Added MTU size to other Boards, Longer Names on Nano BLE

Author: Dorsel89

src/phyphoxBLE_ESP32.cpp

@@ -90,6 +90,7 @@ void PhyphoxBLE::configHandlerDebug(){
 
 void PhyphoxBLE::setMTU(uint16_t mtuSize) {
     BLEDevice::setMTU(mtuSize+3); //user mtu size + 3 for overhead
+    
     PhyphoxBLE::MTU = mtuSize;
     PhyphoxBleExperiment::MTU = mtuSize;
 
@@ -110,9 +111,11 @@ void PhyphoxBLE::start(uint8_t* exp_pointer, size_t len){
 void PhyphoxBLE::start(const char * DEVICE_NAME)
 {
   deviceName = DEVICE_NAME;
-  if(printer){
-    printer -> println("starting server");
-  }
+  #ifdef DEBUG
+    if(printer){
+      printer->println("starting server");
+    }
+  #endif
 	if(p_exp == nullptr){
           PhyphoxBleExperiment defaultExperiment;
 
@@ -350,31 +353,33 @@ void PhyphoxBLE::addExperiment(PhyphoxBleExperiment& exp)
   length += strlen(buffer);
 	p_exp = &EXPARRAY[0];
 	expLen = length;
-
-  if(printer){
+  #ifdef DEBUG
+  if(printer != nullptr){
     for(int i =0; i<length;i++){
       char test = EXPARRAY[i];
-      Serial.print(test);
+      
     }
   }
-
+  #endif
 }
 
 void PhyphoxBLE::disconnected(){
-  if(printer){
+  #ifdef DEBUG
+  if(printer != nullptr){
     printer -> println("device disconnected");
   }
+  #endif
   myAdvertising->start();
 }
 
 
 void PhyphoxBLE::begin(HardwareSerial* hwPrint)
 {
-  
-	 printer = hwPrint;
-   if(printer)
+  #ifdef DEBUG
+	printer = hwPrint;
+  if(printer)
 	   printer->begin(115200);       
-  
+  #endif  
 }
 
 #endif

src/phyphoxBLE_NINAB31.cpp

@@ -18,6 +18,8 @@ uint16_t PhyphoxBLE::maxConInterval = 48; //30ms
 uint16_t PhyphoxBLE::slaveLatency = 0;
 uint16_t PhyphoxBLE::timeout = 50;
 
+uint16_t PhyphoxBLE::MTU = 20;
+uint16_t PhyphoxBleExperiment::MTU = 20;
 
 int PhyphoxBLE::h_phyphoxExperimentService=0;
 int PhyphoxBLE::h_experimentCharacteristic=0;
@@ -39,6 +41,7 @@ uint8_t PhyphoxBLE::controlCharValue[21]={0};
 uint8_t PhyphoxBLE::configCharValue[21]={0};
 
 
+
 void(*PhyphoxBLE::configHandler)() = nullptr;
 
 void PhyphoxBLE::start(const char* DEVICE_NAME, uint8_t* exp_pointer, size_t len){
@@ -126,11 +129,28 @@ void PhyphoxBLE::read(float& f)
 
 void PhyphoxBLE::addExperiment(PhyphoxBleExperiment& exp)
 {
-  char buffer[4000] =""; //this should be reworked 
-  exp.getBytes(buffer);
-  memcpy(&EXPARRAY[0],&buffer[0],strlen(buffer));
-  p_exp = &EXPARRAY[0];
-  expLen = strlen(buffer);
+  char buffer[2500] ="";
+  uint16_t length = 0;
+
+	exp.getFirstBytes(buffer, deviceName);
+	memcpy(&EXPARRAY[length],&buffer[0],strlen(buffer));
+  length += strlen(buffer);
+  memset(&(buffer[0]), NULL, strlen(buffer));
+
+  for(uint8_t i=0;i<phyphoxBleNViews; i++){
+    for(int j=0; j<phyphoxBleNElements; j++){
+      exp.getViewBytes(buffer,i,j);
+	    memcpy(&EXPARRAY[length],&buffer[0],strlen(buffer));
+      length += strlen(buffer);
+      memset(&(buffer[0]), NULL, strlen(buffer));
+    }
+  }
+  exp.getLastBytes(buffer);
+  
+	memcpy(&EXPARRAY[length],&buffer[0],strlen(buffer));
+  length += strlen(buffer);
+	p_exp = &EXPARRAY[0];
+	expLen = length;
 }
 
 

src/phyphoxBLE_NINAB31.h

@@ -62,6 +62,7 @@ class PhyphoxBLE
         static uint16_t maxConInterval;
         static uint16_t slaveLatency;
         static uint16_t timeout;
+        static uint16_t MTU;
 
 };
 

src/phyphoxBLE_NRF52.cpp

@@ -8,6 +8,8 @@ const UUID PhyphoxBLE::phyphoxDataServiceUUID = UUID(phyphoxBleDataServiceUUID);
 const UUID PhyphoxBLE::dataCharacteristicUUID = UUID(phyphoxBleDataCharacteristicUUID);
 const UUID PhyphoxBLE::configCharacteristicUUID = UUID(phyphoxBleConfigCharacteristicUUID);
 
+uint16_t PhyphoxBleExperiment::MTU = 20;
+
 char PhyphoxBLE::name[50] = "";
 
 Thread PhyphoxBLE::bleEventThread;
@@ -193,8 +195,7 @@ void PhyphoxBLE::bleInitComplete(BLE::InitializationCompleteCallbackContext* par
 	ble::AdvertisingParameters adv_parameters(ble::advertising_type_t::CONNECTABLE_UNDIRECTED, ble::adv_interval_t(ble::millisecond_t(100)));
 	adv_data_builder.setFlags();
     adv_data_builder.setLocalServiceList(mbed::make_Span(&phyphoxExperimentServiceUUID, 1));
-    ble_error_t error = adv_data_builder.setName(name);
-
+    
   	#ifndef NDEBUG
     if(error == BLE_ERROR_BUFFER_OVERFLOW){
 		output("BLE_ERROR_BUFFER_OVERFLOW");
@@ -207,6 +208,9 @@ void PhyphoxBLE::bleInitComplete(BLE::InitializationCompleteCallbackContext* par
 
     ble.gap().setAdvertisingParameters(ble::LEGACY_ADVERTISING_HANDLE, adv_parameters);
     ble.gap().setAdvertisingPayload(ble::LEGACY_ADVERTISING_HANDLE,adv_data_builder.getAdvertisingData());
+	adv_data_builder.clear();
+    adv_data_builder.setName(name);
+    ble.gap().setAdvertisingScanResponse(ble::LEGACY_ADVERTISING_HANDLE,adv_data_builder.getAdvertisingData());
     ble.gattServer().addService(phyphoxService);
     ble.gattServer().addService(phyphoxDataService);
 

src/phyphoxBLE_NRF52.h

@@ -108,7 +108,7 @@ class PhyphoxBLE
 	static inline uint16_t maxConInterval = 24; //30ms
 	static inline uint16_t slaveLatency = 0;
 	static inline uint16_t timeout = 50;
-
+	static inline uint16_t MTU = 20;
 	static inline uint16_t currentConnections = 0;	
 
 	static void (*configHandler)();

src/phyphoxBLE_NanoIOT.cpp

@@ -17,6 +17,9 @@ uint16_t PhyphoxBLE::maxConInterval = 24; //30ms
 uint16_t PhyphoxBLE::slaveLatency = 0;
 uint16_t PhyphoxBLE::timeout = 50;
 
+uint16_t PhyphoxBLE::MTU = 20;
+uint16_t PhyphoxBleExperiment::MTU = 20;
+
 uint8_t* PhyphoxBLE::data = nullptr; //this pointer points to the data the user wants to write in the characteristic
 uint8_t* PhyphoxBLE::p_exp = nullptr; //this pointer will point to the byte array which holds an experiment
 

src/phyphoxBLE_NanoIOT.h

@@ -56,7 +56,7 @@ class PhyphoxBLE
         static uint16_t maxConInterval;
         static uint16_t slaveLatency;
         static uint16_t timeout;
-        
+        static uint16_t MTU;
 };