From d8810399ec1c145d172a0971a58eaca98755edfb Mon Sep 17 00:00:00 2001 From: Tat-Chee Wan (USM Signature) Date: Wed, 5 Sep 2012 15:08:06 +0800 Subject: restore custom firmware string to settings --- AT91SAM7S256/Source/BtTest.inc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/AT91SAM7S256/Source/BtTest.inc b/AT91SAM7S256/Source/BtTest.inc index fe2a7ae..f879e20 100644 --- a/AT91SAM7S256/Source/BtTest.inc +++ b/AT91SAM7S256/Source/BtTest.inc @@ -22,11 +22,16 @@ void GetProtocolVersion(UBYTE *String) if (Tmp < 100) { - sprintf((char*)String,"FW NBC/NXC %2u.%02u",(FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF); +#ifdef CUSTOM_FIRMWAREVERSION + int pad = (sizeof (CUSTOM_FIRMWAREVERSION) - 1) > 7 ? 1 : 1 + 7 - (sizeof (CUSTOM_FIRMWAREVERSION) - 1); + sprintf((char*)String,"FW %*u.%02ui-%.7s", pad, (FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF, CUSTOM_FIRMWAREVERSION); +#else + sprintf((char*)String,"FW %3u.%02u",(FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF); +#endif } else { - sprintf((char*)String,"FW NBC/NXC %2X.%02X",(FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF); + sprintf((char*)String,"FW Hex %2X.%02X",(FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF); } } @@ -99,7 +104,6 @@ enum TSTPRG { SYSTEM_INIT = 1, SYSTEM_UNLOCK_INIT, -#ifdef TESTPRG SYSTEM_UNLOCK, SYSTEM_PAGE, TIMER_INIT, @@ -147,9 +151,9 @@ enum TSTPRG TSTPRG_MOTOR_INIT, TSTPRG_MOTOR, TSTPRG_SKIP_MOTOR, -#endif - TSTPRG_SKIP//, -// TSTPRG_WAIT + + TSTPRG_SKIP, + TSTPRG_WAIT }; const UBYTE TXT_EMPTY[] = " "; -- cgit v1.2.3