Skip to content

Commit 8d62c18

Browse files
committed
Completely remove the version option
There is no real need to make the version configurable since the git commit and the build date both are equally important to the user. Signed-off-by: Maximilian Güntner <maximilian.guentner@gmail.com>
1 parent 361998b commit 8d62c18

File tree

3 files changed

+3
-20
lines changed

3 files changed

+3
-20
lines changed

config.h

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,8 @@
3636
#define ENC28J60_REV6_WORKAROUND /* rev is 6; but microchip calls it B7 */
3737

3838
/* global version defines */
39-
#define USE_BUILDDATE_VERSION 1
40-
#define USE_GIT_VERSION 2
4139

42-
#if VERSION_STRING_CHOICE == USE_BUILDDATE_VERSION
43-
#define VERSION_STRING __DATE__ " " __TIME__
44-
#else
45-
#if VERSION_STRING_CHOICE == USE_GIT_VERSION
46-
#define VERSION_STRING VERSION_GIT
47-
#else
48-
#warning No Version choosen
49-
#endif
50-
#endif
40+
#define VERSION_STRING GIT_VERSION " build date: " __DATE__ " " __TIME__
5141

5242
/* configure duplex mode */
5343
#define NET_FULL_DUPLEX 0

config.in

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,7 @@ fi
9191
dep_bool "Use Software-SPI" SOFT_SPI_SUPPORT $ARCH_AVR
9292
fi
9393

94-
choice 'Version String' \
95-
"GIT-commit-hash USE_GIT_VERSION \
96-
Build-Date-Time USE_BUILDDATE_VERSION" \
97-
'Release-Version' VERSION_STRING_CHOICE
98-
99-
if [ "$VERSION_STRING_CHOICE" = "USE_GIT_VERSION" ] ; then
100-
define_string VERSION_GIT "$(scripts/get-git-version)"
101-
fi
94+
define_string GIT_VERSION "$(scripts/get-git-version)"
10295

10396
bool 'Debug: Discard some packets' DEBUG_DISCARD_SOME
10497
dep_bool_menu "Enable Debugging" DEBUG y

protocols/ecmd/parser.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ parse_cmd_version(char *cmd, char *output, uint16_t len)
223223
{
224224
(void) cmd;
225225

226-
return ECMD_FINAL(snprintf_P(output, len, PSTR("%s"), VERSION_STRING));
226+
return ECMD_FINAL(snprintf_P(output, len, PSTR("Ethersex %s"), VERSION_STRING));
227227
}
228228

229229
int16_t

0 commit comments

Comments
 (0)