shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

VERSION macro was colliding with something

Browse Source
This commit is contained in:
Conor Patrick 2019-02-12 22:02:11 -05:00
parent d38d3a8342
commit 6e497ad04e
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/stm32l432/bootloader/bootloader.h
View File

@ -52,7 +52,7 @@
#define SKIP_BUTTON_CHECK_WITH_DELAY 0 #define SKIP_BUTTON_CHECK_WITH_DELAY 0
#define SKIP_BUTTON_CHECK_FAST 1 #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 printing_init();
void hw_init(void); void hw_init(void);

4
targets/stm32l432/src/app.h
View File

@ -32,9 +32,9 @@
#if defined(SOLO_HACKER) #if defined(SOLO_HACKER)
#define SOLO_PRODUCT_NAME "Solo Hacker " VERSION #define SOLO_PRODUCT_NAME "Solo Hacker " SOLO_VERSION
#else #else
#define SOLO_PRODUCT_NAME "Solo " VERSION #define SOLO_PRODUCT_NAME "Solo " SOLO_VERSION
#endif #endif
void printing_init(); void printing_init();

8
targets/stm32l432/src/version.h
View File

@ -10,15 +10,11 @@
#endif #endif
#define BOOT_VERSION_MAJ 1
#define BOOT_VERSION_MIN 0
#define BOOT_VERSION_PATCH 0
#define __STR_HELPER(x) #x #define __STR_HELPER(x) #x
#define __STR(x) __STR_HELPER(x) #define __STR(x) __STR_HELPER(x)
#ifndef VERSION #ifndef SOLO_VERSION
#define VERSION __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN) "." __STR(SOLO_VERSION_PATCH) #define SOLO_VERSION __STR(SOLO_VERSION_MAJ) "." __STR(SOLO_VERSION_MIN) "." __STR(SOLO_VERSION_PATCH)
#endif #endif