From e95af52d98ec1bdaa5987eda33c3a9c0fb5c47d4 Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 29 Jun 2012 20:37:07 +0000 Subject: [PATCH] Small flash saving (36bytes) --- src/general_menus.cpp | 3 ++- src/lcd.cpp | 1 - src/lcd.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/general_menus.cpp b/src/general_menus.cpp index 9755eca84..8c0250d43 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -792,7 +792,8 @@ void menuProcDiagAna(uint8_t event) for (uint8_t i=0; i<7; i++) { uint8_t y = 1+FH+(i/2)*FH; uint8_t x = i&1 ? 64+5 : 0; - putsStrIdx(x, y, PSTR("A"), i+1, TWO_DOTS); + putsStrIdx(x, y, PSTR("A"), i+1); + lcd_putc(x+2*FWNUM, y, ':'); lcd_outhex4(x+3*FW-1, y, anaIn(i)); lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i+1)-1]*25/256); } diff --git a/src/lcd.cpp b/src/lcd.cpp index 741895931..eec240bfe 100644 --- a/src/lcd.cpp +++ b/src/lcd.cpp @@ -469,7 +469,6 @@ void putsStrIdx(uint8_t x, uint8_t y, const pm_char *str, uint8_t idx, uint8_t a { lcd_putsAtt(x, y, str, att & ~BSS); // TODO use something else than BSS for LEADING0 lcd_outdezNAtt(lcdLastPos, y, idx, att|LEFT, 2); - if (att&TWO_DOTS) lcd_putc(lcdLastPos, y, ':'); lcd_putsAtt(x, y, str, att & ~BSS); // TODO use something else than BSS for LEADING0 } diff --git a/src/lcd.h b/src/lcd.h index c7454ac6f..e8b70a7dd 100644 --- a/src/lcd.h +++ b/src/lcd.h @@ -75,9 +75,6 @@ /* telemetry flags */ #define NO_UNIT 0x40 -/* other flags */ -#define TWO_DOTS LEFT - extern uint8_t displayBuf[DISPLAY_W*DISPLAY_H/8]; extern uint8_t lcdLastPos;