gex/gex-client-c
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed bulk read and updated unit listing to support unit types

Browse Source
This commit is contained in:
MightyPork
2017-12-23 22:36:56 +01:00
parent 9eb4984b1f
commit e82d45eefb
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gex/gex_bulk.c
+6 -7
View File
@@ -66,16 +66,15 @@ uint32_t GEX_BulkRead(GexUnit *unit, GexBulk *bulk)
return 0; return 0;
} }
if (resp.type == MSG_BULK_END) { if (resp.type == MSG_BULK_DATA || resp.type == MSG_BULK_END) {
// No more data
// fprintf(stderr, "Bulk read OK, closed.\n");
return at;
}
if (resp.type == MSG_BULK_DATA) {
// hexDump("Rx chunk", resp.payload, resp.len); // hexDump("Rx chunk", resp.payload, resp.len);
memcpy(bulk->buffer+at, resp.payload, resp.len); memcpy(bulk->buffer+at, resp.payload, resp.len);
at += resp.len; at += resp.len;
// quit if we're done
if (resp.type == MSG_BULK_END) {
return at;
}
} else { } else {
fprintf(stderr, "Bulk read failed! Bad response type.\n"); fprintf(stderr, "Bulk read failed! Bad response type.\n");
return 0; return 0;
gex/gex_client.c
+6 -4
View File
@@ -76,17 +76,19 @@ static TF_Result list_units_lst(TinyFrame *tf, TF_Msg *msg)
PayloadParser pp = pp_start((uint8_t*)msg->data, msg->len, NULL); PayloadParser pp = pp_start((uint8_t*)msg->data, msg->len, NULL);
uint8_t count = pp_u8(&pp); uint8_t count = pp_u8(&pp);
char buf[100]; char buf[20];
char buf2[20];
struct gex_unit *tail = NULL; struct gex_unit *tail = NULL;
for(int i = 0; i < count; i++) { for(int i = 0; i < count; i++) {
uint8_t callsign = pp_u8(&pp); uint8_t callsign = pp_u8(&pp);
pp_string(&pp, buf, 100); pp_string(&pp, buf, 20);
fprintf(stderr, "- Found unit \"%s\" @ callsign %d\n", buf, callsign); pp_string(&pp, buf2, 20);
fprintf(stderr, "- Found unit \"%s\" (type %s) @ callsign %d\n", buf, buf2, callsign);
// append // append
struct gex_unit *lu = malloc(sizeof(struct gex_unit)); struct gex_unit *lu = malloc(sizeof(struct gex_unit));
lu->next = NULL; lu->next = NULL;
lu->type = strdup("UNKNOWN"); // TODO lu->type = strdup(buf2);
lu->name = strdup(buf); lu->name = strdup(buf);
lu->callsign = callsign; lu->callsign = callsign;
lu->gex = gex; lu->gex = gex;