Fix and extend get_light_sensor and get_voltage, move system clock query out of libra...

diff --git a/metawatch.c b/metawatch.c
index a4ac2348a27ed6f1029f2ebae88796f4435ef9d7..2bf028cbabef8d4111a913b092247f9e3e77cdae 100644 (file)
--- a/metawatch.c
+++ b/metawatch.c
@@ -105,25 +105,20 @@ int mw_send_frame(mwdevice_t *mwdevice, unsigned char msg_type, unsigned char op
  * ---------------------------------------------------------------------- */
 
 
  * ---------------------------------------------------------------------- */
 
 

-int mw_set_rtc(mwdevice_t *mwdevice)
+int mw_set_rtc(mwdevice_t *mwdevice, struct tm *mw_tm)

 {
 {

-       time_t mtime;
-       struct tm mtm;

        unsigned short year;
        unsigned char data[32];
 
        unsigned short year;
        unsigned char data[32];
 

-       mtime = time(NULL);
-       localtime_r(&mtime, &mtm);
-
-       year = mtm.tm_year + 1900;  
+       year = mw_tm->tm_year + 1900;  

        data[0] = (year & 0x0f00) >> 8;
        data[1] = (year & 0x00ff);
        data[0] = (year & 0x0f00) >> 8;
        data[1] = (year & 0x00ff);

-       data[2] = mtm.tm_mon + 1;
-       data[3] = mtm.tm_mday;
-       data[4] = mtm.tm_wday;
-       data[5] = mtm.tm_hour;
-       data[6] = mtm.tm_min;
-       data[7] = mtm.tm_sec;
+       data[2] = mw_tm->tm_mon + 1;
+       data[3] = mw_tm->tm_mday;
+       data[4] = mw_tm->tm_wday;
+       data[5] = mw_tm->tm_hour;
+       data[6] = mw_tm->tm_min;
+       data[7] = mw_tm->tm_sec;

 
        return mw_send_frame(mwdevice, MW_SET_REAL_TIME_CLOCK, 0, data, 8);
 }
 
        return mw_send_frame(mwdevice, MW_SET_REAL_TIME_CLOCK, 0, data, 8);
 }


@@ -398,19 +393,19 @@ int mw_get_battery_voltage_response(mwdevice_t *mwdevice, unsigned char *batrsp,
        unsigned char power_good = batrsp[0];
        unsigned char bat_charging = batrsp[1];
        unsigned short voltage = *(unsigned short *)(batrsp+2);
        unsigned char power_good = batrsp[0];
        unsigned char bat_charging = batrsp[1];
        unsigned short voltage = *(unsigned short *)(batrsp+2);

-       unsigned short voltage_average = *(unsigned short *)(batrsp+4);
+       unsigned short voltage_avg = *(unsigned short *)(batrsp+4);

 
 #ifdef DEBUG
 
 #ifdef DEBUG

-       fprintf(stderr, "battery is at %dmV (average is %dmV), %s and %s\n", voltage, voltage_average, power_good ? "power is good" : "power fault", bat_charging ? "charging" : "not charging");
+       fprintf(stderr, "battery is at %dmV (average is %dmV), %s and %s\n", voltage, voltage_avg, power_good ? "power is good" : "power fault", bat_charging ? "charging" : "not charging");

 #endif
 
        if (mwdevice->mw_get_battery_voltage_response_cb != NULL)
 #endif
 
        if (mwdevice->mw_get_battery_voltage_response_cb != NULL)

-               mwdevice->mw_get_battery_voltage_response_cb(mwdevice, &voltage, &power_good, &bat_charging, mwdevice->mw_gbatvrsp_data);
+               mwdevice->mw_get_battery_voltage_response_cb(mwdevice, &voltage, &voltage_avg, &power_good, &bat_charging, mwdevice->mw_gbatvrsp_data);

 
        return 0;
 }
 
 
        return 0;
 }
 

-void mw_set_get_battery_voltage_response_cb(mwdevice_t *mwdevice, void (*mw_get_battery_voltage_response_cb) (mwdevice_t *mwdevice, unsigned short *voltage, unsigned char *pgood, unsigned char *charging, void *user_data), void *user_data)
+void mw_set_get_battery_voltage_response_cb(mwdevice_t *mwdevice, void (*mw_get_battery_voltage_response_cb) (mwdevice_t *mwdevice, unsigned short *voltage, unsigned short *voltage_avg, unsigned char *pgood, unsigned char *charging, void *user_data), void *user_data)

 {
        if (mw_get_battery_voltage_response_cb != NULL)
                mwdevice->mw_get_battery_voltage_response_cb = mw_get_battery_voltage_response_cb;
 {
        if (mw_get_battery_voltage_response_cb != NULL)
                mwdevice->mw_get_battery_voltage_response_cb = mw_get_battery_voltage_response_cb;


@@ -468,21 +463,20 @@ void mw_set_button_event_message_cb(mwdevice_t *mwdevice, void (*mw_button_event
 
 int mw_read_light_sensor_response(mwdevice_t *mwdevice, unsigned char *lightrsp, int len)
 {
 
 int mw_read_light_sensor_response(mwdevice_t *mwdevice, unsigned char *lightrsp, int len)
 {

-       unsigned char power_good = lightrsp[0];
-       unsigned char bat_charging = lightrsp[1];
-       unsigned short light_level = *(unsigned short *)(lightrsp+2);
+       unsigned short light_level = *(unsigned short *)(lightrsp);
+       unsigned short light_level_avg = *(unsigned short *)(lightrsp+2);

 
 #ifdef DEBUG
 
 #ifdef DEBUG

-       fprintf(stderr, "light sensor is at %d, power stat: %s and %s\n", light_level, power_good ? "power is good" : "power fault", bat_charging ? "charging" : "not charging");
+       fprintf(stderr, "light sensor is at %d, average at %d\n", light_level, light_level_avg);

 #endif
 
        if (mwdevice->mw_read_light_sensor_response_cb != NULL)
 #endif
 
        if (mwdevice->mw_read_light_sensor_response_cb != NULL)

-               mwdevice->mw_read_light_sensor_response_cb(mwdevice, &light_level, mwdevice->mw_rlsrsp_data);
+               mwdevice->mw_read_light_sensor_response_cb(mwdevice, &light_level, &light_level_avg, mwdevice->mw_rlsrsp_data);

 
        return 0;
 }
 
 
        return 0;
 }
 

-void mw_set_read_light_sensor_response_cb(mwdevice_t *mwdevice, void (*mw_read_light_sensor_response_cb) (mwdevice_t *mwdevice, unsigned short *light_level, void *user_data), void *user_data)
+void mw_set_read_light_sensor_response_cb(mwdevice_t *mwdevice, void (*mw_read_light_sensor_response_cb) (mwdevice_t *mwdevice, unsigned short *light_level, unsigned short *light_level_avg, void *user_data), void *user_data)

 {
        if (mw_read_light_sensor_response_cb != NULL)
                mwdevice->mw_read_light_sensor_response_cb = mw_read_light_sensor_response_cb;
 {
        if (mw_read_light_sensor_response_cb != NULL)
                mwdevice->mw_read_light_sensor_response_cb = mw_read_light_sensor_response_cb;

diff --git a/metawatch.h b/metawatch.h
index da89e624991ae16a10860d587e03384fbebfe0e3..bedaa4e78120b34799486d83873e4526a11100a3 100644 (file)
--- a/metawatch.h
+++ b/metawatch.h
@@ -23,13 +23,13 @@ typedef struct _mwdevice_t {
        void *mw_gdtypersp_data;
        void (*mw_get_real_time_clock_response_cb) (struct _mwdevice_t *mwdevice, struct tm *mw_tm, void *user_data);
        void *mw_grtcrsp_data;
        void *mw_gdtypersp_data;
        void (*mw_get_real_time_clock_response_cb) (struct _mwdevice_t *mwdevice, struct tm *mw_tm, void *user_data);
        void *mw_grtcrsp_data;

-       void (*mw_get_battery_voltage_response_cb) (struct _mwdevice_t *mwdevice, unsigned short *voltage, unsigned char *pgood, unsigned char *charging, void *user_data);
+       void (*mw_get_battery_voltage_response_cb) (struct _mwdevice_t *mwdevice, unsigned short *voltage, unsigned short *voltage_avg, unsigned char *pgood, unsigned char *charging, void *user_data);

        void *mw_gbatvrsp_data;
        void (*mw_read_button_config_response_cb) (struct _mwdevice_t *mwdevice, void *user_data);
        void *mw_rbtncnfrsp_data;
        void (*mw_button_event_message_cb) (struct _mwdevice_t *mwdevice, unsigned char buttons, unsigned char options, void *user_data);
        void *mw_btnevmsg_data;
        void *mw_gbatvrsp_data;
        void (*mw_read_button_config_response_cb) (struct _mwdevice_t *mwdevice, void *user_data);
        void *mw_rbtncnfrsp_data;
        void (*mw_button_event_message_cb) (struct _mwdevice_t *mwdevice, unsigned char buttons, unsigned char options, void *user_data);
        void *mw_btnevmsg_data;

-       void (*mw_read_light_sensor_response_cb) (struct _mwdevice_t *mwdevice, unsigned short *light_level, void *user_data);
+       void (*mw_read_light_sensor_response_cb) (struct _mwdevice_t *mwdevice, unsigned short *light_level, unsigned short *light_level_avg, void *user_data);

        void *mw_rlsrsp_data;
        void (*mw_status_change_event_cb) (struct _mwdevice_t *mwdevice, unsigned char *scrmode, unsigned char *status, void *user_data);
        void *mw_stchev_data;
        void *mw_rlsrsp_data;
        void (*mw_status_change_event_cb) (struct _mwdevice_t *mwdevice, unsigned char *scrmode, unsigned char *status, void *user_data);
        void *mw_stchev_data;


@@ -40,7 +40,7 @@ void dump_frame(unsigned char *frame, int len);
 
 int mw_send_frame(mwdevice_t *mwdevice, unsigned char msg_type, unsigned char options, unsigned char *data, unsigned char len);
 
 
 int mw_send_frame(mwdevice_t *mwdevice, unsigned char msg_type, unsigned char options, unsigned char *data, unsigned char len);
 

-int mw_set_rtc(mwdevice_t *mwdevice);
+int mw_set_rtc(mwdevice_t *mwdevice, struct tm *mw_tm);

 
 int mw_nval_operation(mwdevice_t *mwdevice, unsigned char operation, unsigned short identifier, unsigned char size, void *mdata);
 
 
 int mw_nval_operation(mwdevice_t *mwdevice, unsigned char operation, unsigned short identifier, unsigned char size, void *mdata);
 


@@ -72,7 +72,7 @@ int mw_get_real_time_clock_response(mwdevice_t *mwdevice, unsigned char *rtcrsp,
 void mw_set_get_real_time_clock_response_cb(mwdevice_t *mwdevice, void (*mw_get_real_time_clock_response_cb) (mwdevice_t *mwdevice, struct tm *mw_tm, void *user_data), void *user_data);
 
 int mw_get_battery_voltage_response(mwdevice_t *mwdevice, unsigned char *batrsp, int len);
 void mw_set_get_real_time_clock_response_cb(mwdevice_t *mwdevice, void (*mw_get_real_time_clock_response_cb) (mwdevice_t *mwdevice, struct tm *mw_tm, void *user_data), void *user_data);
 
 int mw_get_battery_voltage_response(mwdevice_t *mwdevice, unsigned char *batrsp, int len);

-void mw_set_get_battery_voltage_response_cb(mwdevice_t *mwdevice, void (*mw_get_battery_voltage_response_cb) (mwdevice_t *mwdevice, unsigned short *voltage, unsigned char *pgood, unsigned char *charging, void *user_data), void *user_data);
+void mw_set_get_battery_voltage_response_cb(mwdevice_t *mwdevice, void (*mw_get_battery_voltage_response_cb) (mwdevice_t *mwdevice, unsigned short *voltage, unsigned short *voltage_avg, unsigned char *pgood, unsigned char *charging, void *user_data), void *user_data);

 
 int mw_read_button_config_response(mwdevice_t *mwdevice, unsigned char *btnrsp, int len);
 
 
 int mw_read_button_config_response(mwdevice_t *mwdevice, unsigned char *btnrsp, int len);
 


@@ -80,7 +80,7 @@ int mw_button_event_message(mwdevice_t *mwdevice, unsigned char *btnevt, int len
 void mw_set_button_event_message_cb(mwdevice_t *mwdevice, void (*mw_button_event_message_cb) (mwdevice_t *mwdevice, unsigned char buttons, unsigned char options, void *user_data), void *user_data);
 
 int mw_read_light_sensor_response(mwdevice_t *mwdevice, unsigned char *lightrsp, int len);
 void mw_set_button_event_message_cb(mwdevice_t *mwdevice, void (*mw_button_event_message_cb) (mwdevice_t *mwdevice, unsigned char buttons, unsigned char options, void *user_data), void *user_data);
 
 int mw_read_light_sensor_response(mwdevice_t *mwdevice, unsigned char *lightrsp, int len);

-void mw_set_read_light_sensor_response_cb(mwdevice_t *mwdevice, void (*mw_read_light_sensor_response_cb) (mwdevice_t *mwdevice, unsigned short *light_level, void *user_data), void *user_data);
+void mw_set_read_light_sensor_response_cb(mwdevice_t *mwdevice, void (*mw_read_light_sensor_response_cb) (mwdevice_t *mwdevice, unsigned short *light_level, unsigned short *light_level_avg, void *user_data), void *user_data);

 
 int mw_status_change_event(mwdevice_t *mwdevice, unsigned char option, unsigned char *statrsp, int len);
 void mw_set_status_change_event_cb(mwdevice_t *mwdevice, void (*mw_status_change_event_cb) (mwdevice_t *mwdevice, unsigned char *scrmode, unsigned char *status, void *user_data), void *user_data);
 
 int mw_status_change_event(mwdevice_t *mwdevice, unsigned char option, unsigned char *statrsp, int len);
 void mw_set_status_change_event_cb(mwdevice_t *mwdevice, void (*mw_status_change_event_cb) (mwdevice_t *mwdevice, unsigned char *scrmode, unsigned char *status, void *user_data), void *user_data);

diff --git a/mw_main.c b/mw_main.c
index b1e9d15c4b05d54c0d8671344512ca8fbe5415d7..fbe0ec890c5185c0dee8bce41fb30ce41dc1165e 100644 (file)
--- a/mw_main.c
+++ b/mw_main.c
@@ -499,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) {
                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...");
                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) {
                fprintf(stderr, "OK\n");
        }
        if (strncmp(cmdline, "grtc", 4) == 0) {