Skip to content

bug fixes #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattrwang merged 1 commit into from
Apr 2, 2025
Merged

bug fixes #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NERODevelopment/content/FaultDialog.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions NERODevelopment/content/Snake.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,21 @@ Rectangle {
}
}

Keys.onLeftPressed: {
snakeController.leftButtonPressed()
}

Keys.onRightPressed: {
snakeController.rightButtonPressed()
}

Keys.onUpPressed: {
snakeController.upButtonPressed()
}

Keys.onDownPressed: {
snakeController.downButtonPressed()
}

ListModel {
id: snakeModel
Expand Down
3 changes: 2 additions & 1 deletion NERODevelopment/src/controllers/navigationcontroller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion NERODevelopment/src/utils/data_type_names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down