Merge pull request #1 from espruino/master

merge from Dordon

Author: lanselambor

.travis.yml

@@ -49,6 +49,7 @@ env:
     - BOARD=EFM32GGSTK
     - BOARD=NUCLEOL476RG
     - BOARD=RUUVITAG DFU_UPDATE_BUILD=1
+    - BOARD=WIO_LTE DFU_UPDATE_BUILD=1
 
 script: make
 

ChangeLog

@@ -6,6 +6,23 @@
              - Do not garbage collect inside an IRQ
             On nRF52 devices, allow button press at boot to clear out peer manager data
             Work out length of typed array with offset correctly (fix #1204)
+            nRF5x: Add Watchdog timer handling
+            Allow IRQs during STM32 neopixel send
+            nRF52: start new connections on idle to ease memory allocation conflicts between code execution & IRQs
+            nRF52: Ignore INVALID_STATE from CONN_PARAM_UPDATE_REQUEST (it can happen if we disconnect and then SD requests an update)
+            Fix Date.toString for dates before 1970
+            STM32: Fix handling of months when setting the internal RTC
+            Move to a faster jsvNewFlatStringOfLength which avoids blocking memory allocation
+            nRF5x: If a task is in progress, report the task ID (BleTask enum)
+            nRF52: Report central mode promise errors correctly if returned by softdevice
+            Remove 'out of memory' warning messages (it's stored as a flag anyway)
+            nRF5x: Don't disable IRQs completely for some things - only disable Espruino ones
+            Fix tab complete for Pins (fix #1213)
+            ESP8266: Fix load() causes endless loops (fix #1037)
+            ESP8266: Wifi library doesn't handle {password: null} (fix #753)
+            ESP8266: make topstrings and topreadonly work on Mac OS X (fix #1210)
+            Change order of execution for init - E.on('init',...) now executed before onInit
+            Added Error flag to show if a UART overflow has occurred
 
      1v93 : Ensure that specifying too many advertising UUIDs causes an exception, not a reboot
             nRF5x: Fix for time jump caused by reentrancy in jshGetSystemTime

Makefile

@@ -601,11 +601,23 @@ ifdef USE_NFC
 endif
 
 ifdef USE_NUCLEO
-WRAPPERSOURCES += targets/nucleo/jswrap_nucleo.c
+  WRAPPERSOURCES += targets/nucleo/jswrap_nucleo.c
 endif
 
+ifdef USE_HEXBADGE
+  INCLUDE += -I$(ROOT)/libs/hexbadge
+  WRAPPERSOURCES += libs/hexbadge/jswrap_hexbadge.c
+endif
+
+ifdef USE_WIO_LTE
+  INCLUDE += -I$(ROOT)/libs/wio_lte
+  WRAPPERSOURCES += libs/wio_lte/jswrap_wio_lte.c
+  SOURCES += targets/stm32/stm32_ws2812b_driver.c
+endif
+
+
 ifdef WICED
-WRAPPERSOURCES += targets/emw3165/jswrap_emw3165.c
+  WRAPPERSOURCES += targets/emw3165/jswrap_emw3165.c
 endif
 
 endif # BOOTLOADER ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ DON'T USE STUFF ABOVE IN BOOTLOADER

boards/HEXBADGE.py

@@ -0,0 +1,112 @@
+#!/bin/false
+# This file is part of Espruino, a JavaScript interpreter for Microcontrollers
+#
+# Copyright (C) 2013 Gordon Williams <[email protected]>
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# ----------------------------------------------------------------------------------------
+# This file contains information for a specific board - the available pins, and where LEDs,
+# Buttons, and other in-built peripherals are. It is used to build documentation as well
+# as various source and header files for Espruino.
+# ----------------------------------------------------------------------------------------
+
+import pinutils;
+
+info = {
+ 'name' : "Hexagonal Espruino Badge",
+ 'link' :  [ "" ],
+ 'default_console' : "EV_SERIAL1",
+ 'default_console_tx' : "D7",
+ 'default_console_rx' : "D8",
+ 'default_console_baudrate' : "9600",
+ # Number of variables can be WAY higher on this board
+ 'variables' : 2000, # How many variables are allocated for Espruino to use. RAM will be overflowed if this number is too high and code won't compile.
+ 'bootloader' : 1,
+ 'binary_name' : 'espruino_%v_hexbadge.bin',
+ 'build' : {
+   'optimizeflags' : '-Os',
+   'libraries' : [
+     'BLUETOOTH',
+     'NET',
+     'GRAPHICS',
+     'NFC',
+     'NEOPIXEL',
+     'HEXBADGE'
+   ],
+   'makefile' : [
+     'DEFINES+=-DHAL_NFC_ENGINEERING_BC_FTPAN_WORKAROUND=1', # Looks like proper production nRF52s had this issue
+     'DFU_PRIVATE_KEY=targets/nrf5x_dfu/dfu_private_key.pem',
+     'DFU_SETTINGS=--application-version 0xff --hw-version 52 --sd-req 0x8C'
+   ]
+ }
+};
+
+
+chip = {
+  'part' : "NRF52832",
+  'family' : "NRF52",
+  'package' : "QFN48",
+  'ram' : 64,
+  'flash' : 512,
+  'speed' : 64,
+  'usart' : 1,
+  'spi' : 3,
+  'i2c' : 2,
+  'adc' : 1,
+  'dac' : 0,
+  'saved_code' : {
+    'address' : ((118 - 3) * 4096), # Bootloader takes pages 120-127, FS takes 118-119
+    'page_size' : 4096,
+    'pages' : 3,
+    'flash_available' : 512 - ((31 + 8 + 1 + 3)*4) # Softdevice uses 31 pages of flash, bootloader 8, FS 1, code 3. Each page is 4 kb.
+  },
+};
+
+devices = {
+  'LED1' : { 'pin' : 'D25' },
+  'LED2' : { 'pin' : 'D26' },
+  'LED3' : { 'pin' : 'D27' },
+  'LED4' : { 'pin' : 'D28' },
+  'LED5' : { 'pin' : 'D29' },
+  'LED6' : { 'pin' : 'D30' },
+  'BTN1' : { 'pin' : 'D19', 'pinstate' : 'IN_PULLDOWN' },
+  'BTN2' : { 'pin' : 'D20', 'pinstate' : 'IN_PULLDOWN' },
+  'BTN3' : { 'pin' : 'D31', 'pinstate' : 'IN_PULLDOWN' },
+  'BTN4' : { 'pin' : 'D16', 'pinstate' : 'IN_PULLDOWN' },
+  'BTN5' : { 'pin' : 'D17', 'pinstate' : 'IN_PULLDOWN' },
+  'BTN6' : { 'pin' : 'D18', 'pinstate' : 'IN_PULLDOWN' },
+  # Pin D22 is used for clock when driving neopixels - as not specifying a pin seems to break things
+};
+
+# left-right, or top-bottom order
+board = {
+};
+board["_css"] = """
+""";
+
+def get_pins():
+  pins = pinutils.generate_pins(0,31) # 32 General Purpose I/O Pins.
+  pinutils.findpin(pins, "PD0", True)["functions"]["XL1"]=0;
+  pinutils.findpin(pins, "PD1", True)["functions"]["XL2"]=0;
+  pinutils.findpin(pins, "PD5", True)["functions"]["RTS"]=0;
+  pinutils.findpin(pins, "PD6", True)["functions"]["TXD"]=0;
+  pinutils.findpin(pins, "PD7", True)["functions"]["CTS"]=0;
+  pinutils.findpin(pins, "PD8", True)["functions"]["RXD"]=0;
+  pinutils.findpin(pins, "PD9", True)["functions"]["NFC1"]=0;
+  pinutils.findpin(pins, "PD10", True)["functions"]["NFC2"]=0;
+  pinutils.findpin(pins, "PD2", True)["functions"]["ADC1_IN0"]=0;
+  pinutils.findpin(pins, "PD3", True)["functions"]["ADC1_IN1"]=0;
+  pinutils.findpin(pins, "PD4", True)["functions"]["ADC1_IN2"]=0;
+  pinutils.findpin(pins, "PD5", True)["functions"]["ADC1_IN3"]=0;
+  pinutils.findpin(pins, "PD28", True)["functions"]["ADC1_IN4"]=0;
+  pinutils.findpin(pins, "PD29", True)["functions"]["ADC1_IN5"]=0;
+  pinutils.findpin(pins, "PD30", True)["functions"]["ADC1_IN6"]=0;
+  pinutils.findpin(pins, "PD31", True)["functions"]["ADC1_IN7"]=0;
+  # everything is non-5v tolerant
+  for pin in pins:
+    pin["functions"]["3.3"]=0;
+  #The boot/reset button will function as a reset button in normal operation. Pin reset on PD21 needs to be enabled on the nRF52832 device for this to work.
+  return pins

boards/WIO_LTE.py

@@ -27,10 +27,12 @@
      'NET',
      'NEOPIXEL',
      'FILESYSTEM',  # Add FILESYSTEM will force javascript module to load from SD card, remain to be seen.
+     'WIO_LTE'
    ],
    'makefile' : [
      'DEFINES+=-DUSE_USB_OTG_FS=1',
      'DEFINES+=-DWIO_LTE',
+     'USE_DFU=1',
      'STLIB=STM32F405xx',
      'PRECOMPILED_OBJS+=$(ROOT)/targetlibs/stm32f4/lib/startup_stm32f40_41xxx.o'
    ]
@@ -91,7 +93,7 @@
   width: 680px;
   height: 1020px;
   left: 200px;
-  background-image: url(img/STM32F4DISCOVERY.jpg);
+  background-image: url(img/WIO_LTE.jpg);
 }
 #boardcontainer {
   height: 1020px;

libs/bluetooth/jswrap_bluetooth.c

@@ -58,7 +58,7 @@ BleTask bleGetCurrentTask() {
 
 bool bleNewTask(BleTask task, JsVar *taskInfo) {
   if (bleTask) {
-    jsExceptionHere(JSET_ERROR, "BLE task is already in progress");
+    jsExceptionHere(JSET_ERROR, "BLE task %d is already in progress", (int)bleTask);
     return false;
   }
   assert(!blePromise && !bleTaskInfo);
@@ -390,8 +390,6 @@ This makes Puck.js undiscoverable, so it can't be connected to.
 Use `NRF.wake()` to wake up and make Puck.js connectable again.
 */
 void jswrap_nrf_bluetooth_sleep() {
-  uint32_t err_code;
-
   // set as sleeping
   bleStatus |= BLE_IS_SLEEPING;
   // stop advertising
@@ -1174,16 +1172,33 @@ Start/stop listening for BLE advertising packets within range. Returns a
 packets=10;
 NRF.setScan(function(d) {
   packets--;
-  console.log(d); // print packet info
   if (packets<=0)
     NRF.setScan(); // stop scanning
+  else
+    console.log(d); // print packet info
 });
 ```
 
+Each `BluetoothDevice` will look a bit like:
+
+```
+BluetoothDevice {
+  "id": "aa:bb:cc:dd:ee:ff", // address
+  "rssi": -89,               // signal strength
+  "services": [ "128bit-uuid", ... ],     // zero or more service UUIDs
+  "data": new Uint8Array([ ... ]).buffer, // ArrayBuffer of returned data
+  "name": "DeviceName"       // the advertised device name
+ }
+```
+
 **Note:** BLE advertising packets can arrive quickly - faster than you'll
 be able to print them to the console. It's best only to print a few, or
 to use a function like `NRF.findDevices(..)` which will collate a list
 of available devices.
+
+**Note:** Using setScan turns the radio's receive mode on constantly. This
+can draw a *lot* of power (12mA or so), so you should use it sparingly or
+you can run your battery down quickly.
 */
 void jswrap_nrf_bluetooth_setScan_cb(JsVar *callback, JsVar *adv) {
   /* This is called when we get data - do some processing here in the main loop
@@ -1295,6 +1310,9 @@ the device returned, to make a connection.
 
 You can also use [`NRF.connect(...)`](/Reference#l_NRF_connect) on just the `id` string returned, which
 may be useful if you always want to connect to a specific device.
+
+**Note:** Using findDevices turns the radio's receive mode on for 2000ms (or however long you specify). This
+can draw a *lot* of power (12mA or so), so you should use it sparingly or you can run your battery down quickly.
 */
 void jswrap_nrf_bluetooth_findDevices_found_cb(JsVar *device) {
   JsVar *arr = jsvObjectGetChild(execInfo.hiddenRoot, "BLEADV", JSV_ARRAY);
@@ -1645,7 +1663,7 @@ NRF.requestDevice({ filters: [{ namePrefix: 'Puck.js' }] }).then(function(device
 }).then(function(service) {
   return service.getCharacteristic("6e400002-b5a3-f393-e0a9-e50e24dcca9e");
 }).then(function(characteristic) {
-  characteristic.writeValue("LED1.set()\n");
+  return characteristic.writeValue("LED1.set()\n");
 }).then(function() {
   gatt.disconnect();
   console.log("Done!");
@@ -1821,7 +1839,7 @@ NRF.connect("aa:bb:cc:dd:ee").then(function(g) {
 }).then(function(service) {
   return service.getCharacteristic("6e400002-b5a3-f393-e0a9-e50e24dcca9e");
 }).then(function(characteristic) {
-  characteristic.writeValue("LED1.set()\n");
+  return characteristic.writeValue("LED1.set()\n");
 }).then(function() {
   gatt.disconnect();
   console.log("Done!");
@@ -1919,6 +1937,17 @@ See [`NRF.requestDevice`](/Reference#l_NRF_requestDevice) for usage examples.
 
 **Note:** This is only available on some devices
 */
+#if CENTRAL_LINK_COUNT>0
+static void _jswrap_nrf_bluetooth_central_connect(JsVar *addr) {
+  // this function gets called on idle - just to make it less
+  // likely we get connected while in the middle of executing stuff
+  ble_gap_addr_t peer_addr;
+  // this should be ok since we checked in jswrap_nrf_BluetoothRemoteGATTServer_connect
+  if (!bleVarToAddr(addr, &peer_addr)) return;
+  jsble_central_connect(peer_addr);
+}
+#endif
+
 JsVar *jswrap_nrf_BluetoothRemoteGATTServer_connect(JsVar *parent) {
 #if CENTRAL_LINK_COUNT>0
 
@@ -1931,14 +1960,19 @@ JsVar *jswrap_nrf_BluetoothRemoteGATTServer_connect(JsVar *parent) {
     jsExceptionHere(JSET_TYPEERROR, "Expecting a device with a mac address of the form aa:bb:cc:dd:ee:ff");
     return 0;
   }
-  jsvUnLock2(device, addr);
+  jsvUnLock(device);
 
+  JsVar *promise = 0;
   if (bleNewTask(BLETASK_CONNECT, parent/*BluetoothRemoteGATTServer*/)) {
-    JsVar *promise = jsvLockAgainSafe(blePromise);
-    jsble_central_connect(peer_addr);
-    return promise;
+    JsVar *fn = jsvNewNativeFunction((void (*)(void))_jswrap_nrf_bluetooth_central_connect, JSWAT_VOID|(JSWAT_JSVAR<<JSWAT_BITS));
+    if (fn) {
+      jsiQueueEvents(0, fn, &addr, 1);
+      jsvUnLock(fn);
+      promise = jsvLockAgainSafe(blePromise);
+    }
   }
-  return 0;
+  jsvUnLock(addr);
+  return promise;
 #else
   jsExceptionHere(JSET_ERROR, "Unimplemented");
   return 0;