* ---------------------------------------------------------------------- */
-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];
- 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[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);
}
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
- 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)
- 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;
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;