di0ib/tmk_keyboard
1
0
Fork 0
Code Releases Activity

Fix version info command

Browse Source
This commit is contained in:
tmk 2013-09-19 00:51:44 +09:00
parent 0ca415004a
commit 9f29fa6bf3
3 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.mk
View File

@ -69,7 +69,7 @@ ifdef BACKLIGHT_ENABLE
endif endif
ifdef KEYMAP_SECTION_ENABLE ifdef KEYMAP_SECTION_ENABLE
OPT_DEFS += -DKEYMAP_SECTION OPT_DEFS += -DKEYMAP_SECTION_ENABLE
EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x
endif endif

47
common/command.c
View File

@ -251,11 +251,48 @@ static bool command_common(uint8_t code)
break; break;
case KC_V: // print version & information case KC_V: // print version & information
print("\n\n----- Version -----\n"); print("\n\n----- Version -----\n");
print(STR(DESCRIPTION) "\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("VID: " STR(VENDOR_ID) "(" STR(MANUFACTURER) ") "
print("SRC: " STR(VERSION) "\n"); "PID: " STR(PRODUCT_ID) "(" STR(PRODUCT) ") "
print("GCC: " STR(__GNUC__) "." STR(__GNUC_MINOR__) "." STR(__GNUC_PATCHLEVEL__) "\n"); "VER: " STR(DEVICE_VER) "\n");
print("AVR-LIBC: " __AVR_LIBC_VERSION_STRING__ "\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; break;
case KC_T: // print timer case KC_T: // print timer
print_val_hex32(timer_count); print_val_hex32(timer_count);

4
keyboard/hhkb/keymap.c
View File

@ -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 } \ { 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"))) = { const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] __attribute__ ((section (".keymap.keymaps"))) = {
#else #else
static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = { static const uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
@ -189,7 +189,7 @@ enum macro_id {
/* /*
* Fn action definition * Fn action definition
*/ */
#ifdef KEYMAP_SECTION #ifdef KEYMAP_SECTION_ENABLE
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = { const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
#else #else
static const uint16_t fn_actions[] PROGMEM = { static const uint16_t fn_actions[] PROGMEM = {