summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Browne <cbbrowne@ca.afilias.info>2016-06-15 17:36:27 +0200
committerChristopher Browne <cbbrowne@ca.afilias.info>2016-06-15 17:36:27 +0200
commitbb0e0c7eba5fd37df5b66cd77fc8b0a382ef48b1 (patch)
tree2025e71ffb86e6d38383b4603a7e116f9b6ce2a6
parent4e1bc2d298defff58316cac9de00f0495b02c742 (diff)
downloadqmk_firmware-bb0e0c7eba5fd37df5b66cd77fc8b0a382ef48b1.tar.gz
qmk_firmware-bb0e0c7eba5fd37df5b66cd77fc8b0a382ef48b1.tar.xz
Split build date into a separate DEFINE
-rw-r--r--Makefile6
-rw-r--r--keyboard/planck/keymaps/cbbrowne/keymap.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e93528600..2c35e0f10 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ include $(TMK_PATH)/protocol/lufa.mk
include $(TMK_PATH)/common.mk
include $(TMK_PATH)/rules.mk
-GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d")
-
+GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null)
+BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
-OPT_DEFS += -DQMK_VERSION=\"$(GIT_VERSION)\"
+OPT_DEFS += -DQMK_VERSION=\"$(GIT_VERSION)\" -DQMK_BUILDDATE=\"$(BUILD_DATE)\"
diff --git a/keyboard/planck/keymaps/cbbrowne/keymap.c b/keyboard/planck/keymaps/cbbrowne/keymap.c
index 70b15406b..7fe391ec5 100644
--- a/keyboard/planck/keymaps/cbbrowne/keymap.c
+++ b/keyboard/planck/keymaps/cbbrowne/keymap.c
@@ -138,7 +138,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
break;
case M_VERSION:
if (record->event.pressed) {
- SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION);
+ SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP "@" QMK_VERSION "@" QMK_BUILDDATE);
}
break;
case M_RANDDIGIT: