mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Uemis downloader: minor coding style updates

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-09-18 12:35:35 -07:00
parent 69c5e9adc2
commit f7eb6f6b58
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
uemis.c
View file

@ -80,22 +80,20 @@ static int uemis_convert_base64(char *base64, uint8_t **data)
len = strlen(base64); len = strlen(base64);
datalen = (len / 4 + 1) * 3; datalen = (len / 4 + 1) * 3;
if (datalen < 0x123 + 0x25) { if (datalen < 0x123 + 0x25)
/* less than header + 1 sample??? */ /* less than header + 1 sample??? */
fprintf(stderr, "suspiciously short data block %d\n", datalen); fprintf(stderr, "suspiciously short data block %d\n", datalen);
}
*data = malloc(datalen); *data = malloc(datalen);
if (!*data) { if (!*data) {
datalen = 0;
fprintf(stderr, "Out of memory\n"); fprintf(stderr, "Out of memory\n");
goto bail; return 0;
} }
decode((unsigned char *)base64, *data, len); decode((unsigned char *)base64, *data, len);
if (memcmp(*data, "Dive\01\00\00", 7)) if (memcmp(*data, "Dive\01\00\00", 7))
fprintf(stderr, "Missing Dive100 header\n"); fprintf(stderr, "Missing Dive100 header\n");
bail:
return datalen; return datalen;
} }
@ -159,7 +157,7 @@ void uemis_mark_divelocation(int diveid, int divespot, uint32_t dive_site_uuid)
int uemis_get_divespot_id_by_diveid(uint32_t diveid) int uemis_get_divespot_id_by_diveid(uint32_t diveid)
{ {
struct uemis_helper *hp = uemis_helper; struct uemis_helper *hp = uemis_helper;
while(hp) { while (hp) {
if (hp->diveid == diveid) if (hp->diveid == diveid)
return hp->divespot; return hp->divespot;
hp = hp->next; hp = hp->next;
@ -347,7 +345,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap)
/* first byte of divelog data is at offset 0x123 */ /* first byte of divelog data is at offset 0x123 */
i = 0x123; i = 0x123;
u_sample = (uemis_sample_t *)(data + i); u_sample = (uemis_sample_t *)(data + i);
while ((i <= datalen) && (data[i] != 0 || data[i+1] != 0)) { while ((i <= datalen) && (data[i] != 0 || data[i + 1] != 0)) {
if (u_sample->active_tank != active) { if (u_sample->active_tank != active) {
if (u_sample->active_tank >= MAX_CYLINDERS) { if (u_sample->active_tank >= MAX_CYLINDERS) {
fprintf(stderr, "got invalid sensor #%d was #%d\n", u_sample->active_tank, active); fprintf(stderr, "got invalid sensor #%d was #%d\n", u_sample->active_tank, active);
@ -379,7 +377,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap)
add_extra_data(dc, "FW Version", version); add_extra_data(dc, "FW Version", version);
snprintf(buffer, sizeof(buffer), "%08x", *(uint32_t *)(data + 9)); snprintf(buffer, sizeof(buffer), "%08x", *(uint32_t *)(data + 9));
add_extra_data(dc, "Serial", buffer); add_extra_data(dc, "Serial", buffer);
snprintf(buffer, sizeof(buffer), "%d",*(uint16_t *)(data + i + 35)); snprintf(buffer, sizeof(buffer), "%d", *(uint16_t *)(data + i + 35));
add_extra_data(dc, "main battery after dive", buffer); add_extra_data(dc, "main battery after dive", buffer);
snprintf(buffer, sizeof(buffer), "%0u:%02u", FRACTION(*(uint16_t *)(data + i + 24), 60)); snprintf(buffer, sizeof(buffer), "%0u:%02u", FRACTION(*(uint16_t *)(data + i + 24), 60));
add_extra_data(dc, "no fly time", buffer); add_extra_data(dc, "no fly time", buffer);
@ -387,7 +385,7 @@ void uemis_parse_divelog_binary(char *base64, void *datap)
add_extra_data(dc, "no dive time", buffer); add_extra_data(dc, "no dive time", buffer);
snprintf(buffer, sizeof(buffer), "%0u:%02u", FRACTION(*(uint16_t *)(data + i + 28), 60)); snprintf(buffer, sizeof(buffer), "%0u:%02u", FRACTION(*(uint16_t *)(data + i + 28), 60));
add_extra_data(dc, "desat time", buffer); add_extra_data(dc, "desat time", buffer);
snprintf(buffer, sizeof(buffer), "%u",*(uint16_t *)(data + i + 30)); snprintf(buffer, sizeof(buffer), "%u", *(uint16_t *)(data + i + 30));
add_extra_data(dc, "allowed altitude", buffer); add_extra_data(dc, "allowed altitude", buffer);
return; return;