Merge branch 'development' into pre-release-12.2

CHANGELOG.md

@@ -9,6 +9,8 @@ All notable changes to this project will be documented in this file.
 ## [12.1.1.6] 20221017
 ### Added
 - Command ``WcClock 10..200`` set webcam clock in MHz. Default is 20
+- ESP32 Automatically resize FS to max flash size at initial boot (#16838)
+- Command ``SspmPowerOnState<relay> 0|1|2`` to set Sonoff SPM 4Relay module v1.2.0 power on state overruling tasmota global power on state. 0 = Off, 1 = On, 2 = Saved state (#13447)
 
 ## [12.1.1.5] 20221013
 ### Added

RELEASENOTES.md

@@ -116,6 +116,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - Command ``UrlFetch <url>`` to download a file to filesystem
 - Command ``DspSpeed 2..127`` to control message rotation speed on display of POWR3xxD and THR3xxD
 - Command ``DspLine<1|2> <index>,<unit>,<index>,<unit>,...`` to select message(s) on display of POWR3xxD and THR3xxD
+- Command ``SspmPowerOnState<relay> 0|1|2`` to set Sonoff SPM 4Relay module v1.2.0 power on state overruling tasmota global power on state. 0 = Off, 1 = On, 2 = Saved state [#13447](https://github.com/arendst/Tasmota/issues/13447)
 - Command ``Sunrise 0..3`` to select sunrise dawn angle between Normal, Civil, Nautical or Astronomical [#16795](https://github.com/arendst/Tasmota/issues/16795)
 - Command ``WcClock 10..200`` set webcam clock in MHz. Default is 20
 - Support for Shelly Plus 2PM
@@ -133,6 +134,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 - Support for Ethernet in ESP32 safeboot firmware [#16388](https://github.com/arendst/Tasmota/issues/16388)
 - ESP32-S3 support for internal temperature sensor
 - ESP32-S2 and ESP32-S3 touch button support
+- ESP32 Automatically resize FS to max flash size at initial boot [#16838](https://github.com/arendst/Tasmota/issues/16838)
 - Berry has persistent MQTT subscriptions: auto-subscribe at (re)connection
 - Berry automated solidification of code
 - LVGL/HASPmota add tiny "pixel perfect" fonts for small screens [#16758](https://github.com/arendst/Tasmota/issues/16758)

lib/libesp32/ESP32-to-ESP8266-compat/src/ESP32Wifi.cpp

@@ -37,14 +37,23 @@ int WiFiClass32::getPhyMode() {
  int phy_mode = 0; // " BGNL"
  uint8_t protocol_bitmap;
  if (esp_wifi_get_protocol(WIFI_IF_STA, &protocol_bitmap) == ESP_OK) {
- if (protocol_bitmap & 1) { phy_mode = 1; } // 11b
- if (protocol_bitmap & 2) { phy_mode = 2; } // 11g
- if (protocol_bitmap & 4) { phy_mode = 3; } // 11n
+ if (protocol_bitmap & 1) { phy_mode = WIFI_PHY_MODE_11B; } // 1 = 11b
+ if (protocol_bitmap & 2) { phy_mode = WIFI_PHY_MODE_11G; } // 2 = 11bg
+ if (protocol_bitmap & 4) { phy_mode = WIFI_PHY_MODE_11N; } // 3 = 11bgn
  if (protocol_bitmap & 8) { phy_mode = 4; } // Low rate
  }
  return phy_mode;
 }
 
+bool WiFiClass32::setPhyMode(WiFiPhyMode_t mode) {
+ uint8_t protocol_bitmap = WIFI_PROTOCOL_11B; // 1
+ switch (mode) {
+ case 3: protocol_bitmap |= WIFI_PROTOCOL_11N; // 4
+ case 2: protocol_bitmap |= WIFI_PROTOCOL_11G; // 2
+ }
+ return (ESP_OK == esp_wifi_set_protocol(WIFI_IF_STA, protocol_bitmap));
+}
+
 void WiFiClass32::wps_disable() {
 }
 

lib/libesp32/ESP32-to-ESP8266-compat/src/ESP8266WiFi.h

@@ -32,6 +32,11 @@
 #define WIFI_LIGHT_SLEEP 1
 #define WIFI_MODEM_SLEEP 2
 
+typedef enum WiFiPhyMode
+{
+ WIFI_PHY_MODE_11B = 1, WIFI_PHY_MODE_11G = 2, WIFI_PHY_MODE_11N = 3
+} WiFiPhyMode_t;
+
 class WiFiClass32 : public WiFiClass
 {
 public:
@@ -41,6 +46,7 @@ class WiFiClass32 : public WiFiClass
  }
  static void setSleepMode(int iSleepMode);
  static int getPhyMode();
+ static bool setPhyMode(WiFiPhyMode_t mode);
 
  static void wps_disable();
  static void setOutputPower(int n);

lib/libesp32/berry_tasmota/src/embedded/partition_core.be

@@ -506,6 +506,105 @@ class Partition
  self.otadata.save()
  end
 
+ # Internal: returns which flash sector contains the partition definition
+ # Returns 0 or 1, or `nil` if something went wrong
+ # Note: partition flash sector vary from ESP32 to ESP32C3/S3
+ static def get_flash_definition_sector()
+ import flash
+ for i:0..1
+ var offset = i * 0x1000
+ if flash.read(offset, 1) == bytes('E9') return offset end
+ end
+ end 
+
+ # Internal: returns the maximum flash size possible
+ # Returns max flash size ok kB
+ def get_max_flash_size_k()
+ var flash_size_k = tasmota.memory()['flash']
+ var flash_size_real_k = tasmota.memory().find("flash_real", flash_size_k)
+ if (flash_size_k != flash_size_real_k) && self.get_flash_definition_sector() != nil
+ flash_size_k = flash_size_real_k # try to expand the flash size definition
+ end
+ return flash_size_k
+ end
+
+ # Internal: returns the unallocated flash size (in kB) beyond the file-system
+ # this indicates that the file-system can be extended (although erased at the same time)
+ def get_unallocated_k()
+ var last_slot = self.slots[-1]
+ if last_slot.is_spiffs()
+ # verify that last slot is filesystem
+ var flash_size_k = self.get_max_flash_size_k()
+ var partition_end_k = (last_slot.start + last_slot.sz) / 1024 # last kb used for fs
+ if partition_end_k < flash_size_k
+ return flash_size_k - partition_end_k
+ end
+ end
+ return 0
+ end
+
+ #- ---------------------------------------------------------------------- -#
+ #- Resize flash definition if needed
+ #- ---------------------------------------------------------------------- -#
+ def resize_max_flash_size_k()
+ var flash_size_k = tasmota.memory()['flash']
+ var flash_size_real_k = tasmota.memory().find("flash_real", flash_size_k)
+ var flash_definition_sector = self.get_flash_definition_sector()
+ if (flash_size_k != flash_size_real_k) && flash_definition_sector != nil
+ import flash
+ import string
+
+ flash_size_k = flash_size_real_k # try to expand the flash size definition
+
+ var flash_def = flash.read(flash_definition_sector, 4)
+ var size_before = flash_def[3]
+
+ var flash_size_code
+ var flash_size_real_m = flash_size_real_k / 1024 # size in MB
+ if flash_size_real_m == 1 flash_size_code = 0x00
+ elif flash_size_real_m == 2 flash_size_code = 0x10
+ elif flash_size_real_m == 4 flash_size_code = 0x20
+ elif flash_size_real_m == 8 flash_size_code = 0x30
+ elif flash_size_real_m == 16 flash_size_code = 0x40
+ end
+
+ if flash_size_code != nil
+ # apply the update
+ var old_def = flash_def[3]
+ flash_def[3] = (flash_def[3] & 0x0F) | flash_size_code
+ flash.write(flash_definition_sector, flash_def)
+ tasmota.log(string.format("UPL: changing flash definition from 0x02X to 0x%02X", old_def, flash_def[3]), 3)
+ else
+ raise "internal_error", "wrong flash size "+str(flash_size_real_m)
+ end
+ end
+ end
+
+ # Called at first boot
+ # Try to expand FS to max of flash size
+ def resize_fs_to_max()
+ import string
+ try
+ var unallocated = self.get_unallocated_k()
+ if unallocated <= 0 return nil end
+
+ tasmota.log(string.format("BRY: Trying to expand FS by %i kB", unallocated), 2)
+
+ self.resize_max_flash_size_k() # resize if needed
+ # since unallocated succeeded, we know the last slot is FS
+ var fs_slot = self.slots[-1]
+ fs_slot.sz += unallocated * 1024
+ self.save()
+ self.invalidate_spiffs() # erase SPIFFS or data is corrupt
+
+ # restart
+ tasmota.global.restart_flag = 2
+ tasmota.log("BRY: Successfully resized FS, restarting", 2)
+ except .. as e, m
+ tasmota.log(string.format("BRY: Exception> '%s' - %s", e, m), 2)
+ end
+ end
+
  #- invalidate SPIFFS partition to force format at next boot -#
  #- we simply erase the first byte of the first 2 blocks in the SPIFFS partition -#
  def invalidate_spiffs()