Cleanup Epicardium API and Serial Module

epicardium/modules/serial.c

-#include <stdint.h>
-#include <stdio.h>
+#include "epicardium.h"
+#include "api/interrupt-sender.h"
+#include "modules/log.h"
+#include "modules/modules.h"
 
 #include "max32665.h"
 #include "cdcacm.h"
@@ -9,9 +11,8 @@
 #include "task.h"
 #include "queue.h"
 
-#include "modules.h"
-#include "modules/log.h"
-#include "api/interrupt-sender.h"
+#include <stdint.h>
+#include <stdio.h>
 
 /* Task ID for the serial handler */
 TaskHandle_t serial_task_id = NULL;
@@ -31,13 +32,31 @@ void epic_uart_write_str(const char *str, intptr_t length)
 }
 
 /*
- * Blocking API-call to read a character from the queue.
+ * API-call to read a character from the queue.
  */
-char epic_uart_read_chr(void)
+int epic_uart_read_char(void)
 {
 	char chr;
-	xQueueReceive(read_queue, &chr, portMAX_DELAY);
-	return chr;
+	if (xQueueReceive(read_queue, &chr, 0) == pdTRUE) {
+		return (int)chr;
+	}
+	return (-1);
+}
+
+/*
+ * API-call to read data from the queue.
+ */
+int epic_uart_read_str(char *buf, size_t cnt)
+{
+	int i = 0;
+
+	for (i = 0; i < cnt; i++) {
+		if (xQueueReceive(read_queue, &buf[i], 0) != pdTRUE) {
+			break;
+		}
+	}
+
+	return i;
 }
 
 /* Interrupt handler needed for SDK UART implementation */
@@ -60,15 +79,12 @@ static void enqueue_char(char chr)
 		api_interrupt_trigger(EPIC_INT_CTRL_C);
 	}
 
-	if (chr == 0x0e) {
-		/* Control-N */
-		api_interrupt_trigger(EPIC_INT_BHI160_TEST);
-	}
-
 	if (xQueueSend(read_queue, &chr, 100) == errQUEUE_FULL) {
 		/* Queue overran, wait a bit */
 		vTaskDelay(portTICK_PERIOD_MS * 50);
 	}
+
+	api_interrupt_trigger(EPIC_INT_UART_RX);
 }
 
 void vSerialTask(void *pvParameters)