archive-gh-me/Espruino
1
0
Fork 0
mirror of https://github.com/espruino/Espruino.git synced 2025-12-08 19:06:15 +00:00
Code Issues Projects Releases Wiki Activity

update esp-idf to v3.0. BLE support - thanks to @jumjum. 2500 vars. Erase flash before flashing

Browse Source
This commit is contained in:
wilberforce 2018-05-13 14:52:58 +12:00
parent 15c3a9ae93
commit d73e908f39
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/bluetooth/jswrap_bluetooth.c
View File

@ -152,7 +152,7 @@ void jswrap_nrf_init() {
// By default Puck.js's NFC will send you to the PuckJS website
// address is included so Web Bluetooth can connect to the correct one
JsVar *addr = jswrap_nrf_bluetooth_getAddress();
JsVar *uri = jsvVarPrintf("https://puck-js.com/go?a=%v", addr);
JsVar *uri = jsvVarPrintf(NFC_DEFAULT_URL"?a=%v", addr);
jsvUnLock(addr);
jswrap_nrf_nfcURL(uri);
jsvUnLock(uri);
@ -739,9 +739,9 @@ void jswrap_nrf_bluetooth_setAdvertising(JsVar *data, JsVar *options) {
jsble_advertising_stop();
#ifdef NRF5X
err_code = sd_ble_gap_adv_data_set((uint8_t *)dPtr, dLen, NULL, 0);
//#else
// err_code = 0xDEAD;
// jsiConsolePrintf("FIXME\n");
#else
err_code = 0xDEAD;
jsiConsolePrintf("FIXME\n");
#endif
#ifdef ESP32
err_code = bluetooth_gap_setAdvertizing(advArray);

8
scripts/common.py
View File

@ -371,7 +371,6 @@ def get_ifdef_description(d):
if d=="STM32": return "STM32 devices (including Espruino Original, Pico and WiFi)"
if d=="STM32F1": return "STM32F1 devices (including Original Espruino Board)"
if d=="NRF52": return "NRF52 devices (like Puck.js, Pixl.js and MDBT42Q)"
if d=="PUCKJS": return "Puck.js devices"
if d=="PIXLJS": return "Pixl.js boards"
if d=="ESPRUINOWIFI": return "Espruino WiFi boards"
if d=="ESP8266": return "ESP8266 devices running Espruino"
@ -381,11 +380,14 @@ def get_ifdef_description(d):
if d=="USE_TLS": return "devices with TLS and SSL support (Espruino Pico and Espruino WiFi only)"
if d=="RELEASE": return "release builds"
if d=="LINUX": return "Linux-based builds"
if d=="DEBUG": return "debug builds"
if d=="BLUETOOTH": return "devices with Bluetooth LE capability"
if d=="USB": return "devices with USB"
if d=="USE_USB_HID": return "devices that support USB HID (Espruino Pico and Espruino WiFi)"
if d=="USE_AES": return "devices that support AES (Espruino Pico, Espruino WiFi or Linux)"
if d=="USE_CRYPTO": return "devices that support Crypto Functionality (Espruino Pico, Espruino WiFi, Linux or ESP8266)"
if d=="USE_AES": return "devices that support AES (Espruino Pico, Espruino WiFi or Linux, EPS32)"
if d=="USE_CRYPTO": return "devices that support Crypto Functionality (Espruino Pico, Espruino WiFi, Linux or ESP8266, ESP32)"
if d=="USE_SHA256": return "devices that support SHA256 (Espruino Pico, Espruino WiFi, Espruino BLE devices or Linux, ESP32)"
if d=="USE_SHA512": return "devices that support SHA512 (Espruino Pico, Espruino WiFi, Espruino BLE devices or Linux, ESP32)"
if d=="USE_FLASHFS": return "devices with filesystem in Flash support enabled (ESP32 only)"
if d=="USE_TERMINAL": return "devices with VT100 terminal emulation enabled (Pixl.js only)"
print("WARNING: Unknown ifdef '"+d+"' in common.get_ifdef_description")