josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add M600 into PROGMEM 

Change in memory:
Flash: -10 bytes
SRAM: 0 bytes
This commit is contained in:
Guðni Már Gilbert 2023-03-18 16:33:13 +00:00
parent 129cc18cbf
commit 466a6a8fc3
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/Filament_sensor.cpp
View File

@ -163,7 +163,7 @@ void Filament_sensor::filRunout() {
restore_print_from_ram_and_continue(0); restore_print_from_ram_and_continue(0);
eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT); eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT);
eeprom_increment_word((uint16_t *)EEPROM_FERROR_COUNT_TOT); eeprom_increment_word((uint16_t *)EEPROM_FERROR_COUNT_TOT);
enquecommand_front_P((PSTR("M600"))); enquecommand_front_P(MSG_M600);
} }
void Filament_sensor::triggerError() { void Filament_sensor::triggerError() {
@ -483,7 +483,7 @@ void PAT9125_sensor::filJam() {
restore_print_from_ram_and_continue(0); restore_print_from_ram_and_continue(0);
eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT); eeprom_increment_byte((uint8_t *)EEPROM_FERROR_COUNT);
eeprom_increment_word((uint16_t *)EEPROM_FERROR_COUNT_TOT); eeprom_increment_word((uint16_t *)EEPROM_FERROR_COUNT_TOT);
enquecommand_front_P((PSTR("M600"))); enquecommand_front_P(MSG_M600);
} }
bool PAT9125_sensor::updatePAT9125() { bool PAT9125_sensor::updatePAT9125() {

5
Firmware/messages.cpp
View File

@ -230,9 +230,10 @@ const char MSG_LCD_STATUS_CHANGED[] PROGMEM_N1 = "LCD status changed";
const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n";
// Common G-gcodes // Common G-gcodes
const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0";
const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0";
const char MSG_M23[] PROGMEM_N1 = "M23 %s"; const char MSG_M23[] PROGMEM_N1 = "M23 %s";
const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M24[] PROGMEM_N1 = "M24";
const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M83[] PROGMEM_N1 = "M83";
const char MSG_M84[] PROGMEM_N1 = "M84"; const char MSG_M84[] PROGMEM_N1 = "M84";
const char MSG_M600[] PROGMEM_N1 = "M600";
const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0";
const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0";

5
Firmware/messages.h
View File

@ -236,12 +236,13 @@ extern const char MSG_LCD_STATUS_CHANGED[];
extern const char MSG_UNKNOWN_CODE[]; extern const char MSG_UNKNOWN_CODE[];
// Common G-gcodes // Common G-gcodes
extern const char MSG_M701_NO_LIFT[];
extern const char MSG_M702_NO_LIFT[];
extern const char MSG_M23[]; extern const char MSG_M23[];
extern const char MSG_M24[]; extern const char MSG_M24[];
extern const char MSG_M83[]; extern const char MSG_M83[];
extern const char MSG_M84[]; extern const char MSG_M84[];
extern const char MSG_M600[];
extern const char MSG_M701_NO_LIFT[];
extern const char MSG_M702_NO_LIFT[];
#if defined(__cplusplus) #if defined(__cplusplus)
} }

2
Firmware/mmu2.cpp
View File

@ -188,7 +188,7 @@ void MMU2::CheckFINDARunout() {
if (SpoolJoin::spooljoin.isSpoolJoinEnabled() && get_current_tool() != (uint8_t)FILAMENT_UNKNOWN){ // Can't auto if F=? if (SpoolJoin::spooljoin.isSpoolJoinEnabled() && get_current_tool() != (uint8_t)FILAMENT_UNKNOWN){ // Can't auto if F=?
enquecommand_front_P(PSTR("M600 AUTO")); // save print and run M600 command enquecommand_front_P(PSTR("M600 AUTO")); // save print and run M600 command
} else { } else {
enquecommand_front_P(PSTR("M600")); // save print and run M600 command enquecommand_front_P(MSG_M600); // save print and run M600 command
} }
} }
} }

2
Firmware/ultralcd.cpp
View File

@ -5490,7 +5490,7 @@ void stepper_timer_overflow() {
static void lcd_colorprint_change() { static void lcd_colorprint_change() {
enquecommand_P(PSTR("M600")); enquecommand_P(MSG_M600);
custom_message_type = CustomMsg::FilamentLoading; //just print status message custom_message_type = CustomMsg::FilamentLoading; //just print status message
lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS)); lcd_setstatuspgm(_T(MSG_FINISHING_MOVEMENTS));