From 5d3caec44020e46b9d6959d031d4f8a4cb300ef6 Mon Sep 17 00:00:00 2001
From: Jason Wen <haibin.wen3@gmail.com>
Date: Thu, 8 Jun 2023 12:31:20 -0400
Subject: [PATCH] ui: move Error Troubleshoot to Device menu (#102)

---
 selfdrive/ui/qt/offroad/settings.cc            | 15 +++++++++++++++
 selfdrive/ui/qt/offroad/sunnypilot_settings.cc | 18 ------------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
index be4080925e..54e4fb4080 100644
--- a/selfdrive/ui/qt/offroad/settings.cc
+++ b/selfdrive/ui/qt/offroad/settings.cc
@@ -6,6 +6,8 @@
 
 #include <QDebug>
 #include <QFile>
+#include <QFileInfo>
+#include <QDateTime>
 
 #include "selfdrive/ui/qt/offroad/networking.h"
 
@@ -187,6 +189,19 @@ DevicePanel::DevicePanel(SettingsWindow *parent) : ListWidget(parent) {
   QString pin = f.readAll();
   addItem(new LabelControl(tr("Fleet Manager PIN"), pin));
 
+  // Error Troubleshoot
+  auto errorBtn = new ButtonControl(
+    tr("Error Troubleshoot"), tr("VIEW"),
+    tr("Display error from the tmux session when an error has occurred from a system process."));
+  QFileInfo file("/data/community/crashes/error.txt");
+  QDateTime modifiedTime = file.lastModified();
+  QString modified_time = modifiedTime.toString("yyyy-MM-dd hh:mm:ss ");
+  connect(errorBtn, &ButtonControl::clicked, [=]() {
+    const std::string txt = util::read_file("/data/community/crashes/error.txt");
+    ConfirmationDialog::rich(modified_time + QString::fromStdString(txt), this);
+  });
+  addItem(errorBtn);
+
   // offroad-only buttons
 
   auto dcamBtn = new ButtonControl(tr("Driver Camera"), tr("PREVIEW"),
diff --git a/selfdrive/ui/qt/offroad/sunnypilot_settings.cc b/selfdrive/ui/qt/offroad/sunnypilot_settings.cc
index 3f2e52a156..fb9980c1c4 100644
--- a/selfdrive/ui/qt/offroad/sunnypilot_settings.cc
+++ b/selfdrive/ui/qt/offroad/sunnypilot_settings.cc
@@ -3,8 +3,6 @@
 #include <iostream>
 #include <thread>
 #include <chrono>
-#include <QFileInfo>
-#include <QDateTime>
 
 #include "common/watchdog.h"
 #include "selfdrive/ui/qt/api.h"
@@ -86,22 +84,6 @@ SPGeneralPanel::SPGeneralPanel(QWidget *parent) : QWidget(parent) {
     "../assets/offroad/icon_network.png"
   ));
 
-  // General: Error Troubleshoot
-  auto errorBtn = new ButtonControl(
-    tr("Error Troubleshoot"),
-    tr("VIEW"),
-    tr("Display error from the tmux session when an error has occurred from a system process.")
-  );
-  QFileInfo file("/data/community/crashes/error.txt");
-  QDateTime modifiedTime = file.lastModified();
-  QString modified_time = modifiedTime.toString("yyyy-MM-dd hh:mm:ss ");
-  connect(errorBtn, &ButtonControl::clicked, [=]() {
-    const std::string txt = util::read_file("/data/community/crashes/error.txt");
-    ConfirmationDialog::rich(modified_time + QString::fromStdString(txt), this);
-  });
-  main_layout->addWidget(horizontal_line());
-  main_layout->addWidget(errorBtn);
-
   // General: Debug snapshot on screen center tap
   main_layout->addWidget(horizontal_line());
   main_layout->addWidget(new ParamControl(