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

Solve merge conflict

Browse Source
This commit is contained in:
Andre Bernet
2014-02-10 15:27:53 +01:00
parent f635a1e762
commit 9ac30369e0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/frsky_sport.cpp
+8
View File
@@ -200,6 +200,10 @@ void processHubPacket(uint8_t id, uint16_t value)
break;
case CURRENT_ID:
if(((int16_t)frskyData.hub.current + g_model.frsky.fasOffset)>0)
frskyData.hub.current += g_model.frsky.fasOffset;
else
frskyData.hub.current = 0;
if (frskyData.hub.current > frskyData.hub.maxCurrent)
frskyData.hub.maxCurrent = frskyData.hub.current;
break;
@@ -382,6 +386,10 @@ void processSportPacket(uint8_t *packet)
}
else if (appId >= CURR_FIRST_ID && appId <= CURR_LAST_ID) {
frskyData.hub.current = SPORT_DATA_U32(packet);
if(((int16_t)frskyData.hub.current + g_model.frsky.fasOffset)>0)
frskyData.hub.current += g_model.frsky.fasOffset;
else
frskyData.hub.current = 0;
if (frskyData.hub.current > frskyData.hub.maxCurrent)
frskyData.hub.maxCurrent = frskyData.hub.current;
}