From 0e1b430ae9ad2d87fdc3efbf99f6797c1b55df7a Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Fri, 5 Aug 2022 18:43:02 +1000 Subject: [PATCH] chore: Minor cleanup --- .github/workflows/actions.yml | 4 +--- .github/workflows/nightly.yml | 3 +-- radio/src/CMakeLists.txt | 1 - radio/src/targets/common/arm/stm32/stm32_hal_adc.cpp | 2 +- radio/src/targets/taranis/bootloader/boot_menu.cpp | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 6855614e6..388357d5a 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -53,7 +53,6 @@ jobs: - x9lites - xlite - xlites - - commando8 container: image: ghcr.io/edgetx/edgetx-dev:latest volumes: @@ -84,7 +83,7 @@ jobs: - t12 - t16 - t18 - - t8;zorro + - t8;zorro;commando8 - tlite;tpro - tx12;tx12mk2 - tx16s @@ -95,7 +94,6 @@ jobs: - x9e;x9e-hall - x9lite;x9lites - xlite;xlites - - commando8 container: image: ghcr.io/edgetx/edgetx-dev:latest volumes: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e31e90fa8..8e102774e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ jobs: - t12 - t16 - t18 - - t8;zorro + - t8;zorro;commando8 - tlite;tpro - tx12;tx12mk2 - tx16s @@ -32,7 +32,6 @@ jobs: - x9d;x9dp;x9dp2019 - x9lite;x9lites - xlite;xlites - - commando8 container: image: ghcr.io/edgetx/edgetx-dev:latest volumes: diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 7e68d944a..609d78362 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -450,7 +450,6 @@ if(IFLIGHT_RELEASE) add_definitions(-DIFLIGHT_RELEASE) endif() - if(HARDWARE_TRAINER_MULTI) add_definitions(-DHARDWARE_TRAINER_MULTI) endif() diff --git a/radio/src/targets/common/arm/stm32/stm32_hal_adc.cpp b/radio/src/targets/common/arm/stm32/stm32_hal_adc.cpp index 67eaf36bf..90ee371fe 100644 --- a/radio/src/targets/common/arm/stm32/stm32_hal_adc.cpp +++ b/radio/src/targets/common/arm/stm32/stm32_hal_adc.cpp @@ -100,7 +100,7 @@ stm32_hal_adc_channel ADC_MAIN_channels[] = { { ADC_CHANNEL_BATT, ADC_SAMPTIME } #else #if defined(RADIO_T8) || defined(RADIO_TLITE) || defined(RADIO_COMMANDO8) - // fake channels to fill unsused POT1/POT2 + // fake channels to fill unused POT1/POT2 {0, 0}, {0, 0}, #elif defined(PCBX7) || defined(PCBXLITE) diff --git a/radio/src/targets/taranis/bootloader/boot_menu.cpp b/radio/src/targets/taranis/bootloader/boot_menu.cpp index 67372e142..92fc752d4 100644 --- a/radio/src/targets/taranis/bootloader/boot_menu.cpp +++ b/radio/src/targets/taranis/bootloader/boot_menu.cpp @@ -135,4 +135,3 @@ void blExit(void) lcdRefreshWait(); #endif } -