diff --git a/embedded/mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo b/embedded/mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo index 0a3d81aecc453ce98dd9298f9a5087fd83b04c5b..432e6ed9e82fecb6e94766f7b7eae339ad017231 100644 Binary files a/embedded/mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo and b/embedded/mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo differ diff --git a/embedded/mkrouter-v04/mkrouter-v04/src/apahandler.c b/embedded/mkrouter-v04/mkrouter-v04/src/apahandler.c index b84cfce969a695bd09b5eaeb0b11fd4f1df71103..ced7ecd74cd4859a1b28c9069e235f7e05c58208 100644 --- a/embedded/mkrouter-v04/mkrouter-v04/src/apahandler.c +++ b/embedded/mkrouter-v04/mkrouter-v04/src/apahandler.c @@ -55,7 +55,4 @@ void apa_return_packet(uint8_t *packet, uint8_t length){ } uart_sendchars_buffered(ups[ackpack[1]], ackpack, length); } -} - -// NOW: test this -// then, also: can we avoid packing ups into apaports, use hardware.h instead? +} \ No newline at end of file diff --git a/embedded/mkrouter-v04/mkrouter-v04/src/uartport.c b/embedded/mkrouter-v04/mkrouter-v04/src/uartport.c index 9700c31617c983ac43300676950cf593bb99ed30..47c275217d5ded9a25511560f38703c2ba6ac0e4 100644 --- a/embedded/mkrouter-v04/mkrouter-v04/src/uartport.c +++ b/embedded/mkrouter-v04/mkrouter-v04/src/uartport.c @@ -6,6 +6,7 @@ */ #include "uartport.h" +#include "hardware.h" void uart_build(uartport_t *uart, Uart *com, Pio *port, uint32_t pinrx, uint32_t pintx, ringbuffer_t *rbrx, ringbuffer_t *rbtx, pin_t *stlr, pin_t *stlb){ uart->com = com; @@ -82,7 +83,9 @@ void uart_handler(uartport_t *uart){ void uart_rxhandler(uartport_t *uart){ pin_clear(uart->stlr); // set with whatever reads it (apa) + //uint8_t data = uart->com->UART_RHR; rb_putchar(uart->rbrx, uart->com->UART_RHR); + //uart_sendchar_buffered(ups[0], data); } void uart_txhandler(uartport_t *uart){