clean-up tempo monitoring posts; closes #22

Brandon Satrom · Brandon Satrom · commit d9ca6c4c1e16 · 2019-02-28T17:06:01.000-06:00
diff --git a/brew-buddy-firmware/src/brew-buddy-firmware.cpp b/brew-buddy-firmware/src/brew-buddy-firmware.cpp
@@ -227,9 +227,16 @@ void loop()
 
     if (currentMillis - previousPostMillis > postInterval)
     {
-      // Post curent values to the Device Cloud
-      postTemp(lastTemp);
-      postFermentationRate();
+      previousPostMillis = millis();
+
+      if (isBrewingMode)
+      {
+        postTemp(lastTemp);
+      }
+      else if (isFermentationMode)
+      {
+        postFermentationRate();
+      }
     }
   }
 }
@@ -391,13 +398,13 @@ float readTemp()
 
 void postTemp(float temp)
 {
-  String payload = "{ \"a\":" + String(temp, 2) + ", \"b\": \"" + brewId + "\", \"c\": \"" + brewStage + "\" }";
-  Particle.publish("BrewStageTemp", payload);
+  String payload = "{ \"temperature\":" + String(temp, 2) + ", \"time\": \"" + millis() + "\" }";
+  Particle.publish("brewing/temp", payload);
 }
 
 void postFermentationRate()
 {
-  String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + "\" }";
+  String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + ", \"time\": \"" + millis() + "\" }";
   Particle.publish("fermentation/rate", payload);
 }
 
diff --git a/brew-buddy-firmware/src/brew-buddy-firmware.ino b/brew-buddy-firmware/src/brew-buddy-firmware.ino
@@ -203,8 +203,14 @@ void loop()
     {
       previousPostMillis = millis();
 
-      postTemp(lastTemp);
-      postFermentationRate();
+      if (isBrewingMode)
+      {
+        postTemp(lastTemp);
+      }
+      else if (isFermentationMode)
+      {
+        postFermentationRate();
+      }
     }
   }
 }
@@ -366,13 +372,13 @@ float readTemp()
 
 void postTemp(float temp)
 {
-  String payload = "{ \"a\":" + String(temp, 2) + ", \"b\": \"" + brewId + "\", \"c\": \"" + brewStage + "\" }";
-  Particle.publish("BrewStageTemp", payload);
+  String payload = "{ \"temperature\":" + String(temp, 2) + ", \"time\": \"" + millis() + "\" }";
+  Particle.publish("brewing/temp", payload);
 }
 
 void postFermentationRate()
 {
-  String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + " }";
+  String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + ", \"time\": \"" + millis() + "\" }";
   Particle.publish("fermentation/rate", payload);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -227,9 +227,16 @@ void loop()`
`227`	`227`
`228`	`228`	`if (currentMillis - previousPostMillis > postInterval)`
`229`	`229`	`{`
`230`		`- // Post curent values to the Device Cloud`
`231`		`- postTemp(lastTemp);`
`232`		`- postFermentationRate();`
	`230`	`+ previousPostMillis = millis();`
	`231`	`+`
	`232`	`+ if (isBrewingMode)`
	`233`	`+ {`
	`234`	`+ postTemp(lastTemp);`
	`235`	`+ }`
	`236`	`+ else if (isFermentationMode)`
	`237`	`+ {`
	`238`	`+ postFermentationRate();`
	`239`	`+ }`
`233`	`240`	`}`
`234`	`241`	`}`
`235`	`242`	`}`
`@@ -391,13 +398,13 @@ float readTemp()`
`391`	`398`
`392`	`399`	`void postTemp(float temp)`
`393`	`400`	`{`
`394`		`- String payload = "{ \"a\":" + String(temp, 2) + ", \"b\": \"" + brewId + "\", \"c\": \"" + brewStage + "\" }";`
`395`		`- Particle.publish("BrewStageTemp", payload);`
	`401`	`+ String payload = "{ \"temperature\":" + String(temp, 2) + ", \"time\": \"" + millis() + "\" }";`
	`402`	`+ Particle.publish("brewing/temp", payload);`
`396`	`403`	`}`
`397`	`404`
`398`	`405`	`void postFermentationRate()`
`399`	`406`	`{`
`400`		`- String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + "\" }";`
	`407`	`+ String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + ", \"time\": \"" + millis() + "\" }";`
`401`	`408`	`Particle.publish("fermentation/rate", payload);`
`402`	`409`	`}`
`403`	`410`
Original file line number	Diff line number	Diff line change
`@@ -203,8 +203,14 @@ void loop()`
`203`	`203`	`{`
`204`	`204`	`previousPostMillis = millis();`
`205`	`205`
`206`		`- postTemp(lastTemp);`
`207`		`- postFermentationRate();`
	`206`	`+ if (isBrewingMode)`
	`207`	`+ {`
	`208`	`+ postTemp(lastTemp);`
	`209`	`+ }`
	`210`	`+ else if (isFermentationMode)`
	`211`	`+ {`
	`212`	`+ postFermentationRate();`
	`213`	`+ }`
`208`	`214`	`}`
`209`	`215`	`}`
`210`	`216`	`}`
`@@ -366,13 +372,13 @@ float readTemp()`
`366`	`372`
`367`	`373`	`void postTemp(float temp)`
`368`	`374`	`{`
`369`		`- String payload = "{ \"a\":" + String(temp, 2) + ", \"b\": \"" + brewId + "\", \"c\": \"" + brewStage + "\" }";`
`370`		`- Particle.publish("BrewStageTemp", payload);`
	`375`	`+ String payload = "{ \"temperature\":" + String(temp, 2) + ", \"time\": \"" + millis() + "\" }";`
	`376`	`+ Particle.publish("brewing/temp", payload);`
`371`	`377`	`}`
`372`	`378`
`373`	`379`	`void postFermentationRate()`
`374`	`380`	`{`
`375`		`- String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + " }";`
	`381`	`+ String payload = "{ \"current_rate\":" + String(fermentationRate, 2) + ", \"time\": \"" + millis() + "\" }";`
`376`	`382`	`Particle.publish("fermentation/rate", payload);`
`377`	`383`	`}`
`378`	`384`