Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 12:55:19 +03:00
Code Issues Wiki Activity

Some fixes for what looks like merge problems introduced by #9012.

Browse source
This commit is contained in:
mikeller 2019-11-25 19:01:27 +13:00
parent a65a4049ad
commit 21b9fba3bf
3 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/io/displayport_hott.c
View file

@ -56,7 +56,7 @@ static int hottWriteString(displayPort_t *displayPort, uint8_t col, uint8_t row,
UNUSED(attr); UNUSED(attr);
while (*s) { while (*s) {
hottWriteChar(displayPort, col++, row, 0, *(s++)); hottWriteChar(displayPort, col++, row, DISPLAYPORT_ATTR_NONE, *(s++));
} }
return 0; return 0;
} }
@ -65,7 +65,7 @@ static int hottClearScreen(displayPort_t *displayPort)
{ {
for (int row = 0; row < displayPort->rows; row++) { for (int row = 0; row < displayPort->rows; row++) {
for (int col= 0; col < displayPort->cols; col++) { for (int col= 0; col < displayPort->cols; col++) {
hottWriteChar(displayPort, col, row, 0, ' '); hottWriteChar(displayPort, col, row, DISPLAYPORT_ATTR_NONE, ' ');
} }
} }
return 0; return 0;

3
src/main/io/displayport_msp.c
View file

@ -29,9 +29,6 @@
#include "common/utils.h" #include "common/utils.h"
#include "pg/pg.h"
#include "pg/pg_ids.h"
#include "drivers/display.h" #include "drivers/display.h"
#include "io/displayport_msp.h" #include "io/displayport_msp.h"

2
src/main/osd/osd.h
View file

@ -22,8 +22,6 @@
#include "common/time.h" #include "common/time.h"
#include "drivers/display.h"
#include "pg/pg.h" #include "pg/pg.h"
#include "sensors/esc_sensor.h" #include "sensors/esc_sensor.h"