Fixed ui version bug. (#125)

* Added correct firmware release version to ui. * Fixed rendering bug, where version would pop in and out.
SeedLabs-it · May 10, 2024 · c3d0476 · c3d0476
1 parent cace367
commit c3d0476
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/firmware/src/onboarding_flow/onboarding_flow.cpp b/firmware/src/onboarding_flow/onboarding_flow.cpp
@@ -36,6 +36,12 @@ OnboardingFlow::OnboardingFlow(TFT_eSprite *spr_, TFT_eSprite qrcode_spr_) : spr
         0,
         90,
     };
+
+#ifdef RELEASE_VERSION
+    sprintf(firmware_version, "%s", RELEASE_VERSION);
+#else
+    sprintf(firmware_version, "%s", "DEV");
+#endif
 }
 
 void OnboardingFlow::triggerMotorConfigUpdate()
@@ -563,11 +569,7 @@ TFT_eSprite *OnboardingFlow::renderAboutPage()
     spr_->setTextDatum(CC_DATUM);
     uint8_t left_padding = 30;
 
-#ifdef RELEASE_VERSION
-    sprintf(buf_, "FIRMWARE %s" RELEASE_VERSION);
-#else
-    sprintf(buf_, "FIRMWARE %s", "DEV");
-#endif
+    sprintf(buf_, "FIRMWARE: %s", firmware_version);
     spr_->setFreeFont(&NDS1210pt7b);
     spr_->setTextColor(default_text_color);
     spr_->drawString(buf_, center_h, 85, 1);

diff --git a/firmware/src/onboarding_flow/onboarding_flow.h b/firmware/src/onboarding_flow/onboarding_flow.h
@@ -62,6 +62,8 @@ class OnboardingFlow
     TFT_eSprite *renderDemo1StepPage();
     TFT_eSprite *renderAboutPage();
 
+    char firmware_version[16];
+
     int32_t current_position = 0;
     uint8_t current_page = 0;