Skip to content

Commit ede8a90

Browse files
committed
Set xtal frequency to auto to support 26MHz crystals
1 parent d49ebc8 commit ede8a90

File tree

3 files changed

+6
-57
lines changed

3 files changed

+6
-57
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ifndef IDF_PATH
77
endif
88

99
PROJECT_NAME := eq3_trv_control
10-
PROJECT_VER := 1.55-beta
10+
PROJECT_VER := 1.56-beta
1111

1212
COMPONENT_ADD_INCLUDEDIRS := components/include
1313

main/eq3_main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define EQ3_MAIN_H
33

44
#define EQ3_MAJVER "1"
5-
#define EQ3_MINVER "55"
5+
#define EQ3_MINVER "56"
66
#define EQ3_EXTRAVER "-beta"
77

88
void eq3_log_init(void);

sdkconfig

Lines changed: 4 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# Espressif IoT Development Framework Configuration
44
#
55
CONFIG_IDF_TARGET="esp32"
6-
CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
76

87
#
98
# SDK tool configuration
@@ -143,7 +142,6 @@ CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY=y
143142
CONFIG_BTDM_CONTROLLER_MODE_BR_EDR_ONLY=
144143
CONFIG_BTDM_CONTROLLER_MODE_BTDM=
145144
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN=3
146-
CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
147145
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=3
148146
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
149147
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -168,10 +166,6 @@ CONFIG_SCAN_DUPLICATE_TYPE=0
168166
CONFIG_DUPLICATE_SCAN_CACHE_SIZE=200
169167
CONFIG_BLE_MESH_SCAN_DUPLICATE_EN=
170168
CONFIG_BTDM_CONTROLLER_FULL_SCAN_SUPPORTED=
171-
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_SUPPORTED=y
172-
CONFIG_BLE_ADV_REPORT_FLOW_CONTROL_NUM=100
173-
CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD=20
174-
CONFIG_BTDM_COEX_BT_OPTIONS=
175169
CONFIG_BLUEDROID_ENABLED=y
176170
CONFIG_BLUEDROID_PINNED_TO_CORE_0=y
177171
CONFIG_BLUEDROID_PINNED_TO_CORE_1=
@@ -187,7 +181,6 @@ CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE=0
187181
CONFIG_GATTC_ENABLE=y
188182
CONFIG_GATTC_CACHE_NVS_FLASH=
189183
CONFIG_BLE_SMP_ENABLE=y
190-
CONFIG_SMP_SLAVE_CON_PARAMS_UPD_ENABLE=
191184
CONFIG_BT_STACK_NO_LOG=
192185

193186
#
@@ -367,7 +360,6 @@ CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=
367360
CONFIG_BLE_HOST_QUEUE_CONGESTION_CHECK=
368361
CONFIG_SMP_ENABLE=y
369362
CONFIG_BLE_ACTIVE_SCAN_REPORT_ADV_SCAN_RSP_INDIVIDUALLY=
370-
CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT=30
371363
CONFIG_BT_RESERVE_DRAM=0xdb5c
372364

373365
#
@@ -388,26 +380,10 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=y
388380
CONFIG_SPI_SLAVE_IN_IRAM=
389381
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
390382

391-
#
392-
# eFuse Bit Manager
393-
#
394-
CONFIG_EFUSE_CUSTOM_TABLE=
395-
CONFIG_EFUSE_VIRTUAL=
396-
CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE=
397-
CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
398-
CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT=
399-
CONFIG_EFUSE_MAX_BLK_LEN=192
400-
401383
#
402384
# ESP32-specific
403385
#
404386
CONFIG_IDF_TARGET_ESP32=y
405-
CONFIG_ESP32_REV_MIN_0=y
406-
CONFIG_ESP32_REV_MIN_1=
407-
CONFIG_ESP32_REV_MIN_2=
408-
CONFIG_ESP32_REV_MIN_3=
409-
CONFIG_ESP32_REV_MIN=0
410-
CONFIG_ESP32_DPORT_WORKAROUND=y
411387
CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
412388
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
413389
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=
@@ -474,15 +450,14 @@ CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
474450
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
475451
CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
476452
CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
477-
CONFIG_ESP32_XTAL_FREQ_40=y
453+
CONFIG_ESP32_XTAL_FREQ_40=
478454
CONFIG_ESP32_XTAL_FREQ_26=
479-
CONFIG_ESP32_XTAL_FREQ_AUTO=
480-
CONFIG_ESP32_XTAL_FREQ=40
455+
CONFIG_ESP32_XTAL_FREQ_AUTO=y
456+
CONFIG_ESP32_XTAL_FREQ=0
481457
CONFIG_DISABLE_BASIC_ROM_CONSOLE=
482458
CONFIG_ESP_TIMER_PROFILING=
483459
CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
484460
CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
485-
CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
486461

487462
#
488463
# Wi-Fi
@@ -507,9 +482,7 @@ CONFIG_ESP32_WIFI_NVS_ENABLED=y
507482
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
508483
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
509484
CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
510-
CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
511485
CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
512-
CONFIG_ESP32_WIFI_IRAM_OPT=y
513486

514487
#
515488
# PHY
@@ -540,16 +513,12 @@ CONFIG_EVENT_LOOP_PROFILING=
540513
# ESP HTTP client
541514
#
542515
CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
543-
CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
544516

545517
#
546518
# HTTP Server
547519
#
548520
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
549521
CONFIG_HTTPD_MAX_URI_LEN=512
550-
CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
551-
CONFIG_HTTPD_PURGE_BUF_LEN=32
552-
CONFIG_HTTPD_LOG_PURGE_DATA=
553522

554523
#
555524
# ESP HTTPS OTA
@@ -654,8 +623,6 @@ CONFIG_FREERTOS_USE_TRACE_FACILITY=
654623
CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
655624
CONFIG_FREERTOS_DEBUG_INTERNALS=
656625
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
657-
CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
658-
CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE=
659626

660627
#
661628
# Heap memory debugging
@@ -691,6 +658,7 @@ CONFIG_LWIP_MAX_SOCKETS=10
691658
CONFIG_USE_ONLY_LWIP_SELECT=
692659
CONFIG_LWIP_SO_REUSE=
693660
CONFIG_LWIP_SO_RCVBUF=
661+
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
694662
CONFIG_LWIP_IP_FRAG=
695663
CONFIG_LWIP_IP_REASSEMBLY=
696664
CONFIG_LWIP_STATS=
@@ -751,12 +719,6 @@ CONFIG_LWIP_BROADCAST_PING=
751719
#
752720
CONFIG_LWIP_MAX_RAW_PCBS=16
753721

754-
#
755-
# SNTP
756-
#
757-
CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
758-
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
759-
760722
#
761723
# mbedTLS
762724
#
@@ -766,8 +728,6 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
766728
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
767729
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
768730
CONFIG_MBEDTLS_DEBUG=
769-
CONFIG_MBEDTLS_ECP_RESTARTABLE=
770-
CONFIG_MBEDTLS_CMAC_C=
771731
CONFIG_MBEDTLS_HARDWARE_AES=y
772732
CONFIG_MBEDTLS_HARDWARE_MPI=
773733
CONFIG_MBEDTLS_HARDWARE_SHA=
@@ -885,12 +845,6 @@ CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
885845
CONFIG_SPI_FLASH_VERIFY_WRITE=
886846
CONFIG_SPI_FLASH_ENABLE_COUNTERS=
887847
CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
888-
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
889-
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS=
890-
CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=
891-
CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
892-
CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
893-
CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
894848

895849
#
896850
# SPIFFS Configuration
@@ -950,8 +904,3 @@ CONFIG_SUPPORT_TERMIOS=y
950904
CONFIG_WL_SECTOR_SIZE_512=
951905
CONFIG_WL_SECTOR_SIZE_4096=y
952906
CONFIG_WL_SECTOR_SIZE=4096
953-
954-
#
955-
# Wi-Fi Provisioning Manager
956-
#
957-
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16

0 commit comments

Comments
 (0)