Merge pull request #95 from e-flux-platform/add-soc

e-flux-platform · Sep 4, 2024 · 70c9a2e · 70c9a2e
2 parents 1eade9c + 9211fac
commit 70c9a2e
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 52 deletions.
diff --git a/src/lib/ChargeStation/eventHandlers/ocpp-16/send-meter-values.ts b/src/lib/ChargeStation/eventHandlers/ocpp-16/send-meter-values.ts
@@ -1,13 +1,14 @@
 import { ChargeStationEventHandler } from 'lib/ChargeStation/eventHandlers';
 import { MeterValuesRequest } from 'schemas/ocpp/1.6/MeterValues';
 import clock from 'lib/ChargeStation/clock';
+
 const sendMeterValues: ChargeStationEventHandler = async ({
   chargepoint,
   session,
 }) => {
   const now = clock.now()
 
-  await chargepoint.writeCall<MeterValuesRequest>('MeterValues', {
+	chargepoint.writeCall<MeterValuesRequest>('MeterValues', {
     connectorId: session.connectorId,
     transactionId: Number(session.transactionId),
     meterValue: [
@@ -23,6 +24,18 @@ const sendMeterValues: ChargeStationEventHandler = async ({
           },
         ],
       },
+			{
+				timestamp: now.toISOString(),
+				sampledValue: [
+					{
+						value: session.stateOfCharge.toString(),
+						context: 'Sample.Periodic',
+						measurand: 'SoC',
+						location: 'Outlet',
+						unit: 'Percent'
+					}
+				]
+			}
     ],
   });
 };

diff --git a/...andlers/ocpp-16/send-start-transaction.js → ...andlers/ocpp-16/send-start-transaction.ts b/...andlers/ocpp-16/send-start-transaction.js → ...andlers/ocpp-16/send-start-transaction.ts
@@ -1,9 +1,14 @@
 import { sleep } from '../../../../utils/csv';
+import {ChargeStationEventHandler} from "lib/ChargeStation/eventHandlers";
+import {StartTransactionRequest} from "schemas/ocpp/1.6/StartTransaction";
 
-export default async function sendStartTransaction({ chargepoint, session }) {
+const sendStartTransaction: ChargeStationEventHandler = async ({
+	chargepoint,
+	session,
+}) => {
   chargepoint.sessions[session.connectorId].isStartingSession = true;
   await sleep(1000);
-  await chargepoint.writeCall(
+	chargepoint.writeCall<StartTransactionRequest>(
     'StartTransaction',
     {
       connectorId: session.connectorId,
@@ -15,3 +20,5 @@ export default async function sendStartTransaction({ chargepoint, session }) {
     session
   );
 }
+
+export default sendStartTransaction;
diff --git a/src/lib/ChargeStation/eventHandlers/ocpp-16/send-stop-transaction.js b/src/lib/ChargeStation/eventHandlers/ocpp-16/send-stop-transaction.js
diff --git a/src/lib/ChargeStation/eventHandlers/ocpp-16/send-stop-transaction.ts b/src/lib/ChargeStation/eventHandlers/ocpp-16/send-stop-transaction.ts
@@ -0,0 +1,54 @@
+import {sleep} from '../../../../utils/csv';
+import {ChargeStationEventHandler} from "lib/ChargeStation/eventHandlers";
+import {StopTransactionRequest} from "schemas/ocpp/1.6/StopTransaction";
+
+const sendStopTransaction: ChargeStationEventHandler = async ({
+	chargepoint,
+	session,
+}) => {
+	chargepoint.sessions[session.connectorId].isStoppingSession = true;
+
+	chargepoint.sessions[session.connectorId].tickInterval?.stop();
+	await sleep(1000);
+
+	chargepoint.writeCall<StopTransactionRequest>(
+		'StopTransaction',
+		{
+			idTag: session.options.uid,
+			meterStop: Math.round(session.kwhElapsed * 1000),
+			timestamp: session.now().toISOString(),
+			reason: 'EVDisconnected',
+			transactionId: Number(session.transactionId),
+			transactionData: [
+				{
+					timestamp: session.now().toISOString(),
+					sampledValue: [
+						{
+							value: session.kwhElapsed.toString(),
+							context: 'Sample.Periodic',
+							format: 'Raw',
+							measurand: 'Energy.Active.Import.Register',
+							location: 'Outlet',
+							unit: 'kWh',
+						},
+					],
+				},
+				{
+					timestamp: session.now().toISOString(),
+					sampledValue: [
+						{
+							value: session.stateOfCharge.toString(),
+							context: 'Transaction.End',
+							location: 'Outlet',
+							unit: 'Percent',
+							measurand: 'SoC',
+						}
+					]
+				}
+			],
+		},
+		session
+	);
+}
+
+export default sendStopTransaction;
diff --git a/src/lib/ChargeStation/eventHandlers/ocpp-20/send-start-transaction.ts b/src/lib/ChargeStation/eventHandlers/ocpp-20/send-start-transaction.ts
@@ -42,15 +42,27 @@ const sendStartTransaction: ChargeStationEventHandler = async ({
       },
       meterValue: [
         {
-          sampledValue: [
+					timestamp: startTime,
+					sampledValue: [
             {
               value: Math.round(session.kwhElapsed * 1000),
               context: 'Transaction.Begin',
               unitOfMeasure: { unit: 'kWh' },
             },
+
           ],
-          timestamp: startTime,
         },
+				{
+					timestamp: startTime,
+					sampledValue: [
+						{
+							value: session.stateOfCharge,
+							context: 'Transaction.Begin',
+							unitOfMeasure: { unit: 'Percent' },
+							measurand: 'SoC',
+						}
+					]
+				}
       ],
       evse: { id: evseId, connectorId },
       idToken: { idToken: session.options.uid, type: 'ISO14443' },

diff --git a/src/lib/ChargeStation/eventHandlers/ocpp-20/send-stop-transaction.ts b/src/lib/ChargeStation/eventHandlers/ocpp-20/send-stop-transaction.ts
@@ -15,7 +15,7 @@ const sendStopTransaction: ChargeStationEventHandler = async ({
 
   const now = clock.now().toISOString();
 
-  await chargepoint.writeCall(
+	chargepoint.writeCall(
     'TransactionEvent',
     {
       eventType: 'Ended',
@@ -28,25 +28,36 @@ const sendStopTransaction: ChargeStationEventHandler = async ({
       },
       meterValue: [
         {
-          sampledValue: [
+					timestamp: session.startTime.toISOString(),
+					sampledValue: [
             {
               value: 0.0,
               context: 'Transaction.Begin',
               unitOfMeasure: { unit: 'kWh' },
             },
           ],
-          timestamp: session.startTime.toISOString(),
         },
         {
-          sampledValue: [
+					timestamp: now,
+					sampledValue: [
             {
               value: session.kwhElapsed,
               context: 'Transaction.End',
               unitOfMeasure: { unit: 'kWh' },
             },
           ],
-          timestamp: now,
         },
+				{
+					timestamp: now,
+					sampledValue: [
+						{
+							value: session.stateOfCharge,
+							context: 'Transaction.End',
+							unitOfMeasure: { unit: 'Percent' },
+							measurand: 'SoC',
+						}
+					],
+				}
       ],
       evse: { id: 1, connectorId: session.connectorId },
       idToken: { idToken: session.options.uid, type: 'ISO14443' },
@@ -56,7 +67,7 @@ const sendStopTransaction: ChargeStationEventHandler = async ({
 
   await sleep(1000);
 
-  await chargepoint.writeCall('StatusNotification', {
+	chargepoint.writeCall('StatusNotification', {
     timestamp: clock.now().toISOString(),
     connectorStatus: 'Available',
     evseId: 1,

diff --git a/src/lib/ChargeStation/eventHandlers/ocpp-20/send-transaction-event-updated.ts b/src/lib/ChargeStation/eventHandlers/ocpp-20/send-transaction-event-updated.ts
@@ -1,7 +1,5 @@
 import { ChargeStationEventHandler } from 'lib/ChargeStation/eventHandlers';
-
 import { TransactionEventRequest } from 'schemas/ocpp/2.0/TransactionEventRequest';
-
 import clock from '../../clock';
 
 const sendTransationEventUpdated: ChargeStationEventHandler = ({
@@ -21,7 +19,8 @@ const sendTransationEventUpdated: ChargeStationEventHandler = ({
     },
     meterValue: [
       {
-        sampledValue: [
+				timestamp: now.toISOString(),
+				sampledValue: [
           {
             value: Number(session.kwhElapsed.toFixed(3)),
             context: 'Sample.Periodic',
@@ -30,8 +29,19 @@ const sendTransationEventUpdated: ChargeStationEventHandler = ({
             unitOfMeasure: { unit: 'kWh' },
           },
         ],
-        timestamp: now.toISOString(),
       },
+			{
+				timestamp: now.toISOString(),
+				sampledValue: [
+					{
+						value: session.stateOfCharge,
+						context: 'Sample.Periodic',
+						measurand: 'SoC',
+						location: 'Outlet',
+						unitOfMeasure: { unit: 'Percent' }
+					}
+				]
+			}
     ],
     evse: { id: 1, connectorId: session.connectorId },
   });

diff --git a/src/lib/ChargeStation/index.ts b/src/lib/ChargeStation/index.ts
@@ -479,6 +479,10 @@ export class Session {
     return this.chargeStation.currentStatus[this.connectorId];
   }
 
+	get stateOfCharge(): number {
+		return this.carBatteryStateOfCharge ;
+	}
+
   now(): Date {
     return clock.now();
   }
@@ -498,10 +502,13 @@ export class Session {
     }
     const amountKwhToCharge = (this.maxPowerKw / 3600) * secondsElapsed;
 
+		this.carBatteryStateOfCharge += amountKwhToCharge / this.carBatteryKwh * 100;
+
     const carNeededKwh =
       this.carBatteryKwh -
       this.carBatteryKwh * (this.carBatteryStateOfCharge / 100);
-    const chargeLimitReached = this.kwhElapsed >= carNeededKwh;
+
+		const chargeLimitReached = carNeededKwh <= 0;
 
     console.info(
       `Charge session tick (connectorId=${this.connectorId}, carNeededKwh=${carNeededKwh}, chargeLimitReached=${chargeLimitReached}, amountKwhToCharge=${amountKwhToCharge}, currentStatus=${this.connectorStatus}`

diff --git a/src/lib/ChargeStation/utils.ts b/src/lib/ChargeStation/utils.ts
@@ -38,4 +38,4 @@ export function summarizeCommandParams({
 
 export function toCamelCase(value: string) {
   return value.charAt(0).toLowerCase() + value.slice(1);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,4 +38,4 @@ export function summarizeCommandParams({ @@
     export function toCamelCase(value: string) {
       return value.charAt(0).toLowerCase() + value.slice(1);
-    }
+    }