Feb 25 testing (#83)

* Add Debug Screen * Use Anchors * Use Pit * Debug Nav Controller * hard code visibility * Mock Model * Use White * Set Focus * set defaults * Revert Hard Coding Changes * Connect Mqtt Reception Messsage * Emit Data Change SIgnal * Validate State of Charge * Remove Unecessary Function Call * Remove Unecessary Configs * Update On Button Press As Well
Northeastern-Electric-Racing · Feb 26, 2024 · 7dfe46c · 7dfe46c
1 parent d977a90
commit 7dfe46c
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 18 deletions.
diff --git a/NERODevelopment/content/App.qml b/NERODevelopment/content/App.qml
@@ -1,6 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
-
 import QtQuick 6.2
 import NERO
 
@@ -12,10 +11,9 @@ Window {
     visible: true
     title: "NERO"
     FontLoader {
-            id: webFont
-            source: "fonts/Roboto-Black.ttf"
-        }
+        id: webFont
+        source: "fonts/Roboto-Black.ttf"
+    }
 
     NavigationController {}
 }
-
diff --git a/NERODevelopment/content/HomeMenuItem.qml b/NERODevelopment/content/HomeMenuItem.qml
@@ -6,7 +6,7 @@ Rectangle {
     color: 'transparent'
     border.width: highlighted ? 2 : 1
 
-    border.color: highlighted ? "lightsteelblue" : "transparent"
+    border.color: highlighted ? "white" : "transparent"
     height: label.implicitHeight
     width: parent.width
 

diff --git a/NERODevelopment/content/NavigationController.qml b/NERODevelopment/content/NavigationController.qml
@@ -3,8 +3,7 @@ import NERO
 
 Item {
     id: navigation
-    width: parent.width
-    height: parent.height
+    anchors.fill: parent
     focus: !isSelected
     property int selectedPageIndex: navigationController.selectedPageIndex
     property bool isSelected: navigationController.isSelected
@@ -35,7 +34,7 @@ Item {
                     }
 
     Column {
-        visible: !isSelected
+        visible: !navigation.isSelected
         anchors.fill: parent
         anchors.leftMargin: 8
         anchors.rightMargin: 8

diff --git a/NERODevelopment/content/Pit.qml b/NERODevelopment/content/Pit.qml
@@ -19,8 +19,6 @@ Rectangle {
     property int iconWidth: 40
     property int iconHeight: 90
     property int labelVerticalSpacing: 10
-    width: 800
-    height: 480
     color: 'black'
 
     RowLayout {

diff --git a/NERODevelopment/src/controllers/debugtablecontroller.cpp b/NERODevelopment/src/controllers/debugtablecontroller.cpp
@@ -68,6 +68,7 @@ void DebugTableController::downButtonPressed() {
   if (this->m_scrollingTopics) {
     if (this->m_selectedTopicsIndex < this->m_topics.length() - 1) {
       this->setSelectedTopicsIndex(this->m_selectedTopicsIndex + 1);
+      this->update();
     }
   } else {
     if (this->m_selectedValuesIndex < this->m_selectedValues.length() - 1) {
@@ -82,6 +83,7 @@ void DebugTableController::upButtonPressed() {
   if (this->m_scrollingTopics) {
     if (this->m_selectedTopicsIndex != 0) {
       this->setSelectedTopicsIndex(this->m_selectedTopicsIndex - 1);
+      this->update();
     }
   } else {
     if (this->m_selectedValuesIndex != 0) {

diff --git a/NERODevelopment/src/controllers/navigationcontroller.h b/NERODevelopment/src/controllers/navigationcontroller.h
@@ -30,8 +30,8 @@ public slots:
   void homeButtonPressed() override;
 
 private:
-  bool m_isSelected;
-  int m_selectedPageIndex;
+  bool m_isSelected = false;
+  int m_selectedPageIndex = 0;
   int m_numPages = 3;
 };
 

diff --git a/NERODevelopment/src/controllers/offviewcontroller.h b/NERODevelopment/src/controllers/offviewcontroller.h
@@ -80,8 +80,8 @@ public slots:
   float m_packTemp;
   float m_motorTemp;
   float m_stateOfCharge;
-  int m_selectedFlowIndex;
-  bool m_didSelect;
+  int m_selectedFlowIndex = 0;
+  bool m_didSelect = 0;
   QString m_selectedName;
   QString m_selectedDescription;
   QString m_selectedUrl;

diff --git a/NERODevelopment/src/main.cpp b/NERODevelopment/src/main.cpp
@@ -30,6 +30,7 @@ int main(int argc, char *argv[]) {
 
   if (osName == "raspberrypi-sta") {
     model = new RaspberryModel;
+    model->connectToMQTT();
   } else {
     model = new MockModel;
   }
@@ -54,7 +55,6 @@ int main(int argc, char *argv[]) {
       },
       Qt::QueuedConnection);
 
-  engine.rootContext()->setContextProperty("model", model);
   engine.rootContext()->setContextProperty("homeController", &homeController);
   engine.rootContext()->setContextProperty("offViewController",
                                            &offViewController);

diff --git a/NERODevelopment/src/models/mqtt_client.cpp b/NERODevelopment/src/models/mqtt_client.cpp
@@ -63,7 +63,6 @@ void MqttClient::brokerConnected() {
 
 void MqttClient::receiveMessage(const QByteArray &message,
                                 const QMqttTopicName &topic) {
-
   serverdata::ServerData serverData;
 
   bool success = m_serializer.deserialize(&serverData, message);

diff --git a/NERODevelopment/src/models/raspberry_model.cpp b/NERODevelopment/src/models/raspberry_model.cpp
@@ -28,6 +28,7 @@ void RaspberryModel::connectToMQTT() {
 void RaspberryModel::receiveServerData(const serverdata::ServerData data,
                                        const QString topic) {
   this->currentData[topic] = DataInfo(topic, data.unit(), data.values());
+  emit this->onCurrentDataChange();
 }
 
 std::optional<float> RaspberryModel::getMph() {

diff --git a/NERODevelopment/src/utils/data_type_names.h b/NERODevelopment/src/utils/data_type_names.h
@@ -7,7 +7,7 @@
 #define DIRECTION "direction"
 #define PACKTEMP "bms/temps/packtemp"
 #define MOTORTEMP "bms/temps/motortemp"
-#define STATEOFCHARGE "stateofcharge"
+#define STATEOFCHARGE "BMS/Pack/SOC"
 #define CURRENT "current"
 #define BALANCINGCELLS "balancingcells"
 #define PACKVOLTAGE "packvoltage"