Merge branch 'base'

benma · benma · commit b50287dec59f · 2022-11-01T11:16:42.000+01:00
diff --git a/src/ui/oled/oled.c b/src/ui/oled/oled.c
@@ -143,13 +143,7 @@ void oled_clear_buffer(void)
 
 void oled_mirror(bool mirror)
 {
-#if PLATFORM_BITBOX02 == 1
     bb02_display.mirror(mirror);
-#elif PLATFORM_BITBOXBASE == 1
-    (void)mirror;
-    // DON'T ABORT HERE, this is called in the bootloader
-    screen_print_debug("BitBoxBase cannot mirror screen", 5000);
-#endif
 }
 
 void oled_set_pixel(uint16_t x, uint16_t y, uint8_t c)

Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,7 @@ void oled_clear_buffer(void)`
`143`	`143`
`144`	`144`	`void oled_mirror(bool mirror)`
`145`	`145`	`{`
`146`		`-#if PLATFORM_BITBOX02 == 1`
`147`	`146`	`bb02_display.mirror(mirror);`
`148`		`-#elif PLATFORM_BITBOXBASE == 1`
`149`		`- (void)mirror;`
`150`		`- // DON'T ABORT HERE, this is called in the bootloader`
`151`		`- screen_print_debug("BitBoxBase cannot mirror screen", 5000);`
`152`		`-#endif`
`153`	`147`	`}`
`154`	`148`
`155`	`149`	`void oled_set_pixel(uint16_t x, uint16_t y, uint8_t c)`