Fix: more than 5 channels can be used

Author: Dorsel89

src/experiment.cpp

@@ -1,5 +1,6 @@
 #include "phyphoxBleExperiment.h"
 
+int PhyphoxBleExperiment::numberOfChannels = 5;
 void PhyphoxBleExperiment::addView(View& v)
 {
 	for(int i=0; i<phyphoxBleNViews; i++)

src/exportSet.cpp

@@ -33,7 +33,7 @@ void PhyphoxBleExperiment::ExportSet::getBytes(char *buffArray)
 	strcat(buffArray,">\n");
 
 	//loop over elements
-	for(int i=0; i<phyphoxBleNElements; i++){
+	for(int i=0; i<phyphoxBleNExportSets; i++){
 		if(ELEMENTS[i]!=nullptr){
 			ELEMENTS[i]->getBytes(buffArray);
 		}

src/graph.cpp

@@ -52,8 +52,8 @@ void PhyphoxBleExperiment::Graph::setYPrecision(int py){
 
 void PhyphoxBleExperiment::Graph::setChannel(int x, int y)
 {
-	ERROR = (strcmp(ERROR.MESSAGE, "")==0) ? err_checkUpper(x, 5, "setChannel") : ERROR;
-	ERROR = (strcmp(ERROR.MESSAGE, "")==0) ? err_checkUpper(y, 5, "setChannel") : ERROR;
+	ERROR = (strcmp(ERROR.MESSAGE, "")==0) ? err_checkUpper(x, numberOfChannels, "setChannel") : ERROR;
+	ERROR = (strcmp(ERROR.MESSAGE, "")==0) ? err_checkUpper(y, numberOfChannels, "setChannel") : ERROR;
 	sprintf(INPUTX, "CH%i", x);
 	sprintf(INPUTY, "CH%i", y);
 }

src/phyphoxBLE_ESP32.cpp

@@ -3,7 +3,7 @@
 #include "Arduino.h"
 #include <stdio.h>
 #include "esp_system.h"
-
+//#define DEBUG
 //init statics
 uint8_t PhyphoxBLE::data_package[20] = {0};
 void (*PhyphoxBLE::configHandler)() = nullptr;
@@ -356,8 +356,8 @@ void PhyphoxBLE::addExperiment(PhyphoxBleExperiment& exp)
   #ifdef DEBUG
   if(printer != nullptr){
     for(int i =0; i<length;i++){
-      char test = EXPARRAY[i];
-      
+      char CHAR = EXPARRAY[i];
+      printer->print(CHAR);
     }
   }
   #endif

src/phyphoxBleExperiment.h

@@ -2,7 +2,7 @@
 #define PHYPHOX_BLE_EXPERIMENT
 
 #define phyphoxBleNViews 5
-#define phyphoxBleNElements 5
+#define phyphoxBleNElements 20
 #define phyphoxBleNExportSets 5
 
 #include <Arduino.h>
@@ -73,7 +73,7 @@ class PhyphoxBleExperiment {
 
 		char STYLE[17] = "";
 
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 
 		void setUnitX(const char *);
 		void setUnitY(const char *);
@@ -106,7 +106,7 @@ class PhyphoxBleExperiment {
 		void setXMLAttribute(const char *);
 
 		char LABEL[50] = " label=\"label\"";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 
 		Element *ELEMENTS[phyphoxBleNElements] = {nullptr};
 
@@ -122,7 +122,7 @@ class PhyphoxBleExperiment {
 		~ExportData() = default;
 
 		char BUFFER[5] = "CH1";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[1] = "";
 		void setDatachannel(int);
 		void setXMLAttribute(const char *);
 		void setLabel(const char *);
@@ -145,7 +145,7 @@ class PhyphoxBleExperiment {
 		void setXMLAttribute(const char *);
 
 		char LABEL[50] = "";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 		Element *ELEMENTS[phyphoxBleNExportSets] = {nullptr};
 
 	private:
@@ -166,7 +166,7 @@ class PhyphoxBleExperiment {
 
 		char INFO[200] = "";
 		char COLOR[17] = "";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 
 	private:
 	};
@@ -186,7 +186,7 @@ class PhyphoxBleExperiment {
 
 		char COLOR[17] = "";
 		char HEIGHT[20] = " height=\"0.1\"";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 
 	private:
 	};
@@ -210,7 +210,7 @@ class PhyphoxBleExperiment {
 		char UNIT[20] = "";
 		char COLOR[17] = "";
 		char INPUTVALUE[5] = "CH3";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 
 	private:
 	};
@@ -233,7 +233,7 @@ class PhyphoxBleExperiment {
 		char UNIT[20] = "";
 		char SIGNED[17] = "";
 		char DECIMAL[17] = "";
-		char XMLAttribute[100] = "";
+		char XMLAttribute[25] = "";
 		char BUFFER[5] = "CH5";
 
 	private:
@@ -259,7 +259,7 @@ class PhyphoxBleExperiment {
 	View *VIEWS[phyphoxBleNViews] = {nullptr};
 	ExportSet *EXPORTSETS[phyphoxBleNExportSets] = {nullptr};
 
-	int numberOfChannels = 5;
+	static int numberOfChannels;
 	int repeating = 0;
 
 

src/value.cpp

@@ -26,7 +26,7 @@ void PhyphoxBleExperiment::Value::setUnit(const char* u)
 
 void PhyphoxBleExperiment::Value::setChannel(int c)
 {
-	ERROR = (strcmp(ERROR.MESSAGE, "")==0) ? err_checkUpper(c, 5, "setChannel") : ERROR;
+	ERROR = (strcmp(ERROR.MESSAGE, "")==0) ? err_checkUpper(c, numberOfChannels, "setChannel") : ERROR;
 	sprintf(INPUTVALUE, "CH%i", c);
 }