Merge pull request commaai#98 from CHaucke89/frog-softreboot-pr

Soft Reboot 2
MoreTore · Feb 21, 2024 · bf62e45 · bf62e45
2 parents 77020c0 + ef86688
commit bf62e45
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 4 deletions.
diff --git a/common/params.cc b/common/params.cc
@@ -261,6 +261,7 @@ std::unordered_map<std::string, uint32_t> keys = {
     {"DisableOnroadUploads", PERSISTENT},
     {"DisableVTSCSmoothing", PERSISTENT},
     {"DisengageVolume", PERSISTENT},
+    {"DoSoftReboot", CLEAR_ON_MANAGER_START},    
     {"DragonPilotTune", PERSISTENT},
     {"DriverCamera", PERSISTENT},
     {"DriveStats", PERSISTENT},

diff --git a/selfdrive/manager/manager.py b/selfdrive/manager/manager.py
@@ -380,7 +380,7 @@ def manager_thread() -> None:
 
     # Exit main loop when uninstall/shutdown/reboot is needed
     shutdown = False
-    for param in ("DoUninstall", "DoShutdown", "DoReboot"):
+    for param in ("DoUninstall", "DoShutdown", "DoReboot", "DoSoftReboot"):
       if params.get_bool(param):
         shutdown = True
         params.put("LastManagerExitReason", f"{param} {datetime.datetime.now()}")
@@ -419,7 +419,9 @@ def main() -> None:
   elif params.get_bool("DoShutdown"):
     cloudlog.warning("shutdown")
     HARDWARE.shutdown()
-
+  elif params.get_bool("DoSoftReboot"):
+    cloudlog.warning("softreboot")
+    HARDWARE.soft_reboot()
 
 if __name__ == "__main__":
   unblock_stdout()

diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
@@ -304,6 +304,11 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) {
   QHBoxLayout *power_layout = new QHBoxLayout();
   power_layout->setSpacing(30);
 
+  QPushButton *softreboot_btn = new QPushButton(tr("Soft Reboot"));
+  softreboot_btn->setObjectName("softreboot_btn");
+  power_layout->addWidget(softreboot_btn);
+  QObject::connect(softreboot_btn, &QPushButton::clicked, this, &DevicePanel::softreboot);
+
   QPushButton *reboot_btn = new QPushButton(tr("Reboot"));
   reboot_btn->setObjectName("reboot_btn");
   power_layout->addWidget(reboot_btn);
@@ -319,8 +324,10 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) {
   }
 
   setStyleSheet(R"(
-    #reboot_btn { height: 120px; border-radius: 15px; background-color: #393939; }
-    #reboot_btn:pressed { background-color: #4a4a4a; }
+    #softreboot_btn { height: 120px; border-radius: 15px; background-color: #e2e22c; }
+    #softreboot_btn:pressed { background-color: #ffe224; }  
+    #reboot_btn { height: 120px; border-radius: 15px; background-color: #e2872c; }
+    #reboot_btn:pressed { background-color: #ff9724; }
     #poweroff_btn { height: 120px; border-radius: 15px; background-color: #E22C2C; }
     #poweroff_btn:pressed { background-color: #FF2424; }
   )");
@@ -364,6 +371,18 @@ void DevicePanel::reboot() {
   }
 }
 
+void DevicePanel::softreboot() {
+  if (!uiState()->engaged()) {
+    if (ConfirmationDialog::confirm(tr("Are you sure you want to soft reboot?"), tr("Soft Reboot"), this)) {
+      if (!uiState()->engaged()) {
+        params.putBool("DoSoftReboot", true);
+      }
+    }
+  } else {
+    ConfirmationDialog::alert(tr("Disengage to Soft Reboot"), this);
+  }
+}
+
 void DevicePanel::poweroff() {
   if (!uiState()->engaged()) {
     if (ConfirmationDialog::confirm(tr("Are you sure you want to power off?"), tr("Power Off"), this)) {

diff --git a/selfdrive/ui/qt/offroad/settings.h b/selfdrive/ui/qt/offroad/settings.h
@@ -56,6 +56,7 @@ class DevicePanel : public ListWidget {
 private slots:
   void poweroff();
   void reboot();
+  void softreboot();
   void updateCalibDescription();
 
 private:

diff --git a/system/hardware/base.h b/system/hardware/base.h
@@ -26,6 +26,7 @@ class HardwareNone {
   }
 
   static void reboot() {}
+  static void soft_reboot() {}
   static void poweroff() {}
   static void set_brightness(int percent) {}
   static void set_display_power(bool on) {}

diff --git a/system/hardware/base.py b/system/hardware/base.py
@@ -30,6 +30,10 @@ def booted(self) -> bool:
   def reboot(self, reason=None):
     pass
 
+  @abstractmethod
+  def soft_reboot(self):
+    pass
+
   @abstractmethod
   def uninstall(self):
     pass

diff --git a/system/hardware/tici/hardware.h b/system/hardware/tici/hardware.h
@@ -50,6 +50,7 @@ class HardwareTici : public HardwareNone {
   }
 
   static void reboot() { std::system("sudo reboot"); }
+  static void soft_reboot() { std::system("sudo systemctl restart comma"); }
   static void poweroff() { std::system("sudo poweroff"); }
   static void set_brightness(int percent) {
     std::string max = util::read_file("/sys/class/backlight/panel0-backlight/max_brightness");

diff --git a/system/hardware/tici/hardware.py b/system/hardware/tici/hardware.py
@@ -134,6 +134,14 @@ def get_sound_card_online(self):
   def reboot(self, reason=None):
     subprocess.check_output(["sudo", "reboot"])
 
+  def soft_reboot(self):
+    # Reload the touchscreen driver to reset touch_count and avoid triggering a system reset prompt
+    sudo_write("894000.i2c", "/sys/bus/platform/drivers/i2c_geni/unbind")
+    time.sleep(0.5)
+    sudo_write("894000.i2c", "/sys/bus/platform/drivers/i2c_geni/bind")
+    time.sleep(0.5)    
+    os.system("sudo systemctl restart comma")
+
   def uninstall(self):
     Path("/data/__system_reset__").touch()
     os.sync()