From ed094f89e86e4b4d72f040d639db1c2a4d3d9abe Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 6 Jul 2014 08:49:35 +0200 Subject: [PATCH] Fixes #1458 - Incorrect display of free mem on statistics page lcd_outdezNAtt() on ARM was casting values to uint16_t. --- radio/src/lcd_common.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/lcd_common.cpp b/radio/src/lcd_common.cpp index 883c9be5d..0950d9863 100644 --- a/radio/src/lcd_common.cpp +++ b/radio/src/lcd_common.cpp @@ -324,13 +324,13 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t if (dblsize) x++; for (uint8_t i=1; i<=len; i++) { - div_t qr = div((uint16_t)val, 10); + div_t qr = div(val, 10); char c = qr.rem + '0'; LcdFlags f = flags; #if !defined(PCBTARANIS) if (dblsize) { if (c=='1' && i==len && xn>x+10) { x+=1; } - if ((uint16_t)val >= 1000) { x+=FWNUM; f&=~DBLSIZE; } + if (val >= 1000) { x+=FWNUM; f&=~DBLSIZE; } } #endif lcd_putcAtt(x, y, c, f); @@ -379,7 +379,7 @@ void lcd_outdezNAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags flags, uint8_t } } #if !defined(PCBTARANIS) - if (dblsize && (uint16_t)val >= 1000 && (uint16_t)val < 10000) x-=2; + if (dblsize && val >= 1000 && val < 10000) x-=2; #endif val = qr.quot; x -= fw;