Update to spec

[metawatch.git] / mw_main.c

diff --git a/mw_main.c b/mw_main.c
index a2c94afb1891b7eed4e3d2064e9dfddff805f54d..b9a547c305ce793f1ff2dcb8c0b2eadd11dda77d 100644 (file)
--- a/mw_main.c
+++ b/mw_main.c
@@ -257,8 +257,8 @@ int days(int m1, int y1)
 void draw_idle_calendar(mwdevice_t *mwdevice)
 {
        long unsigned int t;
-       unsigned int y,y1,m,m1,d,da,i,j,k;
-       const char a[12][20]={"January","February","March","April","May","June","July","August","September","October","November","December"};
+       unsigned int y,y1,m,m1,d,i,j,k;
+       /* const char a[12][20]={"January","February","March","April","May","June","July","August","September","October","November","December"}; */
        const char dnames[7][3] = { "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So" };
        mw_buffer *mwbuf;
        unsigned char *bbuf;
@@ -429,7 +429,7 @@ void test_oled(mwdevice_t *mwdevice, unsigned char oled)
 {
        mw_buffer *mwbuf;
        unsigned char *bbuf;
-       int len, i;
+       int len;
 
        mwbuf = mw_alloc_pbuffer(80, 16, 1);
        mw_buf_clear(mwbuf, MW_BLACK);
@@ -483,6 +483,8 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
        if (strncmp(cmdline, "quit", 4) == 0) {
                //close(mw_fd);
                //exit(0);
+               /* just in case we quit and show another screen */
+               mw_update_display(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0);
                g_main_loop_quit (mwdata->mloop);
        }
        if (strncmp(cmdline, "help", 4) == 0) {
@@ -497,8 +499,14 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
                mw_send_frame(&mwdata->mwdevice, MW_ADVANCE_WATCH_HANDS, 0, mdata, 3);
        }
        if (strncmp(cmdline, "srtc", 4) == 0) {
+               time_t mtime;
+               struct tm mtm;
+
+               mtime = time(NULL);
+               localtime_r(&mtime, &mtm);
+
                fprintf(stderr, "Setting RTC from system time...");
-               mw_set_rtc(&mwdata->mwdevice);
+               mw_set_rtc(&mwdata->mwdevice, &mtm);
                fprintf(stderr, "OK\n");
        }
        if (strncmp(cmdline, "grtc", 4) == 0) {
@@ -525,6 +533,7 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
                mw_configure_watch_mode(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0, 4, 1);
                mw_update_display(&mwdata->mwdevice, MW_SCREEN_MODE_IDLE, 0);
        }
+#if 0
        if (strncmp(cmdline, "rbtcfg", 6) == 0) {
                intopt = cmdline[7]-0x30;
                mdata[0] = 0; /* idle screen */
@@ -535,6 +544,7 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
                mdata[4] = 0; /* callback message option */
                mw_send_frame(&mwdata->mwdevice, MW_READ_BUTTON_CONFIG, 0, mdata, 5);
        }
+#endif
        if (strncmp(cmdline, "svib", 4) == 0) {
                mw_set_vibrate_mode(&mwdata->mwdevice, 1, 300, 300, 5);
        }
@@ -585,6 +595,14 @@ void process_cmd(char *cmdline, int clinep, mwdata_t *mwdata)
                mdata[0] = 0;
                mw_nval_operation(&mwdata->mwdevice, MW_NVAL_OPERATION_READ, MW_NVAL_TIME_FORMAT, 1, mdata);
        }
+       if (strncmp(cmdline, "sdm", 3) == 0) {
+               mdata[0] = MW_RTC_DATE_DDMM;
+               mw_nval_operation(&mwdata->mwdevice, MW_NVAL_OPERATION_WRITE, MW_NVAL_DATE_FORMAT, 1, mdata);
+       }
+       if (strncmp(cmdline, "gdm", 3) == 0) {
+               mdata[0] = 0;
+               mw_nval_operation(&mwdata->mwdevice, MW_NVAL_OPERATION_READ, MW_NVAL_TIME_FORMAT, 1, mdata);
+       }
 }