|
|
@@ -77,6 +77,54 @@ unsigned long GetClockTimeoutValue(struct timespec _start_time)
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
|
+void changeTimeFormat(char* str, struct tm *_trTime)
|
|
|
+{
|
|
|
+ //2022-04-29 06:22:00
|
|
|
+ int i;
|
|
|
+ char year[4];
|
|
|
+ char mon[2];
|
|
|
+ char day[2];
|
|
|
+ char hr[2];
|
|
|
+ char min[2];
|
|
|
+ char sec[2];
|
|
|
+ for (i = 0; i < 4; i++) {
|
|
|
+ year[i] = str[i];
|
|
|
+ }
|
|
|
+ _trTime->tm_year = atoi(year) - 1900;
|
|
|
+ for (i = 0; i < 2; i++) {
|
|
|
+ mon[i] = str[i+5];
|
|
|
+ }
|
|
|
+ _trTime->tm_mon = atoi(mon) - 1;
|
|
|
+
|
|
|
+ for (i = 0; i < 2; i++) {
|
|
|
+ day[i] = str[i + 8];
|
|
|
+ }
|
|
|
+ _trTime->tm_mday = atoi(day);
|
|
|
+
|
|
|
+ for (i = 0; i < 2; i++) {
|
|
|
+ hr[i] = str[i + 11];
|
|
|
+ }
|
|
|
+ _trTime->tm_hour = atoi(hr);
|
|
|
+ for (i = 0; i < 2; i++) {
|
|
|
+ min[i] = str[i + 14];
|
|
|
+ }
|
|
|
+ _trTime->tm_min = atoi(min);
|
|
|
+ for (i = 0; i < 2; i++) {
|
|
|
+ sec[i] = str[i + 17];
|
|
|
+ }
|
|
|
+ _trTime->tm_sec = atoi(sec);
|
|
|
+ _trTime->tm_isdst = 0;
|
|
|
+}
|
|
|
+int GetChargingDuration(char* st,char* et)
|
|
|
+{
|
|
|
+ struct tm StartTime,EndTime;
|
|
|
+ time_t t_start, t_end;
|
|
|
+ changeTimeFormat(st, &StartTime);
|
|
|
+ changeTimeFormat(et, &EndTime);
|
|
|
+ t_start = mktime(&StartTime);
|
|
|
+ t_end = mktime(&EndTime);
|
|
|
+ return difftime(t_end, t_start);
|
|
|
+}
|
|
|
int CreateCommunicationLcmPort()
|
|
|
{
|
|
|
int fd;
|
|
|
@@ -124,12 +172,18 @@ void ReadMsgFromLcm(uint8_t *msg, uint8_t readLen)
|
|
|
case CMD_REGISTER: {
|
|
|
// 頁面
|
|
|
strcpy((char *)pSysInfo->LcmHwRev, moduleName);
|
|
|
- _currentPage = *(msg + 7);
|
|
|
+ //_currentPage = *(msg + 7);
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
} else if (*(msg + 3) == CMD_MULTI_READ) {
|
|
|
-
|
|
|
+ short key = ((short)(*(msg + 4) << 8) + *(msg + 5));
|
|
|
+ if (key == _LCM_VERSION) {
|
|
|
+ if (strcmp((char*)pSysInfo->LcmHwRev, "") != EQUAL)
|
|
|
+ strcpy((char*)pSysInfo->LcmHwRev, moduleName);
|
|
|
+ if (atoi((char*)(msg + 7)) != 0)
|
|
|
+ ShmDcCommonData->LcmFwVersion = atoi((char*)(msg + 7));
|
|
|
+ }
|
|
|
// switch ((unsigned short) (*(msg + 4) << 8) + (unsigned short) *(msg + 5))
|
|
|
// {
|
|
|
// case BUTTON_GUN_INDEX:
|
|
|
@@ -153,7 +207,7 @@ void GetHrFormTimeString(char* time,char* hr)
|
|
|
_temp_hr = atoi(hr) + 8 - 24;
|
|
|
sprintf(hr, "%02d", _temp_hr);
|
|
|
} else if( atoi(hr) == NULL ) {
|
|
|
- strcmp(hr,"");
|
|
|
+ strcpy(hr,"");
|
|
|
}
|
|
|
}
|
|
|
void GetMinFormTimeString(char* time,char* min)
|
|
|
@@ -163,7 +217,17 @@ void GetMinFormTimeString(char* time,char* min)
|
|
|
min[i] = time[i+14];
|
|
|
}
|
|
|
if( atoi(min) == NULL || atoi(min) > 60) {
|
|
|
- strcmp(min,"");
|
|
|
+ strcpy(min,"");
|
|
|
+ }
|
|
|
+}
|
|
|
+void GetSecFormTimeString(char* time, char* sec)
|
|
|
+{
|
|
|
+ //char tm[] = "2021-12-06 17:29:08:084";
|
|
|
+ for (int i = 0; i < 2; i++) {
|
|
|
+ sec[i] = time[i + 17];
|
|
|
+ }
|
|
|
+ if (atoi(sec) == NULL || atoi(sec) > 60) {
|
|
|
+ strcpy(sec, "");
|
|
|
}
|
|
|
}
|
|
|
//================================================
|
|
|
@@ -303,7 +367,11 @@ void ChangeCurPage()
|
|
|
//log_info("cur = %d ,system = %d, lcm = %d ",_currentPage, pSysInfo->SystemPage, pSysInfo->PageIndex);
|
|
|
struct ChargingInfoData *pDcChargingInfo_0 = (struct ChargingInfoData *)GetDcChargingInfoData(LEFT_GUN_NUM);
|
|
|
struct ChargingInfoData *pDcChargingInfo_1 = (struct ChargingInfoData *)GetDcChargingInfoData(RIGHT_GUN_NUM);
|
|
|
-
|
|
|
+ if (pSysWarning->Level == WARN_LV_ER) {
|
|
|
+ pSysInfo->SystemPage = _LCM_MAINTAIN;
|
|
|
+ if (ShmPrimaryMcuData->InputDet.bits.EmergencyButton)
|
|
|
+ pSysInfo->SystemPage = _LCM_EMERGENCY;
|
|
|
+ }
|
|
|
|
|
|
switch (pSysInfo->SystemPage) {
|
|
|
case _LCM_VIEW:
|
|
|
@@ -315,16 +383,100 @@ void ChangeCurPage()
|
|
|
pSysInfo->PageIndex = __VIEW_RIGHT_CHARGE_;
|
|
|
} else if(pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_CHARGING) {
|
|
|
pSysInfo->PageIndex = __VIEW_ALL_CHARGE_;
|
|
|
- } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && pDcChargingInfo_1->SystemStatus == S_CHARGING) {
|
|
|
- pSysInfo->PageIndex = __VIEW_L_FAIL_R_CHARGE;
|
|
|
- } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_ALARM) {
|
|
|
- pSysInfo->PageIndex = __VIEW_L_CHARGE_R_FAIL;
|
|
|
- } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && pDcChargingInfo_1->SystemStatus == S_IDLE) {
|
|
|
- pSysInfo->PageIndex = __VIEW_L_FAIL_R_IDLE;
|
|
|
- } else if (pDcChargingInfo_0->SystemStatus == S_IDLE && pDcChargingInfo_1->SystemStatus == S_ALARM) {
|
|
|
- pSysInfo->PageIndex = __VIEW_L_IDLE_R_FAIL;
|
|
|
- } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && pDcChargingInfo_1->SystemStatus == S_ALARM) {
|
|
|
- pSysInfo->PageIndex = __VIEW_ALL_FAIL;
|
|
|
+
|
|
|
+ } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT )&&
|
|
|
+ pDcChargingInfo_1->SystemStatus == S_CHARGING) {
|
|
|
+ if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_LINK_R_CHARGE;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_FAIL_R_CHARGE;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING &&
|
|
|
+ (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
|
|
|
+ if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_CHARGE_R_LINK;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_CHARGE_R_FAIL;
|
|
|
+ } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT) &&
|
|
|
+ pDcChargingInfo_1->SystemStatus == S_IDLE) {
|
|
|
+ if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_LINK_R_IDLE;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_FAIL_R_IDLE;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_IDLE &&
|
|
|
+ (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
|
|
|
+ if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_IDLE_R_LINK;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_IDLE_R_FAIL;
|
|
|
+ } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT) &&
|
|
|
+ (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
|
|
|
+ if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM] &&
|
|
|
+ pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM]) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_OUT;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM]) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_LINK_R_FAIL;
|
|
|
+ } else if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM]) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_FAIL_R_LINK;
|
|
|
+ } else
|
|
|
+ pSysInfo->PageIndex = __VIEW_ALL_FAIL;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_IDLE && pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_IDLE_R_MAINTAIN;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_IDLE) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_IDLE;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_CHARGE_R_MAINTAIN;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_CHARGING) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_CHARGE;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
|
|
|
+ pSysInfo->PageIndex = __MAINTAIN_PAGE_;
|
|
|
+
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_IDLE && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
|
|
|
+ pDcChargingInfo_1->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_IDLE_R_OUT;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_IDLE &&
|
|
|
+ pDcChargingInfo_0->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_IDLE;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_CHARGING && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
|
|
|
+ pDcChargingInfo_1->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_CHARGE_R_OUT;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_CHARGING &&
|
|
|
+ pDcChargingInfo_0->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_CHARGE;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
|
|
|
+ pDcChargingInfo_1->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_OUT;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_MAINTAIN &&
|
|
|
+ pDcChargingInfo_0->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_MAINTAIN;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_1->SystemStatus == S_COMPLETE &&
|
|
|
+ pDcChargingInfo_0->ConnectorPlugIn && pDcChargingInfo_1->ConnectorPlugIn) {
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_OUT;
|
|
|
+ } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT) &&
|
|
|
+ pDcChargingInfo_1->SystemStatus == S_COMPLETE && pDcChargingInfo_1->ConnectorPlugIn) {
|
|
|
+ if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_LINK_R_OUT;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_FAIL_R_OUT;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_COMPLETE && pDcChargingInfo_0->ConnectorPlugIn &&
|
|
|
+ (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
|
|
|
+ if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_LINK;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_OUT_R_FAIL;
|
|
|
+ } else if (pDcChargingInfo_0->SystemStatus == S_MAINTAIN &&
|
|
|
+ (pDcChargingInfo_1->SystemStatus == S_ALARM || pDcChargingInfo_1->SystemStatus == S_FAULT)) {
|
|
|
+ if (pDcChargingInfo_1->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[RIGHT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_LINK;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_MAINTAIN_R_FAIL;
|
|
|
+ } else if ((pDcChargingInfo_0->SystemStatus == S_ALARM || pDcChargingInfo_0->SystemStatus == S_FAULT ) &&
|
|
|
+ pDcChargingInfo_1->SystemStatus == S_MAINTAIN) {
|
|
|
+ if (pDcChargingInfo_0->SystemStatus == S_ALARM && !ShmDcCommonData->isIntoCharge[LEFT_GUN_NUM])
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_LINK_R_MAINTAIN;
|
|
|
+ else
|
|
|
+ pSysInfo->PageIndex = __VIEW_L_FAIL_R_MAINTAIN;
|
|
|
+ } else {
|
|
|
+ pSysInfo->PageIndex = __VIEW_ALL_IDLE_;
|
|
|
}
|
|
|
break;
|
|
|
case _LCM_START_SCAN:
|
|
|
@@ -407,20 +559,33 @@ void ChangeCurPage()
|
|
|
pSysInfo->PageIndex = __CONFIRM_STOP_RIGHT;
|
|
|
break;
|
|
|
case _LCM_COMMUNICATION:
|
|
|
- pSysInfo->PageIndex = __COMMUNICATION_PROCESS;
|
|
|
+ if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
|
|
|
+ pSysInfo->PageIndex = __PRECHARGE_LEFT_CONNECT;
|
|
|
+ } else {
|
|
|
+ pSysInfo->PageIndex = __PRECHARGE_RIGHT_CONNECT;
|
|
|
+ }
|
|
|
break;
|
|
|
case _LCM_CHARGING_DETECT:
|
|
|
- pSysInfo->PageIndex = __GFD_PROCESS;
|
|
|
+ if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
|
|
|
+ pSysInfo->PageIndex = __PRECHARGE_LEFT_CHECK;
|
|
|
+ } else {
|
|
|
+ pSysInfo->PageIndex = __PRECHARGE_RIGHT_CHECK;
|
|
|
+ }
|
|
|
break;
|
|
|
case _LCM_PREPARECHARE:
|
|
|
- pSysInfo->PageIndex = __PRECHARGE_PROCESS;
|
|
|
+ if (pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
|
|
|
+ pSysInfo->PageIndex = __PRECHARGE_LEFT_START;
|
|
|
+ } else {
|
|
|
+ pSysInfo->PageIndex = __PRECHARGE_RIGHT_START;
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
if (_currentPage != pSysInfo->PageIndex) {
|
|
|
- //_currentPage = pSysInfo->PageIndex;
|
|
|
- log_info("Change Page :%d", pSysInfo->PageIndex);
|
|
|
- ChangeToOtherPage(pSysInfo->PageIndex);
|
|
|
+ log_info("Gun%d Change Page from %d to %d",pSysInfo->CurGunSelected, _currentPage, pSysInfo->PageIndex);
|
|
|
}
|
|
|
+ _currentPage = pSysInfo->PageIndex;
|
|
|
+ ChangeToOtherPage(pSysInfo->PageIndex);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/*
|
|
|
@@ -436,26 +601,29 @@ void ShowViewChargingSoc(uint8_t gunIndex,int soc)
|
|
|
|
|
|
if (gunIndex == LEFT_GUN_NUM) {
|
|
|
ChangeDisplay2Value(_LeftGun_Soc_Digits,(short)_ICON_Red_Num_0+digits);
|
|
|
- ChangeDisplay2Value(_LeftGun_Soc_Tens,(short)_ICON_Red_Num_0+tens);
|
|
|
if (hundreds == 0 ) {
|
|
|
ChangeDisplay2Value(_LeftGun_Soc_Hundreds,(short)_ICON_Empty);
|
|
|
if (tens == 0 )
|
|
|
ChangeDisplay2Value(_LeftGun_Soc_Tens,(short)_ICON_Empty);
|
|
|
+ else
|
|
|
+ ChangeDisplay2Value(_LeftGun_Soc_Tens, (short)_ICON_Red_Num_0 + tens);
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(_LeftGun_Soc_Hundreds, (short)_ICON_Red_Num_1);
|
|
|
+ ChangeDisplay2Value(_LeftGun_Soc_Tens, (short)_ICON_Red_Num_0 + tens);
|
|
|
}
|
|
|
- else
|
|
|
- ChangeDisplay2Value(_LeftGun_Soc_Hundreds,(short)_ICON_Red_Num_1);
|
|
|
|
|
|
} else {
|
|
|
- //log_info("%d %d %d",hundreds,tens,digits);
|
|
|
ChangeDisplay2Value(_RightGun_Soc_Digits,(short)_ICON_Red_Num_0+digits);
|
|
|
- ChangeDisplay2Value(_RightGun_Soc_Tens,(short)_ICON_Red_Num_0+tens);
|
|
|
if (hundreds == 0 ) {
|
|
|
ChangeDisplay2Value(_RightGun_Soc_Hundreds,(short)_ICON_Empty);
|
|
|
if (tens == 0)
|
|
|
ChangeDisplay2Value(_RightGun_Soc_Tens,(short)_ICON_Empty);
|
|
|
+ else
|
|
|
+ ChangeDisplay2Value(_RightGun_Soc_Tens,(short)_ICON_Red_Num_0+ tens);
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(_RightGun_Soc_Hundreds, (short)_ICON_Red_Num_1);
|
|
|
+ ChangeDisplay2Value(_RightGun_Soc_Tens, (short)_ICON_Red_Num_0 + tens);
|
|
|
}
|
|
|
- else
|
|
|
- ChangeDisplay2Value(_RightGun_Soc_Hundreds,(short)_ICON_Red_Num_1);
|
|
|
}
|
|
|
}
|
|
|
void ShowViewChargingTime(uint8_t gunIndex,int time)
|
|
|
@@ -497,7 +665,6 @@ void ShowViewChargingEngery(uint8_t gunIndex, float energy)
|
|
|
}
|
|
|
void ShowViewCharingMoney(uint8_t gunIndex,float money)
|
|
|
{
|
|
|
- uint8_t value[10] = { 0 };
|
|
|
float data = money;
|
|
|
if (money < 0)
|
|
|
data = fabs(money);
|
|
|
@@ -549,7 +716,6 @@ void ShowConnectId()
|
|
|
}
|
|
|
void ShowViewLeftGunInfo()
|
|
|
{
|
|
|
- char value[5];
|
|
|
pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(LEFT_GUN_NUM);
|
|
|
if (pDcChargingInfo->SystemStatus == S_IDLE ) {
|
|
|
switch (pDcChargingInfo->CCSGunType) {
|
|
|
@@ -580,7 +746,13 @@ void ShowViewLeftGunInfo()
|
|
|
}
|
|
|
} else if (pDcChargingInfo->SystemStatus == S_CHARGING ) {
|
|
|
ShowViewChargingSoc(LEFT_GUN_NUM,pDcChargingInfo->EvBatterySoc);
|
|
|
- ShowViewChargingTime(LEFT_GUN_NUM,pDcChargingInfo->PresentChargedDuration);
|
|
|
+ if (strlen(ShmDcCommonData->pGunInfo[LEFT_GUN_NUM].ChargeStartTime) > 1) {
|
|
|
+ int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[LEFT_GUN_NUM].ChargeStartTime,
|
|
|
+ ShmDcCommonData->pGunInfo[LEFT_GUN_NUM].ChargeDuration);
|
|
|
+ ShowViewChargingTime(LEFT_GUN_NUM, duration);
|
|
|
+ } else {
|
|
|
+ ShowViewChargingTime(LEFT_GUN_NUM, 0);
|
|
|
+ }
|
|
|
ShowViewCharingMoney(LEFT_GUN_NUM,pDcChargingInfo->ChargingFee);
|
|
|
ShowViewChargingPower(LEFT_GUN_NUM,pDcChargingInfo->PresentChargingPower);
|
|
|
ShowViewChargingEngery(LEFT_GUN_NUM, pDcChargingInfo->PresentChargedEnergy);
|
|
|
@@ -634,8 +806,14 @@ void ShowViewRightGunInfo()
|
|
|
sprintf((char *)value,"1 B");
|
|
|
DisplayValueToLcm(_RightGun_location, (uint8_t *)value, sizeof(value));
|
|
|
} else if (pDcChargingInfo->SystemStatus == S_CHARGING ) {
|
|
|
- ShowViewChargingSoc(RIGHT_GUN_NUM,pDcChargingInfo->EvBatterySoc);
|
|
|
- ShowViewChargingTime(RIGHT_GUN_NUM,pDcChargingInfo->PresentChargedDuration);
|
|
|
+ ShowViewChargingSoc(RIGHT_GUN_NUM,pDcChargingInfo->EvBatterySoc);
|
|
|
+ if (strlen(ShmDcCommonData->pGunInfo[RIGHT_GUN_NUM].ChargeStartTime) > 1) {
|
|
|
+ int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[RIGHT_GUN_NUM].ChargeStartTime,
|
|
|
+ ShmDcCommonData->pGunInfo[RIGHT_GUN_NUM].ChargeDuration);
|
|
|
+ ShowViewChargingTime(RIGHT_GUN_NUM, duration);
|
|
|
+ } else {
|
|
|
+ ShowViewChargingTime(RIGHT_GUN_NUM, 0);
|
|
|
+ }
|
|
|
ShowViewCharingMoney(RIGHT_GUN_NUM,pDcChargingInfo->ChargingFee);
|
|
|
ShowViewChargingPower(RIGHT_GUN_NUM,pDcChargingInfo->PresentChargingPower);
|
|
|
ShowViewChargingEngery(RIGHT_GUN_NUM, pDcChargingInfo->PresentChargedEnergy);
|
|
|
@@ -740,7 +918,7 @@ void ClearQrCode()
|
|
|
{
|
|
|
char cmd[200];
|
|
|
memset(cmd, 0, 200);
|
|
|
- DisplayValueToLcm(_QR_CODE_AUTHORIZE, cmd, 200);
|
|
|
+ DisplayValueToLcm(_QR_CODE_AUTHORIZE, (uint8_t *)cmd, 200);
|
|
|
}
|
|
|
void ChangeQrCode()
|
|
|
{
|
|
|
@@ -748,7 +926,7 @@ void ChangeQrCode()
|
|
|
pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(pSysInfo->CurGunSelected);
|
|
|
|
|
|
memset(cmd, 0 , 200);
|
|
|
- int len = sprintf(cmd, "https://qrcode.u-power.app/connector?chargebox=%s&connectorno=%d", pSysConfig->SystemId, ShmDcCommonData->ConnectorId[pSysInfo->CurGunSelected]);
|
|
|
+ int len = sprintf(cmd, "https://qrcode.u-power.app/connector?chargebox=%s&connectorno=%d", ShmDcCommonData->QRCodeString, ShmDcCommonData->ConnectorId[pSysInfo->CurGunSelected]);
|
|
|
//int len = sprintf(cmd, "http://www.u-power.com.tw/");
|
|
|
if (len > 200) {
|
|
|
log_info("QR Code URL length too long");
|
|
|
@@ -763,66 +941,148 @@ void ShowProgressBar()
|
|
|
usleep(100000);
|
|
|
}*/
|
|
|
}
|
|
|
+void ShowChargeTime(int addr,int _time)
|
|
|
+{
|
|
|
+ int tens, digits;
|
|
|
+ tens = _time / 10;
|
|
|
+ digits = _time % 10;
|
|
|
+ ChangeDisplay2Value(addr, tens);
|
|
|
+ ChangeDisplay2Value(addr+2, digits);
|
|
|
+}
|
|
|
+void ShowSummaryMoney(int addr, int money)
|
|
|
+{
|
|
|
+ int dig, tens, hund, thou,shift;
|
|
|
+ if (addr == _Summary_total_money) {
|
|
|
+ shift = 42;
|
|
|
+ } else {
|
|
|
+ shift = 100;
|
|
|
+ }
|
|
|
+ if (money > 9999) {
|
|
|
+ money = 9999;
|
|
|
+ }
|
|
|
+ thou = money / 1000;
|
|
|
+ hund = (money / 100) % 10;
|
|
|
+ tens = (money / 10) % 10;
|
|
|
+ dig = money % 10;
|
|
|
+
|
|
|
+ ChangeDisplay2Value(addr + 6, thou == 0 ? _ICON_Empty : thou+shift);
|
|
|
+ if (thou == 0) {
|
|
|
+ ChangeDisplay2Value(addr + 4, hund == 0 ? _ICON_Empty : hund + shift);
|
|
|
+ if (addr == _Summary_cal_discount)
|
|
|
+ ChangeDisplay2Value(addr + 8, _ICON_Empty);
|
|
|
+ if (hund == 0) {
|
|
|
+ ChangeDisplay2Value(addr + 2, tens == 0 ? _ICON_Empty : tens + shift);
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(addr + 2, tens + shift);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(addr + 4, hund + shift);
|
|
|
+ ChangeDisplay2Value(addr + 2, tens + shift);
|
|
|
+ }
|
|
|
+ ChangeDisplay2Value(addr, dig + shift);
|
|
|
+
|
|
|
+ // 給UPOINT負號
|
|
|
+ if (addr == _Summary_cal_discount) {
|
|
|
+ if (thou == 0) {
|
|
|
+ if (hund == 0) {
|
|
|
+ if (tens == 0) {
|
|
|
+ ChangeDisplay2Value(addr + 2, _ICON_negative);
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(addr + 4, _ICON_negative);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(addr + 6, _ICON_negative);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(addr + 8, _ICON_negative);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+}
|
|
|
+void ShowSummaryMoneyDash(int addr)
|
|
|
+{
|
|
|
+ if (addr == _Summary_total_money) {
|
|
|
+ ChangeDisplay2Value(addr , _ICON_DASH_SINGLE);
|
|
|
+ ChangeDisplay2Value(addr + 2, _ICON_DASH_SINGLE);
|
|
|
+ ChangeDisplay2Value(addr + 4, _ICON_Empty);
|
|
|
+ ChangeDisplay2Value(addr + 6, _ICON_Empty);
|
|
|
+ } else {
|
|
|
+ ChangeDisplay2Value(addr, _ICON_DASH_SINGLE);
|
|
|
+ ChangeDisplay2Value(addr + 2, _ICON_DASH_SINGLE);
|
|
|
+ ChangeDisplay2Value(addr + 4, _ICON_Empty);
|
|
|
+ ChangeDisplay2Value(addr + 6, _ICON_Empty);
|
|
|
+ ChangeDisplay2Value(addr + 8, _ICON_Empty);
|
|
|
+ }
|
|
|
+}
|
|
|
void ShowSummaryPage()
|
|
|
{
|
|
|
float data;
|
|
|
- uint8_t value[10] = {0};
|
|
|
- char start_hr[3],start_min[3],end_hr[3],end_min[3];
|
|
|
+ char start_hr[3],start_min[3],start_sec[3],end_hr[3],end_min[3],end_sec[3];
|
|
|
int t_hr;
|
|
|
- long eng = 0;
|
|
|
pDcChargingInfo = (struct ChargingInfoData *)GetDcChargingInfoData(pSysInfo->CurGunSelected);
|
|
|
+
|
|
|
// Show Money
|
|
|
- data = pDcChargingInfo->ChargingFee;
|
|
|
- sprintf((char *)value,"%.1f",data);
|
|
|
- int discount,settlement = 0;
|
|
|
-
|
|
|
- discount = ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount;
|
|
|
- ChangeDisplay2Value(_Summary_cal_discount, discount*(-1));
|
|
|
- settlement = (int)pDcChargingInfo->ChargingFee - discount;
|
|
|
- ChangeDisplay2Value(_Summary_total_money, (int)pDcChargingInfo->ChargingFee);
|
|
|
- ChangeDisplay2Value(_Summary_cal_Total_money, (int)pDcChargingInfo->ChargingFee);
|
|
|
+ if (ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].finalcost_flag) {
|
|
|
+ ShowSummaryMoney(_Summary_total_money, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].RemainAmount);
|
|
|
+ ShowSummaryMoney(_Summary_cal_Total_money, (int)pDcChargingInfo->ChargingFee);
|
|
|
+ ShowSummaryMoney(_Summary_cal_discount, (int)ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount);
|
|
|
+ } else {
|
|
|
+ // 未收到Final cost
|
|
|
+ ShowSummaryMoneyDash(_Summary_total_money);
|
|
|
+ ShowSummaryMoneyDash(_Summary_cal_Total_money);
|
|
|
+ ShowSummaryMoneyDash(_Summary_cal_discount);
|
|
|
+ }
|
|
|
/*
|
|
|
log_info("start time:%s",pDcChargingInfo->StartDateTime);
|
|
|
log_info("stop time:%s",pDcChargingInfo->StopDateTime);*/
|
|
|
|
|
|
- GetHrFormTimeString(pDcChargingInfo->StartDateTime,start_hr);
|
|
|
- GetMinFormTimeString(pDcChargingInfo->StartDateTime,start_min);
|
|
|
- GetHrFormTimeString(pDcChargingInfo->StopDateTime,end_hr);
|
|
|
- GetMinFormTimeString(pDcChargingInfo->StopDateTime,end_min);
|
|
|
+ GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_hr);
|
|
|
+ GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,start_min);
|
|
|
+ GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_sec);
|
|
|
+ GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime,end_hr);
|
|
|
+ GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime,end_min);
|
|
|
+ GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_sec);
|
|
|
|
|
|
t_hr = atoi(start_hr) + (ShmDcCommonData->TZOffset / 60);
|
|
|
if (t_hr >= 24)
|
|
|
t_hr -= 24;
|
|
|
- if (!ShmDcCommonData->isIntoCharge[pSysInfo->CurGunSelected]) {
|
|
|
- t_hr = 0;
|
|
|
- strcpy(start_min,"0");
|
|
|
+ if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) == 0) {
|
|
|
+ ShowChargeTime(_Summary_Start_time_hr,0);
|
|
|
+ ShowChargeTime(_Summary_Start_time_min, 0);
|
|
|
+ ShowChargeTime(_Summary_Start_time_sec, 0);
|
|
|
+ } else {
|
|
|
+ ShowChargeTime(_Summary_Start_time_hr, t_hr);
|
|
|
+ ShowChargeTime(_Summary_Start_time_min, atoi(start_min));
|
|
|
+ ShowChargeTime(_Summary_Start_time_sec, atoi(start_sec));
|
|
|
}
|
|
|
- ChangeDisplay2Value(_Summary_Start_time_hr, t_hr);
|
|
|
- ChangeDisplay2Value(_Summary_Start_time_min, atoi(start_min));
|
|
|
t_hr = atoi(end_hr) + (ShmDcCommonData->TZOffset / 60);
|
|
|
if (t_hr >= 24)
|
|
|
t_hr -= 24;
|
|
|
- if (!ShmDcCommonData->isIntoCharge[pSysInfo->CurGunSelected]) {
|
|
|
- t_hr = 0;
|
|
|
- strcpy(end_min, "0");
|
|
|
+ if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime) == 0) {
|
|
|
+ ShowChargeTime(_Summary_end_time_hr, 0);
|
|
|
+ ShowChargeTime(_Summary_end_time_min, 0);
|
|
|
+ ShowChargeTime(_Summary_end_time_sec, 0);
|
|
|
+ } else {
|
|
|
+ ShowChargeTime(_Summary_end_time_hr, t_hr);
|
|
|
+ ShowChargeTime(_Summary_end_time_min, atoi(end_min));
|
|
|
+ ShowChargeTime(_Summary_end_time_sec, atoi(end_sec));
|
|
|
}
|
|
|
- ChangeDisplay2Value(_Summary_end_time_hr, t_hr);
|
|
|
- ChangeDisplay2Value(_Summary_end_time_min, atoi(end_min));
|
|
|
/*
|
|
|
DisplayValueToLcm(_Summary_Start_time_hr, (uint8_t *)start_hr, sizeof(start_hr));
|
|
|
DisplayValueToLcm(_Summary_Start_time_min, (uint8_t *)start_min, sizeof(start_min));
|
|
|
DisplayValueToLcm(_Summary_end_time_hr, (uint8_t *)end_hr, sizeof(end_hr));
|
|
|
DisplayValueToLcm(_Summary_end_time_min, (uint8_t *)end_min, sizeof(end_min));
|
|
|
*/
|
|
|
-
|
|
|
- uint8_t _min = (pDcChargingInfo->PresentChargedDuration)/60;
|
|
|
- uint8_t _sec = (pDcChargingInfo->PresentChargedDuration) % 60;
|
|
|
+ int duration = GetChargingDuration(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime,
|
|
|
+ ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime);
|
|
|
+ //uint8_t _min = (pDcChargingInfo->PresentChargedDuration)/60;
|
|
|
+ //uint8_t _sec = (pDcChargingInfo->PresentChargedDuration) % 60;
|
|
|
/*
|
|
|
sprintf((char *)value,"%d",min);
|
|
|
DisplayValueToLcm(_Summary_duration_time, (uint8_t *)value, sizeof(value));
|
|
|
*/
|
|
|
- ChangeDisplay2Value(_Summary_duration_min, (int)_min);
|
|
|
- ChangeDisplay2Value(_Summary_duration_sec, (int)_sec);
|
|
|
+ ChangeDisplay2Value(_Summary_duration_min, (int)duration/60);
|
|
|
+ ChangeDisplay2Value(_Summary_duration_sec, (int)duration%60);
|
|
|
|
|
|
if (pDcChargingInfo->PresentChargedEnergy > 0.001 &&
|
|
|
pDcChargingInfo->PresentChargedEnergy <= ENERGY_MAX_KWH) {
|
|
|
@@ -850,13 +1110,6 @@ void ShowSummaryPage()
|
|
|
}
|
|
|
void ProcessPageInfo()
|
|
|
{
|
|
|
- if (pSysWarning->Level == WARN_LV_ER) {
|
|
|
- pSysInfo->SystemPage = _LCM_MAINTAIN;
|
|
|
- if (ShmPrimaryMcuData->InputDet.bits.EmergencyButton)
|
|
|
- pSysInfo->SystemPage = _LCM_EMERGENCY;
|
|
|
- return;;
|
|
|
- }
|
|
|
-
|
|
|
switch (pSysInfo->SystemPage) {
|
|
|
case _LCM_VIEW:
|
|
|
// Confirm Charging Gun Number.
|
|
|
@@ -908,6 +1161,8 @@ void DemoFunction()
|
|
|
uint8_t value[10];
|
|
|
struct timeb SeqEndTime;
|
|
|
struct tm *tm;
|
|
|
+ int t_hr;
|
|
|
+ char start_hr[3], start_min[3], start_sec[3], end_hr[3], end_min[3], end_sec[3];
|
|
|
ChangeDisplay2Value(_Animation_Running, 1);
|
|
|
ChangeDisplay2Value(_Animation_Communcation, 1);
|
|
|
ChangeDisplay2Value(_Animation_GFD, 1);
|
|
|
@@ -1067,23 +1322,57 @@ void DemoFunction()
|
|
|
|
|
|
DisplayValueToLcm(_Count_Down_Time, (uint8_t *)value, sizeof(value));
|
|
|
if (pSysInfo->PageIndex == 17 || pSysInfo->PageIndex == 28) {
|
|
|
- //for (i = 0; i <= 100; i++) {
|
|
|
- ChangeDisplay2Value(_Summary_total_money, 888);
|
|
|
- ChangeDisplay2Value(_Summary_cal_Total_money, 888);
|
|
|
- ChangeDisplay2Value(_Summary_Start_time_hr, 6);
|
|
|
- ChangeDisplay2Value(_Summary_Start_time_min, 6);
|
|
|
- ChangeDisplay2Value(_Summary_end_time_hr, 8);
|
|
|
- ChangeDisplay2Value(_Summary_end_time_min, 8);
|
|
|
- ChangeDisplay2Value(_Summary_duration_min, 88);
|
|
|
- ChangeDisplay2Value(_Summary_duration_sec, 88);
|
|
|
-
|
|
|
- ChangeDisplay2LongValue(_Summary_cap, 88888);
|
|
|
+ for (i = 0; i <= 9999; i++) {
|
|
|
+ strcpy((char*)ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, "2022-05-15 16:42:11");
|
|
|
+ strcpy((char*)ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, "2022-05-15 16:47:44");
|
|
|
+
|
|
|
+ GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_hr);
|
|
|
+ GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_min);
|
|
|
+ GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime, start_sec);
|
|
|
+ GetHrFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_hr);
|
|
|
+ GetMinFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_min);
|
|
|
+ GetSecFormTimeString(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime, end_sec);
|
|
|
+
|
|
|
+ t_hr = atoi(start_hr) + (ShmDcCommonData->TZOffset / 60);
|
|
|
+ if (t_hr >= 24)
|
|
|
+ t_hr -= 24;
|
|
|
+ if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStartTime) == 0) {
|
|
|
+ ShowChargeTime(_Summary_Start_time_hr, 0);
|
|
|
+ ShowChargeTime(_Summary_Start_time_min, 0);
|
|
|
+ ShowChargeTime(_Summary_Start_time_sec, 0);
|
|
|
+ } else {
|
|
|
+ ShowChargeTime(_Summary_Start_time_hr, t_hr);
|
|
|
+ ShowChargeTime(_Summary_Start_time_min, atoi(start_min));
|
|
|
+ ShowChargeTime(_Summary_Start_time_sec, atoi(start_sec));
|
|
|
+ }
|
|
|
+ t_hr = atoi(end_hr) + (ShmDcCommonData->TZOffset / 60);
|
|
|
+ if (t_hr >= 24)
|
|
|
+ t_hr -= 24;
|
|
|
+ if (strlen(ShmDcCommonData->pGunInfo[pSysInfo->CurGunSelected].ChargeStopTime) == 0) {
|
|
|
+ ShowChargeTime(_Summary_end_time_hr, 0);
|
|
|
+ ShowChargeTime(_Summary_end_time_min, 0);
|
|
|
+ ShowChargeTime(_Summary_end_time_sec, 0);
|
|
|
+ } else {
|
|
|
+ ShowChargeTime(_Summary_end_time_hr, t_hr);
|
|
|
+ ShowChargeTime(_Summary_end_time_min, atoi(end_min));
|
|
|
+ ShowChargeTime(_Summary_end_time_sec, atoi(end_sec));
|
|
|
+ }
|
|
|
+
|
|
|
ChangeDisplay2Value(_Summary_cal_discount,88);
|
|
|
- ChangeDisplay2Value(_Summary_cal_Settlement,888);
|
|
|
ChangeDisplay2Value(_Summary_max_power, 888);
|
|
|
ChangeDisplay2Value(_Summary_average_power, 888);
|
|
|
- sleep(5);
|
|
|
- //}
|
|
|
+ if (i < 100) {
|
|
|
+ ShowSummaryMoneyDash(_Summary_total_money);
|
|
|
+ ShowSummaryMoneyDash(_Summary_cal_Total_money);
|
|
|
+ ShowSummaryMoneyDash(_Summary_cal_discount);
|
|
|
+ } else {
|
|
|
+ ShowSummaryMoney(_Summary_total_money, i);
|
|
|
+ ShowSummaryMoney(_Summary_cal_Total_money, i);
|
|
|
+ ShowSummaryMoney(_Summary_cal_discount, i);
|
|
|
+ }
|
|
|
+
|
|
|
+ usleep(100000);
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
case __START_AUTHORIZE_:
|
|
|
@@ -1100,12 +1389,6 @@ void DemoFunction()
|
|
|
break;
|
|
|
case 29:
|
|
|
break;
|
|
|
- case 21:
|
|
|
- ShowCabientVersion();
|
|
|
- break;
|
|
|
- case 22:
|
|
|
- ShowDispenserVersion();
|
|
|
- break;
|
|
|
case 5:
|
|
|
pSysInfo->CurGunSelected = 0;
|
|
|
ChangeQrCode();
|
|
|
@@ -1304,9 +1587,28 @@ void ChangeWarningFunc()
|
|
|
DisplayValueToLcm(_Icon_Warming0 + ((i) * 2), cmd, 2);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+void GetDeviceInfoStatus(short address, uint8_t len)
|
|
|
+{
|
|
|
+ uint8_t cmd[8];
|
|
|
+ memset(cmd, 0x00, sizeof(cmd));
|
|
|
+ uint8_t msg[11];
|
|
|
+ memset(msg, 0x00, sizeof(msg));
|
|
|
+
|
|
|
+ cmd[0] = CMD_TITLE_1;
|
|
|
+ cmd[1] = CMD_TITLE_2;
|
|
|
+ cmd[2] = 0x04;
|
|
|
+ cmd[3] = CMD_MULTI_READ;
|
|
|
+ cmd[4] = (address >> 8) & 0xff;
|
|
|
+ cmd[5] = (address >> 0) & 0xff;
|
|
|
+ cmd[6] = len;
|
|
|
+
|
|
|
+ WriteCmdToLcm(cmd, ARRAY_SIZE(cmd));
|
|
|
+ usleep(5000);
|
|
|
+ ReadMsgFromLcm(msg, ARRAY_SIZE(msg));
|
|
|
+}
|
|
|
int main(void)
|
|
|
{
|
|
|
- bool defaulttext = false;
|
|
|
if (CreateAllCsuShareMemory() == FAIL) {
|
|
|
log_error("create share memory error");
|
|
|
return FAIL;
|
|
|
@@ -1336,23 +1638,29 @@ int main(void)
|
|
|
//return 0;
|
|
|
uint8_t index = 35;
|
|
|
ShmDcCommonData->PSU_Number = 12;
|
|
|
+ uint8_t _verShowCount = 5;
|
|
|
while (_port != -1) {
|
|
|
if (strcmp((char *)pSysInfo->LcmHwRev, moduleName) != 0x00) {
|
|
|
+ GetDeviceInfoStatus(_LCM_VERSION, 3);
|
|
|
GetCurrentPage();
|
|
|
sleep(1);
|
|
|
|
|
|
ShmStatusCodeData->AlarmCode.AlarmEvents.bits.LcmModuleCommFail = true;
|
|
|
-
|
|
|
+ if (_verShowCount > 0) {
|
|
|
+ log_info("LCM Version = V.%03d \n", ShmDcCommonData->LcmFwVersion);
|
|
|
+ _verShowCount--;
|
|
|
+ }
|
|
|
} else {
|
|
|
// Show Default Text
|
|
|
+ /*
|
|
|
if (!defaulttext) {
|
|
|
ShowCabientVersionDefaultText();
|
|
|
ShowDispenserVersionDefautlText();
|
|
|
defaulttext = true;
|
|
|
}
|
|
|
+ */
|
|
|
ShmStatusCodeData->AlarmCode.AlarmEvents.bits.LcmModuleCommFail = false;
|
|
|
|
|
|
-
|
|
|
if(pSysConfig->TotalConnectorCount>=2) {
|
|
|
if (pDcChargingInfo_0->SystemStatus == S_IDLE) {
|
|
|
ChargeMaxPower_0 = 0;
|
|
|
@@ -1393,7 +1701,6 @@ int main(void)
|
|
|
// 換頁處理
|
|
|
GetCurrentPage(); //DS60-120 add
|
|
|
ChangeCurPage();
|
|
|
-
|
|
|
changeWarningPriority >= 30 ? changeWarningPriority = 0 : changeWarningPriority++;
|
|
|
//*/
|
|
|
/*
|
|
|
@@ -1414,7 +1721,7 @@ int main(void)
|
|
|
ChangeToOtherPage(DemoPage[ShmDcCommonData->DemoCount]);
|
|
|
GetCurrentPage();
|
|
|
DemoFunction();
|
|
|
- ShmDcCommonData->DemoCount >= 21 ? ShmDcCommonData->DemoCount = 0 : ShmDcCommonData->DemoCount++;
|
|
|
+ ShmDcCommonData->DemoCount >= 1 ? ShmDcCommonData->DemoCount = 0 : ShmDcCommonData->DemoCount++;
|
|
|
//*/
|
|
|
usleep(100000);
|
|
|
|
