Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optional thermistors in Info Menu #27303

Merged
merged 5 commits into from
Jul 23, 2024
Merged

Optional thermistors in Info Menu #27303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c6bcce6
update menu info
ellensp Jul 23, 2024
df27c9b
use HAS_TEMP_SENSOR
ellensp Jul 23, 2024
ccfbb23
add TEMP_SENSOR_REDUNDANT
ellensp Jul 23, 2024
0c2cd15
less renaming
thinkyhead Jul 23, 2024
d4311fb
less undef
thinkyhead Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 96 additions & 78 deletions Marlin/src/lcd/menu/menu_info.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,96 +95,114 @@
//
// About Printer > Thermistors
//
void menu_info_thermistors() {
if (ui.use_click()) return ui.go_back();
#if HAS_TEMP_SENSOR
void menu_info_thermistors() {
if (ui.use_click()) return ui.go_back();

START_SCREEN();
START_SCREEN();

#define THERM_ITEMS(LBL,HTR,WAT) \
STATIC_ITEM_F(F(LBL ": " THERMISTOR_NAME), SS_INVERT); \
PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HTR##_MINTEMP), SS_FULL); \
PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HTR##_MAXTEMP), SS_FULL); \
STATIC_ITEM(TERN(WAT, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_FULL) \

#if HAS_EXTRUDERS
#define THERMISTOR_ID TEMP_SENSOR_0
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E0, HEATER_0, WATCH_HOTENDS);
#endif
#define THERM_ITEM_NAME(LBL) \
STATIC_ITEM_F(F(LBL ": " THERMISTOR_NAME), SS_INVERT);

#if TEMP_SENSOR_1 != 0
#define THERMISTOR_ID TEMP_SENSOR_1
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
#endif
#define THERM_ITEMS(LBL,HTR,WAT) \
THERM_ITEM_NAME(LBL) \
PSTRING_ITEM(MSG_INFO_MIN_TEMP, STRINGIFY(HTR##_MINTEMP), SS_FULL); \
PSTRING_ITEM(MSG_INFO_MAX_TEMP, STRINGIFY(HTR##_MAXTEMP), SS_FULL); \
STATIC_ITEM(TERN(WAT, MSG_INFO_RUNAWAY_ON, MSG_INFO_RUNAWAY_OFF), SS_FULL) \

#if TEMP_SENSOR_2 != 0
#define THERMISTOR_ID TEMP_SENSOR_2
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E2, HEATER_2, WATCH_HOTENDS);
#endif
#if TEMP_SENSOR_0 != 0
#define THERMISTOR_ID TEMP_SENSOR_0
#include "../thermistornames.h"
THERM_ITEMS(STR_E0, HEATER_0, WATCH_HOTENDS);
#endif

#if TEMP_SENSOR_3 != 0
#define THERMISTOR_ID TEMP_SENSOR_3
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E3, HEATER_3, WATCH_HOTENDS);
#endif
#if TEMP_SENSOR_1 != 0
#define THERMISTOR_ID TEMP_SENSOR_1
#include "../thermistornames.h"
THERM_ITEMS(STR_E1, HEATER_1, WATCH_HOTENDS);
#endif

#if TEMP_SENSOR_4 != 0
#define THERMISTOR_ID TEMP_SENSOR_4
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E4, HEATER_4, WATCH_HOTENDS);
#endif
#if TEMP_SENSOR_2 != 0
#define THERMISTOR_ID TEMP_SENSOR_2
#include "../thermistornames.h"
THERM_ITEMS(STR_E2, HEATER_2, WATCH_HOTENDS);
#endif

#if TEMP_SENSOR_5 != 0
#define THERMISTOR_ID TEMP_SENSOR_5
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E5, HEATER_5, WATCH_HOTENDS);
#endif
#if TEMP_SENSOR_3 != 0
#define THERMISTOR_ID TEMP_SENSOR_3
#include "../thermistornames.h"
THERM_ITEMS(STR_E3, HEATER_3, WATCH_HOTENDS);
#endif

#if TEMP_SENSOR_6 != 0
#define THERMISTOR_ID TEMP_SENSOR_6
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E6, HEATER_6, WATCH_HOTENDS);
#endif
#if TEMP_SENSOR_4 != 0
#define THERMISTOR_ID TEMP_SENSOR_4
#include "../thermistornames.h"
THERM_ITEMS(STR_E4, HEATER_4, WATCH_HOTENDS);
#endif

#if TEMP_SENSOR_7 != 0
#define THERMISTOR_ID TEMP_SENSOR_7
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS(STR_E7, HEATER_7, WATCH_HOTENDS);
#endif
#if TEMP_SENSOR_5 != 0
#define THERMISTOR_ID TEMP_SENSOR_5
#include "../thermistornames.h"
THERM_ITEMS(STR_E5, HEATER_5, WATCH_HOTENDS);
#endif

#if HAS_HEATED_BED
#define THERMISTOR_ID TEMP_SENSOR_BED
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS("BED", BED, WATCH_BED);
#endif
#if TEMP_SENSOR_6 != 0
#define THERMISTOR_ID TEMP_SENSOR_6
#include "../thermistornames.h"
THERM_ITEMS(STR_E6, HEATER_6, WATCH_HOTENDS);
#endif

#if HAS_HEATED_CHAMBER
#define THERMISTOR_ID TEMP_SENSOR_CHAMBER
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS("CHAM", CHAMBER, WATCH_CHAMBER);
#endif
#if TEMP_SENSOR_7 != 0
#define THERMISTOR_ID TEMP_SENSOR_7
#include "../thermistornames.h"
THERM_ITEMS(STR_E7, HEATER_7, WATCH_HOTENDS);
#endif

#if HAS_COOLER
#define THERMISTOR_ID TEMP_SENSOR_COOLER
#include "../thermistornames.h"
#undef THERMISTOR_ID
THERM_ITEMS("COOL", COOLER, WATCH_COOLER);
#endif
#if HAS_HEATED_BED
#define THERMISTOR_ID TEMP_SENSOR_BED
#include "../thermistornames.h"
THERM_ITEMS("BED", BED, WATCH_BED);
#endif

END_SCREEN();
}
#if HAS_HEATED_CHAMBER
#define THERMISTOR_ID TEMP_SENSOR_CHAMBER
#include "../thermistornames.h"
THERM_ITEMS("CHAM", CHAMBER, WATCH_CHAMBER);
#endif

#if HAS_COOLER
#define THERMISTOR_ID TEMP_SENSOR_COOLER
#include "../thermistornames.h"
THERM_ITEMS("COOL", COOLER, WATCH_COOLER);
#endif

#if TEMP_SENSOR_PROBE != 0
#define THERMISTOR_ID TEMP_SENSOR_PROBE
#include "../thermistornames.h"
THERM_ITEM_NAME("PROBE");
#endif

#if TEMP_SENSOR_BOARD != 0
#define THERMISTOR_ID TEMP_SENSOR_BOARD
#include "../thermistornames.h"
THERM_ITEM_NAME("BOARD");
#endif

#if TEMP_SENSOR_SOC != 0
#define THERMISTOR_ID TEMP_SENSOR_SOC
#include "../thermistornames.h"
THERM_ITEM_NAME("SOC");
#endif

#if TEMP_SENSOR_REDUNDANT != 0
#define THERMISTOR_ID TEMP_SENSOR_REDUNDANT
#include "../thermistornames.h"
THERM_ITEM_NAME("REDUNDANT");
#endif

END_SCREEN();
}
#endif // HAS_TEMP_SENSOR

//
// About Printer > Board Info
Expand Down Expand Up @@ -256,7 +274,7 @@ void menu_info() {
#else
SUBMENU(MSG_INFO_PRINTER_MENU, menu_info_printer); // Printer Info >
SUBMENU(MSG_INFO_BOARD_MENU, menu_info_board); // Board Info >
#if HAS_EXTRUDERS
#if HAS_TEMP_SENSOR
SUBMENU(MSG_INFO_THERMISTOR_MENU, menu_info_thermistors); // Thermistors >
#endif
#endif
Expand Down
6 changes: 6 additions & 0 deletions Marlin/src/lcd/thermistornames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,10 @@
#elif THERMISTOR_ID == 1000
#define THERMISTOR_NAME "Custom"

// SOC thermistor`
#elif THERMISTOR_ID == 100
#define THERMISTOR_NAME "SOC"

#endif // THERMISTOR_ID

#undef THERMISTOR_ID
Loading