Merge branch 'master' into feature/ide_2_debug

Author: me-no-dev

Diff for: cores/esp32/esp32-hal-ledc.c

@@ -166,14 +166,15 @@ void ledcAttachPin(uint8_t pin, uint8_t chan)
         return;
     }
     uint8_t group=(chan/8), channel=(chan%8), timer=((chan/2)%4);
-    
+    uint32_t duty = ledc_get_duty(group,channel);
+
     ledc_channel_config_t ledc_channel = {
         .speed_mode     = group,
         .channel        = channel,
         .timer_sel      = timer,
         .intr_type      = LEDC_INTR_DISABLE,
         .gpio_num       = pin,
-        .duty           = 0,
+        .duty           = duty,
         .hpoint         = 0
     };
     ledc_channel_config(&ledc_channel);
@@ -211,6 +212,8 @@ uint32_t ledcChangeFrequency(uint8_t chan, uint32_t freq, uint8_t bit_num)
 
 static int8_t pin_to_channel[SOC_GPIO_PIN_COUNT] = { 0 };
 static int cnt_channel = LEDC_CHANNELS;
+static uint8_t analog_resolution = 8;
+static int analog_frequency = 1000;
 void analogWrite(uint8_t pin, int value) {
   // Use ledc hardware for internal pins
   if (pin < SOC_GPIO_PIN_COUNT) {
@@ -220,8 +223,8 @@ void analogWrite(uint8_t pin, int value) {
           return;
       }
       pin_to_channel[pin] = cnt_channel--;
+      ledcSetup(cnt_channel, analog_frequency, analog_resolution);
       ledcAttachPin(pin, cnt_channel);
-      ledcSetup(cnt_channel, 1000, 8);
     }
     ledcWrite(pin_to_channel[pin] - 1, value);
   }
@@ -230,3 +233,25 @@ void analogWrite(uint8_t pin, int value) {
 int8_t analogGetChannel(uint8_t pin) {
     return pin_to_channel[pin] - 1;
 }
+
+void analogWriteFrequency(uint32_t freq) {
+    if (cnt_channel != LEDC_CHANNELS) {
+        for (int channel = LEDC_CHANNELS - 1; channel >= cnt_channel; channel--) {
+            ledcChangeFrequency(channel, freq, analog_resolution);
+        }
+    }
+    analog_frequency = freq;
+}
+
+void analogWriteResolution(uint8_t bits) {
+    if(bits > LEDC_MAX_BIT_WIDTH) {
+        log_w("analogWrite resolution width too big! Setting to maximum %u bits)", LEDC_MAX_BIT_WIDTH);
+        bits = LEDC_MAX_BIT_WIDTH;
+    }
+    if (cnt_channel != LEDC_CHANNELS) {
+        for (int channel = LEDC_CHANNELS - 1; channel >= cnt_channel; channel--) {
+            ledcChangeFrequency(channel, analog_frequency, bits);
+        }
+    }
+    analog_resolution = bits;
+}

Diff for: cores/esp32/esp32-hal.h

@@ -93,6 +93,8 @@ void yield(void);
 
 void analogWrite(uint8_t pin, int value);
 int8_t analogGetChannel(uint8_t pin);
+void analogWriteFrequency(uint32_t freq);
+void analogWriteResolution(uint8_t bits);
 
 //returns chip temperature in Celsius
 float temperatureRead();

Diff for: docs/source/api/rainmaker.rst

@@ -22,9 +22,6 @@ The key features of ESP RainMaker are:
 
 Additional information about ESP RainMaker can be found `here <https://rainmaker.espressif.com/>`__.
 
-#########################
-Arduino ESP Rainmaker API
-#########################
 
 ESP RainMaker Agent API
 -----------------------
@@ -127,6 +124,21 @@ This function will return
 1. `ESP_OK` : On success
 2. Error in case of failure
 
+RMaker.enableScenes
+*******************
+
+This API enables the Scenes service for the node. It should be called after `RMaker.initNode()` and before `RMaker.start()`.
+For more information, check `here <https://rainmaker.espressif.com/docs/scenes.html>`__.
+
+.. code-block:: arduino
+
+    esp_err_t enableScenes()
+
+This function will return
+
+1. `ESP_OK` : On success
+2. Error in case of failure
+
 RMaker.setTimeZone
 ******************
 

Diff for: docs/source/esp-idf_component.rst

@@ -39,6 +39,21 @@ Installation
 
 .. note:: If you use Arduino with ESP-IDF often, you can place the arduino folder into global components folder.
 
+If you're targeting the ESP32-S2 or ESP32-S3 and you want to use USBHID classes such as ``USBHID``, ``USBHIDConsumerControl``, ``USBHIDGamepad``, ``USBHIDKeyboard``, ``USBHIDMouse``, ``USBHIDSystemControl``, or ``USBHIDVendor``:
+
+1. Clone these nested repos somewhere:
+
+.. code-block:: bash
+
+    git clone https://github.com/espressif/esp32-arduino-lib-builder.git esp32-arduino-lib-builder && \
+    git clone https://github.com/hathach/tinyusb.git esp32-arduino-lib-builder/components/arduino_tinyusb/tinyusb
+
+2. In the project folder, edit ``CMakeLists.txt`` and add the following before the ``project()`` line:
+
+.. code-block:: bash
+
+    set(EXTRA_COMPONENT_DIRS <path to esp32-arduino-lib-builder/components/arduino_tinyusb>)
+
 Configuration
 -------------
 

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

@@ -26,15 +26,15 @@ static Device my_device("Dimmer", "custom.device.dimmer", &gpio_dimmer);
 
 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:;
     }
@@ -63,7 +63,7 @@ void setup()
     pinMode(gpio_dimmer, OUTPUT);
     digitalWrite(gpio_dimmer, DEFAULT_POWER_MODE);
 
-    Node my_node;    
+    Node my_node;
     my_node = RMaker.initNode("ESP RainMaker Node");
 
     //Create custom dimmer device
@@ -78,20 +78,22 @@ void setup()
     my_device.addParam(level_param);
 
     my_device.addCb(write_callback);
-    
-    //Add custom dimmer device to the node   
+
+    //Add custom dimmer device to the node
     my_node.addDevice(my_device);
 
-    //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
     RMaker.enableTZService();
 
     RMaker.enableSchedule();
 
+    RMaker.enableScenes();
+
     RMaker.start();
 
     WiFi.onEvent(sysProvEvent);

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

@@ -43,15 +43,15 @@ static Device my_device("Air Cooler", "my.device.air-cooler", NULL);
 
 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:;
     }
@@ -114,7 +114,7 @@ void setup()
     pinMode(gpio_speed, OUTPUT);
     analogWrite(gpio_speed, DEFAULT_SPEED);
 
-    Node my_node;    
+    Node my_node;
     my_node = RMaker.initNode("ESP RainMaker Node");
 
     //Create custom air cooler device
@@ -138,20 +138,22 @@ void setup()
     my_device.addParam(mode_param);
 
     my_device.addCb(write_callback);
-    
-    //Add custom Air Cooler device to the node   
+
+    //Add custom Air Cooler device to the node
     my_node.addDevice(my_device);
 
-    //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
     // RMaker.enableTZService();
 
     RMaker.enableSchedule();
 
+    RMaker.enableScenes();
+
     RMaker.start();
 
     WiFi.onEvent(sysProvEvent);

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

@@ -136,6 +136,7 @@ void setup()
     // Alternatively, enable the Timezone service and let the phone apps set the appropriate timezone
     RMaker.enableTZService();
     RMaker.enableSchedule();
+    RMaker.enableScenes();
 
     //Service Name
     for(int i=0; i<17; i=i+8) {

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

@@ -81,6 +81,8 @@ void setup()
 
     RMaker.enableSchedule();
 
+    RMaker.enableScenes();
+
     RMaker.start();
 
     WiFi.onEvent(sysProvEvent);

Diff for: libraries/RainMaker/src/RMaker.cpp

@@ -3,6 +3,7 @@
 #include "RMaker.h"
 #include <esp_rmaker_schedule.h>
 #include <esp_rmaker_utils.h>
+#include <esp_rmaker_scenes.h>
 bool wifiLowLevelInit(bool persistent);
 static esp_err_t err;
 
@@ -28,12 +29,12 @@ static void event_handler(void *arg, esp_event_base_t event_base, int32_t event_
                 log_i("Unhandled RainMaker Event:");
         }
     } else if (event_base == RMAKER_OTA_EVENT) {
-        if(event_data == NULL){
+        if (event_data == NULL) {
             event_data = (void*)"";
         }
         switch(event_id) {
             case RMAKER_OTA_EVENT_STARTING:
-                log_i("Starting OTA : %s", (char*)event_data);
+                log_i("Starting OTA");
                 break;
             case RMAKER_OTA_EVENT_IN_PROGRESS:
                 log_i("OTA in progress : %s", (char*)event_data);
@@ -146,5 +147,13 @@ esp_err_t RMakerClass::enableOTA(ota_type_t type, const char *cert)
     return err;
 }
 
+esp_err_t RMakerClass::enableScenes()
+{
+    err = esp_rmaker_scenes_enable();
+    if (err != ESP_OK) {
+        log_e("Scenes enable failed");
+    }
+    return err;
+}
 RMakerClass RMaker;
 #endif

Diff for: libraries/RainMaker/src/RMaker.h

@@ -25,16 +25,17 @@ class RMakerClass
 {
     private:
         esp_rmaker_config_t rainmaker_cfg = {false};
-      
+
     public:
-    
+
         void setTimeSync(bool val);
         Node initNode(const char *name, const char *type = "ESP RainMaker with Arduino");
         esp_err_t deinitNode(Node node);
         esp_err_t setTimeZone(const char *tz = "Asia/Shanghai");
         esp_err_t enableSchedule();
         esp_err_t enableTZService();
         esp_err_t enableOTA(ota_type_t type, const char *cert = ESP_RMAKER_OTA_DEFAULT_SERVER_CERT);
+        esp_err_t enableScenes();
         esp_err_t start();
         esp_err_t stop();
 };

Diff for: libraries/RainMaker/src/RMakerUtils.cpp

@@ -1,12 +1,13 @@
 #include "RMakerUtils.h"
 #ifdef CONFIG_ESP_RMAKER_WORK_QUEUE_TASK_STACK
-void RMakerFactoryReset(int seconds)
+#define RESET_DELAY_SEC 2
+void RMakerFactoryReset(int reboot_seconds)
 {
-    esp_rmaker_factory_reset(0, seconds);
+    esp_rmaker_factory_reset(RESET_DELAY_SEC, reboot_seconds);
 }
 
-void RMakerWiFiReset(int seconds)
+void RMakerWiFiReset(int reboot_seconds)
 {
-    esp_rmaker_wifi_reset(0, seconds);
+    esp_rmaker_wifi_reset(RESET_DELAY_SEC, reboot_seconds);    
 }
 #endif

Diff for: variants/wt32-eth01/pins_arduino.h

@@ -54,12 +54,12 @@ static const uint8_t RX = 3;
 
 //SPI VSPI default pins
 static const uint8_t SS    = -1;
-static const uint8_t MOSI  = 15;
-static const uint8_t MISO  = 12;
-static const uint8_t SCK   = 14;
+static const uint8_t MOSI  = 14;
+static const uint8_t MISO  = 15;
+static const uint8_t SCK   = 12;
 
 //I2C default pins
-static const uint8_t SDA = 2;
-static const uint8_t SCL = 4;
+static const uint8_t SDA = 33;
+static const uint8_t SCL = 32;
 
 #endif /* Pins_Arduino_h */