Welcome refactoring

bitmaps.c

@@ -301,6 +301,7 @@ const uint8_t BITMAP_compand[6] =
     0b00100100
 };
 
+/*
 const uint8_t BITMAP_Ready[7] =
 {
     0b00001000,
@@ -322,6 +323,7 @@ const uint8_t BITMAP_NotReady[7] =
     0b01000010,
     0b00000000,
 };
+*/
 
 const uint8_t BITMAP_PowerUser[3] =
 {   // 'arrow' symbol

bitmaps.h

@@ -26,8 +26,11 @@ extern const uint8_t gFontHold[2][5];
 extern const uint8_t BITMAP_BatteryLevel[2];
 extern const uint8_t BITMAP_BatteryLevel1[17];
 extern const uint8_t BITMAP_USB_C[9];
+
+/*
 extern const uint8_t BITMAP_Ready[7];
 extern const uint8_t BITMAP_NotReady[7];
+*/
 
 #ifdef ENABLE_VOX
     extern const uint8_t gFontVox[2][6];

compile-with-docker.sh

@@ -12,6 +12,18 @@ custom() {
         && cp f4hwn.custom* compiled-firmware/"
 }
 
+standard() {
+    echo "Standard compilation..."
+    docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make -s \
+        ENABLE_SPECTRUM=0 \
+        ENABLE_FMRADIO=0 \
+        ENABLE_AIRCOPY=0 \
+        ENABLE_NOAA=0 \
+        EDITION_STRING=Standard \
+        TARGET=f4hwn.standard \
+        && cp f4hwn.standard* compiled-firmware/"
+}
+
 bandscope() {
     echo "Bandscope compilation..."
     docker run --rm -v "${PWD}/compiled-firmware/:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "rm ./compiled-firmware/*; cd /app && make -s \
@@ -57,18 +69,6 @@ voxless() {
         && cp f4hwn.voxless* compiled-firmware/"
 }
 
-standard() {
-    echo "Standard compilation..."
-    docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \
-        ENABLE_SPECTRUM=0 \
-        ENABLE_FMRADIO=0 \
-        ENABLE_AIRCOPY=0 \
-        ENABLE_NOAA=0 \
-        EDITION_STRING=Standard \
-        TARGET=f4hwn.standard \
-        && cp f4hwn.standard* compiled-firmware/"
-}
-
 rescueops() {
     echo "RescueOps compilation..."
     docker run --rm -v "${PWD}/compiled-firmware:/app/compiled-firmware" $IMAGE_NAME /bin/bash -c "cd /app && make -s \
@@ -86,6 +86,9 @@ case "$1" in
     custom)
         custom
         ;;
+    standard)
+        standard
+        ;;
     bandscope)
         bandscope
         ;;
@@ -95,9 +98,6 @@ case "$1" in
     voxless)
         voxless
         ;;
-    standard)
-        standard
-        ;;
     rescueops)
         rescueops
         ;;
@@ -105,7 +105,6 @@ case "$1" in
         bandscope
         broadcast
         voxless
-        standard
         rescueops
         ;;
     *)

ui/welcome.c

@@ -48,6 +48,7 @@ void UI_DisplayWelcome(void)
     char WelcomeString0[16];
     char WelcomeString1[16];
     char WelcomeString2[16];
+    char WelcomeString3[20];
 
     memset(gStatusLine,  0, sizeof(gStatusLine));
 
@@ -129,6 +130,10 @@ void UI_DisplayWelcome(void)
         }
 
 
+        sprintf(WelcomeString3, "%s Edition", Edition);
+        UI_PrintStringSmallNormal(WelcomeString3, 0, 127, 6);
+
+        /*
         #ifdef ENABLE_FEAT_F4HWN_MENU_LOCK
             #if ENABLE_FEAT_F4HWN_MENU_LOCK > 1
                 UI_PrintStringSmallNormal(Edition, 18, 0, 6);
@@ -158,6 +163,7 @@ void UI_DisplayWelcome(void)
             UI_PrintStringSmallNormal(Edition, 18, 0, 6);
             memcpy(gFrameBuffer[6] + 103, BITMAP_Ready, sizeof(BITMAP_Ready));                    
         #endif
+        */
 
         /*
         #ifdef ENABLE_SPECTRUM