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

[metawatch.git] / metawatch.c

diff --git a/metawatch.c b/metawatch.c
index 0b3385a9f319ca2de69158e64e0780862475e586..2bf028cbabef8d4111a913b092247f9e3e77cdae 100644 (file)
--- a/metawatch.c
+++ b/metawatch.c
@@ -105,37 +105,30 @@ int mw_send_frame(mwdevice_t *mwdevice, unsigned char msg_type, unsigned char op
  * ---------------------------------------------------------------------- */
 
 
-int mw_set_rtc(mwdevice_t *mwdevice, unsigned char clk1224, unsigned char date_fmt)
+int mw_set_rtc(mwdevice_t *mwdevice, struct tm *mw_tm)
 {
-       time_t mtime;
-       struct tm mtm;
        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[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[8] = clk1224;
-       data[9] = date_fmt;
+       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, 10);
+       return mw_send_frame(mwdevice, MW_SET_REAL_TIME_CLOCK, 0, data, 8);
 }
 
 int mw_nval_operation(mwdevice_t *mwdevice, unsigned char operation, unsigned short identifier, unsigned char size, void *mdata)
 {
        unsigned char data[32];
 
-       data[0] = (identifier & 0xff00) >> 8;
-       data[1] = (identifier & 0x00ff);
+       data[0] = (identifier & 0x00ff);
+       data[1] = (identifier & 0xff00) >> 8;
        data[2] = size;
        if (size > 0 && mdata != NULL)
                memcpy((data+3), mdata, size);
@@ -362,9 +355,8 @@ int mw_get_real_time_clock_response(mwdevice_t *mwdevice, unsigned char *rtcrsp,
 {
        struct tm mtm;
        unsigned short year;
-       unsigned char clk1224, date_fmt;
 
-       if (len != 10) {
+       if (len != 8) {
                fprintf(stderr, "get real time clock response length wrong %d != 10\n", len);
                return -1;
        }
@@ -377,11 +369,9 @@ int mw_get_real_time_clock_response(mwdevice_t *mwdevice, unsigned char *rtcrsp,
        mtm.tm_hour = rtcrsp[5];
        mtm.tm_min = rtcrsp[6];
        mtm.tm_sec = rtcrsp[7];
-       clk1224 = rtcrsp[8];
-       date_fmt = rtcrsp[9];
 
 #ifdef DEBUG
-       fprintf(stderr, "watch RTC is %s, clock format is %s, date format is %s\n", asctime(&mtm), clk1224 ? "24h" : "AM/PM", date_fmt ? "DD/MM" : "MM/DD");
+       fprintf(stderr, "watch RTC is %s\n", asctime(&mtm));
 #endif
        if (mwdevice->mw_get_real_time_clock_response_cb != NULL)
                mwdevice->mw_get_real_time_clock_response_cb(mwdevice, &mtm, mwdevice->mw_grtcrsp_data);
@@ -400,21 +390,22 @@ void mw_set_get_real_time_clock_response_cb(mwdevice_t *mwdevice, void (*mw_get_
 
 int mw_get_battery_voltage_response(mwdevice_t *mwdevice, unsigned char *batrsp, int len)
 {
-       unsigned short voltage = *(unsigned short *)batrsp;
-       unsigned char power_good = batrsp[2];
-       unsigned char bat_charging = batrsp[3];
+       unsigned char power_good = batrsp[0];
+       unsigned char bat_charging = batrsp[1];
+       unsigned short voltage = *(unsigned short *)(batrsp+2);
+       unsigned short voltage_avg = *(unsigned short *)(batrsp+4);
 
 #ifdef DEBUG
-       fprintf(stderr, "battery is at %dmV, %s and %s\n", voltage, 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)
-               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;
 }
 
-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;
@@ -472,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)
 {
-       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
-       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)
-               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;
 }
 
-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;