Merge pull request #136 from Northeastern-Electric-Racing/removing-sc…

…reens removed unnecessary screens
Northeastern-Electric-Racing · Jan 21, 2025 · 1bac6c0 · 1bac6c0
2 parents c044fc9 + 4107605
commit 1bac6c0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/NERODevelopment/content/HomeMenuItem.qml b/NERODevelopment/content/HomeMenuItem.qml
@@ -12,8 +12,8 @@ Rectangle {
 
     LabelText {
         id: label
-        padding: 8
-        font.pixelSize: 12
+        padding: 10
+        font.pixelSize: 15
         text: parent.text
     }
 }
diff --git a/NERODevelopment/content/NavigationController.qml b/NERODevelopment/content/NavigationController.qml
@@ -7,15 +7,15 @@ Item {
     focus: !navigation.isSelected
     property int selectedPageIndex: navigationController.selectedPageIndex
     property bool isSelected: navigationController.isSelected
-    property int exitPageIndex: 8
+    property int exitPageIndex: 6
     property int offPageIndex: 0
     property int pitPageIndex: 1
     property int speedPageIndex: 2
     property int efficiencyPageIndex: 3
-    property int debugPageIndex: 4
-    property int configurationPageIndex: 5
-    property int flappyPageIndex: 6
-    property int snakePageIndex: 7
+    // property int debugPageIndex: 4
+    // property int configurationPageIndex: 5
+    property int flappyPageIndex: 4
+    property int snakePageIndex: 5
 
     Keys.onPressed: event => {
                         console.log(navigationController.isSelected,
@@ -75,15 +75,15 @@ Item {
             text: "Efficiency"
         }
 
-        HomeMenuItem {
-            highlighted: selectedPageIndex === debugPageIndex
-            text: "Debug"
-        }
+        // HomeMenuItem {
+        //     highlighted: selectedPageIndex === debugPageIndex
+        //     text: "Debug"
+        // }
 
-        HomeMenuItem {
-            highlighted: selectedPageIndex === configurationPageIndex
-            text: "Configuration"
-        }
+        // HomeMenuItem {
+        //     highlighted: selectedPageIndex === configurationPageIndex
+        //     text: "Configuration"
+        // }
 
         HomeMenuItem {
             highlighted: selectedPageIndex === flappyPageIndex
@@ -121,15 +121,15 @@ Item {
         focus: selectedPageIndex === efficiencyPageIndex && isSelected
     }
 
-    DebugTable {
-        visible: selectedPageIndex === debugPageIndex && isSelected
-        focus: selectedPageIndex === debugPageIndex && isSelected
-    }
+    // DebugTable {
+    //     visible: selectedPageIndex === debugPageIndex && isSelected
+    //     focus: selectedPageIndex === debugPageIndex && isSelected
+    // }
 
-    Configuration {
-        visible: selectedPageIndex === configurationPageIndex && isSelected
-        isFocused: selectedPageIndex === configurationPageIndex && isSelected
-    }
+    // Configuration {
+    //     visible: selectedPageIndex === configurationPageIndex && isSelected
+    //     isFocused: selectedPageIndex === configurationPageIndex && isSelected
+    // }
 
     FlappyBird {
         visible: selectedPageIndex === flappyPageIndex && isSelected

diff --git a/NERODevelopment/src/controllers/flappybirdcontroller.cpp b/NERODevelopment/src/controllers/flappybirdcontroller.cpp
@@ -1,7 +1,7 @@
 #include "flappybirdcontroller.h"
 
 FlappyBirdController::FlappyBirdController(Model *model, QObject *parent)
-    : ButtonController{model, 6, parent} {
+    : ButtonController{model, 4, parent} {
   this->m_debounceOffset = 150;
 }
 

diff --git a/NERODevelopment/src/controllers/snakecontroller.cpp b/NERODevelopment/src/controllers/snakecontroller.cpp
@@ -1,7 +1,7 @@
 #include "snakecontroller.h"
 
 SnakeController::SnakeController(Model *model, QObject *parent)
-    : ButtonController{model, 7, parent} {}
+    : ButtonController{model, 5, parent} {}
 
 void SnakeController::handleKeyPress(int key) {
   int newDirection = m_currentDirection;