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

[ARM] Negative current values with PREC2, above 200.00A

Browse Source
This commit is contained in:
bsongis
2013-02-04 07:12:21 +00:00
parent 3829212bef
commit 3a1d0b1fd9
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frsky.cpp
+4 -4
View File
@@ -77,7 +77,7 @@ uint16_t getChannelRatio(uint8_t channel)
return (uint16_t)g_model.frsky.channels[channel].ratio << g_model.frsky.channels[channel].multiplier;
}
telvalue_t applyChannelRatio(uint8_t channel, telvalue_t val)
lcdint_t applyChannelRatio(uint8_t channel, lcdint_t val)
{
return ((int32_t)val+g_model.frsky.channels[channel].offset) * getChannelRatio(channel) * 2 / 51;
}
@@ -1045,7 +1045,7 @@ const pm_uint8_t bchunit_ar[] PROGMEM = {
UNIT_METERS, // GPS Alt
};
void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, telvalue_t val, uint8_t att)
void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, uint8_t att)
{
switch (channel) {
case TELEM_TM1-1:
@@ -1061,12 +1061,12 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, telvalue_t val
channel -= TELEM_A1-1;
// A1 and A2
{
telvalue_t converted_value = applyChannelRatio(channel, val);
lcdint_t converted_value = applyChannelRatio(channel, val);
if (g_model.frsky.channels[channel].type >= UNIT_RAW) {
converted_value /= 10;
}
else {
if (converted_value < 1000) {
if (abs(converted_value) < 1000) {
att |= PREC2;
}
else {