Merge tag '1.0.3' into develop
tag 1.0.3
diff --git a/supwisdom/sp_consume.c b/supwisdom/sp_consume.c
index 737b25a..e1a9c46 100644
--- a/supwisdom/sp_consume.c
+++ b/supwisdom/sp_consume.c
@@ -10,7 +10,8 @@
#include "sp_consume.h"
#include "sp_communicate.h"
-static int count = 0;
+static uint32 count = 0;
+static uint8 menu_cnt = 0;
static uint16 sp_calc_payamt_by_flowsensor(sp_pos_t* pos, sp_card_t* card)
{
uint32 usedcount = 0;
@@ -570,34 +571,44 @@
void sp_confirm_paymode(sp_pos_t* pos, sp_cardworkstate_t* cardWorkState)
{
- uint8 keycode = SP_KEY_NONE;
+ uint8 keycode;
keycode = sp_get_key();
- //ÔÚ¿¨Ïû·ÑÔÝÍ£Çé¿öÏ°´ÈÎÒâ¼üΪ½áÊøµ±Ç°Ïû·Ñ״̬
- if(keycode >= SP_KEY_0 && keycode <= SP_KEY_ENTER
- && pos->cardState.cur_state == STATE_NONE
- && cardWorkState->current_state == CARDWORKSTATUS_PAUSE && pos->paymode == PAYMODE_CARD)
+ if(keycode != SP_KEY_NONE)
{
- cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
- return;
- }
- //Ïû·Ñģʽ³õʼ»¯×´Ì¬Ï°´È·ÈϼüÑ¡Ôñ¶þάÂëÏû·Ñ
- if((keycode == SP_KEY_ENTER) && (pos->paymode == PAYMODE_INIT))
- {
- cardWorkState->current_state = CARDWORKSTATUS_NONE;
- pos->paymode = PAYMODE_QRCODE;
- return;
- }
- //¶þάÂëģʽÏ°´È¡Ïû¼üΪֹͣ¹¤×÷
- if((pos->paymode == PAYMODE_QRCODE) && (keycode == SP_KEY_CLEAR))
- {
- cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
- return;
- }
- //°´0¼ü½øÈëÉ豸²Ù×÷½çÃæ
- if(keycode == SP_KEY_0 && (pos->paymode == PAYMODE_INIT))
- {
- cardWorkState->current_state = CARDWORKSTATUS_SET_DEV;
- return;
+ //°´0¼ü½øÈëÉ豸²Ù×÷½çÃæ
+ if((keycode == SP_KEY_0) && (pos->paymode == PAYMODE_INIT))
+ {
+ menu_cnt++;
+ if(menu_cnt > 6)
+ {
+ menu_cnt = 0;
+ cardWorkState->current_state = CARDWORKSTATUS_SET_DEV;
+ }
+ return;
+ }
+ menu_cnt = 0;
+
+ //ÔÚ¿¨Ïû·ÑÔÝÍ£Çé¿öÏ°´ÈÎÒâ¼üΪ½áÊøµ±Ç°Ïû·Ñ״̬
+ if((pos->cardState.cur_state == STATE_NONE)
+ && (cardWorkState->current_state == CARDWORKSTATUS_PAUSE)
+ && (pos->paymode == PAYMODE_CARD))
+ {
+ cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
+ return;
+ }
+ //Ïû·Ñģʽ³õʼ»¯×´Ì¬Ï°´È·ÈϼüÑ¡Ôñ¶þάÂëÏû·Ñ
+ if((keycode == SP_KEY_ENTER) && (pos->paymode == PAYMODE_INIT))
+ {
+ cardWorkState->current_state = CARDWORKSTATUS_NONE;
+ pos->paymode = PAYMODE_QRCODE;
+ return;
+ }
+ //¶þάÂëģʽÏ°´È¡Ïû¼üΪֹͣ¹¤×÷
+ if((keycode == SP_KEY_CLEAR) && (pos->paymode == PAYMODE_QRCODE))
+ {
+ cardWorkState->current_state = CARDWORKSTATUS_STOPPING;
+ return;
+ }
}
}
diff --git a/supwisdom/sp_flash.c b/supwisdom/sp_flash.c
index 0788aed..032f7b6 100644
--- a/supwisdom/sp_flash.c
+++ b/supwisdom/sp_flash.c
@@ -32,35 +32,26 @@
**/
uint16 sp_flash_page_read(uint32 addr,uint8 buf[],uint32 len)
{
- uint32 i;
- uint32 offset = 0;
- uint8 temp[128];
+ uint32 offset;
+ uint8 temp[256];
if(len > sizeof(temp))
{
+ memset(buf,0,len);
return 1;
}
-
+
+ offset = 0;
while(1)
{
- i = 0;
+ memset(temp,0,sizeof temp);
sp_flash_read(addr +offset,temp, len);
- while(i < len)
- {
- if(0xFF == temp[i])
- {
- ++i;
- }
- else
- {
- break;
- }
- }
- if(len == i)
+ if(0 == isFF(temp,(uint16)len))
{
if(0 == offset)
{
//ÎÞÊý¾Ý
+ memset(buf,0,len);
return 1;
}
else
@@ -70,9 +61,11 @@
}
}
offset += len;
- if(DEF_FLASH_PageSize < (offset +len)) // ³¬¹ýµ±Ò³Î´ÕÒµ½·µ»Ø1
+ /**Ò»Ò³¸ÕºÃдÍê»ò³¬¹ýµ±Ç°Ò³ ˵Ã÷Ò»Ò³¸ÕºÃÓÃÍê**/
+ if(DEF_FLASH_PageSize < (offset +len))
{
- return 1;
+ memcpy(buf,temp,len);
+ return 0;
}
}
}
@@ -84,40 +77,30 @@
**/
uint16 sp_flash_page_write(uint32 addr,uint8 buf[],uint32 len)
{
- uint32 i;
- uint32 offset = 0;
- uint8 temp[64];
+ uint32 offset;
+ uint8 temp[256];
- if(len > 64)
+ if(len > sizeof(temp))
{
return 1;
}
+
+ offset = 0;
while(1)
{
- i = 0;
+ memset(temp,0,sizeof temp);
sp_flash_read(addr +offset,temp, len);
- while(i < len)
+ if(0 == isFF(temp,(uint16)len))
{
- if(0xFF == temp[i])
- {
- ++i;
- }
- else
- {
- break;
- }
+ return sp_flash_write(addr +offset,buf, len);
}
+ offset += len;
if(DEF_FLASH_PageSize < (offset +len)) // ³¬¹ýµ±Ò³±íʾÒÑдÂú,²Á³ýÖØд
{
sp_flash_erase(addr);
return sp_flash_write(addr,buf, len);
}
- if(len == i)
- {
- //ÎÞÊý¾Ý
- return sp_flash_write(addr +offset,buf, len);
- }
- offset += len;
}
}
+
diff --git a/supwisdom/sp_menu.c b/supwisdom/sp_menu.c
index 4447d52..284d43d 100644
--- a/supwisdom/sp_menu.c
+++ b/supwisdom/sp_menu.c
@@ -24,7 +24,7 @@
uint8 max_cnt = 0;
uint8 offset = 0;
uint8 unconfirm_transnum;
- char syspara[9][17];
+ char syspara[10][17];
MEMCLEAR(syspara, sizeof(syspara));
sprintf(syspara[offset++], "É豸״̬:");
@@ -67,10 +67,15 @@
unconfirm_transnum = 0;
}
sprintf(syspara[offset++], "%d±Ê", unconfirm_transnum);
+
+ sprintf(syspara[offset++],"Âö³åµ¥Î»¼ÆÊý");
+ sprintf(syspara[offset++],"%d (´Î/100ml)",
+ ((uint32)pos->sysconf.flowsensor_unit)*1);
+
sprintf(syspara[offset++], "Ïû·ÑÀàÐÍ:");
sprintf(syspara[offset++], "¼ÇÕËÏû·Ñ");
- max_cnt = sizeof(syspara)/sizeof(syspara[0])/2;
+ max_cnt = (sizeof(syspara)/sizeof(syspara[0]) -1)/2 +1;
offset = 0;
ticker = sp_get_ticker();
while(sp_get_ticker()-ticker <= DELAY_TIME60s)
@@ -115,7 +120,7 @@
}
}
-static uint8 sp_link_test(sp_pos_t* pos)
+static void test_link(sp_pos_t* pos)
{
uint8 ret;
sp_protocol_request_t req;
@@ -137,17 +142,16 @@
if(sp_check_time_valid(resp.data +2))
{
disp_hint_info_two(pos, "Á´Â·¼ì²â³É¹¦","ʱÖÓ²»ºÏ·¨", DELAY_TIME3s);
- return ret;
+ return;
}
sp_set_bcdtime(resp.data +2);
disp_hint_info_two(pos, "Á´Â·¼ì²â³É¹¦","ÒÑͬ²½Ê±ÖÓ", DELAY_TIME3s);
- return ret;
+ return;
}
disp_hint_info_two(pos, "Á´Â·¼ì²âʧ°Ü","ÊÕµ½´íÎó°ü", DELAY_TIME3s);
- return 1;
+ return;
}
disp_hint_info_two(pos, "Á´Â·¼ì²âʧ°Ü","Çë¼ì²âÏß·", DELAY_TIME3s);
- return ret;
}
static void show_keyboard_test(sp_pos_t* pos, uint8 offset)
@@ -158,7 +162,14 @@
disp_hint_info_three(pos, "¼üÅÌÒÀ´ÎÊäÈë","0123456789C",temp,0);
}
-static uint8 sp_keyboard_test(sp_pos_t* pos)
+static void do_keyboard_calibrate(sp_pos_t* pos)
+{
+ disp_hint_info_two(pos,"УÑé¼üÅÌ","ÇëÉÔµÈ...",0);
+ sp_key_calibrate();
+ disp_hint_info_two(pos, "¼üÅÌУÑéÍê³É","Çë¼ì²â",DELAY_TIME3s);
+}
+
+static void do_keyboard_test(sp_pos_t* pos)
{
uint8 kcode;
uint32 tick;
@@ -252,7 +263,7 @@
if(offset == 0)
{
disp_hint_info(pos, "È¡Ïû°´¼ü¼ì²â",DELAY_TIME2s);
- return 1;
+ return;
}
if(keybuf[offset] == SP_KEY_CLEAR)
{
@@ -264,7 +275,7 @@
if(keybuf[offset] == SP_KEY_ENTER)
{
disp_hint_info_two(pos, "¼üÅ̼ì²âÕýÈ·","¼üÅÌУ׼Õý³£",DELAY_TIME3s);
- return 0;
+ return;
}
break;
default:
@@ -272,14 +283,6 @@
}
}
}
- return 1;
-
-}
-
-static void sp_factory_check(sp_pos_t* pos)
-{
- sp_link_test(pos);
- sp_keyboard_test(pos);
}
static void sp_set_devtime(sp_pos_t* pos)
@@ -582,7 +585,55 @@
}
}
-void sp_menu_options(sp_pos_t* pos)
+static void test_valve_on(sp_pos_t* pos)
+{
+ sp_valve_on();
+ disp_hint_info_two(pos,"·§ÃÅ¿ªÆôÖÐ","ÇëÈ·ÈÏ",DELAY_TIME2s);
+}
+
+static void test_valve_off(sp_pos_t* pos)
+{
+ sp_valve_off();
+ disp_hint_info_two(pos,"·§ÃÅÒѹرÕ","ÇëÈ·ÈÏ",DELAY_TIME3s);
+}
+static void test_flowsensor(sp_pos_t* pos)
+{
+ uint32 ticker;
+ uint8 kcode;
+ uint32 count;
+ uint32 temp;
+ char msg[32];
+
+ sp_flowsensor_count_clear();
+ sp_valve_on();
+ disp_hint_info_two(pos,"Á÷Á¿²âÊÔÖÐ","ÇëÈ·ÈÏ",0);
+ count = 0;
+ ticker = sp_get_ticker();
+ while(sp_get_ticker() -ticker < DELAY_TIME60s)
+ {
+ sp_valve_control();
+ kcode = sp_get_key();
+ if(kcode != SP_KEY_NONE)
+ {
+ if(kcode == SP_KEY_CLEAR)
+ {
+ return;
+ }
+ ticker = sp_get_ticker();
+ }
+ temp = sp_flowsensor_get_count();
+ if(temp != count)
+ {
+ count = temp;
+ sprintf(msg,"Á÷Á¿¼ÆÊý:%d",count);
+ disp_hint_info_two(pos,"Á÷Á¿²âÊÔÖÐ",msg,DELAY_TIME100ms);
+ }
+ }
+ sprintf(msg,"Á÷Á¿¼ÆÊý:%d",sp_flowsensor_get_count());
+ disp_hint_info_two(pos,"Á÷Á¿²âÊÔ½áÊø",msg,DELAY_TIME3s);
+}
+
+static void test_factory_options(sp_pos_t* pos)
{
uint32 ticker = 0;
uint8 keycode;
@@ -592,17 +643,14 @@
menu_t menus[] =
{
- {"1.²é¿´²ÎÊý", sp_show_syspara},
- {"2.¹¤³§²âÊÔ", sp_factory_check},
- {"3.ÉèÖÃʱ¼ä", sp_set_devtime},
- {"4.ÊÖ¶¯µÇ¼", sp_manual_login},
- {"5.ÉèÖÃÎïÀíid", sp_set_devphyid},
- {"6.ÉèÖûúºÅ", sp_set_deviceno},
- {"7.Çå¿ÕÁ÷Ë®", clear_transdtl},
- {"8.ÔÚÏßÉý¼¶", manual_upgrade},
- {"9.»Ö¸´³ö³§", reset_factory}
+ {"1.°´¼üУ׼", do_keyboard_calibrate},
+ {"2.°´¼ü²âÊÔ", do_keyboard_test},
+ {"3.¿ªÆô·§ÃÅ", test_valve_on},
+ {"4.¹Ø±Õ·§ÃÅ", test_valve_off},
+ {"5.Á÷Á¿²âÊÔ", test_flowsensor},
+ {"6.ͨѶ²âÊÔ", test_link}
};
- max_cnt = sizeof(menus)/sizeof(menu_t)/3;
+ max_cnt = (sizeof(menus)/sizeof(menu_t) -1)/3 + 1;
page = 0;
ticker = sp_get_ticker();
while(sp_get_ticker()-ticker <= DELAY_TIME60s*5)
@@ -653,3 +701,77 @@
}
}
}
+
+void sp_menu_options(sp_pos_t* pos)
+{
+ uint32 ticker = 0;
+ uint8 keycode;
+ uint8 page;
+ uint8 max_cnt;
+ uint8 key_press = 1;
+
+ menu_t menus[] =
+ {
+ {"1.²é¿´²ÎÊý", sp_show_syspara},
+ {"2.¹¤³§²âÊÔ", test_factory_options},
+ {"3.ÉèÖÃʱ¼ä", sp_set_devtime},
+ {"4.ÊÖ¶¯µÇ¼", sp_manual_login},
+ {"5.ÉèÖÃÎïÀíid", sp_set_devphyid},
+ {"6.ÉèÖûúºÅ", sp_set_deviceno},
+ {"7.Çå¿ÕÁ÷Ë®", clear_transdtl},
+ {"8.ÔÚÏßÉý¼¶", manual_upgrade},
+ {"9.»Ö¸´³ö³§", reset_factory}
+ };
+ max_cnt = (sizeof(menus)/sizeof(menu_t) -1)/3 + 1;
+ page = 0;
+ ticker = sp_get_ticker();
+ while(sp_get_ticker()-ticker <= DELAY_TIME60s*5)
+ {
+ sp_feed_dog();
+ keycode = sp_get_key();
+ if(keycode != SP_KEY_NONE)
+ {
+ key_press = 1;
+ switch(keycode)
+ {
+ case SP_KEY_0:
+ if(page < (max_cnt-1))
+ {
+ page++;
+ }
+ break;
+ case SP_KEY_1:
+ case SP_KEY_2:
+ case SP_KEY_3:
+ case SP_KEY_4:
+ case SP_KEY_5:
+ case SP_KEY_6:
+ case SP_KEY_7:
+ case SP_KEY_8:
+ case SP_KEY_9:
+ if(menus[keycode-SP_KEY_1].func != NULL)
+ {
+ menus[keycode-SP_KEY_1].func(pos);
+ }
+ break;
+ case SP_KEY_CLEAR:
+ if(page == 0)
+ {
+ return;
+ }
+ page--;
+ break;
+ default:
+ break;
+ }
+ }
+ if(key_press)
+ {
+ disp_hint_info_three(pos, menus[page*3].hit, menus[page*3+1].hit, menus[page*3+2].hit, 0);
+ key_press = 0;
+ ticker = sp_get_ticker();
+ }
+ }
+}
+
+
diff --git a/supwisdom/sp_menu.h b/supwisdom/sp_menu.h
index 75f8f32..f780cd3 100644
--- a/supwisdom/sp_menu.h
+++ b/supwisdom/sp_menu.h
@@ -1,4 +1,4 @@
-#ifdef _SP_MENU_H_
+#ifndef _SP_MENU_H_
#define _SP_MENU_H_
#include "sp_config.h"