give capsense a timeout, add it to Puck object, and fix Ctrl-C behaviour on nRF52

Author: gfwilliams

Makefile

@@ -1368,8 +1368,6 @@ ifdef USE_NFC
   INCLUDE          += -I$(NRF5X_SDK_PATH)/components/nfc/ndef/uri
   INCLUDE          += -I$(NRF5X_SDK_PATH)/components/nfc/ndef/generic/message
   INCLUDE          += -I$(NRF5X_SDK_PATH)/components/nfc/ndef/generic/record
-  TARGETSOURCES    += $(NRF5X_SDK_PATH)/components/drivers_nrf/clock/nrf_drv_clock.c
-  TARGETSOURCES    += $(NRF5X_SDK_PATH)/components/libraries/util/app_util_platform.c
   TARGETSOURCES    += $(NRF5X_SDK_PATH)/components/nfc/ndef/uri/nfc_uri_msg.c
   TARGETSOURCES    += $(NRF5X_SDK_PATH)/components/nfc/ndef/uri/nfc_uri_rec.c
   TARGETSOURCES    += $(NRF5X_SDK_PATH)/components/nfc/ndef/generic/message/nfc_ndef_msg.c

boards/PUCKJS.py

@@ -58,8 +58,8 @@
   'LED2' : { 'pin' : 'D4' },
   'LED3' : { 'pin' : 'D3' },
   'IR'   : { 'pin_anode' : 'D26', 'pin_cathode' : 'D25' },
-  'BTN1' : { 'pin' : 'D0', 'pinstate' : 'IN_PULLDOWN' }
-# CAPSENSE D8
+  'BTN1' : { 'pin' : 'D0', 'pinstate' : 'IN_PULLDOWN' },
+  'CAPSENSE' : { 'pin_rx' : 'D11', 'pin_tx' : 'D12' }
 # NFC D9/D10
 
 };

libs/bluetooth/jswrap_bluetooth.c

@@ -240,7 +240,7 @@ void ble_app_error_handler(uint32_t error_code, uint32_t line_num, const uint8_t
  *
  * @details This function will be called in case of an assert in the SoftDevice.
  *
- * @warning This handler is an example only and does not fit a final product. You need to analyse 
+ * @warning This handler is an example only and does not fit a final product. You need to analyse
  *          how your product is supposed to react in case of Assert.
  * @warning On assert from the SoftDevice, the system can only recover on reset.
  *
@@ -365,7 +365,7 @@ static void reset_prepare(void)
 
 /**@brief Function for the GAP initialization.
  *
- * @details This function will set up all the necessary GAP (Generic Access Profile) parameters of 
+ * @details This function will set up all the necessary GAP (Generic Access Profile) parameters of
  *          the device. It also sets the permissions and appearance.
  */
 static void gap_params_init(void)
@@ -483,11 +483,11 @@ static void services_init(void)
 {
     uint32_t       err_code;
     ble_nus_init_t nus_init;
-    
+
     memset(&nus_init, 0, sizeof(nus_init));
 
     nus_init.data_handler = nus_data_handler;
-    
+
     err_code = ble_nus_init(&m_nus, &nus_init);
     APP_ERROR_CHECK(err_code);
 
@@ -524,7 +524,7 @@ static void services_init(void)
  */
 static void on_conn_params_evt(ble_conn_params_evt_t * p_evt) {
     uint32_t err_code;
-    
+
     if(p_evt->evt_type == BLE_CONN_PARAMS_EVT_FAILED) {
         err_code = sd_ble_gap_disconnect(m_conn_handle, BLE_HCI_CONN_INTERVAL_UNACCEPTABLE);
         APP_ERROR_CHECK(err_code);
@@ -546,7 +546,7 @@ static void conn_params_error_handler(uint32_t nrf_error) {
 static void conn_params_init(void) {
     uint32_t               err_code;
     ble_conn_params_init_t cp_init;
-    
+
     memset(&cp_init, 0, sizeof(cp_init));
 
     cp_init.p_conn_params                  = NULL;
@@ -557,7 +557,7 @@ static void conn_params_init(void) {
     cp_init.disconnect_on_fail             = false;
     cp_init.evt_handler                    = on_conn_params_evt;
     cp_init.error_handler                  = conn_params_error_handler;
-    
+
     err_code = ble_conn_params_init(&cp_init);
     APP_ERROR_CHECK(err_code);
 }
@@ -680,7 +680,7 @@ static void on_ble_evt(ble_evt_t * p_ble_evt)
 {
     uint32_t                         err_code;
     //jsiConsolePrintf("\n[%d]\n", p_ble_evt->header.evt_id);
-    
+
     switch (p_ble_evt->header.evt_id) {
       case BLE_GAP_EVT_TIMEOUT:
         // the timeout for sd_ble_gap_adv_start expired - kick it off again
@@ -842,10 +842,10 @@ static void on_ble_evt(ble_evt_t * p_ble_evt)
 }
 
 
-/**@brief Function for dispatching a SoftDevice event to all modules with a SoftDevice 
+/**@brief Function for dispatching a SoftDevice event to all modules with a SoftDevice
  *        event handler.
  *
- * @details This function is called from the SoftDevice event interrupt handler after a 
+ * @details This function is called from the SoftDevice event interrupt handler after a
  *          SoftDevice event has been received.
  *
  * @param[in] p_ble_evt  SoftDevice event.
@@ -914,7 +914,7 @@ void nfc_callback(void *context, NfcEvent event, const char *data, size_t dataLe
 static void ble_stack_init(void)
 {
     uint32_t err_code;
-    
+
     // TODO: enable if we're on a device with 32kHz xtal
     /*nrf_clock_lf_cfg_t clock_lf_cfg = {
         .source        = NRF_CLOCK_LF_SRC_XTAL,
@@ -929,13 +929,13 @@ static void ble_stack_init(void)
 
     // Initialize SoftDevice.
     SOFTDEVICE_HANDLER_INIT(&clock_lf_cfg, false);
-    
+
     ble_enable_params_t ble_enable_params;
     err_code = softdevice_enable_get_default_config(CENTRAL_LINK_COUNT,
                                                     PERIPHERAL_LINK_COUNT,
                                                     &ble_enable_params);
     APP_ERROR_CHECK(err_code);
-    
+
 #ifdef USE_BOOTLOADER
     ble_enable_params.common_enable_params.vs_uuid_count  = 2;
     ble_enable_params.gatts_enable_params.service_changed = 1;
@@ -953,7 +953,7 @@ static void ble_stack_init(void)
     // Enable BLE stack.
     err_code = softdevice_enable(&ble_enable_params);
     APP_ERROR_CHECK(err_code);
-    
+
     // Subscribe for BLE events.
     err_code = softdevice_ble_evt_handler_set(ble_evt_dispatch);
     APP_ERROR_CHECK(err_code);
@@ -1069,7 +1069,7 @@ void jswrap_nrf_bluetooth_init(void) {
   // Initialize.
   APP_TIMER_INIT(APP_TIMER_PRESCALER, APP_TIMER_OP_QUEUE_SIZE, false);
   ble_stack_init();
-  
+
 #ifdef USE_BOOTLOADER
   bool erase_bonds = false;
   device_manager_init(erase_bonds);
@@ -1839,24 +1839,6 @@ void jswrap_nrf_nfcURL(JsVar *url) {
 #endif
 }
 
-/*JSON{
-    "type" : "staticmethod",
-    "class" : "NRF",
-    "name" : "cap",
-    "#ifdef" : "NRF52",
-    "generate" : "jswrap_nrf_cap",
-    "params" : [
-      ["tx","pin",""],
-      ["rx","pin",""]
-    ],
-    "return" : ["int", "Capacitive sense counter" ]
-}
-Capacitive sense. TX must be connected to RX pin and sense plate via 1MOhm resistor
-*/
-int jswrap_nrf_cap(Pin tx, Pin rx) {
-  return (int)nrf_utils_cap_sense(tx, rx);
-}
-
 /* ---------------------------------------------------------------------
  *                                                               TESTING
  * ---------------------------------------------------------------------
@@ -1907,5 +1889,3 @@ NRF.setServices({
 });
 
  */
-
-

libs/bluetooth/jswrap_bluetooth.h

@@ -36,8 +36,6 @@ void jswrap_nrf_bleservice_discoverCharacteristics(JsVar *service);
 void jswrap_nrf_blecharacteristic_write(JsVar *characteristic, JsVar *data);
 
 void jswrap_nrf_nfcURL(JsVar *url);
-int jswrap_nrf_cap(Pin tx, Pin rx);
-
 
 bool jswrap_nrf_idle();
 void jswrap_nrf_kill();

libs/puckjs/jswrap_puck.c

@@ -19,9 +19,11 @@
 #include "jsinteractive.h"
 #include "jsdevices.h"
 #include "jshardware.h"
+#include "jsdevices.h"
+#include "jspin.h"
 #include "jstimer.h"
-
 #include "nrf_gpio.h"
+#include "nrf5x_utils.h"
 
 #define MAG_PWR 18
 #define MAG_INT 17
@@ -331,6 +333,29 @@ void jswrap_puck_IR(JsVar *data) {
 }
 
 
+/*JSON{
+    "type" : "staticmethod",
+    "class" : "Puck",
+    "name" : "capSense",
+    "#ifdef" : "NRF52",
+    "generate" : "jswrap_puck_capSense",
+    "params" : [
+      ["tx","pin",""],
+      ["rx","pin",""]
+    ],
+    "return" : ["int", "Capacitive sense counter" ]
+}
+Capacitive sense. TX must be connected to RX pin and sense plate via 1MOhm resistor.
+
+If no pins are supplied, the NFC ring is used for capacitive sense.
+*/
+int jswrap_puck_capSense(Pin tx, Pin rx) {
+  if (jshIsPinValid(tx) && jshIsPinValid(rx)) {
+    return (int)nrf_utils_cap_sense(tx, rx);
+  }
+  return (int)nrf_utils_cap_sense(CAPSENSE_TX_PIN, CAPSENSE_RX_PIN);
+}
+
 /*JSON{
   "type" : "kill",
   "generate" : "jswrap_puck_kill"
@@ -340,7 +365,6 @@ void jswrap_puck_kill() {
     mag_off();
     mag_enabled = false;
   }
-
 }
 
 /*JSON{

libs/puckjs/jswrap_puck.h

@@ -17,6 +17,7 @@ void jswrap_puck_magOn();
 void jswrap_puck_magOff();
 JsVar *jswrap_puck_mag();
 void jswrap_puck_IR(JsVar *data);
+int jswrap_puck_capSense(Pin tx, Pin rx);
 
 void jswrap_puck_kill();
 bool jswrap_puck_idle();

scripts/build_platform_config.py

@@ -384,6 +384,10 @@ def codeOutDevicePin(device, pin, definition_name):
   codeOutDevicePin("IR", "pin_anode", "IR_ANODE_PIN")
   codeOutDevicePin("IR", "pin_cathode", "IR_CATHODE_PIN")
 
+if "CAPSENSE" in board.devices:
+  codeOutDevicePin("CAPSENSE", "pin_rx", "CAPSENSE_RX_PIN")
+  codeOutDevicePin("CAPSENSE", "pin_tx", "CAPSENSE_TX_PIN")
+
 for device in ["USB","SD","LCD","JTAG","ESP8266","IR"]:
   if device in board.devices:
     for entry in board.devices[device]:

targets/nrf5x/jshardware.c

@@ -72,6 +72,7 @@ volatile bool flashIsBusy = false;
 volatile bool hadEvent = false; // set if we've had an event we need to deal with
 bool uartIsSending = false;
 bool uartInitialised = false;
+unsigned int ticksSinceStart = 0;
 
 JshPinFunction pinStates[JSH_PIN_COUNT];
 
@@ -95,6 +96,24 @@ void sys_evt_handler(uint32_t sys_evt) {
   }
 }
 
+#ifdef NRF52
+/* SysTick interrupt Handler. */
+void SysTick_Handler(void)  {
+  /* Handle the delayed Ctrl-C -> interrupt behaviour (see description by EXEC_CTRL_C's definition)  */
+  if (execInfo.execute & EXEC_CTRL_C_WAIT)
+    execInfo.execute = (execInfo.execute & ~EXEC_CTRL_C_WAIT) | EXEC_INTERRUPTED;
+  if (execInfo.execute & EXEC_CTRL_C)
+    execInfo.execute = (execInfo.execute & ~EXEC_CTRL_C) | EXEC_CTRL_C_WAIT;
+
+  ticksSinceStart++;
+  /* One second after start, call jsinteractive. This is used to swap
+   * to USB (if connected), or the Serial port. */
+  if (ticksSinceStart == 5) {
+    jsiOneSecondAfterStartup();
+  }
+}
+#endif
+
 #ifdef NRF52
 NRF_PWM_Type *nrf_get_pwm(JshPinFunction func) {
   if ((func&JSH_MASK_TYPE) == JSH_TIMER1) return NRF_PWM0;
@@ -195,12 +214,16 @@ void jshInit() {
                       wakeup_handler);
   if (err_code) jsiConsolePrintf("app_timer_create error %d\n", err_code);
 #endif
-  
+
   // Softdevice is initialised now
   softdevice_sys_evt_handler_set(sys_evt_handler);
   // Enable PPI driver
   err_code = nrf_drv_ppi_init();
   APP_ERROR_CHECK(err_code);
+#ifdef NRF52  
+  // Turn on SYSTICK - used for handling Ctrl-C behaviour
+  SysTick_Config(0xFFFFFF);
+#endif
 }
 
 // When 'reset' is called - we try and put peripherals back to their power-on state
@@ -215,10 +238,12 @@ void jshKill() {
 
 // stuff to do on idle
 void jshIdle() {
+#ifndef NRF52
   if (init == 1) {
     jsiOneSecondAfterStartup(); // Do this the first time we enter jshIdle() after we have called jshInit() and never again.
     init = 0;
   }
+#endif
 }
 
 /// Get this IC's serial number. Passed max # of chars and a pointer to write to. Returns # of chars

targets/nrf5x/nrf5x_utils.c

@@ -27,6 +27,8 @@
 #include "nrf_drv_gpiote.h"
 #include "nrf_drv_ppi.h"
 
+#include "jsparse.h"
+
 unsigned int nrf_utils_get_baud_enum(int baud) {
   switch (baud) {
     case 1200: return UART_BAUDRATE_BAUDRATE_Baud1200;
@@ -61,8 +63,8 @@ void nrf_utils_lfclk_config_and_start()
   NRF_CLOCK->TASKS_LFCLKSTART = 1;
   while(NRF_CLOCK->EVENTS_LFCLKSTARTED == 0);
 
-  /* 
-  // wait until the clock is running - Xtal only? 
+  /*
+  // wait until the clock is running - Xtal only?
   while (((NRF_CLOCK->LFCLKSTAT & CLOCK_LFCLKSTAT_STATE_Msk) != ((CLOCK_LFCLKSTAT_STATE_Running << CLOCK_LFCLKSTAT_STATE_Pos) & CLOCK_LFCLKSTAT_STATE_Msk)))
   {
     // Do nothing...
@@ -91,7 +93,7 @@ int nrf_utils_get_device_id(uint8_t * device_id, int maxChars)
 
 uint8_t nrf_utils_get_random_number()
 {
-  
+
   NRF_RNG->CONFIG = 0x00000001; // Use the bias generator.
   NRF_RNG->TASKS_START = 1;
 
@@ -177,9 +179,11 @@ unsigned int nrf_utils_cap_sense(int capSenseTxPin, int capSenseRxPin) {
   NRF_TIMER2->EVENTS_COMPARE[1] = 0;
   int i;
   for (i=0;i<50;i++) {
-    while (!NRF_TIMER2->EVENTS_COMPARE[1]);
+    unsigned int timeout = 100000;
+    while (!NRF_TIMER2->EVENTS_COMPARE[1] && --timeout);
     NRF_TIMER2->EVENTS_COMPARE[1] = 0;
     sum += NRF_TIMER2->CC[2];
+    if (jspIsInterrupted()) break;
   }
 
   nrf_gpio_cfg_input(capSenseTxPin, NRF_GPIO_PIN_NOPULL);
@@ -208,10 +212,15 @@ unsigned int nrf_utils_cap_sense(int capSenseTxPin, int capSenseRxPin) {
   nrf_gpio_cfg_output(capSenseTxPin);
 
   for (i=0;i<100;i++) {
+    const unsigned int CTR_MAX = 100000;
+    unsigned int ctr = CTR_MAX;
     nrf_gpio_pin_set(capSenseTxPin);
-    while (!(NRF_GPIO->IN & mask)) sum++;
+    while (!(NRF_GPIO->IN & mask) && ctr--);
+    sum += CTR_MAX-ctr;
     nrf_gpio_pin_clear(capSenseTxPin);
-    while (NRF_GPIO->IN & mask) sum++;
+    while (NRF_GPIO->IN & mask && ctr--);
+    sum += CTR_MAX-ctr;
+    if (jspIsInterrupted()) break;
   }
   nrf_gpio_cfg_input(capSenseTxPin, NRF_GPIO_PIN_NOPULL);