3 files changed, 14 insertions(+), 11 deletions(-)

M module-bsp/board/linux/battery-charger/battery_charger.cpp
M module-bsp/board/rt1051/bsp/battery-charger/battery_charger.cpp
M module-sys/SystemManager/SystemManager.cpp

@@ 36,7 36,7 @@ namespace bsp
 {
     namespace
     {
-        std::uint8_t batteryCriticalLevel = 10;
+        std::uint8_t batteryCriticalLevel = 5;
     } // namespace
 
     static void battery_worker(void *pvp);

@@ 102,7 102,16 @@ namespace bsp
 {
     namespace
     {
-        std::uint8_t batteryLevelCritical = 10;
+        std::uint8_t batteryLevelCritical = 5;
+
+        void triggerCriticalLevelCheck()
+        {
+            if (qHandleIrq != NULL) {
+                BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+                uint8_t val                         = static_cast<uint8_t>(bsp::batteryIRQSource::checkCriticalLevel);
+                xQueueSendFromISR(qHandleIrq, &val, &xHigherPriorityTaskWoken);
+            }
+        }
     } // namespace
 
     // STATUS register bits


@@ 179,10 188,7 @@ namespace bsp
 
         s_BSP_BatteryChargerIrqPinsInit();
 
-        if (qHandleIrq != NULL) {
-            uint8_t val = static_cast<uint8_t>(bsp::batteryIRQSource::checkCriticalLevel);
-            xQueueSendFromISR(qHandleIrq, &val, &xHigherPriorityTaskWoken);
-        }
+        triggerCriticalLevelCheck();
 
         return 0;
     }


@@ 204,10 210,7 @@ namespace bsp
     void battery_setCriticalLevel(std::uint8_t level)
     {
         batteryLevelCritical = level;
-        if (qHandleIrq != NULL) {
-            uint8_t val = static_cast<uint8_t>(bsp::batteryIRQSource::checkCriticalLevel);
-            xQueueSendFromISR(qHandleIrq, &val, &xHigherPriorityTaskWoken);
-        }
+        triggerCriticalLevelCheck();
     }
 
     bool battery_isLevelCritical(std::uint8_t level)

@@ 313,7 313,7 @@ namespace sys
         });
 
         connect(sevm::BatteryLevelCriticalMessage(), [&](Message *) {
-            LOG_INFO("Battery Critical Level");
+            LOG_INFO("Battery Critical Level reached!");
             return MessageNone{};
         });