Zipping compiler warning about POW_PD_EXT / Option B

Ralim · Jun 17, 2023 · 846ed65 · 846ed65
1 parent 2cf22aa
commit 846ed65
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 16 deletions.
diff --git a/source/Core/BSP/MHP30/configuration.h b/source/Core/BSP/MHP30/configuration.h
@@ -175,6 +175,4 @@
 #endif
 #endif
 
-#define POW_PD_EXT 0
-
 #define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
diff --git a/source/Core/BSP/Miniware/configuration.h b/source/Core/BSP/Miniware/configuration.h
@@ -217,6 +217,4 @@
 #endif
 #endif
 
-#define POW_PD_EXT 0
-
 #define FLASH_LOGOADDR (0x08000000 + (62 * 1024))
diff --git a/source/Core/BSP/Pinecil/configuration.h b/source/Core/BSP/Pinecil/configuration.h
@@ -165,8 +165,6 @@
 #endif
 #endif
 
-#define POW_PD_EXT 0
-
 #define FLASH_LOGOADDR (0x08000000 + (126 * 1024))
 
 #define HAS_POWER_DEBUG_MENU
diff --git a/source/Core/BSP/Pinecilv2/configuration.h b/source/Core/BSP/Pinecilv2/configuration.h
@@ -167,6 +167,4 @@
 #endif
 #endif
 
-#define POW_PD_EXT 0
-
 #define FLASH_LOGOADDR (0x23000000 + (1022 * 1024))
diff --git a/source/Core/Drivers/HUB238.cpp b/source/Core/Drivers/HUB238.cpp
@@ -3,7 +3,7 @@
 #include "Utils.h"
 #include "configuration.h"
 
-#if POW_PD_EXT == 1
+#ifdef POW_PD_EXT
 bool hub238_probe() { return I2CBB::probe(HUB238_ADDR); }
 
 extern int32_t powerSupplyWattageLimit;
@@ -217,4 +217,4 @@ uint8_t hub238_source_currentX100() {
   }
   return 10;//Failsafe to 0.1 amp
 }
-#endif
+#endif
diff --git a/source/Core/Drivers/HUB238.hpp b/source/Core/Drivers/HUB238.hpp
@@ -3,7 +3,7 @@
 #ifndef _DRIVERS_HUB238_HPP_
 #define _DRIVERS_HUB238_HPP_
 #include "configuration.h"
-#if POW_PD_EXT == 1
+#ifdef POW_PD_EXT
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -48,4 +48,4 @@ uint8_t hub238_source_currentX100();
 uint16_t hub238_getVoltagePDOCurrent(uint8_t voltage);
 
 #endif
-#endif
+#endif
diff --git a/source/Core/Threads/OperatingModes/ShowStartupWarnings.cpp b/source/Core/Threads/OperatingModes/ShowStartupWarnings.cpp
@@ -37,7 +37,7 @@ void showWarnings(void) {
     }
   }
 #endif
-#if POW_PD_EXT == 1
+#ifdef POW_PD_EXT
   if (!hub238_probe()) {
     if (getSettingValue(SettingsOptions::PDMissingWarningCounter) < 2) {
       nextSettingValue(SettingsOptions::PDMissingWarningCounter);
@@ -47,4 +47,4 @@ void showWarnings(void) {
   }
 #endif
 #endif
-}
+}
diff --git a/source/Core/Threads/OperatingModes/USBPDDebug_HUSB238.cpp b/source/Core/Threads/OperatingModes/USBPDDebug_HUSB238.cpp
@@ -1,6 +1,6 @@
 #include "HUB238.hpp"
 #include "OperatingModes.h"
-#if POW_PD_EXT == 1
+#ifdef POW_PD_EXT
 #ifdef HAS_POWER_DEBUG_MENU
 void showPDDebug(void) {
   // Print out the USB-PD state

diff --git a/source/Core/Threads/POWThread.cpp b/source/Core/Threads/POWThread.cpp
@@ -59,7 +59,7 @@ void startPOWTask(void const *argument __unused) {
 #else
     (void)res;
 #endif
-#if POW_PD_EXT == 1
+#ifdef POW_PD_EXT
     hub238_check_negotiation();
 #endif
     power_check();