diff --git a/radio/src/targets/pl18/hal.h b/radio/src/targets/pl18/hal.h index 512a95fa3..0985971e2 100644 --- a/radio/src/targets/pl18/hal.h +++ b/radio/src/targets/pl18/hal.h @@ -305,35 +305,32 @@ #endif #else - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_TH LL_GPIO_PIN_3 // PA.03 #define ADC_GPIO_PIN_STICK_ST LL_GPIO_PIN_2 // PA.02 #define ADC_CHANNEL_STICK_TH LL_ADC_CHANNEL_3 // ADC123_IN3 -> ADC1_IN3 #define ADC_CHANNEL_STICK_ST LL_ADC_CHANNEL_2 // ADC123_IN2 -> ADC1_IN2 // #define ADC_GPIO_PIN_SWA LL_GPIO_PIN_1 //PC.01 - #define ADC_GPIO_EXT2 GPIOC // #define ADC_GPIO_PIN_SWB LL_GPIO_PIN_0 //PC.00 // #define ADC_CHANNEL_SWA LL_ADC_CHANNEL_11 // ADC123_IN11 -> ADC1_IN11 // #define ADC_CHANNEL_SWB LL_ADC_CHANNEL_10 // ADC123_IN10 -> ADC1_IN10 - #define ADC_GPIO_PIN_POT1 LL_GPIO_PIN_7 // PA.07 - #define ADC_GPIO_PIN_POT2 LL_GPIO_PIN_2 // PC.02 + #define ADC_GPIO_EXT1 GPIOC + #define ADC_GPIO_PIN_POT1 LL_GPIO_PIN_2 // PC.02 + #define ADC_GPIO_PIN_POT2 LL_GPIO_PIN_7 // PA.07 #define ADC_GPIO_PIN_EXT1 LL_GPIO_PIN_1 // PC.01 (SW1) #define ADC_GPIO_PIN_EXT2 LL_GPIO_PIN_0 // PC.00 (SW2 SW3) #define ADC_GPIO_PIN_EXT3 LL_GPIO_PIN_6 // PA.06 (TR1) #define ADC_GPIO_PIN_EXT4 LL_GPIO_PIN_4 // PC.04 (TR2) #define ADC_GPIO_PIN_BATT LL_GPIO_PIN_5 // PC.05 - #define ADC_CHANNEL_POT1 LL_ADC_CHANNEL_7 // ADC12_IN7 -> ADC1_IN7 - #define ADC_CHANNEL_POT2 LL_ADC_CHANNEL_12 // ADC123_IN12 -> ADC1_IN12 + #define ADC_CHANNEL_POT1 LL_ADC_CHANNEL_12 // ADC123_IN12 -> ADC1_IN12 + #define ADC_CHANNEL_POT2 LL_ADC_CHANNEL_7 // ADC12_IN7 -> ADC1_IN7 #define ADC_CHANNEL_EXT1 LL_ADC_CHANNEL_11 // ADC123_IN11 -> ADC1_IN11 #define ADC_CHANNEL_EXT2 LL_ADC_CHANNEL_10 // ADC123_IN10 -> ADC1_IN10 #define ADC_CHANNEL_EXT3 LL_ADC_CHANNEL_6 // ADC12_IN6 -> ADC1_IN6 #define ADC_CHANNEL_EXT4 LL_ADC_CHANNEL_14 // ADC12_IN14 -> ADC1_IN14 #define ADC_CHANNEL_BATT LL_ADC_CHANNEL_15 // ADC12_IN15 -> ADC1_IN15 #define ADC_CHANNEL_RTC_BAT LL_ADC_CHANNEL_VBAT // ADC1_IN18 - #define ADC_GPIOA_PINS (ADC_GPIO_PIN_STICK_TH | ADC_GPIO_PIN_STICK_ST | ADC_GPIO_PIN_POT1 | ADC_GPIO_PIN_EXT3) - #define ADC_GPIOC_PINS (ADC_GPIO_PIN_EXT1 | ADC_GPIO_PIN_EXT2 | ADC_GPIO_PIN_POT2 | ADC_GPIO_PIN_EXT4 | ADC_GPIO_PIN_BATT) + #define ADC_GPIOA_PINS (ADC_GPIO_PIN_STICK_TH | ADC_GPIO_PIN_STICK_ST | ADC_GPIO_PIN_POT2 | ADC_GPIO_PIN_EXT3) + #define ADC_GPIOC_PINS (ADC_GPIO_PIN_EXT1 | ADC_GPIO_PIN_EXT2 | ADC_GPIO_PIN_POT1 | ADC_GPIO_PIN_EXT4 | ADC_GPIO_PIN_BATT) #define ADC_MAIN ADC1 #define ADC_SAMPTIME LL_ADC_SAMPLINGTIME_28CYCLES @@ -346,12 +343,11 @@ #define ADC_VREF_PREC2 660 #define ADC_DIRECTION { \ - 0,0, /* gimbals */ \ - 0,0,0,0, /* pots */ \ + 0,0, /* gimbals */ \ + 0,0, /* pots */ \ + 0,0,0,0, /* ext1-4 */ \ 0, /* vbat */ \ - 0, /* rtc_bat */ \ - 0, /* SWA */ \ - 0 /* SWB */ \ + 0 /* rtc_bat */ \ } #endif diff --git a/radio/src/targets/pl18/nb4p_key_driver.cpp b/radio/src/targets/pl18/nb4p_key_driver.cpp index 13242cb94..9a76ee3f9 100644 --- a/radio/src/targets/pl18/nb4p_key_driver.cpp +++ b/radio/src/targets/pl18/nb4p_key_driver.cpp @@ -59,11 +59,11 @@ void keysInit() LL_GPIO_InitTypeDef pinInit; LL_GPIO_StructInit(&pinInit); - pinInit.Pin = ADC_GPIO_PIN_EXT2; + pinInit.Pin = ADC_GPIO_PIN_EXT1; pinInit.Mode = LL_GPIO_MODE_ANALOG; pinInit.Pull = LL_GPIO_PULL_NO; - stm32_gpio_enable_clock(ADC_GPIO_EXT2); - LL_GPIO_Init(ADC_GPIO_EXT2, &pinInit); + stm32_gpio_enable_clock(ADC_GPIO_EXT1); + LL_GPIO_Init(ADC_GPIO_EXT1, &pinInit); // Init ADC clock uint32_t adc_idx = (((uint32_t) ADC_MAIN) - ADC1_BASE) / 0x100UL; @@ -102,8 +102,8 @@ void keysInit() uint16_t _adcRead() { // Configure ADC channel - LL_ADC_REG_SetSequencerRanks(ADC_MAIN, LL_ADC_REG_RANK_1, ADC_CHANNEL_EXT2); - LL_ADC_SetChannelSamplingTime(ADC_MAIN, ADC_CHANNEL_EXT2, LL_ADC_SAMPLINGTIME_3CYCLES); + LL_ADC_REG_SetSequencerRanks(ADC_MAIN, LL_ADC_REG_RANK_1, ADC_CHANNEL_EXT1); + LL_ADC_SetChannelSamplingTime(ADC_MAIN, ADC_CHANNEL_EXT1, LL_ADC_SAMPLINGTIME_3CYCLES); // Start ADC conversion LL_ADC_REG_StartConversionSWStart(ADC_MAIN); @@ -128,6 +128,11 @@ uint32_t readKeys() else if (value < 512) result |= 1 << KEY_ENTER; #else + uint16_t value = getAnalogValue(4); + if (value >= 3584) + result |= 1 << KEY_EXIT; + else if (value < 512) + result |= 1 << KEY_ENTER; #endif return result; diff --git a/radio/src/targets/pl18/switch_driver.cpp b/radio/src/targets/pl18/switch_driver.cpp index ad2e56bd9..24624469d 100644 --- a/radio/src/targets/pl18/switch_driver.cpp +++ b/radio/src/targets/pl18/switch_driver.cpp @@ -33,7 +33,7 @@ #define __weak __attribute__((weak)) static const stm32_switch_t _switch_defs[] = { - { +/* { "S1A", nullptr, 0, nullptr, 0, @@ -44,7 +44,7 @@ static const stm32_switch_t _switch_defs[] = { nullptr, 0, nullptr, 0, SWITCH_HW_2POS, 0 - }, + },*/ { "S2", nullptr, 0, @@ -59,34 +59,35 @@ static const stm32_switch_t _switch_defs[] = { } }; -constexpr uint8_t n_switches = 4; +constexpr uint8_t n_switches = 2; constexpr uint8_t n_fct_switches = 0; constexpr swconfig_t _switch_default_config = (swconfig_t)0 | ((swconfig_t)SWITCH_2POS << (0 * SW_CFG_BITS)) | ((swconfig_t)SWITCH_2POS << (1 * SW_CFG_BITS)) - | ((swconfig_t)SWITCH_2POS << (2 * SW_CFG_BITS)) - | ((swconfig_t)SWITCH_2POS << (3 * SW_CFG_BITS)) +/* | ((swconfig_t)SWITCH_2POS << (2 * SW_CFG_BITS)) + | ((swconfig_t)SWITCH_2POS << (3 * SW_CFG_BITS))*/ ; const switch_display_pos_t _switch_display[] = { { 0, 0 }, { 0, 0 }, - { 0, 0 }, - { 0, 0 }, +/* { 0, 0 }, + { 0, 0 },*/ }; SwitchHwPos boardSwitchGetPosition(uint8_t cat, uint8_t idx) { if (idx <= 1) { - uint16_t swVal = getAnalogValue(4); +// uint16_t swVal = getAnalogValue(4); + uint16_t swVal = getAnalogValue(5); if (idx == 0 && (swVal < 512 || (swVal >= 1536 && swVal < 2560))) { return SWITCH_HW_DOWN; } if (idx == 1 && (swVal >= 3584 || (swVal >= 1536 && swVal < 2560))) { return SWITCH_HW_DOWN; } - } else if (idx <= 3) { + } /*else if (idx <= 3) { uint16_t swVal = getAnalogValue(5); if (idx == 3 && (swVal < 512 || (swVal >= 1536 && swVal < 2560))) { return SWITCH_HW_DOWN; @@ -94,7 +95,7 @@ SwitchHwPos boardSwitchGetPosition(uint8_t cat, uint8_t idx) if (idx == 2 && (swVal >= 3584 || (swVal >= 1536 && swVal < 2560))) { return SWITCH_HW_DOWN; } - } + }*/ return SWITCH_HW_UP; } diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index 80558106b..6659e9849 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -1074,10 +1074,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index 1ed9f27b7..54381e3cf 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -1089,10 +1089,10 @@ #define TR_BL_ENABLE "Povoleno" #define TR_BL_DISABLE "Zakazano" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 4d9949021..18d6aa4f3 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -1075,10 +1075,10 @@ #elif defined(PCBPL18) // Bootloader PL18/NB4+ specific - ASCII characters only #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] for at bruge fil" - #define TR_BL_FLASH_KEY "Hold [SW2] længe, for brænding" - #define TR_BL_ERASE_KEY "Hold [SW2] længe, for sletning" - #define TR_BL_EXIT_KEY "[SW3] for at forlade" + #define TR_BL_SELECT_KEY "[SW1A] for at bruge fil" + #define TR_BL_FLASH_KEY "Hold [SW1A] længe, for brænding" + #define TR_BL_ERASE_KEY "Hold [SW1A] længe, for sletning" + #define TR_BL_EXIT_KEY "[SW1B] for at forlade" #else #define TR_BL_SELECT_KEY "[TR4 Dn] for at bruge fil" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] længe, for brænding" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 0e49bd971..ca9847c2a 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -1067,10 +1067,10 @@ #define TR_BL_ENABLE "Aktivieren" #define TR_BL_DISABLE "Deaktivieren" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index 54f6c69ff..c6761cfaa 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -1080,10 +1080,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index f7391b56e..f74af992d 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -1075,10 +1075,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 56413e503..23ce349a1 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -1087,10 +1087,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index e2ad9fd1b..582dfb25a 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -1088,10 +1088,10 @@ #define TR_BL_ENABLE "Activer" #define TR_BL_DISABLE "Désactiver" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/he.h b/radio/src/translations/he.h index 9717675fb..0c7b1752a 100644 --- a/radio/src/translations/he.h +++ b/radio/src/translations/he.h @@ -1077,10 +1077,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index f64cd2d46..df277e08f 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -1071,10 +1071,10 @@ #define TR_BL_ENABLE "Abilita" #define TR_BL_DISABLE "Disabilita" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index ea1f12861..a34ca04d6 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -1077,10 +1077,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 655fab201..819a822bb 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -1080,10 +1080,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 8ed7cf0d6..c996627be 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -1074,10 +1074,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] aby wybrac plik" - #define TR_BL_FLASH_KEY "Przytrzymaj [SW2] aby flashowac" - #define TR_BL_ERASE_KEY "Przytrzymaj [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] aby wyjsc" + #define TR_BL_SELECT_KEY "[SW1A] aby wybrac plik" + #define TR_BL_FLASH_KEY "Przytrzymaj [SW1A] aby flashowac" + #define TR_BL_ERASE_KEY "Przytrzymaj [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] aby wyjsc" #else #define TR_BL_SELECT_KEY "[TR4 Dn] aby wybrac plik" #define TR_BL_FLASH_KEY "Przytrzymaj [TR4 Dn] aby flashowac" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index 235f00b71..da510f6ca 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -1081,10 +1081,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/ru.h b/radio/src/translations/ru.h index e27e4b0a5..ff4721ce5 100644 --- a/radio/src/translations/ru.h +++ b/radio/src/translations/ru.h @@ -1080,10 +1080,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 40b55e8f6..0ddfab9e3 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -1102,10 +1102,10 @@ #define TR_BL_ENABLE "Aktivera" #define TR_BL_DISABLE "Inaktivera" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] för att vaelja fil" - #define TR_BL_FLASH_KEY "Haall [SW2] foer att flasha" - #define TR_BL_ERASE_KEY "Haall [SW2] foer att radera" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] för att vaelja fil" + #define TR_BL_FLASH_KEY "Haall [SW1A] foer att flasha" + #define TR_BL_ERASE_KEY "Haall [SW1A] foer att radera" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Ner] för att vaelja fil" #define TR_BL_FLASH_KEY "Haall [TR4 Ner] foer att flasha" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index e8b2f11ef..90e5cd5d0 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -1079,10 +1079,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/src/translations/ua.h b/radio/src/translations/ua.h index 012a56bb1..79539978a 100644 --- a/radio/src/translations/ua.h +++ b/radio/src/translations/ua.h @@ -1080,10 +1080,10 @@ #define TR_BL_ENABLE "Enable" #define TR_BL_DISABLE "Disable" #if defined(RADIO_NB4P) - #define TR_BL_SELECT_KEY "[SW2] to select file" - #define TR_BL_FLASH_KEY "Hold [SW2] long to flash" - #define TR_BL_ERASE_KEY "Hold [SW2] long to erase" - #define TR_BL_EXIT_KEY "[SW3] to exit" + #define TR_BL_SELECT_KEY "[SW1A] to select file" + #define TR_BL_FLASH_KEY "Hold [SW1A] long to flash" + #define TR_BL_ERASE_KEY "Hold [SW1A] long to erase" + #define TR_BL_EXIT_KEY "[SW1B] to exit" #else #define TR_BL_SELECT_KEY "[TR4 Dn] to select file" #define TR_BL_FLASH_KEY "Hold [TR4 Dn] long to flash" diff --git a/radio/util/hw_defs/switch_config.py b/radio/util/hw_defs/switch_config.py index 8ecb8021d..866e1fad7 100644 --- a/radio/util/hw_defs/switch_config.py +++ b/radio/util/hw_defs/switch_config.py @@ -66,8 +66,6 @@ SWITCH_CONFIG = { "SJ": { "default": "3POS" } }, "nb4p": { - "S1A": { "default": "TOGGLE" }, - "S1B": { "default": "TOGGLE" }, "S2" : { "default": "TOGGLE" }, "S3" : { "default": "TOGGLE" } },