Merge branch 'master' into feature/ipaddress-v6-support

Author: sgryphon

Diff for: boards.txt

@@ -4831,6 +4831,210 @@ nina_w10.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+nora_w10.name=u-blox NORA-W10 series (ESP32-S3)
+nora_w10.vid.0=0x303a
+nora_w10.pid.0=0x1001
+
+nora_w10.bootloader.tool=esptool_py
+nora_w10.bootloader.tool.default=esptool_py
+
+nora_w10.upload.tool=esptool_py
+nora_w10.upload.tool.default=esptool_py
+nora_w10.upload.tool.network=esp_ota
+
+nora_w10.upload.maximum_size=1310720
+nora_w10.upload.maximum_data_size=327680
+nora_w10.upload.flags=
+nora_w10.upload.extra_flags=
+nora_w10.upload.use_1200bps_touch=false
+nora_w10.upload.wait_for_upload_port=false
+
+nora_w10.serial.disableDTR=false
+nora_w10.serial.disableRTS=false
+
+nora_w10.build.tarch=xtensa
+nora_w10.build.bootloader_addr=0x0
+nora_w10.build.target=esp32s3
+nora_w10.build.mcu=esp32s3
+nora_w10.build.core=esp32
+nora_w10.build.variant=nora_w10
+nora_w10.build.board=UBLOX_NORA_W10
+
+nora_w10.build.usb_mode=1
+nora_w10.build.cdc_on_boot=0
+nora_w10.build.msc_on_boot=0
+nora_w10.build.dfu_on_boot=0
+nora_w10.build.f_cpu=240000000L
+nora_w10.build.flash_size=4MB
+nora_w10.build.flash_freq=80m
+nora_w10.build.flash_mode=dio
+nora_w10.build.boot=qio
+nora_w10.build.boot_freq=80m
+nora_w10.build.partitions=default
+nora_w10.build.defines=
+nora_w10.build.loop_core=
+nora_w10.build.event_core=
+nora_w10.build.psram_type=qspi
+nora_w10.build.memory_type={build.boot}_{build.psram_type}
+
+nora_w10.menu.PSRAM.disabled=Disabled
+nora_w10.menu.PSRAM.disabled.build.defines=
+nora_w10.menu.PSRAM.disabled.build.psram_type=qspi
+nora_w10.menu.PSRAM.enabled=QSPI PSRAM
+nora_w10.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+nora_w10.menu.PSRAM.enabled.build.psram_type=qspi
+nora_w10.menu.PSRAM.opi=OPI PSRAM
+nora_w10.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+nora_w10.menu.PSRAM.opi.build.psram_type=opi
+
+nora_w10.menu.FlashMode.qio=QIO 80MHz
+nora_w10.menu.FlashMode.qio.build.flash_mode=dio
+nora_w10.menu.FlashMode.qio.build.boot=qio
+nora_w10.menu.FlashMode.qio.build.boot_freq=80m
+nora_w10.menu.FlashMode.qio.build.flash_freq=80m
+nora_w10.menu.FlashMode.qio120=QIO 120MHz
+nora_w10.menu.FlashMode.qio120.build.flash_mode=dio
+nora_w10.menu.FlashMode.qio120.build.boot=qio
+nora_w10.menu.FlashMode.qio120.build.boot_freq=120m
+nora_w10.menu.FlashMode.qio120.build.flash_freq=80m
+nora_w10.menu.FlashMode.dio=DIO 80MHz
+nora_w10.menu.FlashMode.dio.build.flash_mode=dio
+nora_w10.menu.FlashMode.dio.build.boot=dio
+nora_w10.menu.FlashMode.dio.build.boot_freq=80m
+nora_w10.menu.FlashMode.dio.build.flash_freq=80m
+nora_w10.menu.FlashMode.opi=OPI 80MHz
+nora_w10.menu.FlashMode.opi.build.flash_mode=dout
+nora_w10.menu.FlashMode.opi.build.boot=opi
+nora_w10.menu.FlashMode.opi.build.boot_freq=80m
+nora_w10.menu.FlashMode.opi.build.flash_freq=80m
+
+nora_w10.menu.FlashSize.4M=4MB (32Mb)
+nora_w10.menu.FlashSize.4M.build.flash_size=4MB
+nora_w10.menu.FlashSize.8M=8MB (64Mb)
+nora_w10.menu.FlashSize.8M.build.flash_size=8MB
+nora_w10.menu.FlashSize.8M.build.partitions=default_8MB
+#nora_w10.menu.FlashSize.16M=16MB (128Mb)
+#nora_w10.menu.FlashSize.16M.build.flash_size=16MB
+#nora_w10.menu.FlashSize.32M=32MB (256Mb)
+#nora_w10.menu.FlashSize.32M.build.flash_size=32MB
+
+nora_w10.menu.LoopCore.1=Core 1
+nora_w10.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+nora_w10.menu.LoopCore.0=Core 0
+nora_w10.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+nora_w10.menu.EventsCore.1=Core 1
+nora_w10.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+nora_w10.menu.EventsCore.0=Core 0
+nora_w10.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+nora_w10.menu.USBMode.hwcdc=Hardware CDC and JTAG
+nora_w10.menu.USBMode.hwcdc.build.usb_mode=1
+nora_w10.menu.USBMode.default=USB-OTG (TinyUSB)
+nora_w10.menu.USBMode.default.build.usb_mode=0
+
+nora_w10.menu.CDCOnBoot.default=Disabled
+nora_w10.menu.CDCOnBoot.default.build.cdc_on_boot=0
+nora_w10.menu.CDCOnBoot.cdc=Enabled
+nora_w10.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+nora_w10.menu.MSCOnBoot.default=Disabled
+nora_w10.menu.MSCOnBoot.default.build.msc_on_boot=0
+nora_w10.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+nora_w10.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+nora_w10.menu.DFUOnBoot.default=Disabled
+nora_w10.menu.DFUOnBoot.default.build.dfu_on_boot=0
+nora_w10.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+nora_w10.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+nora_w10.menu.UploadMode.default=UART0 / Hardware CDC
+nora_w10.menu.UploadMode.default.upload.use_1200bps_touch=false
+nora_w10.menu.UploadMode.default.upload.wait_for_upload_port=false
+nora_w10.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+nora_w10.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+nora_w10.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+nora_w10.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+nora_w10.menu.PartitionScheme.default.build.partitions=default
+nora_w10.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+nora_w10.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+nora_w10.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+nora_w10.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+nora_w10.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+nora_w10.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+nora_w10.menu.PartitionScheme.minimal.build.partitions=minimal
+nora_w10.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+nora_w10.menu.PartitionScheme.no_ota.build.partitions=no_ota
+nora_w10.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+nora_w10.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+nora_w10.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+nora_w10.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+nora_w10.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+nora_w10.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+nora_w10.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+nora_w10.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+nora_w10.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+nora_w10.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+nora_w10.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+nora_w10.menu.PartitionScheme.huge_app.build.partitions=huge_app
+nora_w10.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+nora_w10.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+nora_w10.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+nora_w10.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+#nora_w10.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+#nora_w10.menu.PartitionScheme.fatflash.build.partitions=ffat
+#nora_w10.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+#nora_w10.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+#nora_w10.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+#nora_w10.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+nora_w10.menu.PartitionScheme.rainmaker=RainMaker
+nora_w10.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+nora_w10.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+nora_w10.menu.CPUFreq.240=240MHz (WiFi)
+nora_w10.menu.CPUFreq.240.build.f_cpu=240000000L
+nora_w10.menu.CPUFreq.160=160MHz (WiFi)
+nora_w10.menu.CPUFreq.160.build.f_cpu=160000000L
+nora_w10.menu.CPUFreq.80=80MHz (WiFi)
+nora_w10.menu.CPUFreq.80.build.f_cpu=80000000L
+nora_w10.menu.CPUFreq.40=40MHz
+nora_w10.menu.CPUFreq.40.build.f_cpu=40000000L
+nora_w10.menu.CPUFreq.20=20MHz
+nora_w10.menu.CPUFreq.20.build.f_cpu=20000000L
+nora_w10.menu.CPUFreq.10=10MHz
+nora_w10.menu.CPUFreq.10.build.f_cpu=10000000L
+
+nora_w10.menu.UploadSpeed.921600=921600
+nora_w10.menu.UploadSpeed.921600.upload.speed=921600
+nora_w10.menu.UploadSpeed.115200=115200
+nora_w10.menu.UploadSpeed.115200.upload.speed=115200
+nora_w10.menu.UploadSpeed.256000.windows=256000
+nora_w10.menu.UploadSpeed.256000.upload.speed=256000
+nora_w10.menu.UploadSpeed.230400.windows.upload.speed=256000
+nora_w10.menu.UploadSpeed.230400=230400
+nora_w10.menu.UploadSpeed.230400.upload.speed=230400
+nora_w10.menu.UploadSpeed.460800.linux=460800
+nora_w10.menu.UploadSpeed.460800.macosx=460800
+nora_w10.menu.UploadSpeed.460800.upload.speed=460800
+nora_w10.menu.UploadSpeed.512000.windows=512000
+nora_w10.menu.UploadSpeed.512000.upload.speed=512000
+
+nora_w10.menu.DebugLevel.none=None
+nora_w10.menu.DebugLevel.none.build.code_debug=0
+nora_w10.menu.DebugLevel.error=Error
+nora_w10.menu.DebugLevel.error.build.code_debug=1
+nora_w10.menu.DebugLevel.warn=Warn
+nora_w10.menu.DebugLevel.warn.build.code_debug=2
+nora_w10.menu.DebugLevel.info=Info
+nora_w10.menu.DebugLevel.info.build.code_debug=3
+nora_w10.menu.DebugLevel.debug=Debug
+nora_w10.menu.DebugLevel.debug.build.code_debug=4
+nora_w10.menu.DebugLevel.verbose=Verbose
+nora_w10.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 widora-air.name=Widora AIR
 
 widora-air.bootloader.tool=esptool_py

Diff for: libraries/RainMaker/examples/RMakerSonoffDualR3/RMakerSonoffDualR3.ino

@@ -31,20 +31,20 @@ LightSwitch switch_ch1 = {gpio_switch1, false};
 LightSwitch switch_ch2 = {gpio_switch2, false};
 
 //The framework provides some standard device types like switch, lightbulb, fan, temperature sensor.
-static Switch my_switch1("Switch_ch1", &gpio_relay1);
-static Switch my_switch2("Switch_ch2", &gpio_relay2);
+static Switch my_switch1;
+static Switch my_switch2;
 
 void sysProvEvent(arduino_event_t *sys_event)
 {
-    switch (sys_event->event_id) {      
+    switch (sys_event->event_id) {
         case ARDUINO_EVENT_PROV_START:
 #if CONFIG_IDF_TARGET_ESP32
         Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
         printQR(service_name, pop, "ble");
 #else
         Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
         printQR(service_name, pop, "softap");
-#endif        
+#endif
         break;
         case ARDUINO_EVENT_WIFI_STA_CONNECTED:
         Serial.printf("\nConnected to Wi-Fi!\n");
@@ -60,18 +60,18 @@ void write_callback(Device *device, Param *param, const param_val_t val, void *p
     const char *param_name = param->getParamName();
 
     if(strcmp(device_name, "Switch_ch1") == 0) {
-      
+
       Serial.printf("Lightbulb = %s\n", val.val.b? "true" : "false");
-      
+
       if(strcmp(param_name, "Power") == 0) {
           Serial.printf("Received value = %s for %s - %s\n", val.val.b? "true" : "false", device_name, param_name);
         switch_state_ch1 = val.val.b;
         (switch_state_ch1 == false) ? digitalWrite(gpio_relay1, LOW) : digitalWrite(gpio_relay1, HIGH);
         param->updateAndReport(val);
       }
-      
+
     } else if(strcmp(device_name, "Switch_ch2") == 0) {
-      
+
       Serial.printf("Switch value = %s\n", val.val.b? "true" : "false");
 
       if(strcmp(param_name, "Power") == 0) {
@@ -80,9 +80,9 @@ void write_callback(Device *device, Param *param, const param_val_t val, void *p
         (switch_state_ch2 == false) ? digitalWrite(gpio_relay2, LOW) : digitalWrite(gpio_relay2, HIGH);
         param->updateAndReport(val);
       }
-  
+
     }
- 
+
 }
 
 void ARDUINO_ISR_ATTR isr(void* arg) {
@@ -92,8 +92,9 @@ void ARDUINO_ISR_ATTR isr(void* arg) {
 
 void setup()
 {
+
     uint32_t chipId = 0;
-    
+
     Serial.begin(115200);
 
     // Configure the input GPIOs
@@ -102,7 +103,7 @@ void setup()
     attachInterruptArg(switch_ch1.pin, isr, &switch_ch1, CHANGE);
     pinMode(switch_ch2.pin, INPUT_PULLUP);
     attachInterruptArg(switch_ch2.pin, isr, &switch_ch2, CHANGE);
-    
+
     // Set the Relays GPIOs as output mode
     pinMode(gpio_relay1, OUTPUT);
     pinMode(gpio_relay2, OUTPUT);
@@ -112,20 +113,24 @@ void setup()
     digitalWrite(gpio_relay2, DEFAULT_POWER_MODE);
     digitalWrite(gpio_led, false);
 
-    Node my_node;    
+    Node my_node;
     my_node = RMaker.initNode("Sonoff Dual R3");
 
+    //Initialize switch device
+    my_switch1 = Switch("Switch_ch1", &gpio_relay1);
+    my_switch2 = Switch("Switch_ch2", &gpio_relay2);
+
     //Standard switch device
     my_switch1.addCb(write_callback);
     my_switch2.addCb(write_callback);
 
-    //Add switch device to the node   
+    //Add switch device to the node
     my_node.addDevice(my_switch1);
     my_node.addDevice(my_switch2);
 
-    //This is optional 
+    //This is optional
     RMaker.enableOTA(OTA_USING_PARAMS);
-    //If you want to enable scheduling, set time zone for your region using setTimeZone(). 
+    //If you want to enable scheduling, set time zone for your region using setTimeZone().
     //The list of available values are provided here https://rainmaker.espressif.com/docs/time-service.html
     // RMaker.setTimeZone("Asia/Shanghai");
     // Alternatively, enable the Timezone service and let the phone apps set the appropriate timezone

Diff for: libraries/RainMaker/examples/RMakerSwitch/RMakerSwitch.ino

@@ -21,19 +21,19 @@ static int gpio_switch = 16;
 bool switch_state = true;
 
 //The framework provides some standard device types like switch, lightbulb, fan, temperaturesensor.
-static Switch my_switch("Switch", &gpio_switch);
+static Switch my_switch;
 
 void sysProvEvent(arduino_event_t *sys_event)
 {
-    switch (sys_event->event_id) {      
+    switch (sys_event->event_id) {
         case ARDUINO_EVENT_PROV_START:
 #if CONFIG_IDF_TARGET_ESP32S2
         Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on SoftAP\n", service_name, pop);
         printQR(service_name, pop, "softap");
 #else
         Serial.printf("\nProvisioning Started with name \"%s\" and PoP \"%s\" on BLE\n", service_name, pop);
         printQR(service_name, pop, "ble");
-#endif         
+#endif
         break;
         default:;
     }
@@ -59,18 +59,21 @@ void setup()
     pinMode(gpio_switch, OUTPUT);
     digitalWrite(gpio_switch, DEFAULT_POWER_MODE);
 
-    Node my_node;    
+    Node my_node;
     my_node = RMaker.initNode("ESP RainMaker Node");
 
+    //Initialize switch device
+    my_switch = Switch("Switch", &gpio_switch);
+
     //Standard switch device
     my_switch.addCb(write_callback);
-    
-    //Add switch device to the node   
+
+    //Add switch device to the node
     my_node.addDevice(my_switch);
 
-    //This is optional 
+    //This is optional
     RMaker.enableOTA(OTA_USING_PARAMS);
-    //If you want to enable scheduling, set time zone for your region using setTimeZone(). 
+    //If you want to enable scheduling, set time zone for your region using setTimeZone().
     //The list of available values are provided here https://rainmaker.espressif.com/docs/time-service.html
     // RMaker.setTimeZone("Asia/Shanghai");
     // Alternatively, enable the Timezone service and let the phone apps set the appropriate timezone