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

bump version, change HCI uart to main uart. kill main thread when done setting up bt

Browse Source
This commit is contained in:
lady ada
2020-06-19 18:36:22 -04:00
parent 43731b8da5
commit 56d7b740ed
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.6.1.bin esptool.py --port $(M4_PORT) --before no_reset --baud $(UPLOAD_BAUD) write_flash 0 NINA_W102-1.7.0.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.6.1.bin" outputFilename = "NINA_W102-1.7.0.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.6.1"; const char FIRMWARE_VERSION[6] = "1.7.0";
// Optional, user-defined X.509 certificate // Optional, user-defined X.509 certificate
char CERT_BUF[1300]; char CERT_BUF[1300];

5
main/sketch.ino.cpp
View File

@@ -34,7 +34,7 @@ extern "C" {
#define SPI_BUFFER_LEN SPI_MAX_DMA_LEN #define SPI_BUFFER_LEN SPI_MAX_DMA_LEN
int debug = 1; int debug = 0;
uint8_t* commandBuffer; uint8_t* commandBuffer;
uint8_t* responseBuffer; uint8_t* responseBuffer;
@@ -123,7 +123,8 @@ void setupBluetooth() {
// TX GPIO1 & RX GPIO3 on ESP32 'hardware' UART // TX GPIO1 & RX GPIO3 on ESP32 'hardware' UART
// RTS on ESP_BUSY (GPIO33) // RTS on ESP_BUSY (GPIO33)
// CTS on GPIO0 (GPIO0) // CTS on GPIO0 (GPIO0)
uart_set_pin(UART_NUM_1, 22, 23, 33, 0); // uart_set_pin(UART_NUM_1, 22, 23, 33, 0);
uart_set_pin(UART_NUM_1, 1, 3, 33, 0);
#else #else
uart_set_pin(UART_NUM_1, 23, 12, 18, 5); uart_set_pin(UART_NUM_1, 23, 12, 18, 5);
uart_set_hw_flow_ctrl(UART_NUM_1, UART_HW_FLOWCTRL_CTS_RTS, 5); uart_set_hw_flow_ctrl(UART_NUM_1, UART_HW_FLOWCTRL_CTS_RTS, 5);