Merge pull request #4747 from gudnimg/minor-fixes-for-future-tests

Fix compiler warning and add missing includes in unit test environment

Firmware/Configuration.h

@@ -1,6 +1,7 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
+#include <stdint.h>
 #include "boards.h"
 
 #define STR_HELPER(x) #x

Firmware/Filament_sensor.cpp

@@ -8,6 +8,7 @@
 #include "language.h"
 #include "menu.h"
 #include "messages.h"
+#include "mmu2.h"
 #include "planner.h"
 #include "temperature.h"
 #include "ultralcd.h"

Firmware/Marlin.h

@@ -21,7 +21,6 @@
 #include "Configuration.h"
 #include "pins.h"
 #include "Timer.h"
-#include "mmu2.h"
 #include "printer_state.h"
 
 #ifndef AT90USB
@@ -64,8 +63,6 @@
   #define MYSERIAL MSerial
 #endif
 
-#include "lcd.h"
-
 #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x))
 #define SERIAL_PROTOCOL_F(x,y) (MYSERIAL.print(x,y))
 #define SERIAL_PROTOCOLPGM(x) (serialprintPGM(PSTR(x)))

Firmware/Marlin_main.cpp

@@ -76,6 +76,7 @@
 #include "cardreader.h"
 #include "ConfigurationStore.h"
 #include "language.h"
+#include "lcd.h"
 #include "math.h"
 #include "util.h"
 #include "Timer.h"

Firmware/Prusa_farm.cpp

@@ -8,6 +8,7 @@
 #include "ultralcd.h"
 #include "Filament_sensor.h"
 #include "language.h"
+#include "lcd.h"
 #include "stopwatch.h"
 
 #ifdef PRUSA_FARM

Firmware/eeprom.h

@@ -12,6 +12,7 @@
 #define EEPROM_H
 
 #include <stdint.h>
+#include <stddef.h>
 #include "Configuration_var.h"
 
 // Custom Mendel Name

Firmware/mesh_bed_calibration.cpp

@@ -2,6 +2,7 @@
 #include "ConfigurationStore.h"
 #include "util.h"
 #include "language.h"
+#include "lcd.h"
 #include "mesh_bed_calibration.h"
 #include "mesh_bed_leveling.h"
 #include "stepper.h"

Firmware/mesh_bed_calibration.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Marlin.h"
+#include <avr/pgmspace.h>
 
 #define BED_ZERO_REF_X (- 22.f + X_PROBE_OFFSET_FROM_EXTRUDER) // -22 + 23 = 1
 #define BED_ZERO_REF_Y (- 0.6f + Y_PROBE_OFFSET_FROM_EXTRUDER + 4.f) // -0.6 + 5 + 4 = 8.4

Firmware/mmu2_reporting.cpp

@@ -11,6 +11,7 @@
 #include "ultralcd.h"
 #include "Filament_sensor.h"
 #include "language.h"
+#include "lcd.h"
 #include "temperature.h"
 #include "sound.h"
 

Firmware/planner.cpp

@@ -57,6 +57,7 @@
 #include "temperature.h"
 #include "fancheck.h"
 #include "ultralcd.h"
+#include "lcd.h"
 #include "language.h"
 #include "ConfigurationStore.h"
 

Firmware/stepper.cpp

@@ -26,6 +26,7 @@
 #include "planner.h"
 #include "temperature.h"
 #include "ultralcd.h"
+#include "lcd.h"
 #include "cardreader.h"
 #include "speed_lookuptable.h"
 #if defined(DIGIPOTSS_PIN) && DIGIPOTSS_PIN > -1

Firmware/temperature.cpp

@@ -36,6 +36,7 @@
 #include "fancheck.h"
 #include "messages.h"
 #include "language.h"
+#include "lcd.h"
 
 #include "SdFatUtil.h"
 

Firmware/util.cpp

@@ -1,12 +1,16 @@
-#include "Configuration.h"
+#include <avr/eeprom.h>
+#include <avr/pgmspace.h>
+#include <stdio.h> // for sprintf_P
 
-#include "ultralcd.h"
+#include "Configuration.h"
+#include "language.h"
+#include "lcd.h"
+#include "Marlin.h" // delay_keep_alive
 #include "menu.h"
+#include "Prusa_farm.h"
 #include "sound.h"
-#include "language.h"
+#include "ultralcd.h"
 #include "util.h"
-#include <avr/pgmspace.h>
-#include "Prusa_farm.h"
 
 // Allocate the version string in the program memory. Otherwise the string lands either on the stack or in the global RAM.
 static const char FW_VERSION_STR[] PROGMEM = FW_VERSION;

Firmware/util.h

@@ -96,7 +96,7 @@ struct unquoted_string {
     : len(0)
     , found(false)
     {
-        char * pStrEnd = NULL;
+        const char * pStrEnd = NULL;
 
         // Start of the string
         this->ptr = strchr(pStr, '"');

Firmware/xyzcal.cpp

@@ -5,6 +5,7 @@
 
 #include "xyzcal.h"
 #include <avr/wdt.h>
+#include "lcd.h"
 #include "stepper.h"
 #include "temperature.h"
 #include "sm4.h"