优化
diff --git a/supwisdom/sp_constant.h b/supwisdom/sp_constant.h
index ea79d09..af5b43c 100644
--- a/supwisdom/sp_constant.h
+++ b/supwisdom/sp_constant.h
@@ -8,34 +8,20 @@
////////////////////////////////////////////////////////////////////////////////
#define RC_SUCCESS 0 // ³É¹¦
-#define RC_PSAM_ERR 1 //SAM¸´Î»Ê§°Ü
-#define RC_CARD_LOGIN 2 //ÑéÖ¤ÃÜԿʧ°Ü
-#define RC_CARD_READ 3 //¶Á¿¨Ê§°Ü
-#define RC_CARD_WRITE 4 //д¿¨Ê§°Ü
#define RC_FLASH_ERR 5 //FLASH´íÎó
#define RC_HARDWARE_ERR 6 //Ó²¼þ¼ÓÔØ´íÎó
#define RC_FLASH_NO_RIGHT 7 //·Ç¿Éдflash
-#define RC_CARD_NORIGHT 11 //¿¨ÎÞȨÏÞ
#define RC_CARD_EXPIRED 12 //¹ýÆÚ¿¨
#define RC_CARD_AUTHENTICATION 13 //¿¨ÈÏ֤ʧ°Ü
-#define RC_CARD_LOST 14 //ºÚÃûµ¥¿¨
-#define RC_CARDNO_EXCEPT 17 //¿¨ºÅÒì³£
#define RC_CARD_TIMEOUT 18 //ʹÓÃʱ¼äÌ«³¤
-#define RC_CARDBAL_EXCEPT 19 //¿¨Óà¶îÒì³£
-#define RC_CARDBAL_LACK 20 //¿¨Óà¶î²»×ã
#define RC_DEVPHYID_NOTSET 21 //É豸µØַδÉèÖÃ
-#define RC_FEERATE_NOTSET 22 //·ÑÂÊδ³õʼ»¯
#define RC_DEV_OFFLINE_ERROR 23 // É豸ÍÑ»ú¹¤×÷Ì«³¤
-#define RC_FILE09_CRC_ERR 25 ////¼Ç¼CRC´íÎó
-#define RC_FILE10_CRC_ERR 26 //Ë®¿ØÇ®°üCRC´íÎó
#define RC_CARD_INVALID 27 //ÎÞЧ¿¨
-#define RC_FEENUM_ERROR 28 //·ÑÂʸöÊý´íÎó
#define RC_NOTSUPPORT 29 //²»Ö§³Ö
#define RC_NOT_SAME_CARD 30 //²»Í¬¿¨
-#define RC_MODE_NOT_SUPPORT 42 //Ïû·Ñģʽ²»Ö§³Ö
#define RC_UPDPROG_ERR 43 //Éý¼¶Ê§°Ü
#define RC_CONFPARA_CRC_ERR 55 //ÅäÖòÎÊýcrc´íÎó
@@ -52,9 +38,6 @@
#define RC_DEV_FAULT 66 //É豸ÒÉËƹÊÕÏ
#define RC_DEV_NOSET_FLOWSENSOR_UNIT 67 //É豸Á÷Á¿¼ÆË㵥λδÉèÖÃ
#define RC_COMM_TIMEOUT 68 //ͨѶ³¬Ê±
-#define STATUS_KEEPOPEN 1 //³£¿ª¿¨
-#define STATUS_CLOSED 0 //È¡Ïû³£¿ª¿¨
-
#define RC_LIMIT_CONSUMPTION 70 //ÏÞÖÆÏû·Ñ
#endif
diff --git a/supwisdom/sp_display.c b/supwisdom/sp_display.c
index a12d11e..607aeff 100644
--- a/supwisdom/sp_display.c
+++ b/supwisdom/sp_display.c
@@ -174,18 +174,6 @@
char msg[32];
switch(errcode)
{
- case RC_PSAM_ERR:
- sprintf(msg, "%s", "SAM¸´Î»Ê§°Ü");
- break;
- case RC_CARD_LOGIN:
- sprintf(msg, "%s", "ÑéÖ¤ÃØԿʧ°Ü");
- break;
- case RC_CARD_READ:
- sprintf(msg, "%s", "¶Á¿¨Ê§°Ü");
- break;
- case RC_CARD_WRITE:
- sprintf(msg, "%s", "д¿¨Ê§°Ü");
- break;
case RC_FLASH_ERR:
sprintf(msg, "%s", "FLASHÒì³£");
break;
@@ -195,60 +183,30 @@
case RC_FLASH_NO_RIGHT:
sprintf(msg, "%s", "FLASHÏÞÖÆ");
break;
- case RC_CARD_NORIGHT:
- sprintf(msg, "%s", "¿¨ÎÞȨÏÞ");
- break;
case RC_CARD_EXPIRED:
sprintf(msg, "%s", "¿¨ÒѹýÆÚ");
break;
- case RC_CARD_LOST:
- sprintf(msg, "%s", "¿¨ÒÑËø¶¨");
- break;
- case RC_CARDNO_EXCEPT:
- sprintf(msg, "%s", "¿¨Òì³£");
- break;
case RC_CARD_TIMEOUT:
sprintf(msg, "%s", "ʹÓÃÌ«¾Ã");
break;
- case RC_CARDBAL_EXCEPT:
- sprintf(msg, "%s", "Óà¶îÒì³£");
- break;
- case RC_CARDBAL_LACK:
- sprintf(msg, "%s", "ÇëÁª»úÏû·Ñ");
- break;
case RC_DEVPHYID_NOTSET:
sprintf(msg, "%s", "δÉèÖûúºÅ");
break;
- case RC_FEERATE_NOTSET:
- sprintf(msg, "%s", "δÉèÖ÷ÑÂÊ");
- break;
case RC_DEV_OFFLINE_ERROR:
sprintf(msg, "%s", "É豸ÍÑ»úÌ«¾Ã");
break;
case RC_TRANSDTL_FULL:
sprintf(msg, "%s", "Á÷Ë®ÒÑÂú");
break;
- case RC_FILE09_CRC_ERR:
- sprintf(msg, "%s", "09CRC´íÎó");
- break;
- case RC_FILE10_CRC_ERR:
- sprintf(msg, "%s", "10CRC´íÎó");
- break;
case RC_CARD_INVALID:
sprintf(msg, "%s", "ÎÞЧ¿¨");
break;
- case RC_FEENUM_ERROR:
- sprintf(msg, "%s", "·ÑÂʸöÊý´íÎó");
- break;
case RC_NOTSUPPORT:
sprintf(msg, "%s", "²»Ö§³Ö");
break;
case RC_NOT_SAME_CARD:
sprintf(msg, "%s", "²»Í¬¿¨");
break;
- case RC_MODE_NOT_SUPPORT:
- sprintf(msg, "%s", "ģʽ²»Ö§³Ö");
- break;
case RC_UPDPROG_ERR:
sprintf(msg, "%s", "Éý¼¶Ê§°Ü");
break;
@@ -277,13 +235,13 @@
sprintf(msg, "%s", "É豸ÒÉËƹÊÕÏ");
break;
case RC_DEV_NOSET_FLOWSENSOR_UNIT:
- sprintf(msg, "%s", "Á÷Á¿¼ÆË㵥λδÉèÖÃ");
+ sprintf(msg, "%s", "¼ÆÁ¿µ¥Î»Î´ÉèÖÃ");
break;
case RC_CARD_AUTHENTICATION:
disp_server_errmsg(pos,"ÈÏ֤ʧ°Ü",pos->errmsg,pos->errmsglen);
return;
case RC_LIMIT_CONSUMPTION:
- sprintf(msg, "%s", "¸ÃÓû§±»ÏÞÖÆÏû·Ñ");
+ sprintf(msg, "%s", "ÏÞÖÆÏû·Ñ");
break;
default:
sprintf(msg,"´íÎóÂë=0x%04x",errcode);