bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

More IntelliSense-friendly declarations

Browse Source
This commit is contained in:
Scott Lahteine
2021-03-24 05:40:28 -05:00
committed by Scott Lahteine
parent da4b6896f7
commit 2d2291d00e
32 changed files with 562 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/lib/dgus/DGUSScreenHandler.cpp
View File

@ -624,7 +624,9 @@ void DGUSScreenHandler::HandleHeaterControl(DGUS_VP_Variable &var, void *val_ptr
DEBUG_ECHOLNPGM("HandlePreheat");
uint8_t e_temp = 0;
TERN_(HAS_HEATED_BED, uint8_t bed_temp = 0);
#if ENABLED(HAS_HEATED_BED)
uint8_t bed_temp = 0;
#endif
const uint16_t preheat_option = swap16(*(uint16_t*)val_ptr);
switch (preheat_option) {
default:

4
Marlin/src/lcd/extui/lib/mks_ui/draw_printing.cpp
View File

@ -49,7 +49,9 @@ static lv_obj_t *labelPause, *labelStop, *labelOperat;
static lv_obj_t *bar1, *bar1ValueText;
static lv_obj_t *buttonPause, *buttonOperat, *buttonStop;
TERN_(HAS_MULTI_EXTRUDER, static lv_obj_t *labelExt2);
#if ENABLED(HAS_MULTI_EXTRUDER)
static lv_obj_t *labelExt2;
#endif
#if HAS_HEATED_BED
static lv_obj_t* labelBed;

76
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -103,8 +103,12 @@
namespace ExtUI {
static struct {
uint8_t printer_killed : 1;
TERN_(JOYSTICK, uint8_t jogging : 1);
TERN_(SDSUPPORT, uint8_t was_sd_printing : 1);
#if ENABLED(JOYSTICK)
uint8_t jogging : 1;
#endif
#if ENABLED(SDSUPPORT)
uint8_t was_sd_printing : 1;
#endif
} flags;
#ifdef __SAM3X8E__
@ -175,8 +179,12 @@ namespace ExtUI {
#if HAS_HEATED_BED
case BED: thermalManager.reset_bed_idle_timer(); return;
#endif
TERN_(HAS_HEATED_CHAMBER, case CHAMBER: return); // Chamber has no idle timer
TERN_(HAS_COOLER, case COOLER: return); // Cooler has no idle timer
#if ENABLED(HAS_HEATED_CHAMBER)
case CHAMBER: return; // Chamber has no idle timer
#endif
#if ENABLED(HAS_COOLER)
case COOLER: return; // Cooler has no idle timer
#endif
default:
TERN_(HAS_HOTEND, thermalManager.reset_hotend_idle_timer(heater - H0));
break;
@ -234,8 +242,12 @@ namespace ExtUI {
bool isHeaterIdle(const heater_t heater) {
#if HEATER_IDLE_HANDLER
switch (heater) {
TERN_(HAS_HEATED_BED, case BED: return thermalManager.heater_idle[thermalManager.IDLE_INDEX_BED].timed_out);
TERN_(HAS_HEATED_CHAMBER, case CHAMBER: return false); // Chamber has no idle timer
#if ENABLED(HAS_HEATED_BED)
case BED: return thermalManager.heater_idle[thermalManager.IDLE_INDEX_BED].timed_out;
#endif
#if ENABLED(HAS_HEATED_CHAMBER)
case CHAMBER: return false; // Chamber has no idle timer
#endif
default:
return TERN0(HAS_HOTEND, thermalManager.heater_idle[heater - H0].timed_out);
}
@ -253,8 +265,12 @@ namespace ExtUI {
float getActualTemp_celsius(const heater_t heater) {
switch (heater) {
TERN_(HAS_HEATED_BED, case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degBed()));
TERN_(HAS_HEATED_CHAMBER, case CHAMBER: return GET_TEMP_ADJUSTMENT(thermalManager.degChamber()));
#if ENABLED(HAS_HEATED_BED)
case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degBed());
#endif
#if ENABLED(HAS_HEATED_CHAMBER)
case CHAMBER: return GET_TEMP_ADJUSTMENT(thermalManager.degChamber());
#endif
default: return GET_TEMP_ADJUSTMENT(thermalManager.degHotend(heater - H0));
}
}
@ -265,8 +281,12 @@ namespace ExtUI {
float getTargetTemp_celsius(const heater_t heater) {
switch (heater) {
TERN_(HAS_HEATED_BED, case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetBed()));
TERN_(HAS_HEATED_CHAMBER, case CHAMBER: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetChamber()));
#if ENABLED(HAS_HEATED_BED)
case BED: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetBed());
#endif
#if ENABLED(HAS_HEATED_CHAMBER)
case CHAMBER: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetChamber());
#endif
default: return GET_TEMP_ADJUSTMENT(thermalManager.degTargetHotend(heater - H0));
}
}
@ -294,13 +314,13 @@ namespace ExtUI {
}
float getAxisPosition_mm(const axis_t axis) {
return TERN_(JOYSTICK, flags.jogging ? destination[axis] :) current_position[axis];
return TERN0(JOYSTICK, flags.jogging) ? destination[axis] : current_position[axis];
}
float getAxisPosition_mm(const extruder_t extruder) {
const extruder_t old_tool = getActiveTool();
setActiveTool(extruder, true);
const float epos = TERN_(JOYSTICK, flags.jogging ? destination.e :) current_position.e;
const float epos = TERN0(JOYSTICK, flags.jogging) ? destination.e : current_position.e;
setActiveTool(old_tool, true);
return epos;
}
@ -491,14 +511,30 @@ namespace ExtUI {
int getTMCBumpSensitivity(const axis_t axis) {
switch (axis) {
TERN_(X_SENSORLESS, case X: return stepperX.homing_threshold());
TERN_(X2_SENSORLESS, case X2: return stepperX2.homing_threshold());
TERN_(Y_SENSORLESS, case Y: return stepperY.homing_threshold());
TERN_(Y2_SENSORLESS, case Y2: return stepperY2.homing_threshold());
TERN_(Z_SENSORLESS, case Z: return stepperZ.homing_threshold());
TERN_(Z2_SENSORLESS, case Z2: return stepperZ2.homing_threshold());
TERN_(Z3_SENSORLESS, case Z3: return stepperZ3.homing_threshold());
TERN_(Z4_SENSORLESS, case Z4: return stepperZ4.homing_threshold());
#if ENABLED(X_SENSORLESS)
case X: return stepperX.homing_threshold();
#endif
#if ENABLED(X2_SENSORLESS)
case X2: return stepperX2.homing_threshold();
#endif
#if ENABLED(Y_SENSORLESS)
case Y: return stepperY.homing_threshold();
#endif
#if ENABLED(Y2_SENSORLESS)
case Y2: return stepperY2.homing_threshold();
#endif
#if ENABLED(Z_SENSORLESS)
case Z: return stepperZ.homing_threshold();
#endif
#if ENABLED(Z2_SENSORLESS)
case Z2: return stepperZ2.homing_threshold();
#endif
#if ENABLED(Z3_SENSORLESS)
case Z3: return stepperZ3.homing_threshold();
#endif
#if ENABLED(Z4_SENSORLESS)
case Z4: return stepperZ4.homing_threshold();
#endif
default: return 0;
}
}