Skip to content

Commit ef5c73f

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into idf-release/v4.2
2 parents 591c438 + c6a8da6 commit ef5c73f

File tree

6 files changed

+271
-3
lines changed

6 files changed

+271
-3
lines changed

‎boards.txt

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3470,6 +3470,161 @@ m5stack-core2.menu.DebugLevel.verbose.build.code_debug=5
34703470

34713471
##############################################################
34723472

3473+
m5stack-timer-cam.name=M5Stack-Timer-CAM
3474+
3475+
m5stack-timer-cam.upload.tool=esptool_py
3476+
m5stack-timer-cam.upload.maximum_size=1310720
3477+
m5stack-timer-cam.upload.maximum_data_size=327680
3478+
m5stack-timer-cam.upload.wait_for_upload_port=true
3479+
3480+
m5stack-timer-cam.serial.disableDTR=true
3481+
m5stack-timer-cam.serial.disableRTS=true
3482+
3483+
m5stack-timer-cam.build.mcu=esp32
3484+
m5stack-timer-cam.build.core=esp32
3485+
m5stack-timer-cam.build.variant=m5stack_timer_cam
3486+
m5stack-timer-cam.build.board=M5Stack-Timer-CAM
3487+
3488+
m5stack-timer-cam.build.f_cpu=240000000L
3489+
m5stack-timer-cam.build.flash_size=4MB
3490+
m5stack-timer-cam.build.flash_freq=80m
3491+
m5stack-timer-cam.build.flash_mode=dio
3492+
m5stack-timer-cam.build.boot=dio
3493+
m5stack-timer-cam.build.partitions=default
3494+
m5stack-timer-cam.build.defines=
3495+
3496+
m5stack-timer-cam.menu.PSRAM.enabled=Enabled
3497+
m5stack-timer-cam.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue
3498+
m5stack-timer-cam.menu.PSRAM.disabled=Disabled
3499+
m5stack-timer-cam.menu.PSRAM.disabled.build.defines=
3500+
3501+
m5stack-timer-cam.menu.PartitionScheme.default=Default(3MB No OTA/1MB SPIFFS)
3502+
m5stack-timer-cam.menu.PartitionScheme.default.build.partitions=huge_app
3503+
m5stack-timer-cam.menu.PartitionScheme.default.upload.maximum_size=3145728
3504+
3505+
m5stack-timer-cam.menu.PartitionScheme.no_ota=No OTA (Large APP)
3506+
m5stack-timer-cam.menu.PartitionScheme.no_ota.build.partitions=no_ota
3507+
m5stack-timer-cam.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3508+
3509+
m5stack-timer-cam.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
3510+
m5stack-timer-cam.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
3511+
m5stack-timer-cam.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
3512+
3513+
m5stack-timer-cam.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
3514+
m5stack-timer-cam.menu.PartitionScheme.no_ota.build.partitions=no_ota
3515+
m5stack-timer-cam.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3516+
3517+
m5stack-timer-cam.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
3518+
m5stack-timer-cam.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
3519+
m5stack-timer-cam.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
3520+
3521+
m5stack-timer-cam.menu.CPUFreq.240=240MHz (WiFi/BT)
3522+
m5stack-timer-cam.menu.CPUFreq.240.build.f_cpu=240000000L
3523+
m5stack-timer-cam.menu.CPUFreq.160=160MHz (WiFi/BT)
3524+
m5stack-timer-cam.menu.CPUFreq.160.build.f_cpu=160000000L
3525+
m5stack-timer-cam.menu.CPUFreq.80=80MHz (WiFi/BT)
3526+
m5stack-timer-cam.menu.CPUFreq.80.build.f_cpu=80000000L
3527+
m5stack-timer-cam.menu.CPUFreq.40=40MHz (40MHz XTAL)
3528+
m5stack-timer-cam.menu.CPUFreq.40.build.f_cpu=40000000L
3529+
m5stack-timer-cam.menu.CPUFreq.26=26MHz (26MHz XTAL)
3530+
m5stack-timer-cam.menu.CPUFreq.26.build.f_cpu=26000000L
3531+
m5stack-timer-cam.menu.CPUFreq.20=20MHz (40MHz XTAL)
3532+
m5stack-timer-cam.menu.CPUFreq.20.build.f_cpu=20000000L
3533+
m5stack-timer-cam.menu.CPUFreq.13=13MHz (26MHz XTAL)
3534+
m5stack-timer-cam.menu.CPUFreq.13.build.f_cpu=13000000L
3535+
m5stack-timer-cam.menu.CPUFreq.10=10MHz (40MHz XTAL)
3536+
m5stack-timer-cam.menu.CPUFreq.10.build.f_cpu=10000000L
3537+
3538+
m5stack-timer-cam.menu.UploadSpeed.1500000=1500000
3539+
m5stack-timer-cam.menu.UploadSpeed.1500000.upload.speed=1500000
3540+
m5stack-timer-cam.menu.UploadSpeed.750000=750000
3541+
m5stack-timer-cam.menu.UploadSpeed.750000.upload.speed=750000
3542+
m5stack-timer-cam.menu.UploadSpeed.500000=500000
3543+
m5stack-timer-cam.menu.UploadSpeed.500000.upload.speed=500000
3544+
m5stack-timer-cam.menu.UploadSpeed.250000=250000
3545+
m5stack-timer-cam.menu.UploadSpeed.250000.upload.speed=250000
3546+
m5stack-timer-cam.menu.UploadSpeed.115200=115200
3547+
m5stack-timer-cam.menu.UploadSpeed.115200.upload.speed=115200
3548+
3549+
m5stack-timer-cam.menu.DebugLevel.none=None
3550+
m5stack-timer-cam.menu.DebugLevel.none.build.code_debug=0
3551+
m5stack-timer-cam.menu.DebugLevel.error=Error
3552+
m5stack-timer-cam.menu.DebugLevel.error.build.code_debug=1
3553+
m5stack-timer-cam.menu.DebugLevel.warn=Warn
3554+
m5stack-timer-cam.menu.DebugLevel.warn.build.code_debug=2
3555+
m5stack-timer-cam.menu.DebugLevel.info=Info
3556+
m5stack-timer-cam.menu.DebugLevel.info.build.code_debug=3
3557+
m5stack-timer-cam.menu.DebugLevel.debug=Debug
3558+
m5stack-timer-cam.menu.DebugLevel.debug.build.code_debug=4
3559+
m5stack-timer-cam.menu.DebugLevel.verbose=Verbose
3560+
m5stack-timer-cam.menu.DebugLevel.verbose.build.code_debug=5
3561+
3562+
##############################################################
3563+
3564+
m5stack-coreink.name=M5Stack-CoreInk
3565+
3566+
m5stack-coreink.upload.tool=esptool_py
3567+
m5stack-coreink.upload.maximum_size=1310720
3568+
m5stack-coreink.upload.maximum_data_size=327680
3569+
m5stack-coreink.upload.wait_for_upload_port=true
3570+
3571+
m5stack-coreink.serial.disableDTR=true
3572+
m5stack-coreink.serial.disableRTS=true
3573+
3574+
m5stack-coreink.build.mcu=esp32
3575+
m5stack-coreink.build.core=esp32
3576+
m5stack-coreink.build.variant=m5stack_coreink
3577+
m5stack-coreink.build.board=M5Stack_CoreInk
3578+
3579+
m5stack-coreink.build.f_cpu=240000000L
3580+
m5stack-coreink.build.flash_size=4MB
3581+
m5stack-coreink.build.flash_freq=80m
3582+
m5stack-coreink.build.flash_mode=dio
3583+
m5stack-coreink.build.boot=dio
3584+
m5stack-coreink.build.partitions=default
3585+
m5stack-coreink.build.defines=
3586+
3587+
m5stack-coreink.menu.PartitionScheme.default=Default
3588+
m5stack-coreink.menu.PartitionScheme.default.build.partitions=default
3589+
m5stack-coreink.menu.PartitionScheme.no_ota=No OTA (Large APP)
3590+
m5stack-coreink.menu.PartitionScheme.no_ota.build.partitions=no_ota
3591+
m5stack-coreink.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
3592+
m5stack-coreink.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
3593+
m5stack-coreink.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
3594+
m5stack-coreink.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
3595+
3596+
m5stack-coreink.menu.UploadSpeed.921600=921600
3597+
m5stack-coreink.menu.UploadSpeed.921600.upload.speed=921600
3598+
m5stack-coreink.menu.UploadSpeed.115200=115200
3599+
m5stack-coreink.menu.UploadSpeed.115200.upload.speed=115200
3600+
m5stack-coreink.menu.UploadSpeed.256000.windows=256000
3601+
m5stack-coreink.menu.UploadSpeed.256000.upload.speed=256000
3602+
m5stack-coreink.menu.UploadSpeed.230400.windows.upload.speed=256000
3603+
m5stack-coreink.menu.UploadSpeed.230400=230400
3604+
m5stack-coreink.menu.UploadSpeed.230400.upload.speed=230400
3605+
m5stack-coreink.menu.UploadSpeed.460800.linux=460800
3606+
m5stack-coreink.menu.UploadSpeed.460800.macosx=460800
3607+
m5stack-coreink.menu.UploadSpeed.460800.upload.speed=460800
3608+
m5stack-coreink.menu.UploadSpeed.512000.windows=512000
3609+
m5stack-coreink.menu.UploadSpeed.512000.upload.speed=512000
3610+
m5stack-coreink.menu.UploadSpeed.1500000=1500000
3611+
m5stack-coreink.menu.UploadSpeed.1500000.upload.speed=1500000
3612+
3613+
m5stack-coreink.menu.DebugLevel.none=None
3614+
m5stack-coreink.menu.DebugLevel.none.build.code_debug=0
3615+
m5stack-coreink.menu.DebugLevel.error=Error
3616+
m5stack-coreink.menu.DebugLevel.error.build.code_debug=1
3617+
m5stack-coreink.menu.DebugLevel.warn=Warn
3618+
m5stack-coreink.menu.DebugLevel.warn.build.code_debug=2
3619+
m5stack-coreink.menu.DebugLevel.info=Info
3620+
m5stack-coreink.menu.DebugLevel.info.build.code_debug=3
3621+
m5stack-coreink.menu.DebugLevel.debug=Debug
3622+
m5stack-coreink.menu.DebugLevel.debug.build.code_debug=4
3623+
m5stack-coreink.menu.DebugLevel.verbose=Verbose
3624+
m5stack-coreink.menu.DebugLevel.verbose.build.code_debug=5
3625+
3626+
##############################################################
3627+
34733628
odroid_esp32.name=ODROID ESP32
34743629

34753630
odroid_esp32.upload.tool=esptool_py

‎libraries/WiFi/src/WiFiServer.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ WiFiClient WiFiServer::available(){
6767
}
6868

6969
void WiFiServer::begin(uint16_t port){
70+
begin(port, 1);
71+
}
72+
73+
void WiFiServer::begin(uint16_t port, int enable){
7074
if(_listening)
7175
return;
7276
if(port){
@@ -76,6 +80,7 @@ void WiFiServer::begin(uint16_t port){
7680
sockfd = socket(AF_INET , SOCK_STREAM, 0);
7781
if (sockfd < 0)
7882
return;
83+
setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(int));
7984
server.sin_family = AF_INET;
8085
server.sin_addr.s_addr = INADDR_ANY;
8186
server.sin_port = htons(_port);

‎libraries/WiFi/src/WiFiServer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class WiFiServer : public Server {
4040
WiFiClient available();
4141
WiFiClient accept(){return available();}
4242
void begin(uint16_t port=0);
43+
void begin(uint16_t port, int reuse_enable);
4344
void setNoDelay(bool nodelay);
4445
bool getNoDelay();
4546
bool hasClient();

‎variants/m5stack_core2/pins_arduino.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
1212
#define digitalPinHasPWM(p) (p < 34)
1313

14+
#define TX2 14
15+
#define RX2 13
16+
1417
static const uint8_t TX = 1;
1518
static const uint8_t RX = 3;
1619

17-
static const uint8_t TXD2 = 14;
18-
static const uint8_t RXD2 = 13;
19-
2020
static const uint8_t SDA = 32;
2121
static const uint8_t SCL = 33;
2222

‎variants/m5stack_coreink/pins_arduino.h

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
#define TX2 14
15+
#define RX2 13
16+
17+
static const uint8_t TX = 1;
18+
static const uint8_t RX = 3;
19+
20+
static const uint8_t SDA = 32;
21+
static const uint8_t SCL = 33;
22+
23+
static const uint8_t SS = 9;
24+
static const uint8_t MOSI = 23;
25+
static const uint8_t MISO = 34;
26+
static const uint8_t SCK = 18;
27+
28+
static const uint8_t G26 = 26;
29+
static const uint8_t G36 = 36;
30+
static const uint8_t G25 = 25;
31+
32+
static const uint8_t G32 = 32;
33+
static const uint8_t G33 = 33;
34+
35+
static const uint8_t G21 = 21;
36+
static const uint8_t G22 = 22;
37+
38+
static const uint8_t G13 = 13;
39+
static const uint8_t G14 = 14;
40+
41+
static const uint8_t G12 = 12;
42+
static const uint8_t G19 = 19;
43+
44+
static const uint8_t G5 = 5;
45+
static const uint8_t G10 = 10;
46+
static const uint8_t G2 = 2;
47+
static const uint8_t G37 = 37;
48+
static const uint8_t G38 = 38;
49+
static const uint8_t G39 = 39;
50+
51+
static const uint8_t DAC1 = 25;
52+
static const uint8_t DAC2 = 26;
53+
54+
static const uint8_t ADC1 = 35;
55+
static const uint8_t ADC2 = 36;
56+
57+
#endif /* Pins_Arduino_h */

‎variants/m5stack_timer_cam/pins_arduino.h

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#ifndef Pins_Arduino_h
2+
#define Pins_Arduino_h
3+
4+
#include <stdint.h>
5+
6+
#define EXTERNAL_NUM_INTERRUPTS 16
7+
#define NUM_DIGITAL_PINS 40
8+
#define NUM_ANALOG_INPUTS 16
9+
10+
#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1)
11+
#define digitalPinToInterrupt(p) (((p)<40)?(p):-1)
12+
#define digitalPinHasPWM(p) (p < 34)
13+
14+
static const uint8_t TX = 1;
15+
static const uint8_t RX = 3;
16+
17+
static const uint8_t SDA = 4;
18+
static const uint8_t SCL = 13;
19+
20+
static const uint8_t G23 = 23;
21+
static const uint8_t G25 = 25;
22+
static const uint8_t G27 = 27;
23+
static const uint8_t G22 = 22;
24+
static const uint8_t G26 = 26;
25+
static const uint8_t G21 = 21;
26+
static const uint8_t G32 = 32;
27+
static const uint8_t G35 = 35;
28+
static const uint8_t G34 = 34;
29+
static const uint8_t G5 = 5;
30+
static const uint8_t G39 = 39;
31+
static const uint8_t G18 = 18;
32+
static const uint8_t G36 = 36;
33+
static const uint8_t G19 = 19;
34+
static const uint8_t G15 = 15;
35+
36+
static const uint8_t G2 = 2;
37+
static const uint8_t G33 = 33;
38+
39+
static const uint8_t G13 = 13;
40+
static const uint8_t G4 = 4;
41+
42+
static const uint8_t G0 = 0;
43+
44+
static const uint8_t DAC1 = 25;
45+
static const uint8_t DAC2 = 26;
46+
47+
static const uint8_t ADC1 = 35;
48+
static const uint8_t ADC2 = 36;
49+
50+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)