|
@@ -280,7 +280,6 @@ void ChangeCurPage()
|
|
|
}
|
|
|
break;
|
|
|
case _LCM_START_SCAN:
|
|
|
- log_info("Gun%d Enter Start Scan", pSysInfo->CurGunSelected);
|
|
|
if (pSysInfo->CurGunSelected == LEFT_GUN_NUM)
|
|
|
pSysInfo->PageIndex = __START_SCAN_LEFT;
|
|
|
else
|
|
@@ -409,9 +408,10 @@ void ShowViewChargingSoc(uint8_t gunIndex,int soc)
|
|
|
void ShowViewChargingTime(uint8_t gunIndex,int time)
|
|
|
{
|
|
|
uint8_t value[10] = {0};
|
|
|
- int min;
|
|
|
+ int min,sec;
|
|
|
min = time/60;
|
|
|
- sprintf((char *)value,"%d",min);
|
|
|
+ sec = time % 60;
|
|
|
+ sprintf((char *)value,"%d:%02d",min,sec);
|
|
|
if (gunIndex == LEFT_GUN_NUM) {
|
|
|
DisplayValueToLcm(_LeftGun_info_time, (uint8_t *)value, sizeof(value));
|
|
|
} else
|
|
@@ -420,8 +420,11 @@ void ShowViewChargingTime(uint8_t gunIndex,int time)
|
|
|
void ShowViewChargingEngery(uint8_t gunIndex, float energy)
|
|
|
{
|
|
|
uint8_t value[10] = { 0 };
|
|
|
- int min;
|
|
|
- sprintf((char*)value, "%.1f", energy);
|
|
|
+
|
|
|
+ if(energy < 100)
|
|
|
+ sprintf((char*)value, "%.1f", energy);
|
|
|
+ else
|
|
|
+ sprintf((char*)value, "%d", (int)energy);
|
|
|
//log_info("gun[%d] energy:%.1f", gunIndex, energy);
|
|
|
if (gunIndex == LEFT_GUN_NUM) {
|
|
|
DisplayValueToLcm(_LeftGun_info_cap, (uint8_t*)value, sizeof(value));
|
|
@@ -432,7 +435,7 @@ void ShowViewChargingEngery(uint8_t gunIndex, float energy)
|
|
|
void ShowViewCharingMoney(uint8_t gunIndex,float money)
|
|
|
{
|
|
|
uint8_t value[10] = {0};
|
|
|
- sprintf((char *)value,"%.1f",money);
|
|
|
+ sprintf((char *)value,"%d",(int)money);
|
|
|
//log_info("gun[%d] money:%.1f", gunIndex, money);
|
|
|
if (gunIndex == LEFT_GUN_NUM) {
|
|
|
DisplayValueToLcm(_LeftGun_info_money, (uint8_t *)value, sizeof(value));
|
|
@@ -744,6 +747,21 @@ void ShowGunCountDownTimer()
|
|
|
sprintf((char *)value,"%02d:%02d",min,sec);
|
|
|
DisplayValueToLcm(_Count_Down_Time, (uint8_t *)value, sizeof(value));
|
|
|
}
|
|
|
+void ClearQrCode()
|
|
|
+{
|
|
|
+ char cmd[200];
|
|
|
+ memset(cmd, 0, 200);
|
|
|
+ DisplayValueToLcm(_QR_CODE_AUTHORIZE, cmd, 200);
|
|
|
+}
|
|
|
+void ChangeQrCode()
|
|
|
+{
|
|
|
+ char cmd[250];
|
|
|
+ pDcChargingInfo = (struct ChargingInfoData*)GetDcChargingInfoData(pSysInfo->CurGunSelected);
|
|
|
+ // https://nhoatcc.lineapid.tw/web/tologin?sn=ABC123&cid=2
|
|
|
+ memset(cmd, '\0', 256);
|
|
|
+ int len = sprintf(cmd, "https://nhoatcc.lineapid.tw/web/tologin?sn=%s&cid=%d", pSysConfig->SystemId, ShmDcCommonData->ConnectorId[pSysInfo->CurGunSelected]);
|
|
|
+ DisplayValueToLcm(_QR_CODE_AUTHORIZE, cmd, len + 1);
|
|
|
+}
|
|
|
void ShowProgressBar()
|
|
|
{
|
|
|
/*
|
|
@@ -762,7 +780,7 @@ void ShowSummaryPage()
|
|
|
// Show Money
|
|
|
data = pDcChargingInfo->ChargingFee;
|
|
|
sprintf((char *)value,"%.1f",data);
|
|
|
- //int discount,settlement = 0;
|
|
|
+ int discount,settlement = 0;
|
|
|
//DisplayValueToLcm(_Summary_total_money, (uint8_t *)value, sizeof(value));
|
|
|
//DisplayValueToLcm(_Summary_cal_Total_money, (uint8_t *)value, sizeof(value));
|
|
|
ChangeDisplay2Value(_Summary_total_money, (int)pDcChargingInfo->ChargingFee);
|
|
@@ -793,12 +811,14 @@ void ShowSummaryPage()
|
|
|
DisplayValueToLcm(_Summary_end_time_min, (uint8_t *)end_min, sizeof(end_min));
|
|
|
*/
|
|
|
|
|
|
- uint8_t min = (pDcChargingInfo->PresentChargedDuration)/60;
|
|
|
+ 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_time, (int)min);
|
|
|
+ ChangeDisplay2Value(_Summary_duration_min, (int)_min);
|
|
|
+ ChangeDisplay2Value(_Summary_duration_sec, (int)_sec);
|
|
|
|
|
|
if (pDcChargingInfo->PresentChargedEnergy >= 0.1 &&
|
|
|
pDcChargingInfo->PresentChargedEnergy <= ENERGY_MAX_KWH) {
|
|
@@ -808,13 +828,13 @@ void ShowSummaryPage()
|
|
|
//sprintf((char *)value,"%.1f",data);
|
|
|
ChangeDisplay2Value(_Summary_cap, data);
|
|
|
//DisplayValueToLcm(_Summary_cap, (uint8_t *)value, sizeof(value));
|
|
|
- /*
|
|
|
- sprintf((char *)value,"%.1f",discount);
|
|
|
+ discount = ShmSelectGunInfo->PricesInfo[pSysInfo->CurGunSelected].Discount;
|
|
|
+ sprintf((char *)value,"%.1f", discount);
|
|
|
DisplayValueToLcm(_Summary_cal_discount, (uint8_t *)value, sizeof(value));
|
|
|
settlement = pDcChargingInfo->ChargingFee - discount;
|
|
|
sprintf((char *)value,"%.1f",settlement);
|
|
|
DisplayValueToLcm(_Summary_cal_Settlement, (char *)value, sizeof(value));
|
|
|
-
|
|
|
+ /*
|
|
|
if(pSysInfo->CurGunSelected == LEFT_GUN_NUM) {
|
|
|
sprintf((char *)value,"%.1f",ChargeMaxPower_0);
|
|
|
} else if (pSysInfo->CurGunSelected == RIGHT_GUN_NUM) {
|
|
@@ -856,6 +876,7 @@ void ProcessPageInfo()
|
|
|
SetDetailViewPage();
|
|
|
break;
|
|
|
case _LCM_START_SCAN:
|
|
|
+ ChangeQrCode();
|
|
|
case _LCM_STOP_RFID:
|
|
|
case _LCM_STOP_APP:
|
|
|
ShowSelectGunIcon();
|
|
@@ -935,18 +956,20 @@ void DemoFunction()
|
|
|
case __VIEW_LEFT_CHARGE_:
|
|
|
for(i=0;i<=100;i++) {
|
|
|
ShowViewChargingSoc(LEFT_GUN_NUM,i);
|
|
|
- ShowViewChargingTime(LEFT_GUN_NUM,i*60);
|
|
|
+ ShowViewChargingTime(LEFT_GUN_NUM,i);
|
|
|
ShowViewCharingMoney(LEFT_GUN_NUM,i);
|
|
|
ShowViewChargingPower(LEFT_GUN_NUM,i);
|
|
|
+ ShowViewChargingEngery(LEFT_GUN_NUM,i);
|
|
|
usleep(100000);
|
|
|
}
|
|
|
break;
|
|
|
case __VIEW_RIGHT_CHARGE_:
|
|
|
for(i=0;i<=100;i++) {
|
|
|
ShowViewChargingSoc(RIGHT_GUN_NUM,i);
|
|
|
- ShowViewChargingTime(RIGHT_GUN_NUM,i*60);
|
|
|
+ ShowViewChargingTime(RIGHT_GUN_NUM,i);
|
|
|
ShowViewCharingMoney(RIGHT_GUN_NUM,i);
|
|
|
ShowViewChargingPower(RIGHT_GUN_NUM,i);
|
|
|
+ ShowViewChargingEngery(RIGHT_GUN_NUM, i);
|
|
|
usleep(100000);
|
|
|
}
|
|
|
break;
|
|
@@ -956,16 +979,20 @@ void DemoFunction()
|
|
|
ShowViewChargingTime(LEFT_GUN_NUM,i*60);
|
|
|
ShowViewCharingMoney(LEFT_GUN_NUM,i);
|
|
|
ShowViewChargingPower(LEFT_GUN_NUM,i);
|
|
|
+ ShowViewChargingEngery(LEFT_GUN_NUM, i/10);
|
|
|
|
|
|
ShowViewChargingSoc(RIGHT_GUN_NUM,i);
|
|
|
- ShowViewChargingTime(RIGHT_GUN_NUM,i*60);
|
|
|
+ ShowViewChargingTime(RIGHT_GUN_NUM,i);
|
|
|
ShowViewCharingMoney(RIGHT_GUN_NUM,i);
|
|
|
ShowViewChargingPower(RIGHT_GUN_NUM,i);
|
|
|
+ ShowViewChargingEngery(RIGHT_GUN_NUM, i/10);
|
|
|
usleep(100000);
|
|
|
}
|
|
|
break;
|
|
|
case 7:
|
|
|
case 9:
|
|
|
+ case 23:
|
|
|
+ case 24:
|
|
|
break;
|
|
|
case 11:
|
|
|
for(i = 0 ; i <= 100 ; i++) {
|
|
@@ -1006,6 +1033,7 @@ void DemoFunction()
|
|
|
case 13:
|
|
|
case 15:
|
|
|
case 17:
|
|
|
+ case 28:
|
|
|
ftime(&SeqEndTime);
|
|
|
SeqEndTime.time = time(NULL);
|
|
|
tm = localtime(&SeqEndTime.time);
|
|
@@ -1014,8 +1042,24 @@ void DemoFunction()
|
|
|
sprintf((char *)value,"%02d:%02d",tm->tm_hour,tm->tm_min);
|
|
|
|
|
|
DisplayValueToLcm(_Count_Down_Time, (uint8_t *)value, sizeof(value));
|
|
|
- if (pSysInfo->PageIndex == 17 ) {
|
|
|
-
|
|
|
+ if (pSysInfo->PageIndex == 17 || pSysInfo->PageIndex == 28) {
|
|
|
+ for (i = 0; i <= 100; i++) {
|
|
|
+ ChangeDisplay2Value(_Summary_total_money, i);
|
|
|
+ ChangeDisplay2Value(_Summary_cal_Total_money, i);
|
|
|
+ ChangeDisplay2Value(_Summary_Start_time_hr, i/60);
|
|
|
+ ChangeDisplay2Value(_Summary_Start_time_min, i%60);
|
|
|
+ ChangeDisplay2Value(_Summary_end_time_hr, i/60);
|
|
|
+ ChangeDisplay2Value(_Summary_end_time_min, i%60);
|
|
|
+ ChangeDisplay2Value(_Summary_duration_min, i);
|
|
|
+ ChangeDisplay2Value(_Summary_duration_sec, i%60);
|
|
|
+
|
|
|
+ ChangeDisplay2Value(_Summary_cap, i);
|
|
|
+ ChangeDisplay2Value(_Summary_cal_discount,i);
|
|
|
+ ChangeDisplay2Value(_Summary_cal_Settlement,i);
|
|
|
+ ChangeDisplay2Value(_Summary_max_power, i);
|
|
|
+ ChangeDisplay2Value(_Summary_average_power, i);
|
|
|
+ usleep(100000);
|
|
|
+ }
|
|
|
}
|
|
|
break;
|
|
|
case __START_AUTHORIZE_:
|
|
@@ -1032,9 +1076,12 @@ void DemoFunction()
|
|
|
break;
|
|
|
case 8:
|
|
|
case 16:
|
|
|
+ case 27:
|
|
|
case 18:
|
|
|
case 19:
|
|
|
case 20:
|
|
|
+ case 29:
|
|
|
+ case 30:
|
|
|
break;
|
|
|
case 21:
|
|
|
ShowCabientVersion();
|
|
@@ -1042,6 +1089,17 @@ void DemoFunction()
|
|
|
case 22:
|
|
|
ShowDispenserVersion();
|
|
|
break;
|
|
|
+ case 25:
|
|
|
+ case 26:
|
|
|
+ break;
|
|
|
+ case 5:
|
|
|
+ pSysInfo->CurGunSelected = 0;
|
|
|
+ ChangeQrCode();
|
|
|
+ break;
|
|
|
+ case 31:
|
|
|
+ pSysInfo->CurGunSelected = 1;
|
|
|
+ ChangeQrCode();
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
void ShowCabientVersionDefaultText()
|
|
@@ -1212,7 +1270,7 @@ int main(void)
|
|
|
//printf("_LCM_COMPLETE ");
|
|
|
//ChangeToOtherPage(_LCM_COMPLETE);
|
|
|
//return 0;
|
|
|
- //uint8_t index = 21;
|
|
|
+ uint8_t index = 1;
|
|
|
ShmDcCommonData->PSU_Number = 12;
|
|
|
while (_port != -1) {
|
|
|
if (strcmp((char *)pSysInfo->LcmHwRev, moduleName) != 0x00) {
|
|
@@ -1251,7 +1309,7 @@ int main(void)
|
|
|
}
|
|
|
|
|
|
// 頁面資訊處理
|
|
|
-
|
|
|
+
|
|
|
ProcessPageInfo();
|
|
|
|
|
|
// 換頁處理
|
|
@@ -1266,18 +1324,18 @@ int main(void)
|
|
|
if (is_show)
|
|
|
_showInformIndex >= 1 ? _showInformIndex = 0 : _showInformIndex++;
|
|
|
is_show = false;
|
|
|
- }
|
|
|
- */
|
|
|
+ }*/
|
|
|
+
|
|
|
GetCurrentPage(); //DS60-120 add
|
|
|
ChangeCurPage();
|
|
|
-
|
|
|
+
|
|
|
/*
|
|
|
- pSysInfo->PageIndex = index;
|
|
|
+ pSysInfo->PageIndex = _LCM_WAIT_PLUGIN;
|
|
|
GetCurrentPage();
|
|
|
- ChangeToOtherPage(index);
|
|
|
+ ChangeToOtherPage(_LCM_WAIT_PLUGIN);
|
|
|
GetCurrentPage();
|
|
|
DemoFunction();
|
|
|
- index >= 22 ? index = 21 : index++;
|
|
|
+ index >= 34 ? index = 1 : index++;
|
|
|
*/
|
|
|
//usleep(100000);
|
|
|
usleep(1000000);
|