commit merge conflicts

paxo-phone · Sep 4, 2024 · 1720e6c · 1720e6c
1 parent a65183c
commit 1720e6c
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 2 deletions.
diff --git a/lib/graphics/src/graphics.cpp b/lib/graphics/src/graphics.cpp
@@ -275,6 +275,8 @@ int getTouch(uint16_t *pPoints)
 
 void graphics::touchUpdate()
 {
+    if(StandbyMode::state() == true)
+        return;
     bool touchState = true;
     int16_t liveTouchX = 0, liveTouchY = 0;
 

diff --git a/lib/gsm/src/gsm.cpp b/lib/gsm/src/gsm.cpp
@@ -11,6 +11,7 @@
 #include <delay.hpp>
 #include <threads.hpp>
 #include <graphics.hpp>
+#include <standby.hpp>
 
 #include "Image.hpp"
 #include "Surface.hpp"
@@ -41,6 +42,7 @@ namespace GSM
     uint16_t seconds, minutes, hours, days, months, years = 0;
     float voltage = -1;
     int networkQuality = 0;
+    bool flightMode = false;
 
     namespace ExternalEvents
     {
@@ -988,12 +990,14 @@ namespace GSM
 
         try
         {
-            return std::stof(voltage_str);
+            voltage = std::stof(voltage_str);
         }
         catch (std::exception)
         {
-            return 0;
+            voltage = -1;
         }
+
+        return 0;
     }
 
     double getBatteryLevel() {
@@ -1128,6 +1132,32 @@ namespace GSM
         requests.push_back({&GSM::updateNetworkQuality, priority::normal});
     }
 
+    void updateFlightMode()
+    {
+        if(flightMode)
+        {
+            std::cout << "Flight Mode ON" << std::endl;
+            std::cout << send("AT+CFUN=4", "AT+CFUN", 1000) << std::endl;
+        }
+        else
+        {
+            std::cout << "Flight Mode OFF" << std::endl;
+            //std::cout << send("AT+CFUN=6", "AT+CFUN", 1000) << std::endl;
+            std::cout << send("AT+CFUN=1", "AT+CFUN", 1000) << std::endl;
+        }
+    }
+
+    bool isFlightMode()
+    {
+        return flightMode;
+    }
+
+    void setFlightMode(bool mode)
+    {
+        eventHandlerBack.setTimeout(new Callback<>([mode](){ appendRequest({updateFlightMode}); }), 0);
+        flightMode = mode;
+    }
+
     void run()
     {
         init();

diff --git a/lib/gsm/src/gsm.hpp b/lib/gsm/src/gsm.hpp
@@ -107,6 +107,9 @@ namespace GSM
 
     int getNetworkStatus();
 
+    bool isFlightMode();
+    void setFlightMode(bool mode);
+
     std::string getCurrentTimestamp();
     std::string getCurrentTimestampNoSpaces();
     void clearFrom(const std::string &from, const std::string &to);

diff --git a/lib/gui/src/ElementBase.cpp b/lib/gui/src/ElementBase.cpp
@@ -110,6 +110,9 @@ void gui::ElementBase::renderAll(bool onScreen)
 
 bool gui::ElementBase::updateAll()
 {
+    if(!m_isEnabled)
+        return false;
+
     if(!isInside())
     {
         if(m_surface != nullptr)
@@ -189,6 +192,9 @@ bool gui::ElementBase::update()
 {
     // algorithme de mise a jour des interactions tactiles
 
+    if(!this->m_isEnabled)
+        return false;
+
     widgetUpdate();
 
     if (!m_hasEvents && widgetPressed != this)

diff --git a/lib/tasks/src/standby.cpp b/lib/tasks/src/standby.cpp
@@ -81,6 +81,12 @@ namespace StandbyMode
         graphics::setBrightness(0);
         StandbyMode::savePower();
 
+        while(AppManager::isAnyVisibleApp())
+        {
+            AppManager::appStack[AppManager::appStack.size() - 1]->kill();
+            AppManager::appStack.pop_back();
+        }
+
         while (hardware::getHomeButton());
         while (!hardware::getHomeButton() && !AppManager::isAnyVisibleApp() && millis() - sleepTime > lastTrigger)
         {