j.marmier/stw24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start on driver view screen

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-05-05 16:41:52 +02:00
parent 49cc898b8c
commit 243577fdcc
4 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendApplicationBase.hpp
View File

@ -17,12 +17,9 @@ public:
virtual void changeToStartScreen() virtual void changeToStartScreen()
{ {
gotoMissionSelectScreenNoTransition(); gotoDriverViewScreenNoTransition();
} }
// MissionSelect
void gotoMissionSelectScreenNoTransition();
// AMI // AMI
void gotoAMIScreenNoTransition(); void gotoAMIScreenNoTransition();
@ -40,9 +37,6 @@ protected:
FrontendHeap& frontendHeap; FrontendHeap& frontendHeap;
Model& model; Model& model;
// MissionSelect
void gotoMissionSelectScreenNoTransitionImpl();
// AMI // AMI
void gotoAMIScreenNoTransitionImpl(); void gotoAMIScreenNoTransitionImpl();

2
TouchGFX/generated/gui_generated/include/gui_generated/common/FrontendHeapBase.hpp
View File

@ -89,7 +89,7 @@ public:
virtual void gotoStartScreen(FrontendApplication& app) virtual void gotoStartScreen(FrontendApplication& app)
{ {
app.gotoMissionSelectScreenNoTransition(); app.gotoDriverViewScreenNoTransition();
} }
protected: protected:
FrontendHeapBase(touchgfx::AbstractPartition& presenters, touchgfx::AbstractPartition& views, touchgfx::AbstractPartition& transitions, FrontendApplication& app) FrontendHeapBase(touchgfx::AbstractPartition& presenters, touchgfx::AbstractPartition& views, touchgfx::AbstractPartition& transitions, FrontendApplication& app)

13
TouchGFX/generated/gui_generated/src/common/FrontendApplicationBase.cpp
View File

@ -37,19 +37,6 @@ FrontendApplicationBase::FrontendApplicationBase(Model& m, FrontendHeap& heap)
* Screen Transition Declarations * Screen Transition Declarations
*/ */
// MissionSelect
void FrontendApplicationBase::gotoMissionSelectScreenNoTransition()
{
transitionCallback = touchgfx::Callback<FrontendApplicationBase>(this, &FrontendApplication::gotoMissionSelectScreenNoTransitionImpl);
pendingScreenTransitionCallback = &transitionCallback;
}
void FrontendApplicationBase::gotoMissionSelectScreenNoTransitionImpl()
{
touchgfx::makeTransition<MissionSelectView, MissionSelectPresenter, touchgfx::NoTransition, Model >(&currentScreen, &currentPresenter, frontendHeap, &currentTransition, &model);
}
// AMI // AMI
void FrontendApplicationBase::gotoAMIScreenNoTransition() void FrontendApplicationBase::gotoAMIScreenNoTransition()

2
TouchGFX/steering-wheel.touchgfx
View File

@ -1305,7 +1305,7 @@
"Height": 480 "Height": 480
}, },
"SelectedColorDepth": 16, "SelectedColorDepth": 16,
"StartupScreenName": "MissionSelect", "StartupScreenName": "DriverView",
"SelectedStartupLanguage": "GB", "SelectedStartupLanguage": "GB",
"TouchGfxPath": "../Middlewares/ST/touchgfx", "TouchGfxPath": "../Middlewares/ST/touchgfx",
"UIPath": ".", "UIPath": ".",