Skip to content

Commit 23b9655

Browse files
Jason2866Jason2866
authored
Merge branch 'espressif:master' into work
2 parents 72eb85d + 4a341c9 commit 23b9655

File tree

14 files changed

+730
-200
lines changed

14 files changed

+730
-200
lines changed

‎boards.txt

Lines changed: 465 additions & 178 deletions
Large diffs are not rendered by default.

‎docs/source/api/wifi.rst

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -446,26 +446,12 @@ Return the connection state.
446446
setAutoConnect
447447
**************
448448

449-
Function used to set the automatic connection.
450-
451-
.. code-block:: arduino
452-
453-
bool setAutoConnect(bool autoConnect);
454-
455-
Where:
456-
457-
* ``bool autoConnect`` is set to ``true`` to enable this option.
449+
Function is deprecated.
458450

459451
getAutoConnect
460452
**************
461453

462-
Function used to get the automatic connection setting value.
463-
464-
.. code-block:: arduino
465-
466-
bool getAutoConnect();
467-
468-
The function will return ``true`` if the setting is enabled.
454+
Function is deprecated.
469455

470456
setAutoReconnect
471457
****************
@@ -484,11 +470,12 @@ getAutoReconnect
484470
****************
485471

486472
Function used to get the automatic reconnection if the connection is lost.
473+
487474
.. code-block:: arduino
488475
489476
bool getAutoReconnect();
490477
491-
The function will return ``true`` if this setting is enabled.
478+
The function will return ``true`` if this setting is enabled.
492479

493480
WiFiMulti
494481
---------

‎libraries/WiFi/src/WiFiSTA.cpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,9 @@ void WiFiSTAClass::setSortMethod(wifi_sort_method_t sortMethod)
430430
}
431431

432432
/**
433-
* Setting the ESP32 station to connect to the AP (which is recorded)
433+
* Deprecated. Setting the ESP32 station to connect to the AP (which is recorded)
434434
* automatically or not when powered on. Enable auto-connect by default.
435+
* @deprecated use `setAutoReconnect`
435436
* @param autoConnect bool
436437
* @return if saved
437438
*/
@@ -441,21 +442,30 @@ bool WiFiSTAClass::setAutoConnect(bool autoConnect)
441442
}
442443

443444
/**
444-
* Checks if ESP32 station mode will connect to AP
445+
* Deprecated. Checks if ESP32 station mode will connect to AP
445446
* automatically or not when it is powered on.
447+
* @deprecated use `getAutoReconnect`
446448
* @return auto connect
447449
*/
448450
bool WiFiSTAClass::getAutoConnect()
449451
{
450452
return false;//now deprecated
451453
}
452454

455+
/**
456+
* Function used to set the automatic reconnection if the connection is lost.
457+
* @param autoReconnect `true` to enable this option.
458+
* @return true
459+
*/
453460
bool WiFiSTAClass::setAutoReconnect(bool autoReconnect)
454461
{
455462
_autoReconnect = autoReconnect;
456463
return true;
457464
}
458-
465+
/**
466+
* Function used to get the automatic reconnection if the connection is lost.
467+
* @return The function will return `true` if this setting is enabled.
468+
*/
459469
bool WiFiSTAClass::getAutoReconnect()
460470
{
461471
return _autoReconnect;

‎variants/adafruit_feather_esp32_v2/pins_arduino.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ static const uint8_t LED_BUILTIN = 13;
1717

1818
static const uint8_t TX = 8;
1919
static const uint8_t RX = 7;
20-
static const uint8_t TX1 = 8;
21-
static const uint8_t RX1 = 7;
20+
#define TX1 TX
21+
#define RX1 RX
2222

2323
static const uint8_t SDA = 22;
2424
static const uint8_t SCL = 20;

‎variants/adafruit_feather_esp32s3/bootloader.bin

22.2 KB
Binary file not shown.

‎variants/adafruit_feather_esp32s3/partitions.csv

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, 0, ota_0, 0x10000, 1408K,
9+
ota_1, 0, ota_1, 0x170000, 1408K,
10+
uf2, app, factory,0x2d0000, 256K,
11+
ffat, data, fat, 0x310000, 960K,

‎variants/adafruit_feather_esp32s3/pins_arduino.h

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define USB_VID 0x239A
7+
#define USB_PID 0x811B
8+
#define USB_MANUFACTURER "Adafruit"
9+
#define USB_PRODUCT "Feather ESP32-S3"
10+
#define USB_SERIAL "" // Empty string for MAC adddress
11+
12+
#define EXTERNAL_NUM_INTERRUPTS 46
13+
#define NUM_DIGITAL_PINS 48
14+
#define NUM_ANALOG_INPUTS 20
15+
16+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
17+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
18+
#define digitalPinHasPWM(p) (p < 46)
19+
20+
#define LED_BUILTIN 13
21+
22+
#define PIN_NEOPIXEL 33
23+
#define NEOPIXEL_NUM 1 // number of neopixels
24+
#define NEOPIXEL_POWER 21 // power pin
25+
#define NEOPIXEL_POWER_ON HIGH // power pin state when on
26+
#define I2C_POWER 7 // I2C power pin
27+
#define PIN_I2C_POWER 7 // I2C power pin
28+
29+
30+
static const uint8_t TX = 39;
31+
static const uint8_t RX = 38;
32+
#define TX1 TX
33+
#define RX1 RX
34+
35+
static const uint8_t SDA = 3;
36+
static const uint8_t SCL = 4;
37+
38+
static const uint8_t SS = 42;
39+
static const uint8_t MOSI = 35;
40+
static const uint8_t SCK = 36;
41+
static const uint8_t MISO = 37;
42+
43+
static const uint8_t A0 = 18;
44+
static const uint8_t A1 = 17;
45+
static const uint8_t A2 = 16;
46+
static const uint8_t A3 = 15;
47+
static const uint8_t A4 = 14;
48+
static const uint8_t A5 = 8;
49+
static const uint8_t A6 = 3;
50+
static const uint8_t A7 = 4;
51+
static const uint8_t A8 = 5;
52+
static const uint8_t A9 = 6;
53+
static const uint8_t A10 = 9;
54+
static const uint8_t A11 = 10;
55+
static const uint8_t A12 = 11;
56+
static const uint8_t A13 = 12;
57+
static const uint8_t A14 = 13;
58+
59+
static const uint8_t T3 = 3;
60+
static const uint8_t T4 = 4;
61+
static const uint8_t T5 = 5;
62+
static const uint8_t T6 = 6;
63+
static const uint8_t T8 = 8;
64+
static const uint8_t T9 = 9;
65+
static const uint8_t T10 = 10;
66+
static const uint8_t T11 = 11;
67+
static const uint8_t T12 = 12;
68+
static const uint8_t T13 = 13;
69+
static const uint8_t T14 = 14;
70+
71+
#endif /* Pins_Arduino_h */

‎variants/adafruit_feather_esp32s3/tinyuf2.bin

162 KB
Binary file not shown.

‎variants/adafruit_feather_esp32s3/variant.cpp

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2021 Ha Thach (tinyusb.org) for Adafruit Industries
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
26+
#include "esp32-hal-gpio.h"
27+
#include "pins_arduino.h"
28+
29+
extern "C" {
30+
31+
// Initialize variant/board, called before setup()
32+
void initVariant(void)
33+
{
34+
// This board has a power control pin, and we must set it to output and high
35+
// in order to enable the NeoPixels.
36+
pinMode(NEOPIXEL_POWER, OUTPUT);
37+
digitalWrite(NEOPIXEL_POWER, HIGH);
38+
39+
// turn on the I2C power by setting LDO enable pin 'high'
40+
pinMode(PIN_I2C_POWER, OUTPUT);
41+
digitalWrite(PIN_I2C_POWER, HIGH);
42+
}
43+
}

‎variants/adafruit_feather_esp32s3_tft/bootloader.bin

22.3 KB
Binary file not shown.

‎variants/adafruit_feather_esp32s3_tft/partitions.csv

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# ESP-IDF Partition Table
2+
# Name, Type, SubType, Offset, Size, Flags
3+
# bootloader.bin,, 0x1000, 32K
4+
# partition table, 0x8000, 4K
5+
6+
nvs, data, nvs, 0x9000, 20K,
7+
otadata, data, ota, 0xe000, 8K,
8+
ota_0, 0, ota_0, 0x10000, 1408K,
9+
ota_1, 0, ota_1, 0x170000, 1408K,
10+
uf2, app, factory,0x2d0000, 256K,
11+
ffat, data, fat, 0x310000, 960K,

‎variants/adafruit_feather_esp32s3_tft/pins_arduino.h

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
7+
#define USB_VID 0x239A
8+
#define USB_PID 0x811D
9+
#define USB_MANUFACTURER "Adafruit"
10+
#define USB_PRODUCT "Feather ESP32-S3 TFT"
11+
#define USB_SERIAL "" // Empty string for MAC adddress
12+
13+
14+
#define EXTERNAL_NUM_INTERRUPTS 46
15+
#define NUM_DIGITAL_PINS 48
16+
#define NUM_ANALOG_INPUTS 20
17+
18+
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
19+
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1)
20+
#define digitalPinHasPWM(p) (p < 46)
21+
22+
#define LED_BUILTIN 13
23+
24+
#define PIN_NEOPIXEL 33
25+
#define NEOPIXEL_NUM 1 // number of neopixels
26+
#define NEOPIXEL_POWER 34 // power pin
27+
#define NEOPIXEL_POWER_ON HIGH // power pin state when on
28+
29+
#define TFT_I2C_POWER 21
30+
#define TFT_CS 7
31+
#define TFT_RST 40
32+
#define TFT_DC 39
33+
#define TFT_BACKLITE 45
34+
35+
static const uint8_t SDA = 42;
36+
static const uint8_t SCL = 41;
37+
38+
static const uint8_t SS = 7;
39+
static const uint8_t MOSI = 35;
40+
static const uint8_t SCK = 36;
41+
static const uint8_t MISO = 37;
42+
43+
static const uint8_t A0 = 18;
44+
static const uint8_t A1 = 17;
45+
static const uint8_t A2 = 16;
46+
static const uint8_t A3 = 15;
47+
static const uint8_t A4 = 14;
48+
static const uint8_t A5 = 8;
49+
50+
static const uint8_t TX = 1;
51+
static const uint8_t RX = 2;
52+
53+
static const uint8_t T1 = 1;
54+
static const uint8_t T2 = 2;
55+
static const uint8_t T5 = 5;
56+
static const uint8_t T6 = 6;
57+
static const uint8_t T8 = 8;
58+
static const uint8_t T9 = 9;
59+
static const uint8_t T10 = 10;
60+
static const uint8_t T11 = 11;
61+
static const uint8_t T12 = 12;
62+
static const uint8_t T13 = 13;
63+
static const uint8_t T14 = 14;
64+
65+
static const uint8_t DAC1 = 17;
66+
static const uint8_t DAC2 = 18;
67+
68+
#endif /* Pins_Arduino_h */

‎variants/adafruit_feather_esp32s3_tft/tinyuf2.bin

181 KB
Binary file not shown.

‎variants/adafruit_feather_esp32s3_tft/variant.cpp

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* The MIT License (MIT)
3+
*
4+
* Copyright (c) 2021 Ha Thach (tinyusb.org) for Adafruit Industries
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in
14+
* all copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
* THE SOFTWARE.
23+
*/
24+
25+
26+
#include "esp32-hal-gpio.h"
27+
#include "pins_arduino.h"
28+
29+
extern "C" {
30+
31+
// Initialize variant/board, called before setup()
32+
void initVariant(void)
33+
{
34+
// This board has power control pins, and we must set them to output and high
35+
// in order to enable the NeoPixels, TFT & I2C
36+
pinMode(NEOPIXEL_POWER, OUTPUT);
37+
digitalWrite(NEOPIXEL_POWER, HIGH);
38+
pinMode(TFT_I2C_POWER, OUTPUT);
39+
digitalWrite(TFT_I2C_POWER, HIGH);
40+
}
41+
42+
}

0 commit comments

Comments
 (0)