Merge branch 'next' into kilrah/Switch_and_pot_warnings
This commit is contained in:
@@ -191,10 +191,6 @@ void processHubPacket(uint8_t id, uint16_t value)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case CURRENT_ID:
|
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)
|
if (frskyData.hub.current > frskyData.hub.maxCurrent)
|
||||||
frskyData.hub.maxCurrent = frskyData.hub.current;
|
frskyData.hub.maxCurrent = frskyData.hub.current;
|
||||||
break;
|
break;
|
||||||
@@ -374,10 +370,6 @@ void processSportPacket(uint8_t *packet)
|
|||||||
}
|
}
|
||||||
else if (appId >= CURR_FIRST_ID && appId <= CURR_LAST_ID) {
|
else if (appId >= CURR_FIRST_ID && appId <= CURR_LAST_ID) {
|
||||||
frskyData.hub.current = SPORT_DATA_U32(packet);
|
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)
|
if (frskyData.hub.current > frskyData.hub.maxCurrent)
|
||||||
frskyData.hub.maxCurrent = frskyData.hub.current;
|
frskyData.hub.maxCurrent = frskyData.hub.current;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user