mchapman/nina-fw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #27 from dhalbert/fix-hci

Browse Source 
Fix BLE HCI mode
This commit is contained in:
Limor "Ladyada" Fried
2020-10-24 20:52:41 -04:00
committed by GitHub
parent 4b244e7559 0365542bc1
commit d1a03dd26d
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@@ -1,3 +1,7 @@
Adafruit's Arduino NINA-W102 firmware 1.7.1 - 2020.10.24
* Enable HCI BLE for AirLift boards and breakouts.
Adafruit's Arduino NINA-W102 firmware 1.6.0 - 2019.12.28 Adafruit's Arduino NINA-W102 firmware 1.6.0 - 2019.12.28
* Updated to build with ESP-IDF 3.3.1 * Updated to build with ESP-IDF 3.3.1

2
Makefile
View File

@@ -28,7 +28,7 @@ load-passthrough:
cp passthrough.UF2 $(BOOT_VOLUME) cp passthrough.UF2 $(BOOT_VOLUME)
load-nina: load-nina:
esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.0.bin esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.1.bin
load-circuitpython: load-circuitpython:
cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME) cp $(CIRCUITPYTHON_UF2) $(BOOT_VOLUME)

2
combine.py
View File

@@ -31,7 +31,7 @@ for i in range(0, len(certsData)):
# zero terminate the pem file # zero terminate the pem file
outputData[0x10000 + len(certsData)] = 0 outputData[0x10000 + len(certsData)] = 0
outputFilename = "NINA_W102-1.7.0.bin" outputFilename = "NINA_W102-1.7.1.bin"
if (len(sys.argv) > 1): if (len(sys.argv) > 1):
outputFilename = sys.argv[1] outputFilename = sys.argv[1]

2
main/CommandHandler.cpp
View File

@@ -28,7 +28,7 @@
#include "Arduino.h" #include "Arduino.h"
const char FIRMWARE_VERSION[6] = "1.7.0"; const char FIRMWARE_VERSION[6] = "1.7.1";
// Optional, user-defined X.509 certificate // Optional, user-defined X.509 certificate
char CERT_BUF[1300]; char CERT_BUF[1300];

7
main/sketch.ino.cpp
View File

@@ -108,10 +108,6 @@ void setup() {
void setupBluetooth() { void setupBluetooth() {
if (debug) ets_printf("setup periph\n"); if (debug) ets_printf("setup periph\n");
while (1) {
vTaskDelay(portMAX_DELAY);
}
periph_module_enable(PERIPH_UART1_MODULE); periph_module_enable(PERIPH_UART1_MODULE);
periph_module_enable(PERIPH_UHCI0_MODULE); periph_module_enable(PERIPH_UHCI0_MODULE);
@@ -132,7 +128,7 @@ void setupBluetooth() {
if (debug) ets_printf("setup controller\n"); if (debug) ets_printf("setup controller\n");
esp_bt_controller_config_t btControllerConfig = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); esp_bt_controller_config_t btControllerConfig = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
btControllerConfig.hci_uart_no = UART_NUM_1; btControllerConfig.hci_uart_no = UART_NUM_1;
#ifdef UNO_WIFI_REV2 #ifdef UNO_WIFI_REV2
@@ -152,6 +148,7 @@ void setupBluetooth() {
vTaskSuspend(NULL); vTaskSuspend(NULL);
// Don't exit. We don't need loop() to run.
while (1) { while (1) {
vTaskDelay(portMAX_DELAY); vTaskDelay(portMAX_DELAY);
if (debug) ets_printf("."); if (debug) ets_printf(".");