me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor header includes

Browse Source
This commit is contained in:
Ben V. Brown
2024-09-22 21:24:29 +10:00
parent 8b63292d72
commit 64b2c4b3b1
13 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/Core/BSP/MHP30/configuration.h
View File

@@ -1,6 +1,5 @@
#ifndef CONFIGURATION_H_ #ifndef CONFIGURATION_H_
#define CONFIGURATION_H_ #define CONFIGURATION_H_
#include "Settings.h"
#include <stdint.h> #include <stdint.h>
/** /**
* Configuration.h * Configuration.h

1
source/Core/BSP/Miniware/BSP.cpp
View File

@@ -4,6 +4,7 @@
#include "BootLogo.h" #include "BootLogo.h"
#include "I2C_Wrapper.hpp" #include "I2C_Wrapper.hpp"
#include "Pins.h" #include "Pins.h"
#include "Settings.h"
#include "Setup.h" #include "Setup.h"
#include "TipThermoModel.h" #include "TipThermoModel.h"
#include "USBPD.h" #include "USBPD.h"

1
source/Core/BSP/Miniware/configuration.h
View File

@@ -1,6 +1,5 @@
#ifndef CONFIGURATION_H_ #ifndef CONFIGURATION_H_
#define CONFIGURATION_H_ #define CONFIGURATION_H_
#include "Settings.h"
#include <stdint.h> #include <stdint.h>
/** /**
* Configuration.h * Configuration.h

1
source/Core/BSP/Pinecil/configuration.h
View File

@@ -1,6 +1,5 @@
#ifndef CONFIGURATION_H_ #ifndef CONFIGURATION_H_
#define CONFIGURATION_H_ #define CONFIGURATION_H_
#include "Settings.h"
#include <stdint.h> #include <stdint.h>
/** /**
* Configuration.h * Configuration.h

1
source/Core/BSP/Pinecilv2/configuration.h
View File

@@ -1,6 +1,5 @@
#ifndef CONFIGURATION_H_ #ifndef CONFIGURATION_H_
#define CONFIGURATION_H_ #define CONFIGURATION_H_
#include "Settings.h"
#include <stdint.h> #include <stdint.h>
/** /**
* Configuration.h * Configuration.h

1
source/Core/BSP/Sequre/configuration.h
View File

@@ -1,6 +1,5 @@
#ifndef CONFIGURATION_H_ #ifndef CONFIGURATION_H_
#define CONFIGURATION_H_ #define CONFIGURATION_H_
#include "Settings.h"
#include <stdint.h> #include <stdint.h>
/** /**
* Configuration.h * Configuration.h

1
source/Core/Drivers/BootLogo.cpp
View File

@@ -2,6 +2,7 @@
#include "BSP.h" #include "BSP.h"
#include "Buttons.hpp" #include "Buttons.hpp"
#include "OLED.hpp" #include "OLED.hpp"
#include "Settings.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#define LOGO_PAGE_LENGTH 1024 #define LOGO_PAGE_LENGTH 1024

3
source/Core/Drivers/OLED.cpp
View File

@@ -6,6 +6,7 @@
*/ */
#include "Buttons.hpp" #include "Buttons.hpp"
#include "Settings.h"
#include "Translation.h" #include "Translation.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "configuration.h" #include "configuration.h"
@@ -32,7 +33,7 @@ uint32_t OLED::displayChecksum;
* Data packets are prefixed with 0x40 * Data packets are prefixed with 0x40
*/ */
I2C_CLASS::I2C_REG OLED_Setup_Array[] = { I2C_CLASS::I2C_REG OLED_Setup_Array[] = {
/**/ /**/
{0x80, OLED_OFF, 0}, /* Display off */ {0x80, OLED_OFF, 0}, /* Display off */
{0x80, OLED_DIVIDER, 0}, /* Set display clock divide ratio / osc freq */ {0x80, OLED_DIVIDER, 0}, /* Set display clock divide ratio / osc freq */
{0x80, 0x52, 0}, /* Divide ratios */ {0x80, 0x52, 0}, /* Divide ratios */

1
source/Core/Drivers/Utils.cpp
View File

@@ -6,6 +6,7 @@
*/ */
#include "BSP_Power.h" #include "BSP_Power.h"
#include "Settings.h"
#include "configuration.h" #include "configuration.h"
#include <Utils.h> #include <Utils.h>

3
source/Core/Inc/Settings.h
View File

@@ -7,9 +7,10 @@
* Houses the system settings and allows saving / restoring from flash * Houses the system settings and allows saving / restoring from flash
*/ */
#include "configuration.h"
#ifndef CORE_SETTINGS_H_ #ifndef CORE_SETTINGS_H_
#define CORE_SETTINGS_H_ #define CORE_SETTINGS_H_
#include "configuration.h"
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#ifdef MODEL_Pinecilv2 #ifdef MODEL_Pinecilv2

2
source/Core/Src/ScrollMessage.cpp
View File

@@ -1,6 +1,6 @@
#include "ScrollMessage.hpp" #include "ScrollMessage.hpp"
#include "OLED.hpp" #include "OLED.hpp"
#include "Settings.h"
#include "configuration.h" #include "configuration.h"
/** /**

13
source/Core/Threads/UI/drawing/ui_drawing.hpp
View File

@@ -3,6 +3,7 @@
#include "Buttons.hpp" #include "Buttons.hpp"
#include "OLED.hpp" #include "OLED.hpp"
#include "OperatingModeUtilities.h" #include "OperatingModeUtilities.h"
#include "Settings.h"
#include "configuration.h" #include "configuration.h"
#include <stdbool.h> #include <stdbool.h>
#include <stdint.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_basic_status(bool boostModeOn);
void ui_draw_soldering_detailed_sleep(TemperatureType_t tipTemp); void ui_draw_soldering_detailed_sleep(TemperatureType_t tipTemp);
void ui_draw_soldering_basic_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); void ui_draw_temperature_change(void);
//USB-PD debug // 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_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) ; 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 // Utils
void printVoltage(void); void printVoltage(void);
#endif // UI_DRAWING_UI_DRAWING_HPP_ #endif // UI_DRAWING_UI_DRAWING_HPP_

3
source/Core/Threads/UI/logic/utils/OperatingModeUtilities.h
View File

@@ -2,6 +2,7 @@
#define OPERATING_MODE_UTILITIES_H_ #define OPERATING_MODE_UTILITIES_H_
#include "Buttons.hpp" #include "Buttons.hpp"
#include "OLED.hpp" #include "OLED.hpp"
#include "Settings.h"
#include <stdbool.h> #include <stdbool.h>
void GUIDelay(); // void GUIDelay(); //
@@ -14,4 +15,4 @@ void printVoltage(void); //
bool checkForUnderVoltage(void); // bool checkForUnderVoltage(void); //
uint16_t min(uint16_t a, uint16_t b); // uint16_t min(uint16_t a, uint16_t b); //
void printCountdownUntilSleep(int sleepThres); // void printCountdownUntilSleep(int sleepThres); //
#endif #endif