aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-02-28 15:52:03 +0200
committerFred Sundvik <fsundvik@gmail.com>2016-02-28 15:52:03 +0200
commit46482460fa5ba7e1606656f651117cc30f643952 (patch)
tree9d88c148d0971afb0d472981fb3cadf4d67670a8
parent9cb139adc4e08ff393b1cb8bf16203d670996e71 (diff)
downloadfirmware-46482460fa5ba7e1606656f651117cc30f643952.tar.gz
firmware-46482460fa5ba7e1606656f651117cc30f643952.tar.bz2
firmware-46482460fa5ba7e1606656f651117cc30f643952.zip
Some small fixes for the serial update loop
-rw-r--r--serial_link/system/system.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/serial_link/system/system.c b/serial_link/system/system.c
index 2dbd9a4c1..e40a18cec 100644
--- a/serial_link/system/system.c
+++ b/serial_link/system/system.c
@@ -36,14 +36,14 @@ static SerialConfig config = {
.sc_speed = 38400
};
-static uint32_t read_from_serial(SerialDriver* driver) {
+static uint32_t read_from_serial(SerialDriver* driver, uint8_t link) {
const uint32_t buffer_size = 16;
uint8_t buffer[buffer_size];
uint32_t bytes_read = sdAsynchronousRead(driver, buffer, buffer_size);
uint8_t* current = buffer;
uint8_t* end = current + bytes_read;
while(current < end) {
- byte_stuffer_recv_byte(0, *current);
+ byte_stuffer_recv_byte(link, *current);
current++;
}
return bytes_read;
@@ -74,14 +74,14 @@ static THD_FUNCTION(serialThread, arg) {
router_set_master(is_master);
need_wait = true;
- need_wait &= read_from_serial(&SD1) == 0;
- need_wait &= read_from_serial(&SD2) == 0;
+ need_wait &= read_from_serial(&SD2, UP_LINK) == 0;
+ need_wait &= read_from_serial(&SD1, DOWN_LINK) == 0;
update_transport();
}
}
void send_data(uint8_t link, const uint8_t* data, uint16_t size) {
- if (link == 0) {
+ if (link == DOWN_LINK) {
sdWrite(&SD1, data, size);
}
else {