From 95f7dbf1023dfa0cf84e596f9f1bbdb221c67712 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 24 Mar 2014 00:34:12 +0100 Subject: [PATCH] Missing change in old telemetry protocol for #534 FAS offset range increased to +/-12A. Was initially limited to +/-1.5A to use only 5 bits, but later changes gave it a whole 8bit int. --- radio/src/gui/menu_model.cpp | 2 +- radio/src/telemetry/frsky.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 6e44217eb..7d235f845 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -5620,7 +5620,7 @@ void menuModelTelemetry(uint8_t event) lcd_outdezAtt(TELEM_COL2, y, g_model.frsky.fasOffset, attr|LEFT|PREC1); lcd_outdezAtt(TELEM_COL2+6*FW, y, frskyData.hub.current, LEFT|PREC1); lcd_putc(TELEM_COL2+8*FW, y, 'A'); - if (attr) g_model.frsky.fasOffset = checkIncDec(event, g_model.frsky.fasOffset, -15, 15, EE_MODEL); + if (attr) g_model.frsky.fasOffset = checkIncDec(event, g_model.frsky.fasOffset, -120, 120, EE_MODEL); break; #endif diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index 45394bff0..6d3c0736a 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -192,7 +192,7 @@ void parseTelemHubByte(uint8_t byte) case offsetof(FrskySerialData, current): #if defined(FAS_OFFSET) || !defined(CPUM64) - if(((int16_t)frskyData.hub.current + g_model.frsky.fasOffset)>0) + if ((int16_t)frskyData.hub.current > 0 && ((int16_t)frskyData.hub.current + g_model.frsky.fasOffset) > 0) frskyData.hub.current += g_model.frsky.fasOffset; else frskyData.hub.current = 0;