esp32: Merge with master up to version 1.17.3.b1

Author: Daniel Campora

drivers/sx127x/sx1272/sx1272.c

@@ -1072,7 +1072,7 @@ IRAM_ATTR void SX1272OnDio0Irq( void )
                     int8_t snr = 0;
 
                     // Store the packet timestamp
-                    SX1272.Settings.LoRaPacketHandler.TimeStamp = mp_hal_ticks_us();
+                    SX1272.Settings.LoRaPacketHandler.TimeStamp = mp_hal_ticks_us_non_blocking();
 
                     // Clear Irq
                     SX1272Write( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_RXDONE );

drivers/sx127x/sx1276/sx1276.c

@@ -1237,7 +1237,7 @@ IRAM_ATTR void SX1276OnDio0Irq( void )
                     int8_t snr = 0;
 
                     // Store the packet timestamp
-                    SX1276.Settings.LoRaPacketHandler.TimeStamp = mp_hal_ticks_us();
+                    SX1276.Settings.LoRaPacketHandler.TimeStamp = mp_hal_ticks_us_non_blocking();
 
                     // Clear Irq
                     SX1276Write( REG_LR_IRQFLAGS, RFLR_IRQFLAGS_RXDONE );

esp32/bootloader/lib/libbootloader_support.a

@@ -121,24 +121,9 @@ bool updater_start (void) {
 
 bool updater_write (uint8_t *buf, uint32_t len) {
 
-	// the len has to be round-up to multiple of 16
-	// so, actually up to 15Bytes(garbage) could be written to flash
-	uint32_t len_aligned_16 = ((len + ENCRYP_FLASH_MIN_CHUNK - 1) / ENCRYP_FLASH_MIN_CHUNK) * ENCRYP_FLASH_MIN_CHUNK;
-//    sl_LockObjLock (&wlan_LockObj, SL_OS_WAIT_FOREVER);
-
-    if (len != len_aligned_16) {
-    		ESP_LOGD(TAG, "Writing %d bytes, actually %d\n", len, len_aligned_16);
-    }
-
-    // check if starting address is 16bytes aligned
-    if (updater_data.offset % 16) {
-        ESP_LOGE(TAG, "Start address, not 16 aligned, %X\n", updater_data.offset);
-        return false;
-    }
-
     // the actual writing into flash, not-encrypted,
     // because it already came encrypted from OTA server
-    if (ESP_OK != updater_spi_flash_write(updater_data.offset, (void *)buf, len_aligned_16, false)) {
+    if (ESP_OK != updater_spi_flash_write(updater_data.offset, (void *)buf, len, false)) {
         ESP_LOGE(TAG, "SPI flash write failed\n");
         return false;
     }

esp32/bootloader/lib/liblog.a

@@ -173,6 +173,14 @@ IRAM_ATTR uint32_t mp_hal_ticks_us(void) {
     return now.tv_sec * 1000000 + now.tv_usec;
 }
 
+IRAM_ATTR uint64_t mp_hal_ticks_ms_non_blocking(void) {
+    return esp_timer_get_time() / 1000;
+}
+
+IRAM_ATTR uint64_t mp_hal_ticks_us_non_blocking(void) {
+    return esp_timer_get_time();
+}
+
 void mp_hal_delay_ms(uint32_t delay) {
     MP_THREAD_GIL_EXIT();
     vTaskDelay (delay / portTICK_PERIOD_MS);

esp32/bootloader/lib/libmicro-ecc.a

@@ -23,6 +23,8 @@ void mp_hal_stdout_tx_strn_cooked(const char *str, uint32_t len);
 uint32_t mp_hal_ticks_s(void);
 uint32_t mp_hal_ticks_ms(void);
 uint32_t mp_hal_ticks_us(void);
+uint64_t mp_hal_ticks_ms_non_blocking(void);
+uint64_t mp_hal_ticks_us_non_blocking(void);
 void mp_hal_delay_ms(uint32_t delay);
 void mp_hal_set_interrupt_char(int c);
 void mp_hal_reset_safe_and_boot(bool reset);