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

Move configuration into inc

Browse Source
This commit is contained in:
Ben V. Brown
2021-04-04 22:48:41 +10:00
parent 813106438b
commit 77fd9f6a2d
7 changed files with 54 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,9 +5,9 @@
* Author: Ben V. Brown * Author: Ben V. Brown
*/ */
#include "../../configuration.h"
#include "Translation.h" #include "Translation.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "configuration.h"
#include <OLED.hpp> #include <OLED.hpp>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
source/Core/Drivers/TipThermoModel.cpp
View File

@@ -6,9 +6,9 @@
*/ */
#include "TipThermoModel.h" #include "TipThermoModel.h"
#include "../../configuration.h"
#include "BSP.h" #include "BSP.h"
#include "Settings.h" #include "Settings.h"
#include "configuration.h"
#include "main.hpp" #include "main.hpp"
#include "power.hpp" #include "power.hpp"
/* /*

24
source/configuration.h → source/Core/Inc/configuration.h
View File

@@ -122,8 +122,9 @@
#define POWER_LIMIT 0 // 0 watts default limit #define POWER_LIMIT 0 // 0 watts default limit
#define MAX_POWER_LIMIT 65 // #define MAX_POWER_LIMIT 65 //
#define POWER_LIMIT_STEPS 5 // #define POWER_LIMIT_STEPS 5 //
#define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100 #define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100 //
#define TEMP_uV_LOOKUP_HAKKO #define TEMP_uV_LOOKUP_HAKKO //
#define USB_PD_VMAX 20 // Maximum voltage for PD to negotiate
#endif #endif
#ifdef MODEL_Pinecil #ifdef MODEL_Pinecil
@@ -133,8 +134,9 @@
#define POWER_LIMIT 0 // 0 watts default limit #define POWER_LIMIT 0 // 0 watts default limit
#define MAX_POWER_LIMIT 65 // #define MAX_POWER_LIMIT 65 //
#define POWER_LIMIT_STEPS 5 // #define POWER_LIMIT_STEPS 5 //
#define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100 #define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS100 // Uses TS100 resistors
#define TEMP_uV_LOOKUP_HAKKO #define TEMP_uV_LOOKUP_HAKKO // Use Hakko lookup table
#define USB_PD_VMAX 20 // Maximum voltage for PD to negotiate
#endif #endif
#ifdef MODEL_TS80 #ifdef MODEL_TS80
@@ -143,9 +145,10 @@
#define CALIBRATION_OFFSET 900 // the adc offset in uV #define CALIBRATION_OFFSET 900 // the adc offset in uV
#define POWER_LIMIT 24 // 24 watts default power limit #define POWER_LIMIT 24 // 24 watts default power limit
#define MAX_POWER_LIMIT 30 // #define MAX_POWER_LIMIT 30 //
#define POWER_LIMIT_STEPS 2 #define POWER_LIMIT_STEPS 2 //
#define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS80 #define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS80 //
#define TEMP_uV_LOOKUP_TS80 #define TEMP_uV_LOOKUP_TS80 //
#define USB_PD_VMAX 12 // Maximum voltage for PD to negotiate
#endif #endif
#ifdef MODEL_TS80P #ifdef MODEL_TS80P
@@ -154,9 +157,10 @@
#define CALIBRATION_OFFSET 1500 // the adc offset in uV #define CALIBRATION_OFFSET 1500 // the adc offset in uV
#define POWER_LIMIT 30 // 30 watts default power limit #define POWER_LIMIT 30 // 30 watts default power limit
#define MAX_POWER_LIMIT 35 // #define MAX_POWER_LIMIT 35 //
#define POWER_LIMIT_STEPS 2 #define POWER_LIMIT_STEPS 2 //
#define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS80 #define OP_AMP_GAIN_STAGE OP_AMP_GAIN_STAGE_TS80 //
#define TEMP_uV_LOOKUP_TS80 #define TEMP_uV_LOOKUP_TS80 //
#define USB_PD_VMAX 12 // Maximum voltage for PD to negotiate
#endif #endif
#ifdef MODEL_TS100 #ifdef MODEL_TS100

2
source/Core/Inc/power.hpp
View File

@@ -5,8 +5,8 @@
* Authors: Ben V. Brown, David Hilton (David's Idea) * Authors: Ben V. Brown, David Hilton (David's Idea)
*/ */
#include "../../configuration.h"
#include "BSP.h" #include "BSP.h"
#include "configuration.h"
#include "expMovingAverage.h" #include "expMovingAverage.h"
#include "stdint.h" #include "stdint.h"
#include <history.hpp> #include <history.hpp>

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

@@ -9,9 +9,9 @@
*/ */
#include "Settings.h" #include "Settings.h"
#include "../../configuration.h"
#include "BSP.h" #include "BSP.h"
#include "Setup.h" #include "Setup.h"
#include "configuration.h"
#include "string.h" #include "string.h"
volatile systemSettingsType systemSettings; volatile systemSettingsType systemSettings;

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

@@ -6,11 +6,11 @@
*/ */
#include "gui.hpp" #include "gui.hpp"
#include "../../configuration.h"
#include "Buttons.hpp" #include "Buttons.hpp"
#include "TipThermoModel.h" #include "TipThermoModel.h"
#include "Translation.h" #include "Translation.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "configuration.h"
#include "main.hpp" #include "main.hpp"
void gui_Menu(const menuitem *menu); void gui_Menu(const menuitem *menu);

2
source/Core/Threads/GUIThread.cpp
View File

@@ -7,7 +7,6 @@
extern "C" { extern "C" {
#include "FreeRTOSConfig.h" #include "FreeRTOSConfig.h"
} }
#include "../../configuration.h"
#include "Buttons.hpp" #include "Buttons.hpp"
#include "I2CBB.hpp" #include "I2CBB.hpp"
#include "LIS2DH12.hpp" #include "LIS2DH12.hpp"
@@ -15,6 +14,7 @@ extern "C" {
#include "TipThermoModel.h" #include "TipThermoModel.h"
#include "Translation.h" #include "Translation.h"
#include "cmsis_os.h" #include "cmsis_os.h"
#include "configuration.h"
#include "main.hpp" #include "main.hpp"
#include "stdlib.h" #include "stdlib.h"
#include "string.h" #include "string.h"