diff --git a/TouchGFX/config/gcc/app.mk b/TouchGFX/config/gcc/app.mk index ab38c45..6a5485a 100644 --- a/TouchGFX/config/gcc/app.mk +++ b/TouchGFX/config/gcc/app.mk @@ -3,6 +3,6 @@ touchgfx_path := ../Middlewares/ST/touchgfx # Location of the TouchGFX Environment -touchgfx_env := ../../../../../TouchGFX/4.22.0/env +touchgfx_env := C:/TouchGFX/4.22.0/env # Optional additional compiler flags user_cflags := -DUSE_BPP=16 -std=gnu++1z -Wno-cast-qual -Wno-missing-declarations -Wno-format-truncation -Wno-unused-variable diff --git a/TouchGFX/generated/gui_generated/src/ami_screen/AMIViewBase.cpp b/TouchGFX/generated/gui_generated/src/ami_screen/AMIViewBase.cpp index 7f37b8f..76fe211 100644 --- a/TouchGFX/generated/gui_generated/src/ami_screen/AMIViewBase.cpp +++ b/TouchGFX/generated/gui_generated/src/ami_screen/AMIViewBase.cpp @@ -21,7 +21,7 @@ AMIViewBase::AMIViewBase() add(logo); currentMission.setPosition(0, 15, 480, 49); - currentMission.setColor(touchgfx::Color::getColorFromRGB(197, 14, 31)); + currentMission.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255)); currentMission.setLinespacing(0); currentMission.setTypedText(touchgfx::TypedText(T_INVALID_HUGE)); add(currentMission); diff --git a/TouchGFX/steering-wheel.touchgfx b/TouchGFX/steering-wheel.touchgfx index ac0362f..bb025b7 100644 --- a/TouchGFX/steering-wheel.touchgfx +++ b/TouchGFX/steering-wheel.touchgfx @@ -218,9 +218,9 @@ "TextId": "Invalid_Huge", "TextRotation": "0", "Color": { - "Red": 197, - "Green": 14, - "Blue": 31 + "Red": 255, + "Green": 255, + "Blue": 255 } }, { @@ -236,7 +236,7 @@ "X": 273, "Y": 103, "Width": 84, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_3MDX", "TextRotation": "0", "Color": { @@ -252,7 +252,7 @@ "X": 273, "Y": 135, "Width": 85, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_JFR7", "TextRotation": "0", "Color": { @@ -332,7 +332,7 @@ "X": 273, "Y": 198, "Width": 129, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_590R", "TextRotation": "0", "Color": { @@ -348,7 +348,7 @@ "X": 273, "Y": 166, "Width": 128, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_Z78U", "TextRotation": "0", "Color": { @@ -636,7 +636,7 @@ "X": 68, "Y": 247, "Width": 255, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_0L75", "TextRotation": "0", "Color": { @@ -652,7 +652,7 @@ "X": 68, "Y": 215, "Width": 273, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_GA13", "TextRotation": "0", "Color": { @@ -732,7 +732,7 @@ "X": 68, "Y": 184, "Width": 259, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_OOU3", "TextRotation": "0", "Color": { @@ -748,7 +748,7 @@ "X": 68, "Y": 152, "Width": 256, - "Height": 24, + "Height": 25, "TextId": "__SingleUse_2FPP", "TextRotation": "0", "Color": {