fixes, code format

portapack-mayhem · Aug 28, 2024 · 7128d4a · 7128d4a
1 parent 8f24676
commit 7128d4a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp
@@ -319,7 +319,8 @@ static void shutdown_base() {
     });
 
     cgu::pll1::enable();
-    while (!cgu::pll1::is_locked());
+    while (!cgu::pll1::is_locked())
+        ;
 
     set_clock_config(clock_config_pll1_boot);
 
@@ -357,13 +358,15 @@ static void set_cpu_clock_speed() {
     });
 
     cgu::pll1::enable();
-    while (!cgu::pll1::is_locked());
+    while (!cgu::pll1::is_locked())
+        ;
 
     set_clock_config(clock_config_pll1_step);
 
     /* Delay >50us at 90-110MHz clock speed */
     volatile uint32_t delay = 1400;
-    while (delay--);
+    while (delay--)
+        ;
 
     set_clock_config(clock_config_pll1);
 

diff --git a/firmware/common/battery.cpp b/firmware/common/battery.cpp
@@ -124,7 +124,6 @@ uint8_t BatteryManagement::calc_percent_voltage(uint16_t voltage) {
     uint8_t batteryPercentage = (float)(voltage - BATTERY_MIN_VOLTAGE) / (float)(BATTERY_MAX_VOLTAGE - BATTERY_MIN_VOLTAGE) * 100.0;
     // Limit the values to the valid range
     batteryPercentage = (batteryPercentage > 100) ? 100 : batteryPercentage;
-    if (batteryPercentage <= 2) batteryPercentage = 0;
     return batteryPercentage;
 }
 

diff --git a/firmware/common/battery.hpp b/firmware/common/battery.hpp
@@ -29,6 +29,7 @@ namespace battery {
 
 #define BATTERY_MIN_VOLTAGE 3000.0
 #define BATTERY_MAX_VOLTAGE 4170.0
+#define BATTERY_DESIGN_CAP 2500
 
 class BatteryManagement {
    public:

diff --git a/firmware/common/max17055.hpp b/firmware/common/max17055.hpp
@@ -26,6 +26,7 @@
 #include <array>
 #include <string>
 
+#include "battery.hpp"
 #include "i2c_pp.hpp"
 
 #define MAX17055_POR 0
@@ -47,7 +48,7 @@
 
 // Define Battery Capacity
 #ifndef __MAX17055_Design_Capacity__
-#define __MAX17055_Design_Capacity__ 2500  // Battery Capacity
+#define __MAX17055_Design_Capacity__ BATTERY_DESIGN_CAP  // Battery Capacity
 #endif
 
 // Define Gauge Resistor
@@ -57,17 +58,17 @@
 
 // Define Minimum Voltage
 #ifndef __MAX17055_Min_Voltage__
-#define __MAX17055_Min_Voltage__ 3.0  // Minimum Voltage
+#define __MAX17055_Min_Voltage__ BATTERY_MIN_VOLTAGE / 1000.0  // Minimum Voltage
 #endif
 
 // Define Maximum Voltage
 #ifndef __MAX17055_Max_Voltage__
-#define __MAX17055_Max_Voltage__ 4.17  // Maximum Voltage
+#define __MAX17055_Max_Voltage__ BATTERY_MAX_VOLTAGE / 1000.0  // Maximum Voltage
 #endif
 
 // Define Empty Voltage
 #ifndef __MAX17055_Empty_Voltage__
-#define __MAX17055_Empty_Voltage__ 3.0  // Empty Voltage
+#define __MAX17055_Empty_Voltage__ BATTERY_MIN_VOLTAGE / 1000.0  // Empty Voltage
 #endif
 
 // Define Recovery Voltage