improved file upload via IrDA
This commit is contained in:
parent
fd4744b144
commit
5111beac86
@ -63,58 +63,53 @@ bool irda_demo_face_loop(movement_event_t event, void *context) {
|
|||||||
case EVENT_ACTIVATE:
|
case EVENT_ACTIVATE:
|
||||||
case EVENT_TICK:
|
case EVENT_TICK:
|
||||||
{
|
{
|
||||||
char data[32];
|
char data[64];
|
||||||
char filename[9];
|
size_t bytes_read = uart_read_instance(0, data, 64);
|
||||||
char content[30];
|
watch_clear_display();
|
||||||
size_t bytes_read = uart_read_instance(0, data, 32);
|
watch_display_text_with_fallback(WATCH_POSITION_TOP, "IrDA", "IR");
|
||||||
|
|
||||||
if (bytes_read) {
|
if (bytes_read) {
|
||||||
// data is in the format: ">FILENAME>CONTENT" followed by a one-byte checksum
|
// data is in the following format, where S is Size, F is Filename and C is checksum:
|
||||||
uint8_t checksum = 0;
|
// SSFFFFFFFFFFFFCC
|
||||||
for (size_t i = 0; i < bytes_read - 1; i++) {
|
// after that, we get SS bytes of data, followed by a two-byte checksum
|
||||||
checksum += data[i];
|
uint16_t expected_size = ((uint16_t *)data)[0];
|
||||||
}
|
uint16_t expected_checksum = ((uint16_t *)data)[7];
|
||||||
if (checksum != data[bytes_read - 1]) {
|
|
||||||
|
uint16_t checksum = 0;
|
||||||
|
|
||||||
|
for (size_t i = 0; i < 14; i++) checksum += data[i];
|
||||||
|
|
||||||
|
if (checksum != expected_checksum) {
|
||||||
// failed
|
// failed
|
||||||
movement_force_led_on(48, 0, 0);
|
watch_display_text_with_fallback(WATCH_POSITION_TOP, "BAD ", "BA");
|
||||||
} else {
|
watch_display_text(WATCH_POSITION_BOTTOM, "HEADER");
|
||||||
// parse the data
|
break;
|
||||||
if (data[0] != '>') {
|
|
||||||
// failed
|
|
||||||
movement_force_led_on(48, 30, 0);
|
|
||||||
} else {
|
|
||||||
size_t i = 1;
|
|
||||||
while (data[i] != '>' && i < 9) {
|
|
||||||
filename[i - 1] = data[i];
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
if (i == 9) {
|
|
||||||
// failed
|
|
||||||
movement_force_led_on(48, 0, 30);
|
|
||||||
} else {
|
|
||||||
filename[i - 1] = 0;
|
|
||||||
i++;
|
|
||||||
size_t j = 0;
|
|
||||||
while (i < bytes_read - 1) {
|
|
||||||
content[j] = data[i];
|
|
||||||
i++;
|
|
||||||
j++;
|
|
||||||
}
|
|
||||||
content[j] = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// write the data to the file
|
|
||||||
filesystem_write_file(filename, content, strlen(content));
|
|
||||||
movement_force_led_on(0, 48, 0);
|
|
||||||
}
|
}
|
||||||
char buf[14];
|
// valid header! To make it easier on ourselves, we're going to make byte 14 zero...
|
||||||
snprintf(buf, 11, "IR%2d%c%c%c%c%c%c", bytes_read, data[1], data[2], data[3], data[4], data[5], data[6]);
|
data[14] = 0;
|
||||||
watch_clear_display();
|
// so that now buf[2] points to our null-terminated filename.
|
||||||
watch_display_text(WATCH_POSITION_FULL, buf);
|
char *filename = data + 2;
|
||||||
data[31] = 0;
|
|
||||||
printf("%s\n", data);
|
// now let's check the data.
|
||||||
printf("%s\n", buf);
|
checksum = 0;
|
||||||
|
memcpy(&expected_checksum, data + 16 + expected_size, 2);
|
||||||
|
for (uint16_t i = 16; i < 16 + expected_size; i++) checksum += data[i];
|
||||||
|
|
||||||
|
if (checksum != expected_checksum) {
|
||||||
|
// failed
|
||||||
|
watch_display_text_with_fallback(WATCH_POSITION_TOP, "BAD ", "BA");
|
||||||
|
watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "DATA ", " Data ");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Valid data! Write it to the file system.
|
||||||
|
filesystem_write_file(filename, data + 16, expected_size);
|
||||||
|
watch_display_text_with_fallback(WATCH_POSITION_TOP, "RECVD", "RC");
|
||||||
|
|
||||||
|
char buf[8];
|
||||||
|
sprintf(buf, "%4db ", expected_size);
|
||||||
|
watch_display_text(WATCH_POSITION_BOTTOM, buf);
|
||||||
} else {
|
} else {
|
||||||
movement_force_led_off();
|
|
||||||
watch_display_text(WATCH_POSITION_FULL, " no dat");
|
watch_display_text(WATCH_POSITION_FULL, " no dat");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user