github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-04-12 16:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-v2.2

Browse Source
This commit is contained in:
Gunnar Skjold
2022-10-13 20:47:48 +02:00
parent 95d3008a66 fa299198fc
commit e6df68481f
51 changed files with 863 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/JsonMqttHandler/json/json1.json
View File

@@ -1,8 +1,8 @@
{
"id" : "%s",
"name" : "%s",
"up" : %lu,
"t" : %lu,
"up" : %u,
"t" : %lld,
"vcc" : %.3f,
"rssi": %d,
"temp": %.2f,

4
lib/JsonMqttHandler/json/json2.json
View File

@@ -1,8 +1,8 @@
{
"id" : "%s",
"name" : "%s",
"up" : %lu,
"t" : %lu,
"up" : %u,
"t" : %lld,
"vcc" : %.3f,
"rssi": %d,
"temp": %.2f,

6
lib/JsonMqttHandler/json/json3.json
View File

@@ -1,8 +1,8 @@
{
"id" : "%s",
"name" : "%s",
"up" : %lu,
"t" : %lu,
"up" : %u,
"t" : %lld,
"vcc" : %.3f,
"rssi": %d,
"temp": %.2f,
@@ -24,7 +24,7 @@
"tPO" : %.3f,
"tQI" : %.3f,
"tQO" : %.3f,
"rtc" : %lu
"rtc" : %lld
},
"realtime" : {
"h" : %.2f,

12
lib/JsonMqttHandler/json/json4.json
View File

@@ -1,8 +1,8 @@
{
"id" : "%s",
"name" : "%s",
"up" : %lu,
"t" : %lu,
"up" : %u,
"t" : %lld,
"vcc" : %.3f,
"rssi": %d,
"temp": %.2f,
@@ -11,8 +11,14 @@
"id" : "%s",
"type" : "%s",
"P" : %d,
"P1" : %.2f,
"P2" : %.2f,
"P3" : %.2f,
"Q" : %d,
"PO" : %d,
"PO1" : %.2f,
"PO2" : %.2f,
"PO3" : %.2f,
"QO" : %d,
"I1" : %.2f,
"I2" : %.2f,
@@ -28,7 +34,7 @@
"tPO" : %.2f,
"tQI" : %.2f,
"tQO" : %.2f,
"rtc" : %lu
"rtc" : %lld
},
"realtime" : {
"h" : %.2f,