Adding more version information

- Most recent git tag (version)
- Most recent git tag hash (needed for revision number)
- Most recent git tag commit number
- Commit number difference between current and last tagged commit

Author: haata

Debug/cli/cli.c

@@ -708,21 +708,25 @@ void cliFunc_tick( char* args )
 void cliFunc_version( char* args )
 {
 	print( NL );
-	print( " \033[1mRevision:\033[0m      " CLI_Revision       NL );
-	print( " \033[1mBranch:\033[0m        " CLI_Branch         NL );
+	print( " \033[1mRevision:\033[0m      " CLI_Revision          NL );
+	print( " \033[1mRevision #:\033[0m    " CLI_RevisionNumberStr NL );
+	print( " \033[1mVersion:\033[0m       " CLI_Version " (+" );
+	printInt16( CLI_RevisionNumber - CLI_VersionRevNumber );
+	print( ":" CLI_VersionRevNumberStr ")" NL );
+	print( " \033[1mBranch:\033[0m        " CLI_Branch            NL );
 	print( " \033[1mTree Status:\033[0m   " CLI_ModifiedStatus CLI_ModifiedFiles NL );
-	print( " \033[1mRepo Origin:\033[0m   " CLI_RepoOrigin     NL );
-	print( " \033[1mCommit Date:\033[0m   " CLI_CommitDate     NL );
-	print( " \033[1mCommit Author:\033[0m " CLI_CommitAuthor   NL );
-	print( " \033[1mBuild Date:\033[0m    " CLI_BuildDate      NL );
-	print( " \033[1mBuild OS:\033[0m      " CLI_BuildOS        NL );
-	print( " \033[1mArchitecture:\033[0m  " CLI_Arch           NL );
+	print( " \033[1mRepo Origin:\033[0m   " CLI_RepoOrigin        NL );
+	print( " \033[1mCommit Date:\033[0m   " CLI_CommitDate        NL );
+	print( " \033[1mCommit Author:\033[0m " CLI_CommitAuthor      NL );
+	print( " \033[1mBuild Date:\033[0m    " CLI_BuildDate         NL );
+	print( " \033[1mBuild OS:\033[0m      " CLI_BuildOS           NL );
+	print( " \033[1mArchitecture:\033[0m  " CLI_Arch              NL );
 	print( " \033[1mChip Compiled:\033[0m " CLI_ChipShort " (" CLI_Chip ")" NL );
-	print( " \033[1mCPU:\033[0m           " CLI_CPU            NL );
-	print( " \033[1mDevice:\033[0m        " CLI_Device         NL );
-	print( " \033[1mModules:\033[0m       " CLI_Modules        NL );
+	print( " \033[1mCPU:\033[0m           " CLI_CPU               NL );
+	print( " \033[1mDevice:\033[0m        " CLI_Device            NL );
+	print( " \033[1mModules:\033[0m       " CLI_Modules           NL );
 #if defined(_teensy_)
-	print( " \033[1mTeensy:\033[0m        Yes"                 NL );
+	print( " \033[1mTeensy:\033[0m        Yes"                    NL );
 #endif
 #if defined(_kinetis_)
 	print( NL );

Lib/CMake/buildinfo.cmake

@@ -1,6 +1,6 @@
 ###| CMAKE Kiibohd Controller Source Configurator |###
 #
-# Written by Jacob Alexander in 2011-2016 for the Kiibohd Controller
+# Written by Jacob Alexander in 2011-2017 for the Kiibohd Controller
 #
 # Released into the Public Domain
 #
@@ -79,6 +79,33 @@ execute_process ( COMMAND ${GIT_EXECUTABLE} rev-list --count HEAD
 	RESULT_VARIABLE res_var
 )
 
+#| Most Recent Tag (on branch)
+execute_process ( COMMAND ${GIT_EXECUTABLE} for-each-ref refs/tags --sort=-taggerdate "--format=%(refname:short)" --count=1
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+	OUTPUT_VARIABLE Git_Recent_Tag
+	ERROR_QUIET
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+	RESULT_VARIABLE res_var
+)
+
+#| Most Recent Tag Hash (on branch)
+execute_process ( COMMAND ${GIT_EXECUTABLE} rev-list -n 1 ${Git_Recent_Tag}
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+	OUTPUT_VARIABLE Git_Recent_Tag_Revision
+	ERROR_QUIET
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+	RESULT_VARIABLE res_var
+)
+
+#| Most Recent Tag Commit Number (on branch)
+execute_process ( COMMAND ${GIT_EXECUTABLE} rev-list --count ${Git_Recent_Tag_Revision}
+	WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+	OUTPUT_VARIABLE Git_Recent_Tag_Commit_Number
+	ERROR_QUIET
+	OUTPUT_STRIP_TRAILING_WHITESPACE
+	RESULT_VARIABLE res_var
+)
+
 #| Older versions of git (e.g. 1.7.1) dont' like rev-list --count
 #| If there's an error, try again with a less efficient version
 if ( NOT "${res_var}" STREQUAL "0" )

Lib/_buildvars.h

@@ -27,6 +27,10 @@
 
 // ----- Defines -----
 
+// Helpers
+#define _STR_HELPER(x)
+#define _STR(x) _STR_HELPER(x)
+
 // You can change these to give your code its own name.
 #define STR_MANUFACTURER        L"@MANUFACTURER@"
 #define STR_PRODUCT             L"Keyboard - @ScanModule@ @MacroModule@ @OutputModule@ @DebugModule@"
@@ -36,6 +40,12 @@
 
 // Strings used in the CLI module
 #define CLI_Revision            "@Git_Commit_Revision@"
+#define CLI_RevisionNumber      @Git_Commit_Number@
+#define CLI_RevisionNumberStr   "@Git_Commit_Number@"
+#define CLI_Version             "@Git_Recent_Tag@"
+#define CLI_VersionRevision     "@Git_Recent_Tag_Revision@"
+#define CLI_VersionRevNumber    @Git_Recent_Tag_Commit_Number@
+#define CLI_VersionRevNumberStr "@Git_Recent_Tag_Commit_Number@"
 #define CLI_Branch              "@Git_Branch_INFO@"
 #define CLI_ModifiedStatus      "@Git_Modified_Status@"
 #define CLI_ModifiedFiles       "@Git_Modified_Files@"