From 38aa54ba745c8d00d4883d8414e81f5af212a0a0 Mon Sep 17 00:00:00 2001
From: Jake <jake.read@cba.mit.edu>
Date: Fri, 16 Mar 2018 21:47:54 -0400
Subject: [PATCH] port handling works on multiple hops, returns

---
 .../mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo  | Bin 82944 -> 74752 bytes
 .../mkrouter-v04/src/apahandler.c             |   5 +----
 .../mkrouter-v04/mkrouter-v04/src/uartport.c  |   3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/embedded/mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo b/embedded/mkrouter-v04/.vs/mkrouter-v04/v14/.atsuo
index 0a3d81aecc453ce98dd9298f9a5087fd83b04c5b..432e6ed9e82fecb6e94766f7b7eae339ad017231 100644
GIT binary patch
delta 3047
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
b$@g?ZCx=>fP49AI%$wX`?ZCtUigY^w&ZR9L

delta 2635
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
HBL^b@WUs6K

diff --git a/embedded/mkrouter-v04/mkrouter-v04/src/apahandler.c b/embedded/mkrouter-v04/mkrouter-v04/src/apahandler.c
index b84cfce..ced7ecd 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 9700c31..47c2752 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){
-- 
GitLab