aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-01 00:08:16 +0100
committerNicolas Schodet2012-02-08 00:01:45 +0100
commite26e1958b11eb6e7540049fb84bea069bc55dc92 (patch)
treea49881159caa9406f4f3e46a376fc5402c175dea
parentcdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 (diff)
use a special version number for merged branch ('m' suffix)
-rw-r--r--AT91SAM7S256/Source/BtTest.inc9
1 files changed, 7 insertions, 2 deletions
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);
}
}