diff options
| author | tmk <nobody@nowhere> | 2013-09-19 00:51:44 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-09-19 00:51:44 +0900 |
| commit | 9f29fa6bf39ff9b703de132b7f8b8a794b078471 (patch) | |
| tree | d7b4537bb135d18b071b7cc4cf5f4fe3bc2d3a93 | |
| parent | 0ca415004a453b2a841880d3a66492c664505737 (diff) | |
Fix version info command
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | common/command.c | 47 | ||||
| -rw-r--r-- | keyboard/hhkb/keymap.c | 4 |
3 files changed, 45 insertions, 8 deletions
@@ -69,7 +69,7 @@ ifdef BACKLIGHT_ENABLE endif ifdef KEYMAP_SECTION_ENABLE - OPT_DEFS += -DKEYMAP_SECTION + OPT_DEFS += -DKEYMAP_SECTION_ENABLE EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x endif diff --git a/common/command.c b/common/command.c index 7415645b0d..8a8a81d669 100644 --- a/common/command.c +++ b/common/command.c @@ -251,11 +251,48 @@ static bool command_common(uint8_t code) break; case KC_V: // print version & information print("\n\n----- Version -----\n"); - print(STR(DESCRIPTION) "\n"); - print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") VER: " STR(DEVICE_VER) "\n"); - print("SRC: " STR(VERSION) "\n"); - print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__) "\n"); - print("AVR-LIBC: " __AVR_LIBC_VERSION_STRING__ "\n"); + print("DESC: " STR(DESCRIPTION) "\n"); + print("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") " + "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") " + "VER: " STR(DEVICE_VER) "\n"); + print("BUILD: " STR(VERSION) " (" __TIME__ " " __DATE__ ")\n"); + /* build options */ + print("OPTIONS:" +#ifdef PROTOCOL_PJRC + " PJRC" +#endif +#ifdef PROTOCOL_LUFA + " LUFA" +#endif +#ifdef PROTOCOL_VUSB + " VUSB" +#endif +#ifdef BOOTMAGIC_ENABLE + " BOOTMAGIC" +#endif +#ifdef MOUSEKEY_ENABLE + " MOUSEKEY" +#endif +#ifdef EXTRAKEY_ENABLE + " EXTRAKEY" +#endif +#ifdef CONSOLE_ENABLE + " CONSOLE" +#endif +#ifdef COMMAND_ENABLE + " COMMAND" +#endif +#ifdef NKRO_ENABLE + " NKRO" +#endif +#ifdef KEYMAP_SECTION_ENABLE + " KEYMAP_SECTION" +#endif + " " STR(BOOTLOADER_SIZE) "\n"); + + print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__) + " AVR-LIBC: " __AVR_LIBC_VERSION_STRING__ + " AVR_ARCH: avr" STR(__AVR_ARCH__) "\n"); break; case KC_T: // print timer print_val_hex32(timer_count); diff --git a/keyboard/hhkb/keymap.c b/keyboard/hhkb/keymap.c index 5c3bc9de6f..f2c6caf480 100644 --- a/keyboard/hhkb/keymap.c +++ b/keyboard/hhkb/keymap.c @@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_NO } \ } -#ifdef KEYMAP_SECTION +#ifdef KEYMAP_SECTION_ENABLE const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = { #else static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { @@ -189,7 +189,7 @@ enum macro_id { /* * Fn action definition */ -#ifdef KEYMAP_SECTION +#ifdef KEYMAP_SECTION_ENABLE const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { #else static const uint16_t fn_actions[] PROGMEM = { |