Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 17:55:19 +03:00
Code Issues Wiki Activity

No rotary encoders on 9XR-PRO

Browse source
This commit is contained in:
bsongis 2014-05-12 19:38:45 +02:00
parent df73c969c6
commit cc38920432
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/Makefile
View file

@ -573,7 +573,11 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
SDCARD = YES SDCARD = YES
BUZZER = NO BUZZER = NO
THR_TRACE = YES THR_TRACE = YES
CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1 CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM
ifeq ($(PCB), SKY9X)
CPPDEFS += -DROTARY_ENCODERS=1
CPPSRC += targets/sky9x/rotenc_driver.cpp
endif
INCDIRS += targets/sky9x CoOS/kernel CoOS/portable INCDIRS += targets/sky9x CoOS/kernel CoOS/portable
BOARDSRC = targets/sky9x/board_sky9x.cpp BOARDSRC = targets/sky9x/board_sky9x.cpp
EXTRABOARDSRC = targets/sky9x/lcd_driver.cpp EXTRABOARDSRC = targets/sky9x/lcd_driver.cpp
@ -586,7 +590,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
EEPROMSRC = eeprom_common.cpp eeprom_raw.cpp eeprom_conversions.cpp EEPROMSRC = eeprom_common.cpp eeprom_raw.cpp eeprom_conversions.cpp
PULSESSRC = protocols/pulses_arm.cpp protocols/ppm_arm.cpp protocols/pxx_arm.cpp protocols/dsm2_arm.cpp PULSESSRC = protocols/pulses_arm.cpp protocols/ppm_arm.cpp protocols/pxx_arm.cpp protocols/dsm2_arm.cpp
CPPSRC += audio_arm.cpp haptic.cpp gui/view_about.cpp CPPSRC += audio_arm.cpp haptic.cpp gui/view_about.cpp
CPPSRC += targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/rotenc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp CPPSRC += targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
CPPSRC += loadboot.cpp CPPSRC += loadboot.cpp
ifeq ($(SDCARD), YES) ifeq ($(SDCARD), YES)

10
radio/src/opentx.cpp
View file

@ -1269,7 +1269,7 @@ getvalue_t getValue(uint8_t i)
else if (i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud]; else if (i<=MIXSRC_LAST_POT) return calibratedStick[i-MIXSRC_Rud];
#if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(PCBSKY9X) #if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)
else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa); else if (i<=MIXSRC_LAST_ROTARY_ENCODER) return getRotaryEncoder(i-MIXSRC_REa);
#endif #endif
@ -5585,14 +5585,8 @@ void menusTask(void * pdata)
while (pwrCheck() != e_power_off) { while (pwrCheck() != e_power_off) {
perMain(); perMain();
#if defined(PCBSKY9X) // TODO remove completely massstorage from sky9x firmware
for (uint8_t i=0; i<5; i++) {
usbMassStorage();
CoTickDelay(1); // 5*2ms for now
}
#else
CoTickDelay(5); // 5*2ms for now CoTickDelay(5); // 5*2ms for now
#endif
} }
lcd_clear(); lcd_clear();

4
radio/src/targets/sky9x/board_sky9x.cpp
View file

@ -654,7 +654,9 @@ void boardInit()
eepromInit(); eepromInit();
#if defined(ROTARY_ENCODERS)
rotencInit(); rotencInit();
#endif
init_SDcard(); init_SDcard();
} }
@ -781,7 +783,9 @@ void usbBootloader()
// This might be replaced by a software reset // This might be replaced by a software reset
// Any interrupts that have been enabled must be disabled here // Any interrupts that have been enabled must be disabled here
// BEFORE calling sam_boot() // BEFORE calling sam_boot()
#if defined(ROTARY_ENCODERS)
rotencEnd(); rotencEnd();
#endif
endPdcUsartReceive() ; // Terminate any serial reception endPdcUsartReceive() ; // Terminate any serial reception
end_bt_tx_interrupt() ; end_bt_tx_interrupt() ;
stop_trainer_capture() ; stop_trainer_capture() ;