Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Commit 352c8ea

Browse files
committed
update to our latest build of the ESP binaries to fix RTC drift
in support of meshtastic/firmware#584
1 parent c29e0bc commit 352c8ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+13
-9
lines changed

Diff for: tools/sdk/bin/bootloader_dio_40m.bin

-16 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dio_80m.bin

0 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dout_40m.bin

-16 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dout_80m.bin

0 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qio_40m.bin

0 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qio_80m.bin

0 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qout_40m.bin

0 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qout_80m.bin

0 Bytes
Binary file not shown.

Diff for: tools/sdk/include/config/sdkconfig.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
#define CONFIG_ARDUINO_EVENT_RUNNING_CORE 1
125125
#define CONFIG_ESP32_APPTRACE_LOCK_ENABLE 1
126126
#define CONFIG_PTHREAD_STACK_MIN 768
127-
#define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC 1
128127
#define CONFIG_TCP_OVERSIZE_MSS 1
129128
#define CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS 1
130129
#define CONFIG_CONSOLE_UART_DEFAULT 1
@@ -165,7 +164,6 @@
165164
#define CONFIG_TASK_WDT_TIMEOUT_S 5
166165
#define CONFIG_INT_WDT_TIMEOUT_MS 300
167166
#define CONFIG_NIMBLE_ATT_PREFERRED_MTU 256
168-
#define CONFIG_SCCB_HARDWARE_I2C 1
169167
#define CONFIG_ARDUINO_EVENT_RUN_CORE1 1
170168
#define CONFIG_ESPTOOLPY_FLASHMODE "dio"
171169
#define CONFIG_NIMBLE_SVC_GAP_DEVICE_NAME "nimble"
@@ -191,6 +189,7 @@
191189
#define CONFIG_ARDUHAL_PARTITION_SCHEME "default"
192190
#define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
193191
#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
192+
#define CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 1
194193
#define CONFIG_ESP32_WIFI_TX_BA_WIN 6
195194
#define CONFIG_ESP32_WIFI_NVS_ENABLED 1
196195
#define CONFIG_MDNS_MAX_SERVICES 10
@@ -255,6 +254,7 @@
255254
#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM 32
256255
#define CONFIG_HTTPD_MAX_URI_LEN 512
257256
#define CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED 1
257+
#define CONFIG_OV7670_SUPPORT 1
258258
#define CONFIG_ARDUHAL_ESP_LOG 1
259259
#define CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED 1
260260
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ 240
@@ -355,6 +355,7 @@
355355
#define CONFIG_NIMBLE_HS_FLOW_CTRL_THRESH 2
356356
#define CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED 1
357357
#define CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED 1
358+
#define CONFIG_NT99141_SUPPORT 1
358359
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA 1
359360
#define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
360361
#define CONFIG_NIMBLE_NVS_PERSIST 1
@@ -395,5 +396,5 @@
395396
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
396397
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
397398
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
398-
#define CONFIG_ARDUINO_IDF_COMMIT "b0c88a6ae"
399+
#define CONFIG_ARDUINO_IDF_COMMIT "72991ba10"
399400
#define CONFIG_ARDUINO_IDF_BRANCH "meshtastic-release/v3.3"

Diff for: tools/sdk/include/esp32-camera/sensor.h

+2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
#include <stdint.h>
1212
#include <stdbool.h>
1313

14+
#define NT99141_PID (0x14)
1415
#define OV9650_PID (0x96)
1516
#define OV7725_PID (0x77)
1617
#define OV2640_PID (0x26)
1718
#define OV3660_PID (0x36)
1819
#define OV5640_PID (0x56)
20+
#define OV7670_PID (0x76)
1921

2022
typedef enum {
2123
PIXFORMAT_RGB565, // 2BPP/RGB565

Diff for: tools/sdk/ld/esp32.project.ld

+2-2
Large diffs are not rendered by default.

Diff for: tools/sdk/lib/libapp_trace.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libapp_update.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libasio.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libbootloader_support.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libbt.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libcoap.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libconsole.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libcxx.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libdriver.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libefuse.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp-tls.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp32-camera.a

88.7 KB
Binary file not shown.

Diff for: tools/sdk/lib/libesp32.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_adc_cal.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_event.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_http_client.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_http_server.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_https_ota.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_https_server.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_ringbuf.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_websocket_client.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libespcoredump.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libethernet.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libexpat.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libface_detection.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libface_recognition.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libfatfs.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libfb_gfx.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libfreemodbus.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libfreertos.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libheap.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libimage_util.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libjsmn.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libjson.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/liblibsodium.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/liblog.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/liblwip.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libmbedtls.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libmdns.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libmicro-ecc.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libmqtt.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libnewlib.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libnghttp.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libnimble.a

-312 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libnvs_flash.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libopenssl.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libprotobuf-c.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libprotocomm.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libpthread.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libsdmmc.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libsmartconfig_ack.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libsoc.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libspi_flash.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libspiffs.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libtcp_transport.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libtcpip_adapter.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libulp.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libunity.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libvfs.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libwear_levelling.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libwifi_provisioning.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libwpa_supplicant.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libxtensa-debug-module.a

0 Bytes
Binary file not shown.

Diff for: tools/sdk/sdkconfig

+5-4
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,10 @@ CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
421421
CONFIG_ESP32_TIME_SYSCALL_USE_RTC=
422422
CONFIG_ESP32_TIME_SYSCALL_USE_FRC1=
423423
CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
424-
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
424+
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=
425425
CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
426426
CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
427-
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
427+
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=y
428428
CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
429429
CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
430430
CONFIG_ESP32_XTAL_FREQ_40=
@@ -481,11 +481,12 @@ CONFIG_PM_TRACE=
481481
#
482482
# Camera configuration
483483
#
484-
CONFIG_OV2640_SUPPORT=y
484+
CONFIG_OV7670_SUPPORT=y
485485
CONFIG_OV7725_SUPPORT=y
486+
CONFIG_NT99141_SUPPORT=y
487+
CONFIG_OV2640_SUPPORT=y
486488
CONFIG_OV3660_SUPPORT=y
487489
CONFIG_OV5640_SUPPORT=y
488-
CONFIG_SCCB_HARDWARE_I2C=y
489490
CONFIG_SCCB_HARDWARE_I2C_PORT0=
490491
CONFIG_SCCB_HARDWARE_I2C_PORT1=y
491492
CONFIG_CAMERA_CORE0=

0 commit comments

Comments
 (0)