From 72857c902c6ef81422f9c22adcb4e08430c02cdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 24 Dec 2022 12:43:15 +0000 Subject: [PATCH 1/3] drop conv2str dependency in Marlin_main --- Firmware/Marlin_main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index f975c34e6..41489ea2d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -66,7 +66,6 @@ #include "menu.h" #include "ultralcd.h" -#include "conv2str.h" #include "backlight.h" #include "planner.h" @@ -11043,8 +11042,7 @@ void restore_print_from_eeprom(bool mbl_was_active) { sprintf_P(cmd, PSTR("M220 S%d"), feedmultiply_rec); enquecommand(cmd); // Set the fan speed saved at the power panic. - strcpy_P(cmd, PSTR("M106 S")); - strcat(cmd, itostr3(int(fan_speed_rec))); + sprintf_P(cmd, PSTR("M106 S%u"), fan_speed_rec); enquecommand(cmd); // Set a position in the file. From 9757502abcec6a6385c75045f25f7af09bf5648b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 24 Dec 2022 12:43:32 +0000 Subject: [PATCH 2/3] Remove pins_arduino.h include This header is already included with Arduino.h which is included in Marlin.h header. --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 41489ea2d..1f260d642 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -76,7 +76,6 @@ #include "cardreader.h" #include "ConfigurationStore.h" #include "language.h" -#include "pins_arduino.h" #include "math.h" #include "util.h" #include "Timer.h" From 03511a5a7cc53e1923f729ad93ada87bbccd05a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 24 Dec 2022 12:44:40 +0000 Subject: [PATCH 3/3] Remove redundant ultralcd includes in Marlin_main This also removes two definitions - ULTRALCD - LCD_USE_I2C_BUZZER Neither of them are defined anywhere --- Firmware/Marlin_main.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1f260d642..b10116ece 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -113,10 +113,6 @@ #include "Wire.h" #endif -#ifdef ULTRALCD -#include "ultralcd.h" -#endif - #if NUM_SERVOS > 0 #include "Servo.h" #endif @@ -129,8 +125,6 @@ #define VERSION_STRING "1.0.2" - -#include "ultralcd.h" #include "sound.h" #include "cmdqueue.h" @@ -7336,7 +7330,7 @@ Sigma_Exit: break; #endif // NUM_SERVOS > 0 - #if (LARGE_FLASH == true && ( BEEPER > 0 || defined(ULTRALCD) || defined(LCD_USE_I2C_BUZZER))) + #if (LARGE_FLASH == true && BEEPER > 0 ) /*! ### M300 - Play tone M300: Play beep sound