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

[metawatch.git] / metawatch.h

diff --git a/metawatch.h b/metawatch.h
index b910dee30354b5013d5c6c1e2fb9a267c7f3096c..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_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_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;
@@ -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_set_rtc(mwdevice_t *mwdevice, unsigned char clk1224, unsigned char date_fmt);
+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);
 
@@ -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_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);
 
@@ -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_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);