jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc

Browse Source
This commit is contained in:
Scott Lahteine
2025-03-17 20:10:00 -05:00
parent ed60c3c68b
commit a131edd6ff
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/src/lcd/marlinui.cpp
+3 -3
View File
@@ -150,10 +150,10 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
void MarlinUI::apply_preheat(const uint8_t m, const uint8_t pmask, const uint8_t e/*=active_extruder*/) {
const preheat_t &pre = material_preset[m];
TERN_(HAS_HOTEND, if (TEST(pmask, PT_HOTEND)) thermalManager.setTargetHotend(pre.hotend_temp, e));
TERN_(HAS_HEATED_BED, if (TEST(pmask, PT_BED)) thermalManager.setTargetBed(pre.bed_temp));
TERN_(HAS_HOTEND, if (TEST(pmask, PT_HOTEND)) thermalManager.setTargetHotend(pre.hotend_temp, e));
TERN_(HAS_HEATED_BED, if (TEST(pmask, PT_BED)) thermalManager.setTargetBed(pre.bed_temp));
TERN_(HAS_HEATED_CHAMBER, if (TEST(pmask, PT_CHAMBER)) thermalManager.setTargetChamber(pre.chamber_temp));
TERN_(HAS_FAN, if (TEST(pmask, PT_FAN)) thermalManager.set_fan_speed(0, pre.fan_speed));
TERN_(HAS_FAN, if (TEST(pmask, PT_FAN)) thermalManager.set_fan_speed(0, pre.fan_speed));
}
#endif
Marlin/src/lcd/menu/menu_temperature.cpp
+1 -1
View File
@@ -55,7 +55,7 @@
if (indb >= 0 && ui.material_preset[indb].bed_temp > 0) setTargetBed(ui.material_preset[indb].bed_temp);
#endif
#if HAS_HEATED_CHAMBER
if ((indb >= 0 && ui.material_preset[indb].chamber_temp > 0) && (indh >= 0 && ui.material_preset[indh].hotend_temp > 0)) // Preheat all selected
if ((indb >= 0 && ui.material_preset[indb].chamber_temp > 0) && (indh >= 0 && ui.material_preset[indh].hotend_temp > 0)) // Preheat all selected
setTargetChamber(ui.material_preset[indb].chamber_temp);
#endif
#if HAS_FAN
Marlin/src/module/settings.cpp
+4 -4
View File
@@ -36,7 +36,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V91"
#define EEPROM_VERSION "V90"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@@ -3571,10 +3571,10 @@ void MarlinSettings::reset() {
constexpr uint8_t fpre[] = { REPEAT2_S(1, INCREMENT(PREHEAT_COUNT), _PITEM, FAN_SPEED) };
#endif
for (uint8_t i = 0; i < PREHEAT_COUNT; ++i) {
TERN_(HAS_HOTEND, ui.material_preset[i].hotend_temp = hpre[i]);
TERN_(HAS_HEATED_BED, ui.material_preset[i].bed_temp = bpre[i]);
TERN_(HAS_HOTEND, ui.material_preset[i].hotend_temp = hpre[i]);
TERN_(HAS_HEATED_BED, ui.material_preset[i].bed_temp = bpre[i]);
TERN_(HAS_HEATED_CHAMBER, ui.material_preset[i].chamber_temp = cpre[i]);
TERN_(HAS_FAN, ui.material_preset[i].fan_speed = fpre[i]);
TERN_(HAS_FAN, ui.material_preset[i].fan_speed = fpre[i]);
}
#endif