Skip to content

Commit e2661c2

Browse files
discipdiscip
authored
Merge branch 'SoftFever:main' into test
2 parents b137559 + 7d2a12a commit e2661c2

File tree

166 files changed

+6856
-584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+6856
-584
lines changed

‎CMakeLists.txt‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,50 @@
11
cmake_minimum_required(VERSION 3.13)
22

3+
# Verify that your CMake version is exactly 3.31.x series or lower on windows
4+
if(${CMAKE_VERSION} VERSION_LESS "3.13" OR ${CMAKE_VERSION} VERSION_GREATER_EQUAL "4.0")
5+
message(FATAL_ERROR "Only CMake versions between 3.13.x and 3.31.x is supported. Detected version: ${CMAKE_VERSION}")
6+
endif()
7+
8+
if (WIN32)
9+
# Detect known CI environments
10+
set(IS_CI FALSE)
11+
if(DEFINED ENV{CI})
12+
set(IS_CI TRUE)
13+
elseif(DEFINED ENV{GITHUB_ACTIONS})
14+
set(IS_CI TRUE)
15+
elseif(DEFINED ENV{GITLAB_CI})
16+
set(IS_CI TRUE)
17+
elseif(DEFINED ENV{TF_BUILD})
18+
set(IS_CI TRUE)
19+
elseif(DEFINED ENV{BUILD_NUMBER}) # Jenkins
20+
set(IS_CI TRUE)
21+
endif()
22+
23+
# Detect common misconfiguration (Strawberry Perl in PATH before CMake)
24+
# We use ENV to check the PATH order
25+
string(REPLACE "\\" "/" ENV_PATH "$ENV{PATH}")
26+
string(FIND "${ENV_PATH}" "Strawberry/c/bin" STRAWBERRY_POS)
27+
string(FIND "${ENV_PATH}" "Program Files/CMake/bin" CMAKE_POS)
28+
29+
if (STRAWBERRY_POS GREATER -1 AND CMAKE_POS GREATER -1 AND STRAWBERRY_POS LESS CMAKE_POS)
30+
set(_warning_text "
31+
#############################################################
32+
Detected Strawberry Perl's 'c/bin' appearing before CMake in PATH.
33+
This is known to cause CMake to misbehave (e.g., missing modules).
34+
Please adjust your PATH so that:
35+
C:\\Program Files\\CMake\\bin
36+
appears before:
37+
C:\\Strawberry\\c\\bin
38+
You can do this in Environment Variables settings.
39+
#############################################################
40+
")
41+
42+
if(NOT IS_CI)
43+
message(FATAL_ERROR "${_warning_text}")
44+
endif()
45+
endif()
46+
endif ()
47+
348
if (APPLE)
449
# if CMAKE_OSX_DEPLOYMENT_TARGET is not set, set it to 11.3
550
if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
[![Build all](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml/badge.svg?branch=main)](https://github.com/SoftFever/OrcaSlicer/actions/workflows/build_all.yml)
55
<br>Orca Slicer is an open source slicer for FDM printers.
66

7+
## Follow Us
8+
Stay connected with us:
9+
10+
[![Twitter](https://img.shields.io/badge/Twitter-1DA1F2?logo=twitter&logoColor=white&style=flat)](https://twitter.com/real_OrcaSlicer)
711

812
Join our Discord community here:<br>
913
<a href="https://discord.gg/P4VE9UY9gJ"><img src="https://img.shields.io/static/v1?message=Discord&logo=discord&label=&color=7289DA&logoColor=white&labelColor=&style=for-the-badge" height="35" alt="discord logo"/> </a>

‎resources/profiles/CoLiDo.json‎

Lines changed: 284 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,284 @@
1+
{
2+
"name": "CoLiDo",
3+
"version": "02.01.01.00",
4+
"force_update": "0",
5+
"description": "CoLiDo configurations",
6+
"machine_model_list": [
7+
{
8+
"name": "CoLiDo DIY 4.0",
9+
"sub_path": "machine/CoLiDo DIY 4.0.json"
10+
},
11+
{
12+
"name": "CoLiDo X16",
13+
"sub_path": "machine/CoLiDo X16.json"
14+
},
15+
{
16+
"name": "CoLiDo 160 V2",
17+
"sub_path": "machine/CoLiDo 160 V2.json"
18+
},
19+
{
20+
"name": "CoLiDo SR1",
21+
"sub_path": "machine/CoLiDo SR1.json"
22+
},
23+
{
24+
"name": "CoLiDo DIY 4.0 V2",
25+
"sub_path": "machine/CoLiDo DIY 4.0 V2.json"
26+
}
27+
],
28+
"process_list": [
29+
{
30+
"name": "fdm_process_common",
31+
"sub_path": "process/fdm_process_common.json"
32+
},
33+
{
34+
"name": "fdm_process_colido_common",
35+
"sub_path": "process/fdm_process_colido_common.json"
36+
},
37+
{
38+
"name": "fdm_process_colidodiy40_common",
39+
"sub_path": "process/fdm_process_colidodiy40_common.json"
40+
},
41+
{
42+
"name": "0.08mm Extra Fine @CoLiDo DIY 4.0",
43+
"sub_path": "process/0.08mm Extra Fine @CoLiDo DIY 4.0.json"
44+
},
45+
{
46+
"name": "0.12mm Fine @CoLiDo DIY 4.0",
47+
"sub_path": "process/0.12mm Fine @CoLiDo DIY 4.0.json"
48+
},
49+
{
50+
"name": "0.15mm Optimal @CoLiDo DIY 4.0",
51+
"sub_path": "process/0.15mm Optimal @CoLiDo DIY 4.0.json"
52+
},
53+
{
54+
"name": "0.20mm Standard @CoLiDo DIY 4.0",
55+
"sub_path": "process/0.20mm Standard @CoLiDo DIY 4.0.json"
56+
},
57+
{
58+
"name": "0.24mm Draft @CoLiDo DIY 4.0",
59+
"sub_path": "process/0.24mm Draft @CoLiDo DIY 4.0.json"
60+
},
61+
{
62+
"name": "0.28mm Extra Draft @CoLiDo DIY 4.0",
63+
"sub_path": "process/0.28mm Extra Draft @CoLiDo DIY 4.0.json"
64+
}
65+
66+
,
67+
{
68+
"name": "fdm_process_colidox16_common",
69+
"sub_path": "process/fdm_process_colidox16_common.json"
70+
},
71+
{
72+
"name": "0.08mm Extra Fine @CoLiDo X16",
73+
"sub_path": "process/0.08mm Extra Fine @CoLiDo X16.json"
74+
},
75+
{
76+
"name": "0.12mm Fine @CoLiDo X16",
77+
"sub_path": "process/0.12mm Fine @CoLiDo X16.json"
78+
},
79+
{
80+
"name": "0.15mm Optimal @CoLiDo X16",
81+
"sub_path": "process/0.15mm Optimal @CoLiDo X16.json"
82+
},
83+
{
84+
"name": "0.20mm Standard @CoLiDo X16",
85+
"sub_path": "process/0.20mm Standard @CoLiDo X16.json"
86+
},
87+
{
88+
"name": "0.24mm Draft @CoLiDo X16",
89+
"sub_path": "process/0.24mm Draft @CoLiDo X16.json"
90+
},
91+
{
92+
"name": "0.28mm Extra Draft @CoLiDo X16",
93+
"sub_path": "process/0.28mm Extra Draft @CoLiDo X16.json"
94+
}
95+
96+
,
97+
{
98+
"name": "fdm_process_colido160v2_common",
99+
"sub_path": "process/fdm_process_colido160v2_common.json"
100+
},
101+
{
102+
"name": "0.08mm Extra Fine @CoLiDo 160 V2",
103+
"sub_path": "process/0.08mm Extra Fine @CoLiDo 160 V2.json"
104+
},
105+
{
106+
"name": "0.12mm Fine @CoLiDo 160 V2",
107+
"sub_path": "process/0.12mm Fine @CoLiDo 160 V2.json"
108+
},
109+
{
110+
"name": "0.15mm Optimal @CoLiDo 160 V2",
111+
"sub_path": "process/0.15mm Optimal @CoLiDo 160 V2.json"
112+
},
113+
{
114+
"name": "0.20mm Standard @CoLiDo 160 V2",
115+
"sub_path": "process/0.20mm Standard @CoLiDo 160 V2.json"
116+
},
117+
{
118+
"name": "0.24mm Draft @CoLiDo 160 V2",
119+
"sub_path": "process/0.24mm Draft @CoLiDo 160 V2.json"
120+
},
121+
{
122+
"name": "0.28mm Extra Draft @CoLiDo 160 V2",
123+
"sub_path": "process/0.28mm Extra Draft @CoLiDo 160 V2.json"
124+
}
125+
126+
,
127+
{
128+
"name": "fdm_process_colidosr1_common",
129+
"sub_path": "process/fdm_process_colidosr1_common.json"
130+
},
131+
{
132+
"name": "0.08mm Extra Fine @CoLiDo SR1",
133+
"sub_path": "process/0.08mm Extra Fine @CoLiDo SR1.json"
134+
},
135+
{
136+
"name": "0.12mm Fine @CoLiDo SR1",
137+
"sub_path": "process/0.12mm Fine @CoLiDo SR1.json"
138+
},
139+
{
140+
"name": "0.15mm Optimal @CoLiDo SR1",
141+
"sub_path": "process/0.15mm Optimal @CoLiDo SR1.json"
142+
},
143+
{
144+
"name": "0.16mm Optimal @CoLiDo SR1",
145+
"sub_path": "process/0.16mm Optimal @CoLiDo SR1.json"
146+
},
147+
{
148+
"name": "0.20mm Standard @CoLiDo SR1",
149+
"sub_path": "process/0.20mm Standard @CoLiDo SR1.json"
150+
},
151+
{
152+
"name": "0.24mm Draft @CoLiDo SR1",
153+
"sub_path": "process/0.24mm Draft @CoLiDo SR1.json"
154+
},
155+
{
156+
"name": "0.28mm Extra Draft @CoLiDo SR1",
157+
"sub_path": "process/0.28mm Extra Draft @CoLiDo SR1.json"
158+
},
159+
{
160+
"name": "0.32mm Standard @CoLiDo SR1",
161+
"sub_path": "process/0.32mm Standard @CoLiDo SR1.json"
162+
}
163+
164+
,
165+
{
166+
"name": "fdm_process_colidodiy40v2_common",
167+
"sub_path": "process/fdm_process_colidodiy40v2_common.json"
168+
},
169+
{
170+
"name": "0.20mm Standard @CoLiDo DIY 4.0 V2",
171+
"sub_path": "process/0.20mm Standard @CoLiDo DIY 4.0 V2.json"
172+
}
173+
],
174+
"filament_list": [
175+
{
176+
"name": "fdm_filament_common",
177+
"sub_path": "filament/fdm_filament_common.json"
178+
},
179+
{
180+
"name": "fdm_filament_pet",
181+
"sub_path": "filament/fdm_filament_pet.json"
182+
},
183+
{
184+
"name": "fdm_filament_pla",
185+
"sub_path": "filament/fdm_filament_pla.json"
186+
},
187+
{
188+
"name": "fdm_filament_tpu",
189+
"sub_path": "filament/fdm_filament_tpu.json"
190+
},
191+
{
192+
"name": "fdm_filament_abs",
193+
"sub_path": "filament/fdm_filament_abs.json"
194+
},
195+
{
196+
"name": "CoLiDo Generic PETG @CoLiDo DIY 4.0",
197+
"sub_path": "filament/CoLiDo Generic PETG @CoLiDo DIY 4.0.json"
198+
},
199+
{
200+
"name": "CoLiDo Generic PLA @CoLiDo DIY 4.0",
201+
"sub_path": "filament/CoLiDo Generic PLA @CoLiDo DIY 4.0.json"
202+
},
203+
{
204+
"name": "CoLiDo Generic TPU @CoLiDo DIY 4.0",
205+
"sub_path": "filament/CoLiDo Generic TPU @CoLiDo DIY 4.0.json"
206+
},
207+
{
208+
"name": "CoLiDo Generic ABS @CoLiDo DIY 4.0",
209+
"sub_path": "filament/CoLiDo Generic ABS @CoLiDo DIY 4.0.json"
210+
}
211+
212+
,
213+
{
214+
"name": "CoLiDo Generic PETG @CoLiDo X16",
215+
"sub_path": "filament/CoLiDo Generic PETG @CoLiDo X16.json"
216+
},
217+
{
218+
"name": "CoLiDo Generic PLA @CoLiDo X16",
219+
"sub_path": "filament/CoLiDo Generic PLA @CoLiDo X16.json"
220+
},
221+
{
222+
"name": "CoLiDo Generic TPU @CoLiDo X16",
223+
"sub_path": "filament/CoLiDo Generic TPU @CoLiDo X16.json"
224+
},
225+
{
226+
"name": "CoLiDo Generic ABS @CoLiDo X16",
227+
"sub_path": "filament/CoLiDo Generic ABS @CoLiDo X16.json"
228+
}
229+
230+
,
231+
{
232+
"name": "CoLiDo PETG @CoLiDo SR1",
233+
"sub_path": "filament/CoLiDo PETG @CoLiDo SR1.json"
234+
},
235+
{
236+
"name": "CoLiDo PLA @CoLiDo SR1",
237+
"sub_path": "filament/CoLiDo PLA @CoLiDo SR1.json"
238+
},
239+
{
240+
"name": "CoLiDo PLA Silk @CoLiDo SR1",
241+
"sub_path": "filament/CoLiDo PLA Silk @CoLiDo SR1.json"
242+
},
243+
{
244+
"name": "CoLiDo ABS @CoLiDo SR1",
245+
"sub_path": "filament/CoLiDo ABS @CoLiDo SR1.json"
246+
}
247+
248+
,
249+
{
250+
"name": "CoLiDo PLA+ @CoLiDo DIY 4.0 V2",
251+
"sub_path": "filament/CoLiDo PLA+ @CoLiDo DIY 4.0 V2.json"
252+
}
253+
],
254+
"machine_list": [
255+
{
256+
"name": "fdm_machine_common",
257+
"sub_path": "machine/fdm_machine_common.json"
258+
},
259+
{
260+
"name": "fdm_klipper_common",
261+
"sub_path": "machine/fdm_klipper_common.json"
262+
},
263+
{
264+
"name": "CoLiDo DIY 4.0 0.4 nozzle",
265+
"sub_path": "machine/CoLiDo DIY 4.0 0.4 nozzle.json"
266+
},
267+
{
268+
"name": "CoLiDo X16 0.4 nozzle",
269+
"sub_path": "machine/CoLiDo X16 0.4 nozzle.json"
270+
},
271+
{
272+
"name": "CoLiDo 160 V2 0.4 nozzle",
273+
"sub_path": "machine/CoLiDo 160 V2 0.4 nozzle.json"
274+
},
275+
{
276+
"name": "CoLiDo SR1 0.4 nozzle",
277+
"sub_path": "machine/CoLiDo SR1 0.4 nozzle.json"
278+
},
279+
{
280+
"name": "CoLiDo DIY 4.0 V2 0.4 nozzle",
281+
"sub_path": "machine/CoLiDo DIY 4.0 V2 0.4 nozzle.json"
282+
}
283+
]
284+
}

‎resources/profiles/CoLiDo/CoLiDo 160 V2_cover.png‎

18.7 KB
Loading

‎resources/profiles/CoLiDo/CoLiDo DIY 4.0 V2_cover.png‎

22.4 KB
Loading

‎resources/profiles/CoLiDo/CoLiDo DIY 4.0_cover.png‎

23.5 KB
Loading

‎resources/profiles/CoLiDo/CoLiDo SR1_cover.png‎

28.7 KB
Loading

‎resources/profiles/CoLiDo/CoLiDo X16_cover.png‎

18.7 KB
Loading

‎resources/profiles/CoLiDo/filament/CoLiDo ABS @CoLiDo SR1.json‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"type": "filament",
3+
"filament_id": "GFB99",
4+
"setting_id": "GFSB99_06",
5+
"name": "CoLiDo ABS @CoLiDo SR1",
6+
"from": "system",
7+
"instantiation": "true",
8+
"filament_vendor": [
9+
"CoLiDo"
10+
],
11+
"compatible_printers": [
12+
"CoLiDo SR1 0.4 nozzle"
13+
],
14+
"enable_pressure_advance": [
15+
"1"
16+
],
17+
"filament_settings_id": [
18+
"CoLiDo ABS @CoLiDo SR1"
19+
],
20+
"hot_plate_temp": [
21+
"100"
22+
],
23+
"hot_plate_temp_initial_layer": [
24+
"100"
25+
],
26+
"inherits": "fdm_filament_abs",
27+
"is_custom_defined": "0",
28+
"nozzle_temperature": [
29+
"245"
30+
],
31+
"nozzle_temperature_initial_layer": [
32+
"245"
33+
],
34+
"nozzle_temperature_range_high": [
35+
"260"
36+
],
37+
"nozzle_temperature_range_low": [
38+
"230"
39+
],
40+
"version": "2.2.0.4",
41+
"filament_flow_ratio": [
42+
"0.926"
43+
],
44+
"filament_max_volumetric_speed": [
45+
"12"
46+
]
47+
}

0 commit comments

Comments
 (0)