Merge branch 'master' into license-change

targets/stm32l432/src/app.h

@@ -7,6 +7,7 @@
 #ifndef _APP_H_
 #define _APP_H_
 #include <stdint.h>
+#include "version.h"
 
 #define DEBUG_UART      USART1
 
@@ -21,7 +22,7 @@
 
 //#define USING_DEV_BOARD
 
-//#define ENABLE_U2F_EXTENSIONS
+#define ENABLE_U2F_EXTENSIONS
 
 #define ENABLE_U2F
 
@@ -29,6 +30,13 @@
 // #define DISABLE_CTAPHID_WINK
 // #define DISABLE_CTAPHID_CBOR
 
+
+#if defined(SOLO_HACKER)
+#define SOLO_PRODUCT_NAME "Solo Hacker " VERSION
+#else
+#define SOLO_PRODUCT_NAME "Solo " VERSION
+#endif
+
 void printing_init();
 void hw_init(void);
 

targets/stm32l432/src/version.h

@@ -0,0 +1,21 @@
+#ifndef _VERSION_H_
+#define _VERSION_H_
+
+
+#ifndef SOLO_VERSION_MAJ
+
+#define SOLO_VERSION_MAJ    0
+#define SOLO_VERSION_MIN    0
+#define SOLO_VERSION_PATCH    0
+
+#endif
+
+#define __STR_HELPER(x) #x
+#define __STR(x) __STR_HELPER(x)
+
+#ifndef VERSION
+#define VERSION     __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN) "." __STR(SOLO_VERSION_PATCH)
+#endif
+
+
+#endif