Skip to content

Commit 81fc052

Browse files
authored
Merge branch 'master' into esp8266_stuff
2 parents 21c32ab + 9df1c13 commit 81fc052

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1891
-663
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
language: c
44

5+
# Ensure we clone the last 1000 commits, which allows us to get the commit counter correct!
6+
git:
7+
depth: 1000
8+
59
before_script:
610
- source ./scripts/provision.sh $BOARD
711
- python --version

ChangeLog

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

81125
2v04 : Allow \1..\9 escape codes in RegExp
82126
ESP8266: reading storage is not working for boot from user2 (fix #1507)

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ INCLUDE?=-I$(ROOT) -I$(ROOT)/targets -I$(ROOT)/src -I$(GENDIR)
6666
LIBS?=
6767
DEFINES?=
6868
CFLAGS?=-Wall -Wextra -Wconversion -Werror=implicit-function-declaration -fno-strict-aliasing -g
69-
CFLAGS+=-Wno-expansion-to-defined # remove warnings created by Nordic's libs
7069
CCFLAGS?= # specific flags when compiling cc files
7170
LDFLAGS?=-Winline -g
7271
OPTIMIZEFLAGS?=

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Espruino JavaScript for Microcontrollers
99
</pre>
1010
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)
1111

12+
[![Build Status](https://travis-ci.org/espruino/Espruino.svg?branch=master)](https://travis-ci.org/espruino/Espruino)
1213

1314
About
1415
-----

boards/BANGLEJS.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
'INCLUDE += -I$(ROOT)/libs/banglejs -I$(ROOT)/libs/misc',
4646
'WRAPPERSOURCES += libs/banglejs/jswrap_bangle.c',
4747
'SOURCES += libs/misc/nmea.c',
48-
'JSMODULESOURCES += libs/js/graphical_menu.min.js',
48+
'JSMODULESOURCES += libs/js/banglejs/locale.min.js',
4949
'NRF_BL_DFU_INSECURE=1',
5050
'LINKER_BOOTLOADER=targetlibs/nrf5x_12/nrf5x_linkers/banglejs_dfu.ld',
5151
'LINKER_ESPRUINO=targetlibs/nrf5x_12/nrf5x_linkers/banglejs_espruino.ld'
@@ -69,7 +69,7 @@
6969
'saved_code' : {
7070
'address' : 0x40000000, # put this in external flash
7171
'page_size' : 4096,
72-
'pages' : 256, # 1024kb - still loads left
72+
'pages' : 1024, # Entire 4MB of external flash
7373
'flash_available' : 512 - ((31 + 8 + 2)*4) # Softdevice uses 31 pages of flash, bootloader 8, FS 2. Each page is 4 kb.
7474
},
7575
};
@@ -132,7 +132,7 @@
132132
'pin_miso' : 'D20', # D1
133133
'pin_wp' : 'D31', # D2
134134
'pin_rst' : 'D17', # D3
135-
'size' : 2097152
135+
'size' : 4096*1024 # 4MB
136136
}
137137
};
138138

boards/MDBT42Q.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'NET',
3434
'GRAPHICS',
3535
'CRYPTO','SHA256','SHA512',
36-
'AES',
36+
#'AES',
3737
'NFC',
3838
'NEOPIXEL',
3939
'FILESYSTEM'

boards/MICROBIT.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
],
3434
'makefile' : [
3535
'SAVE_ON_FLASH=1',
36+
'DEFINES+=-DSAVE_ON_FLASH_EXTREME',
3637
'DEFINES+=-DCONFIG_GPIO_AS_PINRESET', # Allow the reset pin to work
37-
'DEFINES+=-DUSE_TAB_COMPLETE', # Removed -DUSE_DEBUGGER due to firmware size issues
38+
# 'DEFINES+=-DUSE_TAB_COMPLETE -DUSE_DEBUGGER', # Removed due to firmware size issues
3839
'INCLUDE += -I$(ROOT)/libs/microbit',
3940
'WRAPPERSOURCES += libs/microbit/jswrap_microbit.c'
4041
]

0 commit comments

Comments
 (0)