From f628044c08c513978ced9b82eab9820b9fdd7caa Mon Sep 17 00:00:00 2001 From: mattrwang Date: Thu, 27 Mar 2025 20:11:03 -0400 Subject: [PATCH] bug fixes --- NERODevelopment/content/FaultDialog.qml | 2 +- NERODevelopment/content/Snake.qml | 14 ++++++++++++++ .../src/controllers/navigationcontroller.cpp | 3 ++- NERODevelopment/src/utils/data_type_names.h | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/NERODevelopment/content/FaultDialog.qml b/NERODevelopment/content/FaultDialog.qml index c0437e7..f12706b 100644 --- a/NERODevelopment/content/FaultDialog.qml +++ b/NERODevelopment/content/FaultDialog.qml @@ -6,7 +6,7 @@ Popup { id: modal property int dimension: 500 property int offset: (modal.width * .02) - focus: true + focus: false modal: true width: dimension * 2 height: dimension diff --git a/NERODevelopment/content/Snake.qml b/NERODevelopment/content/Snake.qml index fbd096a..942fad8 100644 --- a/NERODevelopment/content/Snake.qml +++ b/NERODevelopment/content/Snake.qml @@ -156,7 +156,21 @@ Rectangle { } } + Keys.onLeftPressed: { + snakeController.leftButtonPressed() + } + + Keys.onRightPressed: { + snakeController.rightButtonPressed() + } + Keys.onUpPressed: { + snakeController.upButtonPressed() + } + + Keys.onDownPressed: { + snakeController.downButtonPressed() + } ListModel { id: snakeModel diff --git a/NERODevelopment/src/controllers/navigationcontroller.cpp b/NERODevelopment/src/controllers/navigationcontroller.cpp index 8afffe6..6044517 100644 --- a/NERODevelopment/src/controllers/navigationcontroller.cpp +++ b/NERODevelopment/src/controllers/navigationcontroller.cpp @@ -68,6 +68,7 @@ void NavigationController::downButtonPressed() { } void NavigationController::upButtonPressed() { + qDebug() << "up"; if (m_gamesSelected) { if (this->m_selectedPageIndex >= this->m_numPages) { this->setSelectedPageIndex(this->m_selectedPageIndex - 1); @@ -96,7 +97,7 @@ void NavigationController::enterButtonPressed() { void NavigationController::homeButtonPressed() { if (m_gamesSelected) { this->setIsGamesOpen(false); - this->setSelectedPageIndex(this->m_numPages - 1); + this->setSelectedPageIndex(this->m_numPages - 2); } this->m_model->currentPageIndex = -1; this->setIsSelected(false); diff --git a/NERODevelopment/src/utils/data_type_names.h b/NERODevelopment/src/utils/data_type_names.h index 06411a6..c0f6f1f 100644 --- a/NERODevelopment/src/utils/data_type_names.h +++ b/NERODevelopment/src/utils/data_type_names.h @@ -52,7 +52,7 @@ #define SEGMENTTEMP2 "segmenttemp2" #define SEGMENTTEMP3 "segmenttemp3" #define SEGMENTTEMP4 "segmenttemp4" -#define TORQUEPOWER "torquepower" +#define TORQUEPOWER "MPU/State/TorqueLimit" #define SIDEBRBS "MPU/Fuses/BRB" #define BMS "MPU/Shutdown/BMS" #define BSPD "MPU/Shutdown/BSPD"