优化显示
diff --git a/supwisdom/main.c b/supwisdom/main.c
index c5fdc97..9138e16 100644
--- a/supwisdom/main.c
+++ b/supwisdom/main.c
@@ -34,11 +34,11 @@
sp_communicate(&POS);
if(POS.paymode == PAYMODE_QRCODE)
{
- if(tick - lasttick >= DELAY_TIME100ms)
- {
- lasttick = tick;
- sp_qrcode_handle(&POS, &cardWorkState);
- }
+ //if(tick - lasttick >= DELAY_TIME100ms)
+ //{
+ // lasttick = tick;
+ sp_qrcode_handle(&POS, &cardWorkState);
+ //}
}
else
{
diff --git a/supwisdom/sp_communicate.c b/supwisdom/sp_communicate.c
index 258c90f..28dfe83 100644
--- a/supwisdom/sp_communicate.c
+++ b/supwisdom/sp_communicate.c
@@ -94,7 +94,7 @@
unpack_field_t field;
sp_protocol_response_t resp;
- disp_hint_info(pos,"ÕýÔÚÉí·ÝÈÏÖ¤ÖÐ",0);
+ disp_hint_info_two(pos,"Éí·ÝÈ·ÈÏÖÐ","ÇëÉÔµÈ...",0);
ret = sp_usart_recv(pos, &resp, COMM_WAIT_TIME);
if(ret)
{
@@ -136,7 +136,7 @@
card->feepara.fee_start = field.val.intval;
}
}
- disp_hint_info(pos,"Éí·ÝÈÏÖ¤³É¹¦",DELAY_TIME1s);
+ //disp_hint_info(pos,"Éí·ÝÈÏÖ¤³É¹¦",DELAY_TIME1s);
return 0;
}
diff --git a/supwisdom/sp_consume.c b/supwisdom/sp_consume.c
index 78dd02c..579a3af 100644
--- a/supwisdom/sp_consume.c
+++ b/supwisdom/sp_consume.c
@@ -438,7 +438,7 @@
}
if(pos->purchase.paid_num > card->waterlimit)
{
- disp_hint_info(pos,"ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ",DELAY_TIME2s);
+ disp_hint_info_two(pos,"Í£Ö¹³öË®","ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ",DELAY_TIME2s);
cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
}
cardWorkState->pause_tick = timer_get_ticker();
@@ -454,7 +454,7 @@
cardWorkState->current_state = CARDWORKSTATUS_STOPPED;
break;
case CARDWORKSTATUS_STOPPED:
- disp_hint_info(pos, "Çë°Î¿¨", DELAY_TIME2s);
+ disp_hint_info_two(pos,"Í£Ö¹³öË®", "ÇëÄÃ×ß¿¨", DELAY_TIME2s);
break;
case CARDWORKSTATUS_FEECARD_WORKING:
if(MEMCMP(pos->cardState.snr, card->cardphyid, 4) != 0)
@@ -629,6 +629,7 @@
cardWorkState->current_state = CARDWORKSTATUS_ERROR;
break;
}
+ disp_hint_info_two(pos, "ÇëÇó¶þάÂë","ÇëÉÔµÈ...",0);
ret = sp_qrcode_init(pos, &CARD);
if(ret)
{
@@ -645,7 +646,7 @@
}
pos->sysconf.work_mode = 1;
CARD.qrcode.starttime = sp_get_ticker();
- disp_hint_info(pos, "ÕýÔÚÉú³É¶þάÂë", DELAY_TIME2s);
+ //disp_hint_info(pos, "Éú³É¶þάÂë", 0);
cardWorkState->last_state = cardWorkState->current_state;
cardWorkState->current_state = CARDWORKSTATUS_READY;
break;
@@ -696,7 +697,7 @@
}
if(pos->purchase.paid_num > CARD.waterlimit)
{
- disp_hint_info(pos, "ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ", DELAY_TIME2s);
+ disp_hint_info_two(pos, "Í£Ö¹³öË®","ÒÑ´ïµ¥´Î³öË®ÉÏÏÞ", DELAY_TIME2s);
cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
}
cardWorkState->last_state = cardWorkState->current_state;
@@ -706,7 +707,7 @@
if(cardWorkState->last_state == CARDWORKSTATUS_NONE
|| cardWorkState->last_state == CARDWORKSTATUS_READY)
{
- disp_hint_info(pos,"È¡ÏûË¢Âë!", DELAY_TIME2s);
+ disp_hint_info_two(pos,"Í£Ö¹³öË®","È¡ÏûË¢Âë!", DELAY_TIME2s);
pos->paymode = PAYMODE_INIT;
pos->sysconf.work_mode = 0;
}
diff --git a/supwisdom/sp_data.c b/supwisdom/sp_data.c
index a6bad45..f2fdac3 100644
--- a/supwisdom/sp_data.c
+++ b/supwisdom/sp_data.c
@@ -351,7 +351,7 @@
uint8 crc[2];
sp_config_t config;
MEMCLEAR(&config, sizeof(config));
- disp_hint_info(pos,"É豸²ÎÊý³õʼ»¯", DELAY_TIME2s);
+ disp_hint_info_two(pos,"É豸²ÎÊý³õʼ»¯", "ÇëÉÔµÈ...",0);
sp_protocol_crc((uint8*)&config,sizeof(sp_config_t)-2,config.crc);
sp_flash_erase(ADDR_CONFIG_PARA);
sp_flash_write(ADDR_CONFIG_PARA,(uint8*)&config,sizeof(sp_config_t));
diff --git a/supwisdom/sp_display.c b/supwisdom/sp_display.c
index ba3b39f..ec618b1 100644
--- a/supwisdom/sp_display.c
+++ b/supwisdom/sp_display.c
@@ -59,8 +59,8 @@
static void show_bottom(sp_pos_t* pos)
{
- sprintf(line_buff,"%02d:%02x%02x%02x%02x",pos->deviceno, pos->devphyid[0],
- pos->devphyid[1], pos->devphyid[2], pos->devphyid[3]);
+ sprintf(line_buff,"%02d:%02x%02x%02x%02x v%s",pos->deviceno, pos->devphyid[0],
+ pos->devphyid[1], pos->devphyid[2], pos->devphyid[3],PRO_VERSION);
glcd_draw_string_xy(0, GLCD_BUTTOM_Y, line_buff);
}
@@ -100,7 +100,7 @@
if(MEMCMP(ctime,last_ctime,6) != 0)
{
MEMCPY(last_ctime,ctime,6);
- disp_hint_info_two(pos,"F°æ±¾",PRO_VERSION,0);
+ disp_hint_info_two(pos,">>Ë¢ÊÐÃñ¿¨³öË®",">>°´È·ÈϼüɨÂë",0);
}
}
diff --git a/supwisdom/sp_upgrade.c b/supwisdom/sp_upgrade.c
index 6f2fdb8..6d04a83 100644
--- a/supwisdom/sp_upgrade.c
+++ b/supwisdom/sp_upgrade.c
@@ -311,7 +311,7 @@
offset += (uint32)data_len;
if(ADDR_UPGRADE_BEGIN + offset >= ADDR_UPGRADE_END)
{
- disp_hint_info(pos, "ÏÂÔØÎļþ¹ý´ó",DELAY_TIME3s);
+ disp_hint_info_two(pos,"Éý¼¶Ê§°Ü", "ÏÂÔØÎļþ¹ý´ó",DELAY_TIME3s);
return 1;
}
}
@@ -319,7 +319,7 @@
{
if(3 < timeout_trycnt)
{
- disp_hint_info(pos, "ÏÂÔØÎļþ³¬Ê±",DELAY_TIME3s);
+ disp_hint_info_two(pos,"Éý¼¶Ê§°Ü", "ÏÂÔØÎļþ³¬Ê±",DELAY_TIME3s);
return 1;
}
Delay_ms(DELAY_TIME1s);
@@ -374,7 +374,7 @@
}
else
{
- disp_hint_info(pos, "ÎļþУÑé´íÎó",DELAY_TIME3s);
+ disp_hint_info_two(pos,"Éý¼¶Ê§°Ü", "ÎļþУÑé´íÎó",DELAY_TIME3s);
return 1;
}
}