Completing merge
This commit is contained in:
@@ -875,5 +875,3 @@ const char ArialRoundedMTBold_36[] PROGMEM = {
|
|||||||
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x78,0xF0,0x00,0x00,0x00,0x00,0x1C,0xC0,0x01,0x00,0x00,0x00,0x1E,0xC0,0x03,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x1F,0xC0,0x07,0x00,0x00,0x00,0x7F,0xF0,0x07,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x00,0xF0,0x7F,0x00,0x00,0x00,0x00,0xC0,0x1F, // 254
|
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFE,0xFF,0xFF,0xFF,0x03,0x00,0xFC,0xFF,0xFF,0xFF,0x01,0x00,0x00,0x78,0xF0,0x00,0x00,0x00,0x00,0x1C,0xC0,0x01,0x00,0x00,0x00,0x1E,0xC0,0x03,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x0F,0x80,0x07,0x00,0x00,0x00,0x1F,0xC0,0x07,0x00,0x00,0x00,0x7F,0xF0,0x07,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFE,0xFF,0x03,0x00,0x00,0x00,0xFC,0xFF,0x01,0x00,0x00,0x00,0xF0,0x7F,0x00,0x00,0x00,0x00,0xC0,0x1F, // 254
|
||||||
0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x00,0xC0,0x03,0x00,0x00,0x3F,0x00,0xC0,0x03,0x00,0x00,0xFF,0x01,0xC0,0x03,0x00,0x18,0xFF,0x07,0xC0,0x03,0x00,0x3C,0xFC,0x3F,0xE0,0x03,0x00,0x3C,0xE0,0xFF,0xF0,0x03,0x00,0x18,0x00,0xFF,0xFF,0x03,0x00,0x00,0x00,0xF8,0xFF,0x01,0x00,0x00,0x00,0xC0,0xFF,0x00,0x00,0x18,0x00,0xF8,0x3F,0x00,0x00,0x3C,0x00,0xFF,0x0F,0x00,0x00,0x3C,0xC0,0xFF,0x01,0x00,0x00,0x18,0xF8,0x7F,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0x00,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x0E // 255
|
0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x0E,0x00,0xC0,0x03,0x00,0x00,0x3F,0x00,0xC0,0x03,0x00,0x00,0xFF,0x01,0xC0,0x03,0x00,0x18,0xFF,0x07,0xC0,0x03,0x00,0x3C,0xFC,0x3F,0xE0,0x03,0x00,0x3C,0xE0,0xFF,0xF0,0x03,0x00,0x18,0x00,0xFF,0xFF,0x03,0x00,0x00,0x00,0xF8,0xFF,0x01,0x00,0x00,0x00,0xC0,0xFF,0x00,0x00,0x18,0x00,0xF8,0x3F,0x00,0x00,0x3C,0x00,0xFF,0x0F,0x00,0x00,0x3C,0xC0,0xFF,0x01,0x00,0x00,0x18,0xF8,0x7F,0x00,0x00,0x00,0x00,0xFE,0x0F,0x00,0x00,0x00,0x00,0xFF,0x01,0x00,0x00,0x00,0x00,0x7F,0x00,0x00,0x00,0x00,0x00,0x0E // 255
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -103,4 +103,3 @@ TS_Point TouchController::getPoint() {
|
|||||||
p.y = y;
|
p.y = y;
|
||||||
return p;
|
return p;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,4 +33,3 @@ class TouchController {
|
|||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user