Merge branch 'master' into master

Author: P-R-O-C-H-Y

boards.txt

@@ -16275,7 +16275,7 @@ m5stack-core2.build.f_cpu=240000000L
 m5stack-core2.build.flash_size=16MB
 m5stack-core2.build.flash_freq=80m
 m5stack-core2.build.flash_mode=dio
-m5stack-core2.build.boot=dio
+m5stack-core2.build.boot=qio
 m5stack-core2.build.partitions=default_16MB
 m5stack-core2.build.defines=
 

cores/esp32/esp32-hal.h

@@ -86,7 +86,6 @@ void yield(void);
 #include "esp32-hal-psram.h"
 #include "esp32-hal-rgb-led.h"
 #include "esp32-hal-cpu.h"
-#include "esp32-hal-periman.h"
 
 void analogWrite(uint8_t pin, int value);
 void analogWriteFrequency(uint8_t pin, uint32_t freq);

cores/esp32/io_pin_remap.h

@@ -71,16 +71,6 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
 #define pinMatrixOutAttach(pin, function, invertOut, invertEnable)  pinMatrixOutAttach(digitalPinToGPIONumber(pin), function, invertOut, invertEnable)
 #define pinMatrixOutDetach(pin, invertOut, invertEnable)            pinMatrixOutDetach(digitalPinToGPIONumber(pin), invertOut, invertEnable)
 
-// cores/esp32/esp32-hal-periman.h
-#define perimanSetPinBus(pin, type, bus, bus_num, bus_channel)      perimanSetPinBus(digitalPinToGPIONumber(pin), type, bus, bus_num, bus_channel)
-#define perimanGetPinBus(pin, type)                                 perimanGetPinBus(digitalPinToGPIONumber(pin), type)
-#define perimanGetPinBusType(pin)                                   perimanGetPinBusType(digitalPinToGPIONumber(pin))
-#define perimanGetPinBusNum(pin)                                    perimanGetPinBusNum(digitalPinToGPIONumber(pin))
-#define perimanGetPinBusChannel(pin)                                perimanGetPinBusChannel(digitalPinToGPIONumber(pin))
-#define perimanPinIsValid(pin)                                      perimanPinIsValid(digitalPinToGPIONumber(pin))
-#define perimanSetPinBusExtraType(pin, extra_type)                  perimanSetPinBusExtraType(digitalPinToGPIONumber(pin), extra_type)
-#define perimanGetPinBusExtraType(pin)                              perimanGetPinBusExtraType(digitalPinToGPIONumber(pin))
-
 // cores/esp32/esp32-hal-rgb-led.h
 #define neopixelWrite(pin, red_val, green_val, blue_val)    neopixelWrite(digitalPinToGPIONumber(pin), red_val, green_val, blue_val)
 

libraries/BLE/src/BLEAdvertising.cpp

@@ -79,6 +79,41 @@ void BLEAdvertising::addServiceUUID(const char* serviceUUID) {
 } // addServiceUUID
 
 
+/**
+ * @brief Remove a service uuid to exposed list of services.
+ * @param [in] index The index of the service to stop exposing.
+ */
+bool BLEAdvertising::removeServiceUUID(int index) {
+	
+	// If index is larger than the size of the
+	// advertised services, return false
+	if(index > m_serviceUUIDs.size()) return false;
+	
+	m_serviceUUIDs.erase(m_serviceUUIDs.begin() + index);
+	return true;
+}
+	
+/**
+ * @brief Remove a service uuid to exposed list of services.
+ * @param [in] serviceUUID The BLEUUID of the service to stop exposing.
+ */
+bool BLEAdvertising::removeServiceUUID(BLEUUID serviceUUID) {
+	for(int i = 0; i < m_serviceUUIDs.size(); i++) {
+		if(m_serviceUUIDs.at(i).equals(serviceUUID)) {
+			return removeServiceUUID(i);
+		}
+	}
+	return false;
+}
+	
+/**
+ * @brief Remove a service uuid to exposed list of services.
+ * @param [in] serviceUUID The string of the service to stop exposing.
+ */
+bool BLEAdvertising::removeServiceUUID(const char* serviceUUID) {
+	return removeServiceUUID(BLEUUID(serviceUUID));
+}
+
 /**
  * @brief Set the device appearance in the advertising data.
  * The appearance attribute is of type 0x19.  The codes for distinct appearances can be found here:

libraries/BLE/src/BLEAdvertising.h

@@ -51,7 +51,10 @@ class BLEAdvertising {
 public:
 	BLEAdvertising();
 	void addServiceUUID(BLEUUID serviceUUID);
-	void addServiceUUID(const char* serviceUUID);
+	void addServiceUUID(const char* serviceUUID);	
+	bool removeServiceUUID(int index);
+	bool removeServiceUUID(BLEUUID serviceUUID);
+	bool removeServiceUUID(const char* serviceUUID);	
 	void start();
 	void stop();
 	void setAppearance(uint16_t appearance);

libraries/ESP_I2S/src/ESP_I2S.cpp

@@ -281,7 +281,7 @@ void I2SClass::setInvertedPdm(bool clk){
 }
 #endif
 
-bool I2SClass::initSTD(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch){
+bool I2SClass::initSTD(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask){
     // Peripheral manager deinit previous peripheral if pin was used
     if (_mclk >= 0) if (!perimanClearPinBus(_mclk)){ return false; }
     if (_bclk >= 0) if (!perimanClearPinBus(_bclk)){ return false; }
@@ -307,6 +307,9 @@ bool I2SClass::initSTD(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mo
     }
 
     i2s_std_config_t i2s_config = I2S_STD_CHAN_CFG(rate, bits_cfg, ch);
+    if(slot_mask >= 0 && (i2s_std_slot_mask_t)slot_mask <= I2S_STD_SLOT_BOTH){
+        i2s_config.slot_cfg.slot_mask = (i2s_std_slot_mask_t)slot_mask;
+    }
     if (tx_chan != NULL) {
         tx_sample_rate = rate;
         tx_data_bit_width = bits_cfg;
@@ -475,11 +478,7 @@ bool I2SClass::initPDMrx(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_
 }
 #endif
 
-bool I2SClass::begin(i2s_mode_t mode, uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch
-#if SOC_I2S_SUPPORTS_TDM
-    , int8_t slot_mask
-#endif
-){
+bool I2SClass::begin(i2s_mode_t mode, uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask){
     /* Setup I2S peripheral */
     if (mode >= I2S_MODE_MAX){
         log_e("Invalid I2S mode selected.");
@@ -490,7 +489,7 @@ bool I2SClass::begin(i2s_mode_t mode, uint32_t rate, i2s_data_bit_width_t bits_c
     bool init = false;
     switch (_mode){
         case I2S_MODE_STD:
-            init = initSTD(rate, bits_cfg, ch);
+            init = initSTD(rate, bits_cfg, ch, slot_mask);
             break;
 #if SOC_I2S_SUPPORTS_TDM
         case I2S_MODE_TDM:
@@ -569,13 +568,16 @@ bool I2SClass::end(){
     return true;
 }
 
-bool I2SClass::configureTX(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch){
+bool I2SClass::configureTX(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask){
     /* Setup I2S channels */
     if (tx_chan != NULL) {
         if(tx_sample_rate == rate && tx_data_bit_width == bits_cfg && tx_slot_mode == ch){
             return true;
         }
         i2s_std_config_t i2s_config = I2S_STD_CHAN_CFG(rate, bits_cfg, ch);
+        if(slot_mask >= 0 && (i2s_std_slot_mask_t)slot_mask <= I2S_STD_SLOT_BOTH){
+            i2s_config.slot_cfg.slot_mask = (i2s_std_slot_mask_t)slot_mask;
+        }
         I2S_ERROR_CHECK_RETURN_FALSE(i2s_channel_disable(tx_chan));
         I2S_ERROR_CHECK_RETURN_FALSE(i2s_channel_reconfig_std_clock(tx_chan, &i2s_config.clk_cfg));
         tx_sample_rate = rate;

libraries/ESP_I2S/src/ESP_I2S.h

@@ -56,12 +56,8 @@ class I2SClass: public Stream {
     void setInvertedPdm(bool clk);
 #endif
 
-    bool begin(i2s_mode_t mode, uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch
-#if SOC_I2S_SUPPORTS_TDM
-      , int8_t slot_mask=-1
-#endif
-    );
-    bool configureTX(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch);
+    bool begin(i2s_mode_t mode, uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask=-1);
+    bool configureTX(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask=-1);
     bool configureRX(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, i2s_rx_transform_t transform=I2S_RX_TRANSFORM_NONE);
     bool end();
 
@@ -130,7 +126,7 @@ class I2SClass: public Stream {
     bool transformRX(i2s_rx_transform_t transform);
 
     static bool i2sDetachBus(void * bus_pointer);
-    bool initSTD(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch);
+    bool initSTD(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask);
 #if SOC_I2S_SUPPORTS_TDM
     bool initTDM(uint32_t rate, i2s_data_bit_width_t bits_cfg, i2s_slot_mode_t ch, int8_t slot_mask);
 #endif

libraries/HTTPUpdate/src/HTTPUpdate.cpp

@@ -33,15 +33,18 @@
 // To do extern "C" uint32_t _SPIFFS_end;
 
 HTTPUpdate::HTTPUpdate(void)
-        : _httpClientTimeout(8000), _ledPin(-1)
+        : HTTPUpdate(8000)
 {
-    _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
 }
 
 HTTPUpdate::HTTPUpdate(int httpClientTimeout)
         : _httpClientTimeout(httpClientTimeout), _ledPin(-1)
 {
     _followRedirects = HTTPC_DISABLE_FOLLOW_REDIRECTS;
+    _md5Sum = String();
+    _user = String();
+    _password = String();
+    _auth = String();
 }
 
 HTTPUpdate::~HTTPUpdate(void)
@@ -220,6 +223,14 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren
         requestCB(&http);
     }
 
+    if (!_user.isEmpty() && !_password.isEmpty()) {
+        http.setAuthorization(_user.c_str(), _password.c_str());
+    }
+
+    if (!_auth.isEmpty()) {
+        http.setAuthorization(_auth.c_str());
+    }
+
     const char * headerkeys[] = { "x-MD5" };
     size_t headerkeyssize = sizeof(headerkeys) / sizeof(char*);
 
@@ -243,8 +254,14 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren
     log_d(" - code: %d\n", code);
     log_d(" - len: %d\n", len);
 
-    if(http.hasHeader("x-MD5")) {
-        log_d(" - MD5: %s\n", http.header("x-MD5").c_str());
+    String md5;
+    if (_md5Sum.length()) {
+        md5 = _md5Sum; 
+    } else if(http.hasHeader("x-MD5")) {
+        md5 = http.header("x-MD5");
+    }
+    if(md5.length()) {
+        log_d(" - MD5: %s\n",md5.c_str());
     }
 
     log_d("ESP32 info:\n");
@@ -341,7 +358,7 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient& http, const String& curren
                     }
 */
                 }
-                if(runUpdate(*tcp, len, http.header("x-MD5"), command)) {
+                if(runUpdate(*tcp, len, md5, command)) {
                     ret = HTTP_UPDATE_OK;
                     log_d("Update ok\n");
                     http.end();

libraries/HTTPUpdate/src/HTTPUpdate.h

@@ -85,6 +85,22 @@ class HTTPUpdate
         _ledOn = ledOn;
     }
 
+    void setMD5sum(const String &md5Sum) 
+    {
+        _md5Sum = md5Sum;
+    }
+    
+    void setAuthorization(const String& user, const String& password) 
+    {
+        _user = user;
+        _password = password;
+    }
+  
+    void setAuthorization(const String& auth)
+    {
+        _auth = auth;
+    }
+
     t_httpUpdate_return update(WiFiClient& client, const String& url, const String& currentVersion = "", HTTPUpdateRequestCB requestCB = NULL);
 
     t_httpUpdate_return update(WiFiClient& client, const String& host, uint16_t port, const String& uri = "/",
@@ -123,6 +139,10 @@ class HTTPUpdate
 private:
     int _httpClientTimeout;
     followRedirects_t _followRedirects;
+    String _user;
+    String _password;
+    String _auth;
+    String _md5Sum;
 
     // Callbacks
     HTTPUpdateStartCB    _cbStart;

libraries/SD/src/sd_diskio.cpp

@@ -11,6 +11,10 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
+// Disable the automatic pin remapping of the API calls in this file
+#define ARDUINO_CORE_BUILD
+
 #include "sd_diskio.h"
 #include "esp_system.h"
 #include "esp32-hal-periman.h"
@@ -742,7 +746,7 @@ uint8_t sdcard_init(uint8_t cs, SPIClass * spi, int hz)
     card->base_path = NULL;
     card->frequency = hz;
     card->spi = spi;
-    card->ssPin = cs;
+    card->ssPin = digitalPinToGPIONumber(cs);
 
     card->supports_crc = true;
     card->type = CARD_NONE;