From a44ec5dfa721e47cfe76ccba97dda4ba682c9217 Mon Sep 17 00:00:00 2001
From: Glyn Hudson <glynhudson@users.noreply.github.com>
Date: Thu, 1 Nov 2018 18:05:19 +0000
Subject: [PATCH] update openevse device template for new total wh accumulator

https://github.com/OpenEVSE/ESP8266_WiFi_v2.x/pull/195
---
 data/OpenEnergyMonitor/openevse.json | 34 ++++++++++++++++------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/data/OpenEnergyMonitor/openevse.json b/data/OpenEnergyMonitor/openevse.json
index 1acf21c..0f75e27 100644
--- a/data/OpenEnergyMonitor/openevse.json
+++ b/data/OpenEnergyMonitor/openevse.json
@@ -6,7 +6,7 @@
     "inputs": [
         {
             "name": "amp",
-            "description": "Charge current",
+            "description": "Real-time charging current",
             "processList": [
                 {
                     "process": "scale",
@@ -14,23 +14,27 @@
                 },
                 {
                     "process": "log_to_feed",
-                    "arguments": { "type": "ProcessArg::FEEDID", "value": "amp" }
+                    "arguments": { "type": "ProcessArg::FEEDID", "value": "current" }
                 }
             ]
         },
         {
             "name": "wh",
-            "description": "Cumulative Watt Hours",
+            "description": "Cumulative Energy",
             "processList": [
                 {
-                    "process": "log_to_feed",
-                    "arguments": { "type": "ProcessArg::FEEDID", "value": "wh" }
+                    "process": "scale",
+                    "arguments": { "type": "ProcessArg::VALUE", "value": 0.001 }
+                },
+                {
+                    "process": "wh_accumulator",
+                    "arguments": { "type": "ProcessArg::FEEDID", "value": "energy" }
                 }
             ]
         },
         {
             "name": "temp1",
-            "description": "Charger temperature",
+            "description": "EVSE internal temperature",
             "processList": [
                 {
                     "process": "scale",
@@ -38,7 +42,7 @@
                 },
                 {
                     "process": "log_to_feed",
-                    "arguments": { "type": "ProcessArg::FEEDID", "value": "temp1" }
+                    "arguments": { "type": "ProcessArg::FEEDID", "value": "temperature" }
                 }
             ]
         },
@@ -64,11 +68,11 @@
         },
         {
             "name": "divertmode",
-            "description": "Divert Mode",
+            "description": "Divert Mode state",
             "processList": [
                 {
                     "process": "log_to_feed",
-                    "arguments": { "type": "ProcessArg::FEEDID", "value": "divertmode" }
+                    "arguments": { "type": "ProcessArg::FEEDID", "value": "divertmode_state" }
                 }
             ]
         }
@@ -76,21 +80,21 @@
 
     "feeds": [
         {
-            "name": "amp",
+            "name": "current",
             "type": "DataType::REALTIME",
             "engine": "Engine::PHPFINA",
             "interval": "30",
             "unit": "A"
         },
         {
-            "name": "wh",
+            "name": "energy",
             "type": "DataType::REALTIME",
             "engine": "Engine::PHPFINA",
             "interval": "30",
-            "unit": "Wh"
+            "unit": "kWh"
         },
         {
-            "name": "temp1",
+            "name": "temperature",
             "type": "DataType::REALTIME",
             "engine": "Engine::PHPFINA",
             "interval": "30",
@@ -108,10 +112,10 @@
             "type": "DataType::REALTIME",
             "engine": "Engine::PHPFINA",
             "interval": "30",
-            "unit": ""
+            "unit": "A"
         },
         {
-            "name": "divertmode",
+            "name": "divertmode_state",
             "type": "DataType::REALTIME",
             "engine": "Engine::PHPFINA",
             "interval": "30",