diff options
Diffstat (limited to 'src/displayapp/screens/Symbols.h')
| -rw-r--r-- | src/displayapp/screens/Symbols.h | 144 |
1 files changed, 89 insertions, 55 deletions
diff --git a/src/displayapp/screens/Symbols.h b/src/displayapp/screens/Symbols.h index 86b4b8b..83ccee6 100644 --- a/src/displayapp/screens/Symbols.h +++ b/src/displayapp/screens/Symbols.h @@ -25,6 +25,24 @@ 0 \ } +#define H( \ + A,B,C,a,b,c, \ + D,E,F,d,e,f, \ + G,H,I,g,h,i, \ + J,K,L,j,k,l, \ + M,N,O,m,n,o \ +) { \ + ((char)( 0xF3 )), \ + ((char)( 0xB8 | (I<<2) | (J<<1) | K )), \ + ((char)( 0x80 | (L<<5) | (M<<4) | (N<<3) | (O<<2) | (A<<1) | B )), \ + ((char)( 0x80 | (C<<5) | (D<<4) | (E<<3) | (F<<2) | (G<<1) | H )), \ + ((char)( 0xF3 )), \ + ((char)( 0xB0 | (i<<2) | (j<<1) | k )), \ + ((char)( 0x80 | (l<<5) | (m<<4) | (n<<3) | (o<<2) | (a<<1) | b )), \ + ((char)( 0x80 | (c<<5) | (d<<4) | (e<<3) | (f<<2) | (g<<1) | h )), \ + 0 \ +} + #define X 1 #define _ 0 @@ -35,46 +53,46 @@ namespace Pinetime { static constexpr const char* none = ""; static constexpr const char batteryFull[] = // "\xEF\x89\x80"; - G(_, X, _, - X, X, X, - X, X, X, - X, X, X, - X, X, X); + H(X, X, X, X, X, _, + X, X, X, X, X, X, + X, X, X, X, X, X, + X, X, X, X, X, _, + _, _, _, _, _, _); static constexpr const char batteryEmpty[] = // "\xEF\x89\x84"; - G(_, X, _, - X, _, X, - X, _, X, - X, _, X, // l is ignored! - X, X, X); + H(X, X, X, X, X, _, + X, _, _, _, _, X, + X, _, _, _, _, X, + X, X, X, X, X, _, + _, _, _, _, _, _); static constexpr const char batteryThreeQuarter[] = // Was: "\xEF\x89\x81"; - G(_, X, _, - X, X, X, - X, _, X, - X, X, X, - X, X, X); + H(X, X, X, X, X, _, + X, X, X, X, _, X, + X, X, X, X, _, X, + X, X, X, X, X, _, + _, _, _, _, _, _); static constexpr const char batteryHalf[] = // Was: "\xEF\x89\x82"; - G(_, X, _, - X, _, X, - X, X, X, - X, X, X, - X, X, X); + H(X, X, X, X, X, _, + X, X, X, _, _, X, + X, X, X, _, _, X, + X, X, X, X, X, _, + _, _, _, _, _, _); static constexpr const char batteryOneQuarter[] = // Was: "\xEF\x89\x83"; - G(_, X, _, - X, _, X, - X, _, X, - X, X, X, - X, X, X); + H(X, X, X, X, X, _, + X, X, _, _, _, X, + X, X, _, _, _, X, + X, X, X, X, X, _, + _, _, _, _, _, _); static constexpr const char heartBeat[] = // Was: "\xEF\x88\x9E" - G(_, _, _, - X, _, X, - X, X, X, - _, X, _, - _, _, _); + H(_, X, _, X, _, _, + X, X, X, X, X, _, + X, X, X, X, X, _, + _, X, X, X, _, _, + _, _, X, _, _, _); static constexpr const char bluetoothFull[] = // "\xEF\x8A\x93"; G(X, X, _, @@ -105,11 +123,11 @@ namespace Pinetime { X, _, _); static constexpr const char music[] = // "\xEF\x80\x81"; - G(_, X, X, - _, _, X, - _, X, X, - X, X, X, - _, X, _); + H(_, X, X, X, X, X, + _, X, _, _, _, X, + _, X, _, _, _, X, + X, X, _, _, X, X, + X, X, _, _, X, X); static constexpr const char* clock = "\xEF\x80\x97"; static constexpr const char* info = "\xEF\x84\xA9"; static constexpr const char* list = "\xEF\x80\xBA"; @@ -164,18 +182,33 @@ namespace Pinetime { X, _, _); static constexpr const char hourGlass[] = // "\xEF\x89\x92"; - G(X, X, X, - X, X, X, - _, X, _, - X, X, X, - X, X, X); + H(_, X, X, X, X, _, + _, X, _, _, X, _, + _, _, X, X, _, _, + _, X, X, X, X, _, + _, X, X, X, X, _); + // G(X, X, X, + // X, _, X, + // _, X, _, + // X, X, X, + // X, X, X); static constexpr const char lapsFlag[] = // "\xEF\x80\xA4"; - G(_, X, _, - X, _, X, - X, _, _, - X, _, X, - _, X, _); + H(X, X, X, _, _, X, + X, X, X, X, X, X, + X, X, X, X, X, X, + X, _, _, X, X, _, + X, _, _, _, _, _); + // H(_, X, X, X, _, _, + // K, _, X, _, X, _, + // X, _, X, _, X, _, + // X, _, _, _, X, _, + // _, X, X, X, _, _); + // G(_, X, _, + // X, _, X, + // X, _, _, + // X, _, X, + // _, X, _); static constexpr const char* drum = "\xEF\x95\xA9"; static constexpr const char* chartLine = "\xEF\x88\x81"; static constexpr const char* eye = "\xEF\x81\xAE"; @@ -184,11 +217,11 @@ namespace Pinetime { // lv_font_sys_48.c static constexpr const char settings[] = // "\xEE\xA4\x82"; // e902 - G(_, X, X, - X, _, _, - _, X, X, - _, X, _, - _, X, _); + H(X, X, X, _, _, _, + _, _, X, X, X, X, + _, _, X, X, X, X, + X, X, X, _, _, _, + _, _, _, _, _, _); static constexpr const char brightnessHigh[] = // "\xEE\xA4\x84"; // e904 @@ -229,16 +262,17 @@ namespace Pinetime { static constexpr const char highlight[] = // "\xEE\xA4\x87"; // e907 - G(X, X, X, - X, X, X, - _, X, _, - _, X, _, - _, X, _); + H(_, _, _, X, X, _, + X, X, X, _, _, X, + X, X, X, X, _, X, + X, X, X, _, _, X, + _, _, _, X, X, _); } } } } +#undef H #undef G #undef X #undef _ |