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

change pin to not conflict with boot, add some debugs

Browse Source
This commit is contained in:
ladyada
2019-02-10 14:32:56 -05:00
parent a55c66afb4
commit 9e76479a7e
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arduino/libraries/SPIS/src/SPIS.cpp
View File

@@ -113,4 +113,4 @@ void SPISClass::handleSetupComplete()
xSemaphoreGiveFromISR(_readySemaphore, NULL); xSemaphoreGiveFromISR(_readySemaphore, NULL);
} }
SPISClass SPIS(VSPI_HOST, 1, 12, 23, 18, 5, 33); SPISClass SPIS(VSPI_HOST, 1, 14, 23, 18, 5, 33);

14
main/sketch.ino.cpp
View File

@@ -66,6 +66,8 @@ void setDebug(int d) {
// uartAttach(); // uartAttach();
ets_install_uart_printf(); ets_install_uart_printf();
uart_tx_switch(CONFIG_CONSOLE_UART_NUM); uart_tx_switch(CONFIG_CONSOLE_UART_NUM);
ets_printf("*** DEBUG ON\n");
} else { } else {
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[1], PIN_FUNC_GPIO); PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[1], PIN_FUNC_GPIO);
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[3], PIN_FUNC_GPIO); PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[3], PIN_FUNC_GPIO);
@@ -91,13 +93,17 @@ void setup() {
pinMode(5, INPUT); pinMode(5, INPUT);
if (digitalRead(5) == LOW) { if (digitalRead(5) == LOW) {
if (debug) ets_printf("*** BLUETOOTH ON\n");
setupBluetooth(); setupBluetooth();
} else { } else {
if (debug) ets_printf("*** WIFI ON\n");
setupWiFi(); setupWiFi();
} }
} }
// #define UNO_WIFI_REV2 #define UNO_WIFI_REV2
void setupBluetooth() { void setupBluetooth() {
periph_module_enable(PERIPH_UART1_MODULE); periph_module_enable(PERIPH_UART1_MODULE);
@@ -133,23 +139,27 @@ void setupBluetooth() {
void setupWiFi() { void setupWiFi() {
esp_bt_controller_mem_release(ESP_BT_MODE_BTDM); esp_bt_controller_mem_release(ESP_BT_MODE_BTDM);
if (debug) ets_printf("*** SPIS\n");
SPIS.begin(); SPIS.begin();
if (WiFi.status() == WL_NO_SHIELD) { if (WiFi.status() == WL_NO_SHIELD) {
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);
if (debug) ets_printf("*** BEGIN\n");
CommandHandler.begin(); CommandHandler.begin();
} }
void loop() { void loop() {
if (debug) ets_printf(".");
// wait for a command // wait for a command
memset(commandBuffer, 0x00, SPI_BUFFER_LEN); memset(commandBuffer, 0x00, SPI_BUFFER_LEN);
int commandLength = SPIS.transfer(NULL, commandBuffer, SPI_BUFFER_LEN); int commandLength = SPIS.transfer(NULL, commandBuffer, SPI_BUFFER_LEN);
if (debug) ets_printf("%d", commandLength);
if (commandLength == 0) { if (commandLength == 0) {
return; return;
} }