piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Better correction for issue 95

Browse Source
This commit is contained in:
bsongis
2012-08-21 11:45:04 +00:00
parent 0e7c08ba15
commit 76ea24e62c
5 changed files with 48 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frsky.cpp
+9 -4
View File
@@ -135,9 +135,14 @@ typedef enum {
TS_XOR = 0x80 // decode stuffed byte
} TS_STATE;
int16_t applyChannelRatio(uint8_t channel, int16_t val)
uint16_t getChannelRatio(uint8_t channel)
{
return (int16_t)(((int32_t)val+g_model.frsky.channels[channel].offset) * (g_model.frsky.channels[channel].ratio << g_model.frsky.channels[channel].multiplier) * 2 / 51);
return (uint16_t)g_model.frsky.channels[channel].ratio << g_model.frsky.channels[channel].multiplier;
}
int16_t applyChannelRatio(uint8_t channel, uint8_t val)
{
return ((int32_t)val+g_model.frsky.channels[channel].offset) * getChannelRatio(channel) * 2 / 51;
}
void evalVario(int16_t altitude_bp, uint16_t altitude_ap)
@@ -660,7 +665,7 @@ inline void FRSKY10mspoll(void)
}
#endif
void check_frsky()
NOINLINE void check_frsky()
{
#if defined(PCBARM)
rxPdcUsart(processSerialData); // Receive serial data here
@@ -874,7 +879,7 @@ void frskyEvalCurrentConsumptionBoundary()
currentConsumptionBoundary = 3600;
uint8_t channel = g_model.frsky.currentSource-FRSKY_SOURCE_A1;
if (channel <= 1) {
uint16_t divider = (g_model.frsky.channels[channel].ratio << g_model.frsky.channels[channel].multiplier);
uint16_t divider = getChannelRatio(channel);
if (divider > 5) {
currentConsumptionBoundary = 360000L / divider;
}