character map tweaks: add some ligatures and symbols

diff --git a/movement/watch_faces/complication/pulsometer_face.c b/movement/watch_faces/complication/pulsometer_face.c
index 28ca1a50fcaf5b49f05a6a877155e7e052fccc99..1d6f2086ed0814834ee1e44fde6662a95684c3a7 100644 (file)
--- a/movement/watch_faces/complication/pulsometer_face.c
+++ b/movement/watch_faces/complication/pulsometer_face.c
@@ -73,7 +73,7 @@ bool pulsometer_face_loop(movement_event_t event, movement_settings_t *settings,
                         watch_display_string(" Alarn", 4);
                         break;
                     case 2:
-                        watch_display_string("+   Count ", 0);
+                        watch_display_string("*   Count ", 0);
                         break;
                     case 3:
                         watch_display_string("  30Beats ", 0);

diff --git a/movement/watch_faces/complication/sunrise_sunset_face.c b/movement/watch_faces/complication/sunrise_sunset_face.c
index fef9b4dfecb6487e7fce0ec731e2c62dc37dbb8c..8dea812e6b274e56559d2cbaf89ae2384839a6ef 100644 (file)
--- a/movement/watch_faces/complication/sunrise_sunset_face.c
+++ b/movement/watch_faces/complication/sunrise_sunset_face.c
@@ -188,10 +188,10 @@ static void _sunrise_sunset_face_update_settings_display(movement_event_t event,
 
     switch (state->page) {
         case 1:
-            sprintf(buf, "LA  %c %04d", state->working_latitude.sign ? '-' : 'F', abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude))); // F looks sorta like a plus sign in position 1
+            sprintf(buf, "LA  %c %04d", state->working_latitude.sign ? '-' : '+', abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)));
             break;
         case 2:
-            sprintf(buf, "LO  %c%05d", state->working_longitude.sign ? '-' : 'F', abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)));
+            sprintf(buf, "LO  %c%05d", state->working_longitude.sign ? '-' : '+', abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)));
             break;
     }
     if (event.subsecond % 2) {

diff --git a/watch-library/shared/watch/watch_private_display.h b/watch-library/shared/watch/watch_private_display.h
index 08597848251d0346a290874f85e324aff6ffe006..11219cf1489b45924d15eb4c8de03d59ba45fd06 100644 (file)
--- a/watch-library/shared/watch/watch_private_display.h
+++ b/watch-library/shared/watch/watch_private_display.h
@@ -33,14 +33,14 @@ static const uint8_t Character_Set[] =
     0b01100000, // ! (L in the top half for positions 4 and 6)
     0b00100010, // "
     0b01100011, // # (degree symbol, hash mark doesn't fit)
-    0b00000000, // $ (unused)
+    0b00101101, // $ (S without the center segment)
     0b00000000, // % (unused)
     0b01000100, // & ("lowercase 7" for positions 4 and 6)
     0b00100000, // '
     0b00111001, // (
     0b00001111, // )
-    0b00000000, // * (unused)
-    0b11000000, // + (only works in position 0)
+    0b11000000, // * (The + sign for use in position 0)
+    0b01110000, // + (segments E, F and G; looks like ┣╸)
     0b00000100, // ,
     0b01000000, // -
     0b01000000, // . (same as -, semantically most useful)
@@ -120,9 +120,9 @@ static const uint8_t Character_Set[] =
     0b01111110, // x
     0b01101110, // y
     0b00011011, // z
-    0b00111001, // {
-    0b00110000, // |
-    0b00001111, // }
+    0b00010110, // { (open brace doesn't really work; overriden to represent the two character ligature "il")
+    0b00110110, // | (overriden to represent the two character ligature "ll")
+    0b00110100, // } (overriden to represent the two character ligature "li")
     0b00000001, // ~
 };