Add version information and info screen, some more work on the accel screen

[oswald.git] / ui / oswald.h

diff --git a/ui/oswald.h b/ui/oswald.h
index b03a6b33331d7717679ba7e65bb7be65ad4c47c3..8d16b2e3b01b8f9f6f7c6d67264dd73c564f6324 100644 (file)
--- a/ui/oswald.h
+++ b/ui/oswald.h
@@ -4,6 +4,8 @@
 #include <string.h>
 #include <stdint.h>
 
 #include <string.h>
 #include <stdint.h>
 

+#define OSWALD_VERSION "v0.3"
+

 //#define DEBUG 1
 #ifdef DEBUG
 #define dbg_out( args... ) fprintf(stderr, args)
 //#define DEBUG 1
 #ifdef DEBUG
 #define dbg_out( args... ) fprintf(stderr, args)


@@ -55,9 +57,10 @@ typedef enum {
        STOP_WATCH_SCREEN,
        BLUETOOTH_SCREEN,
        ACCEL_DISPLAY_SCREEN,
        STOP_WATCH_SCREEN,
        BLUETOOTH_SCREEN,
        ACCEL_DISPLAY_SCREEN,

-       MENU_TEST_SCREEN,
-//     APPLICATION_SCREEN,
+       INFO_SCREEN,

        LAST_SCREEN,            // a marker for the last (not valid) screen)
        LAST_SCREEN,            // a marker for the last (not valid) screen)

+       MENU_TEST_SCREEN,
+       APPLICATION_SCREEN,

        DATETIME_SETTING_SCREEN,
        ALARM_SCREEN,
        SCREENS_END,
        DATETIME_SETTING_SCREEN,
        ALARM_SCREEN,
        SCREENS_END,


@@ -103,9 +106,9 @@ typedef struct {
 } watch_state;
 
 typedef struct {
 } watch_state;
 
 typedef struct {

-       uint8_t x;
-       uint8_t y;
-       uint8_t z;
+       int8_t  x;
+       int8_t  y;
+       int8_t  z;

 } accel_data_t;
 
 #define POWER_SOURCE_BATTERY   0
 } accel_data_t;
 
 #define POWER_SOURCE_BATTERY   0