Merge pull request #8 from bobbydeveaux/master

updating README to reflect latest schema changes
aallan · Jun 12, 2018 · 82ce84a · 82ce84a
2 parents 62dcf75 + bceb5c1
commit 82ce84a
Showing 1 changed file with 40 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -43,21 +43,38 @@ The first message is for electricity updates,
 where you will receive an event object of the form,
 
 
-	{"id":"443719001958",
-	 "signal":
-	    {"rssi":"-66",
-	     "lqi":"127"},
-	 "battery":"100%",
-	 "channels":
-	    {"0":[
-	        {"current":"241.00", "units":"w"},
-	        {"day":"823.49", "units":"wh"}],
-	     "1":[
-	        {"current":"0.00", "units":"w"},
-	        {"day":"0.00", "units":"wh"}],
-	     "2":[
-	        {"current":"0.00", "units":"w"},
-	        {"day":"0.00", "units":"wh"}]}}		
+	   { id: '443719001958',
+	     ver: '2.0',
+	     timestamp: '1528824836',
+	     signal: { rssi: '-78', lqi: '67' },
+	     battery: { level: '100%' },
+	     channels:
+	      { chan:
+	         [ { id: '0',
+	             curr: { units: 'w', '$t': '466.00' },
+	             day: { units: 'wh', '$t': '7288.01' } },
+	           { id: '1',
+	             curr: { units: 'w', '$t': '504.00' },
+	             day: { units: 'wh', '$t': '13623.20' } },
+	           { id: '2',
+	             curr: { units: 'w', '$t': '0.00' },
+	             day: { units: 'wh', '$t': '0.00' } },
+	           { id: '3',
+	             curr: { units: 'w', '$t': '0.00' },
+	             day: { units: 'wh', '$t': '0.00' } },
+	           { id: '4',
+	             curr: { units: 'w', '$t': '0.00' },
+	             day: { units: 'wh', '$t': '0.00' } },
+	           { id: '5',
+	             curr: { units: 'w', '$t': '0.00' },
+	             day: { units: 'wh', '$t': '0.00' } } ] },
+	     property:
+	      { current: { watts: '466.00', cost: '15.02' },
+	        day: { wh: '7288.01', cost: '323.80' },
+	        tariff:
+	         { curr_price: '0.15',
+	           block_limit: '4294967295',
+	           block_usage: '18839' } } } }	
 
 as an argument to your callback function. The channels contain data for the current reading and the daily total for each of the channels/phases on the electricity transmitter. If the transmitter only has 1 channel, the last 2 channels will always contain 0 values.
 
@@ -115,13 +132,14 @@ Finally the fourth message is for solar updates, and will only occur if an Intui
 
 where you will receive an event object of the form
 
-      {"id":"443719001958",
-       "current":[
-          {"generating":1000,"units":"w"},
-          {"exporting":730, "units":"w"}],
-       "day":[
-          {"generated":23000, "units":"wh"},
-          {"exported":17000, "units":"wh"}]}
+       { id: '443719001958',
+	     timestamp: '1528824812',
+	     current:
+	      { generating: { units: 'w', '$t': '806.00' },
+	        exporting: { units: 'w', '$t': '0.00' } },
+	     day:
+	      { generated: { units: 'wh', '$t': '13611.39' },
+	        exported: { units: 'wh', '$t': '0.00' } } } 
 
 This contains sections for the current solar readings and the totals for the day. Both sections have generated and exported keys that contain the values for power generated by the PV system and power exported to the electricity grid.