From bb254db3713d644ef9ce74f7dd854f36a9697cf0 Mon Sep 17 00:00:00 2001 From: Pawel Jalocha Date: Fri, 15 Jun 2018 21:14:06 +0000 Subject: [PATCH] Initialize the new paramater in the SPI structure with the new ESP-IDF - not tested --- main/hal.cpp | 4 +++- sdkconfig | 20 ++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/main/hal.cpp b/main/hal.cpp index 0714e4e..fc32217 100644 --- a/main/hal.cpp +++ b/main/hal.cpp @@ -373,7 +373,8 @@ void IO_Configuration(void) sclk_io_num: PIN_RFM_SCK, quadwp_io_num: -1, quadhd_io_num: -1, - max_transfer_sz: 64 + max_transfer_sz: 64, + flags: SPICOMMON_BUSFLAG_MASTER | SPICOMMON_BUSFLAG_SCLK | SPICOMMON_BUSFLAG_MISO | SPICOMMON_BUSFLAG_MOSI, }; spi_device_interface_config_t DevCfg = { command_bits: 0, @@ -384,6 +385,7 @@ void IO_Configuration(void) cs_ena_pretrans: 0, cs_ena_posttrans: 0, clock_speed_hz: RFM_SPI_SPEED, + input_delay_ns: 0, spics_io_num: PIN_RFM_SS, flags: 0, queue_size: 3, diff --git a/sdkconfig b/sdkconfig index cdded4b..dbdb087 100644 --- a/sdkconfig +++ b/sdkconfig @@ -22,6 +22,8 @@ CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE= CONFIG_LOG_BOOTLOADER_LEVEL=2 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V= CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y +CONFIG_BOOTLOADER_FACTORY_RESET= +CONFIG_BOOTLOADER_APP_TEST= # # Security features @@ -113,10 +115,6 @@ CONFIG_ESP32_APPTRACE_DEST_TRAX= CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_ENABLE= CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y - -# -# FreeRTOS SystemView Tracing -# CONFIG_AWS_IOT_SDK= # @@ -175,6 +173,7 @@ CONFIG_ESP32_PANIC_PRINT_REBOOT=y CONFIG_ESP32_PANIC_SILENT_REBOOT= CONFIG_ESP32_PANIC_GDBSTUB= CONFIG_ESP32_DEBUG_OCDAWARE=y +CONFIG_ESP32_DEBUG_STUBS_ENABLE=y CONFIG_INT_WDT=y CONFIG_INT_WDT_TIMEOUT_MS=300 CONFIG_TASK_WDT=y @@ -218,6 +217,7 @@ CONFIG_ESP32_WIFI_STATIC_TX_BUFFER= CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32 +CONFIG_ESP32_WIFI_CSI_ENABLED= CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y CONFIG_ESP32_WIFI_TX_BA_WIN=6 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y @@ -244,6 +244,11 @@ CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y CONFIG_ADC_CAL_LUT_ENABLE=y +# +# ESP HTTP client +# +CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y + # # Ethernet # @@ -347,6 +352,7 @@ CONFIG_LOG_COLORS=y CONFIG_L2_TO_L3_COPY= CONFIG_LWIP_IRAM_OPTIMIZATION= CONFIG_LWIP_MAX_SOCKETS=4 +CONFIG_USE_ONLY_LWIP_SELECT= CONFIG_LWIP_SO_REUSE= CONFIG_LWIP_SO_RCVBUF= CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 @@ -379,6 +385,7 @@ CONFIG_TCP_SND_BUF_DEFAULT=5744 CONFIG_TCP_WND_DEFAULT=5744 CONFIG_TCP_RECVMBOX_SIZE=6 CONFIG_TCP_QUEUE_OOSEQ=y +CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES= CONFIG_TCP_OVERSIZE_MSS=y CONFIG_TCP_OVERSIZE_QUARTER_MSS= CONFIG_TCP_OVERSIZE_DISABLE= @@ -539,6 +546,11 @@ CONFIG_SPIFFS_TEST_VISUALISATION= # CONFIG_IP_LOST_TIMER_INTERVAL=120 +# +# Virtual file system +# +CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y + # # Wear Levelling #