$GC returns max current capacity

openenergymonitor · Mar 28, 2020 · 68f362c · 68f362c
1 parent 88fa612
commit 68f362c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/firmware/open_evse/rapi_proc.cpp b/firmware/open_evse/rapi_proc.cpp
@@ -570,7 +570,8 @@ int EvseRapiProcessor::processCmd()
 	u2.i = MAX_CURRENT_CAPACITY_L1;
       }
       u3.i = g_EvseController.GetCurrentCapacity();
-      sprintf(buffer,"%d %d %d",u1.i,u2.i,u3.i);
+      u4.i = g_EvseController.GetMaxCurrentCapacity();
+      sprintf(buffer,"%d %d %d %d",u1.i,u2.i,u3.i,u4.i);
       bufCnt = 1; // flag response text output
       rc = 0;
       break;

diff --git a/firmware/open_evse/rapi_proc.h b/firmware/open_evse/rapi_proc.h
@@ -220,11 +220,13 @@ GA - get ammeter settings
  $GA^22
 
 GC - get current capacity info
- response: $OK minamps maxamps pilotamps
+ response: $OK minamps hmaxamps pilotamps cmaxamps
  all values decimal
  minamps - min allowed current capacity
- maxamps - max allowed current capacity
+ hmaxamps - max hardware allowed current capacity MAX_CURRENT_CAPACITY_Ln
  pilotamps - current capacity advertised by pilot
+ cmaxamps - max configured allowed current capacity (saved to EEPROM)
+ n.b. maxamps,emaxamps values are dependent on the active service level (L1/L2)
  $GC^20
 
 GD - get Delay timer
@@ -315,7 +317,7 @@ Z0 closems holdpwm
 
 #ifdef RAPI
 
-#define RAPIVER "5.0.0"
+#define RAPIVER "5.1.0"
 
 #define WIFI_MODE_AP 0
 #define WIFI_MODE_CLIENT 1