From a77282a62abe102e396cf7c3fdf895f188ae8bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anian=20B=C3=BChler?=
 <anian.buehler@reutlingen-university.de>
Date: Mon, 7 Feb 2022 14:35:25 +0100
Subject: [PATCH] updates on examples

---
 examples/sPSN_Broker/sPSN_Broker.ino             |  3 ---
 .../sPSN_ClientMinimal/sPSN_ClientMinimal.ino    |  2 +-
 examples/sPSN_PingTest/sPSN_PingTest.ino         | 14 ++------------
 examples/sPSN_PongTester/sPSN_PongTester.ino     | 16 ++++------------
 4 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/examples/sPSN_Broker/sPSN_Broker.ino b/examples/sPSN_Broker/sPSN_Broker.ino
index e2d142d..b9034ba 100644
--- a/examples/sPSN_Broker/sPSN_Broker.ino
+++ b/examples/sPSN_Broker/sPSN_Broker.ino
@@ -41,9 +41,6 @@ SoftwareSerial sSerial(10, 11);
 DidacticPSNetBroker psnBroker;
 
 void setup() {
-  //Starte Serielle Schnittstelle (zum PC)
-  Serial.begin(SERIAL_BAUD);
-
   //Starte SoftwareSerielle Schnittstelle (zu IR-Link-Modulen)
   sSerial.begin(SERIAL_BAUD);
 
diff --git a/examples/sPSN_ClientMinimal/sPSN_ClientMinimal.ino b/examples/sPSN_ClientMinimal/sPSN_ClientMinimal.ino
index 1805cb5..9dbedea 100644
--- a/examples/sPSN_ClientMinimal/sPSN_ClientMinimal.ino
+++ b/examples/sPSN_ClientMinimal/sPSN_ClientMinimal.ino
@@ -20,13 +20,13 @@
  *date:  06.07.2021
  */
 #include <Arduino.h>
+
 #include "SoftwareSerial.h"
 #include "didacticNet.h"
 
 SoftwareSerial sSerial(10, 11); //Erzeuge SoftwareSerial-Instanz mit Rx = Pin10 -> Empfänger | Tx = Pin11 -> Sender
 
 DidacticPSNetClient psnClient;  //Erzeuge PubSub-Client-Instanz
-UnblockingTimer uTimer;
 
 //Callback-Funktion - wird beim Empfang neuer Daten aufgerufen
 void clientCallback(char* mTopic, int mToLength, char* mPayload, int mPayloadLength) {
diff --git a/examples/sPSN_PingTest/sPSN_PingTest.ino b/examples/sPSN_PingTest/sPSN_PingTest.ino
index 03f7594..121d475 100644
--- a/examples/sPSN_PingTest/sPSN_PingTest.ino
+++ b/examples/sPSN_PingTest/sPSN_PingTest.ino
@@ -1,13 +1,3 @@
-/**
-  file:  sPSN_HWTest
-  author:  letsgoING -> info@letsgoing.de
-
-  description:
-   Test-Software um Clients im Netzwerk "anzumelden"
-
-  date:  01.12.2021
-*/
-
 /**
  *file:  sPSN_PingTest
  *author:  letsgoING -> info@letsgoing.de
@@ -97,7 +87,7 @@ void setup() {
   psnClient.subscribe(topicSub);
   while (!psnClient.handleNetwork());
 
-  psnClient.setInterval(10000L);
+  psnClient.setInterval(5000L);
 }
 
 void loop() {
@@ -111,4 +101,4 @@ void loop() {
     digitalWrite(LED_PIN, !ledState);
     digitalWrite(LED2_PIN, ledState);
   }
-}
+}
\ No newline at end of file
diff --git a/examples/sPSN_PongTester/sPSN_PongTester.ino b/examples/sPSN_PongTester/sPSN_PongTester.ino
index bddbb0f..fec1479 100644
--- a/examples/sPSN_PongTester/sPSN_PongTester.ino
+++ b/examples/sPSN_PongTester/sPSN_PongTester.ino
@@ -48,14 +48,13 @@ void myCallback(char* mTopic, int mToLength, char* mData, int mDaLength) {
   Serial.println(mTopic);
   //reply pong
   strcpy(topicPub, mTopic);
-  if (!strcmp(mData, "Ping")) {
+  if (!strcmp(mData, "Ping")) { //Empfangene Nachricht == Ping
     Serial.print(" ");
-    Serial.println(mTopic);
+    Serial.print(mTopic);
     psnClient.publish(topicPub, payloadSend);
   }
 }
 
-
 void setup() {
   //Starte Serielle Schnittstelle (zum PC)
   Serial.begin(SERIAL_BAUD);
@@ -73,15 +72,8 @@ void setup() {
 
   psnClient.begin(sSerial, myCallback);
 
-  //psnClient.subscribe("*");
-  Serial.println("Topics: ");
-  for (int clientNr = 0; clientNr < MAX_NR_CLIENTS; ++clientNr) {
-    sprintf(topicSub, "%02d", clientNr);
-    psnClient.subscribe(topicSub);
-    while (!psnClient.handleNetwork());
-    Serial.print(topicSub);
-    Serial.print(" ");
-  }
+  //subscribe auf alle möglichen Topics
+  psnClient.subscribe("*");
 
   Serial.println("\n\nReady for Clients...");
 
-- 
GitLab