From 6e497ad04e2dedbc3448ee464100b31867e0c36c Mon Sep 17 00:00:00 2001
From: Conor Patrick <conorpp94@gmail.com>
Date: Tue, 12 Feb 2019 22:02:11 -0500
Subject: [PATCH] VERSION macro was colliding with something

---
 targets/stm32l432/bootloader/bootloader.h | 2 +-
 targets/stm32l432/src/app.h               | 4 ++--
 targets/stm32l432/src/version.h           | 8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/targets/stm32l432/bootloader/bootloader.h b/targets/stm32l432/bootloader/bootloader.h
index 9335f8d..013ed6a 100644
--- a/targets/stm32l432/bootloader/bootloader.h
+++ b/targets/stm32l432/bootloader/bootloader.h
@@ -52,7 +52,7 @@
 #define SKIP_BUTTON_CHECK_WITH_DELAY        0
 #define SKIP_BUTTON_CHECK_FAST              1
 
-#define SOLO_PRODUCT_NAME "Solo Bootloader " VERSION
+#define SOLO_PRODUCT_NAME "Solo Bootloader " SOLO_VERSION
 
 void printing_init();
 void hw_init(void);
diff --git a/targets/stm32l432/src/app.h b/targets/stm32l432/src/app.h
index 8be24fd..c05a9b3 100644
--- a/targets/stm32l432/src/app.h
+++ b/targets/stm32l432/src/app.h
@@ -32,9 +32,9 @@
 
 
 #if defined(SOLO_HACKER)
-#define SOLO_PRODUCT_NAME "Solo Hacker " VERSION
+#define SOLO_PRODUCT_NAME "Solo Hacker " SOLO_VERSION
 #else
-#define SOLO_PRODUCT_NAME "Solo " VERSION
+#define SOLO_PRODUCT_NAME "Solo " SOLO_VERSION
 #endif
 
 void printing_init();
diff --git a/targets/stm32l432/src/version.h b/targets/stm32l432/src/version.h
index fcad14d..fe5f293 100644
--- a/targets/stm32l432/src/version.h
+++ b/targets/stm32l432/src/version.h
@@ -10,15 +10,11 @@
 
 #endif
 
-#define BOOT_VERSION_MAJ    1
-#define BOOT_VERSION_MIN    0
-#define BOOT_VERSION_PATCH    0
-
 #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)
+#ifndef SOLO_VERSION
+#define SOLO_VERSION     __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN) "." __STR(SOLO_VERSION_PATCH)
 #endif