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

Better averaging for FrSky A1/A2/RSSI

Browse source
This commit is contained in:
bsongis 2012-05-18 10:35:21 +00:00
parent 1272f34ccb
commit 9fc9cd18be
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/frsky.cpp
View file

@ -58,6 +58,7 @@ uint8_t frskyTxBufferCount = 0;
uint8_t FrskyRxBufferReady = 0; uint8_t FrskyRxBufferReady = 0;
int8_t frskyStreaming = -1; int8_t frskyStreaming = -1;
uint8_t frskyUsrStreaming = 0; uint8_t frskyUsrStreaming = 0;
uint8_t link_counter = 0;
FrskyData frskyTelemetry[2]; FrskyData frskyTelemetry[2];
FrskyRSSI frskyRSSI[2]; FrskyRSSI frskyRSSI[2];
@ -391,6 +392,7 @@ void processFrskyPacket(uint8_t *packet)
} }
break; break;
case LINKPKT: // A1/A2/RSSI values case LINKPKT: // A1/A2/RSSI values
link_counter += 32;
frskyTelemetry[0].set(packet[1], g_model.frsky.channels[0].type); frskyTelemetry[0].set(packet[1], g_model.frsky.channels[0].type);
frskyTelemetry[1].set(packet[2], g_model.frsky.channels[1].type); frskyTelemetry[1].set(packet[2], g_model.frsky.channels[1].type);
frskyRSSI[0].set(packet[3]); frskyRSSI[0].set(packet[3]);
@ -802,18 +804,25 @@ void frskyAlarmsRefresh()
void FrskyRSSI::set(uint8_t value) void FrskyRSSI::set(uint8_t value)
{ {
if (this->value == 0) if (this->value == 0)
this->value = value; this->value = value;
else
this->value = (((uint16_t)this->value * 7) + value + 4) / 8; sum += value;
if (value && (!min || value < min)) if (link_counter == 0) {
min = value; this->value = sum / 8;
sum = 0;
}
if (value && (!min || value < min))
min = value;
} }
void FrskyData::set(uint8_t value, uint8_t unit) void FrskyData::set(uint8_t value, uint8_t unit)
{ {
if (unit != UNIT_VOLTS) this->value = value;
FrskyRSSI::set(value); FrskyRSSI::set(value);
if (unit != UNIT_VOLTS) {
this->value = value;
}
if (!max || value > max) if (!max || value > max)
max = value; max = value;
} }

1
src/frsky.h
View file

@ -56,6 +56,7 @@ class FrskyRSSI {
public: public:
uint8_t value; uint8_t value;
uint8_t min; uint8_t min;
uint16_t sum;
void set(uint8_t value); void set(uint8_t value);
}; };