add Ctrl+C for REPL over bleuart

hathach · tannewt · commit dfa6b6e9c5ec · 2018-01-18T11:32:47.000-08:00
diff --git a/ports/nrf/drivers/bluetooth/ble_uart.c b/ports/nrf/drivers/bluetooth/ble_uart.c
@@ -30,6 +30,7 @@
 #include "ble_uart.h"
 #include "ringbuffer.h"
 #include "hal/hal_time.h"
+#include "lib/utils/interrupt_char.h"
 
 #if MICROPY_PY_BLE_NUS
 
@@ -145,6 +146,7 @@ STATIC void gap_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t conn
     } else if (event_id == 17) {         // disconnect event
         self->conn_handle = 0xFFFF;      // invalid connection handle
         m_connected = false;
+        ble_uart_advertise();
     }
 }
 
@@ -157,7 +159,14 @@ STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t at
             m_cccd_enabled = true;
         } else if (ble_uart_char_rx.handle == attr_handle) {
             for (uint16_t i = 0; i < length; i++) {
-                bufferWrite(mp_rx_ring_buffer, data[i]);
+                #if MICROPY_KBD_EXCEPTION
+                if (data[i] == mp_interrupt_char) {
+                    mp_keyboard_interrupt();
+                } else
+                #endif
+                {
+                    bufferWrite(mp_rx_ring_buffer, data[i]);
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include "ble_uart.h"`
`31`	`31`	`#include "ringbuffer.h"`
`32`	`32`	`#include "hal/hal_time.h"`
	`33`	`+#include "lib/utils/interrupt_char.h"`
`33`	`34`
`34`	`35`	`#if MICROPY_PY_BLE_NUS`
`35`	`36`
`@@ -145,6 +146,7 @@ STATIC void gap_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t conn`
`145`	`146`	`} else if (event_id == 17) { // disconnect event`
`146`	`147`	`self->conn_handle = 0xFFFF; // invalid connection handle`
`147`	`148`	`m_connected = false;`
	`149`	`+ ble_uart_advertise();`
`148`	`150`	`}`
`149`	`151`	`}`
`150`	`152`
`@@ -157,7 +159,14 @@ STATIC void gatts_event_handler(mp_obj_t self_in, uint16_t event_id, uint16_t at`
`157`	`159`	`m_cccd_enabled = true;`
`158`	`160`	`} else if (ble_uart_char_rx.handle == attr_handle) {`
`159`	`161`	`for (uint16_t i = 0; i < length; i++) {`
`160`		`- bufferWrite(mp_rx_ring_buffer, data[i]);`
	`162`	`+ #if MICROPY_KBD_EXCEPTION`
	`163`	`+ if (data[i] == mp_interrupt_char) {`
	`164`	`+ mp_keyboard_interrupt();`
	`165`	`+ } else`
	`166`	`+ #endif`
	`167`	`+ {`
	`168`	`+ bufferWrite(mp_rx_ring_buffer, data[i]);`
	`169`	`+ }`
`161`	`170`	`}`
`162`	`171`	`}`
`163`	`172`	`}`