Merge pull request #34 from bsatrom/feature/cloud-publishing

Brandon Satrom · web-flow · commit 8b909c7cc0b5 · 2019-03-05T08:57:59.000-06:00
give all pubs a common root; closes #30
diff --git a/brew-buddy-firmware/src/brew-buddy-firmware.ino b/brew-buddy-firmware/src/brew-buddy-firmware.ino
@@ -87,6 +87,8 @@ QueueArray<long> knockArray;
 float fermentationRate = 0; // knocks per ms
 unsigned long lastKnock;
 
+String messageBase = "bb/";
+
 String brewStage;
 String brewId;
 
@@ -153,7 +155,7 @@ void loop()
         displayFermentationModeDelta();
 
         waitUntil(Particle.connected);
-        Particle.publish("fermentation/state", "start");
+        Particle.publish(messageBase + "ferment/state", "start");
       }
       else
       {
@@ -373,13 +375,13 @@ float readTemp()
 void postTemp(float temp)
 {
   String payload = "{ \"temperature\":" + String(temp, 2) + ", \"time\": \"" + millis() + "\" }";
-  Particle.publish("brewing/temp", payload);
+  Particle.publish(messageBase + "brew/temp", payload);
 }
 
 void postFermentationRate()
 {
   String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + ", \"time\": \"" + millis() + "\" }";
-  Particle.publish("fermentation/rate", payload);
+  Particle.publish(messageBase + "ferment/rate", payload);
 }
 
 void printReading(float reading)

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,8 @@ QueueArray<long> knockArray;`
`87`	`87`	`float fermentationRate = 0; // knocks per ms`
`88`	`88`	`unsigned long lastKnock;`
`89`	`89`
	`90`	`+String messageBase = "bb/";`
	`91`	`+`
`90`	`92`	`String brewStage;`
`91`	`93`	`String brewId;`
`92`	`94`
`@@ -153,7 +155,7 @@ void loop()`
`153`	`155`	`displayFermentationModeDelta();`
`154`	`156`
`155`	`157`	`waitUntil(Particle.connected);`
`156`		`- Particle.publish("fermentation/state", "start");`
	`158`	`+ Particle.publish(messageBase + "ferment/state", "start");`
`157`	`159`	`}`
`158`	`160`	`else`
`159`	`161`	`{`
`@@ -373,13 +375,13 @@ float readTemp()`
`373`	`375`	`void postTemp(float temp)`
`374`	`376`	`{`
`375`	`377`	`String payload = "{ \"temperature\":" + String(temp, 2) + ", \"time\": \"" + millis() + "\" }";`
`376`		`- Particle.publish("brewing/temp", payload);`
	`378`	`+ Particle.publish(messageBase + "brew/temp", payload);`
`377`	`379`	`}`
`378`	`380`
`379`	`381`	`void postFermentationRate()`
`380`	`382`	`{`
`381`	`383`	`String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + ", \"time\": \"" + millis() + "\" }";`
`382`		`- Particle.publish("fermentation/rate", payload);`
	`384`	`+ Particle.publish(messageBase + "ferment/rate", payload);`
`383`	`385`	`}`
`384`	`386`
`385`	`387`	`void printReading(float reading)`