max/tmk_keyboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Fork of https://github.com/tmk/tmk_keyboard
1533 commits 1 branch 0 tags 27 MiB
Find a file
Purdea Andrei 338a1506dc tmk_core/common/timer.h: Fixing TIMER_DIFF macro to calculate difference correctly after the timer wraps. 
Let's go through an example, using the following macro:

If the first timer read is 0xe4 and the second one is 0x32, the timer wrapped.
If the timer would have had more bits, it's new value would have been 0x132,
and the correct difference in time is 0x132 - 0xe4 = 0x4e

old code TIMER_DIFF_8(0x32, 0xe4) = 0xff - 0xe4 + 0x32 = 0x4d, which is wrong.
new code TIMER_DIFF_8(0x32, 0xe4) = 0xff + 1 - 0xe4 + 0x32 = 0x4e, which is correct.

This also gives a chance for a smart compiler to optimize the code using normal
integer overflow.

For example on AVR, the following C code:
uint8_t __attribute__ ((noinline)) test(uint8_t current_timer, uint8_t start_timer)
{
    return TIMER_DIFF_8(current_timer, start_timer);
}
With the original code, it gets translated to the following list of instructions:
00004c6e <test>:
    4c6e:       98 2f           mov     r25, r24
    4c70:       86 1b           sub     r24, r22
    4c72:       96 17           cp      r25, r22
    4c74:       08 f4           brcc    .+2             ; 0x4c78 <test+0xa>
    4c76:       81 50           subi    r24, 0x01       ; 1
    4c78:       08 95           ret
But with this commit, it gets translated to a single instruction:
00004c40 <test>:
    4c40:       86 1b           sub     r24, r22
    4c42:       08 95           ret

This unfortunately doesn't always work so nicely, for example the following C code:
int __attribute__ ((noinline)) test(uint8_t current_timer, uint8_t start_timer)
{
    return TIMER_DIFF_8(current_timer, start_timer);
}
(Note: return type changed to int)
With the original code it gets translated to:
00004c6e <test>:
    4c6e:       28 2f           mov     r18, r24
    4c70:       30 e0           ldi     r19, 0x00       ; 0
    4c72:       46 2f           mov     r20, r22
    4c74:       50 e0           ldi     r21, 0x00       ; 0
    4c76:       86 17           cp      r24, r22
    4c78:       20 f0           brcs    .+8             ; 0x4c82 <test+0x14>
    4c7a:       c9 01           movw    r24, r18
    4c7c:       84 1b           sub     r24, r20
    4c7e:       95 0b           sbc     r25, r21
    4c80:       08 95           ret
    4c82:       c9 01           movw    r24, r18
    4c84:       84 1b           sub     r24, r20
    4c86:       95 0b           sbc     r25, r21
    4c88:       81 50           subi    r24, 0x01       ; 1
    4c8a:       9f 4f           sbci    r25, 0xFF       ; 255
    4c8c:       08 95           ret
Wth this commit it gets translated to:
00004c40 <test>:
    4c40:       28 2f           mov     r18, r24
    4c42:       30 e0           ldi     r19, 0x00       ; 0
    4c44:       46 2f           mov     r20, r22
    4c46:       50 e0           ldi     r21, 0x00       ; 0
    4c48:       86 17           cp      r24, r22
    4c4a:       20 f0           brcs    .+8             ; 0x4c54 <test+0x14>
    4c4c:       c9 01           movw    r24, r18
    4c4e:       84 1b           sub     r24, r20
    4c50:       95 0b           sbc     r25, r21
    4c52:       08 95           ret
    4c54:       c9 01           movw    r24, r18
    4c56:       84 1b           sub     r24, r20
    4c58:       95 0b           sbc     r25, r21
    4c5a:       93 95           inc     r25
    4c5c:       08 95           ret
There is not much performance improvement in this case, however at least with this
commit it functions correctly.

Note: The following commit will improve compiler output for the latter example.
2020-04-01 07:45:05 +03:00
converter ibmpc_usb: Update firmware hex files 2020-03-22 21:30:22 +09:00
keyboard fc660c: Update firmware hex files 2020-03-13 13:51:50 +09:00
orphan Fix error in media layer for phantom iso keymap. 2016-11-28 13:19:50 +01:00
tmk_core tmk_core/common/timer.h: Fixing TIMER_DIFF macro to calculate difference correctly after the timer wraps. 2020-04-01 07:45:05 +03:00
.gitignore Change gitignore for unimap hex files 2016-09-02 13:48:20 +09:00
.gitmodules lufa: Use the latest LUFA library on github 2020-02-09 21:03:49 +09:00
README.md core: Fix LAYER_MODS() and LAYER_TAP() 2017-01-11 10:30:47 +09:00

README.md

TMK Keyboard Firmware Collection

This repository includes keyboard and converter firmware projects built with tmk_core keyboard library.

The latest source code is available here: http://github.com/tmk/tmk_keyboard

Updates

2017/01/11

Changed action code for ACTION_LAYER_MODS and this may cause incompatibility with existent shared URL and downloaded firmwware of keymap editor. If you are using the action you just have to redefine it on keymap editor. Existent keymap code should not suffer.

2016/06/26

Keymap framework was updated. fn_actions[] should be defined as action_t instead of uint16_t. And default code for keymap handling is now included in core you just need define uint8_t keymaps[][MATRIX_ROWS][MATRIX_COLS] and action_t fn_actions[].

2016/06/22

Some projects were moved from converter and keyboard to orphan directory. Those might be removed in some future but you will be able to access them with orphans tag. See https://github.com/tmk/tmk_keyboard/issues/173

2016/02/10

core: flabbergast's Chibios protocol was merged from https://github.com/flabbergast/tmk_keyboard/tree/chibios (@72b1668). See tmk_core/protocol/chibios/README.md. Chibios protocol supports Cortex-M such as STM32 and Kinetis.

2015/04/22

Core library was separated to other branch core. https://github.com/tmk/tmk_keyboard/tree/core

In Makefile you need to set TMK_DIR to indicate core library location now.

TMK_DIR = ../../tmk_core

Projects

You can find some keyboard specific projects under converter and keyboard directory.

converter

keyboard

Projects based tmk_keyboard or tmk_core

https://github.com/tmk/tmk_keyboard/wiki/TMK-Based-Projects

License

GPLv2 or later. Some protocol files are under Modified BSD License.

Third party libraries like LUFA, PJRC and V-USB have their own license respectively.

Build Firmware and Program Controller

See tmk_core/doc/build.md.

Change your keymap

See tmk_core/doc/keymap.md.

Magic Commands

To see help press Magic + H.

Magic key combination is LShift + RShift in many projects, but Power key on ADB converter. Magic keybind can be vary on each project, check config.h in project directory.

Following commands can be also executed with Magic + key. In console mode Magic keybind is not needed.

----- Command Help -----
c:      enter console mode
d:      toggle debug enable
x:      toggle matrix debug
k:      toggle keyboard debug
m:      toggle mouse debug
v:      print device version & info
t:      print timer count
s:      print status
e:	    print eeprom config
n:	    toggle NKRO
0/F10:  switch to Layer0
1/F1:   switch to Layer1
2/F2:   switch to Layer2
3/F3:   switch to Layer3
4/F4:   switch to Layer4
PScr:   power down/remote wake-up
Caps:   Lock Keyboard(Child Proof)
Paus:   jump to bootloader

Boot Magic Configuration - Virtual DIP Switch

Boot Magic are executed during boot up time. Press Magic key below then plug in keyboard cable. Note that you must use keys of Layer 0 as Magic keys. These settings are stored in EEPROM so that retain your configure over power cycles.

To avoid configuring accidentally additive salt key KC_SPACE also needs to be pressed along with the following configuration keys. The salt key is configurable in config.h. See tmk_core/common/bootmagic.h.

General

  • Skip reading EEPROM to start with default configuration(ESC)
  • Clear configuration stored in EEPROM to reset configuration(Backspace)

Bootloader

  • Kick up Bootloader(B)

Debug

  • Debug enable(D)
  • Debug matrix enable(D+X)
  • Debug keyboard enable(D+K)
  • Debug mouse enable(D+M)

Keymap

  • Swap Control and CapsLock(Left Control)
  • Change CapsLock to Control(Caps Lock)
  • Swap LeftAlt and Gui(Left Alt)
  • Swap RightAlt and Gui(Right Alt)
  • Disable Gui(Left Gui)
  • Swap Grave and Escape(Grave)
  • Swap BackSlash and BackSpace(Back Slash)
  • Enable NKRO on boot(N)

Default Layer

  • Set Default Layer to 0(0)
  • Set Default Layer to 1(1)
  • Set Default Layer to 2(2)
  • Set Default Layer to 3(3)
  • Set Default Layer to 4(4)
  • Set Default Layer to 5(5)
  • Set Default Layer to 6(6)
  • Set Default Layer to 7(7)

Mechanical Locking support

This feature makes it possible for you to use mechanical locking switch for CapsLock, NumLock or ScrollLock. To enable this feature define these macros in config.h and use KC_LCAP, KC_LN UM or KC_LSCR in keymap for locking key instead of normal KC_CAPS, KC_NLCK or KC_SLCK. Res ync option tries to keep switch state consistent with keyboard LED state.

#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE

Start Your Own Project

  1. Add tmk_core into your repository using git submodule or git subtree.
  2. Copy files from tmk_keybaord or other project similar to yours
  3. Edit those files to support your keyboard.

See these as examples.

Debugging

Use PJRC's hid_listen to see debug messages. You can use xprintf() to display debug info, see tmk_core/common/xprintf.h.

Files and Directories

Top

  • keyboard/ - keyboard projects
  • converter/ - protocol converter projects
  • tmk_core/ - core library
  • tmk_core/doc/ - documents

Contribution

  • Report bugs in github Issues.
  • Pull requets are also welcomed.

Coding Style

  • Doesn't use Tab to indent, use 4-spaces instead.

Other Keyboard Firmware Projects

You can learn a lot about keyboard firmware from these. See Other Projects other than TMK.