Merge branch 'gateway'

.drone.yml

@@ -10,8 +10,8 @@ platform:
 steps:
 - name: upload
   commands:
-  - service ser2net stop
   - cd gateway
+  - service ser2net stop
   - pio run -e pro-mini
   - echo -n 'reset' > /dev/ttyUSB0; sleep 1s; avrdude -patmega328p -carduino -P/dev/ttyUSB0 -b115200 -D -Uflash:w:.pio/build/pro-mini/firmware.hex:i -v
   - service ser2net start

gateway/src/gateway.cpp

@@ -2,8 +2,6 @@
 #include <RCSwitch.h>
 #include <Adafruit_Sensor.h>
 #include "Tiny.h"
-
-#define ARDUINOJSON_ENABLE_NAN 1
 #include <ArduinoJson.h>
 #include "Dht.h"
 
@@ -48,11 +46,13 @@ void loop() {
 bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) {
 	jsonDoc["id"] = ID(value);
 
+	float voltage = (float)GET_VCC(value) / 1000;
+	if (voltage != 0) {
+		JsonObject diagnostic = jsonDoc.createNestedObject("diagnostic");
+		diagnostic["voltage"] = voltage;
+	}
+
 	JsonObject sensor = jsonDoc.createNestedObject("sensor");
-
-	unsigned long voltage = GET_VCC(value);
-	sensor["voltage"] = voltage == 0 ? NAN : (float)voltage / 1000;
-
 	switch (GET_TYPE(value)) {
 	case SensorType::GENERIC:
 		sensor["value"] = GET_VALUE(value);