Bluetooth handling, screen reworks for icons

diff --git a/ui/Bluetooth_icon.xbm b/ui/Bluetooth_icon.xbm
new file mode 100644 (file)
index 0000000..82ee5d1
--- /dev/null
+++ b/ui/Bluetooth_icon.xbm
@@ -0,0 +1,10 @@
+#define Bluetooth_icon_width 24
+#define Bluetooth_icon_height 24
+static unsigned char Bluetooth_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x6c, 0x00,
+  0x10, 0xcc, 0x00, 0x30, 0x8c, 0x01, 0x60, 0x0c, 0x03, 0xc0, 0x0c, 0x06,
+  0x80, 0x0d, 0x03, 0x00, 0x8f, 0x01, 0x00, 0xce, 0x00, 0x00, 0x7c, 0x00,
+  0x00, 0x3c, 0x00, 0x00, 0x6e, 0x00, 0x00, 0xcf, 0x00, 0x80, 0x8d, 0x01,
+  0xc0, 0x0c, 0x03, 0x60, 0x0c, 0x06, 0x30, 0x0c, 0x03, 0x10, 0x8c, 0x01,
+  0x00, 0xcc, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x1c, 0x00,
+  };

diff --git a/ui/LcdDisplay.c b/ui/LcdDisplay.c
index f889bbc4ba7b7b118f95ff2212fd5379a090831d..725908a4ab999860fbe6cb865b69ad6bfab5baa1 100644 (file)
--- a/ui/LcdDisplay.c
+++ b/ui/LcdDisplay.c
@@ -5,6 +5,21 @@
 
 #include "LcdDisplay.h"
 
 
 #include "LcdDisplay.h"
 

+void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp)
+{
+       uint8_t x, y;
+       uint8_t *cb;
+
+       // we only draw set pixel, unset pixel remain as they are
+       for (y=0; y<height; y++) {
+               for (x=0; x<width; x++) {
+                       cb = (uint8_t *)(bmp + (y * ((width / 8)+((width % 8) ? 1:0))) + (x / 8));
+                       if (*cb & (1 << (x % 8)))
+                               hal_lcd_set_pixel(xstart + x, ystart + y, TRUE);
+               }
+       }
+}
+

 void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend)
 {
        int x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
 void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend)
 {
        int x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;

diff --git a/ui/LcdDisplay.h b/ui/LcdDisplay.h
index e2725c921b53a1d6dd08b66d5ef5dbc1fee87c4a..42152f09182a04aec2af69729e0d11951af62633 100644 (file)
--- a/ui/LcdDisplay.h
+++ b/ui/LcdDisplay.h
@@ -3,6 +3,7 @@
 
 // #include "oswald_hal.h"
 
 
 // #include "oswald_hal.h"
 

+void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp);

 void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend);
 void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
 u8t WriteLcdCharacter(u8t x, u8t y, u8t Character);
 void DrawLcdLineBresenham(u8t xstart, u8t ystart, u8t xend, u8t yend);
 void DrawLcdLineBresenhamWW(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
 u8t WriteLcdCharacter(u8t x, u8t y, u8t Character);

diff --git a/ui/Oswald.xbm b/ui/Oswald.xbm
new file mode 100644 (file)
index 0000000..4119f6c
--- /dev/null
+++ b/ui/Oswald.xbm
@@ -0,0 +1,84 @@
+#define Oswald_width 80
+#define Oswald_height 96
+static const char Oswald_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x0F, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x3F, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xFF, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0xF8, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0xF0, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 
+  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0x0F, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0x0F, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0xFE, 0x3F, 0x00, 0x00, 0x00, 0x00, 0xBA, 0x01, 0x00, 0x00, 0xF8, 
+  0x3F, 0x00, 0x00, 0x00, 0xC0, 0xFF, 0x3F, 0x00, 0x00, 0xF0, 0x7F, 0x00, 
+  0x00, 0x00, 0xE0, 0xFF, 0xFF, 0x00, 0x00, 0xE0, 0x7F, 0x00, 0x00, 0x00, 
+  0xF0, 0xFF, 0xFF, 0x03, 0x00, 0xE0, 0x7F, 0x00, 0x00, 0x00, 0xF8, 0xFF, 
+  0xFF, 0x0F, 0x00, 0xC0, 0x7F, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x3F, 
+  0x00, 0xC0, 0x7F, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0x7F, 0x00, 0xC0, 
+  0x7F, 0x00, 0x00, 0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0x00, 0x80, 0x7F, 0x00, 
+  0x00, 0x00, 0xF0, 0xFF, 0xFF, 0xFF, 0x03, 0x80, 0x3F, 0x00, 0x00, 0x00, 
+  0xE0, 0xFF, 0xFF, 0xFF, 0x07, 0x80, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x59, 
+  0xE9, 0xFF, 0x0F, 0xC0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, 
+  0xFF, 0xFF, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0xFF, 0xFF, 
+  0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xE0, 0x83, 0x0F, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xC0, 0x01, 0x0F, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x0C, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 
+  0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 
+  0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x18, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x10, 0x18, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x83, 0x07, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x83, 0x07, 0x78, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x81, 
+  0x0F, 0x7C, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x07, 0x7C, 
+  0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xC3, 0x07, 0x7C, 0x38, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x83, 0x07, 0x7C, 0x38, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x80, 0x87, 0x07, 0x7C, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x80, 0xCF, 0x07, 0x7C, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xCF, 
+  0x87, 0x7C, 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xF0, 0x03, 
+  0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xF8, 0x03, 0x16, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0xF8, 0x03, 0x13, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x1A, 0xF0, 0x81, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x34, 0x00, 0xC0, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC8, 
+  0x01, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0xF7, 0xCF, 
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x58, 0xFC, 0x1E, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0xE0, 0x9F, 0xFF, 0x67, 0xFE, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0xF8, 0xBF, 0xF0, 0x63, 0xFE, 0x07, 0x00, 0x00, 0x00, 0x00, 
+  0xFC, 0xFF, 0xE6, 0xFF, 0xFF, 0x0F, 0x00, 0x00, 0x00, 0x00, 0xDF, 0xFF, 
+  0xDF, 0xA2, 0xFF, 0x3F, 0x00, 0x00, 0x00, 0x80, 0xE1, 0xEF, 0x00, 0xF1, 
+  0xB6, 0x63, 0x00, 0x00, 0x00, 0x40, 0x00, 0x74, 0x00, 0xF0, 0x13, 0x80, 
+  0x00, 0x00, 0x00, 0x70, 0x00, 0x96, 0x00, 0x9C, 0x21, 0x00, 0x01, 0x00, 
+  0x00, 0x48, 0xC0, 0x89, 0x03, 0x27, 0xC1, 0x00, 0x01, 0x00, 0x00, 0x64, 
+  0xD1, 0xC8, 0xFE, 0x66, 0x82, 0x11, 0x01, 0x00, 0x00, 0x3C, 0x33, 0x44, 
+  0x06, 0x3C, 0x02, 0x91, 0x03, 0x00, 0x00, 0x10, 0x11, 0x84, 0x03, 0x00, 
+  0x02, 0xB3, 0x04, 0x00, 0x00, 0xE0, 0x09, 0x04, 0x01, 0x00, 0x02, 0xB1, 
+  0x04, 0x00, 0x00, 0x00, 0x07, 0x04, 0x00, 0x00, 0x02, 0x91, 0x05, 0x00, 
+  0x00, 0x00, 0x02, 0x08, 0x00, 0x00, 0x07, 0x9E, 0x07, 0x00, 0x00, 0x00, 
+  0x00, 0x0C, 0x00, 0x00, 0x04, 0xE0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x04, 
+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0xA4, 0xC7, 0x07, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x78, 0xF9, 0x0F, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0xFE, 0x0F, 0xFE, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0xFF, 0x00, 0xF0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 
+  0x00, 0xE0, 0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xE0, 
+  0x1F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0xE0, 0x1F, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x80, 0xFF, 0x00, 0xF0, 0x1F, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0xFF, 0x01, 0xFC, 0x2F, 0x10, 0x00, 0x00, 0x00, 0x00, 
+  0x80, 0xFF, 0x05, 0xF2, 0xF3, 0xFF, 0x01, 0x00, 0x00, 0x00, 0xD4, 0xFC, 
+  0x04, 0x02, 0x3C, 0x00, 0x03, 0x00, 0x00, 0x80, 0xEF, 0x01, 0x0C, 0x8E, 
+  0x07, 0x00, 0x02, 0x00, 0x00, 0xC0, 0x00, 0x07, 0x1E, 0xF9, 0x03, 0x00, 
+  0x04, 0x00, 0x00, 0x20, 0x00, 0xFC, 0xB1, 0x81, 0x00, 0x00, 0x06, 0x00, 
+  0x00, 0x10, 0x00, 0x30, 0xE0, 0x01, 0x00, 0x00, 0x06, 0x00, 0x00, 0x10, 
+  0x00, 0x00, 0x60, 0x06, 0x00, 0x00, 0x07, 0x00, 0x00, 0x10, 0x00, 0x00, 
+  0xE0, 0x3C, 0x00, 0x80, 0x05, 0x00, 0x00, 0x38, 0x00, 0x00, 0xF8, 0x83, 
+  0x07, 0xE0, 0x02, 0x00, 0x00, 0x78, 0x00, 0x00, 0x6F, 0x7E, 0xFE, 0x3E, 
+  0x03, 0x00, 0x00, 0xD0, 0x01, 0x30, 0x30, 0xC0, 0x81, 0xC3, 0x01, 0x00, 
+  0x00, 0x20, 0xFF, 0x4F, 0x0F, 0x00, 0x0E, 0x78, 0x00, 0x00, 0x00, 0xC0, 
+  0x09, 0xFA, 0x00, 0x00, 0xF8, 0x1F, 0x00, 0x00, 0x00, 0x00, 0xFE, 0x07, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+  };

diff --git a/ui/alarm_icon.xbm b/ui/alarm_icon.xbm
new file mode 100644 (file)
index 0000000..2ba8cc3
--- /dev/null
+++ b/ui/alarm_icon.xbm
@@ -0,0 +1,10 @@
+#define alarm_icon_width 24
+#define alarm_icon_height 24
+static unsigned char alarm_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x38,
+  0x1e, 0xff, 0x78, 0xce, 0xff, 0x73, 0xe6, 0x00, 0x67, 0x70, 0x18, 0x0e,
+  0x38, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30,
+  0x0c, 0x18, 0x30, 0x0c, 0xf8, 0x31, 0x0c, 0xf8, 0x31, 0x0c, 0x00, 0x30,
+  0x0c, 0x00, 0x30, 0x0c, 0x00, 0x30, 0x18, 0x00, 0x18, 0x38, 0x00, 0x1c,
+  0x70, 0x00, 0x0e, 0xe0, 0x00, 0x07, 0xc0, 0xff, 0x03, 0x00, 0xff, 0x00,
+  };

diff --git a/ui/battery0_icon.xbm b/ui/battery0_icon.xbm
new file mode 100644 (file)
index 0000000..b23ee6f
--- /dev/null
+++ b/ui/battery0_icon.xbm
@@ -0,0 +1,7 @@
+#define battery0_icon_width 15
+#define battery0_icon_height 20
+static unsigned char battery0_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x1c, 0x00, 0x3e, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22,
+  0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22,
+  0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x3e,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/battery100_icon.xbm b/ui/battery100_icon.xbm
new file mode 100644 (file)
index 0000000..1fef144
--- /dev/null
+++ b/ui/battery100_icon.xbm
@@ -0,0 +1,7 @@
+#define battery100_icon_width 15
+#define battery100_icon_height 20
+static unsigned char battery100_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x1c, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/battery25_icon.xbm b/ui/battery25_icon.xbm
new file mode 100644 (file)
index 0000000..e3e46e4
--- /dev/null
+++ b/ui/battery25_icon.xbm
@@ -0,0 +1,7 @@
+#define battery25_icon_width 15
+#define battery25_icon_height 20
+static unsigned char battery25_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x1c, 0x00, 0x3e, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22,
+  0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22,
+  0x00, 0x22, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/battery50_icon.xbm b/ui/battery50_icon.xbm
new file mode 100644 (file)
index 0000000..141252d
--- /dev/null
+++ b/ui/battery50_icon.xbm
@@ -0,0 +1,7 @@
+#define battery50_icon_width 15
+#define battery50_icon_height 20
+static unsigned char battery50_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x1c, 0x00, 0x3e, 0x00, 0x22, 0x00, 0x22, 0x00, 0x22,
+  0x00, 0x22, 0x00, 0x22, 0x00, 0x22, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/battery75_icon.xbm b/ui/battery75_icon.xbm
new file mode 100644 (file)
index 0000000..2323dcc
--- /dev/null
+++ b/ui/battery75_icon.xbm
@@ -0,0 +1,7 @@
+#define battery75_icon_width 15
+#define battery75_icon_height 20
+static unsigned char battery75_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x1c, 0x00, 0x3e, 0x00, 0x22, 0x00, 0x22, 0x00, 0x3e,
+  0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e, 0x00, 0x3e,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/bluetooth_icon.xbm b/ui/bluetooth_icon.xbm
new file mode 100644 (file)
index 0000000..74cf698
--- /dev/null
+++ b/ui/bluetooth_icon.xbm
@@ -0,0 +1,7 @@
+#define bluetooth_icon_width 15
+#define bluetooth_icon_height 20
+static unsigned char bluetooth_icon_bits[] = {
+  0x10, 0x00, 0x30, 0x00, 0x54, 0x00, 0x38, 0x00, 0x54, 0x00, 0x30, 0x00,
+  0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/charger_icon.xbm b/ui/charger_icon.xbm
new file mode 100644 (file)
index 0000000..d6ec0ad
--- /dev/null
+++ b/ui/charger_icon.xbm
@@ -0,0 +1,7 @@
+#define charger_icon_width 15
+#define charger_icon_height 20
+static unsigned char charger_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x7c, 0x00,
+  0x7c, 0x00, 0x38, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00,
+  0x10, 0x00, 0x10, 0x00, };

diff --git a/ui/downbutton_icon.xbm b/ui/downbutton_icon.xbm
new file mode 100644 (file)
index 0000000..cd7ed6d
--- /dev/null
+++ b/ui/downbutton_icon.xbm
@@ -0,0 +1,7 @@
+#define downbutton_icon_width 15
+#define downbutton_icon_height 20
+static unsigned char downbutton_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+  0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c, 0x80, 0x7f, 0x00, 0x3f,
+  0x00, 0x1e, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/lapsebutton_icon.xbm b/ui/lapsebutton_icon.xbm
new file mode 100644 (file)
index 0000000..82ae88a
--- /dev/null
+++ b/ui/lapsebutton_icon.xbm
@@ -0,0 +1,7 @@
+#define lapsebutton_icon_width 15
+#define lapsebutton_icon_height 20
+static unsigned char lapsebutton_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x61,
+  0x00, 0x63, 0x00, 0x67, 0xc0, 0x6f, 0xc0, 0x6f, 0x00, 0x67, 0x00, 0x63,
+  0x00, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/oswald-ui.c b/ui/oswald-ui.c
index e86f0e1593bc9a930d3bf8aa1be13e3009f01685..563a7b7e51792cebc7252e2e0463a10d0a375286 100644 (file)
--- a/ui/oswald-ui.c
+++ b/ui/oswald-ui.c
@@ -35,7 +35,6 @@ void hal_lcd_set_pixel(gint x, gint y, gboolean state)
        gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix, iy+1);
        gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix+1, iy+1);
 
        gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix, iy+1);
        gdk_draw_point(GDK_DRAWABLE(ui_g->pixmap), state ? ui_g->darea->style->black_gc : ui_g->darea->style->white_gc, ix+1, iy+1);
 

-//     gtk_widget_queue_draw(ui_g->darea);

 }
 
 /* updates the actual LCD so that drawing becomes visible */
 }
 
 /* updates the actual LCD so that drawing becomes visible */


@@ -56,6 +55,45 @@ void hal_lcd_clear_display(void)
        gtk_widget_queue_draw(ui_g->darea);
 }
 
        gtk_widget_queue_draw(ui_g->darea);
 }
 

+static bluetooth_state bt_state = BLUETOOTH_OFF;
+static boolean bt_visible = FALSE;
+
+bluetooth_state hal_bluetooth_set_state(bluetooth_state state)
+{
+       bt_state = state;
+       if (bt_state == BLUETOOTH_OFF)
+               bt_visible = FALSE;
+
+       return bt_state;
+}
+
+bluetooth_state hal_bluetooth_get_state(void)
+{
+       return bt_state;
+}
+
+uint8_t *hal_bluetooth_get_local_bdaddr(void)
+{
+       static uint8_t local_bdaddr[6] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55};
+
+       return local_bdaddr;
+}
+
+void hal_bluetooth_set_visible(boolean visible)
+{
+       bt_visible = visible;
+}
+
+boolean hal_bluetooth_get_visible(void)
+{
+       return bt_visible;
+}
+
+void hal_bluetooth_send_data(const void *mdat, uint16_t mlen)
+{
+       g_printerr("write comm %d\n", mlen);
+}
+

 static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data)
 {
 static gint
 configure_event (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data)
 {

diff --git a/ui/oswald.h b/ui/oswald.h
index 31ee5cd33a0aa71a3b6e6371d5850ae560022346..ee51438c1edbe39141fc39627f3683b8db1f5208 100644 (file)
--- a/ui/oswald.h
+++ b/ui/oswald.h
@@ -1,5 +1,7 @@
 #ifndef _OSWALD_H
 #define _OSWALD_H
 #ifndef _OSWALD_H
 #define _OSWALD_H

+#include <stdio.h>
+#include <string.h>

 #include <stdint.h>
 
 //#define DEBUG 1
 #include <stdint.h>
 
 //#define DEBUG 1


@@ -55,6 +57,7 @@ typedef enum {
        IDLE_SCREEN = 0,
        ALARM_SETUP_SCREEN,
        STOP_WATCH_SCREEN,
        IDLE_SCREEN = 0,
        ALARM_SETUP_SCREEN,
        STOP_WATCH_SCREEN,

+       BLUETOOTH_SCREEN,

        ACCEL_DISPLAY_SCREEN,
        MENU_TEST_SCREEN,
 //     APPLICATION_SCREEN,
        ACCEL_DISPLAY_SCREEN,
        MENU_TEST_SCREEN,
 //     APPLICATION_SCREEN,

diff --git a/ui/oswald_graphics.c b/ui/oswald_graphics.c
index a6eb14f9dfd50191705b71c4c4d0e3198f4a8e55..304aa7af6154c31939ac6c1322781a7815c2b93e 100644 (file)
--- a/ui/oswald_graphics.c
+++ b/ui/oswald_graphics.c
@@ -5,21 +5,26 @@
 #include "oswald_graphics.h"
 
 
 #include "oswald_graphics.h"
 
 

+#if 0

 void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp)
 {
        uint8_t x, y;
 void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp)
 {
        uint8_t x, y;

+       uint8_t *cb;

 
        // we only draw set pixel, unset pixel remain as they are
        for (y=0; y<height; y++) {
                for (x=0; x<width; x++) {
 
        // we only draw set pixel, unset pixel remain as they are
        for (y=0; y<height; y++) {
                for (x=0; x<width; x++) {

-                       hal_lcd_set_pixel(x, y, TRUE);
+                       cb = (uint8_t *)(bmp + (y * ((width / 8)+((width % 8) ? 1:0))) + (x / 8));
+                       if (*cb & (1 << (x % 8)))
+                               hal_lcd_set_pixel(xstart + x, ystart + y, TRUE);

                }
        }
 }
                }
        }
 }

+#endif

 
 void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend)
 {
 
 void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend)
 {

-       int x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;
+       uint8_t x, y, t, dx, dy, incx, incy, pdx, pdy, ddx, ddy, es, el, err;

  
        dx = xend - xstart;
        dy = yend - ystart;
  
        dx = xend - xstart;
        dy = yend - ystart;

diff --git a/ui/oswald_graphics.h b/ui/oswald_graphics.h
index 3d5d6bdc00ed785b29edf3393396388e58972c64..d6be475c95f77803e56dae2f68f0224dcbfdffc0 100644 (file)
--- a/ui/oswald_graphics.h
+++ b/ui/oswald_graphics.h
@@ -8,6 +8,8 @@
 #include "oswald_graphics.h"
 
 
 #include "oswald_graphics.h"
 
 

+void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp);
+

 void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
 
 void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
 void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
 
 void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);

diff --git a/ui/oswald_hal.h b/ui/oswald_hal.h
index eddef94fbae24065c1d68df733740215d4d25cc6..ab1e7c0d9bf042a3b1520bafa37e5f65151957cf 100644 (file)
--- a/ui/oswald_hal.h
+++ b/ui/oswald_hal.h
@@ -26,5 +26,11 @@ void hal_get_power_state(power_state *pwr);
 void hal_vibration_set_state(boolean state);
 boolean hal_vibration_get_state(void);
 
 void hal_vibration_set_state(boolean state);
 boolean hal_vibration_get_state(void);
 

+bluetooth_state hal_bluetooth_set_state(bluetooth_state state);
+bluetooth_state hal_bluetooth_get_state(void);
+uint8_t *hal_bluetooth_get_local_bdaddr(void);
+void hal_bluetooth_set_visible(boolean visible);
+boolean hal_bluetooth_get_visible(void);
+void hal_bluetooth_send_data(const void *mdat, uint16_t mlen);

 #endif
 
 #endif
 

diff --git a/ui/oswald_main.c b/ui/oswald_main.c
index e080a7130aee0a0716809031ac66f12ac0ad8d30..02396d4bddab2205c9077dd4cb3097eabacb0fa1 100644 (file)
--- a/ui/oswald_main.c
+++ b/ui/oswald_main.c
@@ -18,6 +18,8 @@ watch_state OswaldState;
 watch_screen OswaldScreens[SCREENS_END];
 power_state OswaldPowerState;
 u8t backlight_safety_off = 0;
 watch_screen OswaldScreens[SCREENS_END];
 power_state OswaldPowerState;
 u8t backlight_safety_off = 0;

+char MainMessage[148];
+

 
 void oswald_change_to_screen(screen_number screen_id)
 {
 
 void oswald_change_to_screen(screen_number screen_id)
 {


@@ -152,6 +154,26 @@ void oswald_handle_ambientlight_event(u8t light_level)
                OswaldState.screen->event_func(EVENT_AMBIENTLIGHT_UPDATE, &light_level);
 }
 
                OswaldState.screen->event_func(EVENT_AMBIENTLIGHT_UPDATE, &light_level);
 }
 

+void oswald_handle_comm_input(uint16_t mlen, const void *mdat)
+{
+       char *icmd = (char *) mdat;
+
+       if (icmd[0] == '$') {
+               if (strncmp(icmd, "$GRT", 4) == 0) { // get current RTC
+                       char rtime[16];
+                       snprintf(rtime, 10, "%02d%02d%02d\n", OswaldClk.hour, OswaldClk.minute, OswaldClk.second);
+                       hal_bluetooth_send_data(rtime, strlen(rtime));
+               } else if (strncmp(icmd, "$MSG", 4) == 0) { // message on main screen
+                       char *msg = (icmd+4);
+                       mlen -= 4;
+                       memset(MainMessage, 0, 148);
+                       strncpy(MainMessage, msg, (mlen > 147) ? 147 : mlen);
+               } else if (strncmp(icmd, "$MCL", 4) == 0) { // clear message
+                       memset(MainMessage, 0, 148);
+               }
+       }
+}
+

 void oswald_init(void)
 {
        OswaldScreens[IDLE_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;
 void oswald_init(void)
 {
        OswaldScreens[IDLE_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_ONE_SEC_TIMER;


@@ -172,6 +194,9 @@ void oswald_init(void)
        OswaldScreens[STOP_WATCH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_CS_TIMER;
        OswaldScreens[STOP_WATCH_SCREEN].event_func = stop_watch_handle_events;
 
        OswaldScreens[STOP_WATCH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_CS_TIMER;
        OswaldScreens[STOP_WATCH_SCREEN].event_func = stop_watch_handle_events;
 

+       OswaldScreens[BLUETOOTH_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;
+       OswaldScreens[BLUETOOTH_SCREEN].event_func = bluetooth_screen_events;
+

        OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;
        OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;
 
        OswaldScreens[ALARM_SCREEN].event_mask = EVENT_USER_BUTTONS | EVENT_HALF_SEC_TIMER;
        OswaldScreens[ALARM_SCREEN].event_func = alarm_handle_events;
 

diff --git a/ui/oswald_main.h b/ui/oswald_main.h
index 57e8008c7cd8fd20b3278353f76cffb63a9350d1..f8f6ab4279b1b52b4e035e6da97faac27f3702fd 100644 (file)
--- a/ui/oswald_main.h
+++ b/ui/oswald_main.h
@@ -8,6 +8,7 @@ extern alarm_clk OswaldAlarm;
 extern power_state OswaldPowerState;
 extern watch_state OswaldState;
 extern watch_screen OswaldScreens[];
 extern power_state OswaldPowerState;
 extern watch_state OswaldState;
 extern watch_screen OswaldScreens[];

+extern char MainMessage[];

 
 /* gets triggered by OS timer function */
 void oswald_one_second_tick();
 
 /* gets triggered by OS timer function */
 void oswald_one_second_tick();


@@ -24,5 +25,5 @@ void oswald_one_second_tick(void);
 void oswald_halfsecond_tick(void);
 void oswald_centisecond_tick(void);
 void oswald_init(void);
 void oswald_halfsecond_tick(void);
 void oswald_centisecond_tick(void);
 void oswald_init(void);

-
+void oswald_handle_comm_input(uint16_t mlen, const void *mdat);

 #endif
 #endif

diff --git a/ui/oswald_screens.c b/ui/oswald_screens.c
index c09958fd2c6635d99f2486f9e3e917dabb326e5e..a16bf398699d87ba692beef508fd3a18e2562558 100644 (file)
--- a/ui/oswald_screens.c
+++ b/ui/oswald_screens.c
@@ -9,6 +9,15 @@
 
 #include "oswald_screens.h"
 
 
 #include "oswald_screens.h"
 

+#include "timesetup_icon.xbm"
+#include "stopwatch_icon.xbm"
+#include "alarm_icon.xbm"
+#include "startstopbutton_icon.xbm"
+#include "lapsebutton_icon.xbm"
+#include "upbutton_icon.xbm"
+#include "downbutton_icon.xbm"
+#include "Bluetooth_icon.xbm"
+

 
 typedef struct {
        void (*screendraw_func)(boolean show_seconds);
 
 typedef struct {
        void (*screendraw_func)(boolean show_seconds);


@@ -85,6 +94,10 @@ void draw_accel_screen(accel_data_t *accel_data)
        WriteLcdNumber(20, 18, accel_data->y);
        WriteLcdString(2, 34, "Z:");
        WriteLcdNumber(20, 34, accel_data->z);
        WriteLcdNumber(20, 18, accel_data->y);
        WriteLcdString(2, 34, "Z:");
        WriteLcdNumber(20, 34, accel_data->z);

+
+       WriteLcdString(2, 54, "Light:");
+       WriteLcdNumber(40, 54, accel_data->z);
+

        hal_lcd_update_display();
 }
 
        hal_lcd_update_display();
 }
 


@@ -123,57 +136,67 @@ static datetime_setup_data_t dt_setup_screen = {
 void draw_datetime_setup_screen(datetime_setup_data_t *sdata)
 {
        hal_lcd_clear_display();
 void draw_datetime_setup_screen(datetime_setup_data_t *sdata)
 {
        hal_lcd_clear_display();

-       SetFont(MetaWatch16);
-       WriteLcdString(2, 2, "Set");
+//     SetFont(MetaWatch16);
+//     WriteLcdString(2, 2, "Set");
+       oswald_draw_bitmap(36, 0, timesetup_icon_width, timesetup_icon_height, timesetup_icon_bits);
+
+       oswald_draw_bitmap(81, 6, upbutton_icon_width, upbutton_icon_height, upbutton_icon_bits);
+       oswald_draw_bitmap(81, 38, downbutton_icon_width, downbutton_icon_height, downbutton_icon_bits);

 
        SetFont(MetaWatchTime);
        if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {
 
        SetFont(MetaWatchTime);
        if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {

-               WriteLcdCharacter(2, 20, (OswaldClk.hour / 10));
-               WriteLcdCharacter(14, 20, (OswaldClk.hour % 10));
+               WriteLcdCharacter(2, 30, (OswaldClk.hour / 10));
+               WriteLcdCharacter(14, 30, (OswaldClk.hour % 10));

        }
        }

-       WriteLcdCharacter(26, 20, TIME_CHARACTER_COLON_INDEX);
+       WriteLcdCharacter(26, 30, TIME_CHARACTER_COLON_INDEX);

 
        if ((sdata->pos == 1 && sdata->on) || sdata->pos != 1) {
 
        if ((sdata->pos == 1 && sdata->on) || sdata->pos != 1) {

-               WriteLcdCharacter(31, 20, (OswaldClk.minute / 10));
-               WriteLcdCharacter(43, 20, (OswaldClk.minute % 10));
+               WriteLcdCharacter(31, 30, (OswaldClk.minute / 10));
+               WriteLcdCharacter(43, 30, (OswaldClk.minute % 10));

        }
        }

-
+/*

        WriteLcdCharacter(55, 20, TIME_CHARACTER_COLON_INDEX);
 
        if ((sdata->pos == 2 && sdata->on) || sdata->pos != 2) {
                WriteLcdCharacter(60, 20, (OswaldClk.second / 10));
                WriteLcdCharacter(72, 20, (OswaldClk.second % 10));
        }
        WriteLcdCharacter(55, 20, TIME_CHARACTER_COLON_INDEX);
 
        if ((sdata->pos == 2 && sdata->on) || sdata->pos != 2) {
                WriteLcdCharacter(60, 20, (OswaldClk.second / 10));
                WriteLcdCharacter(72, 20, (OswaldClk.second % 10));
        }

-
+*/

        SetFont(MetaWatch16);
        SetFont(MetaWatch16);

+       if ((sdata->pos == 2 && sdata->on) || sdata->pos != 2) {
+               WriteLcdCharacter(59, 36, 0x30 + (OswaldClk.second / 10));
+               WriteLcdCharacter(66, 36, 0x30 + (OswaldClk.second % 10));
+       }
+
+

        if ((sdata->pos == 3 && sdata->on) || sdata->pos != 3) {
        if ((sdata->pos == 3 && sdata->on) || sdata->pos != 3) {

-               WriteLcdNumber(2, 45, OswaldClk.day);
+               WriteLcdNumber(2, 55, OswaldClk.day);

        }
        }

-       WriteLcdString(18, 45, ".");
+       WriteLcdString(18, 55, ".");

        if ((sdata->pos == 4 && sdata->on) || sdata->pos != 4) {
        if ((sdata->pos == 4 && sdata->on) || sdata->pos != 4) {

-               WriteLcdNumber(22, 45, OswaldClk.month);
+               WriteLcdNumber(22, 55, OswaldClk.month);

        }
        }

-       WriteLcdString(38, 45, ".");
+       WriteLcdString(38, 55, ".");

        if ((sdata->pos == 5 && sdata->on) || sdata->pos != 5) {
        if ((sdata->pos == 5 && sdata->on) || sdata->pos != 5) {

-               WriteLcdNumber(42, 45, OswaldClk.year);
+               WriteLcdNumber(42, 55, OswaldClk.year);

        }
 
        SetFont(MetaWatch7);
        if ((sdata->pos == 6 && sdata->on) || sdata->pos != 6) {
                if (OswaldClk.clk24hr)
        }
 
        SetFont(MetaWatch7);
        if ((sdata->pos == 6 && sdata->on) || sdata->pos != 6) {
                if (OswaldClk.clk24hr)

-                       WriteLcdString(2, 66, "x");
+                       WriteLcdString(2, 76, "x");

                else
                else

-                       WriteLcdString(2, 66, "_");
+                       WriteLcdString(2, 76, "_");

        }
        }

-       WriteLcdString(15, 66, "24hr");
+       WriteLcdString(15, 76, "24hr");

 
        if ((sdata->pos == 7 && sdata->on) || sdata->pos != 7) {
                if (OswaldClk.day_first)
 
        if ((sdata->pos == 7 && sdata->on) || sdata->pos != 7) {
                if (OswaldClk.day_first)

-                       WriteLcdString(2, 79, "x");
+                       WriteLcdString(2, 89, "x");

                else
                else

-                       WriteLcdString(2, 79, "_");
+                       WriteLcdString(2, 89, "_");

        }
        }

-       WriteLcdString(15, 79, "dd.mm.  mm/dd");
+       WriteLcdString(15, 89, "dd.mm.  mm/dd");

 
        hal_lcd_update_display();
 }
 
        hal_lcd_update_display();
 }


@@ -290,6 +313,11 @@ void datetime_setup_events(u16t event, void *data)
        };
 }
 
        };
 }
 

+
+/*
+ * Alarm setup
+ */
+

 typedef struct {
        u8t pos;
        boolean on;
 typedef struct {
        u8t pos;
        boolean on;


@@ -303,63 +331,47 @@ void draw_alarm_setup_screen(alarm_setup_data_t *sdata)
 {
        hal_lcd_clear_display();
 
 {
        hal_lcd_clear_display();
 

-       SetFont(MetaWatch16);
-       WriteLcdString(2, 2, "Alarm");
+       oswald_draw_bitmap(36, 0, alarm_icon_width, alarm_icon_height, alarm_icon_bits);
+
+       oswald_draw_bitmap(81, 6, upbutton_icon_width, upbutton_icon_height, upbutton_icon_bits);
+       oswald_draw_bitmap(81, 38, downbutton_icon_width, downbutton_icon_height, downbutton_icon_bits);

 
        SetFont(MetaWatchTime);
        if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {
 
        SetFont(MetaWatchTime);
        if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {

-               WriteLcdCharacter(2, 20, (OswaldAlarm.hour / 10));
-               WriteLcdCharacter(14, 20, (OswaldAlarm.hour % 10));
+               WriteLcdCharacter(22, 30, (OswaldAlarm.hour / 10));
+               WriteLcdCharacter(34, 30, (OswaldAlarm.hour % 10));

        }
        }

-       WriteLcdCharacter(26, 20, TIME_CHARACTER_COLON_INDEX);
+       WriteLcdCharacter(46, 30, TIME_CHARACTER_COLON_INDEX);

 
        if ((sdata->pos == 1 && sdata->on) || sdata->pos != 1) {
 
        if ((sdata->pos == 1 && sdata->on) || sdata->pos != 1) {

-               WriteLcdCharacter(31, 20, (OswaldAlarm.minute / 10));
-               WriteLcdCharacter(43, 20, (OswaldAlarm.minute % 10));
+               WriteLcdCharacter(51, 30, (OswaldAlarm.minute / 10));
+               WriteLcdCharacter(63, 30, (OswaldAlarm.minute % 10));

        }
 
        SetFont(MetaWatchMonospaced10);
        }
 
        SetFont(MetaWatchMonospaced10);

-       WriteLcdCharacter(3, 45, 'S');
-       WriteLcdCharacter(15, 45, 'M');
-       WriteLcdCharacter(27, 45, 'T');
-       WriteLcdCharacter(39, 45, 'W');
-       WriteLcdCharacter(51, 45, 'T');
-       WriteLcdCharacter(63, 45, 'F');
-       WriteLcdCharacter(75, 45, 'S');
+       WriteLcdCharacter(3, 55, 'S');
+       WriteLcdCharacter(15, 55, 'M');
+       WriteLcdCharacter(27, 55, 'T');
+       WriteLcdCharacter(39, 55, 'W');
+       WriteLcdCharacter(51, 55, 'T');
+       WriteLcdCharacter(63, 55, 'F');
+       WriteLcdCharacter(75, 55, 'S');

 
        if ((sdata->pos == 2 && sdata->on) || sdata->pos != 2)
 
        if ((sdata->pos == 2 && sdata->on) || sdata->pos != 2)

-               WriteLcdCharacter(3, 55, (OswaldAlarm.wday & WDAY_SUNDAY) ? 'x' : '_');
+               WriteLcdCharacter(3, 65, (OswaldAlarm.wday & WDAY_SUNDAY) ? 'x' : '_');

        if ((sdata->pos == 3 && sdata->on) || sdata->pos != 3)
        if ((sdata->pos == 3 && sdata->on) || sdata->pos != 3)

-               WriteLcdCharacter(15, 55, (OswaldAlarm.wday & WDAY_MONDAY) ? 'x' : '_');
+               WriteLcdCharacter(15, 65, (OswaldAlarm.wday & WDAY_MONDAY) ? 'x' : '_');

        if ((sdata->pos == 4 && sdata->on) || sdata->pos != 4)
        if ((sdata->pos == 4 && sdata->on) || sdata->pos != 4)

-               WriteLcdCharacter(27, 55, (OswaldAlarm.wday & WDAY_TUESDAY) ? 'x' : '_');
+               WriteLcdCharacter(27, 65, (OswaldAlarm.wday & WDAY_TUESDAY) ? 'x' : '_');

        if ((sdata->pos == 5 && sdata->on) || sdata->pos != 5)
        if ((sdata->pos == 5 && sdata->on) || sdata->pos != 5)

-               WriteLcdCharacter(39, 55, (OswaldAlarm.wday & WDAY_WEDNESDAY) ? 'x' : '_');
+               WriteLcdCharacter(39, 65, (OswaldAlarm.wday & WDAY_WEDNESDAY) ? 'x' : '_');

        if ((sdata->pos == 6 && sdata->on) || sdata->pos != 6)
        if ((sdata->pos == 6 && sdata->on) || sdata->pos != 6)

-               WriteLcdCharacter(51, 55, (OswaldAlarm.wday & WDAY_THURSDAY) ? 'x' : '_');
+               WriteLcdCharacter(51, 65, (OswaldAlarm.wday & WDAY_THURSDAY) ? 'x' : '_');

        if ((sdata->pos == 7 && sdata->on) || sdata->pos != 7)
        if ((sdata->pos == 7 && sdata->on) || sdata->pos != 7)

-               WriteLcdCharacter(63, 55, (OswaldAlarm.wday & WDAY_FRIDAY) ? 'x' : '_');
+               WriteLcdCharacter(63, 65, (OswaldAlarm.wday & WDAY_FRIDAY) ? 'x' : '_');

        if ((sdata->pos == 8 && sdata->on) || sdata->pos != 8)
        if ((sdata->pos == 8 && sdata->on) || sdata->pos != 8)

-               WriteLcdCharacter(75, 55, (OswaldAlarm.wday & WDAY_SATURDAY) ? 'x' : '_');
+               WriteLcdCharacter(75, 65, (OswaldAlarm.wday & WDAY_SATURDAY) ? 'x' : '_');

 
 

-#if 0
-       SetFont(MetaWatch7);
-       if ((sdata->pos == 6 && sdata->on) || sdata->pos != 6) {
-               if (OswaldClk.clk24hr)
-                       WriteLcdString(2, 66, "x");
-               else
-                       WriteLcdString(2, 66, "_");
-       }
-       WriteLcdString(15, 66, "24hr");
-
-       if ((sdata->pos == 7 && sdata->on) || sdata->pos != 7) {
-               if (OswaldClk.day_first)
-                       WriteLcdString(2, 79, "x");
-               else
-                       WriteLcdString(2, 79, "_");
-       }
-       WriteLcdString(15, 79, "dd.mm.  mm/dd");
-#endif

        hal_lcd_update_display();
 }
 
        hal_lcd_update_display();
 }
 


@@ -457,6 +469,10 @@ void alarm_setup_events(u16t event, void *data)
 }
 
 
 }
 
 

+/*
+ * Test menu
+ */
+

 typedef struct {
        u8t menu_pos;
 } test_menu_t;
 typedef struct {
        u8t menu_pos;
 } test_menu_t;


@@ -512,6 +528,10 @@ void test_menu_handle_events(u16t event, void *data)
 }
 
 
 }
 
 

+/*
+ * Stop Watch
+ */
+

 typedef struct {
        u8t hr;
        u8t min;
 typedef struct {
        u8t hr;
        u8t min;


@@ -531,36 +551,19 @@ static void update_stop_watch_screen(stopwatch_data_t *sdata)
        char tstr[16];
        SetFont(MetaWatchMonospaced10);
 
        char tstr[16];
        SetFont(MetaWatchMonospaced10);
 

-#if 0
-       WriteLcdNumber(0, 30, sdata->hr);
-       WriteLcdCharacter(14, 30, ':');
-       WriteLcdNumber(19, 30, sdata->min);
-       WriteLcdCharacter(33, 30, ':');
-       WriteLcdNumber(38, 30, sdata->sec);
-       WriteLcdCharacter(52, 30, '.');
-       WriteLcdNumber(57, 30, sdata->csec / 10);
-
-       WriteLcdNumber(0, 50, sdata->lapse_hr);
-       WriteLcdCharacter(14, 50, ':');
-       WriteLcdNumber(19, 50, sdata->lapse_min);
-       WriteLcdCharacter(33, 50, ':');
-       WriteLcdNumber(38, 50, sdata->lapse_sec);
-       WriteLcdCharacter(52, 50, '.');
-       WriteLcdNumber(57, 50, sdata->lapse_csec / 10);
-#else

        snprintf(tstr, 16, "%02d:%02d:%02d.%1d", sdata->hr, sdata->min, sdata->sec, sdata->csec / 10);
        snprintf(tstr, 16, "%02d:%02d:%02d.%1d", sdata->hr, sdata->min, sdata->sec, sdata->csec / 10);

-       WriteLcdString(0, 30, tstr);
+       WriteLcdString(5, 40, tstr);

        snprintf(tstr, 16, "%02d:%02d:%02d.%02d", sdata->lapse_hr, sdata->lapse_min, sdata->lapse_sec, sdata->lapse_csec);
        snprintf(tstr, 16, "%02d:%02d:%02d.%02d", sdata->lapse_hr, sdata->lapse_min, sdata->lapse_sec, sdata->lapse_csec);

-       WriteLcdString(0, 50, tstr);
-#endif
+       WriteLcdString(5, 60, tstr);

 
        hal_lcd_update_display();
 }
 
 static void draw_stop_watch_screen(stopwatch_data_t *sdata)
 {
 
        hal_lcd_update_display();
 }
 
 static void draw_stop_watch_screen(stopwatch_data_t *sdata)
 {

-       SetFont(MetaWatch16);
-       WriteLcdString(2, 5, "StopWatch");
+       oswald_draw_bitmap(36, 0, stopwatch_icon_width, stopwatch_icon_height, stopwatch_icon_bits);
+       oswald_draw_bitmap(81, 6, startstopbutton_icon_width, startstopbutton_icon_height, startstopbutton_icon_bits);
+       oswald_draw_bitmap(81, 38, lapsebutton_icon_width, lapsebutton_icon_height, lapsebutton_icon_bits);

 
        update_stop_watch_screen(sdata);
 }
 
        update_stop_watch_screen(sdata);
 }


@@ -640,12 +643,17 @@ void stop_watch_handle_events(u16t event, void *data)
 }
 
 
 }
 
 

+/*
+ * when alarm is fired
+ */

 void draw_alarm_screen(void)
 {
        hal_lcd_clear_display();
 
 void draw_alarm_screen(void)
 {
        hal_lcd_clear_display();
 

-       SetFont(MetaWatch16);
-       WriteLcdString(2, 2, "ALARM !");
+//     SetFont(MetaWatch16);
+//     WriteLcdString(2, 2, "ALARM !");
+       oswald_draw_bitmap(36, 20, alarm_icon_width, alarm_icon_height, alarm_icon_bits);
+

 
        hal_lcd_update_display();
 }
 
        hal_lcd_update_display();
 }


@@ -677,3 +685,148 @@ void alarm_handle_events(u16t event, void *data)
        };
 }
 
        };
 }
 

+
+/*
+ * Bluetooth screen
+ */
+typedef struct {
+       u8t pos;
+       boolean bt_en;
+       boolean on;
+} bluetooth_data_t;
+static bluetooth_data_t bluetooth_screen = {
+       0,
+       FALSE,
+       TRUE
+};
+
+void draw_bluetooth_screen(bluetooth_data_t *sdata)
+{
+       char bstr[20];
+       uint8_t *bd_addr;
+
+       hal_lcd_clear_display();
+
+       oswald_draw_bitmap(36, 0, Bluetooth_icon_width, Bluetooth_icon_height, Bluetooth_icon_bits);
+
+       oswald_draw_bitmap(81, 6, upbutton_icon_width, upbutton_icon_height, upbutton_icon_bits);
+       oswald_draw_bitmap(81, 38, downbutton_icon_width, downbutton_icon_height, downbutton_icon_bits);
+
+       SetFont(MetaWatch5);
+       WriteLcdString(2, 30, "Enable:");
+       if ((sdata->pos == 0 && sdata->on) || sdata->pos != 0) {
+               WriteLcdCharacter(45, 30, bluetooth_screen.bt_en ? 'x' : '_');
+       }
+       WriteLcdString(2, 39, "State:");
+       switch (hal_bluetooth_get_state()) {
+               case BLUETOOTH_OFF:
+                       WriteLcdString(45, 39, "off");
+                       break;
+               case BLUETOOTH_ON:
+                       WriteLcdString(45, 39, "on");
+                       break;
+               case BLUETOOTH_CONNECTED:
+                       WriteLcdString(45, 39, "conn.");
+                       break;
+               default:
+                       break;
+       };
+       if (hal_bluetooth_get_state() >= BLUETOOTH_ON) {
+               bd_addr = hal_bluetooth_get_local_bdaddr();
+               snprintf(bstr, 20, "%02x:%02x:%02x:%02x:%02x:%02x", bd_addr[5], bd_addr[4], bd_addr[3], bd_addr[2], bd_addr[1], bd_addr[0]);
+               WriteLcdString(2, 48, bstr);
+       } else {
+       }
+       WriteLcdString(2, 57, "Visible:");
+       if ((sdata->pos == 1 && sdata->on) || sdata->pos != 1) {
+               WriteLcdCharacter(45, 57, hal_bluetooth_get_visible() ? 'x' : '_');
+       }
+
+       hal_lcd_update_display();
+}
+
+void bluetooth_handle_updown(u8t pos, s8t incr)
+{
+       switch (pos) {
+               case 0:
+                       if (hal_bluetooth_get_state() >= BLUETOOTH_ON) {
+                               hal_bluetooth_set_state(BLUETOOTH_OFF);
+                               bluetooth_screen.bt_en = FALSE;
+                       } else {
+                               hal_bluetooth_set_state(BLUETOOTH_ON);
+                               bluetooth_screen.bt_en = TRUE;
+                       }
+                       break;
+               case 1:
+                       if (hal_bluetooth_get_state() >= BLUETOOTH_ON && !hal_bluetooth_get_visible()) {
+                               hal_bluetooth_set_visible(TRUE);
+                       } else {
+                               hal_bluetooth_set_visible(FALSE);
+                       }
+                       break;
+               case 2:
+                       break;
+               case 3:
+                       break;
+               case 4:
+                       break;
+               case 5:
+                       break;
+               case 6:
+                       break;
+               case 7:
+                       break;
+               case 8:
+                       break;
+               default:
+                       break;
+       };
+}
+
+void handle_bluetooth_buttons(watch_button button, bluetooth_data_t *sdata)
+{
+       switch (button) {
+               case BUTTON_A:
+                       bluetooth_handle_updown(sdata->pos, 1);
+                       break;
+               case BUTTON_B:
+                       bluetooth_handle_updown(sdata->pos, -1);
+                       break;
+               case BUTTON_F:
+                       sdata->pos++;
+                       sdata->pos %= 2;
+                       break;
+               default:
+                       break;
+       }
+       draw_bluetooth_screen(sdata);
+}
+
+void bluetooth_screen_events(u16t event, void *data)
+{
+       switch (event) {
+               case EVENT_SCREEN_VISIBLE:
+                       bluetooth_screen.pos = 0;
+                       bluetooth_screen.bt_en = (hal_bluetooth_get_state() > 0);
+                       draw_bluetooth_screen(&bluetooth_screen);
+                       hal_enable_halfsecond_timer();
+                       break;
+               case EVENT_SCREEN_DESTROY:
+                       hal_disable_halfsecond_timer();
+                       break;
+               case EVENT_USER_BUTTONS:
+                       dbg_out("button event %d\n", *(int *)data);
+                       handle_bluetooth_buttons(*(watch_button *)data, &bluetooth_screen);
+                       break;
+               case EVENT_HALF_SEC_TIMER:
+                       if (bluetooth_screen.on)
+                               bluetooth_screen.on = FALSE;
+                       else
+                               bluetooth_screen.on = TRUE;
+                       draw_bluetooth_screen(&bluetooth_screen);
+                       break;
+               default:
+                       break;
+       };
+}
+

diff --git a/ui/oswald_screens.h b/ui/oswald_screens.h
index 005b0bb1c373dff9a52fb734f6ab28ab440aa3b8..cd221fee31b7b7f44b3711a2a7eabfee463fad2f 100644 (file)
--- a/ui/oswald_screens.h
+++ b/ui/oswald_screens.h
@@ -16,5 +16,6 @@ void stop_watch_handle_events(u16t event, void *data);
 
 void alarm_handle_events(u16t event, void *data);
 
 
 void alarm_handle_events(u16t event, void *data);
 

-#endif
+void bluetooth_screen_events(u16t event, void *data);

 
 

+#endif

diff --git a/ui/oswald_watch_faces.c b/ui/oswald_watch_faces.c
index 6db3196abd2d39baba91ff3e415e07866066b96c..7e27fd40ca58a80cd81cc421fbde2c37693103e7 100644 (file)
--- a/ui/oswald_watch_faces.c
+++ b/ui/oswald_watch_faces.c
@@ -9,6 +9,16 @@
 
 #include "oswald_watch_faces.h"
 
 
 #include "oswald_watch_faces.h"
 

+#include "battery0_icon.xbm"
+#include "battery25_icon.xbm"
+#include "battery50_icon.xbm"
+#include "battery75_icon.xbm"
+#include "battery100_icon.xbm"
+#include "charger_icon.xbm"
+#include "bluetooth_icon.xbm"
+
+
+/* sine table, per degree, factor 100 */

 int16_t sintab[]={
            0,   2,   3,   5,   7,   9,  10,  12,  14,  16,
           17,  19,  21,  22,  24,  26,  28,  29,  31,  33,
 int16_t sintab[]={
            0,   2,   3,   5,   7,   9,  10,  12,  14,  16,
           17,  19,  21,  22,  24,  26,  28,  29,  31,  33,


@@ -131,6 +141,7 @@ void DrawLcdDigitalClock(boolean show_seconds)
        int gRow = 3;
        int gColumn = 3;
        char tstr[16];
        int gRow = 3;
        int gColumn = 3;
        char tstr[16];

+       int i;

 
        SetFont(MetaWatchTime);
 
 
        SetFont(MetaWatchTime);
 


@@ -175,6 +186,37 @@ void DrawLcdDigitalClock(boolean show_seconds)
                snprintf(tstr, 16, "%d/%d %d", OswaldClk.month, OswaldClk.day, OswaldClk.year);
        WriteLcdString(3, 25, tstr);
 
                snprintf(tstr, 16, "%d/%d %d", OswaldClk.month, OswaldClk.day, OswaldClk.year);
        WriteLcdString(3, 25, tstr);
 

+       if (OswaldPowerState.source)
+               oswald_draw_bitmap(81, 4, charger_icon_width, charger_icon_height, charger_icon_bits);
+
+       if (OswaldPowerState.percent > 75)
+               oswald_draw_bitmap(81, 4, battery100_icon_width, battery100_icon_height, battery100_icon_bits);
+       else if (OswaldPowerState.percent > 50)
+               oswald_draw_bitmap(81, 4, battery75_icon_width, battery75_icon_height, battery75_icon_bits);
+       else if (OswaldPowerState.percent > 25)
+               oswald_draw_bitmap(81, 4, battery50_icon_width, battery50_icon_height, battery50_icon_bits);
+       else if (OswaldPowerState.percent > 5)
+               oswald_draw_bitmap(81, 4, battery25_icon_width, battery25_icon_height, battery25_icon_bits);
+       else
+               oswald_draw_bitmap(81, 4, battery0_icon_width, battery0_icon_height, battery0_icon_bits);
+
+
+       if (hal_bluetooth_get_state() >= BLUETOOTH_ON)
+               oswald_draw_bitmap(81, 4, bluetooth_icon_width, bluetooth_icon_height, bluetooth_icon_bits);
+
+       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);
        WriteLcdString(2, 64, OswaldPowerState.source ? "ext" : "bat");
        snprintf(tstr, 16, "%d%% (%dmV)", OswaldPowerState.percent, OswaldPowerState.level);
        WriteLcdString(2, 48, tstr);
        WriteLcdString(2, 64, OswaldPowerState.source ? "ext" : "bat");


@@ -198,6 +240,7 @@ void DrawLcdDigitalClock(boolean show_seconds)
                                break;
                };
        };
                                break;
                };
        };

+#endif

        hal_lcd_update_display();
 }
 
        hal_lcd_update_display();
 }
 

diff --git a/ui/resetbutton_icon.xbm b/ui/resetbutton_icon.xbm
new file mode 100644 (file)
index 0000000..6576efc
--- /dev/null
+++ b/ui/resetbutton_icon.xbm
@@ -0,0 +1,7 @@
+#define resetbutton_icon_width 15
+#define resetbutton_icon_height 20
+static unsigned char resetbutton_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0x0e, 0x00, 0xff, 0x00,
+  0xff, 0x00, 0xce, 0x00, 0xcc, 0x00, 0xc8, 0x00, 0xc0, 0x00, 0xc0, 0x00,
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/startstopbutton_icon.xbm b/ui/startstopbutton_icon.xbm
new file mode 100644 (file)
index 0000000..160799b
--- /dev/null
+++ b/ui/startstopbutton_icon.xbm
@@ -0,0 +1,7 @@
+#define startstopbutton_icon_width 15
+#define startstopbutton_icon_height 20
+static unsigned char startstopbutton_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0b,
+  0x00, 0x1b, 0x00, 0x3b, 0x00, 0x7b, 0x00, 0x7b, 0x00, 0x3b, 0x00, 0x1b,
+  0x00, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/stopwatch.xbm b/ui/stopwatch.xbm
new file mode 100644 (file)
index 0000000..ce022fb
--- /dev/null
+++ b/ui/stopwatch.xbm
@@ -0,0 +1,10 @@
+#define stopwatch_width 24
+#define stopwatch_height 24
+static unsigned char stopwatch_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00, 0x00, 0x18, 0x00,
+  0x00, 0x7e, 0x10, 0x80, 0x81, 0x39, 0x40, 0x18, 0x1e, 0x20, 0x18, 0x0c,
+  0x10, 0x18, 0x08, 0x08, 0x18, 0x10, 0x08, 0x18, 0x10, 0x04, 0x18, 0x20,
+  0x04, 0x18, 0x20, 0x04, 0x18, 0x20, 0x04, 0x00, 0x20, 0x04, 0x00, 0x20,
+  0x04, 0x00, 0x20, 0x08, 0x00, 0x10, 0x08, 0x00, 0x10, 0x10, 0x00, 0x08,
+  0x20, 0x00, 0x04, 0x40, 0x00, 0x02, 0x80, 0x81, 0x01, 0x00, 0x7e, 0x00,
+  };

diff --git a/ui/stopwatch_icon.xbm b/ui/stopwatch_icon.xbm
new file mode 100644 (file)
index 0000000..9282fb2
--- /dev/null
+++ b/ui/stopwatch_icon.xbm
@@ -0,0 +1,10 @@
+#define stopwatch_icon_width 24
+#define stopwatch_icon_height 24
+static unsigned char stopwatch_icon_bits[] = {
+  0x00, 0x18, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x3c, 0x18,
+  0x00, 0xff, 0x3c, 0xc0, 0xff, 0x3f, 0xe0, 0x00, 0x1f, 0x70, 0x18, 0x0e,
+  0x38, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30,
+  0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30, 0x0c, 0x00, 0x30,
+  0x0c, 0x00, 0x30, 0x0c, 0x00, 0x30, 0x18, 0x00, 0x18, 0x38, 0x00, 0x1c,
+  0x70, 0x00, 0x0e, 0xe0, 0x00, 0x07, 0xc0, 0xff, 0x03, 0x00, 0xff, 0x00,
+  };

diff --git a/ui/timesetup_icon.xbm b/ui/timesetup_icon.xbm
new file mode 100644 (file)
index 0000000..5e8699d
--- /dev/null
+++ b/ui/timesetup_icon.xbm
@@ -0,0 +1,10 @@
+#define timesetup_icon_width 24
+#define timesetup_icon_height 24
+static unsigned char timesetup_icon_bits[] = {
+  0x00, 0xff, 0x00, 0xc0, 0xff, 0x03, 0xe0, 0x00, 0x07, 0x70, 0x18, 0x0e,
+  0x38, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30,
+  0x0c, 0x18, 0x30, 0x0c, 0xf8, 0x31, 0x0c, 0xf8, 0x31, 0x0c, 0x00, 0x30,
+  0x0c, 0x00, 0x30, 0x0c, 0x00, 0x30, 0x18, 0x00, 0x18, 0x38, 0x00, 0x1c,
+  0x70, 0x00, 0x0e, 0xe0, 0x00, 0x07, 0xc0, 0xff, 0x03, 0x00, 0xff, 0x00,
+  0xfe, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xff, 0xff, 0x3f, 0xfe, 0x00, 0x00,
+  };

diff --git a/ui/upbutton_icon.xbm b/ui/upbutton_icon.xbm
new file mode 100644 (file)
index 0000000..6e16dd4
--- /dev/null
+++ b/ui/upbutton_icon.xbm
@@ -0,0 +1,7 @@
+#define upbutton_icon_width 15
+#define upbutton_icon_height 20
+static unsigned char upbutton_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+  0x00, 0x1e, 0x00, 0x3f, 0x80, 0x7f, 0x00, 0x0c, 0x00, 0x0c, 0x00, 0x0c,
+  0x00, 0x0c, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0x00, 0x00, 0x00, };

diff --git a/ui/watch_icon.xbm b/ui/watch_icon.xbm
new file mode 100644 (file)
index 0000000..ecd95d1
--- /dev/null
+++ b/ui/watch_icon.xbm
@@ -0,0 +1,10 @@
+#define watch_icon_width 24
+#define watch_icon_height 24
+static unsigned char watch_icon_bits[] = {
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+  0x00, 0xff, 0x00, 0xc0, 0xff, 0x03, 0xe0, 0x00, 0x07, 0x70, 0x18, 0x0e,
+  0x38, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x0c, 0x18, 0x30, 0x0c, 0x18, 0x30,
+  0x0c, 0x18, 0x30, 0x0c, 0xf8, 0x31, 0x0c, 0xf8, 0x31, 0x0c, 0x00, 0x30,
+  0x0c, 0x00, 0x30, 0x0c, 0x00, 0x30, 0x18, 0x00, 0x18, 0x38, 0x00, 0x1c,
+  0x70, 0x00, 0x0e, 0xe0, 0x00, 0x07, 0xc0, 0xff, 0x03, 0x00, 0xff, 0x00,
+  };