diff --git a/companion/src/converteeprom.cpp b/companion/src/converteeprom.cpp old mode 100755 new mode 100644 diff --git a/companion/src/converteeprom.h b/companion/src/converteeprom.h old mode 100755 new mode 100644 diff --git a/companion/src/firmwareinterface.cpp b/companion/src/firmwareinterface.cpp old mode 100755 new mode 100644 diff --git a/companion/src/firmwareinterface.h b/companion/src/firmwareinterface.h old mode 100755 new mode 100644 diff --git a/companion/src/firmwares/opentx/opentxinterface.cpp b/companion/src/firmwares/opentx/opentxinterface.cpp index 85c2f3109..e74feb378 100644 --- a/companion/src/firmwares/opentx/opentxinterface.cpp +++ b/companion/src/firmwares/opentx/opentxinterface.cpp @@ -728,7 +728,7 @@ int OpenTxFirmware::getCapability(const Capability capability) case HasFailsafe: return (IS_ARM(board) ? 32 : 0); case NumModules: - return (IS_ARM(board) && !IS_9XRPRO(board)) ? 2 : 1; + return (IS_ARM(board) ? 2 : 1); case HasPPMStart: return (IS_ARM(board) ? true : false); case HastxCurrentCalibration: diff --git a/companion/src/flasheepromdialog.cpp b/companion/src/flasheepromdialog.cpp old mode 100755 new mode 100644 diff --git a/companion/src/flasheepromdialog.h b/companion/src/flasheepromdialog.h old mode 100755 new mode 100644 diff --git a/companion/src/flasheepromdialog.ui b/companion/src/flasheepromdialog.ui old mode 100755 new mode 100644 diff --git a/companion/src/flashfirmwaredialog.cpp b/companion/src/flashfirmwaredialog.cpp old mode 100755 new mode 100644 diff --git a/companion/src/flashfirmwaredialog.h b/companion/src/flashfirmwaredialog.h old mode 100755 new mode 100644 diff --git a/companion/src/flashfirmwaredialog.ui b/companion/src/flashfirmwaredialog.ui old mode 100755 new mode 100644 diff --git a/companion/src/helpers_html.cpp b/companion/src/helpers_html.cpp old mode 100755 new mode 100644 diff --git a/companion/src/helpers_html.h b/companion/src/helpers_html.h old mode 100755 new mode 100644 diff --git a/companion/src/images/originals/scripts/addblackoutline.sh b/companion/src/images/originals/scripts/addblackoutline.sh old mode 100755 new mode 100644 diff --git a/companion/src/images/originals/scripts/makeblue.sh b/companion/src/images/originals/scripts/makeblue.sh old mode 100755 new mode 100644 diff --git a/companion/src/images/originals/scripts/makewhite.sh b/companion/src/images/originals/scripts/makewhite.sh old mode 100755 new mode 100644 diff --git a/companion/src/process_copy.cpp b/companion/src/process_copy.cpp old mode 100755 new mode 100644 diff --git a/companion/src/process_copy.h b/companion/src/process_copy.h old mode 100755 new mode 100644 diff --git a/companion/src/process_flash.cpp b/companion/src/process_flash.cpp old mode 100755 new mode 100644 diff --git a/companion/src/process_flash.h b/companion/src/process_flash.h old mode 100755 new mode 100644 diff --git a/companion/src/process_sync.cpp b/companion/src/process_sync.cpp old mode 100755 new mode 100644 diff --git a/companion/src/process_sync.h b/companion/src/process_sync.h old mode 100755 new mode 100644 diff --git a/companion/src/progressdialog.cpp b/companion/src/progressdialog.cpp old mode 100755 new mode 100644 diff --git a/companion/src/progressdialog.h b/companion/src/progressdialog.h old mode 100755 new mode 100644 diff --git a/companion/src/progressdialog.ui b/companion/src/progressdialog.ui old mode 100755 new mode 100644 diff --git a/companion/src/progresswidget.cpp b/companion/src/progresswidget.cpp old mode 100755 new mode 100644 diff --git a/companion/src/progresswidget.h b/companion/src/progresswidget.h old mode 100755 new mode 100644 diff --git a/companion/src/progresswidget.ui b/companion/src/progresswidget.ui old mode 100755 new mode 100644 diff --git a/companion/src/radiointerface.cpp b/companion/src/radiointerface.cpp old mode 100755 new mode 100644 diff --git a/companion/src/radiointerface.h b/companion/src/radiointerface.h old mode 100755 new mode 100644 diff --git a/companion/src/releasenotesdialog.cpp b/companion/src/releasenotesdialog.cpp old mode 100755 new mode 100644 diff --git a/companion/src/releasenotesdialog.h b/companion/src/releasenotesdialog.h old mode 100755 new mode 100644 diff --git a/companion/src/releasenotesfirmwaredialog.cpp b/companion/src/releasenotesfirmwaredialog.cpp old mode 100755 new mode 100644 diff --git a/companion/src/releasenotesfirmwaredialog.h b/companion/src/releasenotesfirmwaredialog.h old mode 100755 new mode 100644 diff --git a/companion/src/shared/autolineedit.h b/companion/src/shared/autolineedit.h old mode 100755 new mode 100644 diff --git a/companion/src/translations/companion_es.ts b/companion/src/translations/companion_es.ts old mode 100755 new mode 100644 diff --git a/companion/targets/windows/simulator-vs.nsi.in b/companion/targets/windows/simulator-vs.nsi.in old mode 100755 new mode 100644 diff --git a/doc/lua-reference-guide.tex b/doc/lua-reference-guide.tex old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/9X/about.png b/radio/src/bitmaps/9X/about.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/9X/asterisk.xbm b/radio/src/bitmaps/9X/asterisk.xbm old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/9X/splash.xbm b/radio/src/bitmaps/9X/splash.xbm old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/.gitignore b/radio/src/bitmaps/Taranis/.gitignore old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/about.png b/radio/src/bitmaps/Taranis/about.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/asterisk.png b/radio/src/bitmaps/Taranis/asterisk.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/icons.png b/radio/src/bitmaps/Taranis/icons.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/lock.png b/radio/src/bitmaps/Taranis/lock.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/shutdown.png b/radio/src/bitmaps/Taranis/shutdown.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/sleep.png b/radio/src/bitmaps/Taranis/sleep.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/Taranis/splash.png b/radio/src/bitmaps/Taranis/splash.png old mode 100755 new mode 100644 diff --git a/radio/src/bitmaps/sticks.xbm b/radio/src/bitmaps/sticks.xbm old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/gui.h b/radio/src/gui/9X/gui.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/helpers.cpp b/radio/src/gui/9X/helpers.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/lcd.cpp b/radio/src/gui/9X/lcd.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/lcd.h b/radio/src/gui/9X/lcd.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general.cpp b/radio/src/gui/9X/menu_general.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_calib.cpp b/radio/src/gui/9X/menu_general_calib.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_diaganas.cpp b/radio/src/gui/9X/menu_general_diaganas.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_diagkeys.cpp b/radio/src/gui/9X/menu_general_diagkeys.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_hardware.cpp b/radio/src/gui/9X/menu_general_hardware.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_sdmanager.cpp b/radio/src/gui/9X/menu_general_sdmanager.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_setup.cpp b/radio/src/gui/9X/menu_general_setup.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_trainer.cpp b/radio/src/gui/9X/menu_general_trainer.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_general_version.cpp b/radio/src/gui/9X/menu_general_version.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_model.cpp b/radio/src/gui/9X/menu_model.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_model_heli.cpp b/radio/src/gui/9X/menu_model_heli.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menu_model_setup.cpp b/radio/src/gui/9X/menu_model_setup.cpp index 1261dd574..17bd92e60 100644 --- a/radio/src/gui/9X/menu_model_setup.cpp +++ b/radio/src/gui/9X/menu_model_setup.cpp @@ -79,7 +79,7 @@ enum menuModelSetupItems { ITEM_MODEL_EXTERNAL_MODULE_OUTPUT_TYPE, #endif ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE, -#if defined(PCBSKY9X) && !defined(REVA) && !defined(REVX) +#if defined(PCBSKY9X) && !defined(REVA) ITEM_MODEL_EXTRA_MODULE_LABEL, ITEM_MODEL_EXTRA_MODULE_CHANNELS, ITEM_MODEL_EXTRA_MODULE_BIND, @@ -102,7 +102,7 @@ enum menuModelSetupItems { #define MODEL_SETUP_RANGE_OFS 4*FW+3 #define MODEL_SETUP_SET_FAILSAFE_OFS 7*FW-2 -#if defined(PCBSKY9X) && !defined(REVA) && !defined(REVX) +#if defined(PCBSKY9X) && !defined(REVA) #define CURRENT_MODULE_EDITED(k) (k>=ITEM_MODEL_EXTRA_MODULE_LABEL ? EXTRA_MODULE : EXTERNAL_MODULE) #else #define CURRENT_MODULE_EDITED(k) (EXTERNAL_MODULE) @@ -116,7 +116,7 @@ void menuModelSetup(uint8_t event) #define IS_D8_RX(x) (g_model.moduleData[x].rfProtocol == RF_PROTO_D8) #define EXTERNAL_MODULE_CHANNELS_ROWS() IF_EXTERNAL_MODULE_ON(IS_MODULE_DSM2(EXTERNAL_MODULE) ? (uint8_t)0 : (uint8_t)1) #define EXTERNAL_MODULE_SETTINGS_ROWS() (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW -#if defined(PCBSKY9X) && defined(REVX) +#if defined(PCBSKY9X) && !defined(REVX) #define OUTPUT_TYPE_ROWS() (IS_MODULE_PPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) , #else #define OUTPUT_TYPE_ROWS() @@ -128,7 +128,7 @@ void menuModelSetup(uint8_t event) #define MODEL_SETUP_MAX_LINES (1+ITEM_MODEL_SETUP_MAX) #define POT_WARN_ITEMS() ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0) #define TIMER_ROWS 2, 0, CASE_PERSISTENT_TIMERS(0) 0, 0 -#if (defined(PCBSKY9X) && !defined(REVA) && !defined(REVX)) +#if (defined(PCBSKY9X) && !defined(REVA)) #define EXTRA_MODULE_ROWS LABEL(ExtraModule), 1, 2, #else #define EXTRA_MODULE_ROWS @@ -485,7 +485,7 @@ void menuModelSetup(uint8_t event) break; #endif -#if defined(PCBSKY9X) && !defined(REVX) +#if defined(PCBSKY9X) case ITEM_MODEL_EXTRA_MODULE_LABEL: lcd_putsLeft(y, "RF Port 2 (PPM)"); break; @@ -530,7 +530,7 @@ void menuModelSetup(uint8_t event) break; #endif -#if defined(PCBSKY9X) && !defined(REVX) +#if defined(PCBSKY9X) case ITEM_MODEL_EXTRA_MODULE_CHANNELS: #endif #if defined(CPUARM) @@ -562,7 +562,7 @@ void menuModelSetup(uint8_t event) } #endif -#if defined(PCBSKY9X) && !defined(REVX) +#if defined(PCBSKY9X) case ITEM_MODEL_EXTRA_MODULE_BIND: #endif #if defined(CPUARM) diff --git a/radio/src/gui/9X/menus.cpp b/radio/src/gui/9X/menus.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/menus.h b/radio/src/gui/9X/menus.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/navigation.cpp b/radio/src/gui/9X/navigation.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/popups.cpp b/radio/src/gui/9X/popups.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/splash.cpp b/radio/src/gui/9X/splash.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/view_about.cpp b/radio/src/gui/9X/view_about.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/view_mavlink.cpp b/radio/src/gui/9X/view_mavlink.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/view_mavlink.h b/radio/src/gui/9X/view_mavlink.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/view_statistics.cpp b/radio/src/gui/9X/view_statistics.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/view_telemetry.cpp b/radio/src/gui/9X/view_telemetry.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/view_text.cpp b/radio/src/gui/9X/view_text.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/9X/widgets.cpp b/radio/src/gui/9X/widgets.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/fonts.cpp b/radio/src/gui/Taranis/fonts.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/gui.h b/radio/src/gui/Taranis/gui.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/Taranis/helpers.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/lcd.cpp b/radio/src/gui/Taranis/lcd.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/lcd.h b/radio/src/gui/Taranis/lcd.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general.cpp b/radio/src/gui/Taranis/menu_general.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_calib.cpp b/radio/src/gui/Taranis/menu_general_calib.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_diaganas.cpp b/radio/src/gui/Taranis/menu_general_diaganas.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_diagkeys.cpp b/radio/src/gui/Taranis/menu_general_diagkeys.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_hardware.cpp b/radio/src/gui/Taranis/menu_general_hardware.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_sdmanager.cpp b/radio/src/gui/Taranis/menu_general_sdmanager.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_setup.cpp b/radio/src/gui/Taranis/menu_general_setup.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_trainer.cpp b/radio/src/gui/Taranis/menu_general_trainer.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_general_version.cpp b/radio/src/gui/Taranis/menu_general_version.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model.cpp b/radio/src/gui/Taranis/menu_model.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model_custom_scripts.cpp b/radio/src/gui/Taranis/menu_model_custom_scripts.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model_flightmodes.cpp b/radio/src/gui/Taranis/menu_model_flightmodes.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model_gvars.cpp b/radio/src/gui/Taranis/menu_model_gvars.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model_heli.cpp b/radio/src/gui/Taranis/menu_model_heli.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model_limits.cpp b/radio/src/gui/Taranis/menu_model_limits.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menu_model_logical_switches.cpp b/radio/src/gui/Taranis/menu_model_logical_switches.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menus.cpp b/radio/src/gui/Taranis/menus.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/popups.cpp b/radio/src/gui/Taranis/popups.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/splash.cpp b/radio/src/gui/Taranis/splash.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/view_about.cpp b/radio/src/gui/Taranis/view_about.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/view_channels.cpp b/radio/src/gui/Taranis/view_channels.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/view_main.cpp b/radio/src/gui/Taranis/view_main.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/view_statistics.cpp b/radio/src/gui/Taranis/view_statistics.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/view_telemetry.cpp b/radio/src/gui/Taranis/view_telemetry.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/view_text.cpp b/radio/src/gui/Taranis/view_text.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/Taranis/widgets.cpp b/radio/src/gui/Taranis/widgets.cpp old mode 100755 new mode 100644 diff --git a/radio/src/gui/gui.h b/radio/src/gui/gui.h old mode 100755 new mode 100644 diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 0d1c5c578..2b0cbb75b 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -506,12 +506,12 @@ #endif #define MAX_EXTERNAL_MODULE_CHANNELS() ((g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_XJT) ? maxChannelsXJT[1+g_model.moduleData[1].rfProtocol] : maxChannelsModules[g_model.moduleData[EXTERNAL_MODULE].type]) #define MAX_CHANNELS(idx) (idx==INTERNAL_MODULE ? MAX_INTERNAL_MODULE_CHANNELS() : (idx==EXTERNAL_MODULE ? MAX_EXTERNAL_MODULE_CHANNELS() : MAX_TRAINER_CHANNELS())) -#elif defined(PCBSKY9X) && !defined(REVA) && !defined(REVX) +#elif defined(PCBSKY9X) && !defined(REVA) #define IS_MODULE_PPM(idx) (idx==TRAINER_MODULE || idx==EXTRA_MODULE || (idx==EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type==MODULE_TYPE_PPM)) #define IS_MODULE_XJT(idx) (idx==EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type==MODULE_TYPE_XJT) #define IS_MODULE_DSM2(idx) (idx==EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type==MODULE_TYPE_DSM2) #define MAX_EXTERNAL_MODULE_CHANNELS() ((g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_XJT) ? maxChannelsXJT[1+g_model.moduleData[0].rfProtocol] : maxChannelsModules[g_model.moduleData[EXTERNAL_MODULE].type]) - #define MAX_EXTRA_MODULE_CHANNELS() (0) // Only PPM + #define MAX_EXTRA_MODULE_CHANNELS() (8) // Only PPM (16ch PPM) #define MAX_CHANNELS(idx) (idx==EXTERNAL_MODULE ? MAX_EXTERNAL_MODULE_CHANNELS() : (idx==EXTRA_MODULE ? MAX_EXTRA_MODULE_CHANNELS() : MAX_TRAINER_CHANNELS())) #else #define IS_MODULE_PPM(idx) (idx==TRAINER_MODULE || (idx==EXTERNAL_MODULE && g_model.moduleData[EXTERNAL_MODULE].type==MODULE_TYPE_PPM)) diff --git a/radio/src/pulses/pulses.h b/radio/src/pulses/pulses.h old mode 100755 new mode 100644 diff --git a/radio/src/targets/sky9x/pulses_driver.cpp b/radio/src/targets/sky9x/pulses_driver.cpp index 221fd8baf..751077199 100644 --- a/radio/src/targets/sky9x/pulses_driver.cpp +++ b/radio/src/targets/sky9x/pulses_driver.cpp @@ -78,7 +78,7 @@ void init_main_ppm(uint32_t period, uint32_t out_enable) pwmptr->PWM_ENA = PWM_ENA_CHID3 ; // Enable channel 3 pwmptr->PWM_IER1 = PWM_IER1_CHID3 ; -#if !defined(REVA) && !defined(REVX) +#if !defined(REVA) // PWM1 for PPM2 configure_pins(PIO_PC15, PIN_PERIPHERAL | PIN_INPUT | PIN_PER_B | PIN_PORTC | PIN_NO_PULLUP ) ; pwmptr->PWM_CH_NUM[1].PWM_CMR = 0x0000000B ; // CLKB @@ -137,9 +137,9 @@ void disable_ppm(uint32_t port) PWM->PWM_IDR1 = PWM_IDR1_CHID3 ; } else { -#if !defined(REVA) && !defined(REVX) +#if !defined(REVA) pioptr = PIOC ; - pioptr->PIO_PER = PIO_PC17 ; // Assign A17 to PIO + pioptr->PIO_PER = PIO_PC17 ; // Assign C17 to PIO PWM->PWM_IDR1 = PWM_IDR1_CHID1 ; NVIC_DisableIRQ(PWM_IRQn) ; #endif @@ -290,7 +290,7 @@ extern "C" void PWM_IRQHandler(void) } } -#if !defined(REVA) && !defined(REVX) +#if !defined(REVA) if (reason & PWM_ISR1_CHID1) { pwmptr->PWM_CH_NUM[1].PWM_CPDRUPD = modulePulsesData[EXTRA_MODULE].ppm.pulses[modulePulsesData[EXTRA_MODULE].ppm.index++] ; // Period in half uS if (modulePulsesData[EXTRA_MODULE].ppm.pulses[modulePulsesData[EXTRA_MODULE].ppm.index] == 0) { diff --git a/radio/src/targets/stlink-v2.cfg b/radio/src/targets/stlink-v2.cfg old mode 100755 new mode 100644 diff --git a/radio/src/targets/stm32f2x_stlink.cfg b/radio/src/targets/stm32f2x_stlink.cfg old mode 100755 new mode 100644 diff --git a/radio/src/targets/stm32f4x_stlink.cfg b/radio/src/targets/stm32f4x_stlink.cfg old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/bluetooth_driver.cpp b/radio/src/targets/taranis/bluetooth_driver.cpp old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/bootloader/.gitignore b/radio/src/targets/taranis/bootloader/.gitignore old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/bootloader/Makefile b/radio/src/targets/taranis/bootloader/Makefile old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/bootloader/boot.cpp b/radio/src/targets/taranis/bootloader/boot.cpp old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/bootloader/init.c b/radio/src/targets/taranis/bootloader/init.c old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/stm32f4_flash.ld b/radio/src/targets/taranis/stm32f4_flash.ld old mode 100755 new mode 100644 diff --git a/radio/src/targets/taranis/top_lcd_driver.cpp b/radio/src/targets/taranis/top_lcd_driver.cpp old mode 100755 new mode 100644 diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt old mode 100755 new mode 100644 diff --git a/radio/src/translations/tts_nl.cpp b/radio/src/translations/tts_nl.cpp old mode 100755 new mode 100644 diff --git a/radio/util/.gitignore b/radio/util/.gitignore old mode 100755 new mode 100644 diff --git a/radio/util/addtr.py b/radio/util/addtr.py old mode 100644 new mode 100755 diff --git a/radio/util/bin2lbm.py b/radio/util/bin2lbm.py old mode 100644 new mode 100755 diff --git a/radio/util/codecs.py b/radio/util/codecs.py old mode 100644 new mode 100755 diff --git a/radio/util/compile.py b/radio/util/compile.py old mode 100644 new mode 100755 diff --git a/radio/util/copyright-header.txt b/radio/util/copyright-header.txt old mode 100755 new mode 100644 diff --git a/radio/util/dsm2.py b/radio/util/dsm2.py old mode 100644 new mode 100755 diff --git a/radio/util/img2lbm.py b/radio/util/img2lbm.py old mode 100644 new mode 100755 diff --git a/radio/util/luaexport.py b/radio/util/luaexport.py old mode 100644 new mode 100755 diff --git a/radio/util/parse.py b/radio/util/parse.py old mode 100644 new mode 100755 diff --git a/radio/util/sinus.py b/radio/util/sinus.py old mode 100644 new mode 100755 diff --git a/radio/util/translate.py b/radio/util/translate.py old mode 100644 new mode 100755 diff --git a/radio/util/tts.py b/radio/util/tts.py old mode 100644 new mode 100755 diff --git a/radio/util/uncrustify.cfg b/radio/util/uncrustify.cfg old mode 100755 new mode 100644 diff --git a/radio/wizard/delta.lua b/radio/wizard/delta.lua old mode 100755 new mode 100644 diff --git a/radio/wizard/multi.lua b/radio/wizard/multi.lua old mode 100755 new mode 100644 diff --git a/radio/wizard/plane.lua b/radio/wizard/plane.lua old mode 100755 new mode 100644 diff --git a/radio/wizard/wizard.lua b/radio/wizard/wizard.lua old mode 100755 new mode 100644