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

Merge pull request #3851 from gudnimg/cleanup-gudni 

Minor header cleanup in Marlin_main.cpp
This commit is contained in:
Guðni Már Gilbert 2022-12-27 18:21:51 +00:00 committed by GitHub
parent fea608c8c4 03511a5a7c
commit 4207910db9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/Marlin_main.cpp
View File

@ -66,7 +66,6 @@
#include "menu.h" #include "menu.h"
#include "ultralcd.h" #include "ultralcd.h"
#include "conv2str.h"
#include "backlight.h" #include "backlight.h"
#include "planner.h" #include "planner.h"
@ -77,7 +76,6 @@
#include "cardreader.h" #include "cardreader.h"
#include "ConfigurationStore.h" #include "ConfigurationStore.h"
#include "language.h" #include "language.h"
#include "pins_arduino.h"
#include "math.h" #include "math.h"
#include "util.h" #include "util.h"
#include "Timer.h" #include "Timer.h"
@ -115,10 +113,6 @@
#include "Wire.h" #include "Wire.h"
#endif #endif
#ifdef ULTRALCD
#include "ultralcd.h"
#endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#include "Servo.h" #include "Servo.h"
#endif #endif
@ -131,8 +125,6 @@
#define VERSION_STRING "1.0.2" #define VERSION_STRING "1.0.2"
#include "ultralcd.h"
#include "sound.h" #include "sound.h"
#include "cmdqueue.h" #include "cmdqueue.h"
@ -7338,7 +7330,7 @@ Sigma_Exit:
break; break;
#endif // NUM_SERVOS > 0 #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 <a href="https://reprap.org/wiki/G-code#M300:_Play_beep_sound">M300: Play beep sound</a> ### M300 - Play tone <a href="https://reprap.org/wiki/G-code#M300:_Play_beep_sound">M300: Play beep sound</a>
@ -11043,8 +11035,7 @@ void restore_print_from_eeprom(bool mbl_was_active) {
sprintf_P(cmd, PSTR("M220 S%d"), feedmultiply_rec); sprintf_P(cmd, PSTR("M220 S%d"), feedmultiply_rec);
enquecommand(cmd); enquecommand(cmd);
// Set the fan speed saved at the power panic. // Set the fan speed saved at the power panic.
strcpy_P(cmd, PSTR("M106 S")); sprintf_P(cmd, PSTR("M106 S%u"), fan_speed_rec);
strcat(cmd, itostr3(int(fan_speed_rec)));
enquecommand(cmd); enquecommand(cmd);
// Set a position in the file. // Set a position in the file.