Some minor improvements.

[oswald.git] / ui / oswald_watch_faces.c

diff --git a/ui/oswald_watch_faces.c b/ui/oswald_watch_faces.c
index bfbf641ca5b849765865acb9660b7229cb5cd025..b955c74af738776008b35a775c8617b7c6d7dbf4 100644 (file)
--- a/ui/oswald_watch_faces.c
+++ b/ui/oswald_watch_faces.c
@@ -160,12 +160,7 @@ void DrawLcdAnaClock(boolean show_seconds)
        hal_lcd_clear_display();
 
        snprintf(tstr, 16, "%2d", OswaldClk.day);
-#if 0
-       SetFont(MetaWatch16);
-       WriteLcdString(70, 40, tstr);
-#else
-       oswald_write_string(70, 43, FONT_6x9, tstr);
-#endif
+       oswald_write_string(70, 43, FONT_6x9, FALSE, tstr);
 
        // Marker
        // plot(R*cos(360° * i/N), R*sin(360° * i/N))
@@ -215,64 +210,6 @@ void DrawLcdDigitalClock(boolean show_seconds)
        char tstr[16];
        int i;
 
-#if 0
-       SetFont(MetaWatchTime);
-
-       hal_lcd_clear_display();
-       //gRow += WriteLcdCharacter(ui, gRow, gColumn, TIME_CHARACTER_SPACE_INDEX);
-       if (OswaldClk.clk24hr) {
-               gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.hour / 10));
-               gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.hour % 10));
-       } else {
-               unsigned char val = OswaldClk.hour;
-               if (val > 12)
-                       val -= 12;
-               gRow += WriteLcdCharacter(gRow, gColumn, (val / 10));
-               gRow += WriteLcdCharacter(gRow, gColumn, (val % 10));
-       }
-       gRow += WriteLcdCharacter(gRow, gColumn, TIME_CHARACTER_COLON_INDEX);
-       gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.minute / 10));
-       gRow += WriteLcdCharacter(gRow, gColumn, (OswaldClk.minute % 10));
-
-       gRow += 3;
-       if (show_seconds) {
-               SetFont(MetaWatch16);
-               snprintf(tstr, 16, "%02d", OswaldClk.second);
-               WriteLcdString(gRow, 9, tstr);
-       };
-
-       SetFont(MetaWatch7);
-
-       if (!OswaldClk.clk24hr) {
-               if (OswaldClk.hour > 12) {
-                       WriteLcdString(gRow, 3, "PM");
-               } else {
-                       WriteLcdString(gRow, 3, "AM");
-               }
-       }
-
-       SetFont(MetaWatch16);
-
-       if (OswaldClk.day_first)
-               snprintf(tstr, 16, "%d.%d.%d", OswaldClk.day, OswaldClk.month, OswaldClk.year);
-       else
-               snprintf(tstr, 16, "%d/%d %d", OswaldClk.month, OswaldClk.day, OswaldClk.year);
-       WriteLcdString(3, 25, tstr);
-
-       draw_status_icons();
-
-       gRow = 0;
-       gColumn = 45;
-       SetFont(MetaWatch5);
-       for (i=0; i<strlen(MainMessage); i++) {
-               gRow += WriteLcdCharacter(gRow, gColumn, MainMessage[i]);
-               if (gRow > 90) {
-                       gRow = 0;
-                       gColumn += 7;
-               }
-               if (gColumn > 95)
-                       i = 255;
-       }
 #if 0
        snprintf(tstr, 16, "%d%% (%dmV)", OswaldPowerState.percent, OswaldPowerState.level);
        WriteLcdString(2, 48, tstr);
@@ -298,46 +235,58 @@ void DrawLcdDigitalClock(boolean show_seconds)
                };
        };
 #endif
-#else
        hal_lcd_clear_display();
 
        if (OswaldClk.clk24hr) {
-               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.hour / 10));
-               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.hour % 10));
+               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.hour / 10));
+               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.hour % 10));
        } else {
                unsigned char val = OswaldClk.hour;
-               if (val > 12)
+               if (val > 12) {
                        val -= 12;
-               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (val / 10));
-               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (val % 10));
+                       oswald_write_string(59, 0, FONT_6x9, FALSE, "PM");
+               } else {
+                       oswald_write_string(59, 0, FONT_6x9, FALSE, "AM");
+               }
+               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (val / 10));
+               gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (val % 10));
        }
        if (OswaldClk.second % 2)
-               oswald_write_character(gRow-4, gColumn, FONT_LCD13x21, 10);
+               oswald_write_character(gRow-4, gColumn, FONT_LCD13x21, FALSE, 10);
        gRow += 5;
-       gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.minute / 10));
-       gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, (OswaldClk.minute % 10));
-#endif
+       gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.minute / 10));
+       gRow += oswald_write_character(gRow, gColumn, FONT_LCD13x21, FALSE, (OswaldClk.minute % 10));
+
        if (show_seconds) {
-               oswald_write_character(59, 9, FONT_LCD8x13, (OswaldClk.second / 10));
-               oswald_write_character(67, 9, FONT_LCD8x13, (OswaldClk.second % 10));
+               oswald_write_character(59, 9, FONT_LCD8x13, FALSE, (OswaldClk.second / 10));
+               oswald_write_character(67, 9, FONT_LCD8x13, FALSE, (OswaldClk.second % 10));
        }
 
        if (OswaldClk.day_first)
                snprintf(tstr, 16, "%s %d.%d.%d", daynames[OswaldClk.wday], OswaldClk.day, OswaldClk.month, OswaldClk.year);
        else
                snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);
-       oswald_write_string(0, 25, FONT_6x9, tstr);
+       oswald_write_string(0, 25, FONT_DROID8x12, FALSE, tstr);
 
        gRow = 0;
        gColumn = 45;
        for (i=0; i<strlen(MainMessage); i++) {
+               // do not draw a whitespace as first character of a row
                if (gRow == 0 && MainMessage[i] == ' ')
                        continue;
-               gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, MainMessage[i]);
+               // interpret new line
+               if (MainMessage[i] == '\n') {
+                       gRow = 0;
+                       gColumn += 9;
+                       continue;
+               }
+               gRow += oswald_write_character(gRow, gColumn, FONT_DROID8x12, FALSE, MainMessage[i]);
+               // wrap to new line if line is full
                if (gRow > 90) {
                        gRow = 0;
                        gColumn += 9;
                }
+               // OK, screen ends, leave the loop, no matter what
                if (gColumn > 86)
                        i = 255;
        }