From 020fe21546ace727e0bc2ee9312e791d7d991226 Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Tue, 12 Feb 2019 16:11:06 -0500
Subject: [PATCH] organize version header info

---
 targets/stm32l432/bootloader/bootloader.h |  8 ++------
 targets/stm32l432/src/app.h               | 10 ++++------
 targets/stm32l432/src/version.h           | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 targets/stm32l432/src/version.h

diff --git a/targets/stm32l432/bootloader/bootloader.h b/targets/stm32l432/bootloader/bootloader.h
index d12d953..0937abf 100644
--- a/targets/stm32l432/bootloader/bootloader.h
+++ b/targets/stm32l432/bootloader/bootloader.h
@@ -22,6 +22,7 @@
 #ifndef _APP_H_
 #define _APP_H_
 #include <stdint.h>
+#include "version.h"
 
 #define DEBUG_UART      USART1
 
@@ -65,12 +66,7 @@
 #define SKIP_BUTTON_CHECK_WITH_DELAY        0
 #define SKIP_BUTTON_CHECK_FAST              1
 
-
-#define BOOT_VERSION_MAJ    1
-#define BOOT_VERSION_MIN    0
-#define __STR_HELPER(x) #x
-#define __STR(x) __STR_HELPER(x)
-#define SOLO_PRODUCT_NAME "Solo Bootloader " __STR(BOOT_VERSION_MAJ) "." __STR(BOOT_VERSION_MIN)
+#define SOLO_PRODUCT_NAME "Solo Bootloader " VERSION
 
 void printing_init();
 void hw_init(void);
diff --git a/targets/stm32l432/src/app.h b/targets/stm32l432/src/app.h
index 89011f5..5a812ed 100644
--- a/targets/stm32l432/src/app.h
+++ b/targets/stm32l432/src/app.h
@@ -22,6 +22,7 @@
 #ifndef _APP_H_
 #define _APP_H_
 #include <stdint.h>
+#include "version.h"
 
 #define DEBUG_UART      USART1
 
@@ -43,15 +44,12 @@
 // #define DISABLE_CTAPHID_PING
 // #define DISABLE_CTAPHID_WINK
 // #define DISABLE_CTAPHID_CBOR
-#define SOLO_VERSION_MAJ    1
-#define SOLO_VERSION_MIN    0
-#define __STR_HELPER(x) #x
-#define __STR(x) __STR_HELPER(x)
+
 
 #if defined(SOLO_HACKER)
-#define SOLO_PRODUCT_NAME "Solo Hacker " __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN)
+#define SOLO_PRODUCT_NAME "Solo Hacker " VERSION
 #else
-#define SOLO_PRODUCT_NAME "Solo " __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN)
+#define SOLO_PRODUCT_NAME "Solo " VERSION
 #endif
 
 void printing_init();
diff --git a/targets/stm32l432/src/version.h b/targets/stm32l432/src/version.h
new file mode 100644
index 0000000..e9f2e7c
--- /dev/null
+++ b/targets/stm32l432/src/version.h
@@ -0,0 +1,19 @@
+#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)
+
+#define VERSION     __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN) "." __STR(SOLO_VERSION_PATCH)
+
+
+#endif