#include "oswald.h"
#include "oswald_main.h"
-#include "Fonts.h"
-#include "LcdDisplay.h"
#include "oswald_hal.h"
#include "oswald_graphics.h"
}
} else {
if (OswaldPowerState.percent > 75)
- oswald_draw_bitmap_offset(81, 0, 0,0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);
+ oswald_draw_bitmap(81, 0, battery100_icon_width, battery100_icon_height, battery100_icon_bits);
else if (OswaldPowerState.percent > 50)
- oswald_draw_bitmap_offset(81, 0, 0,0, battery75_icon_width, battery75_icon_height, battery75_icon_bits);
+ oswald_draw_bitmap(81, 0, battery75_icon_width, battery75_icon_height, battery75_icon_bits);
else if (OswaldPowerState.percent > 25)
- oswald_draw_bitmap_offset(81, 0, 0,0, battery50_icon_width, battery50_icon_height, battery50_icon_bits);
+ oswald_draw_bitmap(81, 0, battery50_icon_width, battery50_icon_height, battery50_icon_bits);
else if (OswaldPowerState.percent > 5)
- oswald_draw_bitmap_offset(81, 0, 0,0, battery25_icon_width, battery25_icon_height, battery25_icon_bits);
+ oswald_draw_bitmap(81, 0, battery25_icon_width, battery25_icon_height, battery25_icon_bits);
else
- oswald_draw_bitmap_offset(81, 0, 0,0, battery0_icon_width, battery0_icon_height, battery0_icon_bits);
+ oswald_draw_bitmap(81, 0, battery0_icon_width, battery0_icon_height, battery0_icon_bits);
}
if (hal_bluetooth_get_state() == BLUETOOTH_ON)
hal_lcd_clear_display();
- snprintf(tstr, 16, "%02d", OswaldClk.day);
-#if 0
- SetFont(MetaWatch16);
- WriteLcdString(70, 40, tstr);
-#else
- oswald_write_string(70, 43, FONT_7x12b, tstr);
-#endif
+ snprintf(tstr, 16, "%2d", OswaldClk.day);
+ oswald_write_string(70, 43, FONT_6x9, FALSE, tstr);
// Marker
// plot(R*cos(360° * i/N), R*sin(360° * i/N))
hal_lcd_update_display();
}
+static const char *daynames[7] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
+
void DrawLcdDigitalClock(boolean show_seconds)
{
- int gRow = 3;
- int gColumn = 3;
+ int gRow = 1;
+ int gColumn = 1;
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);
};
};
#endif
-#else
hal_lcd_clear_display();
- snprintf(tstr, 16, "%02d", OswaldClk.hour);
- oswald_write_string(0, 0, FONT_16x26, tstr);
- oswald_write_character(26, 0, FONT_16x26, ':');
- snprintf(tstr, 16, "%02d", OswaldClk.minute);
- oswald_write_string(36, 0, FONT_16x26, tstr);
+
+ if (OswaldClk.clk24hr) {
+ 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) {
+ val -= 12;
+ 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, FALSE, 10);
+ gRow += 5;
+ 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, FALSE, (OswaldClk.second / 10));
+ oswald_write_character(67, 9, FONT_LCD8x13, FALSE, (OswaldClk.second % 10));
+ }
if (OswaldClk.day_first)
- snprintf(tstr, 16, "%d.%d.%d", OswaldClk.day, OswaldClk.month, OswaldClk.year);
+ snprintf(tstr, 16, "%s %d.%d.%d", daynames[OswaldClk.wday], OswaldClk.day, OswaldClk.month, OswaldClk.year);
else
- snprintf(tstr, 16, "%d/%d %d", OswaldClk.month, OswaldClk.day, OswaldClk.year);
- oswald_write_string(0, 25, FONT_7x12b, tstr);
+ snprintf(tstr, 16, "%s %d/%d %d", daynames[OswaldClk.wday], OswaldClk.month, OswaldClk.day, OswaldClk.year);
+ oswald_write_string(0, 25, FONT_DROID8x12, FALSE, tstr);
gRow = 0;
gColumn = 45;
for (i=0; i<strlen(MainMessage); i++) {
- gRow += oswald_write_character(gRow, gColumn, FONT_6x8, MainMessage[i]);
+ // do not draw a whitespace as first character of a row
+ if (gRow == 0 && MainMessage[i] == ' ')
+ continue;
+ // 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;
}
- if (gColumn > 95)
+ // OK, screen ends, leave the loop, no matter what
+ if (gColumn > 86)
i = 255;
}
draw_status_icons();
-#endif
+
hal_lcd_update_display();
}
projects / oswald.git / blobdiff