mirror of
https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-26 16:02:02 +08:00
Merge branch 'main' into dev/gizmo
This commit is contained in:
commit
5045642de0
1
deps/CMakeLists.txt
vendored
1
deps/CMakeLists.txt
vendored
@ -133,6 +133,7 @@ else()
|
|||||||
${_gen}
|
${_gen}
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
|
-DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
|
||||||
|
-DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
|
||||||
-DBUILD_SHARED_LIBS:BOOL=OFF
|
-DBUILD_SHARED_LIBS:BOOL=OFF
|
||||||
${_cmake_osx_arch}
|
${_cmake_osx_arch}
|
||||||
"${_configs_line}"
|
"${_configs_line}"
|
||||||
|
3
deps/MPFR/MPFR.cmake
vendored
3
deps/MPFR/MPFR.cmake
vendored
@ -30,7 +30,8 @@ else ()
|
|||||||
URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
|
URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068
|
||||||
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
|
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR
|
||||||
BUILD_IN_SOURCE ON
|
BUILD_IN_SOURCE ON
|
||||||
CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
|
CONFIGURE_COMMAND autoreconf -f -i &&
|
||||||
|
env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure ${_cross_compile_arg} --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt}
|
||||||
BUILD_COMMAND make -j
|
BUILD_COMMAND make -j
|
||||||
INSTALL_COMMAND make install
|
INSTALL_COMMAND make install
|
||||||
DEPENDS dep_GMP
|
DEPENDS dep_GMP
|
||||||
|
@ -21,7 +21,7 @@ Bellow is a reference configuration for Klipper.
|
|||||||
[heater_generic chamber_heater]
|
[heater_generic chamber_heater]
|
||||||
heater_pin:PB10
|
heater_pin:PB10
|
||||||
max_power:1.0
|
max_power:1.0
|
||||||
# Note: here the temperature sensor should be the sensor you are using for chamber temperature, not the PTC sensor
|
# Orca note: here the temperature sensor should be the sensor you are using for chamber temperature, not the PTC sensor
|
||||||
sensor_type:NTC 100K MGB18-104F39050L32
|
sensor_type:NTC 100K MGB18-104F39050L32
|
||||||
sensor_pin:PA1
|
sensor_pin:PA1
|
||||||
control = pid
|
control = pid
|
||||||
@ -43,6 +43,8 @@ gcode:
|
|||||||
M117 Chamber heating cancelled
|
M117 Chamber heating cancelled
|
||||||
{% else %}
|
{% else %}
|
||||||
SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={s}
|
SET_HEATER_TEMPERATURE HEATER=chamber_heater TARGET={s}
|
||||||
|
# Orca: uncomment the following line if you want to use heat bed to assist chamber heating
|
||||||
|
# M140 S100
|
||||||
TEMPERATURE_WAIT SENSOR="heater_generic chamber_heater" MINIMUM={s-1} MAXIMUM={s+1}
|
TEMPERATURE_WAIT SENSOR="heater_generic chamber_heater" MINIMUM={s-1} MAXIMUM={s+1}
|
||||||
M117 Chamber at target temperature
|
M117 Chamber at target temperature
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -8,5 +8,5 @@
|
|||||||
"bed_model": "creality_k1max_buildplate_model.stl",
|
"bed_model": "creality_k1max_buildplate_model.stl",
|
||||||
"bed_texture": "creality_k1max_buildplate_texture.png",
|
"bed_texture": "creality_k1max_buildplate_texture.png",
|
||||||
"hotend_model": "",
|
"hotend_model": "",
|
||||||
"default_materials": "Creality Generic PLA @0.4 nozzle;Creality HF Generic PLA @0.4 nozzle;Creality HF Generic Speed PLA @0.4 nozzle;Creality Generic PETG @0.4 nozzle;Creality Generic TPU @0.4 nozzle;Creality Generic ABS @0.4 nozzle;Creality Generic PLA @0.6 nozzle;Creality HF Generic PLA @0.6 nozzle;Creality HF Generic Speed PLA @0.6 nozzle;Creality Generic PETG @0.6 nozzle;Creality Generic TPU @0.6 nozzle;Creality Generic ABS @0.6 nozzle;Creality Generic PLA @0.8 nozzle;Creality HF Generic PLA @0.8 nozzle;Creality HF Generic Speed PLA @0.8 nozzle;Creality Generic PETG @0.8 nozzle;Creality Generic TPU @0.8 nozzle;Creality Generic ABS @0.8 nozzle"
|
"default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS"
|
||||||
}
|
}
|
||||||
|
@ -8,5 +8,5 @@
|
|||||||
"bed_model": "creality_k1_buildplate_model.stl",
|
"bed_model": "creality_k1_buildplate_model.stl",
|
||||||
"bed_texture": "creality_k1_buildplate_texture.png",
|
"bed_texture": "creality_k1_buildplate_texture.png",
|
||||||
"hotend_model": "",
|
"hotend_model": "",
|
||||||
"default_materials": "Creality Generic PLA @0.4 nozzle;Creality HF Generic PLA @0.4 nozzle;Creality HF Generic Speed PLA @0.4 nozzle;Creality Generic PETG @0.4 nozzle;Creality Generic TPU @0.4 nozzle;Creality Generic ABS @0.4 nozzle;Creality Generic PLA @0.6 nozzle;Creality HF Generic PLA @0.6 nozzle;Creality HF Generic Speed PLA @0.6 nozzle;Creality Generic PETG @0.6 nozzle;Creality Generic TPU @0.6 nozzle;Creality Generic ABS @0.6 nozzle;Creality Generic PLA @0.8 nozzle;Creality HF Generic PLA @0.8 nozzle;Creality HF Generic Speed PLA @0.8 nozzle;Creality Generic PETG @0.8 nozzle;Creality Generic TPU @0.8 nozzle;Creality Generic ABS @0.8 nozzle"
|
"default_materials": "Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PETG;Creality Generic TPU;Creality Generic ABS"
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@
|
|||||||
"ironing_spacing": "0.15",
|
"ironing_spacing": "0.15",
|
||||||
"ironing_speed": "100",
|
"ironing_speed": "100",
|
||||||
"ironing_type": "no ironing",
|
"ironing_type": "no ironing",
|
||||||
"layer_height": "0.2",
|
"layer_height": "0.24",
|
||||||
"reduce_infill_retraction": "1",
|
"reduce_infill_retraction": "1",
|
||||||
"filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
|
"filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
|
||||||
"detect_overhang_wall": "1",
|
"detect_overhang_wall": "1",
|
||||||
|
@ -10,7 +10,6 @@
|
|||||||
"internal_solid_infill_speed": "250",
|
"internal_solid_infill_speed": "250",
|
||||||
"gap_infill_speed": "200",
|
"gap_infill_speed": "200",
|
||||||
"sparse_infill_speed": "270",
|
"sparse_infill_speed": "270",
|
||||||
"print_flow_ratio": "0.98",
|
|
||||||
"small_perimeter_speed": "50%",
|
"small_perimeter_speed": "50%",
|
||||||
"overhang_speed_classic": "0",
|
"overhang_speed_classic": "0",
|
||||||
"internal_bridge_speed": "50",
|
"internal_bridge_speed": "50",
|
||||||
|
@ -30,6 +30,10 @@
|
|||||||
"name": "process_common_mk3",
|
"name": "process_common_mk3",
|
||||||
"sub_path": "process/process_common_mk3.json"
|
"sub_path": "process/process_common_mk3.json"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "0.20mm Standard @MINI",
|
||||||
|
"sub_path": "process/0.20mm Standard @MINI.json"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "0.05mm UltraDetail @MK3S",
|
"name": "0.05mm UltraDetail @MK3S",
|
||||||
"sub_path": "process/0.05mm UltraDetail @MK3S.json"
|
"sub_path": "process/0.05mm UltraDetail @MK3S.json"
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
"ironing_speed": "30",
|
"ironing_speed": "30",
|
||||||
"ironing_type": "no ironing",
|
"ironing_type": "no ironing",
|
||||||
"reduce_infill_retraction": "1",
|
"reduce_infill_retraction": "1",
|
||||||
"filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode",
|
"filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode",
|
||||||
"detect_overhang_wall": "1",
|
"detect_overhang_wall": "1",
|
||||||
"overhang_1_4_speed": "0",
|
"overhang_1_4_speed": "0",
|
||||||
"overhang_2_4_speed": "50",
|
"overhang_2_4_speed": "50",
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
"enable_support": "0",
|
"enable_support": "0",
|
||||||
"enforce_support_layers": "0",
|
"enforce_support_layers": "0",
|
||||||
"extra_perimeters_on_overhangs": "0",
|
"extra_perimeters_on_overhangs": "0",
|
||||||
"filename_format": "{input_filename_base}_{layer_height}mm_{printing_filament_types}_{printer_model}_{print_time}.gcode",
|
|
||||||
"fuzzy_skin": "none",
|
"fuzzy_skin": "none",
|
||||||
"fuzzy_skin_point_distance": "0.8",
|
"fuzzy_skin_point_distance": "0.8",
|
||||||
"fuzzy_skin_thickness": "0.3",
|
"fuzzy_skin_thickness": "0.3",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user