diff --git a/components/FastLED-idf b/components/FastLED-idf index a18abff..cc46634 160000 --- a/components/FastLED-idf +++ b/components/FastLED-idf @@ -1 +1 @@ -Subproject commit a18abff77399434a52c61dec862fff1fc326649e +Subproject commit cc466349b7fd36af1f6c91888ef164def475447e diff --git a/components/TFT_eSPI b/components/TFT_eSPI index 7f378c4..d04ecac 160000 --- a/components/TFT_eSPI +++ b/components/TFT_eSPI @@ -1 +1 @@ -Subproject commit 7f378c458ff153adb8f02556597313757a05f3d0 +Subproject commit d04ecacb6b75f5bc67db117c395dc97e312f1643 diff --git a/components/arduino-esp32 b/components/arduino-esp32 index 6c49028..40409a3 160000 --- a/components/arduino-esp32 +++ b/components/arduino-esp32 @@ -1 +1 @@ -Subproject commit 6c49028af8f4cdf1afbaab6a0a1efc39dc1a256c +Subproject commit 40409a3e4fe4fc5c436dc0d5082c4b576557062b diff --git a/components/esp-gui-lib b/components/esp-gui-lib index 65a8c98..91181ef 160000 --- a/components/esp-gui-lib +++ b/components/esp-gui-lib @@ -1 +1 @@ -Subproject commit 65a8c98530c37d209bd7e40c9d509b9e7407edeb +Subproject commit 91181efef8f2c2fb473086407d67ba01a3b34ed2 diff --git a/components/espasynchttpreq b/components/espasynchttpreq index 50487cf..650f5ed 160000 --- a/components/espasynchttpreq +++ b/components/espasynchttpreq @@ -1 +1 @@ -Subproject commit 50487cf5640491fa889408af6192aab0decacbab +Subproject commit 650f5ed4655e2be405b365ba66abe6985a40879e diff --git a/components/espchrono b/components/espchrono index eff113c..c273edf 160000 --- a/components/espchrono +++ b/components/espchrono @@ -1 +1 @@ -Subproject commit eff113c393d7549ae2fe381e12553c98d8317de5 +Subproject commit c273edf2788eaecdac0113a9afc383686bb4f458 diff --git a/components/espcpputils b/components/espcpputils index 390f342..4d36c0a 160000 --- a/components/espcpputils +++ b/components/espcpputils @@ -1 +1 @@ -Subproject commit 390f34249d0bbcedb276cf2eee4cae6ba4bb3494 +Subproject commit 4d36c0a994fb0bfe3dee82456c7e4b38b432f397 diff --git a/components/espwifistack b/components/espwifistack index ea56b58..25bb86f 160000 --- a/components/espwifistack +++ b/components/espwifistack @@ -1 +1 @@ -Subproject commit ea56b58a23c2e10a8bd64692d62f36f259bd9c6b +Subproject commit 25bb86f9eb82437393c6ad94c72ea22ccb692b1b diff --git a/esp-idf b/esp-idf index 4e7f7e7..7405732 160000 --- a/esp-idf +++ b/esp-idf @@ -1 +1 @@ -Subproject commit 4e7f7e7b524687b99ed98d12bab75de12a19b4b2 +Subproject commit 740573214d850e05bd5814e8ee3b3eddcfdcc94e diff --git a/main/displays/menus/candebugmenu.cpp b/main/displays/menus/candebugmenu.cpp index 001cf17..17254d1 100644 --- a/main/displays/menus/candebugmenu.cpp +++ b/main/displays/menus/candebugmenu.cpp @@ -149,32 +149,6 @@ protected: std::string canStatusName() const override { return "&sbus_error_count"; } std::string canStatusText(const twai_status_info_t &can_status_info) const override { return std::to_string(can_status_info.bus_error_count); } }; - -class CanPendingTxCountText : public virtual espgui::TextInterface -{ -public: - std::string text() const override - { - unsigned pending{}; - if (const auto result = twai_get_pending_tx(&pending); result == ESP_OK) - return fmt::format("pending_TX: {}", pending); - else - return fmt::format("pending_TX: &1{}", esp_err_to_name(result)); - } -}; - -class CanPendingRxCountText : public virtual espgui::TextInterface -{ -public: - std::string text() const override - { - unsigned pending{}; - if (const auto result = twai_get_pending_rx(&pending); result == ESP_OK) - return fmt::format("pending_RX: {}", pending); - else - return fmt::format("pending_RX: &1{}", esp_err_to_name(result)); - } -}; } // namespace CanDebugMenu::CanDebugMenu() @@ -192,8 +166,6 @@ CanDebugMenu::CanDebugMenu() #endif constructMenuItem>(m_last_can_status_info); constructMenuItem>(m_last_can_status_info); - constructMenuItem>(); - constructMenuItem>(); constructMenuItem, SwitchScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); } diff --git a/sdkconfig_allfeatures b/sdkconfig_allfeatures index d4d3fda..eba6f03 100644 --- a/sdkconfig_allfeatures +++ b/sdkconfig_allfeatures @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -977,9 +979,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=1536 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1521,12 +1520,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set diff --git a/sdkconfig_comred b/sdkconfig_comred index a4f3947..de414c5 100644 --- a/sdkconfig_comred +++ b/sdkconfig_comred @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -975,9 +977,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=2096 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1519,12 +1518,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set diff --git a/sdkconfig_feedc0de b/sdkconfig_feedc0de index d4d3fda..eba6f03 100644 --- a/sdkconfig_feedc0de +++ b/sdkconfig_feedc0de @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -977,9 +979,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=1536 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1521,12 +1520,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set diff --git a/sdkconfig_greyhash b/sdkconfig_greyhash index acd9484..91b37fd 100644 --- a/sdkconfig_greyhash +++ b/sdkconfig_greyhash @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -975,9 +977,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=1536 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1519,12 +1518,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set diff --git a/sdkconfig_mick b/sdkconfig_mick index acd9484..91b37fd 100644 --- a/sdkconfig_mick +++ b/sdkconfig_mick @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -975,9 +977,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=1536 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1519,12 +1518,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set diff --git a/sdkconfig_nofeatures b/sdkconfig_nofeatures index 7492abb..bbd2ea4 100644 --- a/sdkconfig_nofeatures +++ b/sdkconfig_nofeatures @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -977,9 +979,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=1536 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1521,12 +1520,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set diff --git a/sdkconfig_peter b/sdkconfig_peter index a4f3947..de414c5 100644 --- a/sdkconfig_peter +++ b/sdkconfig_peter @@ -564,12 +564,6 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_UART_ISR_IN_IRAM is not set # end of UART configuration -# -# RTCIO configuration -# -# CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC is not set -# end of RTCIO configuration - # # GPIO Configuration # @@ -582,6 +576,14 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set # CONFIG_GDMA_ISR_IRAM_SAFE is not set # end of GDMA Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# end of GPTimer Configuration # end of Driver configurations # @@ -975,9 +977,6 @@ CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y # CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_FREERTOS_ISR_STACKSIZE=2096 # CONFIG_FREERTOS_LEGACY_HOOKS is not set @@ -1519,12 +1518,6 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # end of ESP-NimBLE-CPP configuration # end of Component config -# -# Compatibility options -# -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options - # Deprecated options for backward compatibility CONFIG_TOOLPREFIX="xtensa-esp32-elf-" # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set