[20%] progress - sending data to Lo

Author: Kacp3r3

src/LiveObjects.h

@@ -28,7 +28,7 @@
    Adafruit FONA
  ******************************************************************************/
 #ifdef ARDUINO_AVR_FEATHER32U4
-  #include "LiveObjectsFONA.h"
+  #include "LiveObjectsAVRFona.h"
 #endif
 
 

src/LiveObjectsAVRFona.cpp

@@ -0,0 +1,112 @@
+#include "LiveObjectsAVRFona.h"
+
+LiveObjectsFona::LiveObjectsFona() 
+  :
+   m_Fona(FONA_RST)
+   ,m_FonaSerial(FONA_TX,FONA_RX)
+   ,m_FonaMQTT(nullptr)
+   ,m_sClientID("Fona")
+   ,m_nPort(1883)
+{
+  
+}
+
+void LiveObjectsFona::begin(Protocol p, Encoding e, bool d) 
+{
+  
+}
+
+void LiveObjectsFona::loop() 
+{
+  Adafruit_MQTT_Subscribe *subscription;
+  while ((subscription = m_FonaMQTT->readSubscription(5000))) {
+    //if (subscription == &onoffbutton) {
+    //  Serial.print(F("Got: "));
+    //  Serial.println((char *)onoffbutton.lastread);
+    //}
+  }
+}
+
+void LiveObjectsFona::connect() 
+{
+  while (! FONAconnect()) {
+    Serial.println("Retrying FONA");
+  }
+  Serial.println(F("Connected to Cellular!"));
+  delay(5000);  // wait a few seconds to stabilize connection
+  connectMQTT();
+}
+
+void LiveObjectsFona::addToPayload(String x, int y) 
+{
+  
+}
+
+void LiveObjectsFona::sendData() 
+{
+  m_FonaMQTT->publish("dev/data","{ \"value\": { \"hello\" : \"world\" }}");
+}
+
+bool LiveObjectsFona::FONAconnect() 
+{
+   Watchdog.reset();
+
+  Serial.println(F("Initializing FONA....(May take 3 seconds)"));
+
+  m_FonaSerial.begin(4800); // if you're using software serial
+
+  if (!m_Fona.begin(m_FonaSerial)) { // can also try fona.begin(Serial1)
+    Serial.println(F("Couldn't find FONA"));
+    return false;
+  }
+  m_FonaSerial.println("AT+CMEE=2");
+  Serial.println(F("FONA is OK"));
+  Watchdog.reset();
+  Serial.println(F("Checking for network..."));
+  while (m_Fona.getNetworkStatus() != 1) {
+    delay(500);
+  }
+
+  Watchdog.reset();
+  delay(5000); // wait a few seconds to stabilize connection
+  Watchdog.reset();
+
+  m_Fona.setGPRSNetworkSettings(F("internet"), F(""), F(""));
+
+  //Serial.println(F("Disabling GPRS"));
+  //fona.enableGPRS(false);
+
+  Watchdog.reset();
+  delay(5000); // wait a few seconds to stabilize connection
+  Watchdog.reset();
+
+  Serial.println(F("Enabling GPRS"));
+  if (!m_Fona.enableGPRS(true)) {
+    Serial.println(F("Failed to turn GPRS on"));
+    return false;
+  }
+  Watchdog.reset();
+
+  return true;
+}
+
+void LiveObjectsFona::connectMQTT() 
+{
+  m_FonaMQTT = new Adafruit_MQTT_FONA(&m_Fona,MQTT_BROKER, m_nPort,m_sClientID.c_str(), MQTT_USER,SECRET_LIVEOBJECTS_API_KEY.c_str());
+  int8_t ret;
+
+  // Stop if already connected.
+  if (m_FonaMQTT->connected()) {
+    return;
+  }
+
+  Serial.print("Connecting to MQTT... ");
+
+  while ((ret = m_FonaMQTT->connect()) != 0) { // connect will return 0 for connected
+    Serial.println(m_FonaMQTT->connectErrorString(ret));
+    Serial.println("Retrying MQTT connection in 5 seconds...");
+    m_FonaMQTT->disconnect();
+    delay(5000);  // wait 5 seconds
+  }
+  Serial.println("MQTT Connected!");
+}

src/LiveObjectsAVRFona.h

@@ -0,0 +1,110 @@
+#pragma once
+
+/******************************************************************************
+   DEFAULT VALUES FOR LIVEOBJECTS
+ ******************************************************************************/
+#ifdef ARDUINO_ARCH_AVR
+#define PAYLOAD_DATA_SIZE 256
+#else
+#define PAYLOAD_DATA_SIZE 1024
+#endif
+#define KEEP_ALIVE_NETWORK 1000
+#define SW_REVISION "1.8.0"
+
+
+/******************************************************************************
+   LiveObjects MQTT constants
+ ******************************************************************************/
+#define MQTT_BROKER "liveobjects.orange-business.com"
+#define MQTT_USER "json+device"
+#define MQTT_PUBDATA "dev/data"
+#define MQTT_PUBDATA_BINARY "dev/v1/data/binary"
+#define MQTT_SUBCFG "dev/cfg/upd"
+#define MQTT_PUBCFG "dev/cfg"
+#define MQTT_SUBCMD "dev/cmd"
+#define MQTT_PUBCMD "dev/cmd/res"
+
+/******************************************************************************
+   JSON payload constants
+ ******************************************************************************/
+#define JSONCID "cid"
+#define JSONCFG "cfg"
+#define JSONCFGVALUE "v"
+#define JSONCFGTYPE "t"
+#define JSONMODEL "model"
+#define JSONVALUE "value"
+#define JSONMODELNAME "Orange_Pollution_Shield"
+
+
+#include <Adafruit_SleepyDog.h>
+#include <SoftwareSerial.h>
+#include <Adafruit_FONA.h>
+#include <Adafruit_MQTT.h>
+#include <Adafruit_MQTT_FONA.h>
+#include <ArduinoJson.h>
+
+#ifdef ARDUINO_AVR_FEATHER32U4
+  #define FONA_RX  9
+  #define FONA_TX  8
+  #define FONA_RST 4
+#endif
+//Adafruit_MQTT_Subscribe onoffbutton = Adafruit_MQTT_Subscribe(&mqtt, "dev/cmd");
+#define SW_REVISION "1.8.0"
+#define PAYLOAD_DATA_SIZE 256
+
+enum Protocol
+{
+  MQTT,
+  SMS
+  //,LORA
+};
+
+enum Security
+{
+  NONE
+  ,TLS
+  //,DTLS
+};
+
+enum Encoding
+{
+  BINARY
+  ,TEXT
+};
+
+
+class LiveObjectsFona
+{
+  public:
+  static LiveObjectsFona& get()
+  {
+    static LiveObjectsFona f;
+    return f;
+  }
+private:
+  LiveObjectsFona();
+  LiveObjectsFona(const LiveObjectsFona&) = delete;
+  LiveObjectsFona& operator==(const LiveObjectsFona&) = delete;
+
+public:
+  void begin(Protocol p, Encoding e, bool d);
+  void loop();
+  void connect();
+  void addToPayload(String x, int y);
+  void sendData();
+  bool FONAconnect();
+
+private:
+  void connectMQTT();
+
+private:
+  Adafruit_FONA m_Fona;
+  SoftwareSerial m_FonaSerial;
+  Adafruit_MQTT_FONA* m_FonaMQTT;
+  StaticJsonDocument<PAYLOAD_DATA_SIZE> m_Payload;
+  String m_sClientID;
+  uint16_t m_nPort;
+};
+extern const String SECRET_LIVEOBJECTS_API_KEY;
+
+typedef LiveObjectsFona LiveObjects;

src/LiveObjectsBase.h

@@ -4,7 +4,11 @@
 /******************************************************************************
    DEFAULT VALUES FOR LIVEOBJECTS
  ******************************************************************************/
+#ifdef ARDUINO_ARCH_AVR
+#define PAYLOAD_DATA_SIZE 256
+#else
 #define PAYLOAD_DATA_SIZE 1024
+#endif
 #define KEEP_ALIVE_NETWORK 1000
 #define SW_REVISION "1.8.0"