1.1.6 (and screen layout tweaks)

bin/build-all.sh

@@ -66,9 +66,9 @@ function do_build() {
 }
 
 function do_boards() {
-	BOARDS=$1
+	declare boards=$1
-	isNrf=$2
+	declare isNrf=$2
-	for board in $BOARDS; do
+	for board in $boards; do
 		for country in $COUNTRIES; do 
 		    do_build $board $country "$isNrf"   
 		done
@@ -84,8 +84,8 @@ git submodule update
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
 platformio lib update 
 
-do_boards $BOARDS_ESP32 "false"
+do_boards "$BOARDS_ESP32" "false"
-do_boards $BOARDS_NRF52 "true"
+do_boards "$BOARDS_NRF52" "true"
 
 # keep the bins in archive also
 cp $OUTDIR/bins/firmware* $OUTDIR/elfs/firmware* $OUTDIR/bins/universal/firmware* $OUTDIR/elfs/universal/firmware* $ARCHIVEDIR

bin/version.sh

@@ -1,3 +1,3 @@
 
 
-export VERSION=1.1.5
+export VERSION=1.1.6

src/graphics/Screen.cpp

@@ -92,9 +92,8 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     // needs to be drawn relative to x and y
 
     // draw centered left to right and centered above the one line of app text
-    display->drawXbm(x + (SCREEN_WIDTH - icon_width) / 2, 
+    display->drawXbm(x + (SCREEN_WIDTH - icon_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - icon_height) / 2 + 2,
-                    y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - icon_height) / 2 + 2,
+                     icon_width, icon_height, (const uint8_t *)icon_bits);
-                    icon_width, icon_height, (const uint8_t *)icon_bits);
 
     display->setFont(FONT_MEDIUM);
     display->setTextAlignment(TEXT_ALIGN_LEFT);