Merge branch 'master' into feature/network_refactoring

Author: me-no-dev

Diff for: .github/scripts/find_all_boards.sh

@@ -5,6 +5,11 @@ boards_array=()
 
 for line in `grep '.tarch=' boards.txt`; do
     board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
+    # skip esp32c2 as we dont build libs for it
+    if [ "$board_name" == "esp32c2" ]; then
+        echo "Skipping 'espressif:esp32:$board_name'"
+        continue
+    fi
     boards_array+=("espressif:esp32:$board_name")
     echo "Added 'espressif:esp32:$board_name' to array"
 done

Diff for: boards.txt

@@ -35696,6 +35696,178 @@ epulse_feather.menu.EraseFlash.none.upload.erase_cmd=
 epulse_feather.menu.EraseFlash.all=Enabled
 epulse_feather.menu.EraseFlash.all.upload.erase_cmd=-e
 
+##############################################################
+# ThingPulse ePulse Feather C6
+
+epulse_feather_c6.name=ThingPulse ePulse Feather C6
+epulse_feather_c6.vid.0=0x303a
+epulse_feather_c6.pid.0=0x1001
+
+epulse_feather_c6.bootloader.tool=esptool_py
+epulse_feather_c6.bootloader.tool.default=esptool_py
+
+epulse_feather_c6.upload.tool=esptool_py
+epulse_feather_c6.upload.tool.default=esptool_py
+epulse_feather_c6.upload.tool.network=esp_ota
+
+epulse_feather_c6.upload.maximum_size=1310720
+epulse_feather_c6.upload.maximum_data_size=327680
+epulse_feather_c6.upload.flags=
+epulse_feather_c6.upload.extra_flags=
+epulse_feather_c6.upload.use_1200bps_touch=false
+epulse_feather_c6.upload.wait_for_upload_port=false
+
+epulse_feather_c6.serial.disableDTR=false
+epulse_feather_c6.serial.disableRTS=false
+
+epulse_feather_c6.build.tarch=riscv32
+epulse_feather_c6.build.target=esp
+epulse_feather_c6.build.mcu=esp32c6
+epulse_feather_c6.build.core=esp32
+epulse_feather_c6.build.variant=thingpulse_epulse_feather_c6
+epulse_feather_c6.build.board=THINGPULSE_EPULSE_FEATHER_C6
+epulse_feather_c6.build.bootloader_addr=0x0
+
+epulse_feather_c6.build.cdc_on_boot=0
+epulse_feather_c6.build.f_cpu=160000000L
+epulse_feather_c6.build.flash_size=4MB
+epulse_feather_c6.build.flash_freq=80m
+epulse_feather_c6.build.flash_mode=qio
+epulse_feather_c6.build.boot=qio
+epulse_feather_c6.build.partitions=default
+epulse_feather_c6.build.defines=
+
+epulse_feather_c6.menu.JTAGAdapter.default=Disabled
+epulse_feather_c6.menu.JTAGAdapter.default.build.copy_jtag_files=0
+epulse_feather_c6.menu.JTAGAdapter.builtin=Integrated USB JTAG
+epulse_feather_c6.menu.JTAGAdapter.builtin.build.openocdscript=esp32c6-builtin.cfg
+epulse_feather_c6.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+epulse_feather_c6.menu.JTAGAdapter.external=FTDI Adapter
+epulse_feather_c6.menu.JTAGAdapter.external.build.openocdscript=esp32c6-ftdi.cfg
+epulse_feather_c6.menu.JTAGAdapter.external.build.copy_jtag_files=1
+epulse_feather_c6.menu.JTAGAdapter.bridge=ESP USB Bridge
+epulse_feather_c6.menu.JTAGAdapter.bridge.build.openocdscript=esp32c6-bridge.cfg
+epulse_feather_c6.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+epulse_feather_c6.menu.CDCOnBoot.default=Disabled
+epulse_feather_c6.menu.CDCOnBoot.default.build.cdc_on_boot=0
+epulse_feather_c6.menu.CDCOnBoot.cdc=Enabled
+epulse_feather_c6.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+epulse_feather_c6.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+epulse_feather_c6.menu.PartitionScheme.default.build.partitions=default
+epulse_feather_c6.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+epulse_feather_c6.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+epulse_feather_c6.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+epulse_feather_c6.menu.PartitionScheme.minimal.build.partitions=minimal
+epulse_feather_c6.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+epulse_feather_c6.menu.PartitionScheme.no_ota.build.partitions=no_ota
+epulse_feather_c6.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+epulse_feather_c6.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+epulse_feather_c6.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+epulse_feather_c6.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+epulse_feather_c6.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+epulse_feather_c6.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+epulse_feather_c6.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+epulse_feather_c6.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+epulse_feather_c6.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+epulse_feather_c6.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+epulse_feather_c6.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+epulse_feather_c6.menu.PartitionScheme.huge_app.build.partitions=huge_app
+epulse_feather_c6.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+epulse_feather_c6.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+epulse_feather_c6.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+epulse_feather_c6.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+epulse_feather_c6.menu.PartitionScheme.rainmaker=RainMaker
+epulse_feather_c6.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+epulse_feather_c6.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+epulse_feather_c6.menu.PartitionScheme.zigbee=Zigbee 4MB with spiffs
+epulse_feather_c6.menu.PartitionScheme.zigbee.build.partitions=zigbee
+epulse_feather_c6.menu.PartitionScheme.zigbee.upload.maximum_size=1310720
+epulse_feather_c6.menu.PartitionScheme.zigbee_zczr=Zigbee ZCZR 4MB with spiffs
+epulse_feather_c6.menu.PartitionScheme.zigbee_zczr.build.partitions=zigbee_zczr
+epulse_feather_c6.menu.PartitionScheme.zigbee_zczr.upload.maximum_size=1310720
+epulse_feather_c6.menu.PartitionScheme.custom=Custom
+epulse_feather_c6.menu.PartitionScheme.custom.build.partitions=
+epulse_feather_c6.menu.PartitionScheme.custom.upload.maximum_size=16777216
+
+epulse_feather_c6.menu.CPUFreq.160=160MHz (WiFi)
+epulse_feather_c6.menu.CPUFreq.160.build.f_cpu=160000000L
+epulse_feather_c6.menu.CPUFreq.120=120MHz (WiFi)
+epulse_feather_c6.menu.CPUFreq.120.build.f_cpu=120000000L
+epulse_feather_c6.menu.CPUFreq.80=80MHz (WiFi)
+epulse_feather_c6.menu.CPUFreq.80.build.f_cpu=80000000L
+epulse_feather_c6.menu.CPUFreq.40=40MHz
+epulse_feather_c6.menu.CPUFreq.40.build.f_cpu=40000000L
+epulse_feather_c6.menu.CPUFreq.20=20MHz
+epulse_feather_c6.menu.CPUFreq.20.build.f_cpu=20000000L
+epulse_feather_c6.menu.CPUFreq.10=10MHz
+epulse_feather_c6.menu.CPUFreq.10.build.f_cpu=10000000L
+
+epulse_feather_c6.menu.FlashMode.qio=QIO
+epulse_feather_c6.menu.FlashMode.qio.build.flash_mode=dio
+epulse_feather_c6.menu.FlashMode.qio.build.boot=qio
+epulse_feather_c6.menu.FlashMode.dio=DIO
+epulse_feather_c6.menu.FlashMode.dio.build.flash_mode=dio
+epulse_feather_c6.menu.FlashMode.dio.build.boot=dio
+
+epulse_feather_c6.menu.FlashFreq.80=80MHz
+epulse_feather_c6.menu.FlashFreq.80.build.flash_freq=80m
+epulse_feather_c6.menu.FlashFreq.40=40MHz
+epulse_feather_c6.menu.FlashFreq.40.build.flash_freq=40m
+
+epulse_feather_c6.menu.FlashSize.4M=4MB (32Mb)
+epulse_feather_c6.menu.FlashSize.4M.build.flash_size=4MB
+epulse_feather_c6.menu.FlashSize.2M=2MB (16Mb)
+epulse_feather_c6.menu.FlashSize.2M.build.flash_size=2MB
+epulse_feather_c6.menu.FlashSize.2M.build.partitions=minimal
+
+epulse_feather_c6.menu.UploadSpeed.921600=921600
+epulse_feather_c6.menu.UploadSpeed.921600.upload.speed=921600
+epulse_feather_c6.menu.UploadSpeed.115200=115200
+epulse_feather_c6.menu.UploadSpeed.115200.upload.speed=115200
+epulse_feather_c6.menu.UploadSpeed.256000.windows=256000
+epulse_feather_c6.menu.UploadSpeed.256000.upload.speed=256000
+epulse_feather_c6.menu.UploadSpeed.230400.windows.upload.speed=256000
+epulse_feather_c6.menu.UploadSpeed.230400=230400
+epulse_feather_c6.menu.UploadSpeed.230400.upload.speed=230400
+epulse_feather_c6.menu.UploadSpeed.460800.linux=460800
+epulse_feather_c6.menu.UploadSpeed.460800.macosx=460800
+epulse_feather_c6.menu.UploadSpeed.460800.upload.speed=460800
+epulse_feather_c6.menu.UploadSpeed.512000.windows=512000
+epulse_feather_c6.menu.UploadSpeed.512000.upload.speed=512000
+
+epulse_feather_c6.menu.DebugLevel.none=None
+epulse_feather_c6.menu.DebugLevel.none.build.code_debug=0
+epulse_feather_c6.menu.DebugLevel.error=Error
+epulse_feather_c6.menu.DebugLevel.error.build.code_debug=1
+epulse_feather_c6.menu.DebugLevel.warn=Warn
+epulse_feather_c6.menu.DebugLevel.warn.build.code_debug=2
+epulse_feather_c6.menu.DebugLevel.info=Info
+epulse_feather_c6.menu.DebugLevel.info.build.code_debug=3
+epulse_feather_c6.menu.DebugLevel.debug=Debug
+epulse_feather_c6.menu.DebugLevel.debug.build.code_debug=4
+epulse_feather_c6.menu.DebugLevel.verbose=Verbose
+epulse_feather_c6.menu.DebugLevel.verbose.build.code_debug=5
+
+epulse_feather_c6.menu.EraseFlash.none=Disabled
+epulse_feather_c6.menu.EraseFlash.none.upload.erase_cmd=
+epulse_feather_c6.menu.EraseFlash.all=Enabled
+epulse_feather_c6.menu.EraseFlash.all.upload.erase_cmd=-e
+
+epulse_feather_c6.menu.ZigbeeMode.default=Disabled
+epulse_feather_c6.menu.ZigbeeMode.default.build.zigbee_mode=
+epulse_feather_c6.menu.ZigbeeMode.default.build.zigbee_libs=
+epulse_feather_c6.menu.ZigbeeMode.ed=Zigbee ED (end device)
+epulse_feather_c6.menu.ZigbeeMode.ed.build.zigbee_mode=-DZIGBEE_MODE_ED
+epulse_feather_c6.menu.ZigbeeMode.ed.build.zigbee_libs=-lesp_zb_api_ed -lesp_zb_cli_command -lzboss_stack.ed.trace -lzboss_stack.ed -lzboss_port
+epulse_feather_c6.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator)
+epulse_feather_c6.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+epulse_feather_c6.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr.trace -lzboss_stack.zczr -lzboss_port
+epulse_feather_c6.menu.ZigbeeMode.rcp=Zigbee RCP (radio co-processor)
+epulse_feather_c6.menu.ZigbeeMode.rcp.build.zigbee_mode=-DZIGBEE_MODE_RCP
+epulse_feather_c6.menu.ZigbeeMode.rcp.build.zigbee_libs=-lesp_zb_api_rcp -lesp_zb_cli_command -lzboss_stack.rcp -lzboss_port
+
 ##############################################################
 
 Geekble_ESP32C3.name=Geekble ESP32-C3
@@ -35828,4 +36000,4 @@ Geekble_ESP32C3.menu.EraseFlash.none.upload.erase_cmd=
 Geekble_ESP32C3.menu.EraseFlash.all=Enabled
 Geekble_ESP32C3.menu.EraseFlash.all.upload.erase_cmd=-e
 
-##############################################################
+##############################################################

Diff for: cores/esp32/MacAddress.cpp

@@ -28,6 +28,10 @@ MacAddress::MacAddress(const char *macstr){
     fromString(macstr);
 }
 
+MacAddress::MacAddress(const String &macstr){
+    fromString(macstr.c_str());
+}
+
 MacAddress::MacAddress(uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4, uint8_t b5, uint8_t b6) {
     _type = MAC6;
     memset(_mac.bytes, 0, sizeof(_mac.bytes));

Diff for: cores/esp32/MacAddress.h

@@ -54,6 +54,7 @@ class MacAddress : public Printable {
     MacAddress(const uint8_t *macbytearray) : MacAddress(MAC6, macbytearray) {}
 
     MacAddress(const char *macstr);
+    MacAddress(const String &macstr);
 
     virtual ~MacAddress() {}
 

Diff for: cores/esp32/io_pin_remap.h

@@ -100,11 +100,7 @@ int8_t gpioNumberToDigitalPin(int8_t gpioNumber);
 #define spiAttachSCK(spi, sck)          spiAttachSCK(spi, digitalPinToGPIONumber(sck))
 #define spiAttachMISO(spi, miso)        spiAttachMISO(spi, digitalPinToGPIONumber(miso))
 #define spiAttachMOSI(spi, mosi)        spiAttachMOSI(spi, digitalPinToGPIONumber(mosi))
-#define spiDetachSCK(spi, sck)          spiDetachSCK(spi, digitalPinToGPIONumber(sck))
-#define spiDetachMISO(spi, miso)        spiDetachMISO(spi, digitalPinToGPIONumber(miso))
-#define spiDetachMOSI(spi, mosi)        spiDetachMOSI(spi, digitalPinToGPIONumber(mosi))
 #define spiAttachSS(spi, cs_num, ss)    spiAttachSS(spi, cs_num, digitalPinToGPIONumber(ss))
-#define spiDetachSS(spi, ss)            spiDetachSS(spi, digitalPinToGPIONumber(ss))
 
 // cores/esp32/esp32-hal-touch.h
 #define touchInterruptGetLastStatus(pin)                        touchInterruptGetLastStatus(digitalPinToGPIONumber(pin))

Diff for: libraries/BluetoothSerial/examples/DiscoverConnect/DiscoverConnect.ino

@@ -8,7 +8,7 @@
  * source: https://gist.github.com/ukBaz/217875c83c2535d22a16ba38fc8f2a91
  *
  * Tested with Raspberry Pi onboard Wifi/BT, USB BT 4.0 dongles, USB BT 1.1 dongles, 
- * 202202: does NOT work with USB BT 2.0 dongles when esp32 aduino lib is compiled with SSP support!
+ * 202202: does NOT work with USB BT 2.0 dongles when esp32 arduino lib is compiled with SSP support!
  *         see https://github.com/espressif/esp-idf/issues/8394
  *         
  * use ESP_SPP_SEC_ENCRYPT|ESP_SPP_SEC_AUTHENTICATE in connect() if remote side requests 'RequireAuthentication': dbus.Boolean(True),

Diff for: variants/imbrios-logsens-v1p1/pins_arduino.h

@@ -45,7 +45,7 @@ static const uint8_t MOSI  = 13;
 static const uint8_t MISO  = 12;
 static const uint8_t SCK   = 14;
 
-static const uint8_t SPI_SS1  = 23;		// SPI Chip Select - 1; connected to MicroSD Card on the LogSens V1.1 Board
+static const uint8_t SS1  = 23;		// SPI Chip Select - 1; connected to MicroSD Card on the LogSens V1.1 Board
 
 /* Software Controlled: IO, LEDs and Switches */
 static const uint8_t BUZZER_CTRL = 19;		// Signal connected to MOSFET gate pin to control conenctor (X8)

Diff for: variants/thingpulse_epulse_feather_c6/pins_arduino.h

@@ -0,0 +1,35 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+#include "soc/soc_caps.h"
+
+#define PIN_NEOPIXEL        8
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+PIN_NEOPIXEL;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API neopixelWrite()
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t TX = 16;
+static const uint8_t RX = 17;
+
+static const uint8_t SDA = 23;
+static const uint8_t SCL = 22;
+
+static const uint8_t SS    = 18;
+static const uint8_t MOSI  = 19;
+static const uint8_t MISO  = 20;
+static const uint8_t SCK   = 21;
+
+static const uint8_t A0 = 0;
+static const uint8_t A1 = 1;
+static const uint8_t A2 = 2;
+static const uint8_t A3 = 3;
+static const uint8_t A4 = 4;
+static const uint8_t A5 = 5;
+static const uint8_t A6 = 6;
+
+#endif /* Pins_Arduino_h */