Commit a52ebeb0 authored by Franco (nextime) Lanza's avatar Franco (nextime) Lanza

Merge branch 'dev' into nextime

parents 9e3e6335 328ca582
Pipeline #106 skipped
......@@ -3117,7 +3117,8 @@ inline void wait_heater(bool no_wait_for_cooling = true) {
KEEPALIVE_STATE(IN_HANDLER);
}
inline void wait_bed(bool no_wait_for_cooling = true) {
#if HAS(TEMP_BED)
inline void wait_bed(bool no_wait_for_cooling = true) {
#if TEMP_BED_RESIDENCY_TIME > 0
millis_t residency_start_ms = 0;
......@@ -3187,7 +3188,8 @@ inline void wait_bed(bool no_wait_for_cooling = true) {
} while (!cancel_heatup && TEMP_BED_CONDITIONS);
LCD_MESSAGEPGM(MSG_BED_DONE);
KEEPALIVE_STATE(IN_HANDLER);
}
}
#endif // HAS(TEMP_BED)
#if HAS(TEMP_CHAMBER)
inline void wait_chamber(bool no_wait_for_heating = true) {
......@@ -7882,8 +7884,10 @@ inline void gcode_M503() {
setTargetHotend(old_target_temperature[e], e);
wait_heater();
}
#if HAS(TEMP_BED)
setTargetBed(old_target_temperature_bed);
wait_bed();
#endif
}
// Show load message
......
......@@ -121,7 +121,7 @@ inline void refresh_cmd_timeout() { previous_cmd_ms = millis(); }
extern void delay_ms(millis_t ms);
#if ENABLED(FAST_PWM_FAN) || ENABLED(FAST_PWM_COOLER)
void setPwmFrequency(uint8_t pin, uint8_t val);
void setPwmFrequency(uint8_t pin, int val);
#endif
extern float homing_feedrate[];
......
......@@ -51,7 +51,7 @@
* @brief Interval in seconds between SDCARD saves
* @details This const value defines what will be the time between each
*/
const uint32_t saveInterval = SD_CFG_SECONDS * 1000;
const uint32_t saveInterval = (uint16_t)SD_CFG_SECONDS * 1000;
/**
* @brief Timestamp of the last call to deltaDuration()
......
......@@ -200,7 +200,7 @@ bool CardReader::selectFile(const char* filename, bool silent/*=false*/) {
ECHO_EMV(SERIAL_SD_SIZE, file.fileSize());
}
for (int c = 0; c <= sizeof(fullName); c++)
for (int c = 0; c < sizeof(fullName); c++)
const_cast<char&>(fullName[c]) = '\0';
strncpy(fullName, filename, strlen(filename));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment