From 1d24fe93cc74eabe97ee7a27dd84291e1be77c5c Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 11 Apr 2021 16:21:11 +0200
Subject: [PATCH 1/4] Cosmetics

---
 radio/src/gui/screenshot.cpp   | 2 +-
 radio/src/thirdparty/libopenui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/radio/src/gui/screenshot.cpp b/radio/src/gui/screenshot.cpp
index 32312dab5..1cd5d00c4 100644
--- a/radio/src/gui/screenshot.cpp
+++ b/radio/src/gui/screenshot.cpp
@@ -80,7 +80,7 @@ const char * writeScreenshot()
 #if defined(COLORLCD)
   for (int y = LCD_H - 1; y >= 0; y--) {
     for (int x = 0; x < LCD_W; x++) {
-      pixel_t pixel = *lcd->getPixelPtr(x, y);
+      auto pixel = *lcd->getPixelPtr(x, y);
       uint32_t dst = (0xFF << 24) + (GET_RED(pixel) << 16) + (GET_GREEN(pixel) << 8) + (GET_BLUE(pixel) << 0);
       if (f_write(&bmpFile, &dst, sizeof(dst), &written) != FR_OK || written != sizeof(dst)) {
         f_close(&bmpFile);
diff --git a/radio/src/thirdparty/libopenui b/radio/src/thirdparty/libopenui
index 9f0cff2c9..1164767d5 160000
--- a/radio/src/thirdparty/libopenui
+++ b/radio/src/thirdparty/libopenui
@@ -1 +1 @@
-Subproject commit 9f0cff2c987974c487565ba908199918d25a5b2f
+Subproject commit 1164767d532ca63c55db1071d4d940b0d5a97de2

From de708036a7d9759c8ae87077c54b37a6fe622f3d Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 12 Apr 2021 12:22:37 +0200
Subject: [PATCH 2/4] try to fix bootloader deps

---
 radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
index 3ebc31c5f..c36501c3b 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
+++ b/radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
@@ -162,7 +162,7 @@ set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -nostartfiles -lm -T${RADIO_SRC
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --specs=nano.specs")
 
 add_executable(bootloader ${BOOTLOADER_SRC})
-add_dependencies(bootloader ${BITMAPS_TARGET})
+add_dependencies(bootloader ${BITMAPS_TARGET} radio_translations)
 
 add_custom_command(
   TARGET bootloader POST_BUILD

From aff05adb44e209f604d63a154f6f326436ff2c54 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 12 Apr 2021 15:45:06 +0200
Subject: [PATCH 3/4] Try runners on COLORLCD

---
 .github/workflows/actions.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .github/workflows/actions.yml

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
new file mode 100644
index 000000000..564cd6599
--- /dev/null
+++ b/.github/workflows/actions.yml
@@ -0,0 +1,25 @@
+name: OpenTX Commit Tests
+on:
+  push:
+    branches: [ 2.4 ]
+  pull_request:
+    branches: [ 2.4 ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      COMMIT_TEST_IMAGE: ghcr.io/raphaelcoeffic/opentx-commit-tests
+    steps:
+      -
+        name: Check out the repo
+        uses: actions/checkout@v2
+      -
+        name: Test COLORLCD
+        uses: docker://${{ env.COMMIT_TEST_IMAGE }}
+        with:
+          volumes:
+            - ${{ GITHUB_WORKSPACE }}:/src
+        run: |
+          cd /src
+          FLAVOR=COLORLCD ./tools/commit-tests.sh

From e1209202ceab25dd98eaf24caca3c035e7b69889 Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Mon, 12 Apr 2021 16:02:20 +0200
Subject: [PATCH 4/4] Revert "Try runners on COLORLCD"

This reverts commit aff05adb44e209f604d63a154f6f326436ff2c54.
---
 .github/workflows/actions.yml | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 .github/workflows/actions.yml

diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
deleted file mode 100644
index 564cd6599..000000000
--- a/.github/workflows/actions.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: OpenTX Commit Tests
-on:
-  push:
-    branches: [ 2.4 ]
-  pull_request:
-    branches: [ 2.4 ]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    env:
-      COMMIT_TEST_IMAGE: ghcr.io/raphaelcoeffic/opentx-commit-tests
-    steps:
-      -
-        name: Check out the repo
-        uses: actions/checkout@v2
-      -
-        name: Test COLORLCD
-        uses: docker://${{ env.COMMIT_TEST_IMAGE }}
-        with:
-          volumes:
-            - ${{ GITHUB_WORKSPACE }}:/src
-        run: |
-          cd /src
-          FLAVOR=COLORLCD ./tools/commit-tests.sh