Refactor header includes

13 files changed, 17 insertions, 15 deletions

diff --git a/source/Core/BSP/MHP30/configuration.h b/source/Core/BSP/MHP30/configuration.h
index db9fc832..a2d5910b 100644
--- a/source/Core/BSP/MHP30/configuration.h
+++ b/source/Core/BSP/MHP30/configuration.h
@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
diff --git a/source/Core/BSP/Miniware/BSP.cpp b/source/Core/BSP/Miniware/BSP.cpp
index a78c74e5..efb52edc 100644
--- a/source/Core/BSP/Miniware/BSP.cpp
+++ b/source/Core/BSP/Miniware/BSP.cpp
@@ -4,6 +4,7 @@
 #include "BootLogo.h"

 #include "I2C_Wrapper.hpp"

 #include "Pins.h"

+#include "Settings.h"

 #include "Setup.h"

 #include "TipThermoModel.h"

 #include "USBPD.h"

diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h
index 3c298389..913883e1 100644
--- a/source/Core/BSP/Miniware/configuration.h
+++ b/source/Core/BSP/Miniware/configuration.h
@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
diff --git a/source/Core/BSP/Pinecil/configuration.h b/source/Core/BSP/Pinecil/configuration.h
index 141c19d7..fe04595b 100644
--- a/source/Core/BSP/Pinecil/configuration.h
+++ b/source/Core/BSP/Pinecil/configuration.h
@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
diff --git a/source/Core/BSP/Pinecilv2/configuration.h b/source/Core/BSP/Pinecilv2/configuration.h
index bc24391a..8ca4ff40 100644
--- a/source/Core/BSP/Pinecilv2/configuration.h
+++ b/source/Core/BSP/Pinecilv2/configuration.h
@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
diff --git a/source/Core/BSP/Sequre/configuration.h b/source/Core/BSP/Sequre/configuration.h
index fca1fb71..be3c9f6b 100644
--- a/source/Core/BSP/Sequre/configuration.h
+++ b/source/Core/BSP/Sequre/configuration.h
@@ -1,6 +1,5 @@
 #ifndef CONFIGURATION_H_
 #define CONFIGURATION_H_
-#include "Settings.h"
 #include <stdint.h>
 /**
  * Configuration.h
diff --git a/source/Core/Drivers/BootLogo.cpp b/source/Core/Drivers/BootLogo.cpp
index e1f4d7de..af43fee4 100644
--- a/source/Core/Drivers/BootLogo.cpp
+++ b/source/Core/Drivers/BootLogo.cpp
@@ -2,6 +2,7 @@
 #include "BSP.h"
 #include "Buttons.hpp"
 #include "OLED.hpp"
+#include "Settings.h"
 #include "cmsis_os.h"
 
 #define LOGO_PAGE_LENGTH 1024
diff --git a/source/Core/Drivers/OLED.cpp b/source/Core/Drivers/OLED.cpp
index 7d641dbb..3d4ab111 100644
--- a/source/Core/Drivers/OLED.cpp
+++ b/source/Core/Drivers/OLED.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "Buttons.hpp"
+#include "Settings.h"
 #include "Translation.h"
 #include "cmsis_os.h"
 #include "configuration.h"
@@ -32,7 +33,7 @@ uint32_t           OLED::displayChecksum;
  * Data packets are prefixed with 0x40
  */
 I2C_CLASS::I2C_REG OLED_Setup_Array[] = {
-  /**/
+    /**/
     {0x80,         OLED_OFF, 0}, /* Display off */
     {0x80,     OLED_DIVIDER, 0}, /* Set display clock divide ratio / osc freq */
     {0x80,             0x52, 0}, /* Divide ratios */
diff --git a/source/Core/Drivers/Utils.cpp b/source/Core/Drivers/Utils.cpp
index 20f8c46f..4ebb6e73 100644
--- a/source/Core/Drivers/Utils.cpp
+++ b/source/Core/Drivers/Utils.cpp
@@ -6,6 +6,7 @@
  */

 

 #include "BSP_Power.h"

+#include "Settings.h"

 #include "configuration.h"

 #include <Utils.h>

 

diff --git a/source/Core/Inc/Settings.h b/source/Core/Inc/Settings.h
index 30b2c17c..715b7991 100644
--- a/source/Core/Inc/Settings.h
+++ b/source/Core/Inc/Settings.h
@@ -7,9 +7,10 @@
  *      Houses the system settings and allows saving / restoring from flash
  */
 
+#include "configuration.h"
+
 #ifndef CORE_SETTINGS_H_
 #define CORE_SETTINGS_H_
-#include "configuration.h"
 #include <stdbool.h>
 #include <stdint.h>
 #ifdef MODEL_Pinecilv2
diff --git a/source/Core/Src/ScrollMessage.cpp b/source/Core/Src/ScrollMessage.cpp
index ff7a2b51..c56b593b 100644
--- a/source/Core/Src/ScrollMessage.cpp
+++ b/source/Core/Src/ScrollMessage.cpp
@@ -1,6 +1,6 @@
 #include "ScrollMessage.hpp"
-
 #include "OLED.hpp"
+#include "Settings.h"
 #include "configuration.h"
 
 /**
diff --git a/source/Core/Threads/UI/drawing/ui_drawing.hpp b/source/Core/Threads/UI/drawing/ui_drawing.hpp
index ecfc1ec1..4f88aa7d 100644
--- a/source/Core/Threads/UI/drawing/ui_drawing.hpp
+++ b/source/Core/Threads/UI/drawing/ui_drawing.hpp
@@ -3,6 +3,7 @@
 #include "Buttons.hpp"
 #include "OLED.hpp"
 #include "OperatingModeUtilities.h"
+#include "Settings.h"
 #include "configuration.h"
 #include <stdbool.h>
 #include <stdint.h>
@@ -21,13 +22,13 @@ void ui_draw_soldering_power_status(bool boost_mode_on);
 void ui_draw_soldering_basic_status(bool boostModeOn);
 void ui_draw_soldering_detailed_sleep(TemperatureType_t tipTemp);
 void ui_draw_soldering_basic_sleep(TemperatureType_t tipTemp);
-void ui_draw_soldering_profile_advanced(TemperatureType_t tipTemp, TemperatureType_t profileCurrentTargetTemp, uint32_t phaseElapsedSeconds, uint32_t phase,const uint32_t phaseTimeGoal);
+void ui_draw_soldering_profile_advanced(TemperatureType_t tipTemp, TemperatureType_t profileCurrentTargetTemp, uint32_t phaseElapsedSeconds, uint32_t phase, const uint32_t phaseTimeGoal);
 
-//Temp change
+// Temp change
 void ui_draw_temperature_change(void);
-//USB-PD debug
-void ui_draw_usb_pd_debug_state(const uint16_t vbus_sense_state, const uint8_t stateNumber) ;
-void ui_draw_usb_pd_debug_pdo(const uint8_t entry_num, const uint16_t min_voltage, const uint16_t max_voltage, const uint16_t current_a_x100, const uint16_t wattage) ;
+// USB-PD debug
+void ui_draw_usb_pd_debug_state(const uint16_t vbus_sense_state, const uint8_t stateNumber);
+void ui_draw_usb_pd_debug_pdo(const uint8_t entry_num, const uint16_t min_voltage, const uint16_t max_voltage, const uint16_t current_a_x100, const uint16_t wattage);
 // Utils
 void printVoltage(void);
-#endif // UI_DRAWING_UI_DRAWING_HPP_
\ No newline at end of file
+#endif // UI_DRAWING_UI_DRAWING_HPP_
diff --git a/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h b/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h
index 1bd0835e..519bdad3 100644
--- a/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h
+++ b/source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h
@@ -2,6 +2,7 @@
 #define OPERATING_MODE_UTILITIES_H_
 #include "Buttons.hpp"
 #include "OLED.hpp"
+#include "Settings.h"
 #include <stdbool.h>
 
 void     GUIDelay();                               //
@@ -14,4 +15,4 @@ void     printVoltage(void);                       //
 bool     checkForUnderVoltage(void);               //
 uint16_t min(uint16_t a, uint16_t b);              //
 void     printCountdownUntilSleep(int sleepThres); //
-#endif
\ No newline at end of file
+#endif