From ddf61a4f538100343cd6e4e0472828fc9da000e3 Mon Sep 17 00:00:00 2001
From: anschrammh <bugreport@laposte.net>
Date: Sat, 11 Jan 2020 20:06:19 +0100
Subject: [PATCH] Ajout de l'encodeur de trames LoRa

---
 lib/MeasureUnit/MeasureUnit.ino | 36 ++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/lib/MeasureUnit/MeasureUnit.ino b/lib/MeasureUnit/MeasureUnit.ino
index 0980758..eb1edb2 100644
--- a/lib/MeasureUnit/MeasureUnit.ino
+++ b/lib/MeasureUnit/MeasureUnit.ino
@@ -7,19 +7,24 @@
  */
 
 #include "MeasureUnit.h"
+#include "PayloadFormatter.h"
 #include "Ads1115.h"
 
 uint8_t analogInput[] = {0,1,2,3,4,5,6,7};
 double *tempArray = NULL;
 
+//Objet de calcule de la temperature
 ThermistorSetting thermistorSetting(3380, 10000);
 //AdcSetting adcSetting(3300.0, 12, 310, 3);
-AdcSetting adcSetting(3340.0, 15, 6, 10);
-
+AdcSetting adcSetting(3410.0, 15, 6, 10);
 Ads1115 adc;
-
 MeasureUnit measureUnit(analogInput, 8, 990, thermistorSetting, adc);
+//Objet de création des trames LoRa
+PayloadFormatter payloadFormatter(2,4);
+DateTime payloadDate(2020,12,26,8,42);
+
 boolean data(false);
+uint8_t *payload(NULL);
 
 void setup() {
   // put your setup code here, to run once:
@@ -53,21 +58,38 @@ void loop() {
     }
   }
 
+  //On affiche la trame associée:
+  payloadFormatter.startSession(1);
+  uint8_t size = payloadFormatter.buildPayload(&payload, &payloadDate,tempArray);
+  if(size != 0)
+  {
+    Serial.print("LoRa packet --> ");Serial.print("size : ");Serial.print(size);Serial.println(" bytes");
+    for(int i(0); i < size; i++)
+    {
+      payload[i] <= 0x0F ? Serial.print("0") : Serial.print(""); Serial.print(payload[i], HEX); Serial.print(" ");
+    }
+    Serial.println();
+  }
+  else
+    Serial.print("Failed to build LoRa packet");
+  if(payloadFormatter.endSession())
+    Serial.println("Session ended successfully");
+
   //On effectue la calibration
   if(compteur == 5)
   {
-    Serial.println("********************Start calibration********************");
+    Serial.println("********************Starting calibration********************");
     measureUnit.levelTemperaturesOff();
-    Serial.println("********************End calibration********************");
+    Serial.println("********************Ending calibration********************");
   }
 
   if(Serial.available())
   {
     if(Serial.read() == 'c')
     {
-      Serial.println("********************Start calibration********************");
+      Serial.println("********************Starting calibration********************");
       measureUnit.levelTemperaturesOff();
-      Serial.println("********************End calibration********************");
+      Serial.println("********************Ending calibration********************");
     }
   }