3 files changed, 10 insertions, 6 deletions

diff --git a/firmware/drivers/lcd-h100.c b/firmware/drivers/lcd-h100.c
index 666949ff72..23c88100b9 100644
--- a/firmware/drivers/lcd-h100.c
+++ b/firmware/drivers/lcd-h100.c
@@ -312,17 +312,17 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h)
 
 static void setpixel(int x, int y)
 {
-    lcd_framebuffer[y/8][x] |= 1 << (y & 7);
+    DRAW_PIXEL(x, y);
 }
 
 static void clearpixel(int x, int y)
 {
-    lcd_framebuffer[y/8][x] &= ~(1 << (y & 7));
+    CLEAR_PIXEL(x, y);
 }
 
 static void flippixel(int x, int y)
 {
-    lcd_framebuffer[y/8][x] ^= 1 << (y & 7);
+    INVERT_PIXEL(x, y);
 }
 
 static void nopixel(int x, int y)
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 1255516b51..d464e30f0a 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -371,17 +371,17 @@ int lcd_getstringsize(const unsigned char *str, int *w, int *h)
 
 static void setpixel(int x, int y)
 {
-    lcd_framebuffer[y/8][x] |= 1 << (y & 7);
+    DRAW_PIXEL(x, y);
 }
 
 static void clearpixel(int x, int y)
 {
-    lcd_framebuffer[y/8][x] &= ~(1 << (y & 7));
+    CLEAR_PIXEL(x, y);
 }
 
 static void flippixel(int x, int y)
 {
-    lcd_framebuffer[y/8][x] ^= 1 << (y & 7);
+    INVERT_PIXEL(x, y);
 }
 
 static void nopixel(int x, int y)
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 3824096aba..7456aa77a9 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -122,6 +122,10 @@ extern void lcd_jump_scroll_delay(int ms);
 #define DRMODE_SOLID      3
 #define DRMODE_INVERSEVID 4 /* used as bit modifier for basic modes */
 
+#define DRAW_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] |= (1<<((y)&7))      
+#define CLEAR_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] &= ~(1<<((y)&7))
+#define INVERT_PIXEL(x,y) lcd_framebuffer[(y)/8][(x)] ^= (1<<((y)&7))
+
 typedef void lcd_pixelfunc_type(int x, int y); /* for b&w */
 typedef void lcd_blockfunc_type(unsigned char *address, unsigned mask, unsigned bits);