Code formatting

Author: chathura-de-silva

include/constants.h

@@ -1,43 +1,43 @@
-//Uncomment below line if it is the gateway.Otherwise keep it commented out.
-// #define GATEWAY
+// Uncomment below line if it is the gateway.Otherwise keep it commented out.
+//  #define GATEWAY
 
-//Lora transceiver module and sensor pins
-#define CS 5 
-#define DIO0 GPIO_NUM_2 // Dont define just with numbers, use GPIO_NUM_X
+// Lora transceiver module and sensor pins
+#define CS 5
+#define DIO0 GPIO_NUM_2         // Dont define just with numbers, use GPIO_NUM_X
 #define SENSOR_INPUT GPIO_NUM_4 // Dont define just with numbers, use GPIO_NUM_X
-#define SENSORSWITCH 32 // Switching the Sensor on and off.
+#define SENSORSWITCH 32         // Switching the Sensor on and off.
 
-//general parameters
+// general parameters
 #ifdef GATEWAY
-#define LISTENING_INT_LOW 5000 // in milliseconds
+#define LISTENING_INT_LOW 5000  // in milliseconds
 #define LISTENING_INT_HIGH 6000 // in milliseconds
 #else
-#define LISTENING_INT_LOW 2000 // in milliseconds
+#define LISTENING_INT_LOW 2000  // in milliseconds
 #define LISTENING_INT_HIGH 5000 // in milliseconds
 #endif
 #define TEMP_CHECK_INTERVAL 0.5 // in minutes
-#define WAITBEFORERESEND 10 // in seconds
-#define RESETINTERVAL 15 // in minutes
+#define WAITBEFORERESEND 10     // in seconds
+#define RESETINTERVAL 15        // in minutes
 
 #ifdef GATEWAY
-//gsm
-#define GPRS_APN "dialogbb" // Access Point Name
+// gsm
+#define GPRS_APN "dialogbb"       // Access Point Name
 #define SMS_NUMBER "+13137621438" // Phone number to send SMS
 
-//mqtt
+// mqtt
 #define MQTT_SERVER "test.mosquitto.org"
 #define MQTT_PORT 1883
 #define MQTT_DEVICE_ID "firesense_hazards"
 #define DATA_RECEPTION_TOPIC "firesense_hazards/reciever"
 #define DATA_SENDING_TOPIC "firesense_hazards/sender"
 
 #define TINY_GSM_MODEM_SIM900 // Modem is SIM900
-#define SerialMon Serial // Define Serial monitor
-#define SerialAT Serial2 // Define Serial for AT commands
+#define SerialMon Serial      // Define Serial monitor
+#define SerialAT Serial2      // Define Serial for AT commands
 // #define DUMP_AT_COMMANDS // Dump AT commands to Serial for debugging.
-#define TINY_GSM_DEBUG SerialMon // Debug stream
-#define GSM_PIN "" // SIM card PIN (leave empty if not defined)
-#define TINY_GSM_USE_GPRS true // Use GPRS for internet connection
-#define MAX_GSM_CONNECTION_REATTEMPTS 3 // Maximum number of reattempts to connect to GSM network. then will send another sms saying the system is down.
+#define TINY_GSM_DEBUG SerialMon         // Debug stream
+#define GSM_PIN ""                       // SIM card PIN (leave empty if not defined)
+#define TINY_GSM_USE_GPRS true           // Use GPRS for internet connection
+#define MAX_GSM_CONNECTION_REATTEMPTS 3  // Maximum number of reattempts to connect to GSM network. then will send another sms saying the system is down.
 #define MAX_MQTT_CONNECTION_REATTEMPTS 3 // Maximum number of reattempts to connect to MQTT server. then will send another sms saying the system is down.
 #endif

include/functions.h

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 #include <constants.h>
-//utils
+// utils
 void setupSerial();
 void initLora();
 String generateRandomID();
@@ -17,14 +17,14 @@ String listenForPackets(unsigned long lowerbound, unsigned long upperbound);
 #ifdef GATEWAY
 void sendSystemMessage(String message);
 #else
-void sendPacket( String message);
+void sendPacket(String message);
 
 // Program
 void systemReset(uint64_t resetInterval); // Reset the system after a certain time.
 #endif
 
 #ifdef GATEWAY
-//gsm and mqtt
+// gsm and mqtt
 bool GsmAndMqttSetup();
 bool GsmConnect();
 boolean mqttConnect();

src/gsm_and_mqtt.cpp

@@ -90,14 +90,16 @@ bool GsmAndMqttSetup()
         SerialMon.println("Network connected succesfully!");
         return true;
     }
-    else{
+    else
+    {
         SerialMon.println("Network connection failed!");
         return false;
     }
 }
 
-bool GsmConnect(){
-    #if TINY_GSM_USE_GPRS
+bool GsmConnect()
+{
+#if TINY_GSM_USE_GPRS
     // GPRS connection parameters are usually set after network registration
     SerialMon.print(F("Connecting to :"));
     SerialMon.print(GPRS_APN);
@@ -123,7 +125,7 @@ bool GsmConnect(){
 
 void sendMqttMessage(String Payload)
 {
-    if (mqtt.publish(DATA_SENDING_TOPIC, (("Fire Hazard : " + Payload).c_str())),2)
+    if (mqtt.publish(DATA_SENDING_TOPIC, (("Fire Hazard : " + Payload).c_str())), 2)
     {
         Serial.println("Message sent to MQTT Broker");
     }

src/lora.cpp

@@ -24,12 +24,12 @@ String listenForPackets(unsigned long lowerbound, unsigned long upperbound)
             {
                 return LoRaData;
             }
-            #ifndef GATEWAY
+#ifndef GATEWAY
             else if (LoRaData == "IMMEDIATE_RESET")
             {
                 systemReset(RESETINTERVAL); // Reset the system immediately
             }
-            #endif
+#endif
         }
     }
     Serial.println("No any valid packet received");

src/utlis.cpp

@@ -2,8 +2,7 @@
 #include <constants.h>
 #include <LoRa.h>
 #include <Preferences.h>
-#include <nvs_flash.h>  // Include the NVS flash library for manual NVS initialization
-
+#include <nvs_flash.h> // Include the NVS flash library for manual NVS initialization
 
 void setupSerial()
 { // Function to setup serial communication
@@ -34,13 +33,14 @@ void initLora()
 // Function to check Preferences for deviceID and generate if not found
 String getDeviceID()
 {
-    // Initialize the NVS (Non-Volatile Storage) system (Usually this should be handled by the preferences.h, but there was a error and hence done manually.)
-  if (nvs_flash_init() == ESP_ERR_NVS_NO_FREE_PAGES || nvs_flash_init() == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+  // Initialize the NVS (Non-Volatile Storage) system (Usually this should be handled by the preferences.h, but there was a error and hence done manually.)
+  if (nvs_flash_init() == ESP_ERR_NVS_NO_FREE_PAGES || nvs_flash_init() == ESP_ERR_NVS_NEW_VERSION_FOUND)
+  {
     // If NVS partition was truncated or a new version was found, erase it and try again
     nvs_flash_erase();
     nvs_flash_init();
   }
-  Preferences preferences; // Create a Preferences object
+  Preferences preferences;                 // Create a Preferences object
   preferences.begin("device_info", false); // Start preferences in read-write mode
   String device_Identifier = preferences.getString("deviceID", "NULL");