X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ServiceUtils.ts;h=932d4515f6d0fcc7d0c259f3fe8ff000e11423ed;hb=4cf856f0ff988b709da7b9185913266146e82add;hp=52157e3474578ed7b782645370f40c88e86667fa;hpb=0ce9babe5c83eced0e773109d4393c1ab487039f;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts index 52157e34..932d4515 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts @@ -16,8 +16,6 @@ import { MeterValueContext, MeterValueLocation, MeterValueUnit, - OCPP16ChargePointErrorCode, - type OCPP16ChargePointStatus, type OCPP16ChargingProfile, type OCPP16IncomingRequestCommand, type OCPP16MeterValue, @@ -26,15 +24,13 @@ import { OCPP16RequestCommand, type OCPP16SampledValue, OCPP16StandardParametersKey, - type OCPP16StatusNotificationRequest, - type OCPP16StatusNotificationResponse, type OCPP16SupportedFeatureProfiles, OCPPVersion, type SampledValueTemplate, Voltage, } from '../../../types'; import { ACElectricUtils, Constants, DCElectricUtils, Utils, logger } from '../../../utils'; -import { OCPP16Constants, OCPPServiceUtils } from '../internal'; +import { OCPPServiceUtils } from '../internal'; export class OCPP16ServiceUtils extends OCPPServiceUtils { public static checkFeatureProfile( @@ -844,58 +840,6 @@ export class OCPP16ServiceUtils extends OCPPServiceUtils { ); } - public static async sendAndSetConnectorStatus( - chargingStation: ChargingStation, - connectorId: number, - status: OCPP16ChargePointStatus, - errorCode: OCPP16ChargePointErrorCode = OCPP16ChargePointErrorCode.NO_ERROR - ) { - OCPP16ServiceUtils.checkConnectorStatusTransition(chargingStation, connectorId, status); - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId, - status, - errorCode, - }); - chargingStation.getConnectorStatus(connectorId).status = status; - } - - private static checkConnectorStatusTransition( - chargingStation: ChargingStation, - connectorId: number, - status: OCPP16ChargePointStatus - ): boolean { - if ( - connectorId === 0 && - !OCPP16Constants.OCPP16ChargePointStatusChargingStationTransition.has([ - chargingStation.getConnectorStatus(connectorId).status as OCPP16ChargePointStatus, - status, - ]) - ) { - logger.warn( - `${chargingStation.logPrefix()} Connector ${connectorId} status transition from ${ - chargingStation.getConnectorStatus(connectorId).status - } to ${status} is not allowed` - ); - return false; - } else if ( - !OCPP16Constants.OCPP16ChargePointStatusConnectorTransition.has([ - chargingStation.getConnectorStatus(connectorId).status as OCPP16ChargePointStatus, - status, - ]) - ) { - logger.warn( - `${chargingStation.logPrefix()} Connector ${connectorId} status transition from ${ - chargingStation.getConnectorStatus(connectorId).status - } to ${status} is not allowed` - ); - return false; - } - return true; - } - private static buildSampledValue( sampledValueTemplate: SampledValueTemplate, value: number,