Merge pull request #44 from bsatrom/feature/mqtt-for-azure

Feature/mqtt for azure

Author: Brandon Satrom

brew-buddy-firmware/Users/bsatrom/Development/brew-buddy/brew-buddy-firmware/src/brew-buddy-firmware.ino

@@ -3,4 +3,5 @@ dependencies.SparkFunMAX31855k=0.0.1
 dependencies.SdFat=1.0.16
 dependencies.Adafruit_ILI9341_RK=1.2.1
 dependencies.Adafruit_ImageReader=1.0.8
-dependencies.MQTT=0.4.29
+dependencies.MQTT-TLS=0.2.20
+dependencies.JsonParserGeneratorRK=0.0.6

brew-buddy-firmware/project.properties

@@ -15,19 +15,23 @@
 #include "SdFat.h"
 
 // Include MQTT Library to enable the Azure IoT Hub to call back to our device
-#include "MQTT.h"
+#include "MQTT-TLS.h"
+#include "certs/certs.h"
 
-// App Version Constant
+// Json parser for working with MQTT responses from Azure IoT Hub
+#include "JsonParserGeneratorRK.h"
 void setup();
 void loop();
 void resetFermentationVariables();
 long getFermentationRate();
+int checkBatterylevel(String args);
 int checkFermentationRate(String args);
 int checkTemp(String args);
-int checkVoltage();
+int getBattPercentage();
 void activateBrewStage();
 int setBrewMode(String command);
 void printSplash();
+void clearTopBar();
 void clearScreen();
 void printHeadingTextLine(String text);
 void printSubheadingLine(String text);
@@ -43,15 +47,20 @@ void displayTempHeading();
 void displayTempHistoryHeading();
 void displayFermentationRate(long rate);
 void displayTime(float elapsedTime);
-void displayVoltage(int voltage);
+void displayBattLevel(int voltage);
 void displayLowBattAlert();
 String calcTimeToDisplay(float elapsedTime);
 void updateChart(float temp);
-#line 19 "/Users/bsatrom/Development/brew-buddy/brew-buddy-firmware/src/brew-buddy-firmware.ino"
+#line 21 "/Users/bsatrom/Development/brew-buddy/brew-buddy-firmware/src/brew-buddy-firmware.ino"
+JsonParserStatic<2048, 100> jsonParser;
+
+// App Version Constant
 #define APP_VERSION "v1.0"
 
 SYSTEM_THREAD(ENABLED);
 
+String deviceID;
+
 // Thermocouple Variables
 const uint8_t CHIP_SELECT_PIN = D4;
 // SCK, MISO & MOSI are defined on Particle 3rd Gen HW at A6-A8
@@ -74,7 +83,7 @@ int32_t width = 0,           // BMP image dimensions
     height = 0;
 
 #define TFT_SPEED 120000000
-#define BATT_LOW_VOLTAGE 90
+#define BATT_LOW_VOLTAGE 30
 
 // SD Card
 SdFat sd;
@@ -139,6 +148,7 @@ MQTT client("brew-buddy-hub.azure-devices.net", 8883, mqttCB);
 void setup()
 {
   Serial.begin(9600);
+  deviceID = System.deviceID();
 
   pinMode(KNOCK_PIN, INPUT_PULLDOWN);
 
@@ -150,6 +160,7 @@ void setup()
   Particle.function("setMode", setBrewMode);
   Particle.function("checkTemp", checkTemp);
   Particle.function("checkRate", checkFermentationRate);
+  Particle.function("checkBatt", checkBatterylevel);
 
   // Initialize TFT
   tft.begin(TFT_SPEED);
@@ -171,22 +182,30 @@ void setup()
   printSubheadingLine("Waiting for Brew...");
 
   // Check and display the battery level
-  int voltage = checkVoltage();
-  displayVoltage(voltage);
+  int battLevel = getBattPercentage();
+  //displayBattLevel(battLevel);
+
+  waitUntil(Particle.connected);
+
+  Particle.publish("Version", APP_VERSION);
+  Particle.publish("Status", "Brew Buddy Online");
 
   //Connect to Azure MQTT Server
-  /* client.connect("e00fce681290df8ab5487791", "brew-buddy-hub.azure-devices.net/e00fce681290df8ab5487791/?api-version=2018-06-30", "SharedAccessSignature sr=brew-buddy-hub.azure-devices.net&sig=RKWH%2FV8CD595YeAnXOZ8jXsSYMnWf6RiJBnzhUoxCzE%3D&skn=iothubowner&se=1552683541");
+  client.enableTls(certificates, sizeof(certificates));
+  client.connect(deviceID, "brew-buddy-hub.azure-devices.net/" + deviceID, "SharedAccessSignature sr=brew-buddy-hub.azure-devices.net&sig=kNKhEIQaObc74GPvEoK4fi3W1ot65f5aQDOFnTdkaqY%3D&skn=iothubowner&se=1553119278");
   if (client.isConnected())
   {
     Particle.publish("mqtt/status", "connected");
+    bool methodSubResult = client.subscribe("$iothub/methods/#", MQTT::QOS0);
+    bool msgSubResult = client.subscribe("devices/" + deviceID + "/messages/devicebound/#", MQTT::QOS0);
+
+    Particle.publish("matt/method-sub-result", methodSubResult ? "subscribed to hub methods" : "subscription failed");
+    Particle.publish("matt/method-sub-result", msgSubResult ? "subscribed to hub messages" : "subscription failed");
   }
   else
   {
     Particle.publish("mqtt/status", "failed");
-  } */
-
-  Particle.publish("Version", APP_VERSION);
-  Particle.publish("Status", "Brew Buddy Online");
+  }
 }
 
 void loop()
@@ -208,7 +227,7 @@ void loop()
         lastKnock = fermentationStartTime;
 
         clearScreen();
-        tft.setCursor(0, 10);
+        tft.setCursor(0, 30);
         tft.setTextColor(ILI9341_YELLOW);
         tft.setTextSize(2);
         tft.print("Fermentation started");
@@ -265,13 +284,14 @@ void loop()
 
   if (currentMillis - previousBattMillis > battInterval)
   {
-    int voltage = checkVoltage();
+    previousBattMillis = millis();
 
-    displayVoltage(voltage);
-    Particle.publish(messageBase + "voltage", String(voltage));
+    int battLevel = getBattPercentage();
 
-    // If voltage < 30%, show a low batt message and publish message to cloud
-    if (voltage < BATT_LOW_VOLTAGE)
+    displayBattLevel(battLevel);
+    Particle.publish(messageBase + "batt-level", String(battLevel));
+
+    if (battLevel < BATT_LOW_VOLTAGE)
     {
       displayLowBattAlert();
       Particle.publish(messageBase + "alert", "low-batt");
@@ -291,6 +311,11 @@ void loop()
       postFermentationRate();
     }
   }
+
+  if (client.isConnected())
+  {
+    client.loop();
+  }
 }
 
 void resetFermentationVariables()
@@ -319,6 +344,14 @@ long getFermentationRate()
   return rate;
 }
 
+int checkBatterylevel(String args)
+{
+  int battLevel = getBattPercentage();
+  Particle.publish(messageBase + "batt-level", String(battLevel));
+
+  return 1;
+}
+
 int checkFermentationRate(String args)
 {
   if (isFermentationMode)
@@ -344,18 +377,17 @@ int checkTemp(String args)
   return 0;
 }
 
-int checkVoltage()
+int getBattPercentage()
 {
   int voltage = analogRead(BATT) * 0.0011224;
 
-  return (int)((voltage / 4.2) * 100 + 0.5)
+  return (int)((voltage / 4.2) * 100 + 0.5);
 }
 
 void activateBrewStage()
 {
   startTime = millis();
 
-  displayStageName(brewStage);
   displayTempHeading();
   displayTempHistoryHeading();
   displayTimeHeading();
@@ -444,9 +476,16 @@ void printSplash()
   delay(3000);
 }
 
+void clearTopBar()
+{
+  tft.fillRect(0, 0, 240, 30, ILI9341_BLACK);
+  tft.setCursor(0, 0);
+  tft.setTextColor(ILI9341_WHITE);
+}
+
 void clearScreen()
 {
-  tft.fillScreen(ILI9341_BLACK);
+  tft.fillRect(0, 30, 240, 320, ILI9341_BLACK);
   tft.setCursor(0, 0);
   tft.setTextColor(ILI9341_WHITE);
 }
@@ -526,7 +565,7 @@ void displayStageName(String stagename)
 
 void displayFermentationHeading()
 {
-  tft.setCursor(0, 100);
+  tft.setCursor(0, 110);
   tft.setTextSize(2);
   tft.println("Fermentation Rate");
   tft.println("(in seconds)");
@@ -536,7 +575,7 @@ void displayFermentationModeDelta()
 {
   unsigned long fermentationDelta = fermentationStartTime - fermentationModeStartTime;
 
-  tft.setCursor(0, 40);
+  tft.setCursor(0, 60);
   tft.setTextSize(2);
   tft.println("Time to fermentation (hours)");
   tft.println(fermentationDelta / 36000000.00);
@@ -565,8 +604,8 @@ void displayTempHistoryHeading()
 
 void displayFermentationRate(long rate)
 {
-  tft.fillRect(0, 80, 240, fermentationRateSize * pixelMultiplier, ILI9341_BLACK);
-  tft.setCursor(0, 80);
+  tft.fillRect(0, 150, 240, fermentationRateSize * pixelMultiplier, ILI9341_BLACK);
+  tft.setCursor(0, 150);
   tft.setTextSize(fermentationRateSize);
   tft.println(rate);
 }
@@ -581,8 +620,9 @@ void displayTime(float elapsedTime)
   tft.println(timeString);
 }
 
-void displayVoltage(int voltage)
+void displayBattLevel(int voltage)
 {
+  clearTopBar();
   tft.setCursor(160, 10);
   tft.setTextSize(1);
   tft.print("Batt: ");
@@ -592,10 +632,11 @@ void displayVoltage(int voltage)
 
 void displayLowBattAlert()
 {
-  tft.setCursor(160, 30);
+  tft.setCursor(10, 10);
   tft.setTextSize(2);
-  tft.setTextSize(ILI9341_RED);
+  tft.setTextColor(ILI9341_RED);
   tft.println("LOW BATT");
+  tft.setTextColor(ILI9341_WHITE);
 }
 
 String calcTimeToDisplay(float elapsedTime)
@@ -675,5 +716,22 @@ void updateChart(float temp)
 
 void mqttCB(char *topic, byte *payload, unsigned int length)
 {
-  Particle.publish("mqtt/sub", topic);
+  char pload[length + 1];
+  memcpy(pload, payload, length);
+  pload[length] = NULL;
+
+  Serial.printlnf("Topic: %s", topic);
+  Serial.printlnf("Payload: %s", pload);
+
+  jsonParser.clear();
+  jsonParser.addString(pload);
+
+  if (jsonParser.parse())
+  {
+    String methodName = jsonParser.getReference().key("methodName").valueString();
+
+    Particle.publish("mqtt/message-method", methodName);
+
+    setBrewMode(methodName);
+  }
 }