Auto stash before merge of "dev" and "origin/dev"

FSLART · Aug 30, 2024 · c7407b1 · c7407b1
1 parent 490121f
commit c7407b1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -24,6 +24,7 @@
 #include <QTranslator>
 //static store* store_ref;
 //void check_menu(int i);
+#include<QMessageBox>
 
 //VoidsterdebugWindow debugWindow;
 //PilotWindow pl;
@@ -54,9 +55,14 @@ int main(int argc, char *argv[]){
 
     //PilotWindow pl;
     //pl.show();
+    QMessageBox *msgBox = new QMessageBox(QMessageBox::Warning, "ERRO", "bateria baixa !!!", QMessageBox::NoButton);
+    msgBox->setStandardButtons(QMessageBox::NoButton);
+    msgBox->show();
     MainWindow m;
     m.show();
+   //QMessageBox::information(nullptr, "ERRO", "bateria baixa !!!");
 
+    msgBox->close();
 
  //   VoidsterdebugWindow debugWindow;
  //   debugWindow.show();

diff --git a/src/store.cpp b/src/store.cpp
@@ -413,10 +413,18 @@ void store::parseBson(std::vector<std::uint8_t> v){
                 this->setLV_Soc(t.decoded);
             }
             if(j.contains(BSON_MOTORTEMPERATURE)){
-               // EncodingUnion t;
-               // t.encoded=j[BSON_MOTORTEMPERATURE];
-               // this->setmotorTemperature(t.decoded);
                 this->setmotorTemperature(j[BSON_MOTORTEMPERATURE]);
+                if(j[BSON_MOTORTEMPERATURE]>= 75 && error_map.find("Motor temperature warning") != error_map.end()){
+                    error_map["Motor temperature warning"] = j[BSON_MOTORTEMPERATURE];
+                    scribeError("Motor temperature warning",WARNING);
+                }
+                else{
+                    if(error_map.find("Motor temperature warning") == error_map.end()){
+                        error_map.erase("Motor temperature warning");
+                    }
+
+                }
+
             }
             if(j.contains(BSON_MAX_CELL_TEMP)){
                // EncodingUnion t;

diff --git a/src/store.h b/src/store.h
@@ -262,11 +262,13 @@ class store: public QObject{
 			int m_lapTime=0;
 			short m_lapCount=0;
 			short m_highVoltage=0; 
-                        int page = 0;
-                        int m_battery_voltage = 0;
-                        int m_min_cell_voltage = 0;
-                        int m_max_cell_voltage = 0;
+            int page = 0;
+            int m_battery_voltage = 0;
+            int m_min_cell_voltage = 0;
+            int m_max_cell_voltage = 0;
 			//int m_tyreTemperature=0;
+            std::unordered_map<string, int> error_map;
+
 		#endif