diff options
| author | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 21:01:46 +0300 |
|---|---|---|
| committer | Fred Sundvik <fsundvik@gmail.com> | 2016-08-27 21:01:46 +0300 |
| commit | cff26bc48413ec62d4f4a37e3a6ba34721e7670c (patch) | |
| tree | 84c78137841ad83036de7e36579bc7973b024f7a /tmk_core/common | |
| parent | a5b1af4999345239df5086351b52a5b4d2daa97e (diff) | |
| parent | 36b6a96596e6cbca879d5304a586e279c15b04a9 (diff) | |
| download | qmk_firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.tar.gz qmk_firmware-cff26bc48413ec62d4f4a37e3a6ba34721e7670c.zip | |
Merge branch 'master' into fix_line_endings
Diffstat (limited to 'tmk_core/common')
| -rw-r--r-- | tmk_core/common/command.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c index 084c9fe15..476fc6fe3 100644 --- a/tmk_core/common/command.c +++ b/tmk_core/common/command.c | |||
| @@ -34,6 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 34 | #include "command.h" | 34 | #include "command.h" |
| 35 | #include "backlight.h" | 35 | #include "backlight.h" |
| 36 | #include "quantum.h" | 36 | #include "quantum.h" |
| 37 | #include "version.h" | ||
| 37 | 38 | ||
| 38 | #ifdef MOUSEKEY_ENABLE | 39 | #ifdef MOUSEKEY_ENABLE |
| 39 | #include "mousekey.h" | 40 | #include "mousekey.h" |
| @@ -180,7 +181,7 @@ static void print_version(void) | |||
| 180 | print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") " | 181 | print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") " |
| 181 | "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") " | 182 | "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") " |
| 182 | "VER: " STR(DEVICE_VER) "\n"); | 183 | "VER: " STR(DEVICE_VER) "\n"); |
| 183 | print("BUILD: " STR(VERSION) " (" __TIME__ " " __DATE__ ")\n"); | 184 | print("BUILD: " STR(QMK_VERSION) " (" __TIME__ " " __DATE__ ")\n"); |
| 184 | 185 | ||
| 185 | /* build options */ | 186 | /* build options */ |
| 186 | print("OPTIONS:" | 187 | print("OPTIONS:" |