|
@@ -89,6 +89,13 @@ sqlite3 *localDb;
|
|
|
|
|
|
struct SysConfigData SysConfigOrg;
|
|
|
|
|
|
+struct PreviousData
|
|
|
+{
|
|
|
+ uint16_t targetCurrent;
|
|
|
+ uint16_t current_limit;
|
|
|
+ uint16_t primaryMcuCp_Pwn_Duty;
|
|
|
+}previousData[4];
|
|
|
+
|
|
|
//=================================
|
|
|
// Common routine
|
|
|
//=================================
|
|
@@ -2650,6 +2657,7 @@ int upgrade_check()
|
|
|
int isMatchStartUser(unsigned char gun_index)
|
|
|
{
|
|
|
uint8_t tmpUser[32];
|
|
|
+ uint8_t isPrintLogOut;
|
|
|
|
|
|
if(ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian)
|
|
|
{
|
|
@@ -2692,10 +2700,14 @@ int isMatchStartUser(unsigned char gun_index)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- DEBUG_INFO("==== isMatchStartUser ==== \n");
|
|
|
- DEBUG_INFO("tmpUser : %s \n", tmpUser);
|
|
|
- DEBUG_INFO("StartUserId : %s \n", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId);
|
|
|
- DEBUG_INFO("========================== \n");
|
|
|
+ if(isPrintLogOut == OFF)
|
|
|
+ {
|
|
|
+ DEBUG_INFO("==== isMatchStartUser ==== \n");
|
|
|
+ DEBUG_INFO("tmpUser : %s \n", tmpUser);
|
|
|
+ DEBUG_INFO("StartUserId : %s \n", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId);
|
|
|
+ DEBUG_INFO("========================== \n");
|
|
|
+ isPrintLogOut = YES;
|
|
|
+ }
|
|
|
|
|
|
return ((strcmp((char*)tmpUser, (char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartUserId)==0)?YES:NO);
|
|
|
}
|
|
@@ -3524,12 +3536,14 @@ void checkAvailability(uint8_t gun_index)
|
|
|
|
|
|
void checkChargingProfileLimit(uint8_t gun_index, uint8_t system_mode)
|
|
|
{
|
|
|
+ /*
|
|
|
static struct PreviousData
|
|
|
{
|
|
|
uint16_t targetCurrent;
|
|
|
uint16_t current_limit;
|
|
|
uint16_t primaryMcuCp_Pwn_Duty;
|
|
|
}previousData[4];
|
|
|
+ */
|
|
|
|
|
|
if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
|
|
|
{
|
|
@@ -4205,6 +4219,11 @@ int main(void)
|
|
|
|
|
|
// Response StopTransactionConf
|
|
|
ocpp_set_stoptransaction_conf(gun_index, OFF);
|
|
|
+
|
|
|
+ previousData[gun_index].primaryMcuCp_Pwn_Duty = 0;
|
|
|
+ previousData[gun_index].targetCurrent = 0;
|
|
|
+ previousData[gun_index].current_limit = 0;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
if(ocpp_get_isRemoteStartWait())
|