From 6bba404aebff4cadd4e41c89dbf345c83d2c8ab2 Mon Sep 17 00:00:00 2001
From: omahieux <olivier.mahieux@polytech-lille.net>
Date: Thu, 11 May 2017 19:39:18 +0200
Subject: [PATCH] Mise à jour de LORA_terrestre

---
 LORA_terrestre.ino | 84 +++++++++++++++++++++++++-----------------------------------------------------------
 1 file changed, 25 insertions(+), 59 deletions(-)

diff --git a/LORA_terrestre.ino b/LORA_terrestre.ino
index 0e2d512..329b9ed 100644
--- a/LORA_terrestre.ino
+++ b/LORA_terrestre.ino
@@ -1,57 +1,40 @@
-// Feather9x_RX
-// -*- mode: C++ -*-
-// Example sketch showing how to create a simple messaging client (receiver)
-// with the RH_RF95 class. RH_RF95 class does not provide for addressing or
-// reliability, so you should only use RH_RF95 if you do not need the higher
-// level messaging abilities.
-// It is designed to work with the other example Feather9x_TX
+/*Programme implanté dans le module FEATHER Adafruit restant au sol*/
 #include <SPI.h>
 #include <RH_RF95.h>
 
- //for feather m0  
+ //constantes pour ce module feather   
 #define RFM95_CS 8
 #define RFM95_RST 4
 #define RFM95_INT 3
 
 //taille des paquets Lora envoyés à chaque émission
-#define TAILLE_RADIOPACKET 20
+#define TAILLE_RADIOPACKET 100
 
-// Change to 434.0 or other frequency, must match RX's freq!
+// Définition de la fréquence
 #define RF95_FREQ 434.0
-// Singleton instance of the radio driver
+// Configuration 
 RH_RF95 rf95(RFM95_CS, RFM95_INT);
-// Blinky on receipt
+
 #define LED 13
 
 
 
-//Fonction vidage de buffer série
+//Fonction vidage du buffer série
 void serialFlush(){
-  pinMode(LED, OUTPUT);
+  //pinMode(LED, OUTPUT);
   while(Serial.available() > 0) {
     char t = Serial.read();
   }
 }
 
-void RAZradiopacket(uint8_t radiopacket[TAILLE_RADIOPACKET]){
-  int j;
-  for(j=0;j<TAILLE_RADIOPACKET;j++){
-  radiopacket[j] = '0';
-  }
-}
-
-
-
 void setup()
 {
 pinMode(LED, OUTPUT);
 pinMode(RFM95_RST, OUTPUT);
 digitalWrite(RFM95_RST, HIGH);
 while (!Serial);
-Serial.begin(9600);
+Serial.begin(9600); //liaison série 
 delay(100);
-//Serial.println("Feather LoRa RX Test!");
-// manual reset
 digitalWrite(RFM95_RST, LOW);
 delay(10);
 digitalWrite(RFM95_RST, HIGH);
@@ -60,8 +43,8 @@ while (!rf95.init()) {
 Serial.println("LoRa radio init failed");
 while (1);
 }
-Serial.println("Projet IMA Ballon atmospherique ");
-// Defaults after init are 434.0MHz, modulation GFSK_Rb250Fd250, +13dbM
+Serial.println("Projet IMA Ballon atmospherique - 2017 ");
+// Defaults after init are 434.0MHz, modulation GFSK_Rb250Fd250
 if (!rf95.setFrequency(RF95_FREQ)) {
 Serial.println("setFrequency failed");
 while (1);
@@ -69,17 +52,13 @@ serialFlush();
 
 }
 Serial.print("Set Freq to: "); Serial.println(RF95_FREQ);
-// Defaults after init are 434.0MHz, 13dBm, Bw = 125 kHz, Cr = 4/5, Sf = 128chips/symbol, CRC on
-// The default transmitter power is 13dBm, using PA_BOOST.
-// If you are using RFM95/96/97/98 modules which uses the PA_BOOST transmitter pin, then
-// you can set transmitter powers from 5 to 23 dBm:
-rf95.setTxPower(23, false);
-//RAZradiopacket(radiopacket_tmp);
-//RAZradiopacket(radiopacket);
-}
 
+rf95.setTxPower(23, false); //Puissance d'émission à 23 dBm
+
+}
 
-int nb_envoi;
+//variables servant à ne pas envoyer deux fois la même chaîne
+int nb_envoi; 
 uint8_t radiopacket[TAILLE_RADIOPACKET] ="null"; //Chaîne contenant la requête à envoyer à la nacelle 
 uint8_t radiopacket_tmp[TAILLE_RADIOPACKET]="null";
 
@@ -107,7 +86,6 @@ void loop()
 
     //si la donnée reçu est différente de la précédente
     if(memcmp(radiopacket,radiopacket_tmp,TAILLE_RADIOPACKET)!=0){
-      Serial.print("\nRequete differente\n");
       nb_envoi = 0;
     }
 
@@ -117,41 +95,29 @@ void loop()
     rf95.send((uint8_t *)radiopacket, sizeof(radiopacket));
     Serial.print("Envoi commande\n");
     nb_envoi++;   
-   Serial.print("Nb_envoi:");
-   Serial.println(nb_envoi);
-   //radiopacket[0] = '0';
-   //RAZradiopacket(radiopacket);
-   }
-   
-   
-  
+    }
+    
     //LECTURE DONNEES VENANT DE LA NACELLE 
     if (rf95.available())
       {
-       // Should be a message for us now
        uint8_t buf[RH_RF95_MAX_MESSAGE_LEN];
        uint8_t len = sizeof(buf);
          if (rf95.recv(buf, &len))
           {
             digitalWrite(LED, HIGH);
-           // RH_RF95::printBuffer("Received: ", buf, len);
             Serial.print("Reception: ");
             Serial.println((char*)buf);
-            serialFlush();
-            
-            
-            
-            // Send a reply
-            //rf95.send(data, sizeof(data));
-            //rf95.waitPacketSent();
-            //Serial.println("Sent a reply");
-            //digitalWrite(LED, LOW);
-          }
+
+            //Puissance du signal lors de la dernière réception (en dBm)
+            Serial.print("RSSI: ");
+            Serial.println(rf95.lastRssi(), DEC);
+            }
           else
             {
               Serial.println("Receive failed");
               }
         }
-     delay(200);
+     delay(100);
 }
 
+
--
libgit2 0.21.2