From 92202249d91d717e70c1bac2f5059daa3cfd7907 Mon Sep 17 00:00:00 2001 From: Yuri D'Elia Date: Sat, 20 Aug 2022 14:16:56 +0200 Subject: [PATCH] Make temperature jumping configurable in the variant file Use this new feature in the Settings -> Temperature menus. --- Firmware/ultralcd.cpp | 6 +++--- Firmware/variants/MK25-RAMBo10a.h | 4 ++++ Firmware/variants/MK25-RAMBo13a.h | 4 ++++ Firmware/variants/MK25S-RAMBo10a.h | 4 ++++ Firmware/variants/MK25S-RAMBo13a.h | 4 ++++ Firmware/variants/MK3-E3DREVO.h | 4 ++++ Firmware/variants/MK3-E3DREVO_HF_60W.h | 4 ++++ Firmware/variants/MK3.h | 4 ++++ Firmware/variants/MK3S-E3DREVO.h | 4 ++++ Firmware/variants/MK3S-E3DREVO_HF_60W.h | 4 ++++ Firmware/variants/MK3S.h | 4 ++++ 11 files changed, 43 insertions(+), 3 deletions(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index dbcd2edb9..43cecb694 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -4139,12 +4139,12 @@ static void SETTINGS_SILENT_MODE() static void menuitems_temperature_common() { #if TEMP_SENSOR_0 != 0 - MENU_ITEM_EDIT_int3_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10); + MENU_ITEM_EDIT_int3_jmp_P(_T(MSG_NOZZLE), &target_temperature[0], 0, HEATER_0_MAXTEMP - 10, LCD_JUMP_HOTEND_TEMP); #endif #if TEMP_SENSOR_BED != 0 - MENU_ITEM_EDIT_int3_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 5); + MENU_ITEM_EDIT_int3_jmp_P(_T(MSG_BED), &target_temperature_bed, 0, BED_MAXTEMP - 5, LCD_JUMP_BED_TEMP); #endif - MENU_ITEM_EDIT_int3_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255); + MENU_ITEM_EDIT_int3_jmp_P(_T(MSG_FAN_SPEED), &fanSpeed, 0, 255, LCD_JUMP_FAN_SPEED); } void SETTINGS_FANS_CHECK() { diff --git a/Firmware/variants/MK25-RAMBo10a.h b/Firmware/variants/MK25-RAMBo10a.h index 86d541f89..099ad329f 100644 --- a/Firmware/variants/MK25-RAMBo10a.h +++ b/Firmware/variants/MK25-RAMBo10a.h @@ -381,6 +381,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK25-RAMBo13a.h b/Firmware/variants/MK25-RAMBo13a.h index b2410900e..7cce101be 100644 --- a/Firmware/variants/MK25-RAMBo13a.h +++ b/Firmware/variants/MK25-RAMBo13a.h @@ -382,6 +382,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK25S-RAMBo10a.h b/Firmware/variants/MK25S-RAMBo10a.h index d01c705a7..254be0d09 100644 --- a/Firmware/variants/MK25S-RAMBo10a.h +++ b/Firmware/variants/MK25S-RAMBo10a.h @@ -381,6 +381,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK25S-RAMBo13a.h b/Firmware/variants/MK25S-RAMBo13a.h index a4b77f12b..2c375f920 100644 --- a/Firmware/variants/MK25S-RAMBo13a.h +++ b/Firmware/variants/MK25S-RAMBo13a.h @@ -382,6 +382,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3-E3DREVO.h b/Firmware/variants/MK3-E3DREVO.h index 1deab8178..f9e55e4c5 100644 --- a/Firmware/variants/MK3-E3DREVO.h +++ b/Firmware/variants/MK3-E3DREVO.h @@ -527,6 +527,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3-E3DREVO_HF_60W.h b/Firmware/variants/MK3-E3DREVO_HF_60W.h index 471e6c8b7..e60d5b3f4 100644 --- a/Firmware/variants/MK3-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3-E3DREVO_HF_60W.h @@ -528,6 +528,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3.h b/Firmware/variants/MK3.h index e6ce1915d..78ee31d00 100644 --- a/Firmware/variants/MK3.h +++ b/Firmware/variants/MK3.h @@ -530,6 +530,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3S-E3DREVO.h b/Firmware/variants/MK3S-E3DREVO.h index 2ae876f58..030ce2188 100644 --- a/Firmware/variants/MK3S-E3DREVO.h +++ b/Firmware/variants/MK3S-E3DREVO.h @@ -531,6 +531,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3S-E3DREVO_HF_60W.h b/Firmware/variants/MK3S-E3DREVO_HF_60W.h index bfaae1fc9..bc5445af1 100644 --- a/Firmware/variants/MK3S-E3DREVO_HF_60W.h +++ b/Firmware/variants/MK3S-E3DREVO_HF_60W.h @@ -532,6 +532,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/ diff --git a/Firmware/variants/MK3S.h b/Firmware/variants/MK3S.h index 8b9ee71e2..111d151c3 100644 --- a/Firmware/variants/MK3S.h +++ b/Firmware/variants/MK3S.h @@ -534,6 +534,10 @@ #define FLEX_PREHEAT_HOTEND_TEMP 240 #define FLEX_PREHEAT_HPB_TEMP 50 +#define LCD_JUMP_HOTEND_TEMP 200 +#define LCD_JUMP_BED_TEMP 50 +#define LCD_JUMP_FAN_SPEED 127 + /*------------------------------------ THERMISTORS SETTINGS *------------------------------------*/