Fix for issue "Suspend causes oxide to crash on RM2 #113" (#114)

* Fix for issue "Suspend causes oxide to crash on RM2 #113" Co-authored-by: Piotr Witoslawski <[email protected]>
Eeems-Org · Jan 7, 2021 · 49c1716 · 49c1716
1 parent 6f3d9a9
commit 49c1716
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/applications/system-service/screenapi.h b/applications/system-service/screenapi.h
@@ -17,15 +17,13 @@
 #include "stb_image.h"
 #include "stb_image_write.h"
 #include "fb2png.h"
+#include "devicesettings.h"
 
 #define DISPLAYWIDTH 1404
 #define DISPLAYHEIGHT 1872
 #define TEMP_USE_REMARKABLE_DRAW 0x0018
 #define remarkable_color uint16_t
 #define DISPLAYSIZE DISPLAYWIDTH * DISPLAYHEIGHT * sizeof(remarkable_color)
-#define RDISPLAYWIDTH 1408
-#define RDISPLAYHEIGHT 1920
-#define RDISPLAYSIZE RDISPLAYWIDTH * RDISPLAYHEIGHT * sizeof(remarkable_color)
 
 #define screenAPI ScreenAPI::singleton()
 

diff --git a/applications/system-service/systemapi.cpp b/applications/system-service/systemapi.cpp
@@ -1,6 +1,7 @@
 #include "systemapi.h"
 #include "appsapi.h"
 #include "powerapi.h"
+#include "devicesettings.h"
 
 void SystemAPI::PrepareForSleep(bool suspending){
     if(suspending){
@@ -14,10 +15,18 @@ void SystemAPI::PrepareForSleep(bool suspending){
         drawSleepImage();
         qDebug() << "Suspending...";
         buttonHandler->setEnabled(false);
+        if (DeviceSettings::instance().getDeviceType() == DeviceType::RM2) {
+            qDebug() << "Removing module";
+            qDebug() << "Exit code: " << system("rmmod brcmfmac");
+        }
         releaseSleepInhibitors();
     }else{
         inhibitSleep();
         qDebug() << "Resuming...";
+        if (DeviceSettings::instance().getDeviceType() == DeviceType::RM2) {
+            qDebug() << "Inserting module";
+            qDebug() << "Exit code: " << system("modprobe brcmfmac");
+        }
         QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
         if(resumeApp == nullptr){
             resumeApp = appsAPI->getApplication(appsAPI->startupApplication());

diff --git a/applications/system-service/wlan.h b/applications/system-service/wlan.h
@@ -33,12 +33,22 @@ class Wlan : public QObject, public SysObject {
         }
         return "";
     }
+    bool pingIP(std::string ip, const char* port) {
+        return !system(("echo -n > /dev/tcp/" + ip.substr(0, ip.length() - 1) + "/" + port).c_str());
+    }
     bool isConnected(){
         auto ip = exec("ip r | grep " + iface() + " | grep default | awk '{print $3}'");
-        return ip != "" && !system(("echo -n > /dev/tcp/" + ip.substr(0, ip.length() - 1) + "/53").c_str());
+        return ip != "" && (pingIP(ip, "53") || pingIP(ip, "80"));
     }
     int link(){
-        return std::stoi(exec("cat /proc/net/wireless | grep " + iface() + " | awk '{print $3}'"));
+        std::string out = exec("cat /proc/net/wireless | grep " + iface() + " | awk '{print $3}'");
+        try {
+            return std::stoi(out);
+        }
+        catch (const std::invalid_argument& e) {
+            qDebug() << "link failed: " << out.c_str();
+            return 0;
+        }
     }
 signals:
     void BSSAdded(Wlan*, QDBusObjectPath, QVariantMap);

diff --git a/shared/devicesettings.h b/shared/devicesettings.h
@@ -24,5 +24,4 @@ class DeviceSettings{
     const char* getTouchDevicePath() const;
     const char* getTouchEnvSetting() const;
     DeviceType getDeviceType() const;
-
 };