From 0a3dfb34ece5f7cea942bcf8b555b18ff48456d1 Mon Sep 17 00:00:00 2001 From: Ivan Zorin Date: Tue, 20 Jun 2023 08:01:27 +0300 Subject: [PATCH] A bit of clean-up & update configuration.h files (#1717) * BSP/configuration.h: update & clean-up macro defines * BSP/MHP30/configuration.h: add lost-during-update macro --- source/Core/BSP/MHP30/configuration.h | 14 +++++--------- source/Core/BSP/Miniware/configuration.h | 2 +- source/Core/BSP/Pinecil/configuration.h | 7 ++++--- source/Core/BSP/Pinecilv2/configuration.h | 9 +++++---- source/Core/BSP/Sequre_S60/configuration.h | 8 ++++---- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/source/Core/BSP/MHP30/configuration.h b/source/Core/BSP/MHP30/configuration.h index 0443adb9f8..5d4c2eb1d0 100644 --- a/source/Core/BSP/MHP30/configuration.h +++ b/source/Core/BSP/MHP30/configuration.h @@ -1,11 +1,10 @@ #ifndef CONFIGURATION_H_ #define CONFIGURATION_H_ #include "Settings.h" -#include "configuration.h" #include /** * Configuration.h - * Define here your default pre settings for TS80 or TS100 + * Define here your default pre settings for MHP30 * */ @@ -86,13 +85,9 @@ #define ADC_MAX_READING (4096 * 8) // Maximum reading of the adc #define ADC_VDD_MV 3300 // ADC max reading millivolts -#ifdef MODEL_TS100 -#define POWER_PULSE_DEFAULT 0 -#else -#define POWER_PULSE_DEFAULT 5 -#endif #define POWER_PULSE_WAIT_DEFAULT 4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s #define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms +#define POWER_PULSE_DEFAULT 5 /** * OLED Orientation Sensitivity on Automatic mode! @@ -169,12 +164,13 @@ #define HARDWARE_MAX_WATTAGE_X10 650 #define TIP_THERMAL_MASS 65 // TODO, needs refinement #define TIP_RESISTANCE 60 // x10 ohms, ~6 typical -#endif +#endif /* MHP30 */ #ifdef ACCEL_EXITS_ON_MOVEMENT #define NO_SLEEP_MODE #endif -#endif #define FLASH_LOGOADDR (0x08000000 + (62 * 1024)) #define SETTINGS_START_PAGE (0x08000000 + (127 * 1024)) + +#endif /* CONFIGURATION_H_ */ diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h index fe27e89fc8..d26fe0a3e0 100644 --- a/source/Core/BSP/Miniware/configuration.h +++ b/source/Core/BSP/Miniware/configuration.h @@ -4,7 +4,7 @@ #include /** * Configuration.h - * Define here your default pre settings for TS80(P) or TS100 + * Define here your default pre settings for TS80(P) or TS10(0/1) * */ diff --git a/source/Core/BSP/Pinecil/configuration.h b/source/Core/BSP/Pinecil/configuration.h index 3a0304c878..06d2e7c478 100644 --- a/source/Core/BSP/Pinecil/configuration.h +++ b/source/Core/BSP/Pinecil/configuration.h @@ -86,7 +86,7 @@ #define POWER_PULSE_DEFAULT 0 #else #define POWER_PULSE_DEFAULT 5 -#endif +#endif /* Pinecil */ #define POWER_PULSE_WAIT_DEFAULT 4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s #define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms @@ -164,10 +164,11 @@ #define TIP_THERMAL_MASS 65 // X10 watts to raise 1 deg C in 1 second #define TIP_RESISTANCE 75 // x10 ohms, 7.5 typical for Pinecil tips #define CANT_DIRECT_READ_SETTINGS -#endif -#endif +#endif /* Pinecil */ #define FLASH_LOGOADDR (0x08000000 + (126 * 1024)) #define SETTINGS_START_PAGE (0x08000000 + (127 * 1024)) #define HAS_POWER_DEBUG_MENU + +#endif /* CONFIGURATION_H_ */ diff --git a/source/Core/BSP/Pinecilv2/configuration.h b/source/Core/BSP/Pinecilv2/configuration.h index e0af468872..686f54f536 100644 --- a/source/Core/BSP/Pinecilv2/configuration.h +++ b/source/Core/BSP/Pinecilv2/configuration.h @@ -4,7 +4,7 @@ #include /** * Configuration.h - * Define here your default pre settings for Pinecil + * Define here your default pre settings for Pinecilv2 * */ @@ -87,7 +87,7 @@ #define POWER_PULSE_DEFAULT 0 #else #define POWER_PULSE_DEFAULT 5 -#endif +#endif /* Pinecil */ #define POWER_PULSE_WAIT_DEFAULT 4 // Default rate of the power pulse: 4*2500 = 10000 ms = 10 s #define POWER_PULSE_DURATION_DEFAULT 1 // Default duration of the power pulse: 1*250 = 250 ms @@ -165,9 +165,10 @@ #define BLE_ENABLED #define NEEDS_VBUS_PROBE 0 #define CANT_DIRECT_READ_SETTINGS -#endif -#endif +#endif /* Pinecilv2 */ #define FLASH_LOGOADDR (0x23000000 + (1022 * 1024)) #define FLASH_PAGE_SIZE (1024) #define SETTINGS_START_PAGE (1023 * FLASH_PAGE_SIZE) // Hal auto offsets base addr + +#endif /* CONFIGURATION_H_ */ diff --git a/source/Core/BSP/Sequre_S60/configuration.h b/source/Core/BSP/Sequre_S60/configuration.h index 8c5f574f11..fd84162e5c 100644 --- a/source/Core/BSP/Sequre_S60/configuration.h +++ b/source/Core/BSP/Sequre_S60/configuration.h @@ -4,7 +4,7 @@ #include /** * Configuration.h - * Define here your default pre settings for TS80(P) or S60 + * Define here your default pre settings for S60 * */ @@ -163,9 +163,9 @@ #define OLED_I2CBB2 #define MODEL_HAS_DCDC // We dont have DC/DC but have reallly fast PWM that gets us roughly the same place -#endif - -#endif +#endif /* S60 */ #define FLASH_LOGOADDR (0x08000000 + (62 * 1024)) #define SETTINGS_START_PAGE (0x08000000 + (63 * 1024)) + +#endif /* CONFIGURATION_H_ */