From 243577fdcccf62e2984716499650c16a382d601b Mon Sep 17 00:00:00 2001 From: "Jasper v. Blanckenburg" Date: Fri, 5 May 2023 16:41:52 +0200 Subject: [PATCH] Start on driver view screen --- .../common/FrontendApplicationBase.hpp | 8 +------- .../gui_generated/common/FrontendHeapBase.hpp | 2 +- .../src/common/FrontendApplicationBase.cpp | 13 ------------- TouchGFX/steering-wheel.touchgfx | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendApplicationBase.hpp b/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendApplicationBase.hpp index 83084b9..bde1184 100644 --- a/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendApplicationBase.hpp +++ b/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendApplicationBase.hpp @@ -17,12 +17,9 @@ public: virtual void changeToStartScreen() { - gotoMissionSelectScreenNoTransition(); + gotoDriverViewScreenNoTransition(); } - // MissionSelect - void gotoMissionSelectScreenNoTransition(); - // AMI void gotoAMIScreenNoTransition(); @@ -40,9 +37,6 @@ protected: FrontendHeap& frontendHeap; Model& model; - // MissionSelect - void gotoMissionSelectScreenNoTransitionImpl(); - // AMI void gotoAMIScreenNoTransitionImpl(); diff --git a/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendHeapBase.hpp b/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendHeapBase.hpp index 262645c..d96db7b 100644 --- a/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendHeapBase.hpp +++ b/TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendHeapBase.hpp @@ -89,7 +89,7 @@ public: virtual void gotoStartScreen(FrontendApplication& app) { - app.gotoMissionSelectScreenNoTransition(); + app.gotoDriverViewScreenNoTransition(); } protected: FrontendHeapBase(touchgfx::AbstractPartition& presenters, touchgfx::AbstractPartition& views, touchgfx::AbstractPartition& transitions, FrontendApplication& app) diff --git a/TouchGFX/generated/gui_generated/src/common/FrontendApplicationBase.cpp b/TouchGFX/generated/gui_generated/src/common/FrontendApplicationBase.cpp index 72cdd97..6f22010 100644 --- a/TouchGFX/generated/gui_generated/src/common/FrontendApplicationBase.cpp +++ b/TouchGFX/generated/gui_generated/src/common/FrontendApplicationBase.cpp @@ -37,19 +37,6 @@ FrontendApplicationBase::FrontendApplicationBase(Model& m, FrontendHeap& heap) * Screen Transition Declarations */ -// MissionSelect - -void FrontendApplicationBase::gotoMissionSelectScreenNoTransition() -{ - transitionCallback = touchgfx::Callback(this, &FrontendApplication::gotoMissionSelectScreenNoTransitionImpl); - pendingScreenTransitionCallback = &transitionCallback; -} - -void FrontendApplicationBase::gotoMissionSelectScreenNoTransitionImpl() -{ - touchgfx::makeTransition(¤tScreen, ¤tPresenter, frontendHeap, ¤tTransition, &model); -} - // AMI void FrontendApplicationBase::gotoAMIScreenNoTransition() diff --git a/TouchGFX/steering-wheel.touchgfx b/TouchGFX/steering-wheel.touchgfx index b20313d..210a281 100644 --- a/TouchGFX/steering-wheel.touchgfx +++ b/TouchGFX/steering-wheel.touchgfx @@ -1305,7 +1305,7 @@ "Height": 480 }, "SelectedColorDepth": 16, - "StartupScreenName": "MissionSelect", + "StartupScreenName": "DriverView", "SelectedStartupLanguage": "GB", "TouchGfxPath": "../Middlewares/ST/touchgfx", "UIPath": ".",