From e49a10f819482350c8970dfb8e8e9b715c977bd7 Mon Sep 17 00:00:00 2001 From: shelcrow Date: Fri, 16 Apr 2021 16:41:55 -0700 Subject: [PATCH 1/2] Model 711; Fixed labels and descriptions --- json/model_711.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/json/model_711.json b/json/model_711.json index 05b63dc..dc7f247 100644 --- a/json/model_711.json +++ b/json/model_711.json @@ -7,8 +7,8 @@ "Stored control sets - Number of control sets contained in NCtl - The first set is read-only and indicates the current settings." ], "count": "NCtl", - "desc": "Stored curve sets.", - "label": "Stored Curves", + "desc": "Stored control sets.", + "label": "Stored Controls", "name": "Ctl", "points": [ { @@ -162,19 +162,19 @@ "size": 1, "symbols": [ { - "desc": "Curve update in progress.", + "desc": "Control update in progress.", "label": "Update In Progress", "name": "IN_PROGRESS", "value": 0 }, { - "desc": "Curve update completed successfully.", + "desc": "Control update completed successfully.", "label": "Update Complete", "name": "COMPLETED", "value": 1 }, { - "desc": "Curve update failed.", + "desc": "Control update failed.", "label": "Update Failed", "name": "FAILED", "value": 2 @@ -183,8 +183,8 @@ "type": "enum16" }, { - "desc": "Number of stored curves supported.", - "label": "Stored Curve Count", + "desc": "Number of stored controls supported.", + "label": "Stored Control Count", "mandatory": "M", "name": "NCtl", "size": 1, From 9032cb9f403a9fee46572c5a0363c1dbc130bdff Mon Sep 17 00:00:00 2001 From: shelcrow Date: Fri, 16 Apr 2021 16:42:33 -0700 Subject: [PATCH 2/2] Model 713; Add SF 'Pct_SF', assigned SF to points SoC, SoH --- json/model_713.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/json/model_713.json b/json/model_713.json index af21489..75d4b6a 100644 --- a/json/model_713.json +++ b/json/model_713.json @@ -46,6 +46,7 @@ "desc": "State of charge of the DER storage.", "label": "State of Charge", "name": "SoC", + "sf": "Pct_SF", "size": 1, "type": "uint16", "units": "Pct" @@ -54,6 +55,7 @@ "desc": "State of health of the DER storage.", "label": "State of Health", "name": "SoH", + "sf": "Pct_SF", "size": 1, "type": "uint16", "units": "Pct" @@ -90,6 +92,15 @@ "label": "Energy Scale Factor", "name": "WH_SF", "size": 1, + "static": "S", + "type": "sunssf" + }, + { + "desc": "Scale factor for percentage.", + "label": "Percent Scale Factor", + "name": "Pct_SF", + "size": 1, + "static": "S", "type": "sunssf" } ],