From b2642039c735cb56fa8686fb84e4c20bfe305e51 Mon Sep 17 00:00:00 2001 From: Noisyfox Date: Fri, 17 Nov 2023 14:28:48 +0800 Subject: [PATCH 1/6] Fix creality k1/max default materials (#2609) (#2767) --- resources/profiles/Creality/machine/Creality K1 Max.json | 2 +- resources/profiles/Creality/machine/Creality K1.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json index 01a864bd4c..e1d1d5fcd7 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max.json +++ b/resources/profiles/Creality/machine/Creality K1 Max.json @@ -8,5 +8,5 @@ "bed_model": "creality_k1max_buildplate_model.stl", "bed_texture": "creality_k1max_buildplate_texture.png", "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" } diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json index 413022fcdf..bc76e3bf7c 100644 --- a/resources/profiles/Creality/machine/Creality K1.json +++ b/resources/profiles/Creality/machine/Creality K1.json @@ -8,5 +8,5 @@ "bed_model": "creality_k1_buildplate_model.stl", "bed_texture": "creality_k1_buildplate_texture.png", "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" } From 698440d5a448b5d55c43dfb5b659d3f69e430405 Mon Sep 17 00:00:00 2001 From: mariuske Date: Fri, 17 Nov 2023 12:40:03 +0100 Subject: [PATCH 2/6] Removed print_flow_ratio from Flashforge process (#2769) For some reason this value stayed in this profile file after a recent merge and it's now been removed again. --- .../profiles/Flashforge/process/fdm_process_flashforge_0.20.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/profiles/Flashforge/process/fdm_process_flashforge_0.20.json b/resources/profiles/Flashforge/process/fdm_process_flashforge_0.20.json index c2d71186c1..506873d376 100644 --- a/resources/profiles/Flashforge/process/fdm_process_flashforge_0.20.json +++ b/resources/profiles/Flashforge/process/fdm_process_flashforge_0.20.json @@ -10,7 +10,6 @@ "internal_solid_infill_speed": "250", "gap_infill_speed": "200", "sparse_infill_speed": "270", - "print_flow_ratio": "0.98", "small_perimeter_speed": "50%", "overhang_speed_classic": "0", "internal_bridge_speed": "50", From cb038d0469abe2560bb225def99eba21460be374 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 17 Nov 2023 20:00:05 +0800 Subject: [PATCH 3/6] fix Prusa MK3S and Mini profile issues Fixed #2768 --- resources/profiles/Prusa.json | 4 ++++ resources/profiles/Prusa/process/fdm_process_common.json | 2 +- resources/profiles/Prusa/process/process_common_mk3.json | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index cb4f16c96c..d1e2e0cf35 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -30,6 +30,10 @@ "name": "process_common_mk3", "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", "sub_path": "process/0.05mm UltraDetail @MK3S.json" diff --git a/resources/profiles/Prusa/process/fdm_process_common.json b/resources/profiles/Prusa/process/fdm_process_common.json index 793919a167..8aa6ebf563 100644 --- a/resources/profiles/Prusa/process/fdm_process_common.json +++ b/resources/profiles/Prusa/process/fdm_process_common.json @@ -37,7 +37,7 @@ "ironing_speed": "30", "ironing_type": "no ironing", "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", "overhang_1_4_speed": "0", "overhang_2_4_speed": "50", diff --git a/resources/profiles/Prusa/process/process_common_mk3.json b/resources/profiles/Prusa/process/process_common_mk3.json index 31e20be3be..6a8dc3a556 100644 --- a/resources/profiles/Prusa/process/process_common_mk3.json +++ b/resources/profiles/Prusa/process/process_common_mk3.json @@ -21,7 +21,6 @@ "enable_support": "0", "enforce_support_layers": "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_point_distance": "0.8", "fuzzy_skin_thickness": "0.3", From f5ec607b6afd00d80834e90badf13e1fe0e917e3 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 17 Nov 2023 20:00:12 +0800 Subject: [PATCH 4/6] update WIKI --- doc/Chamber-temperature.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/Chamber-temperature.md b/doc/Chamber-temperature.md index 2ab9c1b7cf..ea268532bf 100644 --- a/doc/Chamber-temperature.md +++ b/doc/Chamber-temperature.md @@ -21,7 +21,7 @@ Bellow is a reference configuration for Klipper. [heater_generic chamber_heater] heater_pin:PB10 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_pin:PA1 control = pid @@ -43,6 +43,8 @@ gcode: M117 Chamber heating cancelled {% else %} 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} M117 Chamber at target temperature {% endif %} From c0386d786c4384ff467f7dce2644e494f636d03d Mon Sep 17 00:00:00 2001 From: Ocraftyone Date: Fri, 17 Nov 2023 08:59:18 -0500 Subject: [PATCH 5/6] Fix macOS deps build issues (#2541) update deps/CMakeLists.txt and MPFR.cmake --- deps/CMakeLists.txt | 1 + deps/MPFR/MPFR.cmake | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 52e6022451..aa158a69b4 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -133,6 +133,7 @@ else() ${_gen} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local + -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local -DBUILD_SHARED_LIBS:BOOL=OFF ${_cmake_osx_arch} "${_configs_line}" diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake index c29bb39ad0..f8e95cc808 100644 --- a/deps/MPFR/MPFR.cmake +++ b/deps/MPFR/MPFR.cmake @@ -30,7 +30,8 @@ else () URL_HASH SHA256=cf4f4b2d80abb79e820e78c8077b6725bbbb4e8f41896783c899087be0e94068 DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/MPFR 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 INSTALL_COMMAND make install DEPENDS dep_GMP From b3db0a560aaa3b00e4801be950049b4bd01ed509 Mon Sep 17 00:00:00 2001 From: Jason Pell Date: Sat, 18 Nov 2023 16:43:57 +1100 Subject: [PATCH 6/6] the layer height should be 0.24 not 0.2 (#2779) --- .../process/0.24mm Draft @Creality K1 (0.4 nozzle).json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json index 1f77dd81e7..ad233c1310 100644 --- a/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json @@ -49,7 +49,7 @@ "ironing_spacing": "0.15", "ironing_speed": "100", "ironing_type": "no ironing", - "layer_height": "0.2", + "layer_height": "0.24", "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1",