Merge branch 'master' into esp8266_stuff

Author: gfwilliams

.travis.yml

@@ -2,6 +2,10 @@
 
 language: c
 
+# Ensure we clone the last 1000 commits, which allows us to get the commit counter correct!
+git:
+  depth: 1000
+
 before_script:
  - source ./scripts/provision.sh $BOARD
  - python --version

ChangeLog

@@ -77,6 +77,50 @@
             Add append optimisation for string '+', and don't append to flat/native/etc strings (fix #1746)
             ESP8266_4MB: add optional build flag FLASH_1MB for ESP8255  & ESP01s with 1MB flash
             ESP8266: add optional build flag NO_FOTA to remove flash over the air functionality
+            Add Bangle.getCompass and Bangle.getAccel to get the latest compass/accelerometer readings without a callback
+            Fix `parseInt("0b",16)` as well as some other non-compliant behaviour (fix #1722)
+            Bangle.js: Disable touch buttons if screen off
+            Bangle.js: Don't send 'up' event for a button that was used to wake the screen
+            Bangle.js: GPS event.time set to undefined if GPS time is not initialised
+            Fix regression that removed exception reporting in console
+            Bangle.js: speed up bootloader progress bar
+            Bangle.js: fix problems turning off via bootloader sometimes
+            Bangle.js: improve power consumption when off, now ~0.08mA (fix #1727)
+            Bangle.js: add Bangle.setOptions({wakeOn*}) for when LCD should light
+            Bangle.js: Add 'twist' event and 'wakeOnTwist' (wakeOnTwist now default true, waveOnFaceUp default false)
+            Bangle.js/Pixl.js: Updated E.showMenu
+            Bangle.js: E.showMenu now has some colour, bigger, with next/prev indicators, and works with widgets 
+            Pixl.js: Add E.showPrompt/Alert/Message (fix #1747)
+            Add .toJSON handling for JSON.stringify, and add Date.toJSON (fix #1754)
+            Remove broken Graphics.drawImage centerx/y (fix #1742)
+            Add Storage.writeJSON to avoid any confusion of writing arrays/numbers/etc
+            Bangle.js: Keep widget area free when using showPrompt/Alert/etc (fix #1756)
+            Add more info about flash memory to process.env/process.memory
+            Add Graphics.quadraticBezier() 
+            Allow Graphics.setFont to be used with custom fonts (fix #1762)
+            Espruino WiFi: WiFi module now makes BOOT pin open circuit when sleeping - saves ~2mA
+            Add E.setConsole/getConsole to allow console to be moved (including to 'null')
+            Bangle.js: Ensure HRM is turned off in Bangle.off() (fix #1759)
+            Increase 'Storage' library's max filename size to 24 bytes (from 8)
+            Remove header.replacement in 'Storage' lib and just zero header.name
+              - increase filename to 28 bytes, but file search now more efficient
+            Bangle.js: Increase Storage area to full 4MB of flash
+            Bangle.js: NEEDS NEW APPS - Move away from using first char as file descriptor and use file extensions instead
+            Add StorageFile.getLength() to get the current length of a StorageFile
+            StorageFile also writes files with a 'JSFF_STORAGEFILE' flag (not currently used)
+            Storage.list() can now take a RegEx/string to filter returned results 
+            MDBT42Q: Remove AES encryption libs by default to free up more flash memory
+            Microbit: Add SAVE_ON_FLASH_EXTREME flag to ensure builds keep working
+            Bangle.js: Added built-in 'locale' module to handle common conversions - this can be overwritten by a Storage File to change language
+            Storage.readJSON now has optional 2nd arg that stops it from creating exceptions on bad JSON
+            Bangle.js: Tweak LCD gamma curves to provide better gradients on new watches (fix #1758)
+            Bangle.js: fix BLE UART transmit bug when compiling for SDK14 (thanks @fanoush!)
+            Add euro symbol to 6x8 and 4x6 fonts as char code 128 (ISO10646-1)
+            Bangle.js: Use 'locale' library to translate E.showMenu/Prompt/Alert/etc
+            Bangle.js: remove graphical_menu lib and inline specialised version into E.showMenu
+            Bangle.js: Modify handling of widgets to allow variable width widgets (requires new widget JS)
+            Changed 6x8 builtin font to a modified Dina_r400-6 supporting non-ASCII characters
+            Bangle.js: Modify E.showMessage/Prompt/Alert to clear the entire screen and redraw widgets (fix #1771)
 
      2v04 : Allow \1..\9 escape codes in RegExp
             ESP8266: reading storage is not working for boot from user2 (fix #1507)

Makefile

@@ -66,7 +66,6 @@ INCLUDE?=-I$(ROOT) -I$(ROOT)/targets -I$(ROOT)/src -I$(GENDIR)
 LIBS?=
 DEFINES?=
 CFLAGS?=-Wall -Wextra -Wconversion -Werror=implicit-function-declaration -fno-strict-aliasing -g
-CFLAGS+=-Wno-expansion-to-defined # remove warnings created by Nordic's libs
 CCFLAGS?= # specific flags when compiling cc files
 LDFLAGS?=-Winline -g
 OPTIMIZEFLAGS?=

README.md

@@ -9,6 +9,7 @@ Espruino JavaScript for Microcontrollers
 </pre>
 http://www.espruino.com &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [![Join the chat at https://gitter.im/espruino/Espruino](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/espruino/Espruino?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
+[![Build Status](https://travis-ci.org/espruino/Espruino.svg?branch=master)](https://travis-ci.org/espruino/Espruino)
 
 About
 -----

boards/BANGLEJS.py

@@ -45,7 +45,7 @@
      'INCLUDE += -I$(ROOT)/libs/banglejs -I$(ROOT)/libs/misc',
      'WRAPPERSOURCES += libs/banglejs/jswrap_bangle.c',
      'SOURCES += libs/misc/nmea.c',
-     'JSMODULESOURCES += libs/js/graphical_menu.min.js',
+     'JSMODULESOURCES += libs/js/banglejs/locale.min.js',
      'NRF_BL_DFU_INSECURE=1',
      'LINKER_BOOTLOADER=targetlibs/nrf5x_12/nrf5x_linkers/banglejs_dfu.ld',
      'LINKER_ESPRUINO=targetlibs/nrf5x_12/nrf5x_linkers/banglejs_espruino.ld'
@@ -69,7 +69,7 @@
   'saved_code' : {
     'address' : 0x40000000, # put this in external flash
     'page_size' : 4096,
-    'pages' : 256, # 1024kb - still loads left
+    'pages' : 1024, # Entire 4MB of external flash
     'flash_available' : 512 - ((31 + 8 + 2)*4) # Softdevice uses 31 pages of flash, bootloader 8, FS 2. Each page is 4 kb.
   },
 };
@@ -132,7 +132,7 @@
             'pin_miso' : 'D20', # D1
             'pin_wp' : 'D31', # D2
             'pin_rst' : 'D17', # D3
-            'size' : 2097152
+            'size' : 4096*1024 # 4MB
           }
 };
 

boards/MDBT42Q.py

@@ -33,7 +33,7 @@
      'NET',
      'GRAPHICS',
      'CRYPTO','SHA256','SHA512',
-     'AES',
+     #'AES',
      'NFC',
      'NEOPIXEL',
      'FILESYSTEM'

boards/MICROBIT.py

@@ -33,8 +33,9 @@
    ],
    'makefile' : [
      'SAVE_ON_FLASH=1',
+     'DEFINES+=-DSAVE_ON_FLASH_EXTREME',
      'DEFINES+=-DCONFIG_GPIO_AS_PINRESET', # Allow the reset pin to work
-     'DEFINES+=-DUSE_TAB_COMPLETE', # Removed -DUSE_DEBUGGER due to firmware size issues
+#     'DEFINES+=-DUSE_TAB_COMPLETE -DUSE_DEBUGGER', # Removed  due to firmware size issues
      'INCLUDE += -I$(ROOT)/libs/microbit',
      'WRAPPERSOURCES += libs/microbit/jswrap_microbit.c'
    ]