Fixes for #121

Author: nkolban

cpp_utils/ArduinoBLE.md

@@ -23,6 +23,14 @@ And here you will find the `ESP32_BLE.zip` that is build from the latest source.
 ## Installing a new version
 If you have previously installed a version of the Arduino BLE Support and need to install a new one, follow the steps above to build yourself a new instance of the `ESP32_BLE.zip` that is ready for installation.  I recommend removing the old one before installing the new one.  To remove the old one, find the directory where the Arduino IDE stores your libraries (on Linux this is commonly `$HOME/Arduino`).  In there you will find a directory called `libraries` and, if you have previously installed the BLE support, you will find a directory called `ESP32_BLE`.  Remove that directory.
 
+## Replacing the version that comes with Arduino-ESP32
+From October 2017 onwards, a build of the BLE libraries is supplied with the Arduino-ESP32 distribition which means that you should just be able to use the function without performing any additional steps.  The intent is to keep the BLE libraries in this project completely in synch with the Arduino-ESP32 distribution.  However, there may be times when a bug fix is needed which you may wish to try before an official distribution in Arduino-ESP32.  That should be extremely rare.  However, just in case it is needed, here is the recipe:
+
+1. Go to `<ArduinoIDE>/hardware/espressif/esp32/libraries`
+2. Delete the directory called `BLE`
+3. Go to your `<Arduino>/libraries` folder
+4. Extract the `ESP32_BLE.zip` file there
+
 ## Switching on debugging
 The BLE support contains extensive internal diagnostics which can be switched on by editing the file called `sdkconfig.h` and finding the lines which read:
 

cpp_utils/Arduino_ESP32_BLE.library.properties

@@ -1,5 +1,5 @@
 name=ESP32 BLE Arduino
-version=0.4.2
+version=0.4.3
 author=Neil Kolban <[email protected]>
 maintainer=Neil Kolban <[email protected]>
 sentence=BLE functions for ESP32

cpp_utils/BLEServer.cpp

@@ -201,7 +201,6 @@ void BLEServer::handleGATTServerEvent(
 		// - uint16_t app_id
 		case ESP_GATTS_REG_EVT: {
 			m_gatts_if = gatts_if;
-
 			m_semaphoreRegisterAppEvt.give(); // Unlock the mutex waiting for the registration of the app.
 			break;
 		} // ESP_GATTS_REG_EVT

cpp_utils/BLEService.cpp

@@ -56,9 +56,14 @@ BLEService::BLEService(BLEUUID uuid, uint32_t numHandles) {
  * @param [in] gatts_if The handle of the GATT server interface.
  * @return N/A.
  */
+
 void BLEService::executeCreate(BLEServer *pServer) {
 	//ESP_LOGD(LOG_TAG, ">> executeCreate() - Creating service (esp_ble_gatts_create_service) service uuid: %s", getUUID().toString().c_str());
-	getUUID(); // Needed for a weird bug fix
+	//getUUID(); // Needed for a weird bug fix
+	//char x[1000];
+	//memcpy(x, &m_uuid, sizeof(m_uuid));
+	//char x[10];
+	//memcpy(x, &deleteMe, 10);
 	m_pServer          = pServer;
 	m_semaphoreCreateEvt.take("executeCreate"); // Take the mutex and release at event ESP_GATTS_CREATE_EVT
 

cpp_utils/BLEService.h

@@ -78,10 +78,12 @@ class BLEService {
 	uint16_t             m_handle;
 	BLECharacteristic*   m_lastCreatedCharacteristic;
 	BLEServer*           m_pServer;
+	BLEUUID              m_uuid;
+	char                 deleteMe[10];
 	//FreeRTOS::Semaphore  m_serializeMutex;
 	FreeRTOS::Semaphore  m_semaphoreCreateEvt = FreeRTOS::Semaphore("CreateEvt");
-	FreeRTOS::Semaphore  m_semaphoreStartEvt = FreeRTOS::Semaphore("StartEvt");
-	BLEUUID              m_uuid;
+	FreeRTOS::Semaphore  m_semaphoreStartEvt  = FreeRTOS::Semaphore("StartEvt");
+
 	uint32_t             m_numHandles;
 
 	uint16_t           getHandle();

cpp_utils/FreeRTOS.cpp

@@ -4,8 +4,9 @@
  *  Created on: Feb 24, 2017
  *      Author: kolban
  */
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
+#include <freertos/FreeRTOS.h>   // Include the base FreeRTOS definitions
+#include <freertos/task.h>       // Include the task definitions
+#include <freertos/semphr.h>     // Include the semaphore definitions
 #include <string>
 #include <sstream>
 #include <iomanip>
@@ -102,6 +103,9 @@ FreeRTOS::Semaphore::~Semaphore() {
  */
 void FreeRTOS::Semaphore::give() {
 	xSemaphoreGive(m_semaphore);
+#ifdef ARDUINO_ARCH_ESP32
+	FreeRTOS::sleep(10);
+#endif
 	ESP_LOGV(LOG_TAG, "Semaphore giving: %s", toString().c_str());
 	m_owner = "<N/A>";
 } // Semaphore::give

cpp_utils/FreeRTOS.h

@@ -10,9 +10,9 @@
 #include <stdint.h>
 #include <string>
 
-#include <freertos/FreeRTOS.h>
-#include <freertos/task.h>
-#include <freertos/semphr.h>
+#include <freertos/FreeRTOS.h>   // Include the base FreeRTOS definitions
+#include <freertos/task.h>       // Include the task definitions
+#include <freertos/semphr.h>     // Include the semaphore definitions
 
 
 /**
@@ -40,9 +40,9 @@ class FreeRTOS {
 		std::string toString();
 	private:
 		SemaphoreHandle_t m_semaphore;
-		std::string m_name;
-		std::string m_owner;
-		uint32_t    m_value;
+		std::string       m_name;
+		std::string       m_owner;
+		uint32_t          m_value;
 	};
 };
 

cpp_utils/Makefile.arduino

@@ -51,6 +51,7 @@ BLE_FILES= \
 	GeneralUtils.h \
 	GeneralUtils.cpp 
 
+ARDUINO_LIBS=$(HOME)/Arduino/libraries
 
 build_ble:
 	rm -rf Arduino/ESP32_BLE
@@ -64,3 +65,8 @@ build_ble:
 	rm -rf Arduino/ESP32_BLE
 	@echo "---------------------------------------"
 	@echo "ESP32_BLE.zip Arduino library now built"
+
+install: build_ble
+	rm -rf ${ARDUINO_LIBS}/ESP32_BLE
+	unzip Arduino/ESP32_BLE.zip -d $(ARDUINO_LIBS)
+