Replace TEST1..4 with ASRI

Core/Inc/params.h

@@ -11,15 +11,15 @@ extern "C" {
 #include "util.h"
 
 CountedEnum(ParamType, size_t, PF_BBAL, PF_SLIPREF, PF_MUMAX, PF_ASRP, PF_ASRON,
-            PF_TEST1, PF_TEST2, PF_TEST3, PF_TEST4);
+            PF_ASRI);
 
 typedef struct {
   float bbal;
   float slipref;
   float mumax;
   unsigned asrp;
+  unsigned asri;
   unsigned asron;
-  unsigned test[4];
 } Params;
 
 extern Params params;

Core/Src/params.c

@@ -23,21 +23,12 @@ void params_inc(ParamType param) {
   case PF_ASRP:
     params.asrp++;
     break;
+  case PF_ASRI:
+    params.asri++;
+    break;
   case PF_ASRON:
     params.asron = 1;
     break;
-  case PF_TEST1:
-    params.test[0]++;
-    break;
-  case PF_TEST2:
-    params.test[1]++;
-    break;
-  case PF_TEST3:
-    params.test[2]++;
-    break;
-  case PF_TEST4:
-    params.test[3]++;
-    break;
   }
 }
 
@@ -64,29 +55,14 @@ void params_dec(ParamType param) {
       params.asrp--;
     }
     break;
+  case PF_ASRI:
+    if (params.asri > 0) {
+      params.asri--;
+    }
+    break;
   case PF_ASRON:
     params.asron = 0;
     break;
-  case PF_TEST1:
-    if (params.test[0] > 0) {
-      params.test[0]--;
-    }
-    break;
-  case PF_TEST2:
-    if (params.test[1] > 0) {
-      params.test[1]--;
-    }
-    break;
-  case PF_TEST3:
-    if (params.test[2] > 0) {
-      params.test[2]--;
-    }
-    break;
-  case PF_TEST4:
-    if (params.test[3] > 0) {
-      params.test[3]--;
-    }
-    break;
   }
 }
 
@@ -105,21 +81,12 @@ void params_broadcast(ParamType param) {
   case PF_ASRP:
     value = params.asrp;
     break;
+  case PF_ASRI:
+    value = params.asri;
+    break;
   case PF_ASRON:
     value = params.asron;
     break;
-  case PF_TEST1:
-    value = params.test[0];
-    break;
-  case PF_TEST2:
-    value = params.test[1];
-    break;
-  case PF_TEST3:
-    value = params.test[2];
-    break;
-  case PF_TEST4:
-    value = params.test[3];
-    break;
   default:
     return;
   }

TouchGFX/config/gcc/app.mk

@@ -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 -std=gnu++1z -Wno-cast-qual -Wno-missing-declarations -Wno-format-truncation
+user_cflags := -DUSE_BPP=16 -std=gnu++1z -Wno-cast-qual -Wno-missing-declarations -Wno-format-truncation -Wno-unused-variable

TouchGFX/gui/src/common/NamedField.cpp

@@ -309,10 +309,7 @@ NamedFieldDescription paramFieldDescs[] = {
     [PF_MUMAX] = {NamedFieldKind::Float, "MUMAX", 2, 1, PARAM_FIELD(mumax)},
     [PF_ASRP] = {NamedFieldKind::Int, "ASR-P", 2, 0, PARAM_FIELD(asrp)},
     [PF_ASRON] = {NamedFieldKind::Int, "ASR-ON", 2, 0, PARAM_FIELD(asron)},
-    [PF_TEST1] = {NamedFieldKind::Int, "TEST1", 2, 0, PARAM_FIELD(test[0])},
+    [PF_ASRI] = {NamedFieldKind::Int, "ASR-I", 2, 0, PARAM_FIELD(asri)},
-    [PF_TEST2] = {NamedFieldKind::Int, "TEST2", 2, 0, PARAM_FIELD(test[1])},
-    [PF_TEST3] = {NamedFieldKind::Int, "TEST3", 2, 0, PARAM_FIELD(test[2])},
-    [PF_TEST4] = {NamedFieldKind::Int, "TEST4", 2, 0, PARAM_FIELD(test[3])},
 };
 
 static_assert(sizeof(paramFieldDescs) / sizeof(paramFieldDescs[0]) ==

TouchGFX/gui/src/driverview_screen/DriverViewPresenter.cpp

@@ -3,6 +3,11 @@
 
 #include "gui/common/NamedField.hpp"
 
+constexpr int32_t SHOW_ERRORS_FOR = 10000; // ms
+
+#ifndef SIMULATOR
+#include "stm32h7xx_hal.h"
+#endif
 #include "vehicle_state.h"
 
 DriverViewPresenter::DriverViewPresenter(DriverViewView &v)
@@ -54,9 +59,15 @@ void DriverViewPresenter::updateProgress() {
 }
 
 void DriverViewPresenter::updateErrorPopup() {
+  static uint32_t last_error = 0;
   if (vehicle_state.ts_state == TS_ERROR) {
     view.showAMSError();
+#ifndef SIMULATOR
+    last_error = HAL_GetTick();
+  } else if (HAL_GetTick() - last_error > SHOW_ERRORS_FOR) {
+#else
   } else {
+#endif
     view.clearErrorPopup();
   }
 }