Merge branch 'master' into esp32s2

me-no-dev · web-flow · commit 7e9d75a974a1 · 2020-06-01T01:55:35.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ tools/mkspiffs/mkspiffs.exe
 .vs/
 __vm/
 *.vcxproj*
+.vscode/
diff --git a/boards.txt b/boards.txt
@@ -455,7 +455,6 @@ pico32.menu.DebugLevel.verbose=Verbose
 pico32.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
-
 tinypico.name=TinyPICO
 
 tinypico.upload.tool=esptool_py
@@ -5021,6 +5020,68 @@ sensesiot_weizen.menu.UploadSpeed.460800.macosx=460800
 sensesiot_weizen.menu.UploadSpeed.460800.upload.speed=460800
 sensesiot_weizen.menu.UploadSpeed.512000.windows=512000
 sensesiot_weizen.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+kits-edu.name=KITS ESP32 EDU
+
+kits-edu.upload.tool=esptool_py
+kits-edu.upload.maximum_size=1310720
+kits-edu.upload.maximum_data_size=327680
+kits-edu.upload.wait_for_upload_port=true
+
+kits-edu.serial.disableDTR=true
+kits-edu.serial.disableRTS=true
+
+kits-edu.build.mcu=esp32
+kits-edu.build.core=esp32
+kits-edu.build.variant=pico32
+kits-edu.build.board=ESP32_PICO
+
+kits-edu.build.f_cpu=240000000L
+kits-edu.build.flash_size=4MB
+kits-edu.build.flash_freq=80m
+kits-edu.build.flash_mode=dio
+kits-edu.build.boot=dio
+kits-edu.build.partitions=default
+kits-edu.build.defines=
+
+kits-edu.menu.PartitionScheme.default=Default
+kits-edu.menu.PartitionScheme.default.build.partitions=default
+kits-edu.menu.PartitionScheme.no_ota=No OTA (Large APP)
+kits-edu.menu.PartitionScheme.no_ota.build.partitions=no_ota
+kits-edu.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+kits-edu.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+kits-edu.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+kits-edu.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+kits-edu.menu.UploadSpeed.921600=921600
+kits-edu.menu.UploadSpeed.921600.upload.speed=921600
+kits-edu.menu.UploadSpeed.115200=115200
+kits-edu.menu.UploadSpeed.115200.upload.speed=115200
+kits-edu.menu.UploadSpeed.256000.windows=256000
+kits-edu.menu.UploadSpeed.256000.upload.speed=256000
+kits-edu.menu.UploadSpeed.230400.windows.upload.speed=256000
+kits-edu.menu.UploadSpeed.230400=230400
+kits-edu.menu.UploadSpeed.230400.upload.speed=230400
+kits-edu.menu.UploadSpeed.460800.linux=460800
+kits-edu.menu.UploadSpeed.460800.macosx=460800
+kits-edu.menu.UploadSpeed.460800.upload.speed=460800
+kits-edu.menu.UploadSpeed.512000.windows=512000
+kits-edu.menu.UploadSpeed.512000.upload.speed=512000
+
+kits-edu.menu.DebugLevel.none=None
+kits-edu.menu.DebugLevel.none.build.code_debug=0
+kits-edu.menu.DebugLevel.error=Error
+kits-edu.menu.DebugLevel.error.build.code_debug=1
+kits-edu.menu.DebugLevel.warn=Warn
+kits-edu.menu.DebugLevel.warn.build.code_debug=2
+kits-edu.menu.DebugLevel.info=Info
+kits-edu.menu.DebugLevel.info.build.code_debug=3
+kits-edu.menu.DebugLevel.debug=Debug
+kits-edu.menu.DebugLevel.debug.build.code_debug=4
+kits-edu.menu.DebugLevel.verbose=Verbose
+kits-edu.menu.DebugLevel.verbose.build.code_debug=5
+
 ##############################################################
 mPython.name=mPython
 
diff --git a/libraries/BLE/src/BLEServer.cpp b/libraries/BLE/src/BLEServer.cpp
@@ -202,13 +202,19 @@ void BLEServer::handleGATTServerEvent(esp_gatts_cb_event_t event, esp_gatt_if_t
 		// If we receive a disconnect event then invoke the callback for disconnects (if one is present).
 		// we also want to start advertising again.
 		case ESP_GATTS_DISCONNECT_EVT: {
-			m_connectedCount--;                          // Decrement the number of connected devices count.
 			if (m_pServerCallbacks != nullptr) {         // If we have callbacks, call now.
 				m_pServerCallbacks->onDisconnect(this);
 			}
-			startAdvertising(); //- do this with some delay from the loop()
-			removePeerDevice(param->disconnect.conn_id, false);
-			break;
+            if(m_connId == ESP_GATT_IF_NONE) {
+                return;
+            }
+
+            // only decrement if connection is found in map and removed
+            // sometimes this event triggers w/o a valid connection
+			if(removePeerDevice(param->disconnect.conn_id, false)) {
+                m_connectedCount--;                          // Decrement the number of connected devices count.
+            }
+            break;
 		} // ESP_GATTS_DISCONNECT_EVT
 
 
@@ -395,8 +401,8 @@ void BLEServer::addPeerDevice(void* peer, bool _client, uint16_t conn_id) {
 	m_connectedServersMap.insert(std::pair<uint16_t, conn_status_t>(conn_id, status));	
 }
 
-void BLEServer::removePeerDevice(uint16_t conn_id, bool _client) {
-	m_connectedServersMap.erase(conn_id);
+bool BLEServer::removePeerDevice(uint16_t conn_id, bool _client) {
+	return m_connectedServersMap.erase(conn_id) > 0;
 }
 /* multi connect support */
 
diff --git a/libraries/BLE/src/BLEServer.h b/libraries/BLE/src/BLEServer.h
@@ -79,7 +79,7 @@ class BLEServer {
 	/* multi connection support */
 	std::map<uint16_t, conn_status_t> getPeerDevices(bool client);
 	void addPeerDevice(void* peer, bool is_client, uint16_t conn_id);
-	void removePeerDevice(uint16_t conn_id, bool client);
+	bool removePeerDevice(uint16_t conn_id, bool client);
 	BLEServer* getServerByConnId(uint16_t conn_id);
 	void updatePeerMTU(uint16_t connId, uint16_t mtu);
 	uint16_t getPeerMTU(uint16_t conn_id);
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino b/libraries/ESP32/examples/Camera/CameraWebServer/CameraWebServer.ino
@@ -13,7 +13,9 @@
 #define CAMERA_MODEL_WROVER_KIT // Has PSRAM
 //#define CAMERA_MODEL_ESP_EYE // Has PSRAM
 //#define CAMERA_MODEL_M5STACK_PSRAM // Has PSRAM
-//#define CAMERA_MODEL_M5STACK_WIDE	// 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_AI_THINKER // Has PSRAM
 //#define CAMERA_MODEL_TTGO_T_JOURNAL // No PSRAM
 
@@ -85,7 +87,7 @@ void setup() {
   // drop down frame size for higher initial frame rate
   s->set_framesize(s, FRAMESIZE_QVGA);
 
-#if defined(CAMERA_MODEL_M5STACK_WIDE)
+#if defined(CAMERA_MODEL_M5STACK_WIDE) || defined(CAMERA_MODEL_M5STACK_ESP32CAM)
   s->set_vflip(s, 1);
   s->set_hmirror(s, 1);
 #endif
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h b/libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h
@@ -56,6 +56,25 @@
 #define HREF_GPIO_NUM     26
 #define PCLK_GPIO_NUM     21
 
+#elif defined(CAMERA_MODEL_M5STACK_V2_PSRAM)
+#define PWDN_GPIO_NUM     -1
+#define RESET_GPIO_NUM    15
+#define XCLK_GPIO_NUM     27
+#define SIOD_GPIO_NUM     22
+#define SIOC_GPIO_NUM     23
+
+#define Y9_GPIO_NUM       19
+#define Y8_GPIO_NUM       36
+#define Y7_GPIO_NUM       18
+#define Y6_GPIO_NUM       39
+#define Y5_GPIO_NUM        5
+#define Y4_GPIO_NUM       34
+#define Y3_GPIO_NUM       35
+#define Y2_GPIO_NUM       32
+#define VSYNC_GPIO_NUM    25
+#define HREF_GPIO_NUM     26
+#define PCLK_GPIO_NUM     21
+
 #elif defined(CAMERA_MODEL_M5STACK_WIDE)
 #define PWDN_GPIO_NUM     -1
 #define RESET_GPIO_NUM    15
@@ -75,6 +94,25 @@
 #define HREF_GPIO_NUM     26
 #define PCLK_GPIO_NUM     21
 
+#elif defined(CAMERA_MODEL_M5STACK_ESP32CAM)
+#define PWDN_GPIO_NUM     -1
+#define RESET_GPIO_NUM    15
+#define XCLK_GPIO_NUM     27
+#define SIOD_GPIO_NUM     25
+#define SIOC_GPIO_NUM     23
+
+#define Y9_GPIO_NUM       19
+#define Y8_GPIO_NUM       36
+#define Y7_GPIO_NUM       18
+#define Y6_GPIO_NUM       39
+#define Y5_GPIO_NUM        5
+#define Y4_GPIO_NUM       34
+#define Y3_GPIO_NUM       35
+#define Y2_GPIO_NUM       17
+#define VSYNC_GPIO_NUM    22
+#define HREF_GPIO_NUM     26
+#define PCLK_GPIO_NUM     21
+
 #elif defined(CAMERA_MODEL_AI_THINKER)
 #define PWDN_GPIO_NUM     32
 #define RESET_GPIO_NUM    -1
diff --git a/libraries/SD_MMC/src/SD_MMC.cpp b/libraries/SD_MMC/src/SD_MMC.cpp
@@ -65,6 +65,7 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit)
 #endif
     if(mode1bit) {
         host.flags = SDMMC_HOST_FLAG_1BIT; //use 1-line SD mode
+	slot_config.width = 1;
     }
 
     esp_vfs_fat_sdmmc_mount_config_t mount_config = {

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit)`
`65`	`65`	`#endif`
`66`	`66`	`if(mode1bit) {`
`67`	`67`	`host.flags = SDMMC_HOST_FLAG_1BIT; //use 1-line SD mode`
	`68`	`+ slot_config.width = 1;`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`esp_vfs_fat_sdmmc_mount_config_t mount_config = {`