[chronojump/FS-LCD-Menu: 1/4] Wifi. Added version in ping response

[Xavier Padullés <xpadulles src gnome org>]

commit e7e8eb6d4f91f925a24c76207416304592bc2791
Author: Xavier Padullés <x padulles gmail com>
Date:   Fri Nov 12 17:51:46 2021 +0100

    Wifi. Added version in ping response

 arduino/WiFi/control/control.ino   |  20 ++++--
 arduino/WiFi/terminal/terminal.ino | 124 +++++++++++++++++++++----------------
 2 files changed, 85 insertions(+), 59 deletions(-)
---
diff --git a/arduino/WiFi/control/control.ino b/arduino/WiFi/control/control.ino
index f025e99bb..b9cf0dd99 100644
--- a/arduino/WiFi/control/control.ino
+++ b/arduino/WiFi/control/control.ino
@@ -57,10 +57,10 @@ struct sample_t
 {
   bool state;           //State of the sensor
   short int termNum;    //Terminal number. Configured with the switches.
-  unsigned long int time;
+  unsigned long int data;
 };
 
-struct sample_t sample = {.state = LOW, .termNum = 0, .time = 0};
+struct sample_t sample = {.state = LOW, .termNum = 0, .data = 0};
 int sample_size = sizeof(sample);       //sample_size es la longitud de variables a recibir .
 
 // First channel to be used. The 6xswitches control the terminal number and the number to add the 
terminal0Channel
@@ -79,6 +79,8 @@ unsigned long startTime;      //local time when the reset_time function is execu
 unsigned long lastSampleTime; //local time at which some sample has been received without overflow correction
 unsigned long totalTime;      //Total elapsed time since startTime
 
+bool waitingVersion = false;
+
 void setup(void)
 {
 
@@ -199,6 +201,7 @@ void serialEvent()
     //      Serial.print(instruction.termNum);
     //      Serial.println("\"");
     sendInstruction(&instruction);
+    if(instruction.command == ping) waitingVersion = true;
   }
   if (instruction.command & sensorOnce) {
     blinkStart(blinkPeriod);
@@ -282,8 +285,8 @@ void blinkOnce(void)
 //This fucnction manages the time elapsed from the start of the
 unsigned long getLocalTime(void)
 {
-  //not to be confused with sample.time . This is the local time at which the sample has been received.
-  //sample.time is the elapsed time since the terminal received the activating sensor command untill actual 
activation.
+  //not to be confused with sample.data . This is the local time at which the sample has been received.
+  //sample.data is the elapsed time since the terminal received the activating sensor command untill actual 
activation.
   unsigned long localSampleTime = millis();
   if (localSampleTime > startTime)           //No overflow
   {
@@ -312,6 +315,7 @@ void discoverTerminals(void) {
       radio.flush_tx();
       radio.flush_rx();
       instruction.termNum = i;
+      waitingVersion = true;
       sendInstruction(&instruction);
 
       delay(5);
@@ -339,7 +343,13 @@ bool readSample(void) {
       Serial.print(";");
       Serial.print(totalTime);
       Serial.print(";");
-      Serial.println(sample.state);
+      Serial.print(sample.state);
+      if(waitingVersion) {
+        Serial.print(";");
+        Serial.print(sample.data);
+        waitingVersion = false;
+      }
+      Serial.println();
       readed = true;
     } else {
       Serial.write((byte*)&sample, sample_size);
diff --git a/arduino/WiFi/terminal/terminal.ino b/arduino/WiFi/terminal/terminal.ino
index aa3fd4ec3..2b53cd507 100644
--- a/arduino/WiFi/terminal/terminal.ino
+++ b/arduino/WiFi/terminal/terminal.ino
@@ -6,7 +6,8 @@
 #include <MsTimer2.h>
 #include <TimerOne.h>
 
-String version = "Wifi-Sensor-1.11";
+unsigned int deviceType = 1; //Photocel and LightChro sensor
+unsigned int deviceVersion = 12;
 //
 // Hardware configuration
 
@@ -49,7 +50,7 @@ const uint16_t sensorUnlimited = 0b100000000; //256
 const uint16_t red =              0b10000000; //128
 const uint16_t green =            0b01000000; //64
 const uint16_t blue =             0b00100000; //32
-const uint16_t buzzer =           0b00010000; // 16
+const uint16_t buzzer =           0b00010000; //16
 const uint16_t blinkRed =         0b00001000; //8
 const uint16_t blinkGreen =       0b00000100; //4
 const uint16_t blinkBlue =        0b00000010; //2
@@ -63,10 +64,10 @@ struct sample_t
 {
   bool state;           //State of the sensor
   short int termNum;    //Terminal number. Configured with the switches.
-  unsigned long int elapsedTime;
+  unsigned long int data;
 };
 
-struct sample_t sample = {.state = LOW, .termNum = 0, .elapsedTime = 0};
+struct sample_t sample = {.state = LOW, .termNum = 0, .data = 0};
 
 int sample_size = sizeof(sample);
 
@@ -109,14 +110,13 @@ void setup(void)
   Serial.begin(115200);
   printf_begin(); //Used by radio.printDetails()
 
-  Serial.println(version);
-
-
+  Serial.print("Wifi-Sensor-");
+  Serial.println(deviceVersion);
 
   radio.begin();
 
   //Reading each pin to stablish the terminal number and the listening channel
-  
+
   //¡¡¡¡Atention!!!!, the first version of lightChro the pin7 is associated to the buzzer.
   //The first versions of the Quick the microswitch was 5xSwitches. The last one associated to the buzzer
   //In the first versions of the photocells the microswitch was 8xSwitches
@@ -130,7 +130,7 @@ void setup(void)
   pinMode(8, INPUT_PULLUP);   //Most significant bit.
 
   for (int pin = 6; pin >= 3; pin--)  //Old versions
-  //for (int pin = 8; pin >= 3; pin--)    //New versions
+    //for (int pin = 8; pin >= 3; pin--)    //New versions
   {
     sample.termNum = sample.termNum * 2; //Each bit will be multiplied by 2 as much times as his significance
     if (!digitalRead(pin)) sample.termNum++;
@@ -165,7 +165,7 @@ void setup(void)
   // A0, A1, A2 connected to the 3xswith
 
   pinMode(A0, INPUT_PULLUP);  //Old versions
-//  pinMode(A7, INPUT_PULLUP);    //New version
+  //  pinMode(A7, INPUT_PULLUP);    //New version
   pinMode(A1, INPUT_PULLUP);
   pinMode(A2, INPUT_PULLUP);
 
@@ -234,7 +234,7 @@ void loop(void)
 //    Serial.println(instruction.command);
 //    radio.flush_rx();
 //    radio.startListening();
-    
+
     if (instruction.termNum == sample.termNum)
     {
       executeCommand(instruction.command);
@@ -242,49 +242,49 @@ void loop(void)
   }
 }
 
-void sendSample(void){
+void sendSample(void) {
   //    lastPinState = sample.state;
-    sample.elapsedTime = (millis() - time0);
-    flagint = LOW;
-    buzzer_off;
-    red_off;
-    green_off;
-    blue_off;
-    MsTimer2::stop();
-    blinkingRed = false;
-    blinkingGreen = false;
-    blinkingBlue = false;
-//    Serial.println(sample.state);
-    radio.stopListening();
-    radio.setChannel(control0Channel - controlSwitch);
-//    Serial.print("getChannel = ");
-    //    Serial.println(radio.getChannel());
-    bool en = radio.write( &sample, sample_size);
-//    if (en) {
-//      Serial.println("Sent OK");
-//    } else {
-//      Serial.println("Error sending");
-//    }
-//    Serial.print("getChannel = ");
-//    Serial.println(radio.getChannel());
-    beep(25);
-    flagint = LOW;
-    if (! unlimitedMode) waitingSensor = false;
-    radio.setChannel(terminal0Channel - sample.termNum);
-    radio.startListening();
-    
-//    Serial.println("startListening()");
-//    Serial.print("getChannel = ");
-//    Serial.println(radio.getChannel());
-//    Serial.println(sample.elapsedTime);
+  sample.data = (millis() - time0);
+  flagint = LOW;
+  buzzer_off;
+  red_off;
+  green_off;
+  blue_off;
+  MsTimer2::stop();
+  blinkingRed = false;
+  blinkingGreen = false;
+  blinkingBlue = false;
+  //    Serial.println(sample.state);
+  radio.stopListening();
+  radio.setChannel(control0Channel - controlSwitch);
+  //    Serial.print("getChannel = ");
+  //    Serial.println(radio.getChannel());
+  bool en = radio.write( &sample, sample_size);
+  //    if (en) {
+  //      Serial.println("Sent OK");
+  //    } else {
+  //      Serial.println("Error sending");
+  //    }
+  //    Serial.print("getChannel = ");
+  //    Serial.println(radio.getChannel());
+  beep(25);
+  flagint = LOW;
+  if (! unlimitedMode) waitingSensor = false;
+  radio.setChannel(terminal0Channel - sample.termNum);
+  radio.startListening();
+
+  //    Serial.println("startListening()");
+  //    Serial.print("getChannel = ");
+  //    Serial.println(radio.getChannel());
+  //    Serial.println(sample.data);
 }
 
 void controlint()
 {
-  //sample.state = digitalRead(2);
-  //Serial.println("Int");
+//  sample.state = digitalRead(2);
+//  Serial.println("Int");
   if (waitingSensor == true) {
-    //flagint = HIGH;
+//  flagint = HIGH;
 //    Timer1.initialize(1000000); //Initializing the debounce timer to 1s
     Timer1.attachInterrupt(debounce);
 //    Serial.print(lastPinState);
@@ -383,12 +383,10 @@ void executeCommand(uint16_t command)
     }
 
     if ((command & ping) == ping) {
-//      Serial.println("Pong");
-      time0 = millis(); //empieza a contar time
       sample.state = digitalRead(2);
-      radio.setRetries(15,15);
-      sendSample();
-      radio.setRetries(5,15);
+      radio.setRetries(15, 15);
+      sendPong();
+      radio.setRetries(5, 15);
     }
   }
 }
@@ -432,7 +430,8 @@ void serialEvent()
   if ( commandString == "get_channel") {
     Serial.println(radio.getChannel());
   } else if (commandString == "get_version") {
-    Serial.println(version);
+    Serial.print("Wifi-Sensor-");
+    Serial.println(deviceVersion);
   }
 }
 
@@ -448,3 +447,20 @@ void beepStop(void)
   MsTimer2::stop();
   buzzer_off;
 }
+
+void sendPong(void) {
+  Serial.println("Pong");
+  sample.data = deviceType * 1000000 + deviceVersion;
+//  Serial.println(sample.data);
+  Serial.print("Wifi-Sensor-");
+  Serial.println(deviceVersion);
+  flagint = LOW;
+  MsTimer2::stop();
+  radio.stopListening();
+  radio.setChannel(control0Channel - controlSwitch);
+  bool en = radio.write( &sample, sample_size);
+  flagint = LOW;
+  if (! unlimitedMode) waitingSensor = false;
+  radio.setChannel(terminal0Channel - sample.termNum);
+  radio.startListening();
+}