ソースを参照

Merge branch 'Noodoe'

FolusWen 4 年 前
コミット
c02e77e9e8
1 ファイル変更16 行追加1 行削除
  1. 16 1
      EVSE/Projects/Noodoe/Apps/main.c

+ 16 - 1
EVSE/Projects/Noodoe/Apps/main.c

@@ -1181,7 +1181,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.32.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.33.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2818,6 +2818,7 @@ int main(void)
 								}
 							}
 							DEBUG_INFO("End request User Id : %s\r\n", ShmSysConfigAndInfo->SysConfig.UserId);
+							DEBUG_INFO("Start method : %d...\r\n ", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod);
 
 							if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_RFID)
 							{
@@ -2852,6 +2853,20 @@ int main(void)
 										break;
 								}
 							}
+							else if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BACKEND)
+							{
+								ShmCharger->gun_info[gun_index].rfidReq = OFF;
+								DEBUG_INFO("Need to match with start method : START_METHOD_BACKEND...\r\n");
+								setChargerMode(gun_index, SYS_MODE_CHARGING);
+							}
+							else if (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BLE)
+							{
+								ShmCharger->gun_info[gun_index].rfidReq = OFF;
+								DEBUG_INFO("Need to match with start method : START_METHOD_BLE...\r\n");
+								setChargerMode(gun_index, SYS_MODE_CHARGING);
+							}
+							else
+							{}
 						}
 						else
 						{