Merge pull request #332 from OPEnSLab-OSU/final-hypnos-additions

Final hypnos additions to ino examples

Author: RoryLGroom

examples/Internet/Logging/LTEMongoDBBatch/LTEMongoDBBatch.ino

@@ -3,31 +3,38 @@
  * 
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
-#include "arduino_secrets.h"
 
+#include "arduino_secrets.h"
 #include <Loom_Manager.h>
-
 #include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
 #include <Internet/Connectivity/Loom_LTE/Loom_LTE.h>
 #include <Internet/Logging/Loom_MongoDB/Loom_MongoDB.h>
+#include <Sensors/Loom_Analog/Loom_Analog.h>
+
 
 Manager manager("Device", 1);
 
 Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
 
 Loom_LTE lte(manager, NETWORK_NAME, NETWORK_USER, NETWORK_PASS);
-Loom_MongoDB mqtt(manager, lte.getClient(), SECRET_BROKER, SECRET_PORT, DATABASE, BROKER_USER, BROKER_PASS, PROJECT);
+
+Loom_MongoDB mqtt(manager, lte, SECRET_BROKER, SECRET_PORT, DATABASE, BROKER_USER, BROKER_PASS, PROJECT);
+
+Loom_Analog analog(manager);
 
 // Enables batch logging with a batch size of 15
 Loom_BatchSD batchSD(hypnos, 15);
 
+
 // Called when the interrupt is triggered 
-void isrTrigger(){
+void isrTrigger()
+{
   hypnos.wakeup();
 }
 
-void setup() {
 
+void setup() 
+{
   // Start serial
   manager.beginSerial();
 
@@ -42,15 +49,16 @@ void setup() {
 
   // Register the ISR and attach to the interrupt
   hypnos.registerInterrupt(isrTrigger);
-
 }
 
-void loop() {
+
+void loop() 
+{
   // Set the RTC interrupt alarm to wake the device in 10 seconds
   hypnos.setInterruptDuration(TimeSpan(0, 0, 0, 10));
 
   // Measure data from connected sensors
-  manager.measure()
+  manager.measure();
 
   // Package data
   manager.package();
@@ -64,8 +72,6 @@ void loop() {
   // Pass batch SD along to the MQTT module
   mqtt.publish(batchSD);
 
-  
-
   // Reattach to the interrupt after we have set the alarm so we can have repeat triggers
   hypnos.reattachRTCInterrupt();
 

examples/Internet/Logging/WiFiMongoDB/WiFiMongoDB.ino

@@ -3,26 +3,39 @@
  * 
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
-#include "arduino_secrets.h"
 
+#include "arduino_secrets.h"
 #include <Loom_Manager.h>
-
 #include <Internet/Connectivity/Loom_Wifi/Loom_Wifi.h>
 #include <Internet/Logging/Loom_MongoDB/Loom_MongoDB.h>
+#include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
+
 
 Manager manager("Device", 1);
 
+Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
+
 Loom_WIFI wifi(manager, CommunicationMode::CLIENT, SECRET_SSID, SECRET_PASS);
-Loom_MongoDB mqtt(manager, wifi.getClient(), SECRET_BROKER, SECRET_PORT, DATABASE, BROKER_USER, BROKER_PASS, PROJECT);
 
-void setup() {
+Loom_MongoDB mqtt(manager, wifi, SECRET_BROKER, SECRET_PORT, DATABASE, BROKER_USER, BROKER_PASS, PROJECT);
+
+
+void setup() 
+{
   manager.beginSerial();
+
+  hypnos.enable();
+
   manager.initialize();
 }
 
-void loop() {
+
+void loop() 
+{
   manager.measure();
+
   manager.package();
+  
   manager.display_data();
 
   mqtt.publish();

examples/Internet/Logging/WiFiMongoDBBatch/WiFiMongoDBBatch.ino

@@ -3,26 +3,31 @@
  * 
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
-#include "arduino_secrets.h"
 
+#include "arduino_secrets.h"
 #include <Loom_Manager.h>
-
 #include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
 #include <Internet/Connectivity/Loom_Wifi/Loom_Wifi.h>
 #include <Internet/Logging/Loom_MongoDB/Loom_MongoDB.h>
+#include <Sensors/Loom_Analog/Loom_Analog.h>
+
 
 Manager manager("Device", 1);
 
 Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
 
 Loom_WIFI wifi(manager, CommunicationMode::CLIENT, SECRET_SSID, SECRET_PASS);
-Loom_MongoDB mqtt(manager, wifi.getClient(), SECRET_BROKER, SECRET_PORT, DATABASE, BROKER_USER, BROKER_PASS, PROJECT);
+
+Loom_MongoDB mqtt(manager, wifi, SECRET_BROKER, SECRET_PORT, DATABASE, BROKER_USER, BROKER_PASS, PROJECT);
+
+Loom_Analog analog(manager);
 
 // Enables batch logging with a batch size of 15
 Loom_BatchSD batchSD(hypnos, 15);
 
-void setup() {
 
+void setup() 
+{
   // Start serial
   manager.beginSerial();
 
@@ -36,7 +41,9 @@ void setup() {
   manager.initialize();
 }
 
-void loop() {
+
+void loop() 
+{
   // Package data
   manager.package();
 

examples/Radios/LoRa/BatchTransmission/Receive/Receive.ino

@@ -3,23 +3,35 @@
  * 
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
-#include <Loom_Manager.h>
 
+#include <Loom_Manager.h>
 #include <Radio/Loom_LoRa/Loom_LoRa.h>
+#include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
+
 
 Manager manager("Device", 0);
 
+Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
+
 // Create a new lora instance using the instance number as the address
 Loom_LoRa lora(manager);
 
+
 int packetNumber = 0;
 
-void setup() {
+
+void setup() 
+{
   manager.beginSerial();
+
+  hypnos.enable();
+
   manager.initialize();
 }
 
-void loop() {
+
+void loop() 
+{
   /* Handle each individual packet being received from the batch transmit */
   do{
     if(lora.receiveBatch(5000, &packetNumber)){

examples/Radios/LoRa/BatchTransmission/Transmit/Transmit.ino

@@ -3,12 +3,13 @@
  * 
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
-#include <Loom_Manager.h>
 
+#include <Loom_Manager.h>
 #include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
 #include <Hardware/Loom_BatchSD/Loom_BatchSD.h>
 #include <Radio/Loom_LoRa/Loom_LoRa.h>
 
+
 Manager manager("Device", 1);
 
 Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
@@ -19,27 +20,28 @@ Loom_LoRa lora(manager);
 // Create a batch size of 15
 Loom_BatchSD batch(hypnos, 15);
 
-void setup() {
+
+void setup() 
+{
   manager.beginSerial();
 
-  // Set a reference to the batchSD object
-  lora.setBatchSD(batch);
+  lora.setBatchSD(batch);    // Set a reference to the batchSD object
 
   hypnos.enable();
 
   manager.initialize();
 }
 
-void loop() {
+
+void loop() 
+{
   manager.package();
+
   manager.display_data();
 
-  // Log the hypnos to the SD card
-  hypnos.logToSD();
+  hypnos.logToSD();       // Log the hypnos to the SD card
 
-  // Send the current JSON document to address 0
-  lora.sendBatch(0);
+  lora.sendBatch(0);      // Send the current JSON document to address 0
 
-  // Wait 5 seconds between transmits
-  manager.pause(5000);
+  manager.pause(5000);    // Wait 5 seconds between transmits
 }

examples/Sensors/Analog/Analog/Analog.ino

@@ -5,14 +5,15 @@
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
 
-
 #include <Loom_Manager.h>
-
 #include <Sensors/Loom_Analog/Loom_Analog.h>
+#include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
 
 
 Manager manager("Device", 1);
 
+Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
+
 // Reads the battery voltage
 Loom_Analog analog(manager);
 
@@ -22,16 +23,21 @@ Loom_Analog analog(manager);
 // Read the battery voltage, A2 and A4
 //Loom_Analog analog(manager, A2, A4);
 
-void setup() {
 
+void setup() 
+{
   // Start the serial interface
   manager.beginSerial();
 
+  hypnos.enable();
+
   // Initialize the manager
   manager.initialize();
 }
 
-void loop() {
+
+void loop() 
+{
   // put your main code here, to run repeatedly:
 
   // Measure the data from the sensors

examples/Sensors/I2C/ADS1115/ADS1115.ino

@@ -4,27 +4,34 @@
  * MANAGER MUST BE INCLUDED FIRST IN ALL CODE
  */
 
-
 #include <Loom_Manager.h>
-
 #include <Sensors/I2C/Loom_ADS1115/Loom_ADS1115.h>
+#include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
+
 
 Manager manager("Device", 1);
 
+Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
+
 // Manger Instance, Enable Analog, Enable DIfferential, Gain
 Loom_ADS1115 ads(manager);
 
-void setup() {
 
+void setup() 
+{
   // Start the serial interface and wait for the user to open the serial monitor
   manager.beginSerial();
+  
+  // Enable hypnos for RTC
+  hypnos.enable();
 
   // Initialize the manager
   manager.initialize();
-
 }
 
-void loop() {
+
+void loop() 
+{
   // Measure the data from the sensors
   manager.measure();
 
@@ -36,5 +43,4 @@ void loop() {
 
   // Wait for 5 seconds
   manager.pause(5000);
-
 }

examples/Sensors/I2C/DFMultiGasSensor/DFMultiGasSensor.ino

@@ -3,22 +3,35 @@
  */
 #include <Loom_Manager.h>
 #include <Sensors/I2C/Loom_DFMultiGasSensor/Loom_DFMultiGasSensor.h>
+#include <Hardware/Loom_Hypnos/Loom_Hypnos.h>
 
 
 // If the sensor is freezing on init try disconnecting the power and re-connecting it
 Manager manager("Device", 1);
 
+Loom_Hypnos hypnos(manager, HYPNOS_VERSION::V3_3, TIME_ZONE::PST);
+
 // MANAGER, I2C ADDRESS, INIT RETRY LIMIT, USE MUX
 Loom_DFMultiGasSensor gas(manager, 0x77, 10, false);
 
-void setup() {
+
+void setup() 
+{
   manager.beginSerial();
+
+  hypnos.enable();
+
   manager.initialize();
 }
 
-void loop() {
+
+void loop() 
+{
   manager.measure();
+
   manager.package();
+  
   manager.display_data();
+
   manager.pause(5000);
 }