Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 18:07:25 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[stm32] spektrum: always decode up to 12 channels

Browse Source 
but only copy RADIO_CONTROL_NB_CHANNEL to radio_control.values
This commit is contained in:
Felix Ruess
2014-11-28 14:59:04 +01:00
parent f38c5db2db
commit 7ae4ab3a6f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.c
+2 -2
View File
@@ -446,7 +446,7 @@ void RadioControlEventImp(void (*frame_handler)(void)) {
case(0) : /* 10 bit */ case(0) : /* 10 bit */
ChannelNum = (ChannelData >> 10) & 0x0f; ChannelNum = (ChannelData >> 10) & 0x0f;
/* don't bother decoding unused channels */ /* don't bother decoding unused channels */
if (ChannelNum < RADIO_CONTROL_NB_CHANNEL) { if (ChannelNum < SPEKTRUM_NB_CHANNEL) {
SpektrumBuf[ChannelNum] = ChannelData & 0x3ff; SpektrumBuf[ChannelNum] = ChannelData & 0x3ff;
SpektrumBuf[ChannelNum] -= 0x200; SpektrumBuf[ChannelNum] -= 0x200;
SpektrumBuf[ChannelNum] *= MAX_PPRZ/0x156; SpektrumBuf[ChannelNum] *= MAX_PPRZ/0x156;
@@ -457,7 +457,7 @@ void RadioControlEventImp(void (*frame_handler)(void)) {
case(1) : /* 11 bit */ case(1) : /* 11 bit */
ChannelNum = (ChannelData >> 11) & 0x0f; ChannelNum = (ChannelData >> 11) & 0x0f;
/* don't bother decoding unused channels */ /* don't bother decoding unused channels */
if (ChannelNum < RADIO_CONTROL_NB_CHANNEL) { if (ChannelNum < SPEKTRUM_NB_CHANNEL) {
SpektrumBuf[ChannelNum] = ChannelData & 0x7ff; SpektrumBuf[ChannelNum] = ChannelData & 0x7ff;
SpektrumBuf[ChannelNum] -= 0x400; SpektrumBuf[ChannelNum] -= 0x400;
SpektrumBuf[ChannelNum] *= MAX_PPRZ/0x2AC; SpektrumBuf[ChannelNum] *= MAX_PPRZ/0x2AC;
sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
+1
View File
@@ -29,6 +29,7 @@
* have the same channel assignments. * have the same channel assignments.
*/ */
#define SPEKTRUM_NB_CHANNEL 12
#ifndef RADIO_CONTROL_NB_CHANNEL #ifndef RADIO_CONTROL_NB_CHANNEL
#define RADIO_CONTROL_NB_CHANNEL 12 #define RADIO_CONTROL_NB_CHANNEL 12