Diff: DataBase.cpp

Branch:

Integration

Revision:

39:13e66d087ae9

Parent:

38:9b43b2415093

--- a/DataBase.cpp	Fri Oct 19 06:32:59 2018 +0000
+++ b/DataBase.cpp	Fri Oct 19 15:08:35 2018 +0000
@@ -1,7 +1,7 @@
 /*
- * MISNet
+ * MISNet   
  *
- *  Frame:   Gestionnaire de fabrication des messages et décodage des messages recus
+ *  Frame:   Gestionnaire de fabrication des messages et décodage des messages recus 
  *
  *  Created on: August 17, 2018       Author: Francis CHATAIN
  *
@@ -9,6 +9,7 @@
 
 // =====================================  Includes
 
+//#include "main.h"
 #include "DataBase.hpp"
 #include "SMTClearMessagePart.hpp"
 #include "BroadcastIOTClearMessagePart.hpp"
@@ -21,51 +22,47 @@
 // =====================================  Method of class
 
 
-// =====================================  Constructor
+// =====================================  Constructor 
 
 #ifndef TEST_ENVIRONMENT
-void DataBase::getRadioParameter (uint32_t              &rfFrequency,
-                                  RadioLoRaBandwidths_t           &loraBw,
-                                  RadioLoRaSpreadingFactors_t     &loraSf ,
-                                  int8_t                          &txOutputPower,
-                                  uint8_t                         &bufferSizeMax,
-                                  int16_t                         &terminal_heartbeat_period,
-                                  int16_t                         &payload_heartbeat_period)
-{
-    rfFrequency                 =    _rf_frequency           ;
-    loraBw                      =    _lora_bw                ;
-    loraSf                      =    _lora_sf                ;
-    txOutputPower               =    _tx_output_power        ;
-    bufferSizeMax               =    _buffer_size_max        ;
-    terminal_heartbeat_period   =    _terminal_heartbeat_period;
-    payload_heartbeat_period    =    _payload_heartbeat_period;
+void DataBase::getRadioParameter(uint32_t &rfFrequency,
+        RadioLoRaBandwidths_t &loraBw,
+        RadioLoRaSpreadingFactors_t &loraSf,
+        int8_t &txOutputPower,
+        uint8_t &bufferSizeMax,
+        int16_t &platform_heartbeat_period,
+        int16_t &payload_heartbeat_period) {
+    rfFrequency = _rf_frequency;
+    loraBw = _lora_bw;
+    loraSf = _lora_sf;
+    txOutputPower = _tx_output_power;
+    bufferSizeMax = _buffer_size_max;
+    platform_heartbeat_period = _platform_heartbeat_period;
+    payload_heartbeat_period = _payload_heartbeat_period;
 }
 
+void DataBase::setRadioParameter(uint32_t rfFrequency,
+        RadioLoRaBandwidths_t loraBw,
+        RadioLoRaSpreadingFactors_t loraSf,
+        int8_t txOutputPower,
+        uint8_t bufferSizeMax,
+        int16_t platform_heartbeat_period,
+        int16_t payload_heartbeat_period) {
+    _rf_frequency = rfFrequency;
+    _lora_bw = loraBw;
+    _lora_sf = loraSf;
+    _tx_output_power = txOutputPower;
+    _buffer_size_max = bufferSizeMax;
+    _platform_heartbeat_period = platform_heartbeat_period;
+    _payload_heartbeat_period = payload_heartbeat_period;
 
-void DataBase::setRadioParameter ( uint32_t             rfFrequency,
-                                   RadioLoRaBandwidths_t           loraBw,
-                                   RadioLoRaSpreadingFactors_t     loraSf ,
-                                   int8_t                          txOutputPower,
-                                   uint8_t                         bufferSizeMax,
-                                   int16_t                         terminal_heartbeat_period,
-                                   int16_t                         payload_heartbeat_period)
-{
-    _rf_frequency = rfFrequency   ;
-    _lora_bw = loraBw             ;
-    _lora_sf = loraSf             ;
-    _tx_output_power = txOutputPower      ;
-    _buffer_size_max  = bufferSizeMax     ;
-    _terminal_heartbeat_period  = terminal_heartbeat_period   ;
-    _payload_heartbeat_period  = payload_heartbeat_period   ;
-
-    printf( "*** DTB ***  setRadioParameter   %ld %d %d %d %d %d %d\r\n", _rf_frequency, _lora_bw,
-            _lora_sf, _tx_output_power, _buffer_size_max,_terminal_heartbeat_period, _payload_heartbeat_period);
+    printf("*** DTB ***  setRadioParameter   %ld %d %d %d %d %d %d\r\n", _rf_frequency, _lora_bw,
+            _lora_sf, _tx_output_power, _buffer_size_max, _platform_heartbeat_period, _payload_heartbeat_period);
 }
 #endif
 
 
-void DataBase::setClearMessagePart()
-{
+void DataBase::setClearMessagePart() {
     switch (this->getTerminalType()) {
         case DataBase::NORMAL_IOT:
             _clear_message_part = new NormalIOTClearMessagePart(_terminal_id, _gateway_id);
@@ -85,8 +82,7 @@
 }
 
 
-void DataBase::setIOTConfigDataMessagePart()
-{
+void DataBase::setIOTConfigDataMessagePart() {
     this->_iot_config_data_message_part = new misnet::IOTConfigDataMessagePart();
 
     std::vector<Service*>::iterator serviceIt = this->_payload->getServices().begin();
@@ -101,8 +97,7 @@
 }
 
 
-short DataBase::getNbService(Service::SERVICE_TYPE deviceType)
-{
+short DataBase::getNbService(Service::SERVICE_TYPE deviceType) {
     short result = 0;
 
     std::vector<Service*> channels = this->_payload->getServices();
@@ -118,8 +113,7 @@
 }
 
 
-Service::SERVICE_TYPE DataBase::getServiceType(short channel)
-{
+Service::SERVICE_TYPE DataBase::getServiceType(short channel) {
     return this->_payload->getServiceByRank(channel)->getDeviceType();
 }
 
@@ -132,7 +126,6 @@
     std::vector<Component*>::iterator componentIt = this->_payload->getComponents().begin();
     for (; componentIt != this->_payload->getComponents().end(); componentIt++) {
 
-        //bool activeSensor = false;
         for (std::vector<Service*>::iterator serviceIt = (*componentIt)->getServices().begin();
                 serviceIt != (*componentIt)->getServices().end();
                 serviceIt++) {
@@ -161,8 +154,7 @@
 }
 
 
-std::list<Service*> * DataBase::getCandidateServicesList()
-{
+std::list<Service*> * DataBase::getCandidateServicesList() {
     std::list<Service*> * result = new std::list<Service*>();
     std::vector<misnet::Service*>& services = this->_payload->getServices();