2022-02-07 / Eason Yang

Action
1. Improve: The user must unplug the charging gun when the system is under complete mode to stop the transaction. And reset request is an exception.

File
1. main.c
Action 1

FIRMWARE VERSION: V0.53.XX.XXXX.NX

EVSE/Projects/Noodoe/Apps/main.c

@@ -21,7 +21,7 @@
 #define TMR_IDX_LOGPPRINTOUT			2
 #define TMR_IDX_PROFILE_PREPARE			3
 #define TMR_IDX_PWN_CHANGE				4
-#define TMR_IDX_CHECK_TASK					5
+#define TMR_IDX_CHECK_TASK				5
 #define TMR_IDX_6						6
 #define TMR_IDX_7						7
 #define TMR_IDX_8						8
@@ -4569,15 +4569,18 @@ int main(void)
 						setLedMotion(gun_index, LED_ACTION_STOP);
 						sleep(3);
 					}
+					
+					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A) || ocpp_get_reset_req())
+					{
+						ShmCharger->gun_info[gun_index].rfidReq = OFF;
+						ShmCharger->gun_info[gun_index].isAuthPassEnd = OFF;
+						ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
+						ocpp_set_remotestop(gun_index, OFF);
+						ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].schedule.isTriggerStop = OFF;
 
-					ShmCharger->gun_info[gun_index].rfidReq = OFF;
-					ShmCharger->gun_info[gun_index].isAuthPassEnd = OFF;
-					ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
-					ocpp_set_remotestop(gun_index, OFF);
-					ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].schedule.isTriggerStop = OFF;
-
-					DB_Insert_Record(localDb, gun_index);
-					setChargerMode(gun_index, SYS_MODE_IDLE);
+						DB_Insert_Record(localDb, gun_index);
+						setChargerMode(gun_index, SYS_MODE_IDLE);
+					}
 
 					break;
 				case SYS_MODE_ALARM: