Merge branch 'master' into esp32_adc2gpio

Author: SuGlider

cores/esp32/USB.cpp

@@ -165,7 +165,7 @@ bool ESPUSB::begin(){
             StreamString s;
             uint8_t m[6];
             esp_efuse_mac_get_default(m);
-            s.printf("%02X:%02X:%02X:%02X:%02X:%02X", m[0], m[1], m[2], m[3], m[4], m[5]);
+            s.printf("%02X%02X%02X%02X%02X%02X", m[0], m[1], m[2], m[3], m[4], m[5]);
             serial_number = s;
         }
 #endif

cores/esp32/esp32-hal-ledc.c

@@ -222,9 +222,12 @@ void analogWrite(uint8_t pin, int value) {
           log_e("No more analogWrite channels available! You can have maximum %u", LEDC_CHANNELS);
           return;
       }
+      if(ledcSetup(cnt_channel - 1, analog_frequency, analog_resolution) == 0){
+          log_e("analogWrite setup failed (freq = %u, resolution = %u). Try setting different resolution or frequency");
+          return;
+      }
+      ledcAttachPin(pin, cnt_channel - 1);
       pin_to_channel[pin] = cnt_channel--;
-      ledcSetup(cnt_channel, analog_frequency, analog_resolution);
-      ledcAttachPin(pin, cnt_channel);
     }
     ledcWrite(pin_to_channel[pin] - 1, value);
   }
@@ -237,7 +240,10 @@ int8_t analogGetChannel(uint8_t pin) {
 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);
+            if (ledcChangeFrequency(channel, freq, analog_resolution) == 0){
+                log_e("analogWrite frequency cant be set due to selected resolution! Try to adjust resolution first");
+                return;
+            }
         }
     }
     analog_frequency = freq;
@@ -250,7 +256,10 @@ void analogWriteResolution(uint8_t bits) {
     }
     if (cnt_channel != LEDC_CHANNELS) {
         for (int channel = LEDC_CHANNELS - 1; channel >= cnt_channel; channel--) {
-            ledcChangeFrequency(channel, analog_frequency, bits);
+            if (ledcChangeFrequency(channel, analog_frequency, bits) == 0){
+                log_e("analogWrite resolution cant be set due to selected frequency! Try to adjust frequency first");
+                return;
+            }
         }
     }
     analog_resolution = bits;

docs/source/api/ledc.rst

@@ -169,6 +169,28 @@ It is compatible with Arduinos analogWrite function.
 * ``value`` select the duty cycle of pwm.
   * range is from 0 (always off) to 255 (always on).
 
+analogWriteResolution
+*********************
+
+This function is used to set resolution for all analogWrite channels.
+
+.. code-block:: arduino
+
+    void analogWriteResolution(uint8_t bits);
+   
+* ``bits`` select resolution for analog channels. 
+
+analogWriteFrequency
+********************
+
+This function is used to set frequency for all analogWrite channels.
+
+.. code-block:: arduino
+
+    void analogWriteFrequency(uint32_t freq);
+
+* ``freq`` select frequency of pwm.
+
 Example Applications
 ********************
 

libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino

@@ -14,14 +14,14 @@
 // Select camera model
 // ===================
 //#define CAMERA_MODEL_WROVER_KIT // Has PSRAM
-//#define CAMERA_MODEL_ESP_EYE // Has PSRAM
+#define CAMERA_MODEL_ESP_EYE // Has PSRAM
 //#define CAMERA_MODEL_ESP32S3_EYE // Has PSRAM
 //#define CAMERA_MODEL_M5STACK_PSRAM // Has PSRAM
 //#define CAMERA_MODEL_M5STACK_V2_PSRAM // M5Camera version B Has PSRAM
 //#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
 //#define CAMERA_MODEL_M5STACK_ESP32CAM // No PSRAM
 //#define CAMERA_MODEL_M5STACK_UNITCAM // No PSRAM
-#define CAMERA_MODEL_AI_THINKER // Has PSRAM
+//#define CAMERA_MODEL_AI_THINKER // Has PSRAM
 //#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
 // ** Espressif Internal Boards **
 //#define CAMERA_MODEL_ESP32_CAM_BOARD
@@ -37,6 +37,7 @@ const char* ssid = "**********";
 const char* password = "**********";
 
 void startCameraServer();
+void setupLedFlash(int pin);
 
 void setup() {
   Serial.begin(115200);
@@ -124,6 +125,11 @@ void setup() {
   s->set_vflip(s, 1);
 #endif
 
+// Setup LED FLash if LED pin is defined in camera_pins.h
+#if defined(LED_GPIO_NUM)
+  setupLedFlash(LED_GPIO_NUM);
+#endif
+
   WiFi.begin(ssid, password);
   WiFi.setSleep(false);