Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00
Code Issues Wiki Activity

Merge pull request #4696 from mikeller/change_channel_data_to_uint16_t

Browse source 
Changed channel data to be `uint16_t`.
This commit is contained in:
Michael Keller 2017-12-02 13:10:24 +13:00 • committed by GitHub
commit e1cba01f26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/rx/fport.c
View file

@ -338,7 +338,7 @@ static uint8_t fportFrameStatus(rxRuntimeConfig_t *rxRuntimeConfig)
bool fportRxInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig) bool fportRxInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig)
{ {
static uint32_t sbusChannelData[SBUS_MAX_CHANNEL]; static uint16_t sbusChannelData[SBUS_MAX_CHANNEL];
rxRuntimeConfig->channelData = sbusChannelData; rxRuntimeConfig->channelData = sbusChannelData;
sbusChannelsInit(rxConfig, rxRuntimeConfig); sbusChannelsInit(rxConfig, rxRuntimeConfig);

2
src/main/rx/rx.h
View file

@ -157,7 +157,7 @@ typedef struct rxRuntimeConfig_s {
uint16_t rxRefreshRate; uint16_t rxRefreshRate;
rcReadRawDataFnPtr rcReadRawFn; rcReadRawDataFnPtr rcReadRawFn;
rcFrameStatusFnPtr rcFrameStatusFn; rcFrameStatusFnPtr rcFrameStatusFn;
uint32_t *channelData; uint16_t *channelData;
void *frameData; void *frameData;
} rxRuntimeConfig_t; } rxRuntimeConfig_t;

2
src/main/rx/sbus.c
View file

@ -160,7 +160,7 @@ static uint8_t sbusFrameStatus(rxRuntimeConfig_t *rxRuntimeConfig)
bool sbusInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig) bool sbusInit(const rxConfig_t *rxConfig, rxRuntimeConfig_t *rxRuntimeConfig)
{ {
static uint32_t sbusChannelData[SBUS_MAX_CHANNEL]; static uint16_t sbusChannelData[SBUS_MAX_CHANNEL];
static sbusFrameData_t sbusFrameData; static sbusFrameData_t sbusFrameData;
rxRuntimeConfig->channelData = sbusChannelData; rxRuntimeConfig->channelData = sbusChannelData;

2
src/main/rx/sbus_channels.c
View file

@ -38,7 +38,7 @@
uint8_t sbusChannelsDecode(rxRuntimeConfig_t *rxRuntimeConfig, const sbusChannels_t *channels) uint8_t sbusChannelsDecode(rxRuntimeConfig_t *rxRuntimeConfig, const sbusChannels_t *channels)
{ {
uint32_t *sbusChannelData = rxRuntimeConfig->channelData; uint16_t *sbusChannelData = rxRuntimeConfig->channelData;
sbusChannelData[0] = channels->chan0; sbusChannelData[0] = channels->chan0;
sbusChannelData[1] = channels->chan1; sbusChannelData[1] = channels->chan1;
sbusChannelData[2] = channels->chan2; sbusChannelData[2] = channels->chan2;