summaryrefslogtreecommitdiff
path: root/robot/sercomm.c
diff options
context:
space:
mode:
authorlonkaars <loek@pipeframe.xyz>2022-05-23 12:56:21 +0200
committerlonkaars <loek@pipeframe.xyz>2022-05-23 12:56:21 +0200
commit2c94e4478558551dbebdc8fa8682661fa60a1c75 (patch)
tree12102d584b1e511f65aa0f39c1ea8c4f85aac16c /robot/sercomm.c
parent22f92030b316f98c5f8d3a54d0a937ab12fe148e (diff)
fix segfault
Diffstat (limited to 'robot/sercomm.c')
-rw-r--r--robot/sercomm.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/robot/sercomm.c b/robot/sercomm.c
index 9c67aab..59b0f5a 100644
--- a/robot/sercomm.c
+++ b/robot/sercomm.c
@@ -15,22 +15,12 @@ void w2_sercomm_main() {
simprintfunc("w2_sercomm_main", "");
#endif
// send data
- while (g_w2_sercomm_index != g_w2_sercomm_offset) {
-#ifdef W2_SIM
- simprint("line 0");
- w2_s_bin *data = g_w2_sercomm_buffer[g_w2_sercomm_index];
- simprint("line 1");
-
- simprintf("bytes: %i\n", data->bytes);
+ while (g_w2_sercomm_offset != g_w2_sercomm_index) {
+ w2_s_bin *data = g_w2_sercomm_buffer[g_w2_sercomm_offset];
char *data_cast = malloc(data->bytes);
- simprint("line 2");
memcpy(data_cast, data->data, data->bytes);
- simprint("line 3");
serial_send(data_cast, data->bytes);
- simprint("line 4");
g_w2_sercomm_offset = (g_w2_sercomm_offset + 1) % W2_SERCOMM_BUFFER_SIZE;
- simprint("line 5");
-#endif
}
}
@@ -42,7 +32,8 @@ void w2_sercomm_append_msg(w2_s_bin *data) {
g_w2_sercomm_buffer_full = next_index == g_w2_sercomm_offset;
free(g_w2_sercomm_buffer[g_w2_sercomm_index]);
w2_s_bin *data_copy = malloc(sizeof(w2_s_bin) + sizeof(uint8_t) * data->bytes);
- memcpy(&data_copy->bytes, data->data, data->bytes);
+ memcpy(&data_copy->data, data->data, data->bytes);
+ data_copy->bytes = data->bytes;
g_w2_sercomm_buffer[g_w2_sercomm_index] = data_copy;
if (g_w2_sercomm_buffer_full) return;
g_w2_sercomm_index = next_index;