Merge branch 'master' into release/v3.3.x

Author: me-no-dev

cores/esp32/esp32-hal-cpu.c

@@ -26,6 +26,8 @@
 #include "soc/efuse_reg.h"
 #include "esp32-hal.h"
 #include "esp32-hal-cpu.h"
+#include "hal/timer_ll.h"
+#include "esp_private/systimer.h"
 
 #include "esp_system.h"
 #ifdef ESP_IDF_VERSION_MAJOR  // IDF 4+
@@ -175,7 +177,9 @@ static uint32_t calculateApb(rtc_cpu_freq_config_t *conf) {
 #endif
 }
 
+#if defined(CONFIG_IDF_TARGET_ESP32) && !defined(LACT_MODULE) && !defined(LACT_TICKS_PER_US)
 void esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us);  //private in IDF
+#endif
 
 bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
   rtc_cpu_freq_config_t conf, cconf;
@@ -248,7 +252,13 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
     //Update APB Freq REG
     rtc_clk_apb_freq_update(apb);
     //Update esp_timer divisor
+#if CONFIG_IDF_TARGET_ESP32
+#if defined(LACT_MODULE) && defined(LACT_TICKS_PER_US)
+    timer_ll_set_lact_clock_prescale(TIMER_LL_GET_HW(LACT_MODULE), apb / MHZ / LACT_TICKS_PER_US);
+#else
     esp_timer_impl_update_apb_freq(apb / MHZ);
+#endif
+#endif
   }
 #endif
   //Update FreeRTOS Tick Divisor

libraries/NetworkClientSecure/src/NetworkClientSecure.cpp

@@ -315,9 +315,10 @@ int NetworkClientSecure::available() {
 }
 
 uint8_t NetworkClientSecure::connected() {
-  uint8_t dummy = 0;
-  read(&dummy, 0);
-
+  if (_connected) {
+    uint8_t dummy = 0;
+    read(&dummy, 0);
+  }
   return _connected;
 }