diff options
author | Joule-Flow <github.julian@flores-it.de> | 2019-12-02 20:47:55 +0100 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-12-02 11:47:55 -0800 |
commit | 680924777be7739b249bf0dc3b60a3185134bc94 (patch) | |
tree | 2eb2c2cbc707fa01c88d5442e754f9c04ee021bd /docs/newbs_git_resolving_merge_conflicts.md | |
parent | 75c8a79d0e087d99299b1b273d343aacb8bed0b8 (diff) |
[Keyboard] Added tr60w keyboard (#7450)
* Added tr60w configurations.
I based these files on the fox-lab/qmk_firmware repository.
After checking both licenses, which are identical, I added those
files into this feature branch.
For transparency reasons I'll add the url to the fox-lab repository.
https://github.com/fox-lab/qmk_firmware
* Using #pragma once in config.h.
* Removed '#define CCONFIG_H' from config.h.
* Changed PRODUCT_ID to '0x4140'.
* Renamed setting to 'DEBOUNCE'.
* Removed key combination, due to already default implementation.
* Removed 'PREVENT_STUCK_MODIFIERS', defaulted by QMK.
* Removed not uneccessary '#endif' statement.
* Renamed include to 'QMK_KEYBOARD_H'.
* Changed keymap structure according to pull request suggestion.
* Removed 'void matrix_init_user(void)'.
* Removed 'void matrix_scan_user(void)'.
* Removed 'bool process_record_user(...)'.
* Removed non-standard configuration in favor for 'led_update_kb'.
* Using default setup based on 'MCU' setting.
* Replaced Build Option configuration with suggested information.
* Fixed include statements as requested.
* Changed 'KEYMAP' to suggestion.
* Removed obsolete '#endif' statement.
* Added readme.md file.
* Updated readme.md with further information.
* Reverted include statement, to check if this caused ci error.
* Revert "Reverted include statement."
This reverts commit ebd992dc01133169be38ae7201bb00b4d01cc737.
* Fixed wrong mapped key
* Fixed include as per suggestion.
* Replaced 'KC_TRNS' with '_______'for readability.
* Added personal keymap.c file.
* Updated the readme.md file according to template/avr/readme.md.
* Fixed Link to Image.
* Updated readme.md as per request.
* Updated rules.mk, as per suggestion.
Set 'BOOTMAGIC_ENABLE = lite'.
Diffstat (limited to 'docs/newbs_git_resolving_merge_conflicts.md')
0 files changed, 0 insertions, 0 deletions