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

Merge pull request #23 from adafruit/BT_HCI

Browse Source 
BT HCI support in airlift
This commit is contained in:
Limor "Ladyada" Fried
2020-08-21 14:07:30 -04:00
committed by GitHub
parent 240fef2ca8 56d7b740ed
commit 2c3a8e2230
4 changed files with 28 additions and 7 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];

29
main/sketch.ino.cpp
View File

@@ -103,30 +103,50 @@ void setup() {
} }
} }
#define UNO_WIFI_REV2 #define AIRLIFT 1
void setupBluetooth() { void setupBluetooth() {
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);
if (debug) ets_printf("setup pins\n");
#ifdef UNO_WIFI_REV2 #ifdef UNO_WIFI_REV2
uart_set_pin(UART_NUM_1, 1, 3, 33, 0); // TX, RX, RTS, CTS uart_set_pin(UART_NUM_1, 1, 3, 33, 0); // TX, RX, RTS, CTS
#elif defined(AIRLIFT)
// TX GPIO1 & RX GPIO3 on ESP32 'hardware' UART
// RTS on ESP_BUSY (GPIO33)
// CTS on GPIO0 (GPIO0)
// 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);
#endif
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);
#endif
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
btControllerConfig.hci_uart_baudrate = 115200; btControllerConfig.hci_uart_baudrate = 115200;
#elif defined(AIRLIFT)
btControllerConfig.hci_uart_baudrate = 115200;
#else #else
btControllerConfig.hci_uart_baudrate = 912600; btControllerConfig.hci_uart_baudrate = 912600;
#endif #endif
esp_bt_controller_init(&btControllerConfig); esp_bt_controller_init(&btControllerConfig);
while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE); while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
if (debug) ets_printf("idle\n");
}
esp_bt_controller_enable(ESP_BT_MODE_BLE); esp_bt_controller_enable(ESP_BT_MODE_BLE);
esp_bt_sleep_enable(); esp_bt_sleep_enable();
@@ -134,6 +154,7 @@ void setupBluetooth() {
while (1) { while (1) {
vTaskDelay(portMAX_DELAY); vTaskDelay(portMAX_DELAY);
if (debug) ets_printf(".");
} }
} }
@@ -146,7 +167,7 @@ void setupWiFi() {
if (debug) ets_printf("*** NOSHIELD\n"); if (debug) ets_printf("*** NOSHIELD\n");
while (1); // no shield while (1); // no shield
} }
commandBuffer = (uint8_t*)heap_caps_malloc(SPI_BUFFER_LEN, MALLOC_CAP_DMA); commandBuffer = (uint8_t*)heap_caps_malloc(SPI_BUFFER_LEN, MALLOC_CAP_DMA);
responseBuffer = (uint8_t*)heap_caps_malloc(SPI_BUFFER_LEN, MALLOC_CAP_DMA); responseBuffer = (uint8_t*)heap_caps_malloc(SPI_BUFFER_LEN, MALLOC_CAP_DMA);