From 80e38cc036353a7a0c27da34ffcbd50315ff409b Mon Sep 17 00:00:00 2001
From: Leonard Gies <l.gies@fasttube.de>
Date: Thu, 17 Apr 2025 15:09:24 +0200
Subject: [PATCH] rename backToMissionSelect to canChangeFromMissionSelect

---
 .../gui/include/gui/common/FrontendApplication.hpp   |  6 +++---
 TouchGFX/gui/src/common/FrontendApplication.cpp      | 12 +++++++-----
 .../gui/src/debugview_screen/DebugViewPresenter.cpp  |  6 ++----
 .../missionselect_screen/MissionSelectPresenter.cpp  |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/TouchGFX/gui/include/gui/common/FrontendApplication.hpp b/TouchGFX/gui/include/gui/common/FrontendApplication.hpp
index b611897..2af4e95 100644
--- a/TouchGFX/gui/include/gui/common/FrontendApplication.hpp
+++ b/TouchGFX/gui/include/gui/common/FrontendApplication.hpp
@@ -17,11 +17,11 @@ public:
     model.tick();
   }
 
-  void setBackToMissionSelect(bool backToMissionSelect);
-  bool getBackToMissionSelect() const;
+  void setCanChangeFromMissionSelect(bool canChangeFromMissionSelect);
+  bool getCanChangeFromMissionSelect() const;
 
 private:
-  bool backToMissionSelect;
+  bool canChangeFromMissionSelect;
 };
 
 #endif // FRONTENDAPPLICATION_HPP
diff --git a/TouchGFX/gui/src/common/FrontendApplication.cpp b/TouchGFX/gui/src/common/FrontendApplication.cpp
index 3b3b193..46e1ea1 100644
--- a/TouchGFX/gui/src/common/FrontendApplication.cpp
+++ b/TouchGFX/gui/src/common/FrontendApplication.cpp
@@ -3,14 +3,16 @@
 #include "gui/common/NamedField.hpp"
 
 FrontendApplication::FrontendApplication(Model &m, FrontendHeap &heap)
-    : FrontendApplicationBase(m, heap), backToMissionSelect(false) {
+    : FrontendApplicationBase(m, heap), canChangeFromMissionSelect(false) {
   namedFieldSort();
 }
 
-void FrontendApplication::setBackToMissionSelect(bool backToMissionSelect) {
-  this->backToMissionSelect = backToMissionSelect;
+void FrontendApplication::setCanChangeFromMissionSelect(
+    bool canChangeFromMissionSelect) {
+  this->canChangeFromMissionSelect = canChangeFromMissionSelect;
 }
 
-bool FrontendApplication::getBackToMissionSelect() const {
-  return backToMissionSelect;
+// controls if next screen button works on mission select screen
+bool FrontendApplication::getCanChangeFromMissionSelect() const {
+  return canChangeFromMissionSelect;
 }
diff --git a/TouchGFX/gui/src/debugview_screen/DebugViewPresenter.cpp b/TouchGFX/gui/src/debugview_screen/DebugViewPresenter.cpp
index f19de2e..e328db1 100644
--- a/TouchGFX/gui/src/debugview_screen/DebugViewPresenter.cpp
+++ b/TouchGFX/gui/src/debugview_screen/DebugViewPresenter.cpp
@@ -11,8 +11,6 @@ void DebugViewPresenter::deactivate() {}
 void DebugViewPresenter::vehicleStateUpdated() { view.updateFieldValues(); }
 
 void DebugViewPresenter::nextScreen() {
-  FrontendApplication *app =
-      static_cast<FrontendApplication *>(Application::getInstance());
-  app->setBackToMissionSelect(true);
-  app->gotoMissionSelectScreenNoTransition();
+  static_cast<FrontendApplication *>(Application::getInstance())
+      ->gotoMissionSelectScreenNoTransition();
 }
diff --git a/TouchGFX/gui/src/missionselect_screen/MissionSelectPresenter.cpp b/TouchGFX/gui/src/missionselect_screen/MissionSelectPresenter.cpp
index cd9479d..45ae109 100644
--- a/TouchGFX/gui/src/missionselect_screen/MissionSelectPresenter.cpp
+++ b/TouchGFX/gui/src/missionselect_screen/MissionSelectPresenter.cpp
@@ -18,9 +18,9 @@ void MissionSelectPresenter::deactivate() {}
 void MissionSelectPresenter::vehicleStateUpdated() {
   FrontendApplication *app =
       static_cast<FrontendApplication *>(FrontendApplication::getInstance());
-  if (app->getBackToMissionSelect() &&
-      vehicle_state.active_mission == initialMission) {
-    return;
+  // if screen will be changed, set canChangeFromMissionSelect to true
+  if (vehicle_state.active_mission != initialMission) {
+    app->setCanChangeFromMissionSelect(true);
   }
   switch (vehicle_state.active_mission) {
   case MISSION_NONE:
@@ -37,7 +37,7 @@ void MissionSelectPresenter::vehicleStateUpdated() {
 void MissionSelectPresenter::nextScreen() {
   FrontendApplication *app =
       static_cast<FrontendApplication *>(FrontendApplication::getInstance());
-  if (app->getBackToMissionSelect()) {
+  if (app->getCanChangeFromMissionSelect()) {
     if (vehicle_state.active_mission == MISSION_MANUAL) {
       app->gotoDriverViewScreenNoTransition();
     } else {