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

Make simulator compile

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-05-23 02:51:40 +02:00
parent 2347b738c5
commit 5a56ce394f
9 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TouchGFX/App/app_touchgfx.c
View File

@ -33,7 +33,9 @@
/* USER CODE BEGIN PD */
// Redefine here so it doesn't get overwritten on code generation
#undef TOUCHGFX_STACK_SIZE
#define TOUCHGFX_STACK_SIZE (8160)
#undef TOUCHGFX_BYTE_POOL_SIZE
#define TOUCHGFX_BYTE_POOL_SIZE (8192)
/* USER CODE END PD */

2
TouchGFX/config/gcc/app.mk
View File

@ -5,4 +5,4 @@ touchgfx_path := ../Middlewares/ST/touchgfx
# Location of the TouchGFX Environment
touchgfx_env := C:/TouchGFX/4.21.2/env
# Optional additional compiler flags
user_cflags := -DUSE_BPP=16
user_cflags := -DUSE_BPP=16 -std=gnu++1z -Wno-cast-qual -Wno-missing-declarations

2
TouchGFX/gui/src/driverview_screen/DriverViewView.cpp
View File

@ -59,7 +59,7 @@ void DriverViewView::tearDownScreen() { DriverViewViewBase::tearDownScreen(); }
void DriverViewView::fieldTypeSelectionUpdateItem(
DriverViewFieldSelection &item, int16_t itemIndex) {
item.setName(dataFieldDescs[itemIndex].title);
item.setSelected(itemIndex == selectedFieldType);
item.setSelected(itemIndex == (int)selectedFieldType);
}
void DriverViewView::setFieldType(size_t i, DataFieldType type) {

2
TouchGFX/gui/src/vehicleconfig_screen/VehicleConfigView.cpp
View File

@ -92,7 +92,7 @@ void VehicleConfigView::updateSelectedParam(int select) {
}
if (firstWanted < 0) {
firstWanted = 0;
} else if (firstWanted > ParamType_COUNT - 1) {
} else if (firstWanted > (int16_t)(ParamType_COUNT - 1)) {
firstWanted = ParamType_COUNT - 1;
}
params.animateToItem(firstWanted, 0);

2
TouchGFX/steering-wheel.touchgfx
View File

@ -1542,10 +1542,12 @@
}
},
"GenerateAssetsCommand": "make -f simulator/gcc/Makefile assets -j8",
"GenerateAssetsCommandOverride": "make -f simulator/gcc/Makefile assets -j2",
"PostGenerateCommand": "touchgfx update_project --project-file=simulator/msvs/Application.vcxproj",
"PostGenerateTargetCommand": "touchgfx update_project",
"PostGenerateTargetCommandOverride": "",
"CompileSimulatorCommand": "make -f simulator/gcc/Makefile -j8",
"CompileSimulatorCommandOverride": "make -f simulator/gcc/Makefile -j2",
"RunSimulatorCommand": "build\\bin\\simulator.exe",
"LandscapeSkinX": 0,
"LandscapeSkinY": 0,