Merge branch 'dev' into 'master'

added .begin() method

See merge request !1

examples/sPSN_Broker/sPSN_Broker.ino

@@ -48,7 +48,8 @@ void setup() {
   sSerial.begin(SERIAL_BAUD);
 
   //Lege fest welche Serielle Schnittstelle für sPSN verwendet werden soll
-  psnBroker.setStream(sSerial);
+  //psnBroker.setStream(sSerial);
+  psnBroker.begin(sSerial);
 }
 
 void loop() {

examples/sPSN_Chat/sPSN_Chat.ino

@@ -67,10 +67,12 @@ void setup() {
   sSerial.begin(SERIAL_BAUD);
 
   //Lege fest welche Serielle Schnittstelle für sPSN verwendet werden soll
-  psnClient.setStream(sSerial);
+  //psnClient.setStream(sSerial);
 
   //Lege Callback-Funktion fest (wird ausgeführt wenn neue Daten ankommen)
-  psnClient.setCallback(myCallback);
+  //psnClient.setCallback(myCallback);
+
+  psnClient.begin(sSerial, myCallback);
 
   Serial.print("Bitte den eigenen Namen mit einem # eingeben\nund mit Enter bestaetigen. -> ");
   Serial.println("#DeinName");

examples/sPSN_Client1/sPSN_Client1.ino

@@ -85,10 +85,12 @@ void setup() {
   pinMode(ledPin, OUTPUT);
 
   //Lege fest welche Serielle Schnittstelle für sPSN verwendet werden soll
-  psnClient.setStream(sSerial);
+  //psnClient.setStream(sSerial);
 
   //Lege Callback-Funktion fest (wird ausgeführt wenn neue Daten ankommen)
-  psnClient.setCallback(myCallback);
+  //psnClient.setCallback(myCallback);
+
+  psnClient.begin(sSerial, myCallback);
 
   //Lege fest zu welchem Topic Daten empfangen werden sollen
   psnClient.subscribe(topicSub);

examples/sPSN_Client2/sPSN_Client2.ino

@@ -84,10 +84,12 @@ void setup() {
   pinMode(buttonPin, INPUT);
 
   //Lege fest welche Serielle Schnittstelle für sPSN verwendet werden soll
-  psnClient.setStream(sSerial);
+  //psnClient.setStream(sSerial);
 
   //Lege Callback-Funktion fest (wird ausgeführt wenn neue Daten ankommen)
-  psnClient.setCallback(myCallback);
+  //psnClient.setCallback(myCallback);
+
+  psnClient.begin(sSerial, myCallback);
 
   //Lege fest zu welchem Topic Daten empfangen werden sollen
   psnClient.subscribe(topicSub);

examples/sPSN_Server/sPSN_Server.ino

@@ -48,7 +48,8 @@ void setup() {
   sSerial.begin(SERIAL_BAUD);
 
   //Lege fest welche Serielle Schnittstelle für sPSN verwendet werden soll
-  psnBroker.setStream(sSerial);
+  //psnBroker.setStream(sSerial);
+  psnClient.begin(sSerial);
 }
 
 void loop() {

src/didacticNet.cpp

@@ -16,7 +16,16 @@ didacticPSNet::didacticPSNet(){}
 
 didacticPSNet::~didacticPSNet(){}
 
-didacticPSNet& didacticPSNet::setCallback(void(*callback)(char*, int, char*, int)){
+didacticPSNet::begin(Stream& _port){
+  setStream(_port);
+}
+
+didacticPSNet::begin(Stream& _port, PSNET_CALLBACK_SIGNATURE){
+  setStream(_port);
+  setCallback(callback);
+}
+
+didacticPSNet& didacticPSNet::setCallback(PSNET_CALLBACK_SIGNATURE){
     this->callback = callback;
     return *this;
 }
@@ -39,12 +48,16 @@ bool didacticPSNet::handleNetwork(){
   	}
   	else if(_dataToSend){
   		//send data to network
-  		if(!sendData()){
-  			return false;
-  		}
-      else{
-        _dataToSend = false;
-        _waitingTime = millis()+ random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
+      //TODO: test added CSMA_CHECKDELAY + 2nd checkData()
+      delayMicroseconds(CSMA_CHECK_DELAY_US);
+      if(!checkData()){
+      	if(!sendData()){
+    			return false;
+    		}
+        else{
+          _dataToSend = false;
+          _waitingTime = millis()+ random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
+        }
       }
   	}
   }

src/didacticNet.h

@@ -26,7 +26,7 @@
 
 #define MSG_TOPIC_MULTI     '*'
 
-#define CSMA_CHECK_DELAY_US 400 //unused?
+#define CSMA_CHECK_DELAY_US 400
 #define CSMA_MIN_DELAY_MS 10
 #define CSMA_MID_DELAY_MS 20
 #define CSMA_MAX_DELAY_MS 30
@@ -53,6 +53,9 @@ class didacticPSNet
 		int _currentTopicLength = 0;
 		int _currentDataLength  = 0;
 
+		didacticPSNet& setCallback(PSNET_CALLBACK_SIGNATURE);
+		void setStream(Stream& _port);
+
 		int checkData();
 		bool recieveData();
 		bool sendData();
@@ -68,8 +71,8 @@ class didacticPSNet
 		didacticPSNet();
 		~didacticPSNet();
 
-		didacticPSNet& setCallback(PSNET_CALLBACK_SIGNATURE);
-		void setStream(Stream& _port);
+		begin(Stream& _port);
+		begin(Stream& _port, PSNET_CALLBACK_SIGNATURE);
 		bool handleNetwork();
 		bool isDataToSend();