Merge branch 'master' into args

Author: SuGlider

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -41,6 +41,7 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v2.0.4
         - v2.0.3
         - v2.0.2
         - v2.0.1

CMakeLists.txt

@@ -36,6 +36,7 @@ set(CORE_SRCS
   cores/esp32/esp32-hal-matrix.c
   cores/esp32/esp32-hal-misc.c
   cores/esp32/esp32-hal-psram.c
+  cores/esp32/esp32-hal-rgb-led.c
   cores/esp32/esp32-hal-sigmadelta.c
   cores/esp32/esp32-hal-spi.c
   cores/esp32/esp32-hal-time.c

boards.txt

@@ -31,11 +31,8 @@ static void tone_task(void*){
         log_d("Task received from queue TONE_START: _pin=%d, frequency=%u Hz, duration=%lu ms", tone_msg.pin, tone_msg.frequency, tone_msg.duration);
 
         log_d("Setup LED controll on channel %d", _channel);
-        // ledcSetup(_channel, tone_msg.frequency, 11);
-        // ledcAttachPin(tone_msg.pin, _channel);
-        // ledcWrite(_channel, 1024);
-        ledcWriteTone(_channel, tone_msg.frequency);
         ledcAttachPin(tone_msg.pin, _channel);
+        ledcWriteTone(_channel, tone_msg.frequency);
 
         if(tone_msg.duration){
           delay(tone_msg.duration);

cores/esp32/Tone.cpp

@@ -91,6 +91,13 @@ static InterruptHandle_t __pinInterruptHandlers[SOC_GPIO_PIN_COUNT] = {0,};
 
 extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 {
+#ifdef BOARD_HAS_NEOPIXEL
+    if (pin == LED_BUILTIN){
+        __pinMode(LED_BUILTIN-SOC_GPIO_PIN_COUNT, mode);
+        return;
+    }
+#endif
+
     if (!GPIO_IS_VALID_GPIO(pin)) {
         log_e("Invalid pin selected");
         return;
@@ -127,6 +134,14 @@ extern void ARDUINO_ISR_ATTR __pinMode(uint8_t pin, uint8_t mode)
 
 extern void ARDUINO_ISR_ATTR __digitalWrite(uint8_t pin, uint8_t val)
 {
+    #ifdef BOARD_HAS_NEOPIXEL
+        if(pin == LED_BUILTIN){
+            //use RMT to set all channels on/off
+            const uint8_t comm_val = val != 0 ? LED_BRIGHTNESS : 0;
+            neopixelWrite(LED_BUILTIN, comm_val, comm_val, comm_val);
+            return;
+        }
+    #endif
 	gpio_set_level((gpio_num_t)pin, val);
 }
 

cores/esp32/esp32-hal-gpio.c

@@ -26,6 +26,7 @@ extern "C" {
 
 #include "esp32-hal.h"
 #include "soc/soc_caps.h"
+#include "pins_arduino.h"
 
 #if (CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3)
 #define NUM_OUPUT_PINS  46
@@ -63,6 +64,7 @@ extern "C" {
 #define ONLOW_WE  0x0C
 #define ONHIGH_WE 0x0D
 
+
 #define digitalPinIsValid(pin)          GPIO_IS_VALID_GPIO(pin)
 #define digitalPinCanOutput(pin)        GPIO_IS_VALID_OUTPUT_GPIO(pin)
 

cores/esp32/esp32-hal-gpio.h

@@ -0,0 +1,47 @@
+#include "esp32-hal-rgb-led.h"
+
+
+void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val){
+  rmt_data_t led_data[24];
+  static rmt_obj_t* rmt_send = NULL;
+  static bool initialized = false;
+
+  uint8_t _pin = pin;
+#ifdef BOARD_HAS_NEOPIXEL
+  if(pin == LED_BUILTIN){
+    _pin = LED_BUILTIN-SOC_GPIO_PIN_COUNT;
+  }
+#endif
+
+  if(!initialized){
+    if((rmt_send = rmtInit(_pin, RMT_TX_MODE, RMT_MEM_64)) == NULL){
+        log_e("RGB LED driver initialization failed!");
+        rmt_send = NULL;
+        return;
+    }
+    rmtSetTick(rmt_send, 100);
+    initialized = true;
+  }
+
+  int color[] = {green_val, red_val, blue_val};  // Color coding is in order GREEN, RED, BLUE
+  int i = 0;
+  for(int col=0; col<3; col++ ){
+    for(int bit=0; bit<8; bit++){
+      if((color[col] & (1<<(7-bit)))){
+        // HIGH bit
+        led_data[i].level0 = 1; // T1H
+        led_data[i].duration0 = 8; // 0.8us
+        led_data[i].level1 = 0; // T1L
+        led_data[i].duration1 = 4; // 0.4us
+      }else{
+        // LOW bit
+        led_data[i].level0 = 1; // T0H
+        led_data[i].duration0 = 4; // 0.4us
+        led_data[i].level1 = 0; // T0L
+        led_data[i].duration1 = 8; // 0.8us
+      }
+      i++;
+    }
+  }
+  rmtWrite(rmt_send, led_data, 24);
+}

cores/esp32/esp32-hal-rgb-led.c

@@ -0,0 +1,20 @@
+#ifndef MAIN_ESP32_HAL_RGB_LED_H_
+#define MAIN_ESP32_HAL_RGB_LED_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "esp32-hal.h"
+
+#ifndef LED_BRIGHTNESS
+  #define LED_BRIGHTNESS 64
+#endif
+
+void neopixelWrite(uint8_t pin, uint8_t red_val, uint8_t green_val, uint8_t blue_val);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* MAIN_ESP32_HAL_RGB_LED_H_ */

cores/esp32/esp32-hal-rgb-led.h

@@ -88,6 +88,7 @@ void yield(void);
 #include "esp32-hal-timer.h"
 #include "esp32-hal-bt.h"
 #include "esp32-hal-psram.h"
+#include "esp32-hal-rgb-led.h"
 #include "esp32-hal-cpu.h"
 
 void analogWrite(uint8_t pin, int value);

cores/esp32/esp32-hal.h

@@ -11,7 +11,7 @@ The Wi-Fi API provides support for the 802.11b/g/n protocol driver. This API inc
 
 * AP mode (aka Soft-AP mode or Access Point mode). Devices connect to the ESP32
 
-* Security modes (WPA, WPA2, WEP, etc.)
+* Security modes (WPA2, WPA3 etc.)
 
 * Scanning for access points
 
@@ -446,26 +446,12 @@ Return the connection state.
 setAutoConnect
 **************
 
-Function used to set the automatic connection.
-
-.. code-block:: arduino
-
-    bool setAutoConnect(bool autoConnect);
-
-Where:
-
-* ``bool autoConnect`` is set to ``true`` to enable this option.
+Function is deprecated.
 
 getAutoConnect
 **************
 
-Function used to get the automatic connection setting value.
-
-.. code-block:: arduino
-
-    bool getAutoConnect();
-
-The function will return ``true`` if the setting is enabled.
+Function is deprecated.
 
 setAutoReconnect
 ****************
@@ -484,11 +470,25 @@ getAutoReconnect
 ****************
 
 Function used to get the automatic reconnection if the connection is lost.
+
 .. code-block:: arduino
 
     bool getAutoReconnect();
 
-    The function will return ``true`` if this setting is enabled.
+The function will return ``true`` if this setting is enabled.
+
+setMinSecurity
+**************
+
+Function used to set the minimum security for AP to be considered connectable.
+
+.. code-block:: arduino
+
+    bool setMinSecurity(wifi_auth_mode_t minSecurity);
+
+Where:
+
+* ``minSecurity`` is the minimum security for AP to be considered connectable. Default is ``WIFI_AUTH_WPA2_PSK``.
 
 WiFiMulti
 ---------