Improve cmd parameter parsing and handling

[metawatch.git] / metawatch.c

diff --git a/metawatch.c b/metawatch.c
index d1d6d2b0fe536a8db3ede2e7a7a28eb7b19a28fb..e093168d833fff9bb3bdf44b6fa8cd10ffb9fb9c 100644 (file)
--- a/metawatch.c
+++ b/metawatch.c
@@ -90,6 +90,7 @@ int mw_send_frame(mwdevice_t *mwdevice, unsigned char msg_type, unsigned char op
        while (((ret = write(mwdevice->mw_fd, frame, tlen)) >= 0) && (tlen > 0))
                tlen -= ret;
 
        while (((ret = write(mwdevice->mw_fd, frame, tlen)) >= 0) && (tlen > 0))
                tlen -= ret;
 

+       fsync(mwdevice->mw_fd);

        if (MW_FRAME_DELAY)
                usleep(MW_FRAME_DELAY);
 
        if (MW_FRAME_DELAY)
                usleep(MW_FRAME_DELAY);
 


@@ -428,6 +429,7 @@ void mw_set_get_battery_voltage_response_cb(mwdevice_t *mwdevice, void (*mw_get_
                mwdevice->mw_gbatvrsp_data = user_data;
 }
 
                mwdevice->mw_gbatvrsp_data = user_data;
 }
 

+#if 0

 int mw_read_button_config_response(mwdevice_t *mwdevice, unsigned char *btnrsp, int len)
 {
 #ifdef DEBUG
 int mw_read_button_config_response(mwdevice_t *mwdevice, unsigned char *btnrsp, int len)
 {
 #ifdef DEBUG


@@ -447,6 +449,7 @@ int mw_read_button_config_response(mwdevice_t *mwdevice, unsigned char *btnrsp,
 
        return 0;
 }
 
        return 0;
 }

+#endif

 
 void mw_set_read_button_config_response_cb(mwdevice_t *mwdevice, void (*mw_read_button_config_response_cb) (mwdevice_t *mwdevice, void *user_data), void *user_data)
 {
 
 void mw_set_read_button_config_response_cb(mwdevice_t *mwdevice, void (*mw_read_button_config_response_cb) (mwdevice_t *mwdevice, void *user_data), void *user_data)
 {


@@ -459,7 +462,7 @@ void mw_set_read_button_config_response_cb(mwdevice_t *mwdevice, void (*mw_read_
 int mw_button_event_message(mwdevice_t *mwdevice, unsigned char *btnevt, int len, unsigned char opts)
 {
 #ifdef DEBUG
 int mw_button_event_message(mwdevice_t *mwdevice, unsigned char *btnevt, int len, unsigned char opts)
 {
 #ifdef DEBUG

-       fprintf(stderr, "  button %d options %d\n", btnevt[0], opts);
+       fprintf(stderr, "Button event message, button %d options %d\n", btnevt[0], opts);

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


@@ -522,8 +525,11 @@ void mw_set_status_change_event_cb(mwdevice_t *mwdevice, void (*mw_status_change
                mwdevice->mw_stchev_data = user_data;
 }
 
                mwdevice->mw_stchev_data = user_data;
 }
 

-int mw_low_battery_warning_message(mwdevice_t *mwdevice, unsigned char option, unsigned char *statrsp, int len)
+int mw_low_battery_warning_message(mwdevice_t *mwdevice)

 {
 {

+#ifdef DEBUG
+       fprintf(stderr, "Watch battery low, please connect charger\n");
+#endif

        if (mwdevice->mw_low_battery_warning_message_cb != NULL)
                mwdevice->mw_low_battery_warning_message_cb(mwdevice, mwdevice->mw_lbatwarnmsg_data);
 
        if (mwdevice->mw_low_battery_warning_message_cb != NULL)
                mwdevice->mw_low_battery_warning_message_cb(mwdevice, mwdevice->mw_lbatwarnmsg_data);
 


@@ -538,8 +544,11 @@ void mw_set_low_battery_warning_message_cb(mwdevice_t *mwdevice, void (*mw_low_b
                mwdevice->mw_lbatwarnmsg_data = user_data;
 }
 
                mwdevice->mw_lbatwarnmsg_data = user_data;
 }
 

-int mw_low_battery_bt_off_message(mwdevice_t *mwdevice, unsigned char option, unsigned char *statrsp, int len)
+int mw_low_battery_bt_off_message(mwdevice_t *mwdevice)

 {
 {

+#ifdef DEBUG
+       fprintf(stderr, "Watch battery extremely low - radio will turn off\n");
+#endif

        if (mwdevice->mw_low_battery_bt_off_message_cb != NULL)
                mwdevice->mw_low_battery_bt_off_message_cb(mwdevice, mwdevice->mw_lbatbtoff_data);
 
        if (mwdevice->mw_low_battery_bt_off_message_cb != NULL)
                mwdevice->mw_low_battery_bt_off_message_cb(mwdevice, mwdevice->mw_lbatbtoff_data);
 


@@ -601,18 +610,19 @@ int mw_decode_frame(mwdevice_t *mwdevice, unsigned char *buf, int len)
                case MW_READ_LIGHT_SENSOR_RSP:
                        mw_read_light_sensor_response(mwdevice, msgdata, msgdatalen);
                        break;
                case MW_READ_LIGHT_SENSOR_RSP:
                        mw_read_light_sensor_response(mwdevice, msgdata, msgdatalen);
                        break;

+#if 0

                case MW_READ_BUTTON_CONFIG_RSP:
                        mw_read_button_config_response(mwdevice, msgdata, msgdatalen);
                        break;
                case MW_READ_BUTTON_CONFIG_RSP:
                        mw_read_button_config_response(mwdevice, msgdata, msgdatalen);
                        break;

+#endif

                case MW_BUTTON_EVENT_MESSAGE:
                case MW_BUTTON_EVENT_MESSAGE:

-                       fprintf(stderr, "Button event message\n");

                        mw_button_event_message(mwdevice, msgdata, msgdatalen, msgopt);
                        break;
                case MW_LOW_BATTERY_WARNING_MSG:
                        mw_button_event_message(mwdevice, msgdata, msgdatalen, msgopt);
                        break;
                case MW_LOW_BATTERY_WARNING_MSG:

-                       fprintf(stderr, "Watch battery low, please connect charger\n");
+                       mw_low_battery_warning_message(mwdevice);

                        break;
                case MW_LOW_BATTERY_BT_OFF_MSG:
                        break;
                case MW_LOW_BATTERY_BT_OFF_MSG:

-                       fprintf(stderr, "Watch battery extremely low - radio will turn off\n");
+                       mw_low_battery_bt_off_message(mwdevice);

                        break;
                case MW_NVAL_OPERATION_RSP:
                        fprintf(stderr, "NVAL operation response - ");
                        break;
                case MW_NVAL_OPERATION_RSP:
                        fprintf(stderr, "NVAL operation response - ");


@@ -641,7 +651,9 @@ int mw_decode_frame(mwdevice_t *mwdevice, unsigned char *buf, int len)
                        mw_status_change_event(mwdevice, msgopt, msgdata, msgdatalen);
                        break;
                default:
                        mw_status_change_event(mwdevice, msgopt, msgdata, msgdatalen);
                        break;
                default:

+#ifdef DEBUG

                        fprintf(stderr, "Unkown msgtype 0x%02x\n", msgtype);
                        fprintf(stderr, "Unkown msgtype 0x%02x\n", msgtype);

+#endif

                        break;
        };
 
                        break;
        };