diff --git a/radio/src/Makefile b/radio/src/Makefile index 482cdbb21..1341f5cb6 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -285,7 +285,7 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) ARCH = AVR TRGT = avr- MCU = atmega64 - OPT = s + OPT = s SDCARD = NO THR_TRACE = NO INCDIRS += targets/stock diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index 9f3fb2d46..93d229ab8 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -2271,7 +2271,8 @@ void DrawCurve(uint8_t offset=0) uint8_t i = 0; do { - point_t point = getPoint(i++); + point_t point = getPoint(i); + i++; if (point.x == 0) break; lcd_filled_rect(point.x-offset, point.y-1, 3, 3, SOLID, FORCE); // do markup square } while(1); diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp index 3034f38ec..6613653f0 100644 --- a/radio/src/lcd.cpp +++ b/radio/src/lcd.cpp @@ -64,7 +64,8 @@ void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags for (uint8_t yb = 0; yb < hb; yb++) { uint8_t *p = &displayBuf[ (y / 8 + yb) * LCD_W + x ]; for (xcoord_t i=0; i> 1) | 0x80; @@ -679,7 +679,6 @@ void lcd_hlineStip(xcoord_t x, uint8_t y, xcoord_t w, uint8_t pat, LcdFlags att) else { pat = pat >> 1; } - w--; p++; } } diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index cdefd2577..683cb886e 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -4817,7 +4817,8 @@ void stack_paint() q = &__bss_end ; p -= 2 ; while ( p > q ) - *p-- = 0x55 ; + *p = 0x55 ; + p--; } uint16_t stack_free() @@ -4825,10 +4826,7 @@ uint16_t stack_free() unsigned char *p ; p = &__bss_end + 1 ; - while ( *p == 0x55 ) - { - p+= 1 ; - } + while ( *p++ == 0x55 ); return p - &__bss_end ; } #endif