Skip to content

Commit 7e9d75a

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into esp32s2
2 parents 61c98b8 + b92c58d commit 7e9d75a

File tree

7 files changed

+119
-10
lines changed

7 files changed

+119
-10
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ tools/mkspiffs/mkspiffs.exe
1313
.vs/
1414
__vm/
1515
*.vcxproj*
16+
.vscode/

‎boards.txt‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,6 @@ pico32.menu.DebugLevel.verbose=Verbose
455455
pico32.menu.DebugLevel.verbose.build.code_debug=5
456456

457457
##############################################################
458-
459458
tinypico.name=TinyPICO
460459

461460
tinypico.upload.tool=esptool_py
@@ -5021,6 +5020,68 @@ sensesiot_weizen.menu.UploadSpeed.460800.macosx=460800
50215020
sensesiot_weizen.menu.UploadSpeed.460800.upload.speed=460800
50225021
sensesiot_weizen.menu.UploadSpeed.512000.windows=512000
50235022
sensesiot_weizen.menu.UploadSpeed.512000.upload.speed=512000
5023+
5024+
##############################################################
5025+
kits-edu.name=KITS ESP32 EDU
5026+
5027+
kits-edu.upload.tool=esptool_py
5028+
kits-edu.upload.maximum_size=1310720
5029+
kits-edu.upload.maximum_data_size=327680
5030+
kits-edu.upload.wait_for_upload_port=true
5031+
5032+
kits-edu.serial.disableDTR=true
5033+
kits-edu.serial.disableRTS=true
5034+
5035+
kits-edu.build.mcu=esp32
5036+
kits-edu.build.core=esp32
5037+
kits-edu.build.variant=pico32
5038+
kits-edu.build.board=ESP32_PICO
5039+
5040+
kits-edu.build.f_cpu=240000000L
5041+
kits-edu.build.flash_size=4MB
5042+
kits-edu.build.flash_freq=80m
5043+
kits-edu.build.flash_mode=dio
5044+
kits-edu.build.boot=dio
5045+
kits-edu.build.partitions=default
5046+
kits-edu.build.defines=
5047+
5048+
kits-edu.menu.PartitionScheme.default=Default
5049+
kits-edu.menu.PartitionScheme.default.build.partitions=default
5050+
kits-edu.menu.PartitionScheme.no_ota=No OTA (Large APP)
5051+
kits-edu.menu.PartitionScheme.no_ota.build.partitions=no_ota
5052+
kits-edu.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
5053+
kits-edu.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
5054+
kits-edu.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
5055+
kits-edu.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
5056+
5057+
kits-edu.menu.UploadSpeed.921600=921600
5058+
kits-edu.menu.UploadSpeed.921600.upload.speed=921600
5059+
kits-edu.menu.UploadSpeed.115200=115200
5060+
kits-edu.menu.UploadSpeed.115200.upload.speed=115200
5061+
kits-edu.menu.UploadSpeed.256000.windows=256000
5062+
kits-edu.menu.UploadSpeed.256000.upload.speed=256000
5063+
kits-edu.menu.UploadSpeed.230400.windows.upload.speed=256000
5064+
kits-edu.menu.UploadSpeed.230400=230400
5065+
kits-edu.menu.UploadSpeed.230400.upload.speed=230400
5066+
kits-edu.menu.UploadSpeed.460800.linux=460800
5067+
kits-edu.menu.UploadSpeed.460800.macosx=460800
5068+
kits-edu.menu.UploadSpeed.460800.upload.speed=460800
5069+
kits-edu.menu.UploadSpeed.512000.windows=512000
5070+
kits-edu.menu.UploadSpeed.512000.upload.speed=512000
5071+
5072+
kits-edu.menu.DebugLevel.none=None
5073+
kits-edu.menu.DebugLevel.none.build.code_debug=0
5074+
kits-edu.menu.DebugLevel.error=Error
5075+
kits-edu.menu.DebugLevel.error.build.code_debug=1
5076+
kits-edu.menu.DebugLevel.warn=Warn
5077+
kits-edu.menu.DebugLevel.warn.build.code_debug=2
5078+
kits-edu.menu.DebugLevel.info=Info
5079+
kits-edu.menu.DebugLevel.info.build.code_debug=3
5080+
kits-edu.menu.DebugLevel.debug=Debug
5081+
kits-edu.menu.DebugLevel.debug.build.code_debug=4
5082+
kits-edu.menu.DebugLevel.verbose=Verbose
5083+
kits-edu.menu.DebugLevel.verbose.build.code_debug=5
5084+
50245085
##############################################################
50255086
mPython.name=mPython
50265087

‎libraries/BLE/src/BLEServer.cpp‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,19 @@ void BLEServer::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
202202
// If we receive a disconnect event then invoke the callback for disconnects (if one is present).
203203
// we also want to start advertising again.
204204
case ESP_GATTS_DISCONNECT_EVT: {
205-
m_connectedCount--; // Decrement the number of connected devices count.
206205
if (m_pServerCallbacks != nullptr) { // If we have callbacks, call now.
207206
m_pServerCallbacks->onDisconnect(this);
208207
}
209-
startAdvertising(); //- do this with some delay from the loop()
210-
removePeerDevice(param->disconnect.conn_id, false);
211-
break;
208+
if(m_connId == ESP_GATT_IF_NONE) {
209+
return;
210+
}
211+
212+
// only decrement if connection is found in map and removed
213+
// sometimes this event triggers w/o a valid connection
214+
if(removePeerDevice(param->disconnect.conn_id, false)) {
215+
m_connectedCount--; // Decrement the number of connected devices count.
216+
}
217+
break;
212218
} // ESP_GATTS_DISCONNECT_EVT
213219

214220

@@ -395,8 +401,8 @@ void BLEServer::addPeerDevice(void* peer, bool _client, uint16_t conn_id) {
395401
m_connectedServersMap.insert(std::pair<uint16_t, conn_status_t>(conn_id, status));
396402
}
397403

398-
void BLEServer::removePeerDevice(uint16_t conn_id, bool _client) {
399-
m_connectedServersMap.erase(conn_id);
404+
bool BLEServer::removePeerDevice(uint16_t conn_id, bool _client) {
405+
return m_connectedServersMap.erase(conn_id) > 0;
400406
}
401407
/* multi connect support */
402408

‎libraries/BLE/src/BLEServer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class BLEServer {
7979
/* multi connection support */
8080
std::map<uint16_t, conn_status_t> getPeerDevices(bool client);
8181
void addPeerDevice(void* peer, bool is_client, uint16_t conn_id);
82-
void removePeerDevice(uint16_t conn_id, bool client);
82+
bool removePeerDevice(uint16_t conn_id, bool client);
8383
BLEServer* getServerByConnId(uint16_t conn_id);
8484
void updatePeerMTU(uint16_t connId, uint16_t mtu);
8585
uint16_t getPeerMTU(uint16_t conn_id);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
#define CAMERA_MODEL_WROVER_KIT // Has PSRAM
1414
//#define CAMERA_MODEL_ESP_EYE // Has PSRAM
1515
//#define CAMERA_MODEL_M5STACK_PSRAM // Has PSRAM
16-
//#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
16+
//#define CAMERA_MODEL_M5STACK_V2_PSRAM // M5Camera version B Has PSRAM
17+
//#define CAMERA_MODEL_M5STACK_WIDE // Has PSRAM
18+
//#define CAMERA_MODEL_M5STACK_ESP32CAM // No PSRAM
1719
//#define CAMERA_MODEL_AI_THINKER // Has PSRAM
1820
//#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
1921

@@ -85,7 +87,7 @@ void setup() {
8587
// drop down frame size for higher initial frame rate
8688
s->set_framesize(s, FRAMESIZE_QVGA);
8789

88-
#if defined(CAMERA_MODEL_M5STACK_WIDE)
90+
#if defined(CAMERA_MODEL_M5STACK_WIDE) || defined(CAMERA_MODEL_M5STACK_ESP32CAM)
8991
s->set_vflip(s, 1);
9092
s->set_hmirror(s, 1);
9193
#endif

‎libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,25 @@
5656
#define HREF_GPIO_NUM 26
5757
#define PCLK_GPIO_NUM 21
5858

59+
#elif defined(CAMERA_MODEL_M5STACK_V2_PSRAM)
60+
#define PWDN_GPIO_NUM -1
61+
#define RESET_GPIO_NUM 15
62+
#define XCLK_GPIO_NUM 27
63+
#define SIOD_GPIO_NUM 22
64+
#define SIOC_GPIO_NUM 23
65+
66+
#define Y9_GPIO_NUM 19
67+
#define Y8_GPIO_NUM 36
68+
#define Y7_GPIO_NUM 18
69+
#define Y6_GPIO_NUM 39
70+
#define Y5_GPIO_NUM 5
71+
#define Y4_GPIO_NUM 34
72+
#define Y3_GPIO_NUM 35
73+
#define Y2_GPIO_NUM 32
74+
#define VSYNC_GPIO_NUM 25
75+
#define HREF_GPIO_NUM 26
76+
#define PCLK_GPIO_NUM 21
77+
5978
#elif defined(CAMERA_MODEL_M5STACK_WIDE)
6079
#define PWDN_GPIO_NUM -1
6180
#define RESET_GPIO_NUM 15
@@ -75,6 +94,25 @@
7594
#define HREF_GPIO_NUM 26
7695
#define PCLK_GPIO_NUM 21
7796

97+
#elif defined(CAMERA_MODEL_M5STACK_ESP32CAM)
98+
#define PWDN_GPIO_NUM -1
99+
#define RESET_GPIO_NUM 15
100+
#define XCLK_GPIO_NUM 27
101+
#define SIOD_GPIO_NUM 25
102+
#define SIOC_GPIO_NUM 23
103+
104+
#define Y9_GPIO_NUM 19
105+
#define Y8_GPIO_NUM 36
106+
#define Y7_GPIO_NUM 18
107+
#define Y6_GPIO_NUM 39
108+
#define Y5_GPIO_NUM 5
109+
#define Y4_GPIO_NUM 34
110+
#define Y3_GPIO_NUM 35
111+
#define Y2_GPIO_NUM 17
112+
#define VSYNC_GPIO_NUM 22
113+
#define HREF_GPIO_NUM 26
114+
#define PCLK_GPIO_NUM 21
115+
78116
#elif defined(CAMERA_MODEL_AI_THINKER)
79117
#define PWDN_GPIO_NUM 32
80118
#define RESET_GPIO_NUM -1

‎libraries/SD_MMC/src/SD_MMC.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit)
6565
#endif
6666
if(mode1bit) {
6767
host.flags = SDMMC_HOST_FLAG_1BIT; //use 1-line SD mode
68+
slot_config.width = 1;
6869
}
6970

7071
esp_vfs_fat_sdmmc_mount_config_t mount_config = {

0 commit comments

Comments
 (0)