From e26e1958b11eb6e7540049fb84bea069bc55dc92 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 1 Feb 2012 00:08:16 +0100 Subject: use a special version number for merged branch ('m' suffix) --- AT91SAM7S256/Source/BtTest.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'AT91SAM7S256') diff --git a/AT91SAM7S256/Source/BtTest.inc b/AT91SAM7S256/Source/BtTest.inc index fe2a7ae..148f43b 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.%02um-%.7s", pad, (FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF, CUSTOM_FIRMWAREVERSION); +#else + sprintf((char*)String,"FW %3u.%02um",(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.%02Xm",(FIRMWAREVERSION >> 8) & 0x00FF,Tmp & 0x00FF); } } -- cgit v1.2.3