|
|
@@ -324,8 +324,8 @@ enum CoreProfile {
|
|
|
FreeVend,
|
|
|
OcppServer,
|
|
|
MaintainServer,
|
|
|
- StatusNotificationPeriodically,
|
|
|
- StatusNotificationInterval,
|
|
|
+ StatusNotificationPeriodically,
|
|
|
+ StatusNotificationInterval,
|
|
|
ConfigurationVersion,
|
|
|
_CoreProfile_CNT
|
|
|
};
|
|
|
@@ -467,7 +467,9 @@ typedef union
|
|
|
unsigned int HardResetStop:1; // 0: no effect, 1: hard reset stop
|
|
|
unsigned int SoftResetStop:1; // 0: no effect, 1: soft reset stop
|
|
|
unsigned int InvalidIdStop:1; // 0: no effect, 1: invalid stop when StopTransactionOnInvalidId is true
|
|
|
- unsigned int res:25;
|
|
|
+ unsigned int RemoteStop:1; // 0: no effect, 1: remote stop
|
|
|
+ unsigned int UnlockStop:1; // 0: no effect, 1: unlock stop
|
|
|
+ unsigned int res:23;
|
|
|
}bits;
|
|
|
}ChargingStop;
|
|
|
|
|
|
@@ -702,26 +704,12 @@ typedef union
|
|
|
unsigned int MiscNeedAnnouncement:1; // 0: no need, 1: need send misc command
|
|
|
unsigned int NeedDispenserVerInfo:1; // 0: no need, 1: need dispenser to report it's version info
|
|
|
unsigned int AuthorizeRequest:1; // 0: idle, 1: requesting ( dispenser -> cabinet)
|
|
|
- unsigned int ConnectorTimeoutConfigRequest:1; // 0: no request, 1: connector timeout setting ( ocpp -> cabinet -> dispenser)
|
|
|
- unsigned int DefaultPriceConfigRequest:1; // 0: no request, 1: default price setting ( ocpp -> cabinet -> dispenser)
|
|
|
- unsigned int CurrencyConfigRequest:1; // 0: no request, 1: currency setting ( ocpp -> cabinet -> dispenser)
|
|
|
- unsigned int HardwareRebootRequest:1; // 0: no request, 1: hardware reboot request ( ocpp -> cabinet -> dispenser)
|
|
|
unsigned int HardwareRebootConfirm:1; // 0: no effect, 1: dispenser confirmed
|
|
|
- unsigned int SoftwareResetRequest:1; // 0: no request, 1: software reset request ( ocpp -> cabinet -> dispenser)
|
|
|
unsigned int SoftwareResetConfirm:1; // 0: no effect, 1: dispenser confirmed
|
|
|
unsigned int FirmwareUpdateRequest:1; // firmware update request
|
|
|
unsigned int FirmwareUpdateConfirm:1; // firmware update start
|
|
|
unsigned int FirmwareUpdateCompleted:1; // firmware update completed
|
|
|
- unsigned int BackendStatusRequest:1; // 0: no request, 1: backend connection status has changed ( cabinet -> dispenser)
|
|
|
- unsigned int EthernetStatusRequest:1; // 0: no request, 1: ethernet connection status has changed ( cabinet -> dispenser)
|
|
|
- unsigned int WiFiStatusRequest:1; // 0: no request, 1: wifi connection status has changed ( cabinet -> dispenser)
|
|
|
- unsigned int TelcomModemStatusRequest:1; // 0: no request, 1: 4g connection status has changed ( cabinet -> dispenser)
|
|
|
- unsigned int BillingStatusRequest:1; // 0: no request, 1: billing status has changed ( cabinet -> dispenser)
|
|
|
- unsigned int StopButtonStatusRequest:1; // 0: no request, 1: stop charging button status has changed ( cabinet -> dispenser)
|
|
|
- unsigned int AuthModeConfigRequest:1; // 0: no request, 1: AuthMode Config has changed ( cabinet -> dispenser)
|
|
|
- unsigned int EVCCIDConfigRequest:1; // 0: no request, 1: EVCCID Config has changed ( cabinet -> dispenser)
|
|
|
- unsigned int LEDIntensityRequest:1; // 0: no request, 1: LED Intensity has changed ( cabinet -> dispenser)
|
|
|
- unsigned int res:7;
|
|
|
+ unsigned int res:21;
|
|
|
}bits;
|
|
|
}DispenserSettingFlag;
|
|
|
|
|
|
@@ -797,10 +785,6 @@ struct DispenserInfoData
|
|
|
}CheckInLog; // record dispenser checkin status
|
|
|
unsigned char ConnectorLog[GENERAL_GUN_QUANTITY]; // record connector quantity of dispenser
|
|
|
struct ConnectionInfoData ConnectionInfo[GENERAL_GUN_QUANTITY];
|
|
|
-
|
|
|
- unsigned short ConnectorTimeout; // connector plug in timeout, unit 1s
|
|
|
- unsigned int DefaultPrice; // dispenser default price, unit: 0.01 (dollar/kWh)
|
|
|
- unsigned char Currency; // dispenser currency index
|
|
|
};
|
|
|
|
|
|
struct WARNING_CODE_INFO
|
|
|
@@ -818,16 +802,11 @@ typedef union
|
|
|
struct
|
|
|
{
|
|
|
unsigned int PermissionRequest:1; // 0: no request, 1: dispenser request to charging ( dispenser -> cabinet)
|
|
|
- unsigned int RemoteStartRequest:1; // 0: no request, 1: remote start ( ocpp -> cabinet -> dispenser)
|
|
|
unsigned int RemoteStartConfirm:1;
|
|
|
- unsigned int RemoteStopRequest:1; // 0: no request, 1: remote stop ( ocpp -> cabinet -> dispenser)
|
|
|
unsigned int RemoteStopConfirm:1;
|
|
|
- unsigned int UnlockStopRequest:1; // 0: no request, 1: Unlock stop ( ocpp -> cabinet -> dispenser)
|
|
|
unsigned int UnlockStopConfirm:1;
|
|
|
unsigned int TimeoutStopRequest:1; // 0: no request, 1: ethernet timeout stop ( dispenser -> cabinet)
|
|
|
unsigned int PsuReleasable:1;
|
|
|
- unsigned int AvailabilityRequest:1; // 0: no request, 1: change availability ( ocpp -> cabinet -> dispenser)
|
|
|
- unsigned int AccountBalanceRequest:1; // 0: no request, 1: set account balance ( ocpp -> cabinet -> dispenser)
|
|
|
unsigned int AnnounceBalance:1; //
|
|
|
unsigned int StartWaitPlug:1; //
|
|
|
unsigned int NeedCleanAuthorizeInfo:1; //
|
|
|
@@ -840,7 +819,7 @@ typedef union
|
|
|
unsigned int Disconnection:1;
|
|
|
unsigned int GfdDetection:1; // 0: stop, 1: start
|
|
|
unsigned int GetStartChargingSoc:1; // 0: no effect, 1: get start soc
|
|
|
- unsigned int res:8;
|
|
|
+ unsigned int res:13;
|
|
|
}bits;
|
|
|
}ConnectorParameter;
|
|
|
|
|
|
@@ -880,6 +859,7 @@ struct ConnectorInfoData
|
|
|
unsigned int UserPrice; // connector user's user price, unit: 0.01 (dollar / kWh)
|
|
|
unsigned int TotalCost; // connector user's total cost, unit: 0.01 dollar
|
|
|
int AccountBalance; // connector user's account balance, unit: 0.01 dollar
|
|
|
+ int CostDiscount; // connector user's account balance, unit: 0.01 dollar
|
|
|
};
|
|
|
|
|
|
typedef union
|
|
|
@@ -895,23 +875,6 @@ typedef union
|
|
|
}bits;
|
|
|
}CabinetSettingFlag;
|
|
|
|
|
|
-typedef struct
|
|
|
-{
|
|
|
- unsigned int ConnectionTimeout; // unit: 1s
|
|
|
- unsigned int DefaultPrice; // unit: 0.01dollar
|
|
|
- unsigned int Currency; // currency index
|
|
|
- unsigned int BackendStatus; // 0: disable, 1: connected, 2: disconnected
|
|
|
- unsigned int EthernetStatus; // 0: disable, 1: connected, 2: disconnected
|
|
|
- unsigned int WiFiStatus; // 0: disable, 1: connected, 2: disconnected
|
|
|
- unsigned int TelcomModemStatus; // 0: disable, 1: connected, 2: disconnected
|
|
|
- unsigned int BillingStatus; // 0: disable, 1: enable
|
|
|
- unsigned int StopChargingButton; // 0: disable, 1: enable
|
|
|
- unsigned int HardwareReboot; // 1: HardwareReboot, Other value: no effect
|
|
|
- unsigned int SoftwareRestart; // 1: SoftwareRestart, Other value: no effect
|
|
|
- unsigned int AuthModeConfig; // 0: enable, 1: disable
|
|
|
- unsigned int EVCCIDConfig; // 0: disable, 1: enable
|
|
|
-}CabinetMiscCommand;
|
|
|
-
|
|
|
typedef struct DC_METER_INFO
|
|
|
{
|
|
|
double presetVoltage; // resolution: 1.000v
|
|
|
@@ -1014,7 +977,6 @@ struct SysInfoData
|
|
|
unsigned char AuthorizedType; // record authorized type
|
|
|
unsigned char AuthorizedStatus; // cabinet authorized status
|
|
|
CabinetSettingFlag CabinetSetting;
|
|
|
- CabinetMiscCommand CabinetMicsStatus;
|
|
|
struct LocalSharingInfo localSharingInfo; // Local power sharing info structure
|
|
|
DC_Meter_Info DcMeterInfo[4];
|
|
|
unsigned char OTPTemp; // OTP Temperature
|
|
|
@@ -4598,12 +4560,12 @@ struct StructSessionTarget
|
|
|
//===================================
|
|
|
struct StructRefundStatus
|
|
|
{
|
|
|
- unsigned char status[10];
|
|
|
- unsigned char chargeDate[32];
|
|
|
- int holdAmt;
|
|
|
- int chargeAmt;
|
|
|
- int refundAmt;
|
|
|
- int page;
|
|
|
+ unsigned char status[10];
|
|
|
+ unsigned char chargeDate[32];
|
|
|
+ int holdAmt;
|
|
|
+ int chargeAmt;
|
|
|
+ int refundAmt;
|
|
|
+ int page;
|
|
|
};
|
|
|
|
|
|
struct StructDeductStatus
|
Wendell