Merge branch 'kilrah/FAS_Offset_compensation' into kilrah/Switch_and_pot_warnings

Conflicts: src/translations/es.h src/translations/es.h.txt
2013-11-30 12:40:25 +01:00
parent 9aa5e6d5b5 c31f184813
commit 9f25f558fd
18 changed files with 21 additions and 0 deletions
@@ -191,6 +191,10 @@ void parseTelemHubByte(uint8_t byte)
      break;

    case offsetof(FrskySerialData, current):
+      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;