[stm32] spektrum: always decode up to 12 channels

but only copy RADIO_CONTROL_NB_CHANNEL to radio_control.values
paparazzi · Nov 28, 2014 · 7ae4ab3 · 7ae4ab3
1 parent f38c5db
commit 7ae4ab3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
@@ -446,7 +446,7 @@ void RadioControlEventImp(void (*frame_handler)(void)) {
         case(0) : /* 10 bit */
           ChannelNum = (ChannelData >> 10) & 0x0f;
           /* don't bother decoding unused channels */
-          if (ChannelNum < RADIO_CONTROL_NB_CHANNEL) {
+          if (ChannelNum < SPEKTRUM_NB_CHANNEL) {
            SpektrumBuf[ChannelNum] = ChannelData & 0x3ff;
            SpektrumBuf[ChannelNum] -= 0x200;
            SpektrumBuf[ChannelNum] *= MAX_PPRZ/0x156;
@@ -457,7 +457,7 @@ void RadioControlEventImp(void (*frame_handler)(void)) {
         case(1) : /* 11 bit */
           ChannelNum = (ChannelData >> 11) & 0x0f;
           /* don't bother decoding unused channels */
-          if (ChannelNum < RADIO_CONTROL_NB_CHANNEL) {
+          if (ChannelNum < SPEKTRUM_NB_CHANNEL) {
             SpektrumBuf[ChannelNum] = ChannelData & 0x7ff;
             SpektrumBuf[ChannelNum] -= 0x400;
             SpektrumBuf[ChannelNum] *= MAX_PPRZ/0x2AC;

diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
@@ -29,6 +29,7 @@
  * have the same channel assignments.
  */
 
+#define SPEKTRUM_NB_CHANNEL 12
 
 #ifndef RADIO_CONTROL_NB_CHANNEL
 #define RADIO_CONTROL_NB_CHANNEL 12