replace old counter from OpenEVSE module with new EnergyMeter class on ESP

api.yml

@@ -59,8 +59,12 @@ paths:
                     temp3: -2560
                     state: 254
                     elapsed: 3473
-                    wattsec: 22493407
-                    watthour: 51536
+                    session_energy: 25034
+                    total_energy: 998
+                    total_day: 23
+                    total_week: 68
+                    total_month: 126
+                    total_year: 998
                     gfcicount: 0
                     nogndcount: 0
                     stuckcount: 0
@@ -617,6 +621,46 @@ paths:
         operationId: limit_clear
         tags:
           - Limit
+  /emeter:
+    delete:
+      summary: Reset Energy Meter
+      description: This will clear the Energy Meter
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                hard:
+                  type: int
+                  description: 0|1 Enable hard reset ( reset total_counter & total_switches)
+                import:
+                  type: int
+                  description: 0|1 Import OpenEvse module total kwh.
+      responses:
+        '200':
+          description: Reset counter ok
+          content:
+              application/json:
+              schema:
+                type: object
+                properties:
+                  msg:
+                    type: string
+                    description: Reset done
+        '500':
+          description: Failed to reset counter
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  msg:
+                    type: string
+                    description: Reset failed
+      operationId: energymeter-reset
+      tags:
+        - Energy Meter
 
   /tesla/vehicles:
     get:

models/Status.yaml

@@ -98,12 +98,24 @@ properties:
   elapsed:
     type: number
     description: 'The duration of the current charge session, in seconds'
-  wattsec:
-    type: integer
-    description: 'The amount of energy transfered in this charge session, in W/sec'
-  watthour:
-    type: integer
-    description: 'The total amount of energy transfered, in W/hour'
+  session_energy: 
+    type: number
+    description: 'The total amount of energy accumulated for current session (in wh)'
+  total_energy:
+    type: number
+    description: 'The total amount of energy accumulated (in kwh)'
+  total_day:
+    type: number
+    description: 'The total amount of energy accumulated today (in kwh)'
+  total_week:
+    type: number
+    description: 'The total amount of energy accumulated this week (in kwh)'
+  total_month:
+    type: number
+    description: 'The total amount of energy accumulated this month (in kwh)'
+  total_yaer:
+    type: number
+    description: 'The total amount of energy accumulated the year (in kwh)'
   gfcicount:
     type: integer
     description: Number of GFCI errors

platformio.ini

@@ -62,6 +62,7 @@ debug_flags =
   #-D ENABLE_PROFILE
   #-D ENABLE_NOISY_PROFILE
   #-D ENABLE_DEBUG_MICROTASKS
+  #-D ENABLE_DEBUG_ENERGY_METER
 src_build_flags =
 #  -D ARDUINOJSON_USE_LONG_LONG
 #  -D ENABLE_ASYNC_WIFI_SCAN

src/emonesp.h

@@ -116,7 +116,7 @@
 #endif
 
 #ifndef TOTAL_ENERGY_SCALE_FACTOR
-#define TOTAL_ENERGY_SCALE_FACTOR   1.0
+#define TOTAL_ENERGY_SCALE_FACTOR 1.0
 #endif
 
 #ifndef SESSION_ENERGY_SCALE_FACTOR
@@ -134,17 +134,21 @@
 #endif
 
 #ifndef TEMP_SCALE_FACTOR
-#define TEMP_SCALE_FACTOR   10.0
+#define TEMP_SCALE_FACTOR 10.0
 #endif
 
 #ifndef TOTAL_ENERGY_SCALE_FACTOR
-#define TOTAL_ENERGY_SCALE_FACTOR   1000.0
+#define TOTAL_ENERGY_SCALE_FACTOR 1000.0
 #endif
 
 #ifndef SESSION_ENERGY_SCALE_FACTOR
 #define SESSION_ENERGY_SCALE_FACTOR 3600.0
 #endif
 
+#ifndef POWER_SCALE_FACTOR
+#define POWER_SCALE_FACTOR  1.0
+#endif
+
 #endif
 
 #ifndef LED_DEFAULT_BRIGHTNESS