Compare commits

...

6810 Commits

Author SHA1 Message Date
Jack Humbert 6a4ff6c0c7 turn on all keycodes but unicode 2018-04-07 00:11:31 -04:00
Yan-Fa Li 4cb7907547 Add 2 missing F-Row keys 2018-04-06 12:22:03 -04:00
Yan-Fa Li 25b1d02157 Adds Phantom TKL support (#2696)
* Add an info.json to phantom keyboard

* Add layouts

 - KEYMAP_WINKEYLESS
 - KEYMAP_7BIT
 - KEYMAP_ISO
 - KEYMAP_ISO_WINKEYLESS

* Add key_counts
2018-04-06 03:42:44 -04:00
Daniel H Klein 4feaf1fd76 Add Nyquist keymap (#2692)
* nyquist

* danielhklein nyquist setup

* shift left controls

* remove readme

* cleanup before pr

* ready for pr
2018-04-05 23:44:28 -07:00
Maarten Dekkers d777a05864 Add support for rev3 of the Atom47 (#2672)
* Added support for rev3 of the Atom47

* Updated Atom47 readme's

* Fix redefine error on rev2 and add maartenwut's keymap

* Fix redefine error on LEdiodes keymap
2018-04-05 19:16:35 -04:00
mechmerlin 7bbc9ccc31 change KEYMAP to LAYOUT for all new keyboards made using this script 2018-04-05 19:15:50 -04:00
Kaleb Elwert 0d0664a214 Various tweaks for some Input:Club build processes 2018-04-05 16:59:27 -04:00
adiabatic 011039afca Zweihander: swap space and enter keys (#2665)
* zweihander-osx: Remove app keys, etc.

- add right command keys
- add F16 on ;' for Siri
- remove command-Q (too easy to hit)

* Rename zweihander-osx to zweihander-macos

zweihander-macos: / / ^ → / / ⌥; README revamp

zweihander: rename, ⌃ → ⌥, README revamp

* Zweihander: swap space, enter keys

Left thumb needs a break.
2018-04-04 09:18:15 -07:00
Nicholas 6cc9d59ee8 Enables unicode for Mitosis (#2668)
* fixed comment typo

* Fixes invalid capitalization

Uppercase yes is invalid, so make treats it as no, which is
confusing when it seems like it should have found the method
definition for unicode.

* Own keymap, comma in mitosis

Own keymap is qwerty, workman, numbers, punctuation, function/mouse
layers, gaming, unicode, numberpad.
2018-04-04 09:17:38 -07:00
Florian f281f7dc3a i got a new toy (#2673)
Personal keymap for Waples
2018-04-04 09:16:49 -07:00
markhuguet ba2cab1a89 This adds a keymap to the MF68 labeled factory. It is an attempt to mimic the layout on the factory keycaps of the non-backlit board. (#2674)
There are some small differences:

1) FN+WASD are an arrow cluster
2) FN+Z (Start media player) and FN+] (Start Calculator) are not mapped
3) FN+GHJKL are Backlight controls
4) An FN2 layer exists for future growth
5) The CAPS key is maped as FN2, for CAPS Lock use FN+CAPS
2018-04-04 09:15:43 -07:00
Kaleb Elwert 738588618b Update input:club boards to use the proper vendor and device 2018-04-04 01:31:45 -04:00
QMK Bot 67268db576 convert to unix line-endings [skip ci] 2018-04-04 04:21:53 +00:00
mechmerlin c25f0e6983 Fix readme to explicitly call out that there are two different versions of this board and how to compile them 2018-04-04 00:17:37 -04:00
Kaleb Elwert f6b3c67678 Update whitefox to use the K-Type teensy workaround 2018-04-03 23:06:14 -04:00
MechMerlin 67053712f8 Refactor/eagle viper with new layouts for QMK Configurator (#2659)
* rename KEYMAP to LAYOUT_ALL

* Standard Layout Eagle Refactor

New layout LAYOUT_EAGLE
Got standard layout backspace working

* Remove split right shift support for standard layout eagle

* add back the KC_NO for split right shift

* Remove KC_NO from bottom row to support standard 60 layout

* Fix formatting issues with mechmerlin keymap

* remove extra KC_NO from split right shift in LAYOUT_EAGLE

* Preliminary checkin for new layout LAYOUT_VIPER

* Remove some of the KC_NO from the layout

* Fix formatting

* missed a KC_NO for the LAYOUT_EAGLE

* remove KC_NO from enter key of LAYOUT_VIPER

* some more formatting changes

* Default 60 with split left right shift and backspace

* add info.json layouts to match the new LAYOUTs

* change formatting of LAYOUT names

* propogate renames to info.json
2018-04-02 16:23:21 -04:00
skullydazed 0ca6b53f89 Clueboard Double 1800 support (#2655) 2018-04-01 12:12:45 -07:00
Birkir Rafn Guðjónsson 6f3cbdb5f7 Added birkir's keymap (#2653) 2018-04-01 07:29:19 -07:00
Drashna Jaelre 162a67cbc5 Add userspace config.h handling to build script (#2640)
* Add userspace 'config.h' file

* Add more robust docs

* Remove config.h code from drashna userspace

* Spelling error

* Include links to Config Options page

* Remove config.h documentation from userspace doc, as it's no longer needed
2018-04-01 00:02:40 -04:00
Mike Kozlowski cc323df9ba Fix broken Markdown (#2652)
Fix links in Keyboard Guidelines page
2018-03-31 20:54:01 -07:00
Drashna Jaelre deb5a4b6a9 Convert all Preonic keymaps to layout format (#2644)
* Convert all Preonic keymaps to layout format

* Make sure preonic layouts are using QMK_KEYBOARD_H
2018-03-31 22:39:00 -04:00
Drashna Jaelre 61a2169ff9 Update to Drashna Keymaps and Userspace (#2650)
* Change global config.h settings

* Make Shift LED brighter

* Compatibility Tweaks

* Update ASCII art and layer comments

* Add comments about MOD layer

* Change ASCII art for reset, since it was out of date

* Use Overwatch theme for Workman layer

* Fix RGB define comments

* Make sure RGB set list matches

* Stop all notes for custom Faux Click

* Switch to OSM for everything, and remove RGB Sleep

* Never use KEYMAP now

* Only enable RGB Sleep on Non-Ergodox boards

* Cleanup do to new rgblight_list.h file

* Add redirect message for RGB codes

* Update userspace documentation

* Cleanup of Userspace

Add unicode support, and cleaned up comments for ifdef statements

* Remove unneeded slashes

* Unicode handling

* Force NKRO
2018-03-31 22:38:06 -04:00
mechmerlin adae37f19f Add XD60 support to QMK Configurator
Add info.json

Change KEYMAP to LAYOUT_ALL to better reflect that this is a
LAYOUT that fits ALL the possible positions for switches.

We will need to make better LAYOUTS for the future.
2018-03-31 22:37:45 -04:00
MechMerlin 015aed50a3 AMJ96 Support (#2651)
* Initial commit: Get things compiling

* port the custom matrix code

* Update readme

* make second layer fully transparent

* populate config.h identifiers with more correct information

* Add in switch backlight support

* Enable backlight LEDs, and change pin for RGB

* port TMK version over

* remove all that TMK stuff, it didn't work lol

* Updated readme

* Fix keymap

- Change KEYMAP to LAYOUT
- Adjust formatting of table

* Edit readme to reflect NOTES

* add info.json for QMK configurator support

* Replaced placeholder with MechMerlin
2018-03-31 01:57:49 -04:00
MechMerlin c6b5ce61e8 Fix Octagon info.json issues (#2649)
Change KEYMAP to LAYOUT while I'm at it.
V1 and V2 now have their own info.jsons
2018-03-30 19:20:26 -07:00
Ryan McLean a74f866941 Just a multilayered Layout using tapdance (#2645)
* Ported JJ40 Layout to Contra

* Update readme.md
2018-03-30 13:07:36 -07:00
U-LANDSRAAD\drashna c31f7ff91b Hopefully fix Travis Auto-Incrementation
This reverts the changes in #2491, so that Travis will hopefully return to automatic incrementing.
But this includes the layout and userspace excepts, as well.
2018-03-29 18:18:50 -04:00
U-LANDSRAAD\drashna c2bec5b3f0 Properly always copy firmware
This finishes fixing #2314, which mostly copies the firmware when compiling.
However, it misses `:teensy`, `:avrdude` and most importantly, `:production`
2018-03-29 15:38:42 -04:00
Chris Peters fb34fdbbc9 Added cpeters1982 keymap folder in lets_split (#2583)
* Added cpeters1982 keymap folder in lets_split

* Deleted tap dance. need to research error

* Changed keymap to better facilitate SpaceFn

* Trying to get backlighting to work

* Added RGB backlight support

* cleared some cache files per Drashna's instructions
2018-03-29 10:44:26 -07:00
Jonathan A. Kollasch 5641b1da20 layouts/default: fill in 60_ansi keymaps 2018-03-29 00:52:46 -04:00
nachie 931a52d1ae Support for the Paladin64 PCB (#2639)
* Support for the Paladin64 PCB

* Paladin64: Added readme. Added the bootloader option to rules.mk

* Fixed the formatting

* fixed the flash command
2018-03-28 23:20:15 -04:00
U-LANDSRAAD\drashna 331288233d Add rgblist to docs 2018-03-28 16:55:58 -04:00
U-LANDSRAAD\drashna c1b46206a7 Fix commands and update my userspace (for testing) 2018-03-28 16:55:58 -04:00
U-LANDSRAAD\drashna 9cfeb4e6cf add RGB commands as global functions 2018-03-28 16:55:58 -04:00
U-LANDSRAAD\drashna bdb718af0d Fix RGB Sleep code 2018-03-28 15:37:00 -04:00
Jacob Jerrell c39780b8e1 Add Support for Software Workman (#2632)
This adds the keymap translations and sendstring definitions to support software workman.
2018-03-28 12:07:59 -07:00
Harry Mills b5e899ede7 Adding Haegin's keyboard layout for the ergodox and minidox (#2637)
* Add Haegin's keymap

* Potential improvements to the keyboard

* Add haegin minidox layout

* Add Haegin's keyboard to ergodox layouts

* Update Haegin's minidox keymap
2018-03-28 12:03:32 -07:00
Jason Janse van Rensburg 01c72e8dce changed super key to left super key (#2631) 2018-03-27 13:58:09 -07:00
Michael F. Lamb b61974b301 mitosis:datagrok: minor layout improvements (#2366)
* mitosis/datagrok: make qwerty the default layout

* mitosis/datagrok: update readme to match qwerty default

* mitosis:datagrok: remove redundant name for transparent

meh, decided i don't need an extra key to represent "key that is
transparent because it's a modifier on a layer below." it's a maintenance
burden when moving other keys around

* mitosis:datagrok: add num lock on Blue + QWERTY T

* mitosis:datagrok: tap lshift = tab

we use tab completion a lot so let's get it onto an unmodified key somehow

* mitosis:datagrok: update readme

* mitosis:datagrok: improve notes in README

* mitosis:datagrok: note numlock in README
2018-03-27 09:18:28 -07:00
Benjamin Daschel 9f5a4af09c XD60 ANSI (GH60) layout (#2624)
* configure layer 0 layout for xd60 as ANSI 60%

* update keymap with function key immediately right of spacebar;
shuffle mapping in function layer to my liking

* update readme
2018-03-27 09:04:09 -07:00
Martin Lechner 1305d8de80 [TADA68] Added mac layout with german umlaute on ansi. (#2615) 2018-03-27 09:01:32 -07:00
bjacques 55d0b1f048 Create new 'tada68/iso-uk' layout tailored for boards with the big fat iso enter key (#2612) 2018-03-27 09:00:52 -07:00
mechmerlin d3a0c7e3a6 qmk configurator support for e6v2. Let it be known that this is one of the keymaps I've seen done right 2018-03-27 11:47:32 -04:00
mechmerlin b773d94477 Add qmk configurator support for KBD75
Also changed KEYMAP to KEYMAP_ALL to be more explicit that it's
a layout supporting ALL possible layouts.
2018-03-27 11:39:03 -04:00
dankm 19a1fbaca2 Better non-Linux support (#2524)
* grep -> $(GREP)

Some UNIXy systems (FreeBSD for example) don't use GNU grep by default.
Allow the user to specify which grep implementation to use so that
GNU grep can be specified.

* Allow using versioned avr-gcc command

Don't hardcode "avr-gcc", and allow strings such as "avr-gcc8", or
"avr-gcc-7.3.0" to match checks for "avr-gcc".
2018-03-26 16:08:08 -04:00
Jack Humbert ae7284edb8 rename api docs to internals 2018-03-26 11:43:37 -07:00
Jason Stillwell 66162b2b68 add grave to auto-shift. 2018-03-26 13:42:08 -04:00
mtei 2038a515d9 change rgblight_increase_val() and eeconfig_update_rgblight_default(), use RGBLIGHT_LIMIT_VAL insted of 255. 2018-03-26 13:41:53 -04:00
Otto Rask b922a550dc Add pearl README, add rask's Pearl layout 2018-03-26 13:34:53 -04:00
Drashna Jaelre ee1bb85542 Expand Newb Guide flashing document (#2588)
* Add header info

* Add DFU section

* Add Caterina section

* Add Halfkay section

* Fix Typos

* More typos
2018-03-26 13:34:18 -04:00
Drashna Jaelre 07b90db897 Fixes and updates to docs (#2611)
* Fix advanced keycode headers

* Add caveat for OSM over Remote Desktop

* Hopefully add better anchors to docs

* Add Action code list reference

* Formatting of RGB Underglow doc

* Add brew update issue on macOS

* Revert formatting

* Revert RGB doc formatting

* Make Config Options doc's sections linkable
2018-03-25 16:44:17 -07:00
Drashna Jaelre 0c665696d7 Update to drashna files (#2587)
* Add Colemak Mod-DH vars

* Add Norman Layot vars

* Set Shift Indicator to include CAPS Lock as well

* Change MEH to GUI

* Add Enter to Macro layer

* Switch raise and lower layers to make more sense (to me)

* Replace unused quote on Ergodox

* Add One Shot defines

* Dim indicator LEDs

* Add short codes for KC_SECRET

* Fix typos

* Update OLKB code in userspace

* Add global userspace config.h

* add compile fix

* Automatically include  from userspace

* update readme

* Re-add QMK Scan loop

* Add EEPROM reset code to all keymaps

* Shorten fauxclick sound

* Use layouts instead of keymap, when possible

* Add OSM detection to ergodox

* Convert Viterbi to LAYOUT macro

* Clean up game macros

* Because I accidently removed the C6 AUDIO define from my viterbi... Whoops

* Minor formatting

* Fix Woodpad because it's still there

* Move Ergodox keymap into layouts folder

* Add build date to version macro

* Remove PREVENT_STUCK_MODIFIERS from config
2018-03-25 13:01:15 -07:00
Joshua Coffey a09a042b8f New keymap and more songs (#2609)
* Added some new songs and my own keymap

* Made Dodger keymap safe to use with backlight disabled

* edited layer switching and added more songs

* changed keymap to lowercase
2018-03-25 12:58:40 -07:00
RobertDhaene 3d587b1d2f Merge in some custom keymaps from forked repository (#2605)
* Inital layout

* Fix the backspace

* add a number pad

* move the backlight to the adjust layer; move ctrl and delete.

* Update from main repo

* Add initial files for custom keymap

* Light keymap mod

* Change the submodules to match the upstream fork's master branch
2018-03-25 12:56:36 -07:00
skullY c4f9b8f297 make new_project.sh work correctly on osx too 2018-03-25 13:20:30 -04:00
U-LANDSRAAD\drashna e72cad44fa Add Layouts to exclusion 2018-03-25 13:19:14 -04:00
U-LANDSRAAD\drashna f67950df27 Ignore users folder for Travis tagging 2018-03-25 13:19:14 -04:00
U-LANDSRAAD\drashna b23d2a68dc add syscalls.c if autoshift is enabled, to fix compile issue on ChibiOS 2018-03-25 13:18:28 -04:00
U-LANDSRAAD\drashna 34580baccf Fix #1566 - NKRO reseting issue 2018-03-25 13:17:52 -04:00
MechMerlin d9c6e7487b Refactor/v60 type r keymap/layout (#2593)
* Add a proper ANSI layout

Changed v60_type_r.h to have a proper ANSI layout
Modify keymaps to reflect above changes
Fix comments

* Add new layout to info.json
2018-03-25 00:59:36 -04:00
MechMerlin fa0d97a37f info.json configurator support for popular 65% keyboards (#2589)
* Support for tada68 ansi layout.

Avoiding the iso layout as it doesn't seem correct

* whitefox support for configurator

* configurator support for jc65 PCB featuring both the qmk and ps2avrgb versions
2018-03-25 00:59:17 -04:00
Wilba6582 59a784500b Initial support for RAMA M6-A (#2600)
* Initial commit of RAMA M6-A firmware.

* Added LED support

* Added Knops support

* Fixed compile error for knops keymap.

* updated readme.md

* updated readme.md

* updated readme.md
2018-03-25 00:58:55 -04:00
WarmCat 00dfa73e4c Added basic support for JJ50 (preonic-like based on atmega32A) (#2546)
* Added support for JJ50 from KPRepublic, no rgb or backlight control yet. Added as a layout of ymd96 at the moment (same microprocessor). Basic keymap with three layers to get started.

* Added support for JJ50
2018-03-24 13:03:24 -04:00
myrtle 4adc333455 Fix mechmini2 ortho keymapping layout
A misconfiguration in the ortho layout, K306 key was registered as k305
2018-03-24 12:52:42 -04:00
Danny 4e92dceed8 Add Fourier Keyboard (#2596)
* Initial commit of Fourier keyboard

* Revise keymap, add key to bottom row

* Fix readme
2018-03-24 12:50:44 -04:00
Danny Nguyen f77ecb8960 Add Laplace keyboard 2018-03-24 12:50:16 -04:00
U-LANDSRAAD\drashna d965d72d4a Fix custom functions documation for layer_state_set* 2018-03-24 12:49:56 -04:00
skullY 70cf46d4f1 fix the moxygen invocation 2018-03-23 22:42:08 -07:00
Daniel Hoek 3ee59a79aa Add HSV value specification (#2481)
* Update feature_rgblight.md

I got caught out with this as most color pickers use a percentage NOT 0-255 for this number

* Amended description

Woops! Was focused on s/v not being a percentage i got h wrong.
2018-03-23 16:10:32 -07:00
Takeshi ISHII 824d584d8c New keymap for The Helix keyboard("five_rows") (#2592)
* duplicate keyboards/helix/rev2/keymaps/default to keyboards/helix/rev2/keymaps/five_rows

* OLED Layer display 'Qwerty','Colemak','Dvorak'

* set Qwerty, Lower, Raise map

* set Colemak map

* set Dvorak map

* OLED Layer display 'Raise','Lower' change to 'Extra char','Function'

* fix ExtraChar Layer Shift-key disable

* Raise,Lower,Adjust layer modify

some key change KC_TRNS to KC_NO
add KANA, EISU key

* refine keymaps/five_rows/{config.h,rules.mk} for easy and safe customize

* modify Adjust layer: all function into left hand, remove F1..F12,DEL

* Add Helix five_rows keymap README.md and README_jp.md

* Raise Layer modify: enable Raise(Extr)+Lower(Func)==Adjust

* fix image file url in README.md,README_jp.md

* change Layer display on OLED

* change OLED display base name position
2018-03-23 16:08:37 -07:00
Yida Xu 3a49ad06cd New keymaps for bananasplit (#2586)
* New bananasplit keymap with toggable capslock led.

* Update comments.

* Update readme.md

* Updated keymap name

* update some keys.

* new layout for bananasplit

* update comment

* Update readme.md
2018-03-23 16:07:10 -07:00
Takeshi ISHII f56ded3214 add README.md into keyboards/helix/rev2/keymaps/led_test/ (#2582) 2018-03-23 16:04:49 -07:00
john McCormick 6b060bb9ad Add atlacat keymap (#2581) 2018-03-23 16:04:19 -07:00
Andrew Macpherson d0054c41e2 Fix typo in autoshift docs: statn (#2579) 2018-03-23 16:03:19 -07:00
XP 8575249411 Add a basic keymap for Contra. (#2564) 2018-03-23 16:02:44 -07:00
24-bit-8 8621fd8bbd ekis_isa keymap for HHKB'ish layout (#2562) 2018-03-23 16:01:57 -07:00
James Kay 4cf4fe80ec Just personal layout tweaks :) (#2557)
* More ergonomic mousekeys

* integrate some recent hardware changes by changing the Plover keymap

* use TX Bolt support instead of Plover toggles

* switching to steno is no longer as intrusive, so this can move back to BASE
2018-03-23 16:00:36 -07:00
J. Eric Mason ec5cc02bf0 Preonic Ergodox-Like Mac keymap: Bucktooth (#2553)
* Preonic Ergodox-Like Mac keymap: Bucktooth

This is a layout unlike most Preonics, it is taken partially from
Ergodox and classic C64 keyboards with a ton of Mac-specific features.

* Fix Mouse Left keycode
2018-03-23 15:59:56 -07:00
Ivan Smirnov 7a86a67d99 Fix broken markdown headers. (#2548) 2018-03-23 15:59:15 -07:00
akrob 6706e1af6c Add new keymap for iris transmogrified (#2361)
* Create config.h

* Create rules.mk

* Create keymap.c
2018-03-23 15:57:22 -07:00
MechMerlin 426c71de74 Add new bfake "FaceW" keymap (#2360)
* Add mechmerlin keymap and readme for facew board

* Fix keymap
- Backspace as on the wrong key
- HHKB backspace changed to backslash

* Update keymap.c

Change TO to TG for toggle.
2018-03-23 15:56:36 -07:00
David Collom b3e7149a65 yet another keymap (#2356)
* added keymap

* added readme
2018-03-23 15:55:46 -07:00
That-Canadian c3c4164faf That-Canadian Preonic layout (#2462)
* Line ending stuff again

* Added my own person keymap to preonic folder

* Updated my preonic keymap

* Updated my preonic keymap
2018-03-23 15:54:02 -07:00
Florian c808680436 initial branch (#2379)
* initial branch

* lazy-push

* Fix schema

Updated README, readded DVORAK to keymap.
Updated dir name to lowercase.

* removed executable bit

* testing switched L_GUI position
2018-03-23 15:51:32 -07:00
skullydazed 7c9d5ace14 Generate API docs from source code comments (#2491)
* Generate api docs from source code

* Add a bunch of doxygen comments

* more doxygen comments

* Add the in-progress api docs

* script to generate docs from travis

* Add doc generation to the travis job

* make travis_docs.sh commit the work it does

* make sure the docs script exits cleanly
2018-03-22 02:50:38 -04:00
Drashna Jaelre f0932a8716 Update info.json for Ergodox EZ (#2577) 2018-03-21 03:09:51 -04:00
Drashna Jaelre f7505ef67c Update info.json for orthodox (#2576) 2018-03-21 03:09:28 -04:00
MechMerlin 971b837009 Edit info.json (#2575)
GH60 had the ansi layout taken care of.
This commit adds hhkb, iso, and the "basic" KEYMAP layout.
2018-03-21 03:09:12 -04:00
MechMerlin e021f44378 Update info.json (#2574)
Change name from LAYOUT to KEYMAP.
2018-03-21 03:08:54 -04:00
MechMerlin 63b1946bfe Configurator support for minivan (tv44) (#2573)
Support all 4 layouts supported by the tv44 pcb.
2018-03-20 23:01:03 -04:00
Drashna Jaelre 780ff68674 Create info.json for Ergodox EZ (#2572)
* Create info.json for Ergodox EZ

* Add Orthodox info.json too
2018-03-20 23:00:47 -04:00
MechMerlin 004df55d7f Add configurator support (info.json) for Input Club K-Type (#2571)
* Add configurator support for Input Club K-Type

* update info.json to remove bootloader and add mcu
2018-03-20 23:00:17 -04:00
snyman 7a5ce36f23 Add macro for momentarily switching to a layer while some mods are active (#2460)
* Macro for a momentary layer switch with mods

Passes through to the existing ACTION_LAYER_MODS macro, albeit with more
limited options due to lack of space in the quantum_keycodes enum.

* Add documentation for LM layer-mod macro

* Clean up Tap Toggle documentation
2018-03-20 22:59:54 -04:00
U-LANDSRAAD\drashna 4ec03111cc Add Pretty Keymaps to Ergodox EZ 2018-03-20 20:23:08 -04:00
MechMerlin 1fbddc6613 Configurator Support(info.json) for 1up Keyboards Sweet16 (#2570)
* Configurator Support

- Add info.json to support existing layouts
- Add comment in sweet16.h to remind people to change info.json if
  the layout changes.

* Fix dlaroe's keymap
2018-03-20 20:22:42 -04:00
MechMerlin 2d8fda614e Configurator/dz60 support for info.json (#2568)
* Add info.json file for qmk_configurator

Unfortunately none of these keymaps look like a board I've seen in
the wild. Some further tweaks will have to be done to the keymaps
directly.

* add comment indicating need to edit info.json when keymap changes
2018-03-20 11:50:03 -04:00
Merlin04 6d66fe0c0c Added bootloader options
I think I got all of them, so I removed the "FIXME".
2018-03-20 11:47:22 -04:00
mechmerlin 6268656e01 add info.json to support both layouts on the contra 2018-03-20 00:56:05 -04:00
Drashna Jaelre ff728a8a01 [Proposal?] Allow RGB Underglow to turn off when host is idle/asleep (#2104)
* Add RGB Underglow Sleeping

* Add RGBLIGHT_SLEEP to toggle/control RGB light behavior

* Update rgb docs

* Update for RGB disable command
2018-03-19 23:59:58 -04:00
mechmerlin 37cc088486 Add info.json file to work with qmk_configurator 2018-03-19 23:40:12 -04:00
MechMerlin 500b060e3d Fix info.json issues to display properly in config.qmk.fm (#2552)
* Fix info.json issues to display properly in config.qmk.fm

* rename LAYOUT to KEYMAP to match .h file
2018-03-19 22:43:06 -04:00
dlaroe 4ca65bb6c6 retry of PR #2540 (#2554)
* reforked, untarred keymaps, added CRS and renamed my keymap folders

* Update readme.md

corrected a typo
2018-03-18 00:21:01 -04:00
Shayne Holmes b6db61b922 Fix logic in macos install
Also fix mixed spaces/tabs
2018-03-16 20:08:21 -07:00
Sebastian ce3adcd6e1 Added a clean target to remove build artifacts
This commit adds a new clean target to the makefile which deletes
the .build directory which removes all build artifacts.
2018-03-16 16:44:22 -04:00
Alexander Fougner 3acaad6600 Initial support for The Unloved Bastard 2018-03-16 16:41:32 -04:00
Jason Stillwell 00b4dce605 Rule to enable Modifiers with Auto-Shift (#2542)
* Re-enable modifiers with auto-shift

* Auto-shift modifiers rule

* missed a line

* Documentation

* fixing whitespace
2018-03-16 16:41:01 -04:00
Kenny Hung bb5c98699f Duplicate KC space to UK (#2541)
* Fix tilde in xd75 skewwhiffy

* Small tidy up

* Tidy up Colemak row

* Tidy up navigation layer

* Symbols layer redefined

* Fix UK Quote issue

* Use UK_QUOT rather than KC_QUOT
2018-03-16 16:39:51 -04:00
U-LANDSRAAD\drashna 682c8a260a Fix audio issues with Split keyboards that missed previously 2018-03-16 16:38:05 -04:00
fauxpark a2e12faa19 Add CMD and WIN aliases for KC_GUI, GUI(kc), GUI_T(kc), etc. 2018-03-16 16:37:44 -04:00
Pittyolo 729e99961c Updated keymap for my Nyquist layout 2018-03-16 16:37:02 -04:00
adiron 04d72590af New keymap for XD75re ("adi") (#2530)
* My XD75 keymap

* Proper readme for `adi` keymap for xd75re
2018-03-16 16:36:41 -04:00
Matthew Yee 4dc3a01fcb Added my keymap (#2529)
* Added my keymap

* maybe that wasn't quite right.

* Reduced the tap time to register layer

* changed the tapping term that fits my typing speed a little better

* Added retro tapping and reduced tapping term duration
2018-03-16 16:36:17 -04:00
Brian Choromanski a3047f1ab3 Added choromanski keymap (#2528)
* Added ergodox layout

* Added preonic layout

* Added readme for exgodox layout

* fixed errors with formatting readme

* Added edited preonic keymap & readme
2018-03-16 16:35:44 -04:00
Joe Wasson 5d771039ad Fix swap-hands tapping.
This is an inelegant hack for #2522 but makes things work. Basically we give `action.c` a chance to handle the hold event early so that we can swap the keyboard for later keys. Later, to allow the hold to happen again quickly we nuke the key record so that tapping is reset. I tried to find a cleaner way, honestly.
2018-03-16 16:33:43 -04:00
Joe Wasson 23ac2a02ef Add keycodes for swap-hands feature. 2018-03-16 16:33:43 -04:00
Joe Wasson 7230923b05 Rename ONEHAND_ENABLE to SWAP_HANDS_ENABLE for consistency 2018-03-16 16:33:43 -04:00
uplus 687c7070a1 fix generate Keyboard.h 2018-03-16 16:32:46 -04:00
Twentylives 598ab478be new handwired keyboard - Dactyl Manuform (#2516)
* adding new handwired keyboard: dactyl-manuform

* adding qwerty layout

* updating readme file.
2018-03-16 16:32:18 -04:00
James OFarrell 241421efd4 Added support for ca66 2018-03-16 16:30:43 -04:00
Takeshi ISHII 3d1801e63a Helix keyboard led test as a keymap (#2513)
* duplicate keyboards/helix/rev2/keymaps/default to keyboards/helix/rev2/keymaps/led_test

* OLED & RGB LED on

* duplicate quantum/rgblight.[ch] to keyboards/helix/rev2/keymaps/led_test

* rgblight.c modify for RGB test
2018-03-16 16:28:07 -04:00
Otto Rask ea070950e7 Add underglow animation support to rask's UK78 (#2512)
* Add rask's Satan layout

* Add rask's Satan layout

* Add rask's BananaSplit60 layout

* Add rask's BS60 readme

* Fix rask's BS60 readme image

* Fix rask's BS60 readme image again

* Add rask's UK78 layout

* Change RGui to be LGui to fix locale switching

On Ubuntu the keyboard seemingly lost RGui when toggling
between typing languages. With LGui toggling works normally.

* Add rask's ErgoDox Infinity layout

* Modify ErgoDox layout and add readme for it

* Add rask's UK78 layout readme

* Add undnerglow animation to rask's UK78 firmware
2018-03-16 16:27:03 -04:00
Drashna Jaelre 54f1cdfb1e Add teensy revision folder for Orthodox Rev3 (#2510)
* Add Rev3 Teensy for Orthodox

* MOve bootloader defines into revision folders

* Finishing touches
2018-03-16 16:26:21 -04:00
Daniel Rodríguez Rivero a730cf6718 Create sendstring_spanish.h
This makes possible to use SEND_STRING with a spanish keyboard for almost all symbols except the ones that require ALT, which are documented on the code comments.
I am not adding any documentation because the functionality is not complete until a way to specify alted symbols is added.
2018-03-16 16:25:24 -04:00
Louis Orleans f139c3db8d layout(preonic): update to dudeofawesome's layout (#2507)
* 🎉 duplicate default Preonic keymap

*  add Workman layout

* 🚚 swap backspace and delete

*  enable hold enter for shift

* 🚚 swap media play and next

* 💄 use Planck startup sound

* 💄 add Workman layer sound

*  add numpad layer

* 💄 add new workman sound

* 📝 add README

* 🎨 fix layout formatting

* 📝 add image of numpad layer

* 📦 changing chibios submodule version

to match upstream/master's version

*  add caps lock key on adjust layer

*  reworking numpad layer to match a real numpad

*  add double tap to activate numpad

* 📝 fix layout comments

* 📝 update numpad layer render

*  adding operator keys to left hand on numpad

* 🎨 shorten numpad keycodes

* 🎨 remove redundant breaks

* 📝 update numpad layer render

* 🎨 fix indentation

* 🔧 add rules file

* 🔊 play sound when switching to numpad layer

* 🔨 use userspace sounds
2018-03-16 16:22:33 -04:00
Louis Orleans 48321c3eee layout(infinity ergodox): update dudeofawesome's layout (#2506)
* 🎉 Building simple flasher

* 🎉 Flashing works

* 🎨 Cleaning up

* 🐛 Being more specific with board identity

* 🐛 Flashing correct keymap

* 🎉 Adding keymap

*  Updating keymap

* 🚨 RGB

*  Revert "🚨 RGB"

This reverts commit 9ceabfb267f8daedaad929231229c703abc12ec4.

*  Improvements to flasher

*  Layout tweaks

* 💄 Messing around with LCD

* 💄 Enabling LCD backlight matching

* 🔧 Updating layout

* 🐛 Fixing console logging

* 🎨 Cleaning up indentation

* 🔧 Adding editorconfig

*  Adding game layer

* 💄 Changing numpad layout

* 🔥 redoing entire layout

It's now more similar to the Planck default layout

*  add workman and dvorak layouts

* 🐛 fix numpad

* 🐛 fix layer orders

* 🐛 fix layer toggling

* 🐛 fix tri-layer switching

* 🐛 fix LCD colors for adjustment layers

* 🔥 remove old flasher project

* 🔥 remove simple_visualizer

* 💄 update LCD colors

* 📝 fix layout comments

* 💄  swapping 2u buttons

* 🔥🔧 removing editorconfig

* 🚨 using 2 spaces

* 📝 add README

*  Revert "💄 Enabling LCD backlight matching"

This reverts commit 51577903dfdc9fea5d33e9ab8cfa9b854e7ae19e.

*  Revert "💄 Messing around with LCD"

This reverts commit fdd9acdae514a3e0e4a7153225053680744980e5.

* 🐛 fix thumb inconsistency in QWERTY

* 🐛 fix media keys

*  add F# shortcuts to vertical 1.5u buttons

*  hold enter for RShift

*  hold for numpad

* 🎨 remove unnecessary breaks

* 🎨 reoganizing layers

*  add Colmak layer

* 🚧🔧 add basic config

*  use more standard numpad layout

* 💄 change layer orders

*  add caps lock on adjust layer

* 🔥 disable space cadet

* 📝 update README

* 🔨 use userspace config

* 🎨 clean up a bit

* 🐛 undefine tapping toggle from base config

* 🔨 rename LED functions
2018-03-16 16:21:22 -04:00
lucwastiaux e424944a57 update to Ergodox / Atreus Dvorak 42 key layouts (#2504)
* add SCREEN_NAV layer for copy/pasting within screen

* working readreg/paste macros

* working read reg / paste macros

* write log and tran patterns, and expand

* add ls -la shortcut, add tab on combined layer

* put delete word on the right pinky key on shell_nav layer

* add TAB on the right side, add reset key

* added Cloud9 macros

* add cloud9 shortcuts to atreus layout

* added BROWSER_CONTROL layer

* finalized browser control layer

* adding comment

* add browser control layer to atreus

* add flashing command line

* remove the tab on combined layer
2018-03-16 16:21:00 -04:00
Nicola Gargagli 4658786436 Add italian keymap 2018-03-16 16:20:40 -04:00
Brian Choromanski 6c74d734c2 Fixed various keymaps and the allocation of "key_combos" (#2526)
* Fixed plank keymaps so that they will compile for planck light

* tv44:budi now compiles

* s60_x:amnesia0287 now compiles

* Fixed allocation of key_combos so that narze keymap for planck can compile correctly

* Disabled rgb on ergodone and infinity

* Enabled tap dance so it compiles

* Added return statement so it compiles

* If compiling on light disable extra functionality

* Properly redefined variable so it compiles
2018-03-16 16:20:09 -04:00
U-LANDSRAAD\drashna ad1a868701 Move Narze keymap into Ergodox Infinity folder 2018-03-14 22:01:52 -04:00
U-LANDSRAAD\drashna 9db908f7d1 Fix Preonic layout 2018-03-14 21:54:33 -04:00
ajp10304 added1f062 Planck ajp10304 (#2519)
* Planck ajp10304 layout clean up

* Planck ajp10304 layout add Mac layer extensions

* JJ40 ajp10304 layout add Mac layer extensions
2018-03-13 02:22:35 -04:00
uplus e8e999dcc0 Fix preonic/rev2 bootloader config 2018-03-13 02:22:10 -04:00
Brian Choromanski 4464d90f4d Fixed plank keymaps so that they will compile for planck light 2018-03-13 02:21:18 -04:00
Joe Wasson 2dacf25f28 Add layout support for contra. 2018-03-12 14:22:56 -04:00
Joe Wasson bfa34d02b0 Add default keymap for contra 2018-03-12 14:22:56 -04:00
Jon Nall 0b82d08e8d Fixed exit status check for brew 2018-03-09 20:10:44 -08:00
adiron fdeb7f7665 Added Contra keyboard support (#2501)
* Added Contra keyboard support

The configuration came from a source distribution of the firmware on the
Contra's official website.

I have also included a simple MIDI keymap. (And it works!)

* Changes to Contra config and README

* Readme has been changed as requested by jackhumbert
* Config has been changed to add the Cartel and Contra names to
  the USB configuration.
2018-03-09 14:27:31 -05:00
sparkyman215 141a52982e update ymdk96 files 2018-03-09 13:34:37 -05:00
Danny ac5326595c Add Viterbi fido keymap (#2454)
* Add fido Viterbi keymap

* Cleanup rules files

* Remove unused WIP code
2018-03-09 13:32:50 -05:00
hypnocrat 400f410c45 XD75 keymap - Germanized (#2441)
* Added a heavily customized German keymap to the XD75RE

* A heavily customized alternative layout for the XD75, for German users

* Fixed capitalization, removed unnecessary files

* Hopefully fixed capitalization, some keymap changes
2018-03-09 13:32:03 -05:00
Brian Choromanski 8d6eadf261 Patched some keyboards that won't compile (#2453) 2018-03-09 13:31:42 -05:00
Louis Orleans 0e6e059ef3 layout(planck): dudeofawesome's layout (#2457)
* layout(planck): new layout initial commit

* feat(planck): add workman layout

* fix(planck): switching to workman

* layout(planck): swapping mnext and mplay

* feat(planck): prep for RGB

* perf(planck): remove plover

saves 256 bytes of memory

* perf(planck): remove colemak

saves 128 bytes

* layout(planck): swapping enter and quote

* perf(planck): disable console

frees 1664 bytes

* feat(planck): RGB under-lighting

* refactor(planck): change RGB pin

Uses pin labeled PB2

* feat(planck): add RGB keycodes

* feat(planck): re-enable audio

* style(planck): fixing indentation

Because who indents like that?

* style(planck): clean up keycodes

* layout(planck): remove del

* feat(planck): add tap-space to layer keys

* docs(planck): specify pin on PCB for RGB

* bug(planck): reducing tap time

* Revert "bug(planck): reducing tap time"

This reverts commit 62606b2dc62c5adcc06cfb5978d7e5305411a658.

* Revert "feat(planck): add tap-space to layer keys"

This reverts commit c74de5a4aa45c5563dcaa463395654c29f50eda3.

* perf(planck): remove backlit case

* feat(planck): swap enter and quote

* bug(planck): moving right shift

* doc(planck): update README

* chore(planck): remove makefile

* 🔨 add userspace config

* 📝 update layer ascii art

* 🔥 disable RGB lighting

*  add Colemak

*  add numpad layer

*  add caps lock on adjust layer

* 📝 update layer renders

* 🔥 remove workman sound def

* 🔨 add userspace config

* 📝 update layer ascii art

* 🔥 disable RGB lighting

*  add Colemak

*  add numpad layer

*  add caps lock on adjust layer

* 📝 update layer renders

* 🔥 remove workman sound def
2018-03-09 13:31:08 -05:00
Campbell Barton 0603dcb1be qwerty_code_friendly: minor updates (#2494)
* qwerty_code_friendly: minor updates

- Correct mistake in ascii keymap.
- Make lower right key delete again, but make it configurable.
- Make double shift for double quotes optional.

* qwerty_code_friendly: shift users title-caps
2018-03-09 13:19:51 -05:00
MakotoKurauchi 3313473004 Usb max power (#2502)
* add some comment about Helix customize and auto-setup RGBLIGHT_LIMIT_VAL

* add define USB_MAX_POWER_CONSUMPTION
2018-03-09 13:15:37 -05:00
Drashna Jael're 3f1d147529 Add SS_RALT for AltGR usage in macros 2018-03-09 13:15:10 -05:00
edwardbrowncross eba4b08a4a Add the OK60 keyboard (#2488)
* Add the OK60 keyboard

* Fix ok60 incorrect ANSI keymap signature
Add support for default ansi and iso 60 keymaps
2018-03-09 13:14:50 -05:00
Oscillope 7d9dc61504 Fixes for JJ40 and Oscillope keymap (#2496)
* Add navigation layer for hjkl arrow keys

* Fix Oscillope keymap after jj40.h changes. Also fix jj40.c so that it can build without rgblight if you don't want that enabled.
2018-03-08 21:31:08 -05:00
skullydazed 566399794a Disable the glossary linking to fix #2498 (#2499) 2018-03-08 10:31:08 -08:00
That-Canadian 2bdf1731c3 Canadian planck (#2463)
* Line ending stuff again

* Added my personal Planck layout (finally)
2018-03-08 10:31:27 -05:00
MakotoKurauchi 955b17189a Move rows config to keymap (#2464)
* Fork from Let's Split

* Organizing files

* Delete some keymaps

* I2C and serial enabled at the same time

* Change readme

* add #define HELIX_ROWS for multiple rows

* Delete avrdude flashing script

* Delete makefiles

* Subproject elimination

* Fix lufa path

* Remove PLAY_NOTE_ARRAY usages to get rid of warning.

Fix conflicting function name

* Mousekey change default to off

* Fix to oled display adjust

* make rev2

change pin assign
change keymap

* use master_buffer

* Timing adjustment

* Organizing files

* Change Keymap

* Change Keymap

Add EISU and KANA
Correct 4rows

* NKRO default to disable

* EXTRAKEY_ENABLE default to disable

* add rgb reset key

* rgb custom function enable

*  Extend font

* add RGBLED_POWER

default folder to helix/rev2
RGB_ENABLE to no

* renamed directory

* Disable RGBLIGHT_CUSTOM_DRIVER

* Disable LOCKING_SUPPORT_ENABLE

* Update bootloader setting

* Change readme

* Fixed argument error

* Move rows config to keymap
2018-03-07 17:34:42 -05:00
crazyiop 3d7e9425c7 quantum: keympa_extra: add sendstring_bepo.h 2018-03-07 17:09:41 -05:00
crazyiop 483e3cd1cb quantum: keymap_bepo.h: fix typo in BP_COMMMA 2018-03-07 17:09:41 -05:00
Lukas Klingsbo 821b492667 Swedish layout for iris 2018-03-07 17:07:05 -05:00
Cole Markham bd1ad405bf Update Meira for revision 1.1 to enable backlighting by default (#2468)
* Update Meira for revision 1.1 to enable backlighting by default

* Updates to fix other keymaps
2018-03-07 17:06:41 -05:00
Maarten Dekkers 03df19d3f6 Fixed keymap, added capslock led for maartenwut's kbd66 keymap (#2473)
* Fixed keymap, added capslock led

* Removed macro
2018-03-07 17:06:04 -05:00
U-LANDSRAAD\drashna 42e85d2b92 Add layer_state_set_* to custom function lists 2018-03-07 17:05:38 -05:00
U-LANDSRAAD\drashna d27d854913 Examples should all use _user functions for consistency 2018-03-07 17:05:38 -05:00
Sebastian Kaim bec8d58ad8 Fixed compilation of the ps2avrGB keyboard/firmware (resolving #2425) (#2478)
* Fixed compilation of the ps2avrGB keyboard/firmware

This commit fixes the silent compilation error for the ps2avrGB
keyboard/firmware. This error was caused by a lacking default
keymap which it did not have because all keyboards based on it were
moved to another directory. I also added the required config.h
options so it's possible to compile it again and (probably)
flash it on a b.mini.

Lastly, I updated the README to reflect the current state.

This commit fixes #2425

* Referenced the pearl in the ps2avrGB REAMDE

Added a reference to the pearl keyboard in the README of the ps2avrGB keyboard as it is originally based on the firmware as well.
2018-03-07 17:05:02 -05:00
Blake Newman 6c473c5f38 layout(preonic): blake-newman's layout (#2483)
* layout(preonic): blake-newman's layout

- Add keymap
  - Add Number Pad layout
  - Reconfigure other layouts to my opinionated style
- Add `readme.md` with layout information

* layout(preonic): blake-newman's layout

- Move enter to `raise + space` / `lower + space`
- Replace `enter` to `right shift`
- Explicitly map modifier keys
2018-03-07 17:00:44 -05:00
Campbell Barton aadb386de6 qwerty_code_friendly: various updates
- Remove action_get_macro in favor of process_record_user
- Support user defined words on layer 3 (pass via flags)
- Support backspace & del on left thumb cluster.
  (optionally override top right backspace).
2018-03-07 17:00:21 -05:00
Corey T Kump b688c2c0b3 Corvec's Planck layout 2018-03-07 16:58:51 -05:00
Joe Wasson 7b80aea8b2 Add back docs for hand-swapping feature. 2018-03-07 16:56:57 -05:00
Kenny Hung 586aa15cef A small tidy up (#2490)
* Add extra RGUI key to make keyboard more MAC friendly

* Remove enumerators for no longer used layers in layout Skewwhiffy for XD75

* Make layer numbers even better
2018-03-07 16:56:31 -05:00
skullY 48e11240a6 Move the linux tutorials to an info box on newbs_getting_started 2018-03-06 20:51:26 -08:00
skullY 75354f12d7 warn->danger 2018-03-06 15:39:46 -08:00
skullY 6a4e08938e Flesh out the newbs guide 2018-03-06 15:22:47 -08:00
skullydazed 08e48eb6f5 Add a newbie guide for people completely new to QMK (#2480) 2018-03-06 14:37:48 -08:00
Pawnerd 12c8ee956d Add knops configurator support (#2474)
* Committed initial version of the knops configurator.

* Added support for the Knops v1.1
2018-03-04 21:29:38 -05:00
Graham P Heath b36b4382d0 Mention invalid names in the readme. (#2458) 2018-03-03 09:52:09 -08:00
skullydazed e87c39d302 More thoroughly document Bootmagic and Command (#2455) 2018-03-02 09:21:03 -08:00
skullY e5c331e7be Fix the SGUI aliases 2018-03-01 16:15:38 -08:00
skullydazed e3f67e6e7f Add SGUI() and SGUI_T() for consistency with KC_GUI (#2442)
* Add `SGUI()` as an alias of `SCMD()` for consistency with `KC_GUI`

* Add `SGUI_T()` as an alias of `SCMD_T()` for consistency with `KC_GUI`

* Make SGUI the primary name
2018-03-01 08:13:10 -08:00
Mitchell van Manen 31cae1f1bd Update feature_macros.md (#2387)
break statements are never reached due to the return statement, so unnecessary
2018-03-01 08:05:15 -08:00
Ivan Choi 0092be5925 adding my keymap (#2443) 2018-03-01 07:51:57 -08:00
Maarten Dekkers 381f4e6404 Updated and added maartenwut's layouts (#2444) 2018-03-01 07:51:11 -08:00
fauxpark b713feb6f2 Add a little aside explaining that shifted keys with mod-tap doesn't work (#2446) 2018-03-01 07:49:50 -08:00
Louis Orleans d7f46f3466 layout(preonic): dudeofawesome's layout (#2449)
* 🎉 duplicate default Preonic keymap

*  add Workman layout

* 🚚 swap backspace and delete

*  enable hold enter for shift

* 🚚 swap media play and next

* 💄 use Planck startup sound

* 💄 add Workman layer sound

*  add numpad layer

* 💄 add new workman sound

* 📝 add README

* 🎨 fix layout formatting

* 📝 add image of numpad layer

* 📦 changing chibios submodule version

to match upstream/master's version

*  add caps lock key on adjust layer

*  reworking numpad layer to match a real numpad

*  add double tap to activate numpad

* 📝 fix layout comments

* 📝 update numpad layer render

*  adding operator keys to left hand on numpad

* 🎨 shorten numpad keycodes
2018-03-01 07:48:15 -08:00
Drashna Jaelre 452d23da52 Update to drashna keymaps and userspace (#2450)
* Add OSL keycodes and macro handling

* Re-add AVRDUDE target

* Userspace document cleanup and commenting

* Fix Orthodox keymap layout (cosmetic)

* Add caveat for KEYMAP Macros

* Minor tweaks

* Enable Bootmagic in Ergodox EZ

* Minor tweaks
2018-03-01 07:46:57 -08:00
Brian Choromanski 7f7f763598 Fixed dead links (#2451)
* Fixed typo of 'confid.h' to 'config.h'

* Fixed broken links in docs

* Fixed a lot of dead links
2018-03-01 07:45:47 -08:00
Gam3cat 2b8a82fb9d M10-A, M65-A, GonNerd keymaps (#2418)
* adding my keymap

* update keymap

* adding gamecat keymap for jc65 keyboard

* updating jc65-gamecat keymap

* updating jc65-gamecat keymap

* updating jc65-gamecat keymap

* updating jc65-gamecat keymap

* M10a keymap and M65a updates

* keymap updates

* keymap updates

* M10a/M65a keymap updates

* M10a/M65a keymap updates

* Delete test.txt

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65/M10 keymap updates

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65/M10 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* Set theme jekyll-theme-cayman

* Set theme jekyll-theme-slate

* M65 keymap update

* M10a/M65a keymap updates

* M10a keymap update

* M65a keymap update

* M65a keymap update

* M65a keymap update

* M65a readme update

* M65a/M10a updates

* M65a readme updates

* M65a/M10a updates

* M65A update

* M65A update

* M65A update

* M65A update

* M65A/M10A keymap update

* M10A keymap update

* Set theme jekyll-theme-tactile

* M10A keymap update

* M65A keymap.c update

* M65 keymap added LED backlight toggle, inc/dec to adjust layer.

* M65 keymap/readme updates.

* M65 keymap fix

* M65 keymap update

* remove theme

* fix comments/readme

* update keymap

* LED backlight update, guess based on reading atmega32u4 documentation for DDRB/PORTB regs, believe DDRB should only be written to once not every time CAPS is hit, but really not too sure.

* LED backlight update, guess based on reading atmega32u4 documentation for DDRB/PORTB regs, believe DDRB should only be written to once not every time CAPS is hit, but really not too sure.

* M65 keymap update

* Updated M65, M10, and gonNerd keymaps.

* update

* del

* keymap updates M65, M10, gonnerd

* update keymaps

* adding back readme that somehow got removed.
2018-02-28 16:44:27 -05:00
Brian Choromanski 8e99fbc884 Fixed typo of 'confid.h' to 'config.h' (#2448)
* Fixed typo of 'confid.h' to 'config.h'

* Fixed broken links in docs
2018-02-28 16:43:15 -05:00
Danny 524053e3c0 Remap msys2 usb, fix USB port detection (#2301)
* Add AVRDUDE to MSYS2 setup

* Remap detected USB port in MSYS2 to COM port
2018-02-28 16:40:43 -05:00
Jason Gorman 19b02bf267 Merge of e6v2 stuff as well as my personal keymaps (#2434)
* Checkin of tada keymap and initial commit for e6v2.

* checking in other remaining changes before trying to merge

* Reverting pin change. This was done based on the json orginally provided by exclusive, but it was later determined my map was the correct one based on user testing

* fix extra key for ansi keymap. Didn't include fn as standard ansi shift is not split but still had it in keymap

* Fix default help file and add reset to default
2018-02-28 16:22:53 -05:00
skullY 298ac18dfa remove duplicate #define 2018-02-25 17:41:43 -08:00
skullY c6ce959f49 Test a shrug macro 2018-02-25 17:40:18 -08:00
Yan-Fa Li 3b801880a0 Custom keymap for clueboard 60
My customized keymap for the clueboard 60.

 - Maps MT(LCTL,ESC) to Caps lock
 - Swaps ALT and GUI for OSX
 - Adds layer for WASD key navigation
2018-02-23 13:25:23 -05:00
Alejandro Blanco 21a37a5245 ErgoDox layout similar to Truly Ergonomic 2018-02-23 13:23:55 -05:00
Sean-Li Murmann 3cff95c8df new customized ErgodoxEz keymap with easy to remember modifiers. (#2400)
* First pass keyboard setup!

* More variation

* Final layer for today

* Added brace to middle key
2018-02-23 13:22:50 -05:00
Isaac Hookom 93eabc4b2c new xd60 layout (#2405)
* new xd60 layout

* fix kc_slsh
2018-02-23 13:22:32 -05:00
ajp10304 01f91bf6f4 JJ40 AJP10304 layout (#2407)
* JJ40 AJP10304 layout
Updated AJP10304 readme.md with formatting

* Revert default JJ40 keymap
2018-02-23 13:21:56 -05:00
Michael Wamsley 2c1ba03a98 Add additional 'tada68' layout. 2018-02-23 13:17:00 -05:00
lucwastiaux 27d32378b5 Update Dvorak 42 key layouts (#2420)
* add SCREEN_NAV layer for copy/pasting within screen

* working readreg/paste macros

* working read reg / paste macros

* write log and tran patterns, and expand

* add ls -la shortcut, add tab on combined layer

* put delete word on the right pinky key on shell_nav layer

* add TAB on the right side, add reset key

* added Cloud9 macros

* add cloud9 shortcuts to atreus layout

* added BROWSER_CONTROL layer

* finalized browser control layer

* adding comment
2018-02-23 13:16:40 -05:00
scott-t-wilson 3f3d0551cd Lfkeyboards updates (#2421)
* Update smk65 fn layer, add iso

* Added Fn layer to ISO keymap

* Fix error when backlight is disabled but lighting isn't

* Remove broke mini1800 iso map

* Add keymaps

* Add LFKPad

* Add split delete to lfk78

* Typo

* Custom keymap
2018-02-23 13:16:10 -05:00
Graham P Heath f746174874 Graham's Keymaps. (#2422)
* add my config

* fix backlight, clean up that code

* group background code, restore static var

* qwerty is supposed to be in the middle

* wrap layer change backlight in ifdef

* backlight levels and some more 'emojis'.

* Restructure to make it possible to press cmd ent on the right side of the board with one hand.

* Expose the period through the number layer. Add Hyper keys to mouse layer

* reduce mouse speed

* add a : -P  key

* Thumbs up and down, remove some keys that are duplicated via function keys, clean up

* fix build issues

* add various emoji

* duplicate default Meira keymaps

* Miera updates

* add documented but unmapped emoji

* Sound for the Meira, was stumped by a file size! Thanks drashna!

* add docs

* docs

* revert lib changes...

* clean up

* clean up

* remove make file

* Fixes missing key
2018-02-23 13:15:34 -05:00
Yan-Fa Li a8daf3ffba Document bootmagic hot keys
- covers most of tmk_core/common/bootmagic.h
2018-02-23 13:14:53 -05:00
wanleg 3b4d26e344 flashing instructions, keymap changes
* added flashing instructions for Linux & Windows
* minor keymap changes
2018-02-23 13:14:22 -05:00
ferbie 767f7a8cf0 Fixed formatting for Fedora example 2018-02-23 13:13:30 -05:00
deadencryption ee176f2b27 Adds dead encryption keymap 2018-02-23 13:13:09 -05:00
Mason McAllaster c72c1db68b Planck/NIU_Mini - Mason Layout - Fixing comments, adding missed keys 2018-02-23 13:12:27 -05:00
James Shackleford d469aaa166 tada68: layout: add new layout 'tshack' (#2431)
* Move to a more cross-platform grep command

* Use sed to strip out AVR_SIZE instead

* tada68: layout: add new layout tshack

Adds "James Shackleford's UNIX layout" for the Tada68
2018-02-23 13:12:04 -05:00
Jose Pablo Mora d54de1c5f2 ergobox -> ergodox 2018-02-23 13:11:31 -05:00
Ben Hilburn 8df2ee4ec3 Minor updates to docs (#2406)
* [docs/] Cleaning up some language to make it more clear.

* [docs/] Adding instructions for installing deps on RH / Fedora.
2018-02-19 14:09:05 -05:00
Jason Barnachea 0e92d99cdc Readme img link updates (#2410)
* QMK and JC65 pcb img links updated

link fixes

* personal keymap updates

new v32u4 keymap, updated v32a keymap

* Update readme.md
2018-02-19 14:07:59 -05:00
Danny 3d92b21a3b Update dilly default keymap (#2413)
* Move DEL to correct layer

* Move BNM to the left by one and move Backspace, add more stuff to layers
2018-02-19 13:50:35 -05:00
rempired 78f5a2a3dc 1up60rgb Keyboard Support (#2404)
* Add files via upload

* Update keymap.c

* Update keymap.c

* Update 1up60rgb.c

* Tidy up the code a bit for submission into QMK Master
- Create readme file
- Fix compile issue with standard keymap
- Create default keymap
- Remove unused Makefile

* Keymap Adjustments

* Reworked alternate layouts

* Reworked keymaps

* Update keymap.c

* Update readme.md

Add carriage return to make README cleaner
2018-02-18 02:09:40 -05:00
Danny Nguyen f67c59aa7b Move hexwire layout into 4x12 layout folder 2018-02-18 02:04:56 -05:00
Danny Nguyen 2a5da62728 Add Dilly keyboard 2018-02-18 02:04:22 -05:00
GlenPickle d1ea398fb9 Added Chimera LS and Chimera Ergo (#2335)
* Added Chimera Ortho keymap

* added readme

* fixed hardware link

* Added KC_KEYMAP

* resolving conflict

* Added Chimera LS and Chimera Ergo

* Added rules file

* fixed rule files

* Added Chimera Ortho keymap

* Added KC_KEYMAP

* Added Chimera LS and Chimera Ergo

* fixed rule files

* fixed rule files

* fixed image links

* Added KC_KEYMAP

* Added Chimera LS and Chimera Ergo

* Added Chimera Ortho keymap

* fixed rule files

* fixed rule files

* fixed image links

* Fixed KEYMAP vs KC_KEYMAP
2018-02-16 12:03:53 -05:00
Yan-Fa li bfc2b1205a u/yanfali custom keymap for Iris
Based heavily on the keymap by hexwire.

 1. Moved LALT to LCTL; I don't need CTL because of ESCC.
 1. Moved RAISE to old LALT.
 1. Moved ENTER to old RAISE.
 1. Move QUOTE to old ENTER.
 1. Moved PLUS to old QUOTE.
 1. replaced music next and volume up with browser forward and back
    through history
2018-02-16 12:02:33 -05:00
Pittyolo 7b5c6a895e Update keymap.c 2018-02-16 12:02:14 -05:00
tameone 4f55a7aca1 Iris: Create info.json (#2396)
* Create info.json

* Update info.json
2018-02-16 12:01:51 -05:00
Drashna Jaelre b0e8de1c97 Fix EE HANDS on splits losing handedness if RGB is enabled (#2399)
* Fix EE HANDS on splits losing handedness if RGB is enabled

* Because I'm an idiot and did a bad cut/paste job
2018-02-16 12:00:39 -05:00
ChrissiQ 1af8f1f201 Let's Split: Minor keymap fixes 2018-02-16 12:00:08 -05:00
Oryhara b89e318d35 adding my stuff back after hard reset 2018-02-12 16:37:40 -05:00
Johan Ju 20b5dd80bd Fix swedish NO_GRV 2018-02-12 15:56:43 -05:00
Fred Sundvik 25c7533092 Change the CDC_NOTIFICATION_EPSIZE back to 8 from 32 2018-02-12 15:48:44 -05:00
Fred Sundvik 50038882e0 Set unused USB serial buffer to 1 byte to save memory 2018-02-12 15:48:44 -05:00
Drashna Jaelre 6f5e88277b Update to drashna keymaps (#2381)
* Add to list of predefined rgb colors

* Change layer colors, to reflect new options

* Use Tag Toggle instead

* Clean up macros and add breathing indication for OSM Layer

* Get Viteri Macropad working properly

* Disable unused action features

* Use I2C because that's smaller, apparently

* Remove viterbi-half code
2018-02-12 15:46:35 -05:00
Gomme_Bidule 63df056013 Update feature_auto_shift.md 2018-02-12 15:45:54 -05:00
Kayle Knops 6f1d5f73a4 Committed initial version of the knops configurator. 2018-02-12 15:45:05 -05:00
skullydazed 994d94140e Clueboard hotswap support (#2376) 2018-02-10 17:09:47 -08:00
skullydazed fa72d4aa5a Modernize clueboard, add 66_ansi and 66_iso layouts (#2377) 2018-02-10 17:08:37 -08:00
yiancar 88a7fa762f New keyboard: Cu75 (#2374)
* Added Modular keyboards L,R and NUM

Created code modules for the 3 modules of the modular keyboard.
Original idea by MechboardsUK. Uses i2c implementation similar to lets
split

* Remove modular from master

This is to fix incorrect branching

* Addition of cu75

Addition of cu75 keyboard, uses libraries from LFKeyboards directory which are path linked to reduce file duplication.

Minor fix on cu24 readme

* Minor Readme Fix
2018-02-10 17:47:15 -05:00
IslandMan93 cd0c089b49 Diverge 3 initial commit
woo it works

use lets split code

Final working. Uses serial

Update license
2018-02-10 17:28:49 -05:00
Raymond Douglas 5bdc5c1190 Added raylas keymap for TADA68 2018-02-10 17:26:54 -05:00
Jason Barnachea a972b26274 Add JC65 ps2avrGB keyboard (#2351)
* Adds JC65 ps2avrGB keyboard

* Adds default keymap

* Adds personal keymap

* Backlight On/off support

Migrated code from the BFake. Functionality only on BL_ON, BL_OFF,
BL_TOGG.

* Backlighting config adjustment

Only 1 level supported.

* Personal keymap update

BL toggle added and RGB layer updates.

* Renamed jc65 ps2avrgb directory

Renamed directory for more clarity.

* Default keymap and default rules

* Personal keymap and personal rules

* Group JC65 QMK and PS2 versions

Group JC65 QMK and PS2 versions, Split directories, Readme for parent
folder.

* Default keycaps and personal keymaps re-added

Default and personal keymaps re-added. Keymaps, Readme, Rules.mk, and
config.h

* v32a default keymap rules

Default to no.

* RGB and Backlight default settings

Set to yes.

* Rules.mk defaults for personal keymap

Rules.mk defaults for personal keymap

* Revised keyboard readme make paths

Revised.

* Path correction

* jc65 default folder set

set default pcb to qmk version

* default rules for v32a

set to enable backlight and rgb by default.
2018-02-10 17:24:54 -05:00
Fred Sundvik 8c2ae4a470 Fix reset for STM32 devices 2018-02-10 17:13:38 -05:00
Michael F. Lamb fca31693df add conditional to perform check-size only for supported architectures 2018-02-08 16:47:18 -05:00
Michael F. Lamb fae8132295 make check_size work across platforms 2018-02-08 16:47:18 -05:00
Drashna Jaelre 6835ae8209 Add the ability to disable Music Mode completely (#2339)
* Skip process_music in NO_MUSIC_MODE is defined

* Skip matrix_scan_music if NO_MUSIC_MODE is defined

* Skip music_all_notes_off if NO_MUSIC_MODE is defined

* Leave matrix_scan_music in, because it reduces firmware size by 150b....

* Add docs for NO_MUSIC_MODE
2018-02-08 15:16:06 -05:00
Danny Nguyen c5d81a84a0 Switch from echo to printf for output without newlines 2018-02-08 15:15:12 -05:00
Danny Nguyen 361810dca8 Only search through newly detected devices and discard ones that disappeared 2018-02-08 15:15:12 -05:00
fredizzimo 53ff8a31b6 Merge ChibiOS and LUFA descriptor support (#2362)
* Move lufa descriptor to protocol/usb_descriptor

* Try to compile usb_descriptor on ChibiOS

* Add lufa_utils for ChibiOS

Lufa USB descriptors for ChibiOS

* More lufa_util compatibility fixes

* First compiling version of shared USB descriptor

* Send the usb descriptors

* Fix the CONSOLE output on ChibiOS

* Add errors for unsupported interfaces

* Enable support for vitual serial port USB descriptors

* Implement virtual serial port for ChibiOS

* Cleanup the lufa_utils

Use the default lufa header files

* Add raw hid support for ChibiOS

This is completely untested

* Enable midi compilation on ChibiOS

* Move midi functionality out of lufa.c

* Don't register sysex callback when not needed

* ChibiOS compilation fixes

* Update ChibiOS submodule

* Fix the Midi USB descriptor

It didn't work properly when both Midi and Virtual serial port was enabled.

* Add MIDI support for ChibiOS

* Fix USB descriptor strings on ChibiOS

* Use serial usb driver for raw hid

* Generalize the ChibiOS stream like drivers

This makes the initialization much more simple and eliminates a lot of
the code duplication.

* Convert console output to chibios stream driver

* Fixes for ChibiOS update

* Update the ChibiOS contrib submodule

To include the usb data toggle synchronization fixes

* Fix duplicate reset enumeration on ChibiOS

* Add missing include

* Add number of endpoints check for ChibiOS

* Enable serial USB driver on all keyboards

* Add missing includes when API is enabled withot midi

* Add another missing inlcude
2018-02-08 15:07:46 -05:00
Jack Humbert 63c16f4b63 ARM audio fixes, stack size increase (#2365)
* fix up arm audio implementation

* chibios stack size inc

* get one channel working

* update for chibios
2018-02-08 14:39:40 -05:00
jetpacktuxedo 7d79412f99 Fixed my minivan F-keys 2018-02-08 13:44:41 -05:00
Niles Christensen 57dde3ddba Makes layers consistent with comments 2018-02-08 13:42:58 -05:00
Danny Nguyen 8afbd649f0 Replace Right key on base layer with RShift, convert adjust to KC_KEYMAP format 2018-02-08 13:42:31 -05:00
Fred Sundvik 30b90de7c9 Send usb wakeup through ChibiOS 2018-02-07 17:16:01 -05:00
Fred Sundvik 30e413f985 Update Chibios Contrib with 17.6.3 support 2018-02-07 17:16:01 -05:00
Fred Sundvik 6a9617b1c6 Update ChibiOS to 17.6.3 2018-02-07 17:16:01 -05:00
Legonut ad01e3c03a New keyboard added "Zen" (#2347)
* New keyboard added

Zen is a split ortholinear currently in group buy.

* remove bad keymap

Keymap was throwing errors

* remove other bad keymap

I should have checked these before haha

* small fix to update folder name

* renamed temp

* renamed to zen

* update folder name

* Slim down matrix code

Suggested by drashna

* move KC_NO

* Update keymap

* change from rev2 to rev1
2018-02-06 23:44:10 -05:00
Drashna Jaelre 9cfcd49406 Re-add Flip Installer (#2355)
* Re-add Flip Installer

Found the update URL for it.
http://www.microchip.com/developmenttools/productdetails.aspx?partno=flip

* Comment out JRE installer version
2018-02-06 23:21:03 -05:00
QMK Bot f26e6fca8a convert to unix line-endings [skip ci] 2018-02-07 04:05:15 +00:00
KeLorean 0e31d85b8e made changes to my kelorean planck keymap (#2343)
* Planck-swapped up/down arrows,s65x-add dvorak

* Added Dvorak as first layer of default keymap

* planck-swap up and down arrows. s65x-added dvorak

* added colemak to kelorean s65x keymap

* made more changes to kelorean keymap

* just tryinng to fix bc i was not connected upstrem
2018-02-06 23:01:29 -05:00
U-LANDSRAAD\drashna 84a713b05c Remove _quantum functions from custom matrix.c code 2018-02-06 12:25:30 -05:00
skullydazed 9aaa491bc0 Add stm32 to drivers.txt 2018-02-05 08:54:49 -08:00
scauligi 9fcda95363 Fixes to get tap dance to fire at proper places (#2272)
* tap dance fixes: fire immediately upon completion and also get properly interrupted before macros

* bugfix for tapdance improvement

* fix build
2018-02-04 13:45:19 -05:00
KeLorean 2908c0f927 made kelorean keymaps for planck and s65x (#2331)
* Planck-swapped up/down arrows,s65x-add dvorak

* Added Dvorak as first layer of default keymap

* planck-swap up and down arrows. s65x-added dvorak

* added colemak to kelorean s65x keymap
2018-02-04 13:44:58 -05:00
Drashna Jaelre 598384bc10 Update to drashna userspace (Keymap Templating) (#2338)
* Change tapping term to be longer

* Make Audio/Underglow settings permanent

* Use wait_ms rather than _delay_ms

* Readd One Shot Mods

* Switch to Imperial March startup sound

* Move OSM to it's own layer

* Minor Formatting Tweaks

* Keymap Templates and formatting fixes
2018-02-04 13:44:02 -05:00
Harley Laue ac82cd1ba7 Added personal nyquist & levinson layouts 2018-02-04 13:40:22 -05:00
f3d3 31f5229191 Added dz60 custom layout (#2302)
* Add files via upload

* Update keymap.c

* Delete keymap.c

* Added dz60 banana-split layout

* Added dz60 custom layout

Added layout for dz60 with split spacebar, arrows and other customizations.
2018-02-03 15:22:30 -05:00
jirgn 2f65ab183d just a planck layout (#2320)
* added jirgn keymap from dotfiles

* added jirgn s keymap as copy from default

* [TASK] removed unnecessary colemak and dvorak layouts

* [TASK] added right shift with tab to enter

* [TASK] added ctrl keys beside homerow

* [TASK] added Navigation Layer

removed unnecessary BACKLIT
removed Media Controls in Base Layers

* [TASK] added left Navigation mode  fixed some doc

* [Fix] locked navigation layer by adding a transparent key for nav_mod
keys

* [TASK] added some more symbols and removed lower F1-F12 keys

* [TASK] added some README and a layout design

* [FIX] forced for adding to repo

* [FIX] forced for adding to repo

* [FIX] problem with layerswitching and hanging ctrl

* removed image from repo

* removed github image link with permalink from layout designer

* removed github image link with permalink from layout designer

* replaced image with permalink to layout editor
2018-02-03 15:22:00 -05:00
yiancar 8350d7e607 Cu24 keyboard addition (#2330)
* Added Modular keyboards L,R and NUM

Created code modules for the 3 modules of the modular keyboard.
Original idea by MechboardsUK. Uses i2c implementation similar to lets
split

* CU24 Support

Addes Support for the upcoming CU24 keyboard sold by CapsUnlocked

* Removed modular keyboards to make stuff clear

* Lower Case folders

* Remove CU24 - Rename Folder

* Add CU24 - Renamed

* Fixed ignore list

I am stupid
2018-02-03 15:21:24 -05:00
Fred Sundvik e7bb975482 Fix .editorconfig to not mess with line endings 2018-02-03 15:20:44 -05:00
Emily Soldal a6be48681a Map num lock and caps lock LED events to the RXLED and TXLED 2018-02-02 01:51:01 -05:00
HagVcom e9944bfc8e Added "hag" keymap to Iris (#2313)
* Create keymap.c

Add Hag keymap, a heavily modified dvorak swedish keymap with multiple layouts and often used stuff under the alpha cluster.

* Create config.h

* Create rules.mk
2018-02-02 01:50:22 -05:00
Kenneth Aloysius 9303b42e69 Update personal layouts, free up matrix_scan_user for JJ40 (#2319)
* Add NIU Mini keymap from Planck keymap

* Remove old keymap files

* Fix README, removed Planck references

* Add default layout, move Planck layout to separate folder

* Update README

* Add my XD60 keymap

* Change RShift to slash

* Fix keymap: stuck on MO(1)

* Move RESET to Fn+Enter

* Add: RGB saturation cycle

* Add numpad layer to keymap

* Fix last case

* Cleanup Mechmini keymap. Once the custom RGB function is defined, there is no need to manually handle RGB code.

* Change default to KEYMAP_MIT, not KEYMAP_OFFSET

* Add custom RGB code for JJ40

* Reset Mechmini advertised power draw to 500. Will have to test actual maximum power draw later.

* RGB working on JJ40.

* Fix: saturation increase/decrease flipped

* Add new directory for my custom keymap with RGB keycodes

* Swap LAlt and LGUI

* Update JJ40 max power draw with measured value

* Update: fun40 rules.mk to enable underglow; earlier failed Travis CI

* Fix: init RGB LEDs on boot. Also added HHKB-like keymap for XD60.

* Super rudimentary backlight test, init RGB LEDs on boot

* Backlighting works - stays on for now

* Toggling working

* Now can override backlight.c functions. Problem was functions in backlight.c weren't called before due to a lack of matrix_scan_quantum() in matrix.c

* Timers not working

* Delete global.h

* Cleanup

* Compiles

* Good sign: LEDs stop working again

* Handle timer1 overflow

* Progress: fix: forgot to init

* Backlighting fully working now except breathing.

* Revert keymap to original keycodes

* Update XD60 keymap README

* Update JJ40 keymap with backlight toggles

* Breathing working just fine.

* Update references

* Add backlight_set() call

* Cleanup code to disable backlight

* Fix: does not compile

* Fix: missing call to rgblight_task.

* Testing with BACKLIGHT_BREATHING

* Cleanup

* Cleanup comments

* More commenting cleanup.

* Do not enable BACKLIGHT_BREATHING by default

* Update XD60 keymap

* Update: move matrix_scan_kb out from matrix.c to jj40.c (kb-level)

* Cleanup for PR

* Fix conflict in readme.md for NIU mini

* Restore original power consumption figure

* Fix: matrix_scan_user() now has to be defined in the keymaps

* Add weak `matrix_scan_user` so it does not have to be defined in keymap

* Add weak matrix_init_user()
2018-02-02 01:30:47 -05:00
kifinnsson 042a450e24 Personal BEAKL9 based keymap (#2304)
* Adding personal BEAKL9 based keymap

Initial commit, very much a WIP/Proof of concept.

* Updating personal BEAKL9 based layout

* F-keys added to upper layer
2018-02-02 01:22:37 -05:00
jola5 2cf6bfe9ac Not quite neo (#2318)
* planck with a not-quite-neo layout for a de-DE OS/SW keymap

* ergodox infinity with a not-quite-neo layout for a de-DE OS/SW keymap

* add documentation
2018-02-02 01:21:41 -05:00
Donald 2917e55bd4 Added info.json and updated README for Deltasplit75 (#2266)
* Added info.json and updated README

* Updated info.json
2018-02-02 01:13:44 -05:00
Louis Orleans 55d4c9b162 🔧 create info.json for Infinity Ergodox (#2267)
* 🔧 create info.json for Infinity Ergodox

I'm not sure if the bootloader key is set correctly.

* 🐛 fix layout name
2018-02-02 01:11:56 -05:00
Erin Call 904b1b3f99 Use perl directly instead of grep -P
BSD grep (the one on OSX) lacks a -P flag. The grep -P command thus
fails and prints a usage message to the terminal. This fixes that.
2018-02-02 01:10:57 -05:00
mvs 0310eafdcf QWERTY based layout with thumb-chording (SHIFT + SPECIAL) and programming layer. 2018-02-02 01:02:58 -05:00
Stephen Tudor f2459997ba Add smt keymap for KBD75 2018-02-02 01:01:41 -05:00
adiabatic 9f0aac22e9 zweihander: rename, ⌃ → ⌥, README revamp (#2311)
* zweihander-osx: Remove app keys, etc.

- add right command keys
- add F16 on ;' for Siri
- remove command-Q (too easy to hit)

* Rename zweihander-osx to zweihander-macos

zweihander-macos: / / ^ → / / ⌥; README revamp

zweihander: rename, ⌃ → ⌥, README revamp
2018-02-02 01:01:18 -05:00
Brosseau Valentin 3cf752f83f Xd75 : Bépo layout for the XD75 (#2166)
* Add xd75 layout

* Add Readme

* Update layout

* Remove Backlight keys

* Move ENTER / BACKSP / DEL

* Commit my bepo layout instead of the qwerty version since i will not use it

* Use 0 instead of 00

* Fix TODO key

* Update the readme

* Replace wrong key placment

* Update center column

* Update the layout with 2-u key

* Adjust the fn layer

* Adjust the main layer

* Adjust the fn layer
2018-02-02 01:00:39 -05:00
Christian Richter 087fa37b7a Added us based keyboard layout with cursor keys and mouse functionality for SATAN GH60 (#2180)
* Add chaser keymap

* Added missing readme

* Add missing mousewheel und mousebutton 3
2018-02-02 01:00:09 -05:00
Daniel Shields 4a04c7265e Replace custom tap dance keys with mod tap keys in planck/keymaps/dshields 2018-02-02 00:59:44 -05:00
Chris Lee 9584db055b Add support for key backlighting to bfake
If BACKLIGHT_ENABLE is set to `yes` in `rules.mk`, then the user
can use the `BL_*` keycodes to adjust the backlight. At the moment,
only on/off is supported.
2018-02-02 00:58:26 -05:00
Koen Klinkers 38ab86e8f2 updated xd75 layout (#2321)
* plank layout

* ergodone

* x75

* readmes

* added rgb controls

* bslash

* added backlighting based on layer/modifier

* changed colors
2018-02-01 23:08:39 -05:00
Oryhara 7636fdbbd0 Halfkey function for every layer (#2327)
* started work on halfkeyboard

* update to keymap

* halfkey layouts complete for dvorak and qwerty

* added plover layout to halfkeyboard mapping

* fixed error in dvorak layout right hand

* fixed error in dvorak layout right hand, comments updated

* thing

* added minus and equals to normal layouts

* added minus and equals to normal layouts

* adde visualizer matching halfkeyboard mappings

* adde visualizer matching halfkeyboard mappings

* updated keymaps for mirror handedness functionality for all layers.  Also added visualizer code for distinct color for each layer, and LCD text displaying the current layer.

* had a KC_TILD where should have had KC_GRAV

* its spelled KC_GRAVE
2018-02-01 23:08:18 -05:00
Null cee0a33396 added my layout (#2326)
* added my layout

basically just default with proper arrow-keys

* fixed arrow keys now works properly
2018-02-01 23:07:47 -05:00
Mitchell van Manen ee0a2b7dab Imperial Match (Darth Vader's Theme) added
crappy recording: https://clyp.it/0lufqils
2018-02-01 23:06:52 -05:00
Michael Kaylan 91c133f4e0 Add missing parenthesis back to backlight_tick 2018-02-01 23:06:00 -05:00
LEdiodes b0805e38b9 added ATOM47 (Vortex Core QMK powered PCB) & DZ60 Custom config(LEdiodes) (#2310)
* added ATOM47 (Vortex Core QMK powered PCB)

* fixed broken\unfinished comment block

* moved Layer template to default template.

* moved Layer template to default template and removed template from the keymap.c file.

* Added LEdiodes config

* created readme.md

contains an image of 60% board(LEdiodes).

* updated readme.md with images

added images of the PCB and some feature details from https://geekhack.org/index.php?topic=93447.msg2545221#msg2545221

* removed excess words.

* followed the readme template to a T.

* formatting fix : added a return.
2018-01-28 15:58:42 -05:00
sanosis 2480e5d69a Support for YMDK NP21 (#2316)
* ymdk_np21 initial support

Base support of ymdk_np21 - based on jj40. Full grid layout

* Update README.md

Replacing description.

* Adding YMDK NP21 to comunity list.

Adding YMDK NP21 to community supported list.
2018-01-28 15:58:03 -05:00
sanosis 056ecb1463 Adding jj40 to keyboard list (#2315)
* Adding jj40 to keyboard list

Adding jj40 to Community-supported list.

* Update readme.md
2018-01-28 14:46:22 -05:00
skullydazed 9bfaf66792 Always copy the firmware file to the root qmk_firmware directory (#2314)
* Always copy the firmware file to the root qmk_firmware directory

* remove circular dependency
2018-01-28 11:11:28 -08:00
Sam Perman f0f991dd89 update sed to work on mac
See https://stackoverflow.com/questions/19456518/invalid-command-code-despite-escaping-periods-using-sed
2018-01-28 12:23:28 -05:00
MakotoKurauchi bceffdefca Add helix keyboard (#2308)
* Fork from Let's Split

* Organizing files

* Delete some keymaps

* I2C and serial enabled at the same time

* Change readme

* add #define HELIX_ROWS for multiple rows

* Delete avrdude flashing script

* Delete makefiles

* Subproject elimination

* Fix lufa path

* Remove PLAY_NOTE_ARRAY usages to get rid of warning.

Fix conflicting function name

* Mousekey change default to off

* Fix to oled display adjust

* make rev2

change pin assign
change keymap

* use master_buffer

* Timing adjustment

* Organizing files

* Change Keymap

* Change Keymap

Add EISU and KANA
Correct 4rows

* NKRO default to disable

* EXTRAKEY_ENABLE default to disable

* add rgb reset key

* rgb custom function enable

*  Extend font

* add RGBLED_POWER

default folder to helix/rev2
RGB_ENABLE to no

* renamed directory

* Disable RGBLIGHT_CUSTOM_DRIVER

* Disable LOCKING_SUPPORT_ENABLE

* Update bootloader setting

* Change readme

* Fixed argument error
2018-01-28 12:14:12 -05:00
Gabriel Rauter 86225ccc9b katana60: fix bootloader size to work with PCB
Fix the bootloader size so the `RESET` key actually resets to the
bootloader instead of just restarting the boards.
2018-01-28 12:13:21 -05:00
Mason McAllaster 13d288116f Adding personal keymap for planck/niu_mini (#2263)
* Adding mason keymap for planck/niu_mini

* Adding power shortcut
2018-01-25 01:09:37 -05:00
manofinterests a9bbf9ee5c hi there friends 2018-01-25 01:09:23 -05:00
na7thana ed659aa3a8 Hi there :) (#2273) 2018-01-25 01:04:31 -05:00
Alex Vogel b9b67e9614 [Keymap] semi-ISO Spanish HHKB Keymap for Satan Keyboards (#2290)
* ISO HHKB first commit

* First version of my HHKB ISO Spanish Keymap

* Readme.md

* Added more media keys.
Caps Lock added on function layer.
Backlight toggle added on funtion layer.

* RGB support for WS2812B RGB led strip

* RGB and brightness control.
2018-01-25 01:03:49 -05:00
Greizgh 35b44ac699 Fix compilation error when RGB light is disabled 2018-01-25 01:03:10 -05:00
TerryMathews 61d851af65 Add SSD1306 OLED display support to TKC1800 (#2293)
* Add support for SSD1306 OLED display

* Correct keymap

Had tilde on keymap instead of grave, corrected.

* Winkeyless keymap
2018-01-25 01:00:59 -05:00
allo-world 7c3d2d5f64 Added KBD66 (#2292)
* Created default layout for KBD66.

* Added KBD66 ISO layout.
2018-01-25 01:00:31 -05:00
Thomas Järvstrand d837ab586a Make new_project.sh a bit more robust 2018-01-25 00:59:35 -05:00
Danny Nguyen 9a91b42e92 Add Chocopad keyboard 2018-01-25 00:58:59 -05:00
Danny Nguyen c73514a2b7 Update pinout for Rev. 1.0 Iris without LED 2018-01-23 14:42:11 -05:00
Joe DeVivo ac642de9d7 Iris send backlight info over i2c 2018-01-23 14:29:13 -05:00
U-LANDSRAAD\drashna 7d8a20b07f Disable MIDI on Planck so all revisions compile without compilition size errors 2018-01-21 12:02:03 -05:00
Fred Sundvik 894fa0902f Enable FPU on Clueboard60 2018-01-21 01:10:16 -08:00
Fred Sundvik a14d539ad6 Revert back to normal sleeping wait behaviour for STM32 2018-01-21 01:10:16 -08:00
Fred Sundvik 510a8d3339 Fix compiler settings for MCUs with floating point 2018-01-21 01:10:16 -08:00
skullY 2018df1a61 Clarify the format for layout names 2018-01-19 11:58:19 -08:00
Kenneth Aloysius 365b863578 Backlighting for JJ40 and underglow initialisation code (#2260)
* Cleanup Mechmini keymap. Once the custom RGB function is defined, there is no need to manually handle RGB code.

* Change default to KEYMAP_MIT, not KEYMAP_OFFSET

* Add custom RGB code for JJ40

* Reset Mechmini advertised power draw to 500. Will have to test actual maximum power draw later.

* RGB working on JJ40.

* Fix: saturation increase/decrease flipped

* Add new directory for my custom keymap with RGB keycodes

* Swap LAlt and LGUI

* Update JJ40 max power draw with measured value

* Update: fun40 rules.mk to enable underglow; earlier failed Travis CI

* Fix: init RGB LEDs on boot. Also added HHKB-like keymap for XD60.

* Super rudimentary backlight test, init RGB LEDs on boot

* Backlighting works - stays on for now

* Toggling working

* Now can override backlight.c functions. Problem was functions in backlight.c weren't called before due to a lack of matrix_scan_quantum() in matrix.c

* Timers not working

* Delete global.h

* Cleanup

* Compiles

* Good sign: LEDs stop working again

* Handle timer1 overflow

* Progress: fix: forgot to init

* Backlighting fully working now except breathing.

* Revert keymap to original keycodes

* Update XD60 keymap README

* Update JJ40 keymap with backlight toggles

* Breathing working just fine.

* Update references

* Add backlight_set() call

* Cleanup code to disable backlight

* Fix: does not compile

* Fix: missing call to rgblight_task.

* Testing with BACKLIGHT_BREATHING

* Cleanup

* Cleanup comments

* More commenting cleanup.

* Do not enable BACKLIGHT_BREATHING by default
2018-01-18 16:02:32 -05:00
amanda flagg 5b22ddf526 add dz60 map with arrow keys (#2270) 2018-01-17 15:13:52 -08:00
stephengrier c776c1ce82 Adding stephengrier keymap for the tada68 keyboard. (#2269) 2018-01-17 11:44:12 -08:00
Drashna Jaelre ccaacde4d6 Update to drashna keymaps (#2281)
* Move faux clicky into userspace

* Get Audio and RGB enabled on Orthodox-rev1

* Add faux click to userspace

* Add Orthodox Rev3 check to macros

* Hack Orthodox Name for drashna keymap

* No more One Shots

* Ergodox product name hack

* Enable Audio on Orthodox by default
2018-01-17 11:28:23 -08:00
skullydazed 5836d1a06a Fix up the ARM audio support (#2136)
* Get audio working on clueboard/60

* add keys for music mode

* Change doubles to floats

* add keys for all the songs

* revert to the default startup sound

* Remove music mode until we can figure out why it crashes
2018-01-13 23:38:25 -05:00
manofinterests fd359e23e8 Update info.json 2018-01-12 20:24:48 -08:00
Jack Humbert 4aef0318aa Update info.json 2018-01-12 20:47:39 -05:00
Marco Scannadinari 8209304904 Reset color after submodule warning message
Fixes leaking bold text
2018-01-12 13:25:05 -05:00
noisebomb44 6bbe2366ec Update ergodone.c 2018-01-12 13:24:30 -05:00
Kaleb Elwert 3be81a2daf Fix call to memset for various keyboards 2018-01-12 13:23:38 -05:00
chancellorr 586a5e8d1d Adding my Tada68 Keymap. 2018-01-12 13:20:53 -05:00
Daniel Gordon 383a3c1e08 Add Daniel Gordon's Ergodox Infinity and Chimera
* gordon.c defines many aliases for KC codes.
   * gordon.c defines many advanced tap dance functions.
   * This is a squashed commit of about 6 months of work on chimera and
     ergodox infinity changes.
   * Ignore the change-id below.

Change-Id: I83927139e8a80fe08992ae91ec7d62571498f7f7
2018-01-12 13:14:19 -05:00
Mikkel Jeppesen e2352d4fbf Updated files to better support sockets version (#2255) 2018-01-12 12:57:48 -05:00
Mason McAllaster 3a2acd4475 Updating default niu mini keymap to better reflect product 2018-01-12 12:57:17 -05:00
Kyle Sargent ee15d2fe5e Layout for BananaSplit60 (#2257)
* Kamon bananasplit layout

* readme
2018-01-12 12:56:50 -05:00
pmalecka a01dc4dd48 added the possibility to hav shifted(modded) tap dance 2018-01-12 12:56:21 -05:00
fauxpark 4764e77121 Clarify that we actually have max 16 total backlight levels 2018-01-12 12:52:35 -05:00
fauxpark cfcf0fd36b Remove reference to BL_x in keycodes.md, and add BL_BRTG 2018-01-12 12:52:35 -05:00
Oryhara dcb2627237 Halfkeyboard functionality for dvorak and qwerty (#2261)
* started work on halfkeyboard

* update to keymap

* halfkey layouts complete for dvorak and qwerty
2018-01-12 12:35:33 -05:00
Danny Nguyen fe8942e55c Add -e to enable interpretation of escape characters 2018-01-12 12:35:03 -05:00
farmakon 8e0d9e2637 Adding XMMX (#2236)
* gh80_3000

* Add files via upload
2018-01-07 11:23:45 -05:00
Jack Humbert 81ae0fb10e Update info.json 2018-01-05 16:28:46 -05:00
Jack Humbert e659bc4467 Info json fixes (#2232)
* Update info.json

* Update info.json

* Update info.json

* Update info.json
2018-01-05 15:44:59 -05:00
Jack Humbert e3541853a9 Update info.json 2018-01-05 15:33:15 -05:00
Jack Humbert 0ea6cf719e Update info.json 2018-01-05 15:32:52 -05:00
Hannes Egler c9d23f50f6 Added RGB and in-switch LED controls (#2227)
* Default layout with RGB and in-switch LED controls

This is a variation of the default keymap with added RGB underglow and in-switch LED controls.

* Readme for default_rgb keymap

* ISO keymap with RGB and in-switch LED controls

This is a variation of the default ISO keymap with added RGB Underglow and in-switch LED controls.

* readme for iso_rgb keymap
2018-01-05 11:50:28 -05:00
rooski15 c5c35f5f4b Rooski15: Update Prime_R ReadMe & Keymap (#2228)
* Rooski15: Updated prime_r Keymaps

* Rooski15: Updated Prime_R:Rooski

* Rooski15: Updated Prime_R readme

* Rooski15: Updated Prime_R readme

* Rooski15: Updated Prime_R readme
2018-01-05 11:37:53 -05:00
TurboMech 6b584a23c0 Updated ACR60, Mechmini, ALU84 readme information and config.h descripters (#2231)
* Updated ACR60, Mechmini, ALU84 readme information and config.h descripters

Update MECHKEYS keyboards to be uniform in readmes and config.h's PID, MANUFACTORER, and DESCRIPTIONS.   This allows the keyboards to be more uniform amongst the different types.

* Rename keyboards/alu84/keymaps/TurboMech/config.h to keyboards/alu84/keymaps/turbomech

* Rename keyboards/alu84/keymaps/turbomech to keyboards/alu84/keymaps/TurboMech/config.h

* Fixed folder naming for alu84/keymaps/turbomech

* fixed error from compile

removed double `return MACRO_NONE;` and `switch (id) {`
2018-01-05 11:37:22 -05:00
rooski15 6bb3fbd4e0 Prime_R (#2221)
* Rooski15: Add Prime_R Keyboard

* Rooski15: Added keymaps to xd60, xd75, planck, and prime_r

* Rooski15: Updated prime_r keymap

* Rooski15: Added Prime_R and Documentation

* Rooski15: Added Prime_R and Documentation

* Rooski15: Prime_R - Added futher documentation.

* Update config.h

Added device information

* Update readme.md

Updated Planck:EmilyH Readme

* Update readme.md

Updated XD75:EmilyH Readme
2018-01-04 13:32:51 -05:00
profanum429 9e0b244a34 profanum429@gmail.com (#2222)
* Added initial in-switch LED support for the Eagle/Viper V2.
Currently only has four modes: All ON, Mods/Nums ON, Alphas ON, or All OFF

* Revert keymap changes

* Changed switch curly bracket to match style.
2018-01-04 01:20:58 -05:00
Daniel Gordon 4b7fcf0af0 Add info.json file for Chimera Ortho (#2217)
* Add info.json file for Chimera Ortho

* Correct LAYOUT to KEYMAP 

Correct LAYOUT to KEYMAP in chimera ortho's json.info
2018-01-04 01:20:18 -05:00
MechMerlin 22b9303e2a Keeb json layouts (#2219)
* info.json committed to support the qmk configurator project

These are info.json for each of the keyboards I've contributed to
during my time here at QMK

* change LAYOUT to KEYMAP to adhere to matrix definitions
2018-01-04 01:19:59 -05:00
skullY e956c11bc9 Update the urls for atmel tools 2018-01-03 10:00:40 -08:00
MechMerlin cbc5de67be Duck Eagle/Viper V2 support (#2216)
* Preliminary support for Duck Eagle/Viper V2 60% board. This is a copy of the octagon/v2 with things changed to reach a compiling state

* Get a 60% keymap compiling, this might not be what the eagle/viper
really supports

* Update readme to point to correct GeekHack link

* Get keymap working on a Duck Eagle

* Add code submitted by profanum429

- Add HHKB style top row to v2.h
- Modify read_rows function to take into accout the caps lock firmware key
- Modify default keymap to match the new v2.h
- Adjust readmes

* Fix bug related to col 0 not working

* Add keymap for mechmerlin

* Add profanum429's viper hhkb layout

* Add visual representation for mechmerlin layout
Add navigation keys to keymap

* Add a better visual representation to the mechmerlin keymap

* Add profanum429's Viper layout!

* Updated profanum429 keymap to match a full HHKB
Enabled media keys in rules.mk

* Revert "Updated profanum429 keymap to match a full HHKB"

This reverts commit ed914160d7e27e6412d2c7c5c1c4fa0a04838667.

* Fix default keymap for Eagle

* Enable extra keys for audio control support

* Modified timings in indicator_leds to accomodate the WS2811S chips on the Eagle/Viper2 PCBs at 800kHz with a 16mHz clock
Modified the backlight settings to not interfere with the default RGB underglow code from QMK
Modified the order of the LEDs in the LED status bar at the top of the Eagle/Viper2 PCBs (3,2,1,6,5,4,8,7 order)

* Cleaned up indicator code to remove unused functions as the RGB underglow uses the
default driver provided by QMK

Commented out backlighting code in v2.c

* update readmes to reflect profanum's awesome contributions and fix typo in make instructions

* Remove custom RGB logic and just rely on QMK RGB underglow. We'll leave the backlighting in place for now
2018-01-03 12:17:09 -05:00
TurboMech 9cb1d36974 Added Mechmini 2.0 to Mechmini keyboard folder
This creates a v1 and v2 subproject.  V1 retains all the same implementations of the bootmapper-ported Mechmnini 1 including #2196.  V2 adds the Mechmini 2.0 kayboard support (I know it took me way to long to get it a pull request in).

All readme's updated to reflect compiling the two seperate keyboards.  Simply either `make mechmini/v1:default` or `make mechmini/v2:defualt`.  Utilizing the rules.mk using `make mechmini:default` will automatically create the Mechmini 2 default keymap as this is the current version and has a much wider user base.
2018-01-03 10:32:53 -05:00
Rickard von Essen 0a5d302622 Let's Split: Minor fixes in keymap.c comments
- Single quote (') is the un-shifted key, not double quote (")
- Fixed alignment
2018-01-02 22:19:10 -05:00
YouCanFly 6c24e28b8d ADD RGBLIGHT_LIMIT_VAL (#2214) 2018-01-02 21:54:56 -05:00
Jack Humbert d19805f9de update avr url 2018-01-02 21:35:42 -05:00
Rickard von Essen 4beb5e72f8 macOS also requires avrdude 2018-01-02 14:07:10 -05:00
Stacy Devino 5f0a2e078f JC65 - Adding in CapsLock LED support and my personal keymap
Signed-off-by: Stacy Devino <stacydevino@gmail.com>
2018-01-01 20:37:48 -05:00
benlyall feac994f6f Added support for V60 Type R Polestar backlight and RGB underglow (#1852)
* Added V60 Type R Polestar Backlight and RGB Underglow support

* made RGB Underglow stuff optional, to support the non Polestar V60

* updated readme and rules

* fixed typo in readme
2018-01-01 17:49:26 -05:00
Balz Guenat 4931510ad3 backlight breathing overhaul (#2187)
* add breathing to bananasplit

* backlight breathing overhaul

* fix the backlight_tick thing.

* fix for vision_division backlight

* fix a few keymaps and probably break breathing for some weirdly set-up boards.

* remove BL_x keycodes because they made unreasonable assumptions

* some fixes for BL keycodes

* integer cie lightness scaling

* use cie lightness for non-breathing backlight and make breathing able to reach true max brightness
2018-01-01 17:47:51 -05:00
John Ramsay d6215ad6af Aviator Keymap (#2204)
* Create aviator.txt

* Add files via upload

* Delete aviator.txt

* Delete readme.md

* Add files via upload

* Update readme.md

* Update readme.md

* Delete keyboard-layout.png

* Update readme.md

* Update readme.md

* Update readme.md
2018-01-01 17:35:32 -05:00
Kenneth Aloysius eba4cb7a04 RGB underglow support for JJ40, clean up redundant code in Mechmini keymap (#2196)
* Cleanup Mechmini keymap. Once the custom RGB function is defined, there is no need to manually handle RGB code.

* Change default to KEYMAP_MIT, not KEYMAP_OFFSET

* Add custom RGB code for JJ40

* Reset Mechmini advertised power draw to 500. Will have to test actual maximum power draw later.

* RGB working on JJ40.

* Fix: saturation increase/decrease flipped

* Add new directory for my custom keymap with RGB keycodes

* Swap LAlt and LGUI

* Update JJ40 max power draw with measured value

* Update: fun40 rules.mk to enable underglow; earlier failed Travis CI
2018-01-01 17:34:46 -05:00
James Neill 85ea963931 Remove residual Makefiles from the keyboards directory (#2193)
* Removed residual Makefiles from keyboards directory

* Removed reference to Makefile
2018-01-01 17:32:39 -05:00
wanleg 492a16308a wanleg's gherkin layout
my layout for the Gherkin
2018-01-01 17:22:50 -05:00
Drashna Jaelre 17200f4712 Clean up and tweaks of drashna keymaps and userspace (#2200)
* Minor tweaks

	modified:   users/drashna/drashna.c

* Fix Workman ASCII art

* Add OSM for shifts

* Make Viterbi's 00 code consistant

* Minor Cleanup off Userspace

* Change Tapping Term on Ergodox

* Re-add EEPROM code

* Minor updates and tweaks

* Use QMK_H variables to make keymaps more universal

* Forgot 'break;' for covecube layer

* Tweak Viterbi files now that I have hands on

* Add secrets to Ergodox

* RGB tweaks to Viterbi

* Viterbi RGB layout tweeks

* Minor tweaks

* Add One Shot Mod tap toggle

* Add Faux Clicky to Viterbi, and disable controller's LEDs

* Minor tweaks

* Move D3 keycode defines into userspace

* Updated Userspace Readme
2018-01-01 17:21:01 -05:00
Takahiro Miyamoto eb903c7623 Add meira/takmiya keymap 2018-01-01 17:17:52 -05:00
Hannes Egler c58921c64c KBD75 ISO support (#2201)
* iso_de_mac

ISO-DE layout with mac media controls

* Delete keymap.c

* iso_de_mac

ISO-DE support with Mac media keys

* Add files via upload

Layout overview

* iso layout support

Adds support for the extra key of ISO

* Update keymap.c

typo-fix

* fixed mac next key

* Delete Layout.png

* Delete keymap.c
2018-01-01 17:16:24 -05:00
Mikkel Jeppesen 9fc3e26f70 Fix of #2094 2017-12-31 22:46:31 -05:00
TurboMech e9f44ee96d added ALU84 keyboard and TurboMech user space (#2206)
* Added ALU84

Added ALU84 from mechkeys.ca.  TurboMech keymap is MacOS oriented, need to still update the defualt keymap.

* added alu84 and TurboMech userspace

* updated keymap, config.h and rules.mk for alu84
2017-12-31 22:39:34 -05:00
skullY 9cb80d68e2 Add the missing rules.mk for my layout 2017-12-22 09:49:52 -08:00
skullY 4932f9566a capslock led fix for clueboard 60 2017-12-22 09:49:14 -08:00
Colin Miller 97c6b8143c Adding a Zelda Treasure sound.
It's the sound that's made when opening a treasure chest.
2017-12-21 21:12:08 -05:00
Ryan Mitchell 3b9e4967b8 fix breaking build: remove merge conflict text 2017-12-20 22:27:09 -05:00
adiabatic 7c57104b51 Zweihander: remove app keys, etc. (#2167)
* zweihander-osx: Remove app keys, etc.

- add right command keys
- add F16 on ;' for Siri
- remove command-Q (too easy to hit)

* Zweihander: update readme
2017-12-20 19:55:17 -05:00
Oscillope 846598541b Oscillope keymap: handy programming macros (#2176)
* Added macro to type -> since that symbol requres much finger acrobatics otherwise.

* Added macros for braces
2017-12-20 19:54:43 -05:00
MechMerlin c68597d9ad Octagon V1 Support (Port) (#2184)
* Preliminary commit for Octagon V1 support

This is essentially a cp -R v2 v1 with a few things changed to
get it to compile and build.

* The Octagon V1 supports up to 84 keys as opposed to the V2 which
supports up to 86. This commit changes the keymap to match it.

* Temporary default keymap just to get things to compile

* Update readme file

* Fix switch matrix

* Fix underglow lighting option

* Fix keymap to take care of shifted columns

* Fix keymap formatting

* Remove un-needed files left over from rasmusx

* Make Octagon V1 have its own keymap directory with default keymap

* Make Octagon V2 have its own keymap directory with default keymap

* Cleanups and readme edits
2017-12-20 19:54:07 -05:00
U-LANDSRAAD\drashna 5ffec5d9b0 Disable MIDI on preonic to fix firmware compilation errors 2017-12-20 19:26:24 -05:00
Nicolas Guelpa a8eaf0b666 Adding pok3r like layout to the let's split (#2135)
* adding new layout for the planck that helps when coming from the pok3r

* Fixing the function layer

* Update readme.md

* Update keymap.c

Making some small adjustments

* Update keymap.c

switching GUI and Esc

* Update keymap.c

* adding mod tap on left and right shift

* adding mod tap on left and right shift

* poker keymap for lets split

* fixing the FN layer

* removing unused file
2017-12-20 14:41:41 -05:00
Drashna Jael're 4f484bc1c9 Add on/off/toggle keycodes for Auto Shift 2017-12-20 14:38:56 -05:00
U-LANDSRAAD\drashna a1fa70f94d Add toggle option to AutoShift 2017-12-20 14:38:56 -05:00
Hugo Gayosso d8f0faabda Fixed typo 2017-12-20 14:38:24 -05:00
Kaleb Elwert 818042b2c3 k_type: add belak keymap 2017-12-19 10:52:22 -05:00
Jason Rosenman 8910f9b87e Marked util/atmega32a_program.py as executable so that programming script works. 2017-12-19 10:51:37 -05:00
MechMerlin 9dd3e08fdd Octagon V2 Refactor (#2170)
* rename octagon_v2 directory to octagon directory

* Move octagon_v2 files to v2 sub-directory

* Edit readme files

* setup header files for building multiple versions of the Duck
Octagon.

* Changes as per Jack's PR 2170 comments
2017-12-19 10:50:58 -05:00
fauxpark b3bcafcc4b Unsign key argument in add_key_to_report 2017-12-19 09:25:26 -05:00
Arda Kılıçdağı b8f08d936d Added Ardakilic keymap for Tada68 (#2174)
* Added Ardakilic keymap

more key fixes

* power key instead of eject
2017-12-19 09:24:39 -05:00
kimkimkeren dd37245373 Custom Keymaps for Certain Layouts (#2161)
* Add keymap for my friend's KBD75\nBug : RGUI is read as RALT

* Add keymap for Nyquist

* Add Keymap for Whitefox (Truefox layout only)

* Add Keymap for XD75 and XD73 (XD75 with 1u blocker each on left and right bottom
2017-12-17 11:54:22 -05:00
kamisamamizu eab41f7b38 Added default case to process_record_user
I tried using process_record_user and if I had to add the default case for it to compile.
2017-12-17 11:52:06 -05:00
Vlad Buslov cca3dcc5ec Add my keymap for dz60 2017-12-17 11:44:42 -05:00
kamisamamizu 12e66330c5 Add COSPAD to QMK and add functions to read HSV (#2156)
* Added functions to read HSV values

I have added three functions to rgb_light.c to be able to read the hue, saturation and value from other places.
They are rgblight_get_hue(), rgblight_get_sat(), adn rgblight_get_val().

* Create keymap.c

* Add COSPAD support to QMK

I have ported the COSPAD numpad to qmk.

* Update readme.md

* Update cospad.c
2017-12-17 11:44:13 -05:00
That-Canadian d91c9858c5 Christmas tree (#2160)
* Line ending stuff again

* Added initial files for Christmas Tree PCB

* Updated Readme and info json's, also config.

* Cleaned up keymap file, added proper comments for keymap. Removed readme leftover from original copy of planck folder structure.

* Forgot to push rules.mk for the V2017 folder, fixed now.
2017-12-16 18:25:46 -05:00
U-LANDSRAAD\drashna 8a0997709b Remove MIDI from Planck Rev5 to fix compile build size issue 2017-12-16 11:00:11 -05:00
Jack Humbert 0e1a731446 Update readme.md 2017-12-15 14:06:45 -05:00
Jack Humbert 57ef8a54e4 deletes the extra mechmini readme [doh] 2017-12-15 14:06:29 -05:00
root 1add90a6d2 reforked master and added changes to 7u and 6u iso layouts 2017-12-15 14:02:18 -05:00
Budi Dharmawan e4230c84d0 [budi] tv44 arrow dvorak (#2151)
* [budi] tv44 arrow dvorak

* [tv44/budi] Removed qwerty, added readme
2017-12-15 13:24:12 -05:00
mechmerlin 1485cc1d26 Found some broken links while looking up ARM keyboard support 2017-12-15 13:23:52 -05:00
Colin T.A. Gray 4ea3bbdb4c add tests for action_layer.c and reset layer state after tests 2017-12-15 13:23:30 -05:00
Colin T.A. Gray bad839e6ac make 'layer_state_set' visible to user code 2017-12-15 13:23:30 -05:00
Colin T.A. Gray 3aec9a4354 fixes 'layer_state_cmp' when layer is '1' (aka layer 0, aka layer 1<<0) 2017-12-15 13:23:30 -05:00
MechMerlin 163ddd5d15 Duck Octagon V2 QMK Support (#2153)
* Initial commit for Octagon V2 Support

This is still basically just a copy of lightsaver support with
names changed.

* Port xauser keymap from: https://github.com/xauser/tmk_keyboard/blob/xauser/keyboard/octagon_v2/keymap_common.h

* Temporary default keymap just to get things compiling

* Modify config.h to have the right keyboard info

* Partial port of xauser matrix code for octagon v2

* Fix readme.md
1. Fix link to geekhack GB
2. Add microchips
3. Add appropriate attributions

* Fix PORTD

* Intermediate fix to get LEDs working

* Update BACKLIGHT_AREAS enum

* Port the following:
backlight_set
backlight_toggle_rgb
backlight_set_rgb

and resolve dependencies in header files

* Port backlight_update_state to led_set_kb

* Change copyright notice author to MechMerlin

* Remove Rasmus keymap

* Get a default keymap that actually does something and let's you reset.

* Convert keymap into KC_XXXX format.

* Better formatting of the default keymap to make it more readable

* Fix keymap

* Get that Fn key working!

* Some code cleanup and small refactor

* Fix keymap in octagon_v2.h
2017-12-15 00:09:31 -05:00
Josh Sankey dc7cc26dff Christmas tree (#2105)
* Line ending stuff again

* Added initial files for Christmas Tree PCB

* Updated Readme and info json's, also config.

* Cleaned up keymap file, added proper comments for keymap. Removed readme leftover from original copy of planck folder structure.
2017-12-14 15:58:40 -05:00
JWhy a6e46b99b9 Fix reset key in Iris default keymap 2017-12-14 09:31:50 -05:00
Kaleb Elwert ab197af2ea Initial K-Type support (#1963)
* Initial K-Type support

* Copy PJRC_TEENSY_3_1 to work around watchdog issues

* K-Type: Remove bootloader offset in rules.mk

* Ensure matrix and scan quantum functions are called when needed

This is porting a fix from f5422a70b6
2017-12-14 00:25:47 -05:00
Jean Olivier Simoneau 1226c69f4f Adding my xd60 layout. (#2078)
* Added xd60:Jos keymap

* Corrected Layout image for xd60:Jos layout

* Update README for xd60:Jos layout

* Created rules.mk for xd60:Jos layout

* Fixed an edge case for xd60:Jos layout

* Now using a specific  for xd60:Jos layout instead of modifying the main one

* Better physical layout image for xd60:Jos layout
2017-12-14 00:21:48 -05:00
Zach Richard 8a1e656099 new planck keymap, new feature - hybrid shift/enter action key (great for small keyboards!) (#2100)
* new planck keymap, new feature - hybrid shift/enter action key (great for small keyboards!)

* corrected documentation to specify rules.mk file instead of Makefile
2017-12-14 00:20:44 -05:00
Jon Nelson 56f266173c Adding my personal keymap (#2116)
* my personal keymap

* Add files via upload

* Delete baseLayer.JPG

* Delete fnLayer.JPG

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md

* Update readme.md
2017-12-14 00:16:38 -05:00
Cole Markham 2dfdafbd5b Update '?=' references in rules.mk. Add support for ortho_4x12 layout. 2017-12-14 00:13:42 -05:00
Cole Markham 5fe0fe3756 Fix keyboard not working if I2C pullups not enabled.
Disable backlighting by default.
2017-12-14 00:13:42 -05:00
Cole Markham cc0d4b6513 Cleanup old code and comments 2017-12-14 00:13:42 -05:00
Drashna Jael're 23b1889241 Update revision default 2017-12-14 00:05:28 -05:00
Drashna Jael're 6cd001e337 Fixed orthodox KEYMAP so no londer requires blanks in keymap.c, and added orthodox rev3 2017-12-14 00:05:28 -05:00
Koen Klinkers e4f26a9fcc Personal layout planck,ergodone,xd75 (#2140)
* plank layout

* ergodone

* x75

* readmes
2017-12-14 00:04:42 -05:00
mkende 9cda36238f Add a keymap for the Ergodox EZ meant to be used with a Bépo keyboard layout (French ergonomic layout) (#2141)
* Initial version of the Ergodox EZ Bépo keymap, TypeMatrix style.

* Update the readme file and add some handling of the keyboard LEDs.

* Toggling layer requires 2 taps.

* Remove a constant as it conflicts with an earier definition.

* Fix a typo in a type name.

* Fix the arrow layer that had a bad number.

* Second main version of my bepo keymap, after the tests of the first one.

* Fix the triggering of the function layer and the handling of the LED.

* Reduce the shining of the LEDs.

* Fix the swap layer (that required a keypress on the other side of the keyboard to be deactivated).

* Duplicate some of the mouse button for easy access.

* Move some of the secondary functions out of the center keys.

* Slightly slow down the mouse and mouse wheel.

* Update the comment and readme.md for the V2 of the keymap.

* Invert button 2 and 3 of the mouse. Really fix the SWAP layer.

* Test with the right alt modifier added as secondary function (on hold) of the space keys. The right alt key becomes a left alt one.

* Add specific shift/ctrl for the FN layer; move some mouse keys around to help with that.

* Remove one FN modifier-on-hold key that was not useful.

* Duplicate the FN layer inside the MOUSE layer.

* Add support (not tested yet) for macro recording and play on a single key as a tap dance.

* Allow to stop recording the macro by tapping once on the macro key (still un-tested).

* Add support for macro recording using some tap dance.

* shorten a comment.

* Reinstate the FN toggle on the percent key (so that there is an FN toggle on the right-hand-side).

* Fix some comments and update the link to the most up-to-date image.

* Small fix to the keymap images.
2017-12-14 00:04:21 -05:00
kristmascane 52630f6611 adds @kristmascane's keymap (#2144) 2017-12-14 00:03:58 -05:00
Drashna Jaelre 2ec1ab2b35 Update Drashna keymaps (#2145)
* Change overwatch to Gamepad

* Remove secrets file

* Add sample sensitive.h file

* Borrow @colinta's secrets.h include method

* Remove unnessary placeholder for macros

* Set secrets to use PROGMEM for char string

* Add readme files to my keymaps and userspace
2017-12-14 00:02:48 -05:00
Nico Hormazábal 557745ba9f Updated keymap and readme (#2147)
* added own keymap for planck

* Update Readme.md

* Update Readme.md

* Update Readme.md

* Update Readme.md

* Update Readme.md

* dynamic macros

* Update Readme.md

* moved the reset button

* Update readme for volume explanation

* Format

* Update Readme.md

* Update Readme.md

* added safe double shift

* changed the modified shift to regular shift, for allowing shift + F keys
2017-12-14 00:02:05 -05:00
bunnybugslpat f229d22416 added iso support
added a keymap for an iso layout with 7u spacebar
2017-12-14 00:01:14 -05:00
Benny Powers 98ac32b417 Vim Layout for Ergodox-EZ (mac only) (#2112)
* ignore libs

* Clang complete file

* Add VIM_A, VIM_S, VIM_COMMAND_SHIFT_D, and VIM_COMMAND_SHIFT_A

Add VIM_A, VIM_S, VIM_COMMAND_SHIFT_D, and VIM_COMMAND_SHIFT_A

a s O

* Comment blocks for minimap

generated at
http://patorjk.com/software/taag/#p=display&h=0&v=0&c=c&f=Banner&t=COMMENT

* Be explicit

* More Comment blocks

* Add J

* add A, C, D, J, S, O

* Make h j k l explicitly vim commands (useful for JOIN)

* add cb ce cw ch cj ck cl db de dw dh dj dk dl vb ve vh vj vk vl x ciw diw viw

* debug messages for ci di vi

* Var capitalized

* Save bytes by disabling mouse keys

* Add Y P

* Be more explicit about which key was pressed

* Be more explicit about which key was sent

* Move project to new directory structure

* Remove non-vim layout folder

* Replace KC_TRNS with KC_NO on normal layer

* Insert Mode as default

* Try to prevent crashes

* Put normal mode back

* Revert "ignore libs"

This reverts commit 4c5d7592d6c1b70e689c0b9400afca19c71970a7.

* add rules.mk

* Add mouse bindings

* Checkout most recent keymap following rebase

* Realign mouse button keys

* Make a macro for TO(NORMAL_MODE)
2017-12-11 21:06:05 -05:00
Balz Guenat eeb6443767 actuation point adjustment for fc980c and fc660c (#2134)
* add i2c lib submodule

* add actuation point adjustment to fc980c

* add actuation point adjustment to fc660c also.

* use https for i2c submodule

* move to existing i2c lib

* properly remove old submodule

* oops, forgot some files for the fc660c
2017-12-11 21:05:12 -05:00
That-Canadian c1a6ca46a7 The ruler (#2138)
* Line ending stuff again

* Added initital files and layout for the PCB Ruler keyboard/macro pad thing

* Updated Readme

* Changed make command to new format
2017-12-11 20:57:40 -05:00
Rasmus Schults 7c5428b56d Add rasmus keymap and fix default keymap readme 2017-12-10 15:17:00 -05:00
farmakon d9983082c2 adds the gh80_3000 project (#2132) 2017-12-10 14:44:04 -05:00
Rasmus Schults 41d5d3e655 Add Lightsaver V3 keyboard 2017-12-10 13:28:37 -05:00
Jack Humbert e6b91549e3 fixes audio/midi combinations 2017-12-10 11:54:36 -05:00
Jack Humbert 58898f77e3 fixes midi compile error 2017-12-10 11:32:36 -05:00
Jack Humbert c2f4c4e29e update planck settings 2017-12-10 10:59:47 -05:00
Jack Humbert a7c61f2947 fix up midi stuff w/music mode 2017-12-10 10:59:47 -05:00
Seebs d1feb8744a Don't "unselect" left-hand rows
"unselecting" left-hand rows is a wasted i2c transaction.

On the left-hand side, the ergodox uses a GPIO expander. It
does *not* change "direction" (input/output) of pins, it just
sets pins high or low.

But all the pins are written at once. There's no way to
change just one pin's value; you send a full byte of all eight
row pins. (Not all of them are in use, but that doesn't matter.)
So every pin is either +V or ground. This is in contrast
with the right-hand side, which is using input mode to make pins
be neutral.

So there's no need to "deselect" the rows on the left side
at all. To select row 0, you set the GPIO register for the
rows to 0xFE. The previous code would then set it back to
0xFF, then set it to 0xFD on the next cycle. But we can just
omit the intervening step, and set it to 0xFD next cycle,
and get the same results.

And yes, I tested that the keyboard still works.

On my system, scan rate as reported by DEBUG_SCAN_RATE goes
from 445 or so to 579 or so, thus, from ~2.24ms to ~1.73ms.

Signed-off-by: seebs <seebs@seebs.net>
2017-12-10 00:40:41 -05:00
Balz Guenat 6d1b45fb84 change the ?= assignments to = 2017-12-10 00:40:19 -05:00
Balz Guenat 2c2e103457 some planck keymap shiftings and include proper-making 2017-12-10 00:40:19 -05:00
Balz Guenat 7235c93827 clean up bananasplit keymap 2017-12-10 00:40:19 -05:00
fauxpark bb53635f33 Trim trailing whitespace 2017-12-09 10:46:11 -05:00
fauxpark af37bb2f78 Fix some of the more obvious typos 2017-12-09 10:46:11 -05:00
fauxpark 4c675a83ba Format keycode tables 2017-12-09 10:46:11 -05:00
fauxpark 7b0356d1d4 Convert all headings to Title Case 2017-12-09 10:46:11 -05:00
Nico Hormazábal 6eb89ae906 New Planck Layout (#2123)
* added own keymap for planck

* Update Readme.md

* Update Readme.md

* Update Readme.md

* Update Readme.md

* Update Readme.md
2017-12-09 00:06:27 -05:00
Fredric Silberberg b781cbf7e2 Turn on prevent stuck modifiers for my keymaps. 2017-12-09 00:06:08 -05:00
Cole Markham a14518bf57 Updated copyright headers and peer review fixes 2017-12-09 00:05:35 -05:00
Cole Markham f74f0ac06b Update Meira readme 2017-12-09 00:05:35 -05:00
Cole Markham a9a46adba0 Add support for Meira 2017-12-09 00:05:35 -05:00
Scott Wilson c51dfef958 Add support for LFKeyboard products: LFK78, LFK87 and SMK65 2017-12-09 00:01:58 -05:00
Balz Guenat 8b1862330a fix link for grave escape in docs 2017-12-08 16:12:46 -05:00
Martin Gondermann dc6b341cf9 Updated readme 2017-12-08 16:12:31 -05:00
Martin Gondermann 155660ff9d Updated color for base layer to better match my key caps (Dasher) 2017-12-08 16:12:31 -05:00
Gaëtan Ark 6e25220eed Pointing to the right build URL
The previous URI used to point to the Nyquist keyboard build guide.
2017-12-08 16:12:05 -05:00
Colin T.A. Gray 16546ee06f Add 'rgblight_disable' and 'rgblight_setrgb_at/rgblight_sethsv_at'
Refactors rgblight_toggle to use rgblight_enable or rgblight_disable
Use 'rgblight_setrgb_at/rgblight_sethsv_at' to control an individual LED
2017-12-08 16:10:42 -05:00
Colin T.A. Gray 1620d78e73 helper to compare current layer_state to user layer
Performs the same bit comparison that the layer_move
functions perform
2017-12-08 16:09:47 -05:00
Cosmin Cojocar fc54d62111 Add a slightly modified ordinary layout for OSX 2017-12-08 16:08:50 -05:00
andy f5422a70b6 Enable tap dance and other features for Whitefox
The custom matrix code was missing calls to matrix_*_quantum, disabling quantum features.
2017-12-08 16:06:24 -05:00
Unknown e3b3c1ef82 add do60 support 2017-12-08 16:03:57 -05:00
Jack Humbert bba871df2f move lcd_backlight_keyframes to correct location 2017-12-07 12:41:13 -05:00
Biacco42 5bbad3147c Add support for 7x4 ortholinear split KB Ergo42 2017-12-07 11:10:39 -05:00
Colin T.A. Gray 2bac7cf414 F5 pin doesn't support PWM, so breathing isn't an option 2017-12-07 11:07:45 -05:00
Colin T.A. Gray b7c76fda31 fixes case where BACKLIGHT_BREATHING is enabled, but pin doesn't support PWM 2017-12-07 11:07:45 -05:00
Drashna Jaelre d5a76e899d Updates to drashna keymaps and userspace (#2093)
* Add "secret" macor

* Updating secret macros

* Re-add RGB to Ergodox

* Fixed issue when RGB was disabled

* Consistency changes

* Updated bootloader macro

* Fixing audio setup

* Fix bootloader typo

* Update to full list of stings (for completeness)

* Template fix

* Finally got woodpad to force numlock

* Fix for new RGB mode
2017-12-05 21:45:42 -05:00
Baris Tosun dd05bf0d96 Katana60 (#2068)
* Add files via upload

* katana60 defaults, initial pull-request

* removed icons from google drive

* added simple readme files

* pull-request updates

* readme file updated

* readme file formatting

* improvements before live

* colemak readme

* updated readme files

* removed makefiles and updated readme
2017-12-05 11:14:10 -05:00
Drashna Jael're 95e68c4ae8 Fix Audio chime overrides in split keyboards 2017-12-04 18:16:26 -05:00
Colin T.A. Gray d299d0e72d adds led control functions to XD75 layout 2017-12-04 18:16:07 -05:00
Cole Markham 6fddb31c4c Add Crawlpad 2017 files. 2017-12-04 18:14:08 -05:00
Colin T.A. Gray 53b043d4ef adds 'RGB_RMOD' to go through RGB modes in reverse 2017-12-04 11:12:52 -08:00
Drashna Jaelre 7b51f050d7 Fix typo in make example
It has `:all" when it clearly is referencing the command without `:all`.
2017-12-04 11:17:53 -05:00
Harshit Goel 7730dc3e5c Magicforce68 now in bluetooth flavour (#2051)
* Added working code for mf68_ble

* update read.md

* update read.md

* update read.md

* update readme

* Update README.md

* Update README.md

* added reddit post

* Update README.md

* Update README.md
2017-12-03 00:04:22 -05:00
mmikeww 0740e84d63 update advanced_keycodes; oneshot = sticky/dead keys 2017-12-03 00:03:04 -05:00
mmikeww c917888262 update glossary; oneshot key = sticky/dead key 2017-12-03 00:03:04 -05:00
skullY 0b54e7f5ae Flesh out the grave escape overrides 2017-12-03 00:00:23 -05:00
Drashna Jaelre 8cac6088c6 Remove unnecessary audio code from orthodox (#2076)
* Remove unnecessary startup/shutdown code

* Leave functions intact

* Update rev1.c
2017-12-02 23:59:17 -05:00
khitsule 1548f4c24f Add keymap for atreus and minidox (#2079)
* keymap for atreus and minidox

* minidox keymap khitsule cleaned
2017-12-02 23:56:30 -05:00
mmikeww b9f426ae1e Fix broken link in docs
This link was broken. And the latest, live version of that keymap link doesn't line up with the docs below, so the link will now point to the older version of the file in the git history
2017-12-02 23:55:58 -05:00
Ethan Madden 52b0ad649c Modified default keymap to match ps2avrgb default 2017-12-02 23:55:09 -05:00
Tim Dierks c9d0f210bc Change awk detector to work with mawk; fixes #2073 2017-11-30 22:15:20 -05:00
Devin J. Pohly 7aaef16266 Fix internal links in docs/ (#2080)
One link in the summary (Modding your keyboard) referred to a page that
was deleted; the rest have been updated to point to the new names.
2017-11-30 10:18:01 -08:00
Drashna Jael're 28874a9f33 Fixed minor typo in bootloader code 2017-11-29 13:01:06 -05:00
Drashna Jael're 319ff649ab 16 byte optimization of macro ;) 2017-11-28 22:59:41 -05:00
Drashna Jael're 92f6d6ec02 Update Userspace info to include Bootloader detection 2017-11-27 23:36:55 -05:00
Jack Humbert 9fdc276260 Updates bootloader settings, adds file size check (#2029)
* pull fuse settings for bootloader jump

* fix 32a chips

* make automatic bootloader selection optional

* quantify bootloaders

* fixs #164, speeds up dfu reset

* fix for chips w/o usb

* missing an n

* fix bootloader sizes, use words for addresses

* fix bmini, pearl, and [[ issue, make things quiet

* ignore avr errors on arm for now

* update settings for the light

* document bootloader stuff

* add bootloader title
2017-11-27 23:08:21 -05:00
RandTrawick 9113f3387a JJ40 updates (#2056)
* my bits

* fixed
safdb

* readme

* readme

* better name, fixed compile error

* fixed matrix user

* cleanup
2017-11-27 16:08:53 -05:00
Erez Zukerman 0bd453b527 Merge pull request #2047 from seebs/seebs/ergodox_brightness
Make brightness easier to change
2017-11-27 08:25:24 -05:00
Erin Call b697e1bff3 Fix build instructions in the Dactyl readme
Reflects the changes in #1784
2017-11-26 17:56:16 -05:00
Roman Volosatovs 833ec84921 shell.nix: add teensy loader 2017-11-26 17:55:24 -05:00
TerryMathews 53ad7375c7 Initial support for TKC1800 PCB (#2062)
* Initial support for TKC1800

* Correct typo
2017-11-26 17:54:53 -05:00
Eiji Onchi 5fd400faa9 Fixed bootloader access key 2017-11-26 02:22:23 -05:00
Erin Call f2a0b0ee20 Handwired/Dactyl keyboard (#2058)
* Copy the ergodox_ez code to handwired/dactyl

Differences from the Ergodox:

* Use QMK_SUBPROJECT_H instead of QMK_KEYBOARD_H, since it's under
    handwired
* Omitted several keymaps. They'll eventually be broken (since the
    Dactyl has fewer keys), and I don't want to try to fix them.
* Omitted the keymap images for the default layout, since they depict
    a different keyboard.
* Everything that said Ergodox now says Dactyl, naturally.

* [whitespace] Delete trailing whitespace

My editor does this automatically so it's just gonna keep cropping up...

* Cut the dactyl down to the right number of columns

(Remember, throughout matrix.c, everything called "row" is really a
column, and vice-versa).

* Remove LED-related code

* Tighten up the Dactyl's build options

* Whitespace cleanup in twimaster.c

* Hardtabs -> spaces
* No more trailing whitespace

* Typo fix

* Correct the CPU frequency units

The Teensy's CPU definitely doesn't run at 16 petahertz...

* Restore access to ONEHAND_ENABLE

I turned it off in 26d47cb42622d990a7c3335e7fcc151aa3edfbf0 while
desperately debugging; I just wanted to ensure it wasn't causing the
problem I was seeing. It was not, in fact, causing the problem, so it's
back.

Also fixed the swap matrix in dactyl.c, since it still referred to
columns that exist in the Ergodox but not the Dactyl.

* Clearer phrasing about TWI's effect on scan rate

* Fix up the Dactyl's firmware-loading instructions

Sadly, the Dactyl has no hole for the onboard reset button.

* Dvorak keymap for the Dactyl

* The Erincalling Layout

* Erincalling layout: Add a := key

I've been working in Go, which uses := a lot, and it's awkward to type
in this layout.

* Dactyl README: link to the dactyl-keyboard repo

* Add a missing copyright line

I don't know how much this matters? Honestly, it's enough for me that my
name is on the git commit. But hey, let's be consistent until there's a
specific reason not to be, right?

* Dactyl: remove commented-out code

I hate it I hate it I hate it

There's not even any information about what it was trying to do!!!! >:(

* Add a note about the row/column ridiculousness

* [whitespace] realign some constants

* Don't claim B4 is tied to VCC

It doesn't matter at all? I honestly don't know what the reason ever
was. It looks like it dates back to the original ErgoDox and I've never
seen one sentence about the purpose.

I've been skipping that wire for some time, and I promise it works fine.

* Dactyl keymaps: Send RALT for right-hand alt key

Not terribly important but I just like things tidy OK

* typo fix

* Refer to "dactyl.h" explicitly

QMK_SUBPROJECT_H has been working locally, but fails in CI. Strange!

* Dactyl: Don't use QMK_SUBPROJECT_H at all

It's still breaking in CI, even though it was a never a problem locally.
2017-11-26 02:18:59 -05:00
Balz Guenat 18525aa17b Fc660c port (#2060)
* Port Hasu's FC660C controller to QMK

* fix column mask
2017-11-26 02:17:14 -05:00
Add Chan ac3d9ab761 added addcninblue's layout (#2049)
* added addcninblue's layout

* vim layer
2017-11-26 02:12:26 -05:00
Callum Oakley 2fc727c154 Keymap update (#2045)
* linux shake-around

* move terminal and browser spawning keys

* add a shift to window resizing keys to free combo up for window management

* "jump to tab" shortcuts for firefox

* change window resize modifiers

* change wm keys

* change wm keys again, and reformat keymap to 80chars

* typos

* language key

* qwerty layer for SO, general cleanup
2017-11-26 02:09:28 -05:00
shela d76cc09ed6 Update my keymap (#2042)
* fix bug

* update keymap
2017-11-26 02:09:02 -05:00
Colin T.A. Gray 2c0323bc98 Adds my XD75 layout (#2040)
* adds my xd75 layout

* add secret strings to 'secrets.h' behind compile flag, assign defaults

* macro keys now have defaults (hidden in colinta.h) before any recording, and after clearing the dynamic macros.

* fixed whitespace - using 4 spaces instead of 2
2017-11-26 02:08:28 -05:00
Seebs 7fbe6c3594 improve ergodox ez performance
With these changes, the ergodox ez goes from 315 scans per second
when no keys are pressed (~3.17ms/scan) to 447 (~2.24ms/scan).

The changes to the pin read are just condensing the logic, and
replacing a lot of conditional operations with a single bitwise
inversion.

The change to row scanning is more significant, and merits
explanation. In general, you can only scan one row of a keyboard
at a time, because if you scan two rows, you no longer know
which row is pulling a given column down. But in the Ergodox
design, this isn't the case; the left hand is controlled by an
I2C-based GPIO expander, and the columns and rows are *completely
separate* electrically from the columns and rows on the right-hand
side.

So simply reading rows in parallel offers two significant
improvements. One is that we no longer need the 30us delay after
each right-hand row, because we're spending more than 30us
communicating with the left hand over i2c. Another is that we're
no longer wastefully sending i2c messages to the left hand
to unselect rows when no rows had actually been selected in the
first place. These delays were, between them, coming out to
nearly 30% of the time spent in each scan.

Signed-off-by: seebs <seebs@seebs.net>
2017-11-26 02:07:06 -05:00
Seebs 55f3cd37af fix typo 2017-11-26 02:07:06 -05:00
Paul Ewing d0f3c0576c Add my Atreus62 keymap 2017-11-26 02:03:44 -05:00
Balz Guenat 7d9070c514 I forgot to add a README.md for the FC980C
sorry for forgetting it in the first PR.
2017-11-23 23:41:37 -05:00
Seebs 534cd9d45e Make brightness easier to change
Don't make the #defines unconditional, make them
optional so users can override them with per-keymap
settings more easily.
2017-11-23 15:37:39 -06:00
Balz Guenat 2f5bb2506a QMK port of Hasu's fc980c alt controller (#2043)
* fc980c port, builds but yet untested.

* add my own keymap
2017-11-23 10:34:21 -05:00
Colin T.A. Gray 3e2fd64279 I found a typo! 2017-11-22 11:40:46 -05:00
Colin T.A. Gray 5b4b471a4f this number just looks wrong, should be 4096 not 4996 2017-11-22 11:40:46 -05:00
Maarten Dekkers b8217eeff4 Add maartenwut's handwire build 2017-11-22 11:19:05 -05:00
Max dcc363390f Added Daisy port (#2016)
* Add files via upload

* Update readme.md

* Update readme.md

* Update readme.md

* Add files via upload

* Delete config.h

* Delete rules.mk

* Add files via upload

* Update config.h

* revised config files

* revised readme

* Update readme.md

* Update readme.md
2017-11-22 10:52:42 -05:00
Jack Humbert 62eed0e4a3 Update config_options.md 2017-11-21 21:26:29 -05:00
Jack Humbert c8bdc75e1d Update feature_layouts.md 2017-11-21 21:22:56 -05:00
Seebs 39d3d92364 Allow multiple process_record() calls per scan
This is particularly relevant for, e.g., the ergodox EZ and
other keyboards with slow scan rates. Without changing the API or
behavior of individual process_record() calls, we allow a
configuration flag to make multiple calls in a single scan.

This will probably have miniscule effects on non-steno users,
and it's not enabled by default for any keyboards. Added note
about it to ergodox README.

Signed-off-by: seebs <seebs@seebs.net>
2017-11-21 00:20:52 -05:00
Jack Humbert b669d115c2 adds planck light keyboard 2017-11-20 23:37:38 -05:00
Gilbert Consellado 7ff96877d2 added SS_LSFT to featured macros 2017-11-20 12:25:42 -05:00
yellowmoneybank c6cdd5422f Neo2Planck (#2032)
* Documentation

* Enabled Mouse-Keys in Makefile

* Layer 1 finished

* Small Bugfixes

* Updated documentation
2017-11-20 12:22:16 -05:00
d_r0ck d6ca4e555a Added files 2017-11-20 12:21:31 -05:00
TerryMathews d8aa018995 Kona_classic: ANSI arrows keymap with locking caps lock support 2017-11-20 12:21:04 -05:00
Marcus Young 08dab374da Add my layout 2017-11-20 12:20:40 -05:00
Drashna Jaelre dbd33782f2 Update to drashna keymaps (#4)
* Minor updates to keymaps

* Minor updates to keymaps
2017-11-17 20:48:26 -05:00
Jack Humbert 1d703a476a update build script to not delete files 2017-11-17 14:09:27 -05:00
Jack Humbert f5a9758cea Adds serial number string to USB descriptors (#1996)
* add serial number string to usb descriptors

* better name for serial number
2017-11-17 11:53:46 -05:00
Robert Llewellyn f07e2cdd9d DZ60 own true HHKB layout after dz60.h fix (#2012) 2017-11-17 11:42:23 -05:00
Jack Humbert f2c32b3ea4 Splits up ps2avrGB boards into their own folders (#2014)
* move underglow led count from parent to child

* Added pearl support

* Added personal keymap for pearl

* start splitting up ps2avrGB boards

* clean up ps2avrgb boards

* Move keycodes to their own section

* Clarify `KC_PWR` vs `KC_POWER`. Fixes #1994.

*  Cleaned uppersonal userspace and keymaps (#1998)

* Cleanup of keymaps

* Remove Tap Dance from Orthodox keymap

* Cleaned up userspace and keymaps

* Added sample (template)userspace files to my folder

* Document the Teensy hardware reset problem

* add mfluid keymap to atreus62

* Update hand_wire.md

Change "Resin" to "Rosin"

* Add keyboard: mt40 (#2001)

* add keyboard: chinese planck clone

* rename chinese_planck to mt40

* add image for the mt40 board

* lets_split: Fix matrix_init for ROW2COL

Signed-off-by: Marian Rusu <rusumarian91@gmail.com>

* Add Keymap for Whitefox Truefox layout

* Add keyboard: ACR60 (#1999)

* base acr60 keyboard folder created

* mitch acr60 keymap updates, documentation

* latest keymap updates

* slight modifications to layer switching

* Changes to Atreus and Ergodox EZ Dvorak 42key layout (#1997)

* importing 42 key dvorak layout

* added comment for build instructions

* adding atreus dvorak 42 key layout

* added readme

* add readme

* build instructions

* additional MEH shortcuts

* added shifted symbols on symbols layer

* working extra symbols on COMBINED layer

* bring atreus layout inline with the ergodox one

* add necessary macros

* working ls macro

* added more shell macros

* added screen rename / screen number macros

* add ctrl-a key in shell-nav to use screen more easily

* added shell screen layer

* assign screen switching macros to screen layer

* define all screen switching macros

* more screen-related shortcuts added on shell screen layer

* change shell nav bottom right row to match base layer (backspace / delete)

* remove some mappings on SHELL_NAV layer as they are now in the screen layer

* added more screen macros

* changes to COMBINED layer (pipe on the right) and modified shell nav

* moved pipe/backslash to then right

* documented SHELL_SCREEN layer

* put backspace/delete on SHELL_NAV layer

* add an explicit lisence file for github to pickup

* Updated keymaps to allow base layer alternation for QWERTY, Colemak & Dvorak (#1962)

* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware

* Fix terminus_mini & nyquist/DivergeJM readme files

Previously an outdated copy of the default readme. Updated to match the  Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout)

* Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles

* Updated rules.mk

Inadvertantly removed important code from the rules.mk in previous commit. This has been restored.

Also disabled Tap_Dance in both rules.mk files

* Moved terminus_mini to handwired

Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired.

* New Frosty Flake layout for QFR TKL

Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality.

* README fix & keymap update for 3 keyboards

Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM.

Added TAPPING_TERM =  150 to config.h for all keyboards

Switched LT(LOWER) and LAlt on the mod row for ortholinear boards.

* Update readme for QFR_JM to include make instructions

* Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"

This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing
changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf.

* Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware""

This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93.

* Added QWERTY support to the QFR_JM

Implemented variable default base layer from the Planck default keymap.

* Update README to reflect QWERTY support

* Nyquist:DivergeJM - Update RESET location

Add a reset button to both hands, accessible when halves are disconnected.

* Typo fix

* Update DivergeJM

Switched master to Left hand,
Moved Reset key to a different location

* Added macros to send R pointer & dplyr pipe

Macros added as a string of keypresses, couldn't figure out how to get SEND_STRING to work.

* Added ADJUST -> QWERTY, DVORAK, COLEMAK

Re-implemented update_tri_layer fuctionality to reset base layer for Terminus_Mini & DivergeJM Nyquist keymaps to QWERTY, DVORAK or COLEMAK via the ADJUST layer.

Updated ReadMe files accordingly.

* Fix base layout diagram for Terminus_Mini

Remove split from diagram

* Changed the R operators to SEND_STRING, rather than keypress macros

* Added Dvorak to the QFR_JM keymap

* fixed duplicate row in Nyquist keymap

* Fix readme - LAlt location on mouse layer

* Set EE_HANDS to allow either Nyquist hand to work as master.

* Update R operator strings, clean up layering for terminus_mini, QFR_JM and DivergeJM

"<-" to " <- "
"%>%" to " %>% "

Also played around with the layering, removed unnecessary TAP_TOGGLE for LOWER and shuffled FUNCTION and MOUSE momentary actions to reflect layer order.

* Update bottom alpha row to output symbols on LOWER

This row now outputs the following (z -> /) when in the LOWER layer:
 <-
 %>%
{
[
`
|
]
}
.
/

* Updated readme files for QFR_JM, terminus_mini & DivergeJM

QFR_JM readme reflects correct LOWER bottom row symbol output,
terminus_mini & DivergeJM reflect correct command line make instructions.

* Add media keys to QFR_JM LOWER - Replicate QFR default functionality

* Fix issue with Mouse layering

Stuck on mouse layer because the wrong macro was assigned to the 'exit layer' key. Reassigned that key.

* Changed " <- " to "<- " for QFR_JM, terminus_mini & DivergeJM

* Add "KC_MAKE" to userspace example

* QMK DFU bootloader generation (#2009)

* adds :bootloader target

* update planck and preonic revisions

* remove references to .h files for planck

* update preonic keymap

* only add keyboard.h files that exist

* add production target

* hook things up with the new lufa variables

* update rules for planck/preonic

* back backlight key turn of status led when pressed

* add manufacturer/product strings to bootloader

* fix push script

* Added support for let's split kailh socket version (#2010)

* Added support for socket version of the let's split

* renamed files

* socket-version-works

* fix up lets_split keymaps

* fix up lets_split keymaps

* shrink preonic by a bit

* fix lets_split keyboards

* update travis script

* update travis script

* update version silencing
2017-11-17 11:40:34 -05:00
Jack Humbert 92d47a55d4 update chibios 2017-11-17 11:40:13 -05:00
Jack Humbert 41f3f01167 Update .gitmodules 2017-11-16 15:09:45 -05:00
Damien a8c4af5a45 Updated dbroqua layout for HHKB keyboard (#1990)
* - Fixed DK60 version in config.h

* - Updated dk60 readme with new QMK rules

* - Fixed wording in readme

* Added dbroqua layout for DZ60

I've also updated dz60.h to add "true HHKD" keymap definition (6U
spacebar).

With the default HHKB definition r_alt was not mapped and when I pressed
r_menu it was r_alt.

Regards

* Updated dbroqua layout for HHKB keyboard

Added default configuration and alternate (swap gui/alt keys).

Save user choice in keyboard memory (like plank, thanks for this
feature!).
2017-11-16 14:49:19 -05:00
Balz Guenat 858c09f370 add example keymap 2017-11-16 09:39:00 -05:00
Balz Guenat 179d64d33c extend macro docs a bit 2017-11-16 09:39:00 -05:00
Jack Humbert eac4bab342 update version silencing 2017-11-14 22:56:29 -05:00
Jack Humbert a8466df62d update travis script 2017-11-14 22:31:34 -05:00
Jack Humbert cb64a886e9 update travis script 2017-11-14 22:14:59 -05:00
Jack Humbert dbabfb082c fix lets_split keyboards 2017-11-14 22:14:03 -05:00
Jack Humbert 607876187d shrink preonic by a bit 2017-11-14 21:23:26 -05:00
Jack Humbert 7f3539aa76 fix up lets_split keymaps 2017-11-14 17:55:18 -05:00
Jack Humbert 4ad0bbd672 fix up lets_split keymaps 2017-11-14 17:37:57 -05:00
Mikkel Jeppesen 85172f4f85 Added support for let's split kailh socket version (#2010)
* Added support for socket version of the let's split

* renamed files

* socket-version-works
2017-11-14 17:27:27 -05:00
Jack Humbert b702c08825 fix push script 2017-11-14 16:47:34 -05:00
Jack Humbert ec3e065f0d QMK DFU bootloader generation (#2009)
* adds :bootloader target

* update planck and preonic revisions

* remove references to .h files for planck

* update preonic keymap

* only add keyboard.h files that exist

* add production target

* hook things up with the new lufa variables

* update rules for planck/preonic

* back backlight key turn of status led when pressed

* add manufacturer/product strings to bootloader
2017-11-14 16:11:29 -05:00
drashna 3c15c48e6a Add "KC_MAKE" to userspace example 2017-11-14 11:02:00 -05:00
James Morgan 49d8f1c5ed Updated keymaps to allow base layer alternation for QWERTY, Colemak & Dvorak (#1962)
* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware

* Fix terminus_mini & nyquist/DivergeJM readme files

Previously an outdated copy of the default readme. Updated to match the  Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout)

* Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles

* Updated rules.mk

Inadvertantly removed important code from the rules.mk in previous commit. This has been restored.

Also disabled Tap_Dance in both rules.mk files

* Moved terminus_mini to handwired

Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired.

* New Frosty Flake layout for QFR TKL

Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality.

* README fix & keymap update for 3 keyboards

Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM.

Added TAPPING_TERM =  150 to config.h for all keyboards

Switched LT(LOWER) and LAlt on the mod row for ortholinear boards.

* Update readme for QFR_JM to include make instructions

* Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"

This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing
changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf.

* Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware""

This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93.

* Added QWERTY support to the QFR_JM

Implemented variable default base layer from the Planck default keymap.

* Update README to reflect QWERTY support

* Nyquist:DivergeJM - Update RESET location

Add a reset button to both hands, accessible when halves are disconnected.

* Typo fix

* Update DivergeJM

Switched master to Left hand,
Moved Reset key to a different location

* Added macros to send R pointer & dplyr pipe

Macros added as a string of keypresses, couldn't figure out how to get SEND_STRING to work.

* Added ADJUST -> QWERTY, DVORAK, COLEMAK

Re-implemented update_tri_layer fuctionality to reset base layer for Terminus_Mini & DivergeJM Nyquist keymaps to QWERTY, DVORAK or COLEMAK via the ADJUST layer.

Updated ReadMe files accordingly.

* Fix base layout diagram for Terminus_Mini

Remove split from diagram

* Changed the R operators to SEND_STRING, rather than keypress macros

* Added Dvorak to the QFR_JM keymap

* fixed duplicate row in Nyquist keymap

* Fix readme - LAlt location on mouse layer

* Set EE_HANDS to allow either Nyquist hand to work as master.

* Update R operator strings, clean up layering for terminus_mini, QFR_JM and DivergeJM

"<-" to " <- "
"%>%" to " %>% "

Also played around with the layering, removed unnecessary TAP_TOGGLE for LOWER and shuffled FUNCTION and MOUSE momentary actions to reflect layer order.

* Update bottom alpha row to output symbols on LOWER

This row now outputs the following (z -> /) when in the LOWER layer:
 <-
 %>%
{
[
`
|
]
}
.
/

* Updated readme files for QFR_JM, terminus_mini & DivergeJM

QFR_JM readme reflects correct LOWER bottom row symbol output,
terminus_mini & DivergeJM reflect correct command line make instructions.

* Add media keys to QFR_JM LOWER - Replicate QFR default functionality

* Fix issue with Mouse layering

Stuck on mouse layer because the wrong macro was assigned to the 'exit layer' key. Reassigned that key.

* Changed " <- " to "<- " for QFR_JM, terminus_mini & DivergeJM
2017-11-13 20:55:14 -05:00
Jack Humbert 5cdf47a79e add an explicit lisence file for github to pickup 2017-11-13 20:50:54 -05:00
Marian Rusu 3f1aab0c2e lets_split: Fix matrix_init for ROW2COL
Signed-off-by: Marian Rusu <rusumarian91@gmail.com>
2017-11-13 18:52:57 -05:00
Andy Holder 43edc83998 Add Keymap for Whitefox Truefox layout 2017-11-13 18:51:54 -05:00
lucwastiaux dd60038eeb Changes to Atreus and Ergodox EZ Dvorak 42key layout (#1997)
* importing 42 key dvorak layout

* added comment for build instructions

* adding atreus dvorak 42 key layout

* added readme

* add readme

* build instructions

* additional MEH shortcuts

* added shifted symbols on symbols layer

* working extra symbols on COMBINED layer

* bring atreus layout inline with the ergodox one

* add necessary macros

* working ls macro

* added more shell macros

* added screen rename / screen number macros

* add ctrl-a key in shell-nav to use screen more easily

* added shell screen layer

* assign screen switching macros to screen layer

* define all screen switching macros

* more screen-related shortcuts added on shell screen layer

* change shell nav bottom right row to match base layer (backspace / delete)

* remove some mappings on SHELL_NAV layer as they are now in the screen layer

* added more screen macros

* changes to COMBINED layer (pipe on the right) and modified shell nav

* moved pipe/backslash to then right

* documented SHELL_SCREEN layer

* put backspace/delete on SHELL_NAV layer
2017-11-13 18:50:39 -05:00
Ryan Mitchell 716ff76f5b Add keyboard: ACR60 (#1999)
* base acr60 keyboard folder created

* mitch acr60 keymap updates, documentation

* latest keymap updates

* slight modifications to layer switching
2017-11-13 18:50:09 -05:00
Thomas Dehaeze eef94b0b40 add mfluid keymap to atreus62 2017-11-13 18:49:23 -05:00
James 309a400b3e Update hand_wire.md
Change "Resin" to "Rosin"
2017-11-13 18:48:55 -05:00
Thomas Dehaeze c2c3aa4f08 Add keyboard: mt40 (#2001)
* add keyboard: chinese planck clone

* rename chinese_planck to mt40

* add image for the mt40 board
2017-11-13 18:44:53 -05:00
Erin Call 392121b10e Document the Teensy hardware reset problem 2017-11-12 11:51:12 -05:00
drashna 0533362e82 Cleaned uppersonal userspace and keymaps (#1998)
* Cleanup of keymaps

* Remove Tap Dance from Orthodox keymap

* Cleaned up userspace and keymaps

* Added sample (template)userspace files to my folder
2017-11-10 22:58:53 -05:00
skullY 4df4fa7c26 Clarify KC_PWR vs KC_POWER. Fixes #1994. 2017-11-10 17:58:32 -05:00
skullY 66f13e4972 Move keycodes to their own section 2017-11-10 17:58:32 -05:00
Jack Humbert bb11df6b7a update some docs 2017-11-09 16:19:13 -05:00
Zach Burchill e236f1eba1 Fixed some grammar and typos on the docs (#1989)
* fixed grammar and references

* fixed typo
2017-11-09 16:18:31 -05:00
Erez Zukerman 847ade44fc Merge pull request #1988 from qmk/hf/disable_shine_leds_default
disables Shine LED layer indication for now
2017-11-09 08:31:12 -05:00
Erez Zukerman 7044dafe59 Merge pull request #1986 from ideasman42/code-friendly-qwerty
qwerty_code_friendly: Expose caps-lock & fix typo
2017-11-09 08:29:10 -05:00
Erez Zukerman fd1a0d6753 disables Shine LED layer indication for now 2017-11-09 08:12:43 -05:00
Campbell Barton c2c9d9b386 qwerty_code_friendly: Expose caps-lock & fix typo 2017-11-09 23:13:56 +11:00
Oscillope 05f15b789f More "oscillope" keymap fixes. (#1982)
* More keymap fixes. F-row on bottom layer wasn't fully setup, also switched raise/lower keys to use tap-toggle.

* Added PrScr, put Tab back on top layer.

* Fixed build breakage with default keymap (unneeded rgblight.h include)
2017-11-08 11:13:48 -05:00
Florian Beeres 7e2223f822 Improved README of yuuki and added RGB commands (#1983)
* Add yuuki keymap

Documentation is still a TODO and the keymap may not be final

* GRV on colon

* add KC_GRV to FN ESC

* more RGB modes

* Update README.md

Add image of layout and fix typo

* switch from jpg to png

For some reason the JPG had red outlines around the keys.

* remove whitespace

* add instruction to reset keyboard before flashing

* gh60 stytle layout

* moved the GH60 style layout to new folder

* add HOME and END

* Add heading

* moved ayanami to other branch
2017-11-08 11:13:06 -05:00
Balz Guenat 3b5381d689 restructure converters (#1825)
* restructure converters

each converter is its own keyboard and different hardware variants are different subprojects.

remove (seemingly) old method of loading layouts from main Makefile

* call led_set_kb() from overridden led_set()

* put converter back into one folder

* revert some structure changes to bring in line with #1784.

Also attempt to get the BLE thing more properly integrated.
Also also fix led_set() to call led_set_kb().
2017-11-08 11:11:44 -05:00
Campbell Barton aee6785476 qwerty_code_friendly: configurable left thumb
Also add mouse-wheel keys.
2017-11-07 00:11:36 -05:00
drashna 363aa8aa2e Migrated most code from keymaps to userspace (#1980)
* Add woodpad

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add woodpad

* Add forced NKRO

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow

* Updated macros and added workman keymaps

* Fixed RGB lighting for Workman layout

* Add leader keys

* Remove force NKRO

* Add Viterbi one handed layout and minor tweaks to others

* Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts

* Made "make" keystroke universal

* Clean up and updates of drashna keymaps

* Add workman layer to planck

* Update to keymaps

* Fix makefile toggle code in ez keymap
Finish adding RGB code to orthodox

* Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function

* Remove unnecessary planck layout

* Fixed Workman song

* update make command and added lit reset

* Fixed formatting to fall in line with official standards

* Minor tweaks

* Removed Leader Keys from Ergodox EZ Keymap
Added KC_RESET that resets board and sets underglow to red

* Tweak reset code

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add forced NKRO

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow

* Updated macros and added workman keymaps

* Fixed RGB lighting for Workman layout

* Add leader keys

* Remove force NKRO

* Add Viterbi one handed layout and minor tweaks to others

* Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts

* Made "make" keystroke universal

* Clean up and updates of drashna keymaps

* Add workman layer to planck

* Update to keymaps

* Fix makefile toggle code in ez keymap
Finish adding RGB code to orthodox

* Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function

* Remove unnecessary planck layout

* Fixed Workman song

* update make command and added lit reset

* Fixed formatting to fall in line with official standards

* Minor tweaks

* Removed Leader Keys from Ergodox EZ Keymap
Added KC_RESET that resets board and sets underglow to red

* Tweak reset code

* Fix rebasing issues

* remove head files

* Fix "macro" issue

* Rename ez keymaps for userspace

* Revert "Rename ez keymaps for userspace"

This reverts commit c25425911852e41711a5f0273b5741adb16e5bd4.

* Renamed Ergodox EZ layouts so that all of my personal layouts are on the same name, in prep for using userspaces

* Fix ergodox code

* Remove "drashna-ez" keymap as it's no longer needed

* Migrate majority of code to Userspace
2017-11-07 00:11:08 -05:00
Fredric Silberberg ef2961798c Small ergodox config fix and update. 2017-11-06 15:53:27 -05:00
drashna 3e861c2fd5 Update and move around drashna keymaps (#1976)
* Add woodpad

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add woodpad

* Add forced NKRO

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow

* Updated macros and added workman keymaps

* Fixed RGB lighting for Workman layout

* Add leader keys

* Remove force NKRO

* Add Viterbi one handed layout and minor tweaks to others

* Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts

* Made "make" keystroke universal

* Clean up and updates of drashna keymaps

* Add workman layer to planck

* Update to keymaps

* Fix makefile toggle code in ez keymap
Finish adding RGB code to orthodox

* Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function

* Remove unnecessary planck layout

* Fixed Workman song

* update make command and added lit reset

* Fixed formatting to fall in line with official standards

* Minor tweaks

* Removed Leader Keys from Ergodox EZ Keymap
Added KC_RESET that resets board and sets underglow to red

* Tweak reset code

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add forced NKRO

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow

* Updated macros and added workman keymaps

* Fixed RGB lighting for Workman layout

* Add leader keys

* Remove force NKRO

* Add Viterbi one handed layout and minor tweaks to others

* Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts

* Made "make" keystroke universal

* Clean up and updates of drashna keymaps

* Add workman layer to planck

* Update to keymaps

* Fix makefile toggle code in ez keymap
Finish adding RGB code to orthodox

* Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function

* Remove unnecessary planck layout

* Fixed Workman song

* update make command and added lit reset

* Fixed formatting to fall in line with official standards

* Minor tweaks

* Removed Leader Keys from Ergodox EZ Keymap
Added KC_RESET that resets board and sets underglow to red

* Tweak reset code

* Fix rebasing issues

* remove head files

* Fix "macro" issue

* Rename ez keymaps for userspace

* Revert "Rename ez keymaps for userspace"

This reverts commit c25425911852e41711a5f0273b5741adb16e5bd4.

* Renamed Ergodox EZ layouts so that all of my personal layouts are on the same name, in prep for using userspaces

* Fix ergodox code

* Remove "drashna-ez" keymap as it's no longer needed
2017-11-06 13:32:48 -05:00
Takayuki Matsubara f113f1927f make it easy to customize logo image 2017-11-06 12:10:17 -05:00
Takayuki Matsubara 27ee425892 add pgm_read_dword for Infinity ErgoDox
avoid the following error when `UNICODEMAP_ENABLE = yes`:

```
quantum/process_keycode/process_unicodemap.c:52:21: error: implicit declaration of function 'pgm_read_dword'
```
2017-11-06 12:09:54 -05:00
Fred Silberberg 89357b96d4 333fred layout update (#1971)
* Set up tap dance for layers on the lower button.

* Refactored code to share in the users directory between my two keyboard layouts.

* Small keyboard layout change.

* Updated documentation on oneshot usage in macros/tap dance.
2017-11-06 12:09:01 -05:00
J. Eric Mason 16843bc8c9 Pete's 40th XD64 Layout
Mac layout based on yuuki with some other changes, for Pete's 40th birthday keyboard
2017-11-06 12:08:01 -05:00
lucwastiaux 7854746704 Ergodox EZ and Atreus 42 key dvorak layout updates (#1964)
* importing 42 key dvorak layout

* added comment for build instructions

* adding atreus dvorak 42 key layout

* added readme

* add readme

* build instructions

* additional MEH shortcuts

* added shifted symbols on symbols layer

* working extra symbols on COMBINED layer

* bring atreus layout inline with the ergodox one

* add necessary macros

* working ls macro

* added more shell macros

* added screen rename / screen number macros

* add ctrl-a key in shell-nav to use screen more easily

* added shell screen layer

* assign screen switching macros to screen layer

* define all screen switching macros

* more screen-related shortcuts added on shell screen layer

* change shell nav bottom right row to match base layer (backspace / delete)

* remove some mappings on SHELL_NAV layer as they are now in the screen layer

* added more screen macros
2017-11-06 12:07:21 -05:00
Jeremy Cowgar 245b3376d6 Correct the rules.mk documentation for auto shift.
fixes #1965
2017-11-06 12:03:36 -05:00
drashna 2c703b1528 Fix RGBLIGHT startup color (#1975)
* Fix RGBLIGHT startup color

While it's awesome to see the layer indicating code in here (no really!), and the general rule is to not alter the default keymap/code....

The problem with the layer_state_set_kb call handling this, is that the code doesn't seem to be called at startup.  So the default layer color won't ever get set on startup.  It needs to be called in the init function to be properly set. 

I've played with this extensively, and if you check my keymaps, that is precisely why I have the setrgb/sethsv in the init function.

* Removed typo (pipe)
2017-11-06 11:43:38 -05:00
Erez Zukerman 90a6fea4e8 Merge pull request #1974 from qmk/f/ez_shine_layer_leds
Shine layer indication
2017-11-06 09:44:54 -05:00
Erez Zukerman e45290a62e adds indication up to layer 7 2017-11-06 09:19:51 -05:00
Jack Humbert 1d3a19757c restore default mode/color if no 0 color 2017-11-06 09:15:30 -05:00
Jack Humbert cf9f6bbd91 adds per-layer rgb color option to ez 2017-11-06 08:38:36 -05:00
Jack Humbert 41df0dc9a7 update gh60 info 2017-11-05 12:06:45 -05:00
Jack Humbert 30dc34d529 add gh60 info.json 2017-11-05 12:04:52 -05:00
Michael F. Lamb e899cb8940 several improvements for mitosis:datagrok (#1960)
* mitosis/datagrok: reduce features from rules.mk

* mitosis/datagrok: make both layer keys neighbor shift

* mitosis/datagrok: (no-op) tweak some comments

* mitosis/datagrok: set baudrate to 250k

This requires a corresponding change to the mitosis wireless firmware:
https://github.com/reversebias/mitosis/pull/10

* mitosis/datagrok: move design description from code comment to a readme

* mitosis/datagrok: new layout, new shifted keys, efficient LED code

This is experimental, but compiles and seems to work correctly.

* mitosis/datagrok: whoops, move readme.md

* mitosis/datagrok: a minor layout improvement simplifies custom-shifted code

instead of [, .] [? !], using [, ?] [. !] greatly simplifies the code
needed to perform the shifted-key switching. (And keeps , and . on the
same keys that they are under qwerty.)

also: layout improvements for symbols

* mitosis/datagrok: make my code conform to QMK style guidelines

* mitosis/datagrok: TODO note for layout table in README

* mitosis/datagrok: remove led_set_user until i figure out other changes

need to see if the corresponding changes needed in the keyboard-level code
is okay.

* mitosis/datagrok: simpler layer indicator

* mitosis/datagrok: undo change to keyboard baud; make it in my layout dir.

* mitosis/datagrok: apply same punctuation hack to qwerty layer

* mitosis/datagrok: enable qwerty layer toggle

* mitosis/datagrok: update readme
2017-11-03 11:56:06 -04:00
M Rawash 80e489e122 Added hand-swap matrix to the mitosis 2017-11-03 11:55:37 -04:00
Jennifer 29d1abff07 have led default to off on start up 2017-11-03 11:55:07 -04:00
Jennifer b546da0a19 make more generic, and properly handle inits 2017-11-03 11:55:07 -04:00
skullY f357bd0ccc fix a typo 2017-11-02 17:36:15 -07:00
skullY 685d4c2f97 Do some cleanup for the API 2017-11-02 16:47:39 -07:00
skullY 535c2f60a9 use real greater than and less than chars 2017-11-02 16:27:17 -07:00
skullY 65eaab8a1a fix labels 2017-11-02 12:49:23 -07:00
skullY 18f3cd1123 add labels to the clueboard layout 2017-11-02 12:47:34 -07:00
skullY e45ce2dcb3 Merge branch 'master' of github.com:qmk/qmk_firmware 2017-11-02 12:39:25 -07:00
skullY 137456e5b1 fix the clueboard layout json 2017-11-02 11:51:06 -07:00
Jack Humbert ec59147507 fix 2u alignment in info.jsons 2017-11-02 12:28:15 -04:00
Jack Humbert 074b78700a update preonic, add info.json 2017-11-02 12:18:18 -04:00
skullY 432674781a Document info.json files 2017-11-02 01:31:02 -07:00
skullY 4e41beeaa6 Fix a typo 2017-11-02 01:30:51 -07:00
Jack Humbert 00733f4b87 update contributing guidelines 2017-11-01 21:42:05 -04:00
dkrieger 19753788c1 Add satan keymap: HHKB-alike based on dbroqua's, with mouse functionality (#1948)
* Add satan keymap: HHKB-alike based on dbroqua's, with mouse functionality and without LED functionality

* move mouse layer to DOUBLE_HOLD, add UTIL layer for TRIPLE_HOLD

- UTIL layer
    - currently has "RESET" key and nothing else.
    - functionality otherwise covered by bootmagic should go here

- small bugfix: dispatch of [QTY]_HOLD should be based on range tap count
  falls in, not exact count.
2017-11-01 21:29:23 -04:00
Pawnerd 54a8abd785 Added support for Knops Mini (3x2 macropad) keyboard. (#1953)
* Added support for Knops Mini (3x2 macropad) keyboard.

* Added better documentation, according to the QMK standards.

* Fixed typo.

* Changed names of files to comply with QMK standards.

* Ignored makefile in keymap.

* Removed makefiles and added my credentials in the copyrights.
2017-11-01 21:24:59 -04:00
Jack Humbert d6ad9787a0 update template readme 2017-11-01 21:14:24 -04:00
Jack Humbert e2e387f8f8 update qmk template 2017-11-01 21:10:05 -04:00
Jack Humbert 039cc8c932 ignore more makefiles 2017-11-01 20:59:44 -04:00
QMK Bot 004826e1b8 convert to unix line-endings [skip ci] 2017-11-02 00:51:41 +00:00
Jack Humbert f445a7f971 adds .hex for teensy 2.0 using B0 as reset 2017-11-01 20:42:03 -04:00
Danny Nguyen 13e1388f2d Add nano switch pad 2017-11-01 20:02:52 -04:00
Jack Humbert fe56fffe7d Adds .qmk file type as a target for QMK Toolbox (#1084)
* adds .qmk file type as a target

* adds info.json with vendor and product

* add files for qmk info script

* add layout file for planck

* ignore .qmk files

* more settings

* update rules for avr and chibios

* update .qmk generation for info.json and inheritence
2017-11-01 20:01:45 -04:00
Jack Humbert d069a42c07 Update getting_started_github.md 2017-11-01 14:10:28 -04:00
Jack Humbert 029234f1f1 adds other layouts to rules.mk 2017-11-01 13:21:17 -04:00
Jack Humbert ddf49e8b21 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-11-01 12:22:31 -04:00
Jack Humbert 371922ad61 update layout macros for planck 2017-11-01 12:20:46 -04:00
skullY f868a3bb86 Fix the json for clueboard 2017-11-01 09:19:40 -07:00
skullY 5329a80f6c fixup json 2017-11-01 09:04:45 -07:00
Arialdo Martini 32bb8f6b8a Improvements to documentation (#1919)
* Typo: Github => GitHub

* Typo: windows => Windows, docker => Docker, and some punctuations

* "QMK Introduction" links to the right file

* "Unix" rather than "UNIX", which is a trademark

* Directory name is "keyboards", not "keyboard"

* "handwired" is a subdirectory of "keyboards"

* Punctuation and minor fixes

* macOS rather than Mac

* Punctuation and other minor fixes

* Vagrant Guide links to an existing file

* Jun Wako referenced with his name rather than his nickname

* Saxon genitive 's outside the link
2017-11-01 11:21:54 -04:00
Jack Humbert 1683d3a559 adds info.json files to planck 2017-11-01 10:08:40 -04:00
drashna b79a4cfeba Updated personal keymaps (#1945)
* Add woodpad

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Fix odd merge issue

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add forced NKRO

* Added Colemak and Dvorak layers to default orthodox keymap

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow

* Updated macros and added workman keymaps

* Fixed RGB lighting for Workman layout

* Add leader keys

* Remove force NKRO

* Add Viterbi one handed layout and minor tweaks to others

* Finishing up Viterbi keyboard layout, and NKRO tweaks to other layouts

* Made "make" keystroke universal

* Clean up and updates of drashna keymaps

* Add workman layer to planck

* Update to keymaps

* Fix accidental commit because I don't know how to git

* Fix makefile toggle code in ez keymap
Finish adding RGB code to orthodox

* missing underscore in init function declaration

* Updated RGB Underglow layer indication code due to discovery of the layer_state_set_kb function

* Remove unnecessary planck layout
2017-11-01 00:13:20 -07:00
skullY 44d9ad95b7 Add info.json files for clueboard 66 2017-11-01 00:03:35 -07:00
Danny Nguyen fad967af4c Remove extra underscore from MASTER_RIGHT define 2017-11-01 01:19:06 -04:00
DangerousParts 20e18d15e3 Created Kona Classic config (#1791)
* Created Kona Classic config

* Fixed KonaClassic config

* Updated README

* Updated Readme to conform to format standards

* Added ANSI and ISO layout options

* Fixed images in Readme

* Added labels to images

* Added absolute links to images in Readme

* Image link updates again

* Fixed bottom row keys in some layouts

* Fixed Grave and Tilde

* Fixed Underglow in Kona Classic configs

* Renamed KonaClassic to kona_classic
2017-10-31 23:59:23 -04:00
Danny 83af62322c Add Levinson rev2 (#1939)
* Add levinson rev2 files

* Add hexwire keymap

* Remove redefinition of backlight defines
2017-10-31 23:58:38 -04:00
Rob Rogers 2d77f9cbb9 Fix pointing device feature 2017-10-31 20:59:55 -04:00
Danny Nguyen c9a0436422 Add 6-ball macropad 2017-10-31 20:59:26 -04:00
GlenPickle fca03e15b9 Chimera Ortho Readme (#1943)
* Added Chimera Ortho keymap

* added readme

* fixed hardware link
2017-10-31 20:58:46 -04:00
Erez Zukerman bc98b0d9eb Merge pull request #1915 from dondelelcaro/ergodox_ez_left_leds
Ergodox ez left leds support
2017-10-31 11:33:09 -07:00
Jack Humbert 38261920a9 update hand wiring link 2017-10-31 13:38:57 -04:00
Danny Nguyen f9881793e3 Add hexwire keymap for Eco 2017-10-31 12:27:49 -04:00
tsankuanglee 04b9b62bdc RETRO_TAPPING (#1922)
* add RETRO_TAP: tap anyway, even after TAP_TERM, if no interruption

* consistent variable name

* add option doc

* change name for consistency

* make RETRO_TAPPING default to off
2017-10-31 11:15:22 -04:00
Louis Orleans b2bbbc2dfc layout(infinity ergodox): dudeofawesome's layout (#1932)
* 🎉 Building simple flasher

* 🎉 Flashing works

* 🎨 Cleaning up

* 🐛 Being more specific with board identity

* 🐛 Flashing correct keymap

* 🎉 Adding keymap

*  Updating keymap

* 🚨 RGB

*  Revert "🚨 RGB"

This reverts commit 9ceabfb267f8daedaad929231229c703abc12ec4.

*  Improvements to flasher

*  Layout tweaks

* 💄 Messing around with LCD

* 💄 Enabling LCD backlight matching

* 🔧 Updating layout

* 🐛 Fixing console logging

* 🎨 Cleaning up indentation

* 🔧 Adding editorconfig

*  Adding game layer

* 💄 Changing numpad layout

* 🔥 redoing entire layout

It's now more similar to the Planck default layout

*  add workman and dvorak layouts

* 🐛 fix numpad

* 🐛 fix layer orders

* 🐛 fix layer toggling

* 🐛 fix tri-layer switching

* 🐛 fix LCD colors for adjustment layers

* 🔥 remove old flasher project

* 🔥 remove simple_visualizer

* 💄 update LCD colors

* 📝 fix layout comments

* 💄  swapping 2u buttons

* 🔥🔧 removing editorconfig

* 🚨 using 2 spaces

* 📝 add README

*  Revert "💄 Enabling LCD backlight matching"

This reverts commit 51577903dfdc9fea5d33e9ab8cfa9b854e7ae19e.

*  Revert "💄 Messing around with LCD"

This reverts commit fdd9acdae514a3e0e4a7153225053680744980e5.
2017-10-31 11:14:43 -04:00
Louis Orleans 6169cd52ba Add EditorConfig file (#1930)
* 🔧 add editorconfig

This makes supported editors automatically change their settings to match desired code styles

* 🔧 add extension recommendation for VSCode

This will cause VS Code to prompt the user to install the EditorConfig extension when they open the project.

If this is felt to be too opinionated, I can revert it.
2017-10-31 11:13:40 -04:00
drashna 101b998ac2 Fix Pointing Device code (#1934)
* Fix pointer device options

when the feature was added, the appropriate option definition wasn't created.  This needs to be added to function properly.

* Update common_features.mk

* missing underscore in init function declaration
2017-10-31 11:13:00 -04:00
Takayuki Matsubara 7b65b7e948 fix Logical Maximum to be recognized as 255 instead of -1
SEE ALSO: https://github.com/qmk/qmk_firmware/issues/312
2017-10-31 11:12:06 -04:00
Zach Burchill 4c1164c469 fixed two typos
I'm almost 100% sure "else if (state->count = 2) {" was a typo (it should have two ='s for a logical operator), and I'm *pretty* sure "if (state->interrupted || state->!pressed) return SINGLE_TAP;" has a typo. At least, it returns an error on my machine saying something about an unexpected '!'.  
I changed it to a slightly longer form (i.e., "state->pressed==0"), and that worked fine.
2017-10-31 00:40:27 -04:00
Gun Pinyo e555e42aae add Thai layers for the GunP planck (#1910)
* Add a layout of planck named GunP, ready for pull request review.

* add Thai layers for the GunP planck
2017-10-31 00:39:33 -04:00
William Wilson 38da7795f4 Added Chimera Ortho keymap 2017-10-31 00:30:24 -04:00
Pentti Laitinen 8c10b60c5f Initial commit for nordic layout for ergodox infinity.
- Added nordic infinity ergodox layout
- Fixed typo in ergodox infinity readme.md
2017-10-31 00:29:51 -04:00
Nathan Sharfi c8fca10f0d zweihander-osx: Remove app keys, etc.
- add right command keys
- add F16 on ;' for Siri
- remove command-Q (too easy to hit)
2017-10-31 00:28:56 -04:00
Louis Orleans 1f6002db3f layout(planck): dudeofawesome's layout with simultaneous RGB and audio support (#1929)
* layout(planck): new layout initial commit

* feat(planck): add workman layout

* fix(planck): switching to workman

* layout(planck): swapping mnext and mplay

* feat(planck): prep for RGB

* perf(planck): remove plover

saves 256 bytes of memory

* perf(planck): remove colemak

saves 128 bytes

* layout(planck): swapping enter and quote

* perf(planck): disable console

frees 1664 bytes

* feat(planck): RGB under-lighting

* refactor(planck): change RGB pin

Uses pin labeled PB2

* feat(planck): add RGB keycodes

* feat(planck): re-enable audio

* style(planck): fixing indentation

Because who indents like that?

* style(planck): clean up keycodes

* layout(planck): remove del

* feat(planck): add tap-space to layer keys

* docs(planck): specify pin on PCB for RGB

* bug(planck): reducing tap time

* Revert "bug(planck): reducing tap time"

This reverts commit 62606b2dc62c5adcc06cfb5978d7e5305411a658.

* Revert "feat(planck): add tap-space to layer keys"

This reverts commit c74de5a4aa45c5563dcaa463395654c29f50eda3.

* perf(planck): remove backlit case

* feat(planck): swap enter and quote

* bug(planck): moving right shift

* doc(planck): update README

* chore(planck): remove makefile
2017-10-31 00:27:07 -04:00
James Morgan 07017871e5 README, keymap & config update to 3 keyboards (#1911)
* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware

* Fix terminus_mini & nyquist/DivergeJM readme files

Previously an outdated copy of the default readme. Updated to match the  Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout)

* Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles

* Updated rules.mk

Inadvertantly removed important code from the rules.mk in previous commit. This has been restored.

Also disabled Tap_Dance in both rules.mk files

* Moved terminus_mini to handwired

Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired.

* New Frosty Flake layout for QFR TKL

Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality.

* README fix & keymap update for 3 keyboards

Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM.

Added TAPPING_TERM =  150 to config.h for all keyboards

Switched LT(LOWER) and LAlt on the mod row for ortholinear boards.

* Update readme for QFR_JM to include make instructions

* Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"

This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing
changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf.

* Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware""

This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93.

* Added QWERTY support to the QFR_JM

Implemented variable default base layer from the Planck default keymap.

* Update README to reflect QWERTY support
2017-10-29 20:07:36 -04:00
Jody Foo f4949fdd32 Fix for issue https://github.com/qmk/qmk_firmware/issues/1751 2017-10-29 20:05:54 -04:00
Shihpin Tseng 750f8ec94e Fix process_combo.c compile warning 2017-10-29 20:05:26 -04:00
Jeremy Cowgar 49c32021db Added missing RGB and Auto Shift in main feature list. Also standardized on period at the end of each feature list item. 2017-10-29 20:04:10 -04:00
Jeremy Cowgar 76d807fe7d Fix code example in auto shift docs 2017-10-29 20:04:10 -04:00
Jeremy Cowgar bf1fedc05e Fixed various feature links 2017-10-29 20:04:10 -04:00
Maxr1998 5960d0349c Add grave key 2017-10-29 20:02:52 -04:00
Sebastian Kaim 0afaed8535 Extended the hint of the programmer to link to the relevant README part instead of giving a generic hint. 2017-10-29 19:59:16 -04:00
Sebastian Kaim 688343f218 Added a better description for the bootloader key 2017-10-29 19:59:16 -04:00
Jack Humbert 4d421ee31c adds flashing docs 2017-10-29 18:44:29 -04:00
Campbell Barton 91683d56fa ergodox qwerty_code_friendly: add macro keys (#1918)
Also add more configurable keys.
2017-10-29 15:34:02 -07:00
Pentti Laitinen 9ee207acac Added Iso(ish) layout for tada68. (#1924)
- Basic layout with one function layer.
- Added correct mapping for ISO layout into tada68.h.
- Readme for the keymap.
2017-10-29 15:22:07 -07:00
Don Armstrong 0bb457e573 document how to define LEFT_LEDS and how that hack is done 2017-10-27 13:46:51 -07:00
Don Armstrong 364aeeec53 implement ergodox_left_leds_update in ergodox_ez
Previously, this code was implemented in keymap.c, but I'm unaware of
someone with a different implementation of this particular hack. [If
someone has it, we can add another #ifdef in the future.]
2017-10-27 13:34:03 -07:00
Don Armstrong 2e3b99f7f1 update left led support 2017-10-27 13:24:30 -07:00
Don Armstrong bcfba27101 add initial support for left leds on an ergodox ez 2017-10-27 13:24:30 -07:00
Ethan Madden b45b223389 Small documentation and keymap tweaks for my minivan layout (#1891)
* Added personal minivan keymap

more consistent layer setup

documentation!

slide some things around

more doc jiggling

* Small layout and documentation tweaks

Small documentation updates

dropped Makefile that for some reason was still in my branch

* found and removed extra makefile
2017-10-25 13:01:47 -10:00
Sebastian Kaim 7b754e1a5a added bfake support as a subproject (#1903)
* added bfake support as a subproject

also moved existing bmini stuff to a subproject

fixed columns

minor keymap update

making this a subproject

remove old stuff

got subproject stuff figured out

* travis was upset because a board didn't have a default keymap
2017-10-25 13:01:02 -10:00
Manassarn Manoonchai a3f53aeaa1 Add narze keymaps for Ergodox & Planck with SuperDuper mode implementation (#1883)
* Fork default planck keymap

* Esc -> CapsLock

* Swap Tilde & Grave in Lower & Raise

* Replace Blacklight key with Raise

* Add Hyper/Esc & Shift/Enter key

* Add super duper mode using S+D combo

* Change superduper mode sound

* Add more functionality to superduper mode

* Fork default

* Replace all left shift to shift/parensopen (space cadet)

* Super / Underscore

* Try superduper on z/slash held

* Use function/macro instead, LGUI_UNDS alone not working

*  Add mouse layer 🐭

* 🐛 Fix superduper

*  Fix GUI_UNDS

* 🐛 Fix registering underscore when releasing too fast

* 🐛 Fix Shift/( with LT z

*  Add superduper for colemak

*  Add Qwerty on software Colemak layout & make Superduper available on multile layouts

*  Enable/disable superduper mode & fix layer switching

* 🐛 Fix superduper not unregister mods

*  Update planck-like ergodox (wip)

* 🐛 Fix return before changing tap count & modify comments

*  Replace with planck code

* 📝 Update readme

*  Fix SuperDuper by using intermediate layers

* Remove LT from inner lower & raise for ease of use

* Change TG to LG

* Add options & disable audio

* 🔧 Enable ignore mod tap interrupt & shorting tapping term

* 📝 Update readme

* Remove including quantum makefile

* 📝 Update readme

* Rename Makefiles
2017-10-25 06:11:07 -10:00
Doug Krieger 6c4639bfac Add RESET to satan:dbroqua mapping 2017-10-25 02:40:15 -10:00
skullydazed 67cc5cebc0 Restructure the hardware and feature docs to make things easier to find (#1888)
* fix #1313 by documenting more config.h options

* Clean up and organize documentation
2017-10-24 20:34:28 -07:00
heartrobotninja 8892c50336 Moving LOCK and adding RUN. Fixing equal key to actually use equal keycode. 2017-10-24 17:07:09 -10:00
Dylan Khor 9128ed50c2 Add macro to sleep Windows 10 2017-10-24 17:04:12 -10:00
Sebastian Kaim 1f43495922 Added a new keycode for cycling through RBG modes which reverses directions when shift is hold.
This commit adds a new keycode `RGB_SMOD` which is the same as `RGB_MOD` (cycle through all modes),
but when it is used in combination with shift it will reverse the direction.
2017-10-24 17:02:20 -10:00
Gun Pinyo 21dfa29c28 Add a layout of planck named GunP, ready for pull request review. 2017-10-24 17:01:20 -10:00
Bernardo Farah 4c960ad7c4 Added berfarah's custom keyboard layout 2017-10-24 16:59:35 -10:00
ajp10304 a08287b0a0 Added ajp10304 Planck layout (#1887)
* Added ajp10304 Planck layout

* Removed Makefile from planck ajp10304 keymap
2017-10-23 08:28:52 -10:00
alex-paget af83c6a4cb My layout to suit my needs 2017-10-23 08:28:13 -10:00
Damien e54c8df453 DZ60 changes (#1890)
* - Fixed DK60 version in config.h

* - Updated dk60 readme with new QMK rules

* - Fixed wording in readme

* Added dbroqua layout for DZ60

I've also updated dz60.h to add "true HHKD" keymap definition (6U
spacebar).

With the default HHKB definition r_alt was not mapped and when I pressed
r_menu it was r_alt.

Regards
2017-10-23 08:27:37 -10:00
James c2b8a47604 Some finishing touches on space_oddity (#1892)
* Add verbose comments, ASCII layout pictures, and re-word readme.md

* Fix omission of F(2) on the third layer.
2017-10-23 08:26:52 -10:00
Dylan Khor 07ec609fad Missing line break in NIU Mini readme (#1886)
* Missing line break

* More specific URL to the product
2017-10-22 14:53:00 -10:00
mogranjm a66e75609e Added new TKL layout for the Frosty flake - Quickfire Rapid (#1854)
* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware

* Fix terminus_mini & nyquist/DivergeJM readme files

Previously an outdated copy of the default readme. Updated to match the  Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout)

* Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles

* Updated rules.mk

Inadvertantly removed important code from the rules.mk in previous commit. This has been restored.

Also disabled Tap_Dance in both rules.mk files

* Moved terminus_mini to handwired

Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired.

* New Frosty Flake layout for QFR TKL

Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality.
2017-10-21 18:32:35 -10:00
drashna f3534f999f Updated keymaps (#1853)
* Add woodpad

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Fix odd merge issue

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add forced NKRO

* Added Colemak and Dvorak layers to default orthodox keymap

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow

* Updated macros and added workman keymaps

* Fixed RGB lighting for Workman layout

* Add leader keys

* Remove force NKRO

* Add Viterbi one handed layout and minor tweaks to others
2017-10-21 18:27:54 -10:00
mondaufgrau 22564d8ee7 Added xd60 ISO keymap (#1865)
* Added xd60 ISO keymap

* renamed ISO to iso

* some cleaning

* added iso keymap

* some cleaning
2017-10-21 18:26:05 -10:00
Carlos Filoteo 736140439d Add links to EEPROM files 2017-10-21 18:24:42 -10:00
Daniel Gordon 725aa5b820 Update to Tap-Dance Docs for Fast Typists
* Quad function tap dance works as intended when typing fast
    * Example 4 in doc has been updated

Change-Id: If33406299e2eed49152c495da92f4977dfdc1e2f
2017-10-21 18:24:06 -10:00
Jack Humbert 06f196c589 Creates a userspace for keymaps (#1559)
* create a user space

* adds example

* document, add readme.md

* jackhumbert userspace, ergodox keymap
2017-10-21 11:44:11 -10:00
skullY 9bb259b660 Fix the naming for clueboard files 2017-10-21 13:51:18 -07:00
James ab3dbd8daa Additional custom handwired layout - Space Oddity (#1868)
* Add existing file

* Add new keyboard layout - initial commit

* Revised readme.md

* Clarified readme.md, reorganized keymap.c, and added license text.

* Fixing last incomplete commit

* Just a little code cleanup to make things more readable.
2017-10-21 10:04:35 -10:00
Pittyolo 1954ad1fd8 Added my Let's Split layout (#1867)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Add files via upload

* Add files via upload

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Add files via upload

* Adding my Let's Split layout

As in my Nyquist layout, ISO Hungrian friendly
2017-10-21 10:02:51 -10:00
James 3276c4c56a Minor punctuation and grammar edits. 2017-10-21 10:02:14 -10:00
Jason Rosenman 3a1ce56aed Added caps lock + key lock 2017-10-21 10:01:48 -10:00
Jason Rosenman 2f24ed1046 Turned off some unnecessary makefile rules 2017-10-21 10:01:48 -10:00
CarVac 50a4b3510b Revise carvac_dv keymap for easier alt-tab (#1871)
* Add carvac_dv keymap for mitosis

* Add mouse keys

* move backspace, etc, and fix tab

* remove commented-out functions in keymap

* Fix scroll buttons and add left/right scrolling

* Make num momentary, add comments, and clean up

* fix mouse scroll acceleration

* Add tab, remove bksp, move print screen

Having tab next to control and alt makes for much easier
alt-tabbing and ctrl-tabbing.

That displaced print screen, but I had never used the non-layer
backspace on the right hand, so I moved printscreen over there.
2017-10-21 10:01:09 -10:00
marcostrauss 57bf00f28f ErgoDone: VID/PID/NKRO (#1872)
* - Fancy default PID and option for corresponding VID.
- Information about official VID/PID.
- Correct manufacturer name.
- NKRO enabled by default.

* Resolved build error with `#ifndef FORCE_NKRO`.
2017-10-21 10:00:41 -10:00
heartrobotninja b25338a809 heartrobotninja ergodox_ez and lets_split layouts (#1874) 2017-10-21 09:59:31 -10:00
Jason Milkins 78923cb884 Fix code backticks on Frequently Asked Build Questions docs 2017-10-21 09:58:48 -10:00
Jason Milkins a860d9d628 Fix missing code backticks 2017-10-21 09:58:17 -10:00
Danny b5464cf20a Add Iris keyboard (#1863)
* Clone Nyquist code to Iris and rename

* Set keymap and pins

* Work in progress Iris default keymap

* Add Iris rev2

* Update Iris files to new build system

* Add lewisridden keymap
2017-10-19 04:02:00 -10:00
Daniel Gordon 383e508bc5 Quad Function Tap Dance added to TD Doc
* Added section to example, detailing how to accomplish the
        'quad-function' tap dance.
    * Refactored TD documentation to clearly separate different complex
        examples

Change-Id: Ifc1495d1142849c771418fdabc458c04c48311e6
2017-10-18 17:14:12 -10:00
skullydazed 3f3fa07918 Reorganize clueboard into a single directory (#1855) 2017-10-17 18:05:21 -07:00
skullydazed ad49db8cd2 Address #1689 by using a formula to define the breathing curve (#1692)
* Address #1689 by using a formula to define the breathing curve and exposing defines to control the shape of the curve.

* Tweak the behavior of breathing for clueboard
2017-10-17 16:47:49 -07:00
mogranjm d3fe6a0588 Add terminus_mini keyboard and nyquist/DivergeJM layout (#1851)
* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware

* Fix terminus_mini & nyquist/DivergeJM readme files

Previously an outdated copy of the default readme. Updated to match the  Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout)

* Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles

* Updated rules.mk

Inadvertantly removed important code from the rules.mk in previous commit. This has been restored.

Also disabled Tap_Dance in both rules.mk files

* Moved terminus_mini to handwired

Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired.
2017-10-17 06:42:27 -10:00
Max Rumpf af4697cba5 Add Maxr1998's GH60 layout (#1849)
* Maxr1998's GH60 layout

* delete unused makefile

* Remove unneeded include
2017-10-16 16:43:40 -10:00
Kenneth Aloysius b7bb923962 Add NIU Mini from KBDFans (#1847)
* Add NIU Mini keymap from Planck keymap

* Remove old keymap files

* Fix README, removed Planck references

* Add default layout, move Planck layout to separate folder

* Update README
2017-10-16 13:31:39 -10:00
Phil Hagelberg 0f5928fdf4 Fix avrdude message to not mention any specific device model. 2017-10-16 09:54:17 -10:00
Benjamin Dengler ba4b3d9d72 Added BLE support for USB-USB converter. (#1824)
* Added BLE support to USB-USB converter

* Added readme

* Removed images and Makefile
2017-10-15 15:04:03 -10:00
Dylan Khor aa660c1eb7 Broken link found in issue #1845 2017-10-15 15:03:23 -10:00
Jack Humbert 12b2e0ac73 hack to force new tag 2017-10-15 20:04:23 -04:00
Jack Humbert bd642d08ab add note to makefile for future use 2017-10-15 16:54:06 -04:00
Jack Humbert 7f2882832e adds default keymap for handwired boards 2017-10-15 16:52:51 -04:00
Jack Humbert 32f18cf616 fix up default keymaps and remove keyboard folder filter 2017-10-15 16:44:31 -04:00
Jack Humbert 1745f202cc update keymaps to not be the canonical file 2017-10-15 16:18:45 -04:00
Jack Humbert 115e49b2af only build default keymaps 2017-10-15 16:18:28 -04:00
Jack Humbert e64313cdb3 adds default keymap for amj60 2017-10-15 16:17:47 -04:00
Jack Humbert 066525ab9e add qmk.fm as a backup host 2017-10-15 13:37:46 -04:00
Salt-Peanuts e1bcb40e90 Cleaned up my Kinesis layout and created readme. (#1843)
* Cleaned up keymap and readme

* Cleaned up keymap and readme

* Cleaned up keymap and readme

* Cleaned up keymap and readme
2017-10-15 06:12:39 -10:00
zs 0b023ef67c Add tomb0y's minidox layout 2017-10-14 19:12:59 -10:00
Jack Humbert 800ec55dfc Make arguments redo, subproject elimination (#1784)
* redo make args to use colons, better folder structuring system [skip ci]

* don't put spaces after statements - hard lessons in makefile development

* fix-up some other rules.mk

* give travis a chance

* reset KEYMAPS variable

* start converting keyboards to new system

* try making all with travis

* redo make args to use colons, better folder structuring system [skip ci]

* don't put spaces after statements - hard lessons in makefile development

* fix-up some other rules.mk

* give travis a chance

* reset KEYMAPS variable

* start converting keyboards to new system

* try making all with travis

* start to update readmes and keyboards

* look in keyboard directories for board.mk

* update visualizer rules

* fix up some other keyboards/keymaps

* fix arm board ld includes

* fix board rules

* fix up remaining keyboards

* reset layout variable

* reset keyboard_layouts

* fix remainging keymaps/boards

* update readmes, docs

* add note to makefile error

* update readmes

* remove planck keymap warnings

* update references and docs

* test out tarvis build stages

* don't use stages for now

* don't use stages for now
2017-10-14 11:32:19 -10:00
Stefano Rodighiero e5dc2253e2 keymap configuration rewritten using the KEYMAP macro defined in atreus.h 2017-10-14 07:01:50 -10:00
Andrew 6531d64ac7 Add YMD96 Keyboard (#1838)
* add ymd96 base

currently not working correctly.

* Update

honestly not really sure what I've been doing but I'm just more or less brute forcing this until I can get the pcb schematic or something

* honestly just trying stuff out

* Update keymaps

Getting closer hopefully

* ymd96 works!

at least for me

* Update readme

* Update readme

* Update readme
2017-10-14 07:01:02 -10:00
Pittyolo f9f3afd767 Created cleaner readme and updated the keymap of my layout (#1840)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Add files via upload

* Add files via upload

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Add files via upload
2017-10-14 07:00:00 -10:00
Oscillope c70b419ec0 Add multiple layout support and Linux flash utility to JJ40 (#1837)
* Adds support for multiple layouts. Adds custom keymap for "offset"
layout.

* Adds a tool to help detach the keyboard from the Linux HID driver before programming.

* Adds a tool to help detach the keyboard from the Linux HID driver before programming.
2017-10-13 19:04:36 -10:00
unknown bccf263cd0 Add support for Unikeyboard Felix 2017-10-13 11:24:31 -10:00
Vadim Brodsky e094cd42b5 Add support for the JJ40 Keyboard (#1834)
* Add support for JJ40

* Update readme

* Update maintaner
2017-10-13 10:20:56 -10:00
Sebastian Kaim 598cb82655 Extended the programming script for the ps2avrGB keyboard series:
- a keyboard already in bootloader mode will now be detected
- if setting the keyboard to bootloader mode doesn't work, a hint will be printed on how to do so
- instead of failing instantly when no keyboard is found, the script will now wait up to 60 seconds (it retries every 5 seconds, up to 12 times)
2017-10-13 05:37:19 -10:00
Donald 74f51009a8 Updated DZ60 HHKB layout and add my own layout (#1828)
* Updated DZ60 to properly handle HHKB layout, and added my own HHKB layout

* Added dedicated underglow keys

* Fixed compile issue
2017-10-13 05:35:49 -10:00
Otto Rask 122525ee61 Add rask's UK78 and iErgoDox layouts (#1830)
* Add rask's Satan layout

* Add rask's Satan layout

* Add rask's BananaSplit60 layout

* Add rask's BS60 readme

* Fix rask's BS60 readme image

* Fix rask's BS60 readme image again

* Add rask's UK78 layout

* Change RGui to be LGui to fix locale switching

On Ubuntu the keyboard seemingly lost RGui when toggling
between typing languages. With LGui toggling works normally.

* Add rask's ErgoDox Infinity layout

* Modify ErgoDox layout and add readme for it

* Add rask's UK78 layout readme
2017-10-13 05:35:17 -10:00
Jon Allen c037d4bb30 Add the Tomato keyboard 2017-10-13 05:23:23 -10:00
keisuke333 66f45c9e2e Fix teensy path 2017-10-13 05:22:13 -10:00
Gareth Pye 2cf697d0c8 Tada68 instructions, updated and clarified to avoid bricking keyboards 2017-10-13 05:21:26 -10:00
Jonathan Arnett 4c0ff7b7ea Remove reference to Ergodox subprojects from docs
At one time, "ez" and "infinity" may have been subprojects of a
unified "ergodox" project, but this is not currently the case. Running
`make ergodox-ez-default-teensy` (or similar), as the documentation
currently implies, does not work.
2017-10-12 06:25:47 -10:00
skullY db5afb05cf Fix the presentation of the contribution guide 2017-10-11 12:18:53 -07:00
skullydazed 2db4ad2133 Write a contributing guide. (#1827) 2017-10-11 12:07:15 -07:00
Jacob Chapman b3ad561b4f newkb-atreus-xk 2017-10-10 09:25:39 -10:00
Wunder ee8860a733 add stock layout for xd75 (#1731)
* add stock layout for xd75

* fix layout bug

* layout naming

* don't need it

* Cleaning up
2017-10-10 08:13:42 -10:00
Jesper Brix Rosenkilde 966e2660cf Add option to reverse PS2 mouse axes and scrolling 2017-10-10 07:20:17 -10:00
keisuke333 109b2ae0bd Fix missing teensy path 2017-10-10 07:16:22 -10:00
Joe Martin b91ffba4be #1792 added in waits from tmk for locking switches
fixes #1792
2017-10-10 07:15:41 -10:00
marcostrauss 01ac8a6051 ErgoDone keyboard: Improved structure of readme and augmented it with important information. Updated links to moved content. 2017-10-10 07:12:37 -10:00
unknown f88f042c04 Updated my Gherkin Keymap 2017-10-10 07:11:26 -10:00
drashna e0e80c0dc1 Cleanup of my keymaps (#1802)
* Add woodpad

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info

* Cleanup macros

* Fix odd merge issue

* Tweaked RGB lighting stuff

* Start to merge orthodox/ergodox keymaps (persistant layers)

* Add forced NKRO

* Added Colemak and Dvorak layers to default orthodox keymap

* Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow
2017-10-10 07:11:05 -10:00
DerMeerkamp 34084b4ee6 geändert: readme.md 2017-10-10 07:10:17 -10:00
DerMeerkamp f3e61afdc7 geändert: readme.md 2017-10-10 07:10:17 -10:00
DerMeerkamp 2cda124bc1 geändert: keymap.c 2017-10-10 07:10:17 -10:00
DerMeerkamp 951285de67 neue Datei: readme.md 2017-10-10 07:10:17 -10:00
DerMeerkamp 56c2487223 geändert: keyboards/lets_split/keymaps/DE_simple/keymap.c 2017-10-10 07:10:17 -10:00
DerMeerkamp c5f847a900 neue Datei: keyboards/lets_split/keymaps/DE_simple/Makefile
neue Datei:     keyboards/lets_split/keymaps/DE_simple/config.h
	neue Datei:     keyboards/lets_split/keymaps/DE_simple/keymap.c
	neue Datei:     keyboards/lets_split/keymaps/DE_simple/rules.mk
2017-10-10 07:10:17 -10:00
Campbell Barton d6a446bf95 Qwerty Code Friendly: relocate insert key
This was too easy to press by accident (next to Alt).
Make this user configurable.
2017-10-10 07:09:44 -10:00
Pittyolo 31808df294 Added ISO Hungarian friendly keymap (#1808)
* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update keymap.c
2017-10-10 07:08:37 -10:00
Snipeye cfd118d158 Added Dichotemy Keyboard, updated docs for Pointing Device (#1817)
* Added Dichotemy Keyboard, updated docs for Pointing Device

* Updated readme

* Updated mouse report pointer in pointing_device.c
2017-10-10 07:07:59 -10:00
Antonio García-Domínguez 20031ab982 Contribute GH60 layout (#1820)
* Add first version of my layout

* Tweaked layout

* gh60/bluezio: SpaceFn CapsLock interferes with Ctrl+Arrows
2017-10-10 07:07:09 -10:00
Kyle Montag 6d2cb1d9ac Add my layouts (#1822)
* all of my updates

* return to base config for xd60.c

* remove janky keymap header definition

* update readme for xd60

* update Planck readme
2017-10-10 07:06:41 -10:00
lyuts d8c62e4238 Fixed typo in docs. (#1818) 2017-10-06 20:15:55 -07:00
Rob Rogers 357d930f5a correct extraneous t 2017-10-06 11:09:03 -10:00
Rob Rogers 8d7cc11d72 correct layer numbers in keymaps 2017-10-06 11:09:03 -10:00
Johannes Huber 18f78b6735 Fix Clueboard readme links (#1816) 2017-10-06 13:36:35 -07:00
Fabian Topfstedt 120089d917 Consistent fabian layouts for amj40, let's split, planck and xd75 (#1812)
* slight modifier changes; added plover and reusing jack's default planck keymap as the basis

* space is not shift when held anymore

* added fabian layout (based on jack's default)

* changed fabian layout (based on jack's default)

* changed fabian layout (based on jack's default)
2017-10-06 08:08:35 -10:00
Daniel Shields d2bbfb9058 Increase one-shot timeout for planck/keymaps/dshields and remove unused includes. 2017-10-06 08:08:06 -10:00
Snipeye ee13228486 Generic Pointing Device (#1767) 2017-10-06 07:13:08 -10:00
BenKesselring ea819268f3 Add new 4x12 ortho layout & add credit to XD75 port (#1782)
* add xd75, preliminary RGB'

* fix RGB

* add backlight support (probably)

* updated readme and tweaked keymap

* added xd75 to list in /keyboards

* copyright ALL the things, create blank slate for Colemak Mod-DH Split/Wide keymap

* Add preliminary split Colemak Mod-DH layout

* changing stuff to compile properly

* attribution

* moar attribution

* removed incomplete keymap

* Create Colemak Mod-DH Wide layout for 4x12 ortho.

* Move Adjust key

* Add layou timage to readme

* fix naming

* Fix stupid issue with not understanding how the keymap works

* forgot to switch COLEMAK to COLEMAKDH...

* Remove and link image

* Remove and link image
2017-10-06 04:20:28 -10:00
Dylan Khor e0834cfda9 Update Let's Split readme
Updated Let's Split readme to reflect `make` changes in #1659, removed incorrectly used apostrophe and other spelling / grammar errors
2017-10-05 13:42:17 -10:00
Campbell Barton c206650ed0 [cleanup] consistent 2 space indentation
Was mixed between 2&4
2017-10-05 07:28:42 -10:00
Dylan Khor e446eddca9 Adding my Roadkit keymap (#1798)
* Initial khord roadkit keymap

* Remove bad readme

* Transfer dot through to layer 2 and add clarifications to layout comments
2017-10-05 07:22:58 -10:00
Dylan Khor 0cc62459a7 Minor typo 2017-10-05 07:22:25 -10:00
Sebastian Kaim 29bcffb3f3 Edited a minor typo in feature_bootmagic.md. 2017-10-05 06:17:34 -10:00
Cory Shaw 01bf8e1643 Mbsurfer Let's Split keymap updates (#1787)
* Fix mbsurfer let's split layout RGB indicators when both lower and raise are pressed

* Update mbsurfer let's split keymap with new RGB key codes for modes

* Clean up mbsurfer keymap matrix layout
2017-10-03 09:05:10 -10:00
Daniel Gordon 03de0c8575 Reference to rules.mk in tap dance docs added
Change-Id: I64aa6f95a30ab05f0ed3f499e54b9e125d379fad
2017-10-03 09:04:31 -10:00
Gergely Nagy 1cd336dde4 ergodox: Update algernon's layout to v1.11
Overall changes
===============

* Updated to work with QMK master.
* The `$` and `^` symbols on the number row were swapped on both the base and
  the ADORE layers.
* The bracket tap-dance keys can now be used to input Japanese brackets, `「`
  and `」` with a third tap.
* The second column of the top row on the right side will act as a "Social"
  application selector on the `AppSel` layer.
* The third key on the same column will select a password manager.
* The `GUI` key will now launch `rofi` when triple-tapped.

Miscellaneous
=============

* The `👶` symbol can be entered with UCIS.
* The `👪` symbol can be entered with UCIS.

Tools
=====

* `tools/hid-commands` can now find the `Mstdn`, not just `Slack`, as the
  "Slack"/chat app.
* `tools/hid-commands` can now find the Plex web app as a music/media player.
* `tools/hid-commands` now understands the "Social" application selector. It
  raises the `Mstdn` and `Tweetdeck` windows, but keeps focus on the previous
  window.
* `tools/hid-commands` now understands the "Social2" application selector, which
  raises `Signal` and `Viber`, but keeps focus on the previous window.
* `tools/hid-commands` is now able to select a password manager (KeePass*).
* `tools/hid-commands` can now run `rofi` when receiving an `appsel_helper`
  command (triggered by a triple-tapped `GUI` key).

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2017-10-03 07:54:56 -10:00
Campbell Barton cc52ac5b16 code_friendly_qwerty keymap 2017-10-03 07:46:18 -10:00
Philippe Voinov efbc4d2295 Add new planck layout (#1778)
* Custom layout: tehwalris

* Prevent stuck modifiers.
2017-10-03 07:45:22 -10:00
Fred Sundvik 67eeb889ba Fix dynamic macros on ChibiOS keyboards 2017-09-30 06:22:24 -10:00
Fred Sundvik 25285a1c5a Don't process keycodes on the slave 2017-09-30 06:22:02 -10:00
Max Riveiro f1451b4b04 Fix HSV Color Wheel image on RGB Light page (#1773)
Signed-off-by: Max Riveiro <kavu13@gmail.com>
2017-09-29 16:19:15 -07:00
skullydazed 5fd68266f5 Clueboard 60% support (#1746)
* initial clueboard_60 support

* LED lighting support

* fix the clueboard->clueboard_66 rename

* Add layout support to clueboard_60

* Fix the 60_iso layout so it's actually iso

* add a default keymap for AEK layout

* fix clueboard_17

* Fixup the ISO layouts

* Fix the `wait_ms()/wait_us()` definitions for chibios

* Fix up the wait_ms/wait_us hack. Reduce stack size.

* Add a missing #include "wait.h"

* commit files that should have already been comitted
2017-09-29 16:17:30 -07:00
Matt b736f25e85 added matrixman layout 2017-09-29 11:53:27 -10:00
drashna d28fb63fac updated drashna's keymaps (#1769)
* Add woodpad

* Cleanup

* Remove misc layouts for woodpad

* Move woodpad to handwired

* Updated RGB Underglow info
2017-09-29 11:52:37 -10:00
mechmerlin 6ec7ccec63 Support for KBP V60 Type R 60% keyboard (#1770)
* Support for KBP V60 Type R 60% keyboard

Support does not include in switch or underglow lighting for Polestar Edition.

* rename v60type_r to v60_type_r

* Remove old v60type_r

* Modify readme.md to adhere with QMK readme formatting.
2017-09-29 11:51:12 -10:00
Jack Humbert 791b9cc652 remove all makefiles from keyboard directories 2017-09-27 08:21:09 -10:00
Ethan Madden e2480a299e ?= -> = 2017-09-25 19:36:44 -04:00
Ethan Madden 692c4e7508 Added Obelus
tearing it down so that it can be rebuilt

fiddling with audio

big default config overhaul

apparently startup sounds work without the override now

readme!

readme fixes

readme tweaking
2017-09-25 19:36:44 -04:00
Florian Beeres f1c7b813aa New layout for XD60/64 (#1748)
* Add yuuki keymap

Documentation is still a TODO and the keymap may not be final

* GRV on colon

* add KC_GRV to FN ESC

* hhkb ish

* hhkbish 2

* HHKBish and documentation

* Fix Markdown warnings

* typo
2017-09-25 13:31:42 -04:00
Fred Eisele a00532759b Move work from pinky fingers to thumbs and index fingers (#1749)
* phreed keymap added
This keymap moves many pinky keys to the center

* set to do what I want but LT() does not return to previous layer

* get overlays working

* get overlays working

* fix the readme

* fix the readme

* swapped the shift

* swapped the shift

* propagate mods

* clear special char on readme
2017-09-25 13:30:58 -04:00
Danny 5dab2ef12a Update Viterbi default layout (#1753)
* Implement sticky modifiers

* Change underglow based on sticky mod status

* Set RGB lights based on which mods are stickied

* Add controls for dimming RGB LEDs

* Only update RGB lights if modifiers have changed

* Use all LEDs to show modifier state

* Create default keymap for Viterbi
2017-09-25 13:21:27 -04:00
Kenny Hung a67c930e9e XD75RE Custom layout, and clarification in readme.md (#1754)
* Duplicate default layout as basis of my own

* Basic Colemak layer, just to practice flashing

* Add reset button so that we don't have to short out the reset button on the board to flash it.

* Symbols layer

* Navigation layer, and remove unused keys. Now usable, nice.

* Correct backspace for UK QWERTY mapping

* Small clarification in XD75RE readme instructions

* Use UK pipe so that I can type a pipe on a UK keyboard
2017-09-25 13:20:41 -04:00
unknown 56d750659a Removed unneeded code from keymap 2017-09-25 13:15:04 -04:00
unknown 169d46ce83 Add my gherkin keymap, and update readme and config 2017-09-25 13:15:04 -04:00
Lukas Werling 1ad941e984 Add shell.nix for NixOS users 2017-09-25 13:14:20 -04:00
Zach Burchill 809c9258c1 Fixed typo of "multually" to "mutually" 2017-09-25 13:08:06 -04:00
surlyjake c8d365f5da platform descriptions to match master keycodes.md documentation 2017-09-25 13:07:46 -04:00
surlyjake 957e44231a updated keycodes media descriptions
Platform compatibility descriptions added for mute, volume up/down
2017-09-25 13:07:46 -04:00
Jack Humbert aef36ada02 add conditional for planck-mitch keymap 2017-09-24 23:50:18 -04:00
Yan-Fa Li 878774b24e Contribute a DZ60 keymap for 67 key configuration 2017-09-21 09:43:27 -04:00
Danny Nguyen 8c02748c81 Update Viterbi keymaps 2017-09-21 09:40:13 -04:00
Danny Nguyen 37b9715cbc Update default Viterbi layout 2017-09-21 09:40:13 -04:00
Danny Nguyen 94823176c5 Adjust Viterbi pinout 2017-09-21 09:40:13 -04:00
Danny Nguyen 92b74e2d36 Rename cloned Nyquist files to Viterbi, create temporary keymaps
Add WIP keymap for dwallace
2017-09-21 09:40:13 -04:00
Danny Nguyen 72e9939143 Clone Nyquist keyboard for Viterbi 2017-09-21 09:40:13 -04:00
Jack Humbert 4c75285816 add filess 2017-09-21 00:32:01 -04:00
Jack Humbert d77e55d31e move keymap to rules.mk 2017-09-21 00:27:14 -04:00
Batuhan Baserdem 31e78d22b4 Turkish planck keymap (#1675)
* Adding keymap

* Adding keymap

* Compiles now, but doesn't flash

* Fixes issues with compilation

* Trying to fix issues with tap-dance layer

* Trying to fix issues with tap-dance layer

* Trying to fix issues with tap-dance layer

* Fixed bbaserdem layout

* Added keyboard layout image

* Edited README.md

* Changed layout and removed image from README.md

* Changed tapping terms

* Changed layout a bit
2017-09-21 00:19:57 -04:00
U-SALTY-WINTENDO\Haj Okuda ea7792b6c6 Adding my keymap with Colemak Mod-DH 2017-09-21 00:16:43 -04:00
Michael F. Lamb b1d6005c52 add layout mitosis-datagrok (workman variant) 2017-09-21 00:16:22 -04:00
Jeremy Cowgar 064f682103 Instruct VSCode to indent using spaces, also ignore two temp files created by VSCode. 2017-09-21 00:15:53 -04:00
Jack Humbert 32d6a8b7ec adds DZ60 support (#1734)
* adds support for dz60

* fix dz60 readme
2017-09-19 10:27:46 -04:00
QMK Bot 0c335270bd convert to unix line-endings [skip ci] 2017-09-19 04:47:16 +00:00
Rozakiin 62a02af915 Fixed uk78 and turned Bootmagic off (#1725)
* Add files via upload

* Update readme.md

* Update readme.md

* Add files via upload

* Add files via upload

* Update config.h
2017-09-19 00:44:43 -04:00
Nicolas Guelpa 3173924421 Adding a new layout for the planck that helps when coming from the pok3r (#1701)
* adding new layout for the planck that helps when coming from the pok3r

* Fixing the function layer

* Update readme.md

* Update keymap.c

Making some small adjustments

* Update keymap.c

switching GUI and Esc

* Update keymap.c
2017-09-18 17:13:01 -04:00
Jeremy Cowgar a89183591c Fixed a few typos and spelling errors in auto shift feature document 2017-09-18 17:08:18 -04:00
Jeremy Cowgar d0ca713eb4 KC_TILD should not have been listed as an auto shift key 2017-09-18 17:08:18 -04:00
Jeremy Cowgar abba393f57 Added Auto Shift, tap key = normal, hold key = shifted state. 2017-09-18 17:08:18 -04:00
Daniel Shields 87021371e6 Remove redundant Makefile. 2017-09-18 17:07:41 -04:00
Dylan Khor da887ea412 Address issue #1713 (#1728) 2017-09-17 11:53:45 -07:00
Phil Hagelberg 2a02df84b6 Improve readme and PID codes for Atreus. 2017-09-17 00:04:08 -04:00
krusli 25aa474246 Updated RGB code to use event.pressed 2017-09-16 09:34:29 -04:00
krusli c7ebb0f950 Add RGB code (from ps2avrgb and luizribeiro/qmk_firmware) 2017-09-16 09:34:29 -04:00
krusli a8a02455f5 Keymap updates 2017-09-16 09:34:29 -04:00
krusli 6cfb85f32f Fixes for RGB, more colours 2017-09-16 09:34:29 -04:00
krusli 0b7df9f2ef Update on/off toggle behaviour for RGB LEDs 2017-09-16 09:34:29 -04:00
krusli d281cd5c40 Change max brightness level for iOS 2017-09-16 09:34:29 -04:00
krusli 69ab37fca1 Got luizribeiro's ps2avrgb implementation working for Mechmini 2017-09-16 09:34:29 -04:00
Jack Humbert 024f0455de [core] fix rgb source include 2017-09-15 22:12:25 -04:00
Andrew Plaza (insidious) 6198fed566 Updated README in ergodox_infinity keyboard (#1702)
* changed 'infinity' to 'ergodox_infinity' and specified to be in the top-level directory as per recent changes to directory structure of QMK_firmware git repo

* accidently removed '-' in last line of readme
2017-09-15 22:01:51 -04:00
lucwastiaux 3e1f388bda Adding Ergodox EZ and Atreus Dvorak 42-key layouts (#1705)
* importing 42 key dvorak layout

* added comment for build instructions

* adding atreus dvorak 42 key layout

* added readme

* add readme

* build instructions

* additional MEH shortcuts
2017-09-15 22:00:26 -04:00
Rob Rogers 7bcf3e2781 Wording changes for the WSL install script 2017-09-15 21:59:56 -04:00
Jack Humbert 5ad5c230d6 Merge branch 'luizribeiro-ps2avrGB' 2017-09-15 21:44:39 -04:00
Jack Humbert dc7d0c7b74 update to driver separation 2017-09-15 21:43:58 -04:00
krusli afcf3a2878 Update Mechmini keymap, reduce reported power consumption for iOS Camera Adapter compatibility 2017-09-15 20:11:40 -04:00
Dylan Khor ee9a20ff37 Cleaned, revised, and updated my keymaps to reflect new changes/defaults (#1712)
* add new RGB keycodes and clean up lets split keymap

* extraneous cases

* More cleanup and added macro

* one more macro

* cleaned up my planck keymap and added macros

* Transitioned planck keymap to new formatting / audio modes based on new default

* Remove extraneous newline in song list, add keycodes missed in previous commit

* error in graphical representation of keycodes
2017-09-15 19:21:46 -04:00
Danny 5eb5b6074c Add Levinson keyboard (#1723)
* Fork lets_split to levinson

Update subproject default

* Update Readme

* Pass LED backlight info from master to slave over serial
2017-09-15 19:20:50 -04:00
Hugh 19f48fa922 "New" Atreus Keymap (#1717)
* Merge with upstream

* Finish merge

* Add new keymap

* Change use of KEYMAP macro

* Add Readme.md

* Fix link

* Clean up comments

* Raise on leading edge of keypress
2017-09-15 15:51:47 -04:00
Danny Nguyen c02de0932a Remove accidentally pasted line in MF68 readme 2017-09-15 15:49:57 -04:00
Florent C 17c84f24cd Adapt build instructions to new keyboard name 2017-09-15 15:49:36 -04:00
Christopher Browne a07d1f22aa Some revisions to cbbrowne Planck keymap, and a preliminary xd75 keymap (#1715)
* Add HOME/END keys as upper/lower on arrow-up/down

* Reduce .hex file size by turning off unneeded options

* Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand

* Latest super latest version merge

* cbbrowne keymap for XD75re

* starting notes on XD75re keymap plans

* First draft of bottom row of QWERTY

* Switch my special bottom line over to QCENT

* Dunno

* Filling in wanted keys, bit by bit...

* Add copyright, extra macro

* Clean up comments, remove some experimental code I didn't like

* TODO plans for xd75re

* clean up keyboard layout

* QCENT2 is my new experiment for the main keyboard...

* Add a few more main layer keys, and modify LOWER to shift things outwards to conform with main layer

* Clean up RAISE layer to conform with main layer, remove QCENT layer as QCENT2 is the new thing

* More xd75 changes, now that I actually have it in hand

* shift keymap around, as original attempt was a bit too aggressive in keeping to the edges

* more revs to XD75

* Dropping parts of the centre keypad in favor of Keys I Really Need

* Improve documentation to conform with how builds are done now

* Improve documentation to conform with how builds are done now

* Add cbbrowne rules file as alternative to having the rules in Makefile

* Makefile not needed anymore for individual keymap
2017-09-14 14:02:49 -04:00
Harshit Goel 23ce0b43b6 Further updated ergodone readme.md (#1714)
* updated read.md file

* added image to flash hex on ergodone

* corrected image link

* updated direct image link

* image with larger text
2017-09-14 13:05:29 -04:00
Danny 4549dcd21f Add support for MF68 replacement PCB for Magicforce 68 (#1698)
* Port TMK code for MF68

* Change KEYMAP to KC_KEYMAP and add macro
2017-09-13 17:53:10 -04:00
Goel 7da585917b updated read.md file 2017-09-13 17:51:30 -04:00
Sean Hunter cf001300b3 [planck] Adds Sean Hunter keymap(#1706)
* Sean Hunter initial keymap

* Update old map to sync it up with new one

* Add TODO
fix a few minor things

* small doc fixes

* Minor fixups
2017-09-13 17:47:48 -04:00
Danny Nguyen 63028dde82 Add jojiichan keymap 2017-09-13 17:46:25 -04:00
Jack Humbert 7ad924bae5 Updates send_string functionality, adds terminal feature (#1657)
* implement basic terminal stuff

* modify send_string to read normal strings too

* add files bc yeah. working pgm detected

* pgm detection apparently not working

* adds send string keycodes, additional keycode support in send string

* implement arguments

* [terminal] add help command

* [terminal] adds keycode and keymap functions

* [terminal] adds nop.h, documentation

* update macro docs
2017-09-12 00:43:10 -04:00
Kaleb Elwert a4ff8b91f7 Update tv44-belak keymap 2017-09-10 22:59:30 -04:00
Marco 63cde006c5 Changed USB manufacturer to "JMWS"
Don`t know, if this is 100% correct, but the original software refers
to "JMWS JM60 Driver".
2017-09-10 22:58:55 -04:00
Marco d331e274b3 Use KC_GESC keycode instead of custom function 2017-09-10 22:58:55 -04:00
Marco 349e0012ba Basic support for JM60 keyboard
This adds basic support for JM60 RGB PCB that was sold
by KBDfans https://kbdfans.myshopify.com/
https://www.aliexpress.com/store/product/JM60-RGB60-Custom-mechanical-keyboard-PCB-ANSI/2230037_32810956675.html

No support for RGB Backlight yet.
2017-09-10 22:58:55 -04:00
Ptomerty 68b6de60e0 fix for toggle tap dance 2017-09-10 22:57:26 -04:00
Jack Humbert f10e9586df adds a default ergodox_infinity keymap 2017-09-10 00:10:35 -04:00
skullydazed 4cdcbdb861 Remove all Makefiles from the keyboards directory. (#1660)
* Remove all Makefiles from the keyboards directory.

* update keymaps added in the last 8 days

* Ignore keyboard/keymap makefiles

* update hand_wire to reflect our new Makefile-less reality

* Update the make guide to reflect the new reality

* move planck keymap options to rules.mk

* update planck keymaps 4real

* trigger travis

* add back build_keyboard.mk

* restore changes to build_keyboard
2017-09-08 13:47:50 -04:00
Jack Humbert cf8e10533b update some keymaps that broke w/defaults 2017-09-08 01:42:32 -04:00
skullY 927ef81363 Revert "Remove the "lib/%" rule."
This reverts commit 6fc43ddaf6.

I didn't think this through before pushing it.
2017-09-06 21:09:08 -07:00
skullY 6fc43ddaf6 Remove the "lib/%" rule. 2017-09-06 21:04:29 -07:00
Hugh 0759adeaf1 Split atreus (#1680)
* Merge with upstream

* Add split_atreus keymap for lets_split.

* Move bspace

* Tidy up keymap

* Update layer enum

* Temporary fix

* Finish merge

* Added keys for testing

* Revert temporary fix

* Remake keymap using default let's split map as base. ASCII art not
updated

* Remove non-functioning layers

* Rename folder

* Update ASCII art

* Remove vestiges of ADJUST layer

* Remove nonexistent layer #defines

* Rename folder to avoid confusion

* Add Readme.md

* Formatting

* Description of underscores in layer maps
2017-09-06 18:33:52 -07:00
Jason Milkins 43a1ea3035 Add TKL keymap for Frosty_Flake (#1666)
* Add TKL keymap for Frosty_Flake

* Update readme.md

* Add spaces for ghfm newlines

* add note for dfu target
2017-09-06 17:42:19 -07:00
skullydazed af14e672c9 Add a clueboard rev3 (#1688)
* Allow the knight animation to be restricted to a portion of the LED strip

* Add keys for jumping directly to particular animation modes

* Remove orphaned break statements

* Tweak the `RGB_MODE` buttons so they cycle through the same mode.

* small indentation fix

* Add a new revision of the clueboard with 18 underlight LEDs
2017-09-06 15:27:29 -07:00
skullydazed 2b3803eb5e Clone chibios and ugfx if it's not already checked out. (#1651)
* Clone chibios and ugfx if it's not already checked out.

* update the submodule out of date message
2017-09-06 15:21:31 -07:00
skullydazed 4580d3a730 RGB improvements (#1684)
* Allow the knight animation to be restricted to a portion of the LED strip

* Add keys for jumping directly to particular animation modes

* Remove orphaned break statements

* Tweak the `RGB_MODE` buttons so they cycle through the same mode.

* small indentation fix
2017-09-06 14:49:19 -07:00
Will Jiang 0ce45eb0b7 Update mac guide (#1665)
`avr-libc` is no longer, and it's called `avr-gcc` now. https://github.com/osx-cross/homebrew-avr

Also you need `gcc-arc-none-eabi` to be able to compile in my experience.
2017-09-06 10:36:47 -07:00
Wilba6582 85c3c5926c Force Raw HID interface number to 1 always (#1669) 2017-09-06 10:33:00 -07:00
CarVac 323fa19e2d Dvorak-optimized Mitosis keymap with mouse keys (#1676)
* Add carvac_dv keymap for mitosis

* Add mouse keys

* move backspace, etc, and fix tab

* remove commented-out functions in keymap

* Fix scroll buttons and add left/right scrolling

* Make num momentary, add comments, and clean up

* fix mouse scroll acceleration
2017-09-06 10:19:35 -07:00
Ethan Madden de0e025472 Added personal minivan keymap (#1681)
more consistent layer setup

documentation!

slide some things around

more doc jiggling
2017-09-06 09:48:21 -07:00
Jay Liu b032867236 Update Infinity Ergodox Makefile (#1682)
I believe this change is needed in response to the recent change in folder structure.
2017-09-06 09:47:41 -07:00
Jack Humbert c8e232907f Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-09-06 12:38:08 -04:00
Jack Humbert 994592f985 add audio on/off audios 2017-09-06 12:37:57 -04:00
Rob Rogers 4d5b7dea14 Let's split hand mirroring support
commit b7a1c6fe3f0709d176a7833387051b2323b16f17
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Wed Sep 6 08:28:00 2017 -0500

    add hand swap config matrix for Let's Split

commit 1d53113d96b711db549f735316c2ea3f7469021b
Merge: 98f40e3 4edfa97
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Tue Sep 5 21:43:34 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 98f40e31c4a1728d826037b375cf336d550bf69a
Merge: a825225 94f8b75
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Mon Sep 4 20:20:46 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit a825225810a6282f7229cdf6b1c05fd9c27e1808
Merge: 56846cb f0db2c0
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Thu Aug 31 19:47:25 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 56846cb0326f1c78cba47b8161f4d389e19202c3
Merge: 4deb6ca ba2ad57
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Sun Aug 27 15:05:16 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 4deb6ca77633c603f8a134946bb4edc7ed619b50
Merge: 6f85d1f 7960302
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Sat Aug 26 23:23:48 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 6f85d1ff7cfac0a4a70b133984cd681852b49df6
Merge: e6aff71 4b0c6dc
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Thu Aug 24 14:33:31 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit e6aff71807bf2dc41edbec91408a827c32ef73ef
Merge: 9d38f6f d54360b
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Wed Aug 23 13:43:20 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 9d38f6fe83e08962b14fd5d8a70ff100302af598
Merge: d1c0a9f 3aa7fbc
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Tue Aug 22 22:13:05 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit d1c0a9f3b0d9ac466595b197cd8fbce3f1e42f8a
Merge: bd8dbb9 5cab5e4
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Sun Aug 20 10:00:01 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit bd8dbb9d19344623f1b3cefc0a2b205864e9ba3c
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Sun Aug 20 09:59:45 2017 -0500

    fix line endings another time
    '
    '

commit 2602515eb22451feed3178966ffeed33c0f4548b
Merge: 41e549e 71d1c02
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Wed Aug 16 21:31:28 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 41e549e3d527b58f92df28caf8daecae06e5ecf8
Merge: e624ea5 88198a9
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Fri Aug 11 12:48:45 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit e624ea55a1f715d008661ae2e180ae55a09ef0c8
Merge: 5966f09 933701c
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Mon Aug 7 14:43:30 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 5966f096016ffce9c4802ade57d250d9f756bd73
Merge: 71c173d dd3803f
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Tue Aug 1 21:58:14 2017 -0500

    Merge branch 'master' of github.com:qmk/qmk_firmware

commit 71c173dee1aa16dd762897531c42d23f6da0159c
Author: Rob Rogers <r2d2rogers@gmail.com>
Date:   Mon Jul 31 00:19:08 2017 -0500

    line endings???
2017-09-06 09:20:49 -07:00
Jack Humbert 4d5eeb3d7d update planck stuff 2017-09-06 12:19:40 -04:00
David Stosik 4edfa97e03 Improve and simplify RGB Knight mode (#1677)
* Simplify RGB Knight mode code, and make it look closer to KITT

* Remove RGBLIGHT_EFFECT_DUALKNIGHT_LENGTH
2017-09-05 14:19:08 -07:00
Jack Humbert 5f154f0a00 Update feature_common_shortcuts.md 2017-09-05 13:11:43 -04:00
David Stosik 94f8b758b3 Fix Kitt and its default behavior (#1674) 2017-09-03 11:02:06 -07:00
Lukmanul Hakim f0db2c0512 Set proper backlight level 2017-08-31 09:58:04 -04:00
QMK Bot 8ea690a1b3 convert to unix line-endings [skip ci] 2017-08-30 15:55:39 +00:00
Jonathan Arnett b07b4bb97b Alterations and documentation updates for j3rn Ergodox EZ keymap (#1656)
* Add second set of AltSft and Alt

* Insert the play key between previous and next

* Update documentation
2017-08-30 11:52:43 -04:00
David Stosik 5b897ce223 Port #1576 to Let's Split: EECONFIG_HANDEDNESS gets overridden when RGB is enabled 2017-08-30 11:51:58 -04:00
Otto Rask da33dfec55 rask's Satan and BananaSplit60 (#1654)
* Add rask's Satan layout

* Add rask's Satan layout

* Add rask's BananaSplit60 layout

* Add rask's BS60 readme

* Fix rask's BS60 readme image

* Fix rask's BS60 readme image again
2017-08-30 11:51:18 -04:00
Michael Terhar a4316ba486 Fixed mitosis-mjt audio (#1653)
* copied mjt keymaps from archive

* All mjt boards now compile

* fixed jd45-mjt breathing

* Updates to fix SpaceFN but not tested yet.

* Still missing either spacebar or an adjacent keypress.

* Debugging rigged up for use with hid_listen.

* Reverted the default keymap to use tap_layer_key rather than custom.  Moved custom approach to keymap_debug.c

* Fixed the lower-left side of the keymap, which needed more spacers due to the matrix being directly put into the array rather than using the keymap function.

* Cleaned up JD45 keymap that uses tapkey.

* Redid minivan keymap with numsym rather than raise/lower.
Untested.

* Created my MJT keymap for HHKB
Enabled dynamic macros and moved
somoe of the shortcuts around.

* Minor keymap fixes to make them compile without errors.

* Added home/end to right arrow cluster on DYN layer.

* Added more keys to fn and dyn layers.

* It wasn't using my custom layer last time somehow...?  Now it will.

* Compiled and installed at end of day on 8/23

* Moved macros to FKEY layer because Adjust was too hard to get into and out of without some sort of feedback.

* Fixed volume controls... were reversed and disabled.

* Added F13-F15 back to fkeys layer in Minivan

* Created new Planck Keymap that uses the NumSym and FKeys layer approach like the Minivan.

* Removed DYN layer.

* Fixed diagram in planck numsym.

* Cleanup for pull request.

* Roadkit flip phone warning.

* Replaced PLAY_NOTES_ARRAY to PLAY_SONG

* reset the submodules

* checked out specific commits for submodules

* Removed debugging from JD45 shared config.h

* Moved custom rules.mk to apropriate keymap

Reset the shared rules.mk file.

* Trailing return issue in rules.mk

Gotta make for a smooth pull request :-)

* Mitosis music troubleshooting

Also updated the song playing function.
Does not work currently.

* Fixed mitosis audio

* Put mitosis/rules.mk back to QMK master
2017-08-30 11:50:31 -04:00
Marco Fontani da83f04a30 add UC_OSX_RALT to make unicode use the Right Alt key on OSX 2017-08-30 11:38:03 -04:00
drashna 9987f9dcff Update drashna's keymap (#1649)
* initial commit for my custom layout

* fix switching into and out of numfun layer

* enable tap dance to lock layers

* enable layer indicator LEDs

* remove Colemak2 layer because it was dumb

* remove handler for nonexistent keycode

* add new movement keys to lower layer

* standardize indentation because I'm not a monster

* add Woodpad keyboard with Michael's Tryggve layout

* Add dvorak/colemak layers

* add hash

* Update keymap.c

* Fixed OSL Symbol layer layout issue

* Minor later tweak

* Clean up actions

* Diablo 3 macro keys remove

* Fixed numbad issues

* Remove Underglow toggle

* Fix layer consistency

* cleanup of code

* line feed

* small fixes

* Major merge

* Merge cleanup on my keymap

* Cleanup

* Update compile command

* Swapped arrows

* Additional cleanup

* Revert "Woodpad"

* update

* minor update

* staging for pull request

* Finish removing layer underglow toggles
2017-08-30 11:36:14 -04:00
Fredric Silberberg ad73553aa9 Update README. 2017-08-30 11:28:56 -04:00
Fredric Silberberg 00d8f0c082 Small gaming layer and formatting updates to my nyquist config. 2017-08-30 11:28:56 -04:00
Jack Humbert a729d852fe Merge pull request #1574 from danamlund/master
New clueboard keymap that is a tetris game
2017-08-30 11:27:52 -04:00
Arthur SCHMITT da7aece043 Add the new QMK submodule way in /lib and not tmk_core/tool wich is outdated 2017-08-30 11:26:24 -04:00
skullY ed56a6859f add a git-submodule make target. 2017-08-28 11:26:35 -04:00
Jack Humbert ba2ad57ca8 add rule shortcut via @samwho's suggesion 2017-08-27 12:53:35 -04:00
Jack Humbert 677b89768b add bin targets - closes #1648, fixes #1647 2017-08-27 12:11:59 -04:00
Michael Terhar 7960302242 Keymaps for several of my boards (#1641)
* copied mjt keymaps from archive

* All mjt boards now compile

* fixed jd45-mjt breathing

* Updates to fix SpaceFN but not tested yet.

* Still missing either spacebar or an adjacent keypress.

* Debugging rigged up for use with hid_listen.

* Reverted the default keymap to use tap_layer_key rather than custom.  Moved custom approach to keymap_debug.c

* Fixed the lower-left side of the keymap, which needed more spacers due to the matrix being directly put into the array rather than using the keymap function.

* Cleaned up JD45 keymap that uses tapkey.

* Redid minivan keymap with numsym rather than raise/lower.
Untested.

* Created my MJT keymap for HHKB
Enabled dynamic macros and moved
somoe of the shortcuts around.

* Minor keymap fixes to make them compile without errors.

* Added home/end to right arrow cluster on DYN layer.

* Added more keys to fn and dyn layers.

* It wasn't using my custom layer last time somehow...?  Now it will.

* Compiled and installed at end of day on 8/23

* Moved macros to FKEY layer because Adjust was too hard to get into and out of without some sort of feedback.

* Fixed volume controls... were reversed and disabled.

* Added F13-F15 back to fkeys layer in Minivan

* Created new Planck Keymap that uses the NumSym and FKeys layer approach like the Minivan.

* Removed DYN layer.

* Fixed diagram in planck numsym.

* Cleanup for pull request.

* Roadkit flip phone warning.

* Replaced PLAY_NOTES_ARRAY to PLAY_SONG

* reset the submodules

* checked out specific commits for submodules

* Removed debugging from JD45 shared config.h

* Moved custom rules.mk to apropriate keymap

Reset the shared rules.mk file.

* Trailing return issue in rules.mk

Gotta make for a smooth pull request :-)
2017-08-26 23:33:33 -04:00
Toshiki Yagi de315c54eb make ergodone's led work well 2017-08-26 23:32:25 -04:00
unknown a6fe0320f5 Updated readme to new standard. 2017-08-26 23:31:47 -04:00
unknown 78ab926cc8 Updated my files and added debouncing 2017-08-26 23:31:47 -04:00
Cory Shaw b28982e329 Add mbsurfer Let's Split keymap with RGB layer indicators (#1638) 2017-08-26 10:34:53 -04:00
Joe Wasson 0965e5203e Merge in gaming layout. 2017-08-26 10:34:07 -04:00
Joe Wasson 8e1c3f410d Add split layout to more keyboards. 2017-08-26 10:34:07 -04:00
Cory Shaw 2aedbf872b Improve default layout of 9key and give example macro 2017-08-24 21:29:10 -04:00
Cory Shaw afd7bf5f09 Increase time for tap dancing on 9key default 2017-08-24 21:29:10 -04:00
Cory Shaw 402235eeb4 Update Bishop Keyboards url to relaunched site 2017-08-24 21:29:10 -04:00
Cory Shaw b2d033ffe8 Add 9key to keyboards readme 2017-08-24 21:29:10 -04:00
Joe Wasson ae91af95e2 Add split ansi layout and talljoe's keymap. 2017-08-24 15:52:08 -04:00
Jack Humbert 4b0c6dc50d update travis script 2017-08-24 08:07:37 -04:00
Jack Humbert 9a23fad36b update ergodox links 2017-08-24 08:00:50 -04:00
Markus Kohler 718fddf44c Fix broken link 2017-08-24 07:59:22 -04:00
Jack Humbert d2ff66a985 Creates a layouts/ folder for keymaps shared between keyboards (#1609)
* include variables and .h files as pp directives

* start layout compilation

* split ergodoxes up

* don't compile all layouts for everything

* might seg fault

* reset layouts variable

* actually reset layouts

* include rules.mk instead

* remove includes from rules.mk

* update variable setting

* load visualizer from path

* adds some more examples

* adds more layouts

* more boards added

* more boards added

* adds documentation for layouts

* use lowercase names for LAYOUT_

* add layout.json files for each layout

* add community folder, default keymaps for layouts

* touch-up default layouts

* touch-up layouts, some keyboard rules.mk

* update documentation for layouts

* fix up serial/i2c switches
2017-08-23 22:29:07 -04:00
Jack Humbert 7260fc3eef update 9key readme 2017-08-23 15:46:02 -04:00
Jack Humbert 437c86c9c1 update build script 2017-08-23 15:44:25 -04:00
Steve Holt d54360b1d8 Update keymap.c 2017-08-22 23:53:41 -04:00
Steve Holt fe4549839e Update config.h 2017-08-22 23:53:41 -04:00
Steve Holt 1d930ebe45 Update Makefile 2017-08-22 23:53:41 -04:00
Jonathan Boyett fcb60b1601 fix link brackets 2017-08-22 23:33:38 -04:00
Cory Shaw 3aa7fbcd79 fix(9key): Fix layout of 9key readme 2017-08-22 23:09:12 -04:00
Cory Shaw 82f434a4d4 update(9key): Add readme with updated format 2017-08-22 23:09:12 -04:00
Cory Shaw d8fd33dd5e Add support for 9key by Bishop Keyboards 2017-08-22 23:09:12 -04:00
Jonathan Boyett bd484f18bd JD40 MiniVan port 2017-08-22 23:07:52 -04:00
Ryan MacLean 9f6362e4df Adding Makefile
Required for JIS layouts
2017-08-22 17:59:38 -04:00
Ryan MacLean 57c93c13cc Creating Mac Version of JIS Keymap
Swapping command and alt, restoring fn+left for delete, subbing in grave for hhkb key.
2017-08-22 17:59:38 -04:00
Jack Humbert e719f5b0b5 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-08-22 10:08:44 -04:00
Jack Humbert 9da308a0cd move to compiled [skip ci] 2017-08-22 10:07:32 -04:00
keisuke333 47cd5b5622 Fix avoid certificate errors that occur during '2-setup-environment-win.bat' 2017-08-22 09:09:51 -04:00
Jack Humbert 0e39f1faf4 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-08-22 08:57:13 -04:00
Jack Humbert dd8cedc361 update travis script 2017-08-22 08:56:39 -04:00
Jack Humbert 51a2ce6145 convert to unix line-endings [skip ci] 2017-08-22 08:56:22 -04:00
Jack Humbert 11d27cec1e attempt to fix line-ending travis stuff 2017-08-21 23:39:06 -04:00
jpetermans 7a445d9167 Add back original copyrights 2017-08-21 23:22:36 -04:00
jpetermans ff32643641 Readme correction #2 2017-08-21 23:22:36 -04:00
jpetermans dbd4ce19e9 Correct jpetermans keymap readme and update copyright info 2017-08-21 23:22:36 -04:00
Jack Humbert 9ff064ae50 triggering travis 2017-08-21 23:11:08 -04:00
Jack Humbert c3c07eff51 update building for .hex, secrets moving 2017-08-21 21:57:46 -04:00
Daniel Shields 69c4cfb238 Fix gherkin README to use correct build command. 2017-08-21 17:04:31 -04:00
Mark Spanbroek 36709d6a30 Use cmd-left and cmd-right instead of ctrl-a and ctrl-e for home and end
The ctrl commands only seem to work well in terminal, not in other apps.
2017-08-21 17:01:27 -04:00
Mark Spanbroek 1ab9e5d1c9 Remove COMPACT_KEYMAP, use full KC_ keycodes instead. 2017-08-21 17:01:27 -04:00
Mark Spanbroek f4b3b576a0 Revert "Add COMPACT_KEYMAP macro to Satan GH60"
9a1826598a1a06d87459c5bbef9db9be277bdae9
2017-08-21 17:01:27 -04:00
Mark Spanbroek dc1d24a4fe Add screen lock key 2017-08-21 17:01:27 -04:00
Mark Spanbroek 0be483c762 Fix power; use keyboard shortcut for Mac 2017-08-21 17:01:27 -04:00
Mark Spanbroek cb719757c2 Reverse the split shift/fn
Turns out that 3c and 3d are not reversed when splitting the right
shift in the way that the Mark I layout does. Reversing it here, rather
than in the generic satan.h to avoid breaking the other layouts.
2017-08-21 17:01:27 -04:00
Mark Spanbroek d172d6bec6 Add Mark I layout 2017-08-21 17:01:27 -04:00
Mark Spanbroek 90b07a5be4 Add COMPACT_KEYMAP macro to Satan GH60 2017-08-21 17:01:27 -04:00
Mark Spanbroek af21fa63e5 Fix: add missing keys to Satan GH60 KEYMAP macro 2017-08-21 17:01:27 -04:00
Stephen Tudor dde035b963 Add smt keymap for Sentraq S65-X 2017-08-21 16:59:52 -04:00
Jack Humbert e7b3991b97 fix readmes 2017-08-21 16:51:16 -04:00
Jack Humbert 1ce3971c90 adds sweet16 and four banger keyboards 2017-08-21 16:51:16 -04:00
Ben James 48e79cbe29 Create readme.md 2017-08-20 20:57:22 -04:00
Ben James 68dafc8382 Create Makefile 2017-08-20 20:57:22 -04:00
Ben James e0d9cc945f Create config.h 2017-08-20 20:57:22 -04:00
Ben James 7aa839915e Create keymap.c 2017-08-20 20:57:22 -04:00
Jack Humbert 78dc7bacfa travis files in gitignore for good measure 2017-08-20 15:20:32 -04:00
Jack Humbert fa6bcfd10c make travis convert line-endings and push a skippable commit 2017-08-20 14:22:18 -04:00
Jack Humbert 1254e76e29 stop compiling ez after build, rework ssh ids 2017-08-20 14:04:35 -04:00
Jack Humbert 166706a32c adds subatomic files (non-working) 2017-08-20 13:52:28 -04:00
Joe Wasson 948d6efcfb Fix stray keystroke in readme file. 2017-08-20 13:28:39 -04:00
Joe Wasson fe60cbd928 Remove PLAY_NOTE_ARRAY usages to get rid of warning. 2017-08-20 12:32:20 -04:00
Jack Humbert f94963e6b7 Merge pull request #1608 from hot-leaf-juice/master
keymap update
2017-08-20 11:52:57 -04:00
Joe Wasson 4b74c9056b Fix Planck Steno layout with new error message (remove MIDI). 2017-08-20 11:51:57 -04:00
Joe Wasson e74a95bf26 Keymap tweaks. 2017-08-20 11:51:57 -04:00
Joe Wasson bae1144a9f Fix compilation error when NO_ACTION_LAYER is defined. 2017-08-20 11:51:57 -04:00
Joe Wasson eb5748e8bf Gherkin keymaps for Steno and Talljoe 2017-08-20 11:51:57 -04:00
Joe Wasson bdc0880ca5 Add compile error if too many endpoints are defined for the ATmega32U4. 2017-08-20 11:51:57 -04:00
Joe Wasson fc70c9ac9e Allow steno to build when NKRO is not defined.
Was missing eeprom.h, MAX(), and memset.
2017-08-20 11:51:57 -04:00
That-Canadian 937b86d030 Added default ECO keymap 2017-08-20 11:47:46 -04:00
That-Canadian cc9b0eb109 Line ending stuff again 2017-08-20 11:47:46 -04:00
Daniel Khodabakhsh 046595f521 Update s60_x/default/rule.mk for original Sentraq S60-X
Fix and issue with the original Sentraq S60-X not being compatible with 'default'. If 'default' shouldn't be changed, perhaps I can create an 'original' revision.
2017-08-20 11:45:18 -04:00
ThreeFx 8341068299 Correct if-statement 2017-08-20 11:17:19 -04:00
ThreeFx a553dcba5a Added gentoo support for dependency script 2017-08-20 11:17:19 -04:00
Jack Humbert 5cab5e4a4e validates json 2017-08-19 08:35:14 -04:00
Jack Humbert d8145c8464 adds redirects for docs 2017-08-19 08:31:54 -04:00
Jack Humbert 81d7e7d4c8 Merge pull request #1601 from dlaroe/master
My keymaps only
2017-08-19 08:19:50 -04:00
Balz Guenat 30ac7d403e remove dead links, add troubleshooting section 2017-08-19 08:19:16 -04:00
Balz Guenat 6ea408da10 Update USB-USB converter README according to #1588 2017-08-19 08:19:16 -04:00
Ryan MacLean 1132646b2f Update readme.md 2017-08-19 08:18:27 -04:00
Ryan MacLean 9eb71e9719 Update readme.md 2017-08-19 08:18:27 -04:00
Ryan MacLean 9ea56f03a1 Fixing readme clobber 2017-08-19 08:18:27 -04:00
Ryan MacLean 07be7b8d69 Reverting CMD Changes
Adding the CMD from @edasque in once more as it allows specifying more than one board via host ENV vars. 
Currently, the Dockerfile is hard-coded.
2017-08-19 08:17:58 -04:00
Wilba6582 baae936b47 Required overridden function for keymaps in EEPROM 2017-08-19 08:16:58 -04:00
Callum Oakley a6845036e2 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-08-19 10:34:45 +01:00
4c4a174dbe Added Preonic Makefile and readme.md 2017-08-18 17:45:32 -04:00
8b62a0af74 Updated keymaps with second LOWER for the right hand 2017-08-18 17:29:19 -04:00
Danny Nguyen 7277f09bba Update Nyquist readme file to new format 2017-08-18 15:44:02 -04:00
Joe Wasson 94ca84d271 Fix incorrect name for GeminiPR in docs. 2017-08-18 14:43:24 -04:00
Jack Humbert 52f2f6d8ea adds audio docs to summary 2017-08-18 13:57:57 -04:00
Benny Powers 9fed4f7948 Add link to keycodes doc in how_keyboards_work 2017-08-18 12:49:55 -04:00
Roy Wellington Ⅳ c0a6935fb3 Fix these links, as they appear to be broken (#1595)
It looks like build_environment_setup.md got renamed to
getting_started_build_tools.md in this commit:

	commit e6c638bed1
	Author: skullY <skullydazed@gmail.com>
	Date:   Sat Aug 5 20:54:34 2017 -0700

		Overhaul the Getting Started section and add a FAQ section

	 docs/{build_environment_setup.md => getting_started_build_tools.md} | 132 ++++++++++++++++++++++++++++++++++++-------------------------------------

This commit adjusts the links to match the new name.
2017-08-18 00:18:04 -07:00
Jack Humbert b483a90a90 update favicons 2017-08-17 17:13:44 -04:00
Drashna Jael're cb76e71109 Add dvorak/colemak layers 2017-08-17 12:38:09 -04:00
0010 8392667ac4 bananasplit LED support and keymap add
* added LED pin mapping
* adding my keymap
2017-08-17 12:37:38 -04:00
Dan Amlund Thomsen 4a9e16b394 Add a tetris keymap to clueboard that includes a tetris game 2017-08-17 18:13:21 +02:00
Danny Nguyen 71d1c02a9b Add message to avrdude script that it can't used within WSL currently 2017-08-16 20:47:43 -04:00
skullY 4e73b0b8d7 Make the bulk of our keyboards match the readme.md standard 2017-08-16 20:36:59 -04:00
Erez Zukerman 2ee0dc7793 Revert "Moves files from ez/keymaps to ergodox/keymaps"
This reverts commit 5e36f8463adf9231a60bc8d1c657d51c3181d079.
2017-08-16 20:36:59 -04:00
Erez Zukerman 9298f9d586 Moves files from ez/keymaps to ergodox/keymaps
That directory shouldn't even exist
2017-08-16 20:36:59 -04:00
Erez Zukerman 356b489d98 Update ErgoDox readme
Per standard recommended in #1362.
2017-08-16 20:36:59 -04:00
Yu He 4c2dafc652 Add separate readme.md for ErgoDone 2017-08-16 17:31:12 -04:00
Yu He 285099de0d Add ErgoDone support to two keymaps that have special config.h 2017-08-16 17:31:12 -04:00
Yu He cb74c8dc46 Add dummy backlight/LED functions for keymaps that require them 2017-08-16 17:31:12 -04:00
Yu He 52f4a38cb3 Add support for the ErgoDone 2017-08-16 17:31:12 -04:00
skullY f02430b131 Update links in the glossary 2017-08-16 15:47:20 -04:00
skullY 9d1a08e38a Doc updates from going through every file 2017-08-16 15:47:20 -04:00
skullY 9b879b1267 break up keymaps and quantum keycodes into files by feature 2017-08-16 15:47:20 -04:00
skullY 2709744cdd take a stab at documenting layers 2017-08-16 15:47:20 -04:00
skullY 207bcd788a rework key_functions into feature_common_shortcuts 2017-08-16 15:47:20 -04:00
skullY e6c638bed1 Overhaul the Getting Started section and add a FAQ section 2017-08-16 15:47:20 -04:00
skullY 89bcdde927 line endings 2017-08-16 12:23:59 -07:00
skullY d3e1aaf5e2 trigger new travis build 2017-08-16 01:11:39 -07:00
skullY 0cc15e117d Cleanup the clueboard keymaps 2017-08-16 01:07:48 -07:00
Balz Guenat 5bff9d6181 cleanup usb-usb converter code 2017-08-15 23:14:41 -04:00
Balz Guenat 7e5ccd50dc add RESET to keymap 2017-08-15 23:14:41 -04:00
Balz Guenat 80d082055b convert keymap into qmk-style 2017-08-15 23:14:41 -04:00
Balz Guenat c8222043fc wow, it builds! added empty matrix.c and moved custom matrix code to custom_matrix.cpp
still untested because of hardware availability :(
2017-08-15 23:14:41 -04:00
Balz Guenat fa86b10138 add extern "C" to matrix.cpp 2017-08-15 23:14:41 -04:00
Balz Guenat 2aa5e44640 some major steps toward making the usb-usb converter work 2017-08-15 23:14:41 -04:00
Balz Guenat 42f895a4bc remove unused variables from makefile 2017-08-15 23:14:41 -04:00
Balz Guenat f4cdc9117c small changes following Jack's advice. 2017-08-15 23:14:41 -04:00
Balz Guenat d7d20e2511 start working on usb-usb converter port 2017-08-15 23:14:41 -04:00
Martin Sandiford 4757140107 Wrapped process_leader.c in #ifndef DISABLE_LEADER to allow compilation with DISABLE_LEADER defined. 2017-08-15 19:51:06 -04:00
Martin Sandiford c622423668 Remove floating point calculation in mouse move. Saves approx 650 bytes if no other floating point used. 2017-08-15 19:51:06 -04:00
discursivemoth b7d43ee253 correct tilde to grave 2017-08-15 19:48:58 -04:00
Jack Humbert 565c670ca4 Merge pull request #1571 from BalzGuenat/grave-esc-fix
Fix for issue #1568
2017-08-15 19:48:14 -04:00
Jack Humbert aee4e4650b Merge pull request #1576 from That-Canadian/minidox
Minidox
2017-08-14 16:21:39 -04:00
drashna be0d49ba63 Add files via upload 2017-08-14 16:20:24 -04:00
drashna 0f2a7b6210 Fixed so will compile both with and without underglow 2017-08-14 16:20:24 -04:00
drashna cb7255755b Add files via upload 2017-08-14 16:20:24 -04:00
drashna 1a0b5aee63 Create Keymap.c
RGB Underglow mod for layer indication
2017-08-14 16:20:24 -04:00
That-Canadian 26650731d1 Added "EECONFIG_HANDEDNESS" to the eeconfig.h , because when RGB was enabled it was overwritting the old EECONFIG_HANDEDNESS address (10), so it is now on a non-conflicting addres (14).
Updated MiniDox split_util.h and eeprom files to reflect this change.

I recommend adding this to any split board that used these files, my changes will not effect them currently.
2017-08-13 14:24:04 -04:00
That-Canadian 1631f7cd79 Merge branch 'master' into minidox 2017-08-13 14:11:40 -04:00
That-Canadian 09e5885e45 Merge remote-tracking branch 'upstream/master' 2017-08-13 14:11:25 -04:00
Balz Guenat b4be711af1 fix for issue #1568 2017-08-12 12:15:36 +02:00
Balz Guenat 430151dd51 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	docs/faq_keymap.md
2017-08-12 12:14:33 +02:00
Balz Guenat 175db1a549 fix code block formatting 2017-08-11 23:13:50 +02:00
Balz Guenat 5ad103fa51 add description of new option to docs and add option (commented out) into template. 2017-08-11 16:54:10 -04:00
Balz Guenat 188ed682e3 add short comment to grave_esc_ctrl_override 2017-08-11 16:54:10 -04:00
Balz Guenat 897ceac26c add option to let ctrl override shift/gui for the GRAVE_ESC.
This enables the ctrl+shift+esc shortcut to task manager on windows.
2017-08-11 16:54:10 -04:00
Balz Guenat 3e67cc9c80 add description of new option to docs and add option (commented out) into template. 2017-08-11 22:20:36 +02:00
Balz Guenat bd38273f6f add short comment to grave_esc_ctrl_override 2017-08-11 21:43:49 +02:00
Balz Guenat 7b8eed9f29 add option to let ctrl override shift/gui for the GRAVE_ESC.
This enables the ctrl+shift+esc shortcut to task manager on windows.
2017-08-11 18:53:08 +02:00
Jack Humbert 88198a9606 move qmk version to very top, exclude when git isn't available 2017-08-10 18:54:14 -04:00
Jack Humbert 6895c4510e fix default layer songs 2017-08-10 16:52:35 -04:00
dwrz 70407a1b67 Add config.h to piemod keymap. 2017-08-10 14:58:15 -04:00
dwrz 3fa32867ad Remove makefile from Let's Split piemod. 2017-08-10 14:58:15 -04:00
dwrz 72b7067489 Add piemod keymaps for Let's Split and Planck. 2017-08-10 14:58:15 -04:00
That-Canadian 48a89ad864 Merge remote-tracking branch 'upstream/master' 2017-08-09 23:17:48 -04:00
Ryan Sullivan a5ab2412ab Update readme
Fixed link and small cleanup
2017-08-09 21:03:05 -04:00
Ryan Sullivan 78ae28f24c Add 'boardy' keymap
Initial version of my personal layout for my keyboard Boardy
2017-08-09 21:03:05 -04:00
Ryan Sullivan b6ed990d58 Rename 'base' to 'default'
Moves Eagleheardt's base layout to the default one for the Org60.  Also changed to use the right header file.
2017-08-09 21:03:05 -04:00
Ryan Sullivan aa660d61ea Add Org60 keyboard
This makes some small changes to the XD60 configuration.  Also moves Eagleheardt's base keymap.
2017-08-09 21:03:05 -04:00
Jasonm23 d2e24354e1 Add TKL keymap for GON NerdTKL 2017-08-09 10:19:39 -04:00
Ethan Madden 6b70b6a990 Readmes! 2017-08-08 23:31:56 -04:00
Ethan Madden daa5cee065 Added my personal layout
added RGB controls to my keymap
2017-08-08 23:31:56 -04:00
Ethan Madden 33a87c132c Base JC65 config
jc65 builds properly, haven't test flashed yet

Enabled RGB backlighting

disabled some other features to save some space
2017-08-08 23:31:56 -04:00
skullY 087d00f769 commit line ending differences 2017-08-08 16:45:44 -07:00
Jack Humbert 26d348b6d1 move version info to the top of the output 2017-08-08 16:06:45 -04:00
Jack Humbert 5210f94a56 add version to make output 2017-08-08 16:06:45 -04:00
Danny Nguyen f1536a3f54 Change installation of avr-libc to avr-gcc, now that avr-libc is integrated into the avr-gcc build 2017-08-08 10:03:19 -04:00
Fredric Silberberg 3815067377 Fixed gaming layer 2017-08-08 10:02:53 -04:00
Fredric Silberberg 114565fe81 Rename SHIFT macro to BV_64 2017-08-08 10:02:53 -04:00
Fredric Silberberg e9d755b6f4 Small gaming layer update 2017-08-08 10:02:53 -04:00
Fredric Silberberg a3e1d9a8cc Added support for locking One Shot modifiers. 2017-08-08 10:02:53 -04:00
Fredric Silberberg 02f405708b Remove hex print code. 2017-08-08 10:02:53 -04:00
Fredric Silberberg 916c4d799d Added NKRO to nyquist layout. 2017-08-08 10:02:53 -04:00
Fredric Silberberg bc59e093ec Updated ergodox profile 2017-08-08 10:02:53 -04:00
Fredric Silberberg 7935f563e9 Updated nyquist gaming layout. 2017-08-08 10:02:53 -04:00
Fredric Silberberg 5fc4a664dc Added initial key lock documentation. 2017-08-08 10:02:53 -04:00
Fredric Silberberg 8e1be7c792 Initial implementation of the key_lock feature. 2017-08-08 10:02:53 -04:00
Fredric Silberberg 7a9fb7c96b Added readme, fixed eql vs plus 2017-08-08 10:02:53 -04:00
Fredric Silberberg 8cb413b6b7 Updated licensing 2017-08-08 10:02:53 -04:00
Fredric Silberberg b66a9af352 Finished initial Nyquist keymap. 2017-08-08 10:02:53 -04:00
Fredric Silberberg fb91d9008b Additional keymap updates. 2017-08-08 10:02:53 -04:00
Fredric Silberberg 1219da753b Initial nyquist keymap 2017-08-08 10:02:53 -04:00
Jack Humbert 107d8031e5 update priyadi's keymap config 2017-08-07 22:36:05 -04:00
Jack Humbert 1a070d6f6f let planck keymaps use KEYMAP 2017-08-07 22:04:37 -04:00
Jack Humbert e966854a65 Merge pull request #1558 from BalzGuenat/bananasplit
Merged my Bananasplit port with Nic's.
2017-08-07 17:09:36 -04:00
Balz Guenat 3961e14209 remove duplicate readme 2017-08-07 22:26:32 +02:00
Balz Guenat d18df8ef7a Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
#	keyboards/bananasplit/Makefile
#	keyboards/bananasplit/bananasplit.c
#	keyboards/bananasplit/bananasplit.h
#	keyboards/bananasplit/config.h
#	keyboards/bananasplit/keymaps/default/keymap.c
#	keyboards/bananasplit/rules.mk
2017-08-07 21:54:06 +02:00
That-Canadian 933701c212 Updated .gitignore to properly have the master changes 2017-08-07 09:06:53 -04:00
That-Canadian 5f58a8f842 Line endings issue for uk78? 2017-08-07 09:06:53 -04:00
That-Canadian 4fd5ee410c Modified gitignore file to allow the left and right hand eeprom files for the MiniDox to be added. They need to be there for proper flashing of the board. They do not change between builds, so no need to re-build them. 2017-08-07 09:06:53 -04:00
That-Canadian 93b850048a Changed my personal keymap and config. 2017-08-07 09:06:53 -04:00
That-Canadian f64d4242ad Updated .gitignore to properly have the master changes 2017-08-07 08:05:35 -04:00
That-Canadian 1bbb49585e Merge branch 'master' into minidox 2017-08-07 08:00:02 -04:00
That-Canadian 597ff7aee9 Line endings issue for uk78? 2017-08-07 07:59:29 -04:00
That-Canadian 15822a8e44 Modified gitignore file to allow the left and right hand eeprom files for the MiniDox to be added. They need to be there for proper flashing of the board. They do not change between builds, so no need to re-build them. 2017-08-07 07:55:33 -04:00
That-Canadian aa67e3cedb Changed my personal keymap and config. 2017-08-07 07:49:43 -04:00
Nic Aitch 7f3921bcb3 Update nic keymap 2017-08-06 22:46:44 -04:00
Nic Aitch b529d5923f Update readme 2017-08-06 22:46:44 -04:00
Nic Aitch fb0d4e96e8 Add nic keymap 2017-08-06 22:46:44 -04:00
Nic Aitch c93975ac94 Add "hhkb with arrows" macro 2017-08-06 22:46:44 -04:00
Nic Aitch ba59b2d97e Port hhkbanana 2017-08-06 22:46:44 -04:00
Nic Aitch 4a5c948561 Port true_banana as default 2017-08-06 22:46:44 -04:00
Nic Aitch 087fbe0628 Port main keyboard parts 2017-08-06 22:46:44 -04:00
Jack Humbert 9e79bb1491 Merge pull request #1554 from qmk/docs
Updates some remaining doc stuff
2017-08-06 22:29:59 -04:00
Gareth Pye 1fc9eabd08 Fixed a layout comment to match layout array 2017-08-06 20:08:37 -04:00
Danny Nguyen 7b5f02aa6a Port updated debouncing algorithm from Let's Split to Nyquist 2017-08-06 20:08:00 -04:00
Danny Nguyen b20a87e3cc Add .eep files for setting hands 2017-08-06 20:08:00 -04:00
Danny Nguyen 396f97068b Add RGB commands to default Nyquist keymap 2017-08-06 20:08:00 -04:00
Rozakiin 5fbd25db62 Update readme.md 2017-08-06 20:06:24 -04:00
Rozakiin 05351ce8b3 Add files via upload 2017-08-06 20:06:24 -04:00
Balz Guenat 525b3deadf add short name for locking mods to docs. 2017-08-03 23:10:31 -04:00
Balz Guenat 308bec28bb Add language-switch for locking switch 2017-08-04 04:16:39 +02:00
Jack Humbert 76ea366abd Merge pull request #1538 from That-Canadian/eco-keyboard
Eco keyboard
2017-08-03 20:58:23 -04:00
Jack Humbert 5c44d40a0c Merge pull request #1540 from fabiant7t/master
amj40 added; my layouts for Let's Split, amj40 and XD75
2017-08-03 20:57:44 -04:00
Danny Nguyen 479139f9d4 Fix location of where the make command should be run 2017-08-03 20:56:21 -04:00
Danny Nguyen e0caf94323 Move avrdude flashing script from individual keyboard rules.mk to common location and improve script.
Port detection script is now more informative and better handles first time flashing of a Pro Micro
2017-08-03 20:56:21 -04:00
Balz Guenat d8c503f3ac add personal keymap 2017-08-03 23:33:31 +02:00
Fabian Topfstedt 088dfb7db5 added a clone of my lets split grid layout on a re75 2017-08-03 21:05:09 +02:00
Fabian Topfstedt 3c2343664c Merge https://github.com/qmk/qmk_firmware 2017-08-03 19:44:58 +02:00
Jack Humbert 83b35bf6f6 Update readme.md 2017-08-03 11:57:18 -04:00
That-Canadian 8765751f70 Added V2 files for the ECO board, also changed default from rev1 to rev2. 2017-08-03 11:02:52 -04:00
That-Canadian c33434c0d6 Merge branch 'master' into eco-keyboard 2017-08-03 10:52:30 -04:00
Balz Guenat 07ba06d0b6 fix section in porting guide that refered to Makefile instead of rules.mk 2017-08-02 22:00:49 -04:00
Eagleheardt b6280f979c Picture and details update
I fixed the picture of the layout and added a bit of an explanation. It now matches the readme file from the uppercase BASE folder
2017-08-02 21:52:31 -04:00
Balz Guenat 15fbe6e233 add the bananasplit keyboard incl. default keymap. 2017-08-03 03:51:34 +02:00
Eagleheardt 7371209ffb Adds Eagleheardt's XD60 keymap (#1528)
* Add files via upload

* Update readme.md

* Update readme.md

* Add files via upload
2017-08-02 21:23:36 -04:00
Gergely Nagy d28b2c395b tap-dance: key + layer helper
This adds the `ACTION_TAP_DANCE_DUAL_ROLE` helper, which makes it easy to have
keys that act as a key on the first tap, and as a layer toggle on the second.

Fixes #1532, reported by @Ptomerty.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2017-08-02 16:06:16 -04:00
Mark John Garcia Merin bb30ff5f71 Fix HHKBish layout arrows 2017-08-02 16:05:46 -04:00
MechMerlin bc5c67b3b2 Change TG to TO 2017-08-02 16:05:46 -04:00
MechMerlin ea02a3ea23 Update keymap to have HHKB-ish support and readme along with it 2017-08-02 16:05:46 -04:00
MechMerlin 29fcb64bb4 add KC_Grave and fix typo on readme 2017-08-02 16:05:46 -04:00
MechMerlin 70cc193d14 Add a readme.md file for the keymap 2017-08-02 16:05:46 -04:00
MechMerlin aab5f349a2 New keymap for mechmerlin 2017-08-02 16:05:46 -04:00
Balz Guenat a7b6292010 added missing media controls and mod-tap rshift/enter 2017-08-02 16:05:22 -04:00
Balz Guenat 8e66f65c77 add my keymap 2017-08-02 16:05:22 -04:00
xk 23549791eb Add keymap xk 2017-08-02 16:04:49 -04:00
Zeal Jagannatha dd3803f334 Normalize all line endings 2017-08-01 16:44:29 -04:00
Fabian Topfstedt 015bf30d9b changed adjust layer to emulate mouse on rignt hand 2017-07-31 22:01:35 +02:00
Fabian Topfstedt 9609a47c3e Merge https://github.com/qmk/qmk_firmware 2017-07-31 21:17:16 +02:00
Fabian Topfstedt 661106bac4 layout updates and cleanups 2017-07-31 21:16:55 +02:00
Jack Humbert bd0a888133 line-endings 2017-07-30 12:59:18 -04:00
Benjamin Kesselring d272111d46 added xd75 to list in /keyboards 2017-07-30 00:46:08 -04:00
Benjamin Kesselring 0b528d2e36 updated readme and tweaked keymap 2017-07-30 00:46:08 -04:00
Benjamin Kesselring cc6043ca29 add backlight support (probably) 2017-07-30 00:46:08 -04:00
Benjamin Kesselring fffc5237a7 fix RGB 2017-07-30 00:46:08 -04:00
Benjamin Kesselring 992a63c0f2 add xd75, preliminary RGB' 2017-07-30 00:46:08 -04:00
Kototama 25659acb1c Add an Ergodox Colemak Mod-DH keymap for french layouts
[Colemak Mod-DH](https://colemakmods.github.io/mod-dh/) layout for
users keeping an `azerty` layout configuration on their OS.

The symbols layers was done after analysing various programming
languages sources codes and should be close to optimal for typing
confort.
2017-07-29 11:38:36 -04:00
ahtn 07cb997b6d Changes lets_split to use timer based debouncing
The let's split code used delays in its debouncing algorithm which
increases input latency. This commit copies and adapts the code from
`quantum/matrix.c` to lets_split's `matrix.c`.
2017-07-29 11:38:00 -04:00
unknown ac634aa455 Fixed error in readme 2017-07-28 23:41:53 -04:00
unknown 6b2a3492b7 Removed un-needed protosplit directory and updated readme 2017-07-28 10:45:34 -04:00
unknown dcd64062d2 Reverted changes 2017-07-28 10:45:34 -04:00
unknown 4148aeee19 Figured out that I didn't need to include both keymaps in both files 2017-07-28 10:45:34 -04:00
unknown 1f78b62cd6 Hopefully compile issues are gone, and updated files 2017-07-28 10:45:34 -04:00
unknown 9f82d14eb9 Fixed all things jack suggested. 2017-07-28 10:45:34 -04:00
unknown b710e21efb Added to blank spaces at end of protosplit to make it compile under make v2 2017-07-28 10:45:34 -04:00
unknown 9334986bd9 Updated readme to show compile rules that won't throw an error 2017-07-28 10:45:34 -04:00
unknown f2824bca02 Fixed typo in my layout and updated 2017-07-28 10:45:34 -04:00
unknown 5023f55856 Fixed some capitalization issues 2017-07-28 10:45:34 -04:00
unknown 6d15f5a5b7 Another typo fix 2017-07-28 10:45:34 -04:00
unknown ea1fd96c84 Fixed typo in my layout 2017-07-28 10:45:34 -04:00
unknown 1eea91f5f8 Updated my makefile..again 2017-07-28 10:45:34 -04:00
unknown 9546b180b9 Updated my makefile 2017-07-28 10:45:34 -04:00
unknown 2265e4ce41 Removed old keymaps 2017-07-28 10:45:34 -04:00
unknown cbc5a08c40 Removed old protosplit folder 2017-07-28 10:45:34 -04:00
unknown 78f79ca6cc Removed old folder 2017-07-28 10:45:34 -04:00
Donald f1dbf72e09 Changed case of protosplit
Also updated readme to have correct capitalization.
2017-07-28 10:45:34 -04:00
Donald c71b60c82a Changed case of deltasplit75 to be lowercase.
To follow convention.
2017-07-28 10:45:34 -04:00
unknown 47c6d201aa Add my layout 2017-07-28 10:45:34 -04:00
xyxjj f6438e42af Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj 242c1da2c2 Delete deltasplit build guide.pdf 2017-07-28 10:45:34 -04:00
xyxjj be1876aa76 Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj 1ef6777723 Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj d3b6552fb7 Delete MX RIGHT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj ce3ea49743 Delete ALPS+MX RIGHT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 811c583636 Delete ALPS RIGHT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 173d1b7571 Delete middle layers - RIGHT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 98f977e95c Delete bottom layers - RIGHT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 1832b59266 Delete MX LEFT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 1bfe5b5723 Delete ALPS+MX LEFT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 038c12d59a Delete ALPS LEFT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj 3d23a80c83 Delete Middle layers - LEFT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj f56884b253 Delete Bottom Layer - LEFT B.dxf 2017-07-28 10:45:34 -04:00
xyxjj d4e695a136 Delete top bezel - blocked corner.dxf 2017-07-28 10:45:34 -04:00
xyxjj 2013f4fb83 Delete top bezel - Winkeyless.dxf 2017-07-28 10:45:34 -04:00
xyxjj 508cc7e56b Delete top bezel - Standard.dxf 2017-07-28 10:45:34 -04:00
xyxjj 8958a4f78b Delete PCB Dimesnsion.dxf 2017-07-28 10:45:34 -04:00
xyxjj 429971997c Delete MX RIGHT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj e898a8ecc8 Delete ALPS+MX RIGHT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj b6e8516d6d Delete ALPS RIGHT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj 2077226fc2 Delete middle layers - RIGHT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj cfafa97227 Delete bottom layers - RIGHT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj 3d73110795 Delete readme.md 2017-07-28 10:45:34 -04:00
xyxjj 727707ef0b Delete PCB Dimesnsion.dwg 2017-07-28 10:45:34 -04:00
xyxjj 2a3af90d9f Delete MX LEFT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj 73e5a7fafe Delete ALPS+MX LEFT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj eceb2a4810 Delete ALPS LEFT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj b34dfeecdf Delete Middle layers - LEFT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj 01458037de Delete Bottom Layer - LEFT B.dwg 2017-07-28 10:45:34 -04:00
xyxjj 461f95ce0b Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj f4bc404aa2 Delete top bezel - blocked corner.dwg 2017-07-28 10:45:34 -04:00
xyxjj b70e68ac5b Delete top bezel - Winkeyless.dwg 2017-07-28 10:45:34 -04:00
xyxjj e4d849ed95 Delete top bezel - Standard.dwg 2017-07-28 10:45:34 -04:00
xyxjj 4f193d6dc2 Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj 934d35ea3f Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj a76a607a2b Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj 9aec284f42 Update 2017-07-28 10:45:34 -04:00
xyxjj 3a0f7865da Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj b11d770bea Update Makefile 2017-07-28 10:45:34 -04:00
xyxjj 5a63aa29a9 Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj ab63ff8d2e Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj 00e4079d5a Delete top bezel - blocked corner.bak 2017-07-28 10:45:34 -04:00
xyxjj 4d88634f07 Delete top bezel - Standard.bak 2017-07-28 10:45:34 -04:00
xyxjj 5ea3b1ea4d Delete PCB Dimesnsion.dwl2 2017-07-28 10:45:34 -04:00
xyxjj c497a19e7b Delete PCB Dimesnsion.dwl 2017-07-28 10:45:34 -04:00
xyxjj 7e07bdbde3 Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj 60e5277a8f Delete PCB Dimesnsion.dwg 2017-07-28 10:45:34 -04:00
xyxjj 96ec98b1ad Create readme.md 2017-07-28 10:45:34 -04:00
xyxjj 7a31ef8284 Add files via upload 2017-07-28 10:45:34 -04:00
xyxjj 0c2b0c7cc1 Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj 42ea9460fe Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj e9daf0606f Update readme.md 2017-07-28 10:45:34 -04:00
xyxjj be2c7aac31 Add files via upload 2017-07-28 10:45:34 -04:00
Joe Wasson c5780647d8 Fix typo in docs. 2017-07-27 16:10:36 -04:00
Joe Wasson 26fb063be3 Link to steno docs from summary page. 2017-07-27 16:10:36 -04:00
Joe Wasson e81e75c147 Move steno keycodes due to conflict with another PR. 2017-07-27 16:10:36 -04:00
Joe Wasson 3e96e8a6a1 Add copyright to steno files. 2017-07-27 16:10:36 -04:00
Joe Wasson c0f63ca9dc Add documentation for Steno. 2017-07-27 16:10:36 -04:00
Joe Wasson f30f12ec81 Add support for GeminiPR steno protocol.
This protocol breaks out "duplicate" keys into their own entry in the packet so that more complicated logic can be done on the software side, including support for additional languages and alternative theories.
2017-07-27 16:10:36 -04:00
Joe Wasson 5987f67989 Add TX Bolt protocol support for Stenography
Requires virtser; Allows QMK to speak the TX BOlt protocol used by stenography machines and software (such as Plover). The upside is that Plover can be configured to listen only to TX Bolt allow the keyboard to switch layers without need to enable/disable the Plover software, or to have a second non-Steno keyboard work concurrently.
2017-07-27 16:10:36 -04:00
Fabian Topfstedt 20b3ac49b7 deleted file 2017-07-26 12:48:13 +02:00
Fabian Topfstedt 619081559b added my amj40 custom layout 2017-07-26 12:47:40 +02:00
Fabian Topfstedt 4a1f701d9f included amj40 implementation of nhou7 from https://github.com/nhou7/qmk_firmware_amj40 2017-07-26 12:46:04 +02:00
Fabian Topfstedt de9331c50c custom makefile 2017-07-26 12:19:13 +02:00
Fabian Topfstedt 3b05183deb symmetric modifiers in bottom row 2017-07-26 12:18:40 +02:00
Fabian Topfstedt 75677655ad left shift is backspace on tap 2017-07-26 11:11:13 +02:00
Fabian Topfstedt c7ea65c6d3 default based customizations 2017-07-26 11:09:29 +02:00
Fabian Topfstedt 4ee571b257 Merge https://github.com/qmk/qmk_firmware 2017-07-25 09:48:58 +02:00
07dcbd23fd First Update 2017-07-24 15:19:31 -04:00
Jack Humbert cefc09ae7d adds option for alt pitch standards 2017-07-24 12:45:34 -04:00
Joe Wasson a543ad4c1d Fix minor formatting issue. 2017-07-23 15:10:27 -04:00
Jack Humbert 6bdf7482b1 update audio/music documentation 2017-07-23 14:59:29 -04:00
Jack Humbert 415d38ba9e adds music mode, music mode songs, music mask 2017-07-23 14:59:29 -04:00
Jack Humbert 9abbbe7089 update audio documentation 2017-07-23 14:59:29 -04:00
Jack Humbert f407f3e8de remove unneccesary headers 2017-07-23 14:59:29 -04:00
Jack Humbert 92ccc9a7b8 use automatic rests with songs (no more rest styles) 2017-07-23 14:59:29 -04:00
Jack Humbert f40ded7894 relocate keymap's useful tools 2017-07-23 14:59:29 -04:00
Jack Humbert fd664fe85b escape song playing in music 2017-07-23 14:59:29 -04:00
Jack Humbert fe113ebad5 start updating audio docs 2017-07-23 14:59:29 -04:00
Jack Humbert 6a3c66776c clean-up planck and preonic keymaps, move audio stuff around 2017-07-23 14:59:29 -04:00
Jack Humbert 8edb67b082 fix line-endings 2017-07-21 19:05:13 -04:00
rootuseralpha e26283e9e5 Update keymap.c 2017-07-20 21:52:13 -04:00
rootuseralpha 8deb405292 Add files via upload 2017-07-20 21:52:13 -04:00
rootuseralpha 4d665a99ae Add files via upload 2017-07-20 21:52:13 -04:00
rootuseralpha 4627cab49d Delete test 2017-07-20 21:52:13 -04:00
rootuseralpha e5f606558e Add files via upload 2017-07-20 21:52:13 -04:00
rootuseralpha f379f05c1e Create test 2017-07-20 21:52:13 -04:00
Maarten Dekkers 1524d29cfb Added some user customization 2017-07-20 10:18:00 -04:00
Maarten Dekkers 30efce5584 Changes to own keymap 2017-07-20 10:18:00 -04:00
Fred Sundvik a5b0f4de35 Add SRC and OPT_DEFS when building tests 2017-07-20 10:17:31 -04:00
Fred Sundvik 20696a9efe Fix building of multiple test directories 2017-07-20 10:17:31 -04:00
Fabian Topfstedt ee43856ff7 Merge https://github.com/qmk/qmk_firmware 2017-07-20 08:22:44 +02:00
Jack Humbert 14c5160b1a Update _summary.md 2017-07-17 15:01:33 -04:00
Jack Humbert 000e749853 Rename docs/features/README.md to docs/features.md 2017-07-17 15:01:11 -04:00
Jack Humbert 7c0610b411 Merge pull request #1498 from That-Canadian/minidox
Minidox
2017-07-14 22:04:18 -04:00
That-Canadian b6d74b9bb9 Fixed typo in readme 2017-07-14 21:58:59 -04:00
That-Canadian 5e8594db82 Updated MiniDox readme 2017-07-14 21:57:41 -04:00
That-Canadian 6c9b69a4b6 Merge branch 'master' into minidox 2017-07-14 21:35:50 -04:00
That-Canadian 5412229603 Merge remote-tracking branch 'upstream/master' 2017-07-14 21:34:37 -04:00
That-Canadian e2e0f5d6d1 Merge branch 'minidox' of https://github.com/That-Canadian/qmk_firmware into minidox 2017-07-14 21:33:19 -04:00
That-Canadian 21b63d9243 Updated i2c and serial files to most recent from the lets split firmware. Also updated that_canadian keymap 2017-07-14 21:24:58 -04:00
Jack Humbert 6ed8ce4f59 Merge pull request #1491 from fredizzimo/msys2
Add support for msys2 build environment
2017-07-13 14:24:26 -04:00
ishtob 087af43dee fix implementation issues from SSD1306 clean up, added rotation (#1494)
* moved OLED update task to keymap

* fix splitting render display to keymap

* Added rotation option for OLED, fixed splitting display render update to keymap

* issues with attribute
2017-07-12 12:10:28 -04:00
Fred Sundvik b7d8dec7dc Fix printf error in make output on msys2 2017-07-12 13:04:50 +03:00
Fred Sundvik 7f67abd7d7 Fix bitfield problem when compiling in native mingw 2017-07-11 22:05:01 +03:00
Jack Humbert cc468523df clean up ssd1306 implementation 2017-07-11 14:23:26 -04:00
Jack Humbert 387b07404a update drivers to exclude lets_split include 2017-07-11 13:57:58 -04:00
ishtob cc6db9c540 Adds Hadron Keyboard (#1492)
* adding hadron keymaps

* fix embedded comment

* fixed TWI driver path

* Delete glcdfont.c

* Delete ssd1306.c

* Delete ssd1306.h

* Update readme.md
2017-07-11 13:53:50 -04:00
Maarten Dekkers 886af32507 Updates maartenwut's keymap (#1489)
* Updated keymap

* Added backlight breathing to fix compile error
2017-07-11 12:53:41 -04:00
Fred Sundvik 78545b9509 Fix unreferenced errors with mingw compiler and unit tests 2017-07-11 19:41:04 +03:00
Fred Sundvik 5a25d50168 Add more dependencies, everything can be compiled now 2017-07-11 18:51:52 +03:00
Fred Sundvik 5c3fd67198 Add tools to the path 2017-07-11 17:55:03 +03:00
Fred Sundvik 0d9e7f635e Extract flip 2017-07-11 17:32:58 +03:00
Fred Sundvik 76bd0d3e18 Install arm toolchain 2017-07-11 17:18:24 +03:00
Fred Sundvik b8c363099b Download and extract avr tools 2017-07-11 16:44:46 +03:00
Fred Sundvik b85ce4ce22 Fix overlong lines, and a few spelling errors 2017-07-11 16:26:29 +03:00
Fred Sundvik d47db637ed Use home directory for download on msys2 2017-07-11 16:11:37 +03:00
That-Canadian d73d30aa84 Merge remote-tracking branch 'upstream/master' 2017-07-10 21:24:20 -04:00
Erez Zukerman 585f140052 Invites contributions 2017-07-10 20:51:46 -04:00
That-Canadian 55fcac4639 Adds Minidox Keyboard (#1487)
* merge

* line ending stuff

* Added MiniDox keyboard folder / configs / and some keymaps

* Updated minidox rev1 config, and readme. Also updated that_canadian keymap to include RGB

* cleaned up that_canadian keymap comments

* Fixed RGB being enabled by default, now it must be turned on at the keymap level
2017-07-10 20:15:08 -04:00
That-Canadian a4958a532d Fixed RGB being enabled by default, now it must be turned on at the keymap level 2017-07-10 17:12:18 -04:00
That-Canadian df50260300 cleaned up that_canadian keymap comments 2017-07-10 16:59:20 -04:00
That-Canadian 55ed97af1e Merge branch 'master' into minidox 2017-07-10 16:53:49 -04:00
That-Canadian 07bf8522ca Merge remote-tracking branch 'upstream/master' 2017-07-10 16:52:56 -04:00
That-Canadian 1fdf3c84fe Updated minidox rev1 config, and readme. Also updated that_canadian keymap to include RGB 2017-07-10 16:51:37 -04:00
Jack Humbert 65c10790d4 Update README.md 2017-07-10 11:53:18 -04:00
Jack Humbert 42d5a324eb Start mvoing hardware drivers to /drivers/ (#1433)
* start driver isolation

* update nyquist and orthodox boards

* update atreus62

* move drivers to avr

* update avr conditional
2017-07-10 11:18:47 -04:00
Fred Sundvik 32fc4da4a7 Install unzip 2017-07-10 18:16:35 +03:00
Fred Sundvik 861087096b Add symlinks only on WSL 2017-07-10 18:05:32 +03:00
Fred Sundvik 7bedf8f4f2 Fix launch of qmk_driver_installer on msys2 2017-07-10 17:51:59 +03:00
Jack Humbert 8d190d5e25 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-07-10 10:35:45 -04:00
Fred Sundvik a2d3fc98b8 Initial structure for shared msys2 and wsl installation 2017-07-10 17:31:58 +03:00
Fred Sundvik 10546665f4 Fix uninitialized backlight_level in the Visualizer 2017-07-10 09:02:36 -04:00
Fred Sundvik 551924f8a0 Add template board files 2017-07-10 09:01:59 -04:00
Fred Sundvik 190b90892b Rename board files to lowercase 2017-07-10 09:01:59 -04:00
Fred Sundvik 9d8279960d Make it easier to use drivers 2017-07-10 09:01:59 -04:00
Fred Sundvik 4da3b19603 Shared default animations 2017-07-10 09:01:59 -04:00
Fred Sundvik 2251560256 Clarify naming between LCD_BACKLIGHT and LED_BACKLIGHT 2017-07-10 09:01:59 -04:00
Fred Sundvik f3c113fb5a Shared gfxconf 2017-07-10 09:01:59 -04:00
Fred Sundvik 8a962f7b27 Define visualizer thread priority by default 2017-07-10 09:01:59 -04:00
Fred Sundvik 011ee29441 Fixup mixed tabs/spaces 2017-07-10 09:01:59 -04:00
Fred Sundvik 630f065376 Remove ergodox from gdisp driver names 2017-07-10 09:01:59 -04:00
Fred Sundvik aca0f4dcae Move GDISP drivers to /drivers/ugfx 2017-07-10 09:01:59 -04:00
Fred Sundvik 1ff5fb000f Fix Makefile error_occured output for unit tests 2017-07-10 09:00:58 -04:00
Fred Sundvik ba405cfbb4 Don't search for TEENSY_LOADER_CLI if it's already defined 2017-07-10 09:00:18 -04:00
Fred Sundvik 7ea8753b72 Don't run dfu-programmer unless specified as a target
This introduces a grep dependency, which I believe we didn't have
before, but it should be available and installed by default on all the
supported systems.
2017-07-10 09:00:18 -04:00
That-Canadian 9312b9db6c Added MiniDox keyboard folder / configs / and some keymaps 2017-07-10 00:46:19 -04:00
That-Canadian 707f4efd99 line ending stuff 2017-07-10 00:30:40 -04:00
That-Canadian e7a5fee1f3 merge 2017-07-10 00:21:38 -04:00
Jack Humbert 6221498601 Merge commit '8858438a770c1c982f33b296447ca77176c751f7' 2017-07-09 21:26:54 -04:00
Jack Humbert 8858438a77 Squashed 'lib/lufa/' changes from f2bd51f4e..bbdc9ac40
bbdc9ac40 Merge pull request #1 from fredizzimo/fix_line_endings
75ba27b8d Fix xml file line endings
7a8237259 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b'
713c65b5b Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61'
00e20c453 delete old lufa

git-subtree-dir: lib/lufa
git-subtree-split: bbdc9ac40c2ff543bbaf3870d407d0a96c945c1a
2017-07-09 21:26:51 -04:00
skullY ddc3d3b64b remove numbered headings 2017-07-08 22:53:43 -07:00
skullY d90dc05ddb try swapping toc and numbered headings 2017-07-08 22:51:16 -07:00
skullY 7583136d73 try removing the anchor plugin 2017-07-08 22:44:18 -07:00
skullY 2dea401a8e play around with plugin settings 2017-07-08 22:39:32 -07:00
skullY 4c7c7747a3 Add terminal examples to doc best practices 2017-07-08 22:39:17 -07:00
skullY fcd08b8c7d more crlf issues 2017-07-08 20:03:33 -07:00
skullY 5810bb67e4 Rearrange the faq a bit 2017-07-08 20:01:35 -07:00
skullY cb9e59152e Flesh out the glossary 2017-07-08 20:01:30 -07:00
Fred Sundvik 9158673166 Reference issue #1478 from the unit tests 2017-07-08 21:59:51 -04:00
Fred Sundvik b3af79eaff Reference issue #1477 from the unit tests 2017-07-08 21:59:51 -04:00
Fred Sundvik 41efcd6d73 Reference issue #524 from the unit tests 2017-07-08 21:59:51 -04:00
Fred Sundvik 60b1880a62 Reference issue #1476 from the unit tests 2017-07-08 21:59:51 -04:00
Fred Sundvik 67f722c9c8 Configure vscode file associations, use hpp instead of h 2017-07-08 21:59:51 -04:00
Fred Sundvik 631c09e976 Fix keymap formatting 2017-07-08 21:59:51 -04:00
Fred Sundvik e5780a6dc6 Add tests for macros 2017-07-08 21:59:51 -04:00
Fred Sundvik 4087d6da0d Add wait support for tests 2017-07-08 21:59:51 -04:00
Fred Sundvik fc4bfbe580 Rename tests to start with test_ 2017-07-08 21:59:51 -04:00
Fred Sundvik 4e69a8bda6 Add basic timing support, and SFT_T tests
Also expose some bugs...
2017-07-08 21:59:51 -04:00
Fred Sundvik a62f449659 Add test for a combo key 2017-07-08 21:59:51 -04:00
Fred Sundvik cae7a9c3ec Add simple modifier test 2017-07-08 21:59:51 -04:00
Fred Sundvik 1985f43bad Improve the tests a bit 2017-07-08 21:59:51 -04:00
Fred Sundvik 72c8df1f19 A bigger test matrix, and test for unmapped keys 2017-07-08 21:59:51 -04:00
Fred Sundvik 1e4cc36e14 Rename test.cpp to keypress.cpp 2017-07-08 21:59:51 -04:00
Fred Sundvik 0256cd8cca Build all cpp files in test directories 2017-07-08 21:59:51 -04:00
Fred Sundvik 7d79962785 Move test keymap to keymap.c 2017-07-08 21:59:51 -04:00
Fred Sundvik 448b91689f Exclude .build and .hex from Visual Studio code 2017-07-08 21:59:51 -04:00
skullY 6e2cae4cda commit files with wrong line endings 2017-07-08 12:34:36 -07:00
Jack Humbert 03706de946 Merge commit '5a3397d17ec917c7be5d5109e01a3a84a355cb1b' 2017-07-07 21:46:08 -04:00
Jack Humbert 5a3397d17e Squashed 'lib/lufa/' changes from a44056fb9..f2bd51f4e
f2bd51f4e fixing line endings

git-subtree-dir: lib/lufa
git-subtree-split: f2bd51f4edba87a259808c92c0424dc36475282b
2017-07-07 21:46:04 -04:00
Jack Humbert ea3df7466a Merge commit 'cedfbfcb1a9ad9cf93816f1952fc4bf7c55fbb61' 2017-07-07 16:40:03 -04:00
Jack Humbert cedfbfcb1a Squashed 'lib/lufa/' changes from 385d40300..a44056fb9
a44056fb9 add .gitattributes

git-subtree-dir: lib/lufa
git-subtree-split: a44056fb9d4784e3a248f460688b35977592cb05
2017-07-07 16:40:01 -04:00
skullY 03eb6a3e86 comment out unformatted audio/midi sections 2017-07-07 13:28:31 -07:00
Jack Humbert 0787d70e55 Updates Documentation from #1444 2017-07-07 15:57:18 -04:00
Jack Humbert 9de443cbf1 Merge pull request #1471 from qmk/lufa_lib
Update LUFA and move it to /lib/lufa
2017-07-07 15:33:29 -04:00
Maarten Dekkers 88b3d051b2 Corrected it again. 2017-07-07 15:33:09 -04:00
Maarten Dekkers 53acc7b074 Cleaned and corrected keymap code 2017-07-07 15:33:09 -04:00
Maarten Dekkers 68cf0d454c Own keymap layout 2017-07-07 15:33:09 -04:00
Ethan Spitz 53174036e9 Add new keymap to try to get pretty close to the default layout for an ergodox keyboard. Coming from that I really like being able to use the backspace from my left thumb. 2017-07-07 15:13:18 -04:00
Jack Humbert 1c26468ad5 update include 2017-07-07 14:53:47 -04:00
Jack Humbert 7bddacf25f update lets_split lufa include 2017-07-07 13:32:29 -04:00
Jack Humbert 4b37030ad0 update lufa implementation 2017-07-07 12:06:59 -04:00
Jack Humbert 39ece81979 delete old lufa 2017-07-07 11:56:51 -04:00
Jack Humbert 60b30c0363 Squashed 'lib/lufa/' content from commit 385d40300
git-subtree-dir: lib/lufa
git-subtree-split: 385d4030035dbaf41591309dbde47653bd03841b
2017-07-07 11:55:23 -04:00
Jack Humbert 8655d4f494 Merge commit '60b30c036397cb5627fa374bb930794b225daa29' as 'lib/lufa' 2017-07-07 11:55:23 -04:00
skullydazed ecd3dbf085 Merge branch 'master' into docs 2017-07-06 18:43:22 -07:00
cato976 1896c76a29 Update mouse_keys.md
fix typo
2017-07-06 10:01:12 -04:00
Maarten Dekkers 58139f87e4 Fixed arrow up and rgb config 2017-07-05 11:48:19 -04:00
Maarten Dekkers 684c381aee Moved RGB features to new layout 2017-07-05 11:48:19 -04:00
Maarten Dekkers c6d544bbb0 Fixed image description 2017-07-05 11:48:19 -04:00
Maarten Dekkers 7f82275a4d Added support for RGB on the Tada68 2017-07-05 11:48:19 -04:00
Andreas Lindhé b228cf7ba4 Update readme 2017-07-05 10:56:53 -04:00
Andreas Lindhé 41b23af60e Create custom layout based on swedish
This is a setup that is very useful for me. It may or may not be for
you. I will use it in conjunction with the A5 overlayed sv_SE layout.

The layout is subject to change (in particular I'm thinking about adding
a macro recording feature), but it have not changed much the past year
or two so you can expect it to be stable enough to learn it.

A5: http://aoeu.info/s/dvorak/svorak
My xkb map: https://github.com/lindhe/dotfiles/blob/master/usr/share/X11/xkb/symbols/se-A5

The most major points:
======================

L0:
---

* Easily accessible F11 key for fullscreening
* Print screen
* Middle mouse button for X-paste
* Improved reachability of meta buttons (LCtrl, LALt, AltGr, LGui etc.)
* Cluster Page Up/Down + Home/End by the right thumb
* Vim-like arrow layout in right bottom row

* Set media layer toggle to right thumb (Enter)
* Set apostrophe on LCtl (putting it next to some other small
  characters)

L1:
---

* Full function key layout
* Teensy button

L2:
---

* Improved media buttons layout (close by the jkl; Vim binding)
* Improved layout of emulated mouse buttons

LED behaviour to binary+CAPS
============================

The ErgoDox LEDs on this layout is using the two rightmost LEDs as the
two LSB in a two digit binary number, representing layer 0, 1, 2 and 3.
The leftmost byte/LED indicates CAPS status.
2017-07-05 10:56:53 -04:00
Shayne Holmes 48ff93582b Pull out sendstring variations to their own files.
Instead of having all sendstring keycode mappings in the main quantum.c
file, give each one its own file in keymap_extras that can be #included
in a user's keymap. If one is included, it will define the appropriate
lookup tables and overwrite the weak definitions in quantum.c.
(Including more than one sendstring definition will fail at compile
time.)

Update @rai-suta's test keymap to match, as well as the documentation.
2017-07-05 10:55:47 -04:00
Shayne Holmes fdc2e8058b Allow broader send_string layout customizability via compile flag
Refactor new-ish JIS_KEYCODE send_string implementation with existing
send_string

Reshuffle JIS in line with other alternative keycodes for sendstring,
and make them all accessible via compile-time options

Add a separate function to allow sending a string with a delay.
2017-07-05 10:55:47 -04:00
dbroqua c41d40c422 - Fixed wording in readme 2017-07-05 09:59:37 -04:00
dbroqua d638547cd0 - Updated dk60 readme with new QMK rules 2017-07-05 09:59:37 -04:00
dbroqua 4587bb8786 - Fixed DK60 version in config.h 2017-07-05 09:59:37 -04:00
skullydazed 60eb2e140d Update the clueboard readmes (#1459) 2017-07-05 00:15:09 -07:00
That-Canadian b3d2f05032 Changed - to _ for keymap that-canadian for compatability reasons. 2017-07-04 16:43:19 -04:00
That-Canadian 2cf97c6d90 Updated ECO files to follow proper formatting. Also updated that-canadian keymap to take out extraneous characters. 2017-07-04 16:43:19 -04:00
That-Canadian f7b8148c12 Updated ECO readme file, includes picture of ECO now. 2017-07-04 16:43:19 -04:00
That-Canadian dbcf0ba6ca Added ECO keyboard folder and configuration files. Also added my (That-Canadian) keymap folder and files. 2017-07-04 16:43:19 -04:00
That-Canadian db5bb7dbbf Changed - to _ for keymap that-canadian for compatability reasons. 2017-07-04 15:41:14 -04:00
That-Canadian c534c3e734 Updated ECO files to follow proper formatting. Also updated that-canadian keymap to take out extraneous characters. 2017-07-04 15:26:25 -04:00
That-Canadian f9e8d25e2e Updated ECO readme file, includes picture of ECO now. 2017-07-04 14:19:49 -04:00
That-Canadian e256468e48 Added ECO keyboard folder and configuration files. Also added my (That-Canadian) keymap folder and files. 2017-07-04 14:14:26 -04:00
Callum Oakley 84a8aabe5b MORE layer 2017-07-04 18:16:45 +01:00
Luiz Ribeiro d5486265b8 Merge branch 'master' into ps2avrGB 2017-07-04 11:17:28 -04:00
Luiz Ribeiro 738b072bb0 Fixed indentation and now using quantum keycodes for rgblight 2017-07-04 11:12:42 -04:00
skullY 9cadba7b89 Add missing files to _summary.md 2017-07-03 12:39:15 -07:00
skullY f1c581fdd4 Remove obsolete documentation 2017-07-03 12:31:37 -07:00
skullY c12f19107f update the summary 2017-07-03 12:30:26 -07:00
skullY 2abff258b1 Adjust headings on unicode 2017-07-03 12:29:04 -07:00
skullY 0ded95b888 Update the vagrant guide 2017-07-03 12:28:48 -07:00
skullY ff47ca7a46 update hand_wire 2017-07-03 12:11:13 -07:00
skullY dff5708b07 update basic_how_keyboards_work 2017-07-03 11:59:19 -07:00
Martin Gondermann 34c8bf47a7 Move Space Caded Parentheses to own layer (#1452)
* Move Space Caded Parentheses to own layer

The space cadet parentheses where too much distracting. Therefore they are now on the function layer. I also added two more layers for also having angle brackets and curly braces on the shift keys forr better access.

Also updated the README

* Fixed SHIFT+Function key conflict

* Removed Angle Bracket and Curly Bracket layers, as they don't work corrrectly
2017-07-03 11:48:48 -07:00
Kyle Terry 062b3547ed Keyboards/handwired magicforce61 (#1454)
* adding the magicforce61 under handwired

* I meant 14 cols
2017-07-03 11:47:48 -07:00
Martin Gondermann 827dc6c715 Add octave lights for midi layer (#1457) 2017-07-03 11:43:32 -07:00
skullY 435f99916c Work around quoting hell 2017-07-03 11:35:29 -07:00
skullY b22220532f Rewrite mouse_keys to resolve #937 2017-07-03 10:58:57 -07:00
skullY 6b0503b20d update the faq 2017-07-03 01:37:05 -07:00
skullY 80cc23e912 fix the info boxes 2017-07-03 01:33:13 -07:00
skullY d8e29b53fe Update a bunch of docs 2017-07-03 01:30:36 -07:00
Jack Humbert fe47b36065 fix tag increment 2017-07-03 00:23:37 -04:00
Jack Humbert ea134be36a fix up travis script 2017-07-02 23:38:20 -04:00
Jack Humbert b7afa59c97 remove warning 2017-06-30 16:33:49 -04:00
Jack Humbert 753809eed7 adds debouncing to sixkeyboard 2017-06-30 16:33:49 -04:00
Jack Humbert b476d65b9c Update keyboards' rules.mk/Makefiles (#1442)
this may change some of the keyboards' default settings - if you experience anything odd, please check back to this commit
2017-06-30 16:09:52 -04:00
skullY ea8df568f2 reduce the TOC scope 2017-06-30 10:13:25 -07:00
skullY 486abde026 tweak page-toc settings 2017-06-30 10:06:40 -07:00
skullY d6d14b6794 try page-toc in place of navigator 2017-06-30 09:50:12 -07:00
skullY 10b389f79c Adjust headings to make navigator happier 2017-06-30 09:42:38 -07:00
skullY 77ab0f16a0 use navigator instead of neo-navigator 2017-06-30 09:38:54 -07:00
skullY dcd715ed4d Try neo-navigator in place of etoc 2017-06-30 09:33:03 -07:00
Jack Humbert 3e3c3e2b24 start glossary 2017-06-29 22:12:24 -04:00
Jack Humbert 9f643ba8bf clean-up github page 2017-06-29 21:23:20 -04:00
Jack Humbert 4c7e66c31c add file to summary 2017-06-29 19:37:49 -04:00
Jack Humbert b139633f89 adds how to github 2017-06-29 19:35:33 -04:00
skullY 7da94ac51b Fixup the gitbook config 2017-06-29 17:14:01 -04:00
skullY 2e9e1eb03c remove extraneous config 2017-06-29 17:13:59 -04:00
skullY a5bb83cbf3 remove the rest of the new plugins 2017-06-29 17:13:56 -04:00
skullY 780786596d remove most of the new plugins 2017-06-29 17:13:54 -04:00
Jack Humbert ad91386497 remove dangling commas 2017-06-29 17:13:42 -04:00
skullY ada64b8ec9 add missing comma 2017-06-29 11:49:47 -07:00
skullY bf3007ec58 Add some gitboot plugins 2017-06-29 11:46:58 -07:00
skullY 409cb1af52 Polish up custom_quantum_functions 2017-06-29 10:46:23 -07:00
Jack Humbert b75ad215c8 use default base names 2017-06-29 12:25:29 -04:00
Jack Humbert 391eae97e4 testing out new home 2017-06-29 12:13:44 -04:00
Jack Humbert d59734d3b7 restructure summary 2017-06-29 10:35:09 -04:00
skullY 910d32c07e Flesh out the quantum_keycodes documentation 2017-06-28 23:52:08 -07:00
Jack Humbert d5244c6cf4 restructure keycode docs 2017-06-29 00:15:07 -04:00
Jack Humbert 40d82906cb adds config options md 2017-06-28 21:20:23 -04:00
skullY 617923cd56 Rough draft for a document on understanding QMK 2017-06-28 20:22:37 -04:00
Jack Humbert 61ef949576 update some copyright headers 2017-06-28 12:58:58 -04:00
Jack Humbert 56634ca065 cleanup nyquist 2017-06-28 10:42:23 -04:00
Jack Humbert 663d3906ec cleanup orthodox 2017-06-28 10:42:23 -04:00
Jack Humbert f5f7dfa064 cleanup lets_split 2017-06-28 10:42:23 -04:00
Jack Humbert 4ea247e673 create initial code of conduct 2017-06-27 21:36:44 -04:00
Jack Humbert a52836e669 Merge pull request #1445 from qmk/dual_audio
Allow for duophony (C6 and B5) and B5 audio
2017-06-27 16:57:19 -04:00
Jack Humbert 7d28a417c0 don't let timer1 exist without b5 being enabled 2017-06-27 15:28:13 -04:00
Jack Humbert ea7590c894 add new arguements, docs 2017-06-27 14:35:08 -04:00
Jack Humbert 9f5b4e1d7a Merge branch 'master' of https://github.com/qmk/qmk_firmware into dual_audio 2017-06-27 14:21:42 -04:00
Jack Humbert b82604dada no glide 2017-06-27 14:20:53 -04:00
Jack Humbert bfc73e90cf working duopholy 2017-06-27 14:20:44 -04:00
Jack Humbert eabf530a0e b5 audio 2017-06-27 14:20:14 -04:00
Jack Humbert 4ba9438c3f Add eclipse to the _summary 2017-06-27 13:07:50 -04:00
Jack Humbert b2979eba23 Adds parenthesis where they might be needed
Addresses #764
2017-06-27 12:55:18 -04:00
Erez Zukerman 98391605ca Merge pull request #1441 from lindhe/swedish
Create sv_SE Qwerty layout for ErgoDox EZ
2017-06-27 11:33:29 -04:00
Fabian Topfstedt 99b6e918ea fixed brackets 2017-06-27 16:20:17 +02:00
Andreas Lindhé a25dbaad32 Create sv_SE Qwerty layout for ErgoDox
*NOTE:* it might still be desirable to set the software layout to sv_SE in your
OS.

Swedish (sv_SE) Qwerty layout for ErgoDox, based on the Default configuration

I have tried making this as close of a match I could between the [default
ErgoDox EZ configuration](https://ergodox-ez.com/pages/our-firmware) and a
standard Swedish Qwerty layout.

Notable differences from default:
=================================

* There are three special character buttons (acute accent, circumflex/tilde and
  apostrophe/asterisk) that don't have any buttons to map to naturally. I've put
  these at other places:

    * Acute accent (´) can be found in the lower left corner, conveniently
      placed to reach for making an é.

    * Apostrophe (') was put in the lower left corner, close to acute accent.

    * Circumflex (^) and asterisk (*) was placed in the lower right corner.

    * Tilde (~) and diaeresis (¨) I couldn't find a good place for, so I left
      those out. I could only get the buttons to produce a single one of the
      characters. How can I get it to work properly?

* The Alt button on right thumb was exchanged for AltGr (RAlt).

* I changed the backslash in the numpad (layer 1) for a minus. Thought it was
  more sensible.

* I didn't find a good place for the "<>|" button, so that one was left out.
  That is a problem that really needs to be resolved. Pipe can be found on layer
  one, however.
2017-06-27 15:17:21 +02:00
Fabian Topfstedt 9aa748df2a my layout 2017-06-27 10:36:00 +02:00
Fabian Topfstedt fe3d75922b Merge https://github.com/qmk/qmk_firmware 2017-06-27 09:22:05 +02:00
Fabian Topfstedt 7d0a471051 removed wrong readme 2017-06-27 09:18:05 +02:00
Fabian Topfstedt 786eb4e73d my layout 2017-06-27 09:14:04 +02:00
Jack Humbert 61cdc9aaa4 Allow mod swapping for mod tap (MT) (#1202)
* allow mod swapping for mod tap

* quick include

* fix the mod swapping

* make changes consistent with action code

* fix bug

* re-enable no gui, etc

* fix binary comps

* solid logic
2017-06-26 18:54:01 -04:00
Fabian Topfstedt 4c71b329a2 clone smt layout 2017-06-26 22:33:14 +02:00
Jack Humbert d1fb8d2296 Merge pull request #1431 from rai-suta/master
Bugg fix and add keymap for testing JIS_KEYCODE switch.
2017-06-25 21:31:10 -04:00
Ethan Madden 42e6ecc36b Whitefox LED control (#1432)
* use new grave_esc functionality

* Port LED control from Ergodox Infinity to Whitefox
2017-06-25 21:30:40 -04:00
Art Ortenburger 43579a80a7 add support for Orthodox keyboard (#1436)
* Added orthodox

* Modified readme

* Modified readme

* Modified readme

* Updated makefile

* Fixed keymap issues

* Modified serial communications to allow for over 8 columns

* Fixed sizeof command

* Fixed some typing issues

* Testing issue #1191 (n-column split i2c slave)

Based on initial OrthoDox (serial) config by @reddragond and others,
this attempts to add TWI (I2C) support.
Relevant: <https://github.com/qmk/qmk_firmware/issues/1191>

- per @ahtn recommendation, using memcpy for moving slave matrix
  into slave sending buffer
- slave buffer has been enlarged using sizeof(matrix_row_t)
- note: i2c.h now includes matrix.h
- note: matrix.c includes <string.h>

* Added i2c keymap - right col still not working

* orthodox: re-added i2c keymap, based on serial

* orthodox / issue #1191: trying 9-bit serial

- orthodox serial protocol now sends 9 bits per row, instead of 16.
  Technically it's using MATRIX_COLS, so it might work generically.
- ROW_MASK is #defined in serial.c to truncate the checksums to prevent
  overflows causing false errors. This macro should be renamed if it's
  kept.

* Revert "Fixed sizeof command"

This reverts commit f62a5b9939d6a9c0e442ec403de00c14431a55f9.

Changes had been made to the lets_split serial driver for testing which
mirrored the multi-byte-row changes made to support the orthodox. As the
lets_split does not require these changes, and new improvements had
been added to the orthodox port only, this commit reverts them.

Because the new code could potentially reduce latency over the serial
transport, it may be desirable to re-add in the future, by backporting
the current working orthodox code.

* orthodox: default serial keymap improvements

- formatting has been improved
- a few keys have been shifted, mainly in Raise and Lower layers,
  to be more like the default Planck layout
- Now available: F12, Home, End, PgUp, PgDn, Media-Next, Media-Play

Still To Do:
- duplicate for TWI
- Alt modifier
- GUI modifier

* orthodox: failed attempt at 16b/row TWI

- duplicated updated serial keymap for "i2c"
- removed string.h/memcpy, instead
- hardcoded copying of six bytes per update
- still doesn't work; master reports interconnect errors on txled

* orthodox: adjusted default keymap

- this is applied to both 'serial' and 'i2c' keymaps
- Alt and GUI have been added, as they were missing
- comma and period persist across more layers; Home/PgUp and End/PgDn
  have been moved slightly to accommodate

* orthodox: revert TWI support to minimum to debug

- disabled ssd1306 and hardware locking in build configuration
- increased TWI buffer from 0x10 to 0x20 bytes
- decreased TWI clock from 400000 to 100000
- removed hardcoded TWI multi-byte sending/receiving

An 'i2c' build of this was found to work on a rev1 Orthodox, although
slave-side col9 was understandably not working. When testing-time
permits, features will be gradually re-enabled towards getting the full
matrix supported over TWI.

* orthodox: TWI (i2c) is working, kludge for col9

The TWI interconnect ("i2c" in directories and build config) is now
working for the Orthodox, including the slave half's column #9.
This is intended as an interim solution, as it's a kludge, not a fix.

Rather than a working multi-byte implementation, the two col9 keys'
bits are packed-into and unpacked-from the two unused bits in row1.
Furthermore, the TWI clock constant has been reduced to 100000 from
400000, as testing revealed the higher value just didn't work.
Testing also found that (with this kludge) increasing the TWI buffer
was not necessary.

This commit leaves many commented-out lines in matrix.c from previous
testing, which will be removed in a future commit once the
interconnects' multi-byte problems have been debugged more thoroughly.

* orthodox: updated readme.md

The readme for the Orthodox now includes a description of the keyboard,
allusions to its author and availability, a linked photo, and links to
the evolving build guide and the current keymap on KLE.
This update has been prepared with /u/Deductivemonkee's assistance.
2017-06-25 21:30:07 -04:00
Jack Humbert 1a4a66fd01 updates olkb readmes #1362 2017-06-25 12:40:25 -04:00
rai-suta 3a2ae6a213 Add a keymap for testing JIS_KEYCODE. 2017-06-26 00:37:46 +09:00
rai-suta e740520b3f Fix bug. 2017-06-26 00:24:32 +09:00
Jack Humbert 169ede0715 Merge pull request #1427 from blakedietz/master
Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz
2017-06-25 10:29:24 -04:00
Jack Humbert de833659ae Merge pull request #1429 from fredizzimo/fixes_for_emulator
Minor fixes to support the emulator
2017-06-25 10:29:00 -04:00
Fred Sundvik 1e6a3f9e17 Change M_2_PI to 2 * PI as it should be 2017-06-25 12:55:18 +03:00
Blake Dietz daf16535f1 Add keymaps for ergodox ez, hhkb and jd45 under user blakedietz 2017-06-24 22:46:07 -06:00
skullY 62c77e7dbf Remove the DIODE_DIRECTION defines from lets_split so we can close #1067 2017-06-24 17:08:43 -07:00
skullY 582a6ac75c Fix #1135 by changing the default to at90usb1286 2017-06-24 15:28:13 -07:00
Jack Humbert 901a92a2fd Update _summary.md 2017-06-24 13:11:25 -04:00
Jack Humbert f175f5df95 Merge pull request #1425 from kynikos/patch-1
Fix typo
2017-06-24 11:39:15 -04:00
Jack Humbert 6c81656e8e Merge pull request #1426 from rai-suta/master
Add JIS_KEYCODE layout for send_string()
2017-06-24 11:38:38 -04:00
rai-suta 5dae013ff8 Add JIS_KEYCODE layout for send_string() 2017-06-24 18:29:37 +09:00
Dario Giovannetti 30ab4dd14f Fix typo 2017-06-24 16:32:10 +08:00
Jack Humbert c208a6d4e5 update docs for isp 2017-06-23 23:09:14 -04:00
Jack Humbert b9987d65f9 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-06-23 23:07:01 -04:00
Jack Humbert 2c65a17752 add other mcu bootloaders 2017-06-23 23:05:42 -04:00
Jack Humbert dfa6417ae3 Merge pull request #1422 from nstickney/master
update ErgoDox "Familiar" layout
2017-06-23 21:48:17 -04:00
Jack Humbert 918aea5b47 Update _summary.md 2017-06-23 21:29:35 -04:00
Jack Humbert b4f2f44a6f Create isp_flashing_guide.md 2017-06-23 21:29:04 -04:00
Jack Humbert 1524c2cb16 Merge pull request #1418 from npoirey/master
Frenchdev v1
2017-06-23 18:05:33 -04:00
npoirey 8ad12b1eb7 Updated frenchdev readme 2017-06-23 23:59:30 +02:00
Fred Sundvik dcf9fa1aaa Update the ugfx submodule 2017-06-24 00:37:27 +03:00
Fred Sundvik f912c74fe7 Change inline to static inline 2017-06-24 00:34:16 +03:00
Fred Sundvik 574ca7f59c Delete emulator drivers 2017-06-24 00:34:16 +03:00
Fred Sundvik da19852964 Add function for getting the LCD backlight brightness 2017-06-24 00:34:16 +03:00
Fred Sundvik ff49259a1a Include config.h from visualizer.h 2017-06-24 00:34:16 +03:00
Fred Sundvik b0094e631e Change remote url of uGFX to relative path 2017-06-24 00:34:16 +03:00
Fred Sundvik 6c9b4743f7 Include config.h before visualizer.h 2017-06-24 00:33:23 +03:00
Stick e43e58aad1 updated README.md 2017-06-23 16:28:06 -05:00
Stick f4e4d6f8d0 Merge remote-tracking branch 'upstream/master' 2017-06-23 16:02:44 -05:00
Stick 37987837b1 added media keys; many bug fixes 2017-06-23 16:02:01 -05:00
npoirey a3f151b8e9 Refactoring frenchdev 2017-06-23 21:35:33 +02:00
npoirey de80e2c756 Moved frenchdev to handwired 2017-06-23 21:25:46 +02:00
Jack Humbert a1ce43781a Merge pull request #1421 from 333fred/update-layout
Update my layout
2017-06-23 14:43:51 -04:00
Jack Humbert 91f3a73a28 Merge pull request #1419 from Wraul/phantom-improvements
Phantom improvements
2017-06-23 14:43:32 -04:00
Fredric Silberberg 6794495336 Doc updates 2017-06-23 11:36:14 -07:00
Fredric Silberberg 2b26abf9a9 Copy/paste additions. 2017-06-23 11:24:55 -07:00
Fredric Silberberg 946f4854c5 Added backlight control keys 2017-06-23 11:07:28 -07:00
Fredric Silberberg a2fbd671ad Added a few more VS macros and another ctrl 2017-06-23 11:07:28 -07:00
Fredric Silberberg 7389beb18c Small keymap layout updates 2017-06-23 11:07:28 -07:00
Mathias Andersson dd9b00543b Update Phantom readme
Added basic description of the keyboard and some build and configuration
instructions.

Also moved the RGB underlight modification instructions to the readme.
2017-06-23 12:07:18 +02:00
Mathias Andersson 7ca335cf5b Adjust Phantom for standard PCB
The previous default configuration and keymap was made for a Phantom
modified with RGB underlight.

This commit makes the default more in line with the "official"
configurations provided by the PCB.

The previous default have been moved to a separate keymap named
`rgbmod`. It has also been updated to better match the template keymap.
2017-06-23 12:07:18 +02:00
Mathias Andersson 3522496f24 Update Phantom config to better match template 2017-06-23 12:07:18 +02:00
Mathias Andersson 67b8bf8f70 Move Phantom LED handling to phantom.c
This is more in line with the structure provided by the keyboard
template.
2017-06-23 12:07:18 +02:00
Stick 98373f2fc1 added tapdance locking 2017-06-22 22:22:43 -05:00
npoirey a012c24225 Removed image from git and added references to imgur album for Frenchdev keyboard. 2017-06-22 22:19:50 +02:00
Stick fa96d64f37 Merge remote-tracking branch 'upstream/master' 2017-06-22 13:06:30 -05:00
Jack Humbert 2b98ec67f3 Update _summary.md 2017-06-22 13:23:08 -04:00
Jack Humbert 7b3c9cc8de Create adding_a_keyboard_to_qmk.md 2017-06-22 13:22:21 -04:00
Jack Humbert f32c68ee65 Update porting_your_keyboard_to_qmk.md 2017-06-22 13:21:43 -04:00
Jack Humbert c21c2cc92b Merge pull request #1416 from geofflane/feature/s65_x_std_grv_esc
Use the new Quantum KC_GESC instead of custom code
2017-06-22 12:38:45 -04:00
Erez Zukerman fe9556104b Merge pull request #1331 from ariasuni/master
Fix undefined reference errors with avr-gcc 7.1
2017-06-22 08:40:59 -04:00
npoirey 0fb835c54c Fix warning in frenchdev 2017-06-22 10:47:44 +02:00
npoirey 23b0fc20e3 Frenchdev v1 2017-06-22 10:34:23 +02:00
Jack Humbert 9d22a1a6d8 add group edge via travis updates 2017-06-21 11:23:33 -04:00
Geoff Lane 8705ac408d Use the new Quantum KC_GESC instead of custom code 2017-06-21 09:37:20 -04:00
Jack Humbert 23df3016e8 Merge pull request #1405 from cquiroz/oneshot-mods-timeout
Oneshot mods timeout
2017-06-20 11:40:10 -04:00
Jack Humbert 9019d65b3c Merge pull request #1414 from dvdizon/kbd75
KBD75 - Initial KBD75 port from qmkeyboard.cn source files
2017-06-20 09:19:48 -04:00
Jack Humbert 2c171b3e5f Merge pull request #1413 from lasko/master
This is a complete redo of my keymap. It includes several
2017-06-20 09:18:02 -04:00
Jack Humbert 33a271b8e3 Merge pull request #1412 from nall/master
Fixed offset for knight rgb mode
2017-06-20 09:17:36 -04:00
David Dizon e71b3c6572 KBD75 - Initial KBD75 port from qmkeyboard.cn source files 2017-06-19 22:59:17 -07:00
Jon Nall f169c715eb Added custom keymap and enabled Space Cadet 2017-06-19 22:44:42 -07:00
Brandon Height 2ffcf47793 This is a complete redo of my keymap. It includes several
layers including qwerty, colemak, navigation, and gui layers.

I also was playing around with dancing tap keys.
2017-06-19 20:12:30 -07:00
Jon Nall 7ce056cad7 Fixed offset for knight rgb mode 2017-06-19 19:51:37 -07:00
Jack Humbert 3e7bb19612 Merge pull request #1410 from belak/tv44-core
tv44: Add core layout based on the Core 47
2017-06-19 14:05:02 -04:00
Jack Humbert e951317acb Merge pull request #1409 from fredizzimo/full_unit_test
Take first baby steps towards testing the whole QMK
2017-06-19 14:04:19 -04:00
Kaleb Elwert f71c990215 tv44: Add core layout based on the Core 47 2017-06-18 22:44:52 -07:00
Fred Sundvik 1aa0be4cf1 Fix serial_link vpath problem 2017-06-19 00:46:53 +03:00
Fred Sundvik 0f163c0028 Add todo to timer.c 2017-06-19 00:24:32 +03:00
Fred Sundvik fb9b8dadb9 Add a couple of todos to keyboard_report_util.cpp
Also print the modifier state
2017-06-19 00:22:12 +03:00
Fred Sundvik 43d8fa5bf1 More natural interface for setting keyboard leds 2017-06-19 00:19:09 +03:00
Fred Sundvik 36f820be7e Add a test fixture
It only initializes QMK once, and clears the matrix after each test.
2017-06-18 23:49:38 +03:00
Fred Sundvik e85b185796 Test two keys pressed at once 2017-06-18 21:22:22 +03:00
Fred Sundvik 6a76192fa4 Fix problems with undefined inlines in debug mode 2017-06-18 21:22:22 +03:00
Fred Sundvik bd1729d5be Actually test for correct key presses 2017-06-18 21:22:22 +03:00
Fred Sundvik fb95d86b39 Move functions for adding keys from to reports to report.h 2017-06-18 21:22:22 +03:00
Fred Sundvik 017458a07b Move functionality from action_util to report
The functions also takes report_kebyoard_t parameters, so that they can
be used elsewhere.
2017-06-18 21:22:22 +03:00
Fred Sundvik c38589d861 Fix the order of init and driver creation 2017-06-18 21:22:22 +03:00
Fred Sundvik 3bb0586acc Add a couple of basic tests and implement driver mock 2017-06-18 21:22:22 +03:00
Fred Sundvik 617578399c Add keymap 2017-06-18 21:22:22 +03:00
Fred Sundvik c588fca06c Empty bootloader_jump 2017-06-18 21:22:22 +03:00
Fred Sundvik a72e8f0865 Dummy test matrix implementation 2017-06-18 21:22:22 +03:00
Fred Sundvik 1c0fe956ac Split common.mk into common.mk and common_features.mk
To support including keyboard/keymap specific rules before it
2017-06-18 21:22:22 +03:00
Fred Sundvik d29906cb64 Emulate eeprom 2017-06-18 21:10:42 +03:00
Fred Sundvik f646f00b93 Rename native to test 2017-06-18 21:10:42 +03:00
Fred Sundvik 83509adc3a Add empty timer functions 2017-06-18 21:10:42 +03:00
Fred Sundvik 26eb97a4a8 Empty implementation of bootloader, suspend and timer 2017-06-18 21:10:42 +03:00
Fred Sundvik fdfd48e8c8 Fix program mem functionality 2017-06-18 21:10:42 +03:00
Fred Sundvik efaf0e830b Empty implementation of wait 2017-06-18 21:10:42 +03:00
Fred Sundvik 585d646128 Define MATRIX_COLS and MATRIX_ROWS 2017-06-18 21:10:42 +03:00
Fred Sundvik 8674f9c466 Make sure config.h is included 2017-06-18 21:10:42 +03:00
Fred Sundvik 7424261dae Try to build tmk_common 2017-06-18 21:10:42 +03:00
Fred Sundvik 30f22d450d Add basic infrastrucure for building full tests 2017-06-18 21:08:23 +03:00
Jack Humbert 621ae42a6c revert edit 2017-06-18 13:28:34 -04:00
Jack Humbert 4217cb5bbc Update key_functions.md 2017-06-18 13:26:20 -04:00
Jack Humbert 517f75d893 Merge pull request #1349 from jpetermans/infinity60
Infinity60 backlight support
2017-06-18 12:38:38 -04:00
Jack Humbert dd73e14c9b Merge pull request #1407 from take-a-CHANCE/master
Adding a planck keymap
2017-06-18 12:35:08 -04:00
Jack Humbert 66e2d6a063 Merge pull request #1406 from jprMesh/atreus52
Atreus52
2017-06-18 12:34:33 -04:00
Jack Humbert f2e1609801 remove hardware files, move arrow pad 2017-06-18 12:33:14 -04:00
Carlos Quiroz 74d752b531 Remove noisy debug line 2017-06-18 12:17:51 -04:00
Carlos Quiroz 3ab0f4d9e5 Deactivate oneshot mods once timedout 2017-06-18 12:17:51 -04:00
Jack Humbert 5682254f71 Merge pull request #1408 from fredizzimo/fix_build_improve_travis
Fix the two failing keymaps and improve the travis build script
2017-06-18 12:13:56 -04:00
Fred Sundvik 45d437ca04 Make only modified keymaps 2017-06-18 18:30:59 +03:00
Jack Humbert 51a86b85f3 Merge pull request #1361 from fredizzimo/ergodox_infinity_backlight
Add Ergodox Infinity backlight support
2017-06-18 10:15:02 -04:00
Fred Sundvik 2fd670bec0 Add missing include to Ergodox Belak keymap 2017-06-18 17:07:20 +03:00
Fred Sundvik 6ba22b5f5e Don't define RGBLED_NUM in let-split khord keymap
It's already defined correctly by the parent keyboard project, and was
causing problems for rev1, where the pin is different.
2017-06-18 17:03:07 +03:00
Fred Sundvik a15510b57b Always build everything on master 2017-06-18 17:03:05 +03:00
Fred Sundvik 5acc0e54aa Make all subprojects when a keymap is modified 2017-06-18 16:44:51 +03:00
root 1a8042ae91 Added personal keymap with underglow, right shift, numpad, and bright hidden behind raise/lower 2017-06-17 23:11:37 -04:00
Jonas Rogers a284245f77 Atreus52- moved parens and braces to left hand. 2017-06-17 22:51:50 -04:00
Jonas Rogers 85d688e92c Atreus52- made dvorak layer default. 2017-06-17 21:21:46 -04:00
Jonas Rogers 4c2f04986a Atreus52- added software reset key. 2017-06-17 21:21:38 -04:00
Jonas 3007d01718 Atreus52- Modified BDO map. 2017-06-17 21:21:30 -04:00
Jonas 3b9fabb9aa Atreus52- BDO keymap. 2017-06-17 21:21:21 -04:00
jprmesh a8992a2cfe Atreus52- Added Nav layer keymap. 2017-06-17 21:20:16 -04:00
Jonas 7837d96b6e Atreus52- Reworked keymap to be more 40% like. 2017-06-17 21:20:09 -04:00
jprmesh 56026dd4df Atreus52- Swapped thumb keys. 2017-06-17 21:19:59 -04:00
jprmesh 1552fd6ae1 Atreus52- Last changes to config to get it workin. 2017-06-17 21:19:48 -04:00
jprmesh 133908da74 Atreus52- Some keymap changes. 2017-06-17 21:19:45 -04:00
jprMesh 3c2c489768 Atreus52- Fixed spacing and changed to KC_KEYMAP macro. 2017-06-17 21:19:36 -04:00
jprmesh b236e51b69 Atreus52- finished initial keymap layout. 2017-06-17 21:19:29 -04:00
jprmesh 17e81baab3 Atreus52- Fixed config. 2017-06-17 21:19:18 -04:00
jprmesh f9eb11a674 Atreus52- Fixed Qwerty Dvorak switch 2017-06-17 21:18:58 -04:00
jprmesh bb99d7117c Atreus52- Changed to KEYMAP macro format. 2017-06-17 21:18:40 -04:00
jprMesh a5ba30338f Atreus52- Initial Atreus52 file creation. 2017-06-17 21:18:04 -04:00
Jack Humbert 7feadbd66d Merge pull request #1401 from geofflane/s65_x_fixes3
S65-X Fixes Part 3
2017-06-17 20:14:49 -04:00
Jack Humbert 206233d98c Merge pull request #1402 from belak/tv44-belak-tap-magic
tv44: Rearrange belak keymap and add some tap dance magic
2017-06-17 20:14:23 -04:00
Jack Humbert 82372d36af Merge pull request #1403 from Wraul/kmac-fixes
KMAC fixes
2017-06-17 20:14:05 -04:00
Mathias Andersson df26ede131 Unify KMAC code indentation
It's a little unclear what the style guidelines are for the QMK project.
But I figured that I should at least keep the indentation consistent
within the KMAC part.
2017-06-17 20:06:28 +02:00
Mathias Andersson 67e150a08a Enable backlight support by default for KMAC 2017-06-17 20:06:28 +02:00
Mathias Andersson ba945c5e77 Correct layer switching in KMAC keymap readmes 2017-06-17 20:06:28 +02:00
Mathias Andersson be002137f9 Fix some KMAC code formating 2017-06-17 20:06:28 +02:00
Mathias Andersson a621c7f88b Don't include the console by default on the KMAC 2017-06-17 20:06:28 +02:00
Kaleb Elwert 722adce095 tv44: Rearrange belak keymap and add some tap dance magic 2017-06-16 17:08:00 -07:00
jamesofarrell 98316ef017 Added Grave Escape (#1391)
* added QK_GRAVE_ESC and KC_GESC

* fixed name

* Fixed keycode emnu

* Removed layer check, added left and right GUI mod detection for OSX GUI+~
2017-06-16 14:56:50 -07:00
Jack Humbert ff2b01da49 Merge pull request #1400 from belak/belak-ergodox-theme
ergodox: initial addition of belak theme
2017-06-16 17:01:54 -04:00
Jack Humbert 6549e169f8 Merge pull request #1398 from belak/tv44-keymap-changes
TV44 keymap changes
2017-06-16 17:00:36 -04:00
Kaleb Elwert e9a4a5e961 tv44: add belak keymap 2017-06-16 13:11:40 -07:00
Kaleb Elwert ef4abfeb31 ergodox: initial addition of belak theme
Imported from external repo https://github.com/belak/ergodox-layout at commit
233008ad8c46a85cb118fca0be093c3e751075b0
2017-06-16 10:57:58 -07:00
Geoff Lane b4802d7567 Fix home and end to be on <> 2017-06-16 11:57:43 -04:00
Geoff Lane d2a11b523b LED control on the BL layer 2017-06-15 21:57:50 -04:00
Fred Sundvik 086aad0d7e Make sure backlight is in the range 0-100 2017-06-16 02:06:30 +03:00
Fred Sundvik ec88a0b3cc Make sure that the backlight level is within the right range 2017-06-16 02:05:38 +03:00
Fred Sundvik 7d5606085f Correctly calculate backlight level 2017-06-16 02:05:15 +03:00
Fred Sundvik 19f0285a76 Fix typo in BACKLIGHT_ENABLE 2017-06-15 23:21:01 +03:00
Kaleb Elwert 29108d1477 tv44: update tong92 keymap to use KEYMAP macro 2017-06-15 12:48:59 -07:00
Kaleb Elwert 4cefb45a2d tv44: update xyverz keymap to use KEYMAP macro 2017-06-15 12:48:44 -07:00
Kaleb Elwert f894103997 tv44: update default keymap to use KEYMAP macro 2017-06-15 12:47:57 -07:00
Kaleb Elwert b56a9a9899 tv44: update jeebak keymap to use new macros and remove custom ones 2017-06-15 12:46:25 -07:00
Kaleb Elwert e32e7dc0f5 tv44: update smt keymap to use new macros and remove custom ones 2017-06-15 12:45:53 -07:00
Kaleb Elwert 44ce179192 tv44: Fix up the KEYMAP macro
Previously KEYMAP referred to the KEYMAP_ARROW layout and had 45 keys. It makes
more sense for the default keymap to be the 44 key layout, as is implied by the
name.

Additionally keymaps for all other known layouts have been added:

KEYMAP - base layout
KEYMAP_ARROW - additional key in bottom right
KEYMAP_COMMAND - additional key in bottom left
KEYMAP_ARROW_COMMAND - combination of KEYMAP_ARROW and KEYMAP_COMMAND
2017-06-15 12:42:23 -07:00
Jack Humbert d9ffd77ee7 Merge pull request #1397 from geofflane/s65x_fixes
S65x fixes
2017-06-15 15:16:52 -04:00
Geoff Lane e553bb3af4 LED init works with just pin declared 2017-06-15 13:42:14 -04:00
Geoff Lane b107d64d69 Use standard QMK key codes for RGB control 2017-06-15 13:12:36 -04:00
Geoff Lane c81be932d2 Fix left shift in ansi layout 2017-06-15 13:12:36 -04:00
Geoff Lane 899584187f Fix esc key 2017-06-15 13:12:36 -04:00
Jack Humbert 6a75a7d672 Merge pull request #1394 from Khord/master
Adding custom keymap for Let's Split and updates to custom Planck keymap
2017-06-15 12:34:18 -04:00
Jack Humbert be9fd4b4fa Merge pull request #1396 from shieldsd/master
Minor updates to planck/keymaps/dshields
2017-06-15 12:33:44 -04:00
Daniel Shields cc158d90ae Minor updates to planck/keymaps/dshields
* tweaks to tap dance keys
* tidy up code
* save a few bytes
2017-06-15 09:41:59 +01:00
Dylan Khor 5c11ba74d8 tap dance and hold changes to make planck match lets split 2017-06-15 03:34:08 -04:00
Dylan Khor a44ba492ea minor fixes 2017-06-15 03:26:04 -04:00
Dylan Khor 22f985eba7 Add custom let's split keymap 2017-06-15 07:15:27 +00:00
Martin Gondermann 49cfdb544d Added HyperTab and Ctrl/Fn as well as Space cadet parens (#1390)
* Added HyperTab and Ctrl/Escape as well as Space cadet parens to magicmonty keymap

* Replaced CTL_ESC With FN_ESC
2017-06-14 07:20:43 -07:00
fredizzimo 3aa620c1ac Update uGFX and Chibios submodules + fixes (#1363)
* Make submodules point to qmk

* Update uGFX to 2.7

* Use ugfx with custom fixes

* Fix the ChibiOs submodule commit hash

To match the hashes in the mabl/ChibiOS and therefore QMK repository.
2017-06-13 21:13:39 -07:00
Jack Humbert c2c9cb2505 Merge pull request #1392 from jetpacktuxedo/whitefox
Added whitefox keymap
2017-06-13 22:21:52 -04:00
Ethan Madden a7942c4f48 Added whitefox keymap 2017-06-13 16:01:28 -07:00
Jack Humbert 3d5d3e1b0c Merge pull request #1387 from antelaurijssen/master
Submitting my own custom layout for S60X keyboard
2017-06-12 20:47:35 -04:00
Ante Laurijssen f37daa5343 Properly formatted unordered lists in readme.md 2017-06-12 20:24:56 -04:00
Ante Laurijssen 3ee346c07b Mods to readme.md 2017-06-12 20:20:28 -04:00
Ante Laurijssen 78a4cfd453 Modifications to readme.md and deletion of keyboard layout images 2017-06-12 20:13:17 -04:00
Jack Humbert 6b5d67fcc6 Merge pull request #1389 from geofflane/keyboard_s65_x_2
Keyboard S65-X Support #2
2017-06-12 17:08:27 -04:00
Jack Humbert d1854e0e04 Merge pull request #1388 from bigbigtor/fix_spanish
Fix spanish keymap
2017-06-12 17:06:11 -04:00
Geoff Lane 0440c0f072 Add ISO layout for S65-X 2017-06-12 16:57:01 -04:00
Geoff Lane 568c662c14 Fix media controls in default layout 2017-06-12 16:19:57 -04:00
Geoff Lane 96b0382fb4 Fix backslash and some of the docs 2017-06-12 16:16:42 -04:00
Víctor 21fa16651c Rename ES_RCRB to ES_RCBR for consistency reasons (left curly bracket is defined as ES_LCBR) 2017-06-12 21:44:40 +02:00
Víctor 2c404cca12 Fix keymap definitions referencing inexistent macros 2017-06-12 21:43:34 +02:00
Martin Gondermann a5b5279da9 Add MIDI layer to magicmonty keymap (#1386)
* Add MIDI layer

* Respect brightness level on layer signalling

* Add hotkey in control layer for signalling state

* Update layout.png

* Remove image and replace it with imgur link
2017-06-12 08:48:01 -07:00
Jack Humbert 52f6bc164e Merge pull request #1385 from qmk/ez-images
Remove images and old .hex files
2017-06-11 22:50:40 -04:00
Jack Humbert 23c448b21d remove .hex, .PNG, .jpg 2017-06-11 22:16:42 -04:00
Jack Humbert a7ce482d14 remove the rest of the .pngs 2017-06-11 21:24:23 -04:00
Ante Laurijssen 54d48140cd -MIDI Chords now using process_record_user instead of F(n) keys
-Morse Code shift keys implemented
2017-06-11 16:00:40 -04:00
Jack Humbert c02f9a6ee4 remove most .pngs 2017-06-11 15:36:28 -04:00
Jack Humbert 6bd4df7a90 define limits to functions 2017-06-11 14:28:30 -04:00
Luiz Ribeiro 60153e7bbc Always send 3 * RGBLED_NUM bytes through I2C on ps2avrGB
This wasn't going to work on boards with a different number of LEDs,
since I was always sending 48 bytes.
2017-06-11 12:30:48 -04:00
Luiz Ribeiro 945f2f5916 Fixed rgblight_types.h 2017-06-11 12:30:48 -04:00
Luiz Ribeiro d4cd5dda5c Added a build flag for using a custom rgblight driver 2017-06-11 12:30:48 -04:00
Luiz Ribeiro 964d7060e1 Simplified ps2avrGB rgblight_set logic a bit 2017-06-11 12:30:48 -04:00
Luiz Ribeiro 6037cede2c rgblight support for ps2avrGB 2017-06-11 12:30:48 -04:00
Jack Humbert c22a400603 Merge pull request #1384 from geofflane/keyboard_s65x
Support Sentraq S65-X
2017-06-10 22:18:17 -04:00
Geoff Lane b1e01e9d1f Support Sentraq S65-X
Add initial support for ANSI layout of S65-X.
Includes support for controlling RGB underlighting.
2017-06-10 21:09:38 -04:00
Jack Humbert b721779241 Merge pull request #1383 from qmk/deleting-files
Deleting uppercase docs files
2017-06-10 15:14:17 -04:00
Jack Humbert 06f0f92c1a Delete VAGRANT_GUIDE.md 2017-06-10 15:13:24 -04:00
Jack Humbert 7921834663 Delete USB_NKRO.txt 2017-06-10 15:13:15 -04:00
Jack Humbert d942389e11 Delete TMK_README.md 2017-06-10 15:13:07 -04:00
Jack Humbert 3df614c942 Delete POWER.txt 2017-06-10 15:12:59 -04:00
Jack Humbert 08fdced65f Delete PCB_GUIDE.md 2017-06-10 15:12:52 -04:00
Jack Humbert de4a38ab1b Delete Macros.md 2017-06-10 15:12:45 -04:00
Jack Humbert ceb7a63c68 Delete Kiibohd.asciidoc 2017-06-10 15:12:39 -04:00
Jack Humbert 656744e7dd Delete Keymap.md 2017-06-10 15:12:32 -04:00
Jack Humbert 6442822efd Delete Keycodes.md 2017-06-10 15:12:20 -04:00
Jack Humbert f320ac4bc6 Delete Home.md 2017-06-10 15:12:12 -04:00
Jack Humbert ee595965ae Delete HAND_WIRE.md 2017-06-10 15:12:04 -04:00
Jack Humbert 4de370ccc3 Delete FUSE.txt 2017-06-10 15:11:53 -04:00
Jack Humbert 4092e45b6b Delete FAQ.md 2017-06-10 15:11:36 -04:00
Jack Humbert 296e8669f3 Delete Embedding.md 2017-06-10 15:11:26 -04:00
Jack Humbert fa6044ab1d Delete Eclipse.md 2017-06-10 15:11:18 -04:00
Jack Humbert 401aab7d5a Delete CYGWIN_GUIDE.md 2017-06-10 15:11:02 -04:00
Jack Humbert 5e9d5a0a75 Delete BUILD_GUIDE.md 2017-06-10 15:10:44 -04:00
Jack Humbert 995c3141a6 convert docs to lowercase and underscores 2017-06-10 14:58:55 -04:00
Jack Humbert ca01d94005 convert docs to lowercase and underscores 2017-06-10 14:58:24 -04:00
Jack Humbert 558db0e03f remove leading slash 2017-06-10 12:28:37 -04:00
Jack Humbert 2508b9b6e2 Merge pull request #1380 from qmk/improve_macro_docs
Clean up and improve the macro documentation
2017-06-10 12:27:05 -04:00
Jack Humbert 43b6179feb Merge branch 'master' into improve_macro_docs 2017-06-10 12:26:57 -04:00
Jack Humbert 163754f363 Create Home.md 2017-06-10 12:26:09 -04:00
Jack Humbert ad49086be5 Create SUMMARY.md 2017-06-10 12:25:04 -04:00
Jack Humbert 2f942c9883 Create Custom-Quantum-Functions.md 2017-06-10 12:23:04 -04:00
Jack Humbert 1da0a19177 make searchable 2017-06-10 12:18:49 -04:00
Jack Humbert d81135410c Merge pull request #1382 from binaryplease/handwired_binaryplease
Handwired binaryplease
2017-06-09 21:09:52 -04:00
binaryplease 1502c9c935 put colemak and qwert switching on the top right 2017-06-10 02:44:28 +02:00
binaryplease 0c1dc91d74 removed swapping keys in adjust layer 2017-06-10 02:42:27 +02:00
binaryplease e3f657dfeb commented out unused layers 2017-06-10 02:01:51 +02:00
Jack Humbert 5801a1f8af update music docs 2017-06-09 16:42:30 -04:00
skullY a0ac0d3cea Move Dynamic Macros into their own file 2017-06-09 12:25:12 -07:00
skullY 767bcac23c Clean up and improve the macro documentation 2017-06-09 11:47:53 -07:00
Jack Humbert d2aec1625d removes some images 2017-06-09 14:05:33 -04:00
Jack Humbert 728f2f8d00 Merge pull request #1378 from nicinabox/fix-ls-avrdude
Let's Split avrdude portability fix
2017-06-09 10:35:33 -04:00
Jack Humbert fc39a288ed remove mechmini keymap from ps2avrGB 2017-06-09 10:25:20 -04:00
Jack Humbert 8c4a59611a due diligence, etc 2017-06-09 10:22:58 -04:00
Nic Aitch 3b38e6954a Use single brackets for portability with other shells 2017-06-09 09:14:44 -05:00
Jack Humbert 9ac2ed280c move mechmini to own folder 2017-06-09 10:11:34 -04:00
skullY 2a667eba2a Cleanup the Clueboard readme files. 2017-06-08 20:42:37 -07:00
Ethan Madden d9f95c5da9 Docfix (#1377)
* SCKLCK is now SCROLLLOCK

Yes, with all three Ls
At least it doesn't have a random K anymore lol

* Removed strange mystery trailing numbers in the docs
2017-06-08 20:05:55 -07:00
Erez Zukerman 481797f92f Documents permissive hold 2017-06-08 23:00:28 -04:00
Martin Gondermann e4eb4eaa16 Fix layer LED signalling in magicmonty keymap (#1373)
* Fix layer LED signalling in magicmonty keymap

* Include the breathing modes in layer signalling

* Reverts mode to 1 as the other modes flicker

* Add Cursor keys on VIM positions and PAUSE to function layer
2017-06-08 19:55:34 -07:00
Ethan Madden e82c089b4c SCKLCK is now SCROLLLOCK (#1376)
Yes, with all three Ls
At least it doesn't have a random K anymore lol
2017-06-08 19:54:49 -07:00
Jack Humbert a3385b7a2f Merge pull request #1375 from Wraul/kmac
Add support for KMAC
2017-06-08 16:42:05 -04:00
Mathias Andersson 1b02b2006e Add support for KMAC 2017-06-08 19:35:27 +02:00
Stick 4b50ab029d Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"
This reverts commit f397402e10.
2017-06-08 08:59:33 -05:00
Stick 5a70cb30ee trying to fix LEDs 2017-06-08 08:59:30 -05:00
Stick 3af2bca1fc Merge remote-tracking branch 'upstream/master' 2017-06-08 08:52:32 -05:00
Ante Laurijssen 7146dfea6e Created special shift keys for Morse layer that change variable value, enabling to send “shifted” special morse code characters. 2017-06-07 23:57:14 -04:00
Ante Laurijssen 8f80f35186 Working on Morse Code Macros 2017-06-07 22:01:28 -04:00
Jack Humbert 00d9416626 Merge pull request #1372 from chilifries/master
Added support for Mechmini v1
2017-06-07 21:10:45 -04:00
chilifries c9e0068cf2 Added support for Mechmini v1 2017-06-07 16:24:40 -07:00
Jack Humbert 84012d8243 Merge pull request #1359 from agbell/PR
Permissive Hold, and two keymaps
2017-06-07 18:47:29 -04:00
Stick 035f7bb1bf Merge remote-tracking branch 'upstream/master' 2017-06-07 15:55:52 -05:00
Martin Gondermann 8cc0035ea0 Add new keyboard layout for the ClueBoard (#1371) 2017-06-07 08:18:26 -07:00
Jack Humbert 5d83d320cb Merge pull request #1366 from abperiasamy/refine-layout
Replace enter with quote and few reorgs
2017-06-06 12:35:26 -04:00
Jack Humbert 05b0075391 Merge pull request #1368 from shieldsd/master
Additional tap dance keys/functions for planck/keymap/dshields
2017-06-06 12:35:04 -04:00
Daniel Shields ad7a5bdc4f Additional tap dance keys/functions for planck/keymap/dshields 2017-06-06 13:09:55 +01:00
Ante Laurijssen 1b8ed53f21 Added a couple of custom keys and updated layer image 2017-06-05 22:17:35 -04:00
Jack Humbert 5e18e4ab48 update docs link 2017-06-05 16:25:59 -04:00
Fred Sundvik b51a0db6ed Add backlight support to the default Ergodox Infinity animations 2017-06-03 22:04:10 +03:00
Adam Bell 0db6ac46aa remove build stuff 2017-06-03 14:32:02 -04:00
Fred Sundvik 2a7f9a7e46 Add backlight control to the IS31FL3731 driver 2017-06-03 21:30:52 +03:00
Fred Sundvik effffa33a5 Backlight level handling for the visualizer 2017-06-03 21:14:26 +03:00
Adam Bell 4ab61344f5 Adding permissive_hold 2017-06-03 10:28:46 -04:00
Adam Bell 587b0de6e5 adding lets split keymap 2017-06-03 10:28:46 -04:00
Adam Bell 82de4d039d Ergodox Adam keymap 2017-06-03 10:28:36 -04:00
Adam Bell 6d6dee2956 Adding docker compose 2017-06-03 09:32:44 -04:00
Fred Sundvik 0f9bfafb9e Turn off LED matrix by default 2017-06-03 15:31:02 +03:00
Fred Sundvik a916f4e8b8 Let BACKLIGHT_ENABLE control the Infinity LEDs 2017-06-03 14:34:50 +03:00
Ante Laurijssen 9cfa37bb3d Improvements and corrections to morse code macros layer 2017-06-02 22:57:57 -04:00
Stick f397402e10 ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off 2017-06-02 20:02:02 -05:00
Stick 4cf17210b6 moved alt out from under space 2017-06-02 19:51:29 -05:00
Stick 4ba9917f82 Merge remote-tracking branch 'upstream/master' 2017-06-02 19:50:54 -05:00
Jack Humbert aaa67f6930 Merge pull request #1357 from shieldsd/gherkin
Initial commit for gherkin keyboard support. Compiles but untested.
2017-06-02 10:23:54 -04:00
Daniel Shields 7cbd16c902 Initial commit for gherkin keyboard support. Compiles but untested. 2017-06-02 14:45:42 +01:00
Jack Humbert eefec19ad9 Update Keycodes.md 2017-06-02 09:44:08 -04:00
Jack Humbert af931368ce Merge pull request #1356 from fabienheureux/patch-1
Broken Keymap docs link
2017-06-02 09:21:15 -04:00
Jack Humbert 47c209fa02 Update Keycodes.md 2017-06-02 09:21:01 -04:00
fabienheureux 19816a4998 Broken Keymap docs link 2017-06-02 10:51:12 +02:00
Jack Humbert 9069edd934 Merge pull request #1347 from nooges/nyquist
Add Nyquist keyboard support
2017-06-01 12:58:33 -04:00
Jack Humbert d548693c8b Merge pull request #1294 from shieldsd/master
Prevent the recording of looping dynamic macros.
2017-06-01 12:18:36 -04:00
Daniel Shields 606e13a47e Prevent the recording of looping dynamic macros.
If a macro play key is inadvertently recorded in a dynamic macro
a loop is created and the macro will not terminate when played.

This should be prevented.
2017-06-01 16:29:58 +01:00
Jack Humbert ec3e684123 Merge pull request #1350 from originerd/add-originerd-planck-keymap
Add originerd planck keymap
2017-06-01 11:19:40 -04:00
Jack Humbert 05e6dd6527 Merge pull request #1351 from Alfrheim/fixing_dvorak_layout
replacing one R for a T
2017-06-01 11:19:20 -04:00
Jack Humbert cf77c42c72 Merge pull request #1353 from 333fred/333fred-layout
ergodox/333fred layout
2017-06-01 11:18:56 -04:00
Jack Humbert cc52856bac Merge pull request #1354 from shieldsd/tweaks
Tweak reported power consumption to work with iOS
2017-06-01 11:18:28 -04:00
Danny Nguyen aae727d9ec Update keymap layout comments 2017-06-01 11:15:21 -04:00
Daniel Shields db0ac3bcb3 Tweak reported power consumption to work with iOS 2017-06-01 09:18:33 +01:00
Danny Nguyen db82b17d6e Remove OLED code and set I2C rate back to 100kHz 2017-06-01 01:26:06 -04:00
Fredric Silberberg dded79a412 Update licensing on visualizer.c 2017-05-31 18:07:02 -07:00
Fredric Silberberg cfaf34daec Updated readme 2017-05-31 17:57:38 -07:00
Fredric Silberberg aa1b1c5756 Added several new macros 2017-05-31 17:42:50 -07:00
Fredric Silberberg f35c82ccb2 Fixed numpad 0 layout 2017-05-31 10:27:39 -07:00
Alfrheim 974a77a07c replacing one R for a T 2017-05-31 15:19:37 +02:00
Jitae Kim c33c2bbade Add originerd planck keymap 2017-05-31 22:00:44 +09:00
Fredric Silberberg 4eba71841e Use code blocks for keyboard layouts 2017-05-30 23:56:28 -07:00
Fredric Silberberg 95ae256482 Completed iteration 1 of my layout 2017-05-30 23:52:20 -07:00
jpetermans 9af272e4bb Update lock led processing and remove debug msgs 2017-05-30 21:52:44 -07:00
Jack Humbert 57cfb5f1ae Merge pull request #1348 from Dbroqua/master
Added DK60 keyboard
2017-05-30 23:12:11 -04:00
Ante Laurijssen fbaf964a85 Improvements to Midi and keymap 2017-05-30 21:27:00 -04:00
Fredric Silberberg 949540d601 Added initial keymap files 2017-05-30 18:01:09 -07:00
dbroqua c5d3faace5 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 23:10:14 +02:00
dbroqua a381eb01f5 - Updated copyright 2017-05-30 23:09:39 +02:00
Danny Nguyen 7a433a7f3d Update copyright info 2017-05-30 16:52:02 -04:00
Danny Nguyen fbec02c148 Remove Let’s Split plate files 2017-05-30 16:42:04 -04:00
Damien Broqua 061bb4a0b8 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 22:17:20 +02:00
Damien Broqua 05f5243426 - Updated readme 2017-05-30 22:17:03 +02:00
Damien Broqua 55d6750254 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 22:15:07 +02:00
Damien Broqua e280f7aad7 - Added Capslock/Esc led 2017-05-30 22:13:34 +02:00
Jack Humbert 328bde1624 Merge pull request #1323 from nikchi/master
Variable tapping terms
2017-05-30 15:38:22 -04:00
Nick Choi 3c4022c41b hmm? 2017-05-30 14:19:57 -04:00
Nick Choi 2c9f846608 Merge pull request #2 from qmk/master
pull in new qmk changes
2017-05-30 14:17:48 -04:00
Danny Nguyen be204f9cdd Update readme 2017-05-30 13:29:30 -04:00
Jack Humbert cb791cf6cd Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-30 12:49:38 -04:00
Jack Humbert 9ecfc23292 make qmk bot do the hard work 2017-05-30 12:49:26 -04:00
Jack Humbert 4549b0417e Merge pull request #1342 from priyadi/adafruit-mouse-buttons
Adafruit Feather BLE / BLE Friend mouse buttons support
2017-05-30 12:10:45 -04:00
Jack Humbert 3a1a7d6472 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-30 11:46:34 -04:00
Jack Humbert 7eccbfe737 exclude PRs 2017-05-30 11:46:25 -04:00
Damien Broqua f06f883589 - Some changes on DK60 2017-05-30 16:59:56 +02:00
Ante Laurijssen 06684555d2 Another typo... 2017-05-29 22:16:17 -04:00
Ante Laurijssen cd4ccee703 Corrected typo in readme.md 2017-05-29 22:13:52 -04:00
Ante Laurijssen 1ef911d150 Added a few images 2017-05-29 22:11:48 -04:00
Ante Laurijssen 4c48c29c0e Added MIDI_CHORD layer and other little fixes.
Updated readme.md
2017-05-29 22:09:06 -04:00
Nick Choi 5393bc6f4e switched to uint8 and 16 2017-05-29 21:25:50 -04:00
Danny Nguyen 4a8da0cb45 Modify pinout and layouts for Nyquist 2017-05-29 16:20:06 -04:00
Danny Nguyen aeade1b197 Fork Let’s Split files 2017-05-29 16:04:46 -04:00
Jack Humbert 732a115b32 Merge pull request #1344 from qmk/jackhumbert-patch-1
Re-enable mouse buttons from #1327
2017-05-29 15:17:38 -04:00
Jack Humbert b6c60333e4 Re-enable mouse buttons 2017-05-29 13:21:38 -04:00
Jack Humbert 0c351fa98b no master needed on push maybe 2017-05-29 12:49:25 -04:00
Jack Humbert bd39e91f78 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 12:15:03 -04:00
Jack Humbert 44832127d7 push to git url 2017-05-29 12:14:49 -04:00
Priyadi Iman Nurcahyo 7eebdd4760 Jokrik's Clueboard layout (#1340) 2017-05-29 09:10:34 -07:00
Jack Humbert 1d6a18db99 Merge pull request #1343 from Maartenwut/patch-1
Added SEND_STRING(); to the documentation.
2017-05-29 11:58:08 -04:00
Jack Humbert cecf783e14 Merge pull request #1337 from fredizzimo/wsl_setup
Add script for setting up Windows Subsystem for Linux
2017-05-29 11:56:53 -04:00
Maarten Dekkers 91c6113cba Added SEND_STRING(); to the documentation. 2017-05-29 17:53:39 +02:00
Jack Humbert 988941cc0a Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 11:37:33 -04:00
Jack Humbert ee0135fb81 get rid of folders in tar 2017-05-29 11:37:20 -04:00
Jack Humbert e179dbd9e6 Merge pull request #1341 from Dbroqua/patch-3
Update Differences-from-TMK.md
2017-05-29 10:55:32 -04:00
Jack Humbert 7041055ace Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 10:54:56 -04:00
Jack Humbert ae6b803ad6 more than one en-file, and actually ignore docs 2017-05-29 10:54:46 -04:00
binaryplease 3ea5726739 redefined options in config.h 2017-05-29 13:53:13 +02:00
Damien 51e44fd6c5 Update Differences-from-TMK.md
Removed fn_actions.

According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633)
2017-05-29 13:17:23 +02:00
Priyadi Iman Nurcahyo f0fc2db4e2 Adafruit Feather BLE / BLE Friend mouse buttons support 2017-05-29 18:17:21 +07:00
Erez Zukerman 80707d529c Merge pull request #1338 from qmk/hf/prevent_stuck_mods
Adds prevent stuck modifiers to EZ default
2017-05-28 20:14:36 -04:00
Erez Zukerman 41fa638aa8 Adds prevent stuck modifiers to EZ default 2017-05-28 20:05:37 -04:00
binaryplease a83662329d overwriting optins in makefile and configuration 2017-05-29 01:28:18 +02:00
binaryplease 64e4c47ae4 disabled backlight and audio 2017-05-29 01:14:25 +02:00
binaryplease 58af88eb51 copied default planck keymap to handwired_binaryplease; 2017-05-29 00:52:38 +02:00
Jack Humbert 71feac5717 ignore docs, fix tag/hex pushing 2017-05-28 16:16:56 -04:00
Fred Sundvik 78aebe0631 Update windows 10 instructions 2017-05-28 22:35:45 +03:00
Jack Humbert de0a058da7 Merge pull request #1336 from Dbroqua/patch-2
Update Differences-from-TMK.md
2017-05-28 14:47:57 -04:00
Fred Sundvik 999b35c7f8 Create a symlink to qmk if requested 2017-05-28 21:38:14 +03:00
Fred Sundvik ec720ac1ea Add activate_wsl to .bashrc 2017-05-28 21:30:55 +03:00
Fred Sundvik fa4a492677 Fix symlink creation 2017-05-28 21:30:55 +03:00
Fred Sundvik 3e4f2f5590 Use unzip instead of 7zip 2017-05-28 21:30:55 +03:00
Fred Sundvik 3d3999d863 Actually install flip instead of just extracting 2017-05-28 21:30:55 +03:00
Fred Sundvik b8899b48b4 Make symlink to utils and export programmer variables 2017-05-28 21:30:55 +03:00
Fred Sundvik 9c582fc797 Add install dependencies 2017-05-28 21:30:55 +03:00
Fred Sundvik 477bd4b948 Add prompt for re-downloading the utils 2017-05-28 21:30:55 +03:00
Fred Sundvik c2096bb515 Add driver installation 2017-05-28 21:30:55 +03:00
Fred Sundvik aa26464480 Add checks for cloning to the right dir 2017-05-28 21:30:55 +03:00
Fred Sundvik 28a4e90565 Download windows flashing utils and driver_installer 2017-05-28 21:30:55 +03:00
Damien b2010cd478 Update Differences-from-TMK.md
Hello,

I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ).

Regards,
Damien
2017-05-28 19:17:22 +02:00
Jack Humbert d0d81eecef Merge pull request #1334 from fredizzimo/fix_faq_lineending
Fix line endings in FAQ.md
2017-05-28 12:12:47 -04:00
Ante Laurijssen a584675735 Midi Chord Function is now working! But some chords lag... 2017-05-28 08:14:17 -04:00
Fred Sundvik 623b1cd866 Fix line endings in FAQ.md 2017-05-28 12:28:02 +03:00
Jack Humbert b8c1f25072 Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:24:53 +00:00
Jack Humbert 931ad66ffa Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:23:09 +00:00
Jack Humbert 2003cee609 Updates book.json
Auto commit by GitBook Editor
2017-05-27 22:21:58 +00:00
Jack Humbert c3bdddb637 move book for gitbook 2017-05-27 18:20:46 -04:00
Jack Humbert c95f08c439 Updates docs/book.json
Auto commit by GitBook Editor
2017-05-27 22:19:38 +00:00
Jack Humbert 7e84b0e3b3 move old doc to docs 2017-05-27 18:14:21 -04:00
Jack Humbert 704794bae3 subtree docs 2017-05-27 18:09:52 -04:00
Jack Humbert e229dcadb5 Merge pull request #5 from Maartenwut/patch-1
Mention that TT needs 5 taps by default.
2017-05-27 11:03:34 -04:00
Jack Humbert bb2a8c3611 Updates book.json
Auto commit by GitBook Editor
2017-05-27 14:56:13 +00:00
Maarten Dekkers e7fccabb1c Mention that TT needs 5 taps by default.
Also gave an example of defining the amount of taps needed.
2017-05-27 12:34:16 +02:00
Jack Humbert d24da945d1 Merge pull request #1319 from Johannes-Larsson/master
Add planck/johannes layout
2017-05-26 18:33:25 -04:00
Jack Humbert 453877422b Merge pull request #1327 from Dbroqua/master
Added Integration of IBM Trackpoint
2017-05-26 18:32:43 -04:00
Jack Humbert 9851e6f3b1 Merge pull request #1328 from yiancar/qmk_usb_startup_disable
Use variable to disable usb check at startup
2017-05-26 18:31:23 -04:00
Jack Humbert 492115a611 Merge pull request #4 from Dbroqua/master
Update Modding-your-keyboard.md
2017-05-26 18:30:41 -04:00
ariasuni e87691fa5d Fix undefined reference errors with avr-gcc 7.1 2017-05-27 00:25:35 +02:00
yiancar fa1b92fbb1 Use variable to disable usb check at startup
Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy
2017-05-26 21:58:43 +01:00
Damien 6d12588cdf Merge pull request #1 from Dbroqua/patch-1
Update Modding-your-keyboard.md
2017-05-26 22:16:09 +02:00
Nick Choi 66e9cf9718 clarified tap 2017-05-26 15:59:34 -04:00
dbroqua 6b994ecd82 - Added schematic for Trackpoint demonstration 2017-05-26 21:27:11 +02:00
dbroqua 81e85a1a4e - Added integration of IBM Trackpoint 2017-05-26 20:35:31 +02:00
Damien 6a0b13191b Update Modding-your-keyboard.md
Updated `USART version` chapter.

I think there were 2 `#endif` too .
2017-05-26 16:00:48 +02:00
Damien 0a4a966c66 Merge pull request #22 from qmk/master
Merge from QMK
2017-05-26 15:57:08 +02:00
Ante Laurijssen 6b1f707ce9 Still working on these MIDI CHORDS! 2017-05-26 09:54:40 -04:00
Nick Choi 1bff72c009 - 2017-05-26 00:19:12 -04:00
Nick Choi d462409762 tenative readme for variable timing tap 2017-05-26 00:18:59 -04:00
Ante Laurijssen b4b06f81b5 More changes to keymap.c to try and get midi chords to work 2017-05-25 23:03:33 -04:00
Nick Choi b3144112d3 removed need to set customtapping term 0. defaults to 0 already 2017-05-25 16:38:06 -04:00
Nick Choi 7c8b166cce changed -1 to 0 can't have negative unsigned ints 🤔 2017-05-25 16:29:57 -04:00
Nick Choi aeb3a34636 moved specific tap term to its own function
included custom_tapping_term in action struct
2017-05-25 16:26:30 -04:00
jpetermans ac97870801 reduce recurring writes to lock leds 2017-05-25 13:00:21 -07:00
Nick Choi e695b5a33b Added per case tapping term, updated FF-nikchi keymap. 2017-05-25 00:41:00 -04:00
Jack Humbert b003669934 Merge pull request #3 from fieldju/patch-1
Fix typo in Macro.md in dynamic macro section.
2017-05-24 23:43:34 -04:00
Nick Choi 17a378715e Tapping Term and Memes TD for FF 2017-05-24 23:43:02 -04:00
Justin Field a9ef02105d Fix typo in Macro.md in dynamic macro section. 2017-05-24 20:13:03 -07:00
Ante Laurijssen 1a0dfbbc96 More updates to keymap.c - still errors with midi when trying to compile 2017-05-24 21:15:41 -04:00
Johannes Larsson 6d08de5c67 readme, media keys fix 2017-05-24 21:35:31 +02:00
jpetermans 083267680d Restore deleted MEMO.txt from master 2017-05-24 12:26:56 -07:00
Johannes Larsson e4f1b238b3 revert changes to config.h 2017-05-24 21:24:13 +02:00
jpetermans e6c9b07e1c Merge branch 'user_led_configuration' into infinity60
Conflicts:
	keyboards/infinity60/keymaps/jpetermans/keymap.c
2017-05-24 12:07:18 -07:00
jpetermans 2dcd6c38fa Merge remote-tracking branch 'upstream/master' into infinity60 2017-05-24 11:51:20 -07:00
jpetermans f54b4771eb keymap example update and tweak to set_led_bit function 2017-05-24 11:20:50 -07:00
Jack Humbert 7a4ec3bd92 Merge pull request #1316 from nikchi/master
FrostyFlake Keymap
2017-05-24 13:59:30 -04:00
Johannes Larsson 690957cdbd media keys and stuff 2017-05-24 19:00:56 +02:00
Nick Choi 006ba4bf36 moved unicodemap rules to localer make 2017-05-24 12:36:36 -04:00
Johannes Larsson b9cf386b21 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-24 17:58:11 +02:00
Erez Zukerman ad420e7205 Merge pull request #1317 from qmk/hf/faster_mouse
tweaks default mouse speed constants
2017-05-24 05:09:29 -07:00
Erez Zukerman a965e5b735 tweaks default mouse speed constants 2017-05-24 07:56:41 -04:00
Nick Choi ef1714f443 more emoji function comments 2017-05-24 00:35:04 -04:00
Nick Choi 6536b1ce2a Tap dancing emoji support 😩😩 2017-05-23 23:52:48 -04:00
Erez Zukerman e90a00c88c then some code blocks 2017-05-23 23:09:19 -04:00
Erez Zukerman 870aaa0a7e pipes without backtics 2017-05-23 23:06:35 -04:00
Erez Zukerman be4ece0f3e grrr 2017-05-23 23:05:19 -04:00
Erez Zukerman 9359abf33e surrounds stuff with backticks 2017-05-23 23:03:30 -04:00
Erez Zukerman 260ddd3290 quick table tweak 2017-05-23 22:58:35 -04:00
Nick Choi b3eeb9d84a removed s 2017-05-23 18:47:06 -04:00
Nick Choi 0e174fcb48 Merge branch 'master' of https://github.com/nikchi/qmk_firmware 2017-05-23 13:13:23 -04:00
Nick Choi 3ed2147a88 preonic map 2017-05-23 13:13:20 -04:00
Nick Choi ec86fac6ee Merge pull request #1 from qmk/master
pull new to mine
2017-05-23 13:08:44 -04:00
Ante Laurijssen 4d783d0e69 More work on my keymap.c and added .png images of my different layers. 2017-05-22 23:30:25 -04:00
Johannes Larsson 4f1007952b merge 2017-05-22 15:27:57 +02:00
Johannes Larsson 53b094934f matrix layout 2017-05-22 15:25:53 +02:00
Ante Laurijssen 06433eb1a0 More work on keymap.c and config.h 2017-05-21 22:37:20 -04:00
Jack Humbert f9a301761f Merge pull request #2 from Vifon/master
Update the dynamic macro docs according to the recent changes
2017-05-21 11:27:41 -04:00
Ante Laurijssen 34a1bf9e20 Merge https://github.com/qmk/qmk_firmware
Update my qmk_firmware fork
2017-05-21 08:44:52 -04:00
Ante Laurijssen b766407cbe Continuing work on keymap.c 2017-05-21 08:40:42 -04:00
Wojciech Siewierski 8cd9d26246 Update the dynamic macro docs according to the recent changes
See qmk/qmk_firmware#1275.
2017-05-21 14:27:29 +02:00
Jack Humbert d2ad5afaa6 Merge pull request #1 from Xyverz/master
Adding punctuation for clarity.
2017-05-20 21:44:00 -04:00
xyverz 3588bd694e Adding punctuation for clarity. 2017-05-20 18:39:59 -07:00
Jack Humbert 68b8f37853 favicon 2017-05-20 13:30:27 -04:00
Jack Humbert 33f886ad74 favicon 2017-05-20 13:26:08 -04:00
Jack Humbert 0cd8eb02c7 favicon 2017-05-20 13:20:10 -04:00
Jack Humbert c7e9e643fa Update readme.md 2017-05-20 12:38:30 -04:00
Jack Humbert d380ed1f75 Update readme.md 2017-05-20 12:37:31 -04:00
Jack Humbert 684a02ae3f Update SUMMARY.md 2017-05-20 12:30:24 -04:00
Jack Humbert b3bff6404c Update SUMMARY.md 2017-05-20 12:29:45 -04:00
Jack Humbert 046c5d332f Update SUMMARY.md 2017-05-20 12:27:07 -04:00
Jack Humbert 5e28f88707 Update book.json 2017-05-20 12:07:31 -04:00
Jack Humbert d678899c83 Update book.json 2017-05-20 12:04:03 -04:00
Jack Humbert 2df879cbe3 Update book.json 2017-05-20 12:02:55 -04:00
jerryen 9c284786e7 Workaround for the macOS caps lock delay (#1308)
* Add 80ms delay for KC_CAPS when used as a tap key

Workaround for the macOS caps lock delay

* Revert "Increase TAPPING_TERM for the Clueboard"

This reverts commit a74e69e9fa.
2017-05-19 17:24:47 -07:00
Jack Humbert 85df687348 m10a lowercase 2017-05-18 18:55:07 -04:00
Erez Zukerman 0d8c73dc8d Merge pull request #1303 from cwesterlund/dvorak_dev_swe
Created a dvorak keymap for Swedish developers using Visual Studio
2017-05-18 15:31:16 -07:00
Ante Laurijssen c686793b59 Merge https://github.com/qmk/qmk_firmware
Update from QMK main
2017-05-17 23:06:57 -04:00
tengg aaa01d0a4e ESC/GRAVE/TILDE better handling (#1307)
* revise HHKB bootloader_size to 4096 such that sw reset works

* cleanup esr/grave/tilde handling function
2017-05-17 18:20:01 -07:00
Jack Humbert 8da442f411 update travis script 2017-05-17 20:27:07 -04:00
Ante Laurijssen 26c6f6a85c Added Space Cadet Rollover Disable to config.h 2017-05-16 22:08:45 -04:00
skullY a74e69e9fa Increase TAPPING_TERM for the Clueboard 2017-05-16 13:09:23 -07:00
skullY 3c5b915078 Make KC_GRV accessible 2017-05-16 13:02:22 -07:00
Christian Westerlund fcef83a5d0 Created a dvorak keymap for Swedish developers using Visual Studio 2017-05-16 15:15:42 +02:00
Ante Laurijssen 814b570ba1 Working on keymap.c file... 2017-05-15 22:56:33 -04:00
Jack Humbert e5ed23c0b3 summary test 2017-05-15 22:45:20 -04:00
Jack Humbert 2513912975 Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:39:49 +00:00
Jack Humbert 52562eaaea Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:38:44 +00:00
Jack Humbert 3a7e0dd2f6 Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:36:31 +00:00
Jack Humbert e0689c000b Updates book.json
Auto commit by GitBook Editor
2017-05-16 02:35:00 +00:00
Jack Humbert 997a847f8c update links 2017-05-15 22:29:17 -04:00
Jack Humbert 60daffbe5d Update SUMMARY.md 2017-05-15 22:00:22 -04:00
Jack Humbert e5b0095e6c Update SUMMARY.md 2017-05-15 22:00:14 -04:00
Jack Humbert 819f0998bd Updates SUMMARY.md
Auto commit by GitBook Editor
2017-05-16 01:50:44 +00:00
Jack Humbert 7cbbf62f5f Merge pull request #1298 from barrar/master
Anti-ghost improvement for older keyboards with empty spots in matrix
2017-05-15 12:20:17 -04:00
Nick Choi 5d965a8d41 emojis and reorg 2017-05-15 02:19:50 -04:00
Nick Choi eb660ef218 emoji support but 2017-05-15 01:52:45 -04:00
Nick Choi b2b72058e5 change readme 2017-05-15 00:12:04 -04:00
Nick Choi 888026ae73 nikchi flake 2017-05-15 00:10:25 -04:00
Ante Laurijssen ee0b34feaf Started working on custom midi chord function 2017-05-14 20:07:35 -04:00
Jeremiah 25c6ca750f added comments and made function name clearer 2017-05-14 15:36:44 -07:00
Ante Laurijssen f006ebebbd Initial push of my keymap 2017-05-14 16:07:44 -04:00
Jeremiah 84395e8a04 whoops 2017-05-14 09:36:50 -07:00
Jeremiah b9b2244b82 faster, less bits :) 2017-05-14 08:01:01 -07:00
Jeremiah 63d9698d5c faster and less bits... again 2017-05-13 19:07:05 -07:00
Jeremiah 37f6f92765 faster and less bits 2017-05-13 18:24:43 -07:00
Jeremiah 7b7e285a98 should be using matrix_row_t 2017-05-13 17:22:38 -07:00
Jeremiah acd3e97b83 a bit smaller 2017-05-13 17:01:27 -07:00
Jeremiah 99877cdff3 a bit smaller 2017-05-13 16:57:23 -07:00
Jeremiah b9895771ed improvements 2017-05-13 13:19:28 -07:00
Jack Humbert 95ac79cb67 Updates SUMMARY.md
Auto commit by GitBook Editor
2017-05-13 20:17:26 +00:00
Jack Humbert 694db4130e Updates SUMMARY.md
Auto commit by GitBook Editor
2017-05-13 20:17:21 +00:00
Jack Humbert 7f4cf32af9 Updates book.json
Auto commit by GitBook Editor
2017-05-13 20:10:38 +00:00
Jack Humbert e7da52c7de Updates book.json
Auto commit by GitBook Editor
2017-05-13 20:09:06 +00:00
Jack Humbert 43d1e05b31 Updates Home.md
Auto commit by GitBook Editor
2017-05-13 20:04:39 +00:00
Jack Humbert 05a6449d2d Updates readme.md
Auto commit by GitBook Editor
2017-05-13 18:25:08 +00:00
Jeremiah 849ed5a6a0 anti-ghost improvement for older keyboards with empty spots in matrix 2017-05-13 08:51:20 -07:00
barrar 4fe58aa6ec Merge pull request #1 from qmk/master
pull
2017-05-13 08:37:25 -07:00
Jack Humbert 04069c94cc Merge pull request #1297 from khogeland/satan-colemak
Colemak layout for GH60 Satan
2017-05-12 16:24:51 -04:00
Jack Humbert a82e752f64 Merge pull request #1291 from adzenith/persistent
Fix spelling of "persistent"
2017-05-12 16:24:29 -04:00
Kevin Hogeland b767719fc8 Colemak layout GH60 Satan 2017-05-12 12:03:09 -07:00
Nikolaus Wittenstein 8ddbf7f59f Fix spelling of "persistent"
Fixes #1201.
2017-05-11 15:32:35 -04:00
Jack Humbert b412bb8d8c Merge pull request #1283 from TerryMathews/master
Establish support for Bathroom Epiphanies Tiger Lily controller
2017-05-11 14:34:02 -04:00
Jack Humbert d6ce42b01c Merge pull request #1288 from Nephiel/led-set-on-layer-change
Call led_set for layer action events to update LEDs on layer changes
2017-05-11 14:32:56 -04:00
Jack Humbert de2c51b7ca Merge pull request #1290 from shieldsd/master
Add new features to dshields keymap.
2017-05-11 14:31:11 -04:00
Daniel Shields eb3f80b924 Add new features to dshields keymap.
- one shot layers, dynamic macros and tap dance keys
- add a basic readme.md and layout image.
2017-05-11 09:16:55 +01:00
jpetermans 164a6c994b reorder mailbox msg data; formatting 2017-05-10 15:53:59 -07:00
Nephiel bd2c0b9648 Call led_set for layer action events to update LEDs on layer changes 2017-05-10 19:26:39 +02:00
jpetermans a144968807 remove breath functions from keymap 2017-05-08 16:38:44 -07:00
jpetermans 16774333ad last readme fix 2017-05-08 16:28:04 -07:00
jpetermans 5fc5661147 third readme fix attempt 2017-05-08 16:19:11 -07:00
jpetermans d1ff2bb9db readme fix 2017-05-08 16:17:40 -07:00
jpetermans 821f72eae9 documentation cleanup 2017-05-08 16:15:20 -07:00
jpetermans b5675e2025 Merge branch 'user_led_configuration' of https://github.com/jpetermans/qmk_firmware into user_led_configuration
Conflicts:
	keyboards/infinity60/led_controller.c
	keyboards/infinity60/led_controller.h
2017-05-08 15:42:27 -07:00
Stephen Tudor 9a8904a9c0 Add smt keymap for Clueboard (HHKB-style layout) (#1286)
* Add keymap for smt Clueboard (HHKB layout)

* Add readme for smt Clueboard (HHKB) keymap

* Flesh out the keymap a bit more to support Colemak & Dvorak

* Update README with layout image
2017-05-08 15:32:15 -07:00
jpetermans 967cf0f6d4 Merge remote-tracking branch 'upstream/master' into user_led_configuration 2017-05-08 15:24:50 -07:00
jpetermans 5df74f3ba7 updated keymap for new led functions 2017-05-08 15:13:02 -07:00
jpetermans f1d81d2cc6 minor change on lock leds 2017-05-08 14:55:57 -07:00
jpetermans 2c5b551970 CLeaned out debug code 2017-05-08 14:35:08 -07:00
jpetermans 52f671c23e small code cleanup 2017-05-08 11:57:40 -07:00
Erez Zukerman 153eb95ab2 Merge pull request #1279 from awpr/master
Change to per-key eager debouncing for ErgoDox EZ.
2017-05-07 21:52:00 -04:00
Jack Humbert d9b70cc1c9 Merge pull request #1275 from Vifon/dynamic_macro/trailing_keypresses
dynamic macros: Trim the trailing modifiers; further cleanup
2017-05-07 20:20:55 -04:00
Jack Humbert b11a5be62c Merge pull request #1278 from shieldsd/master
Add new keymap for dshields.
2017-05-07 20:18:23 -04:00
Jack Humbert 0b050f6c33 Merge pull request #1280 from tobsn/patch-1
lowercase .jpg
2017-05-07 20:17:47 -04:00
Jack Humbert 05b356dea7 Merge pull request #1282 from coderkun/coderkun_neo2
Merge changes for coderkun’s Neo2 layout
2017-05-07 20:16:30 -04:00
Jack Humbert 7a7b57ffb1 Merge pull request #1284 from bigtunaIO/master
[Bigtuna.IO] Updating Miuni32 Layouts
2017-05-07 20:16:03 -04:00
TerryMathews 84a358845b Fix compile error 2017-05-07 18:00:06 -04:00
Adam Lee 22738df5f5 Merge branch 'dev' 2017-05-07 14:44:28 -07:00
Adam Lee d099266853 [Miuni32] Rm accidentally committed file 2017-05-07 14:42:21 -07:00
Adam Lee ba90cf422c Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev 2017-05-07 14:40:37 -07:00
Adam Lee f2fcab96a8 Merge remote-tracking branch 'upstream/master' 2017-05-07 14:36:10 -07:00
Adam Lee 29df2be2a9 Merge remote-tracking branch 'upstream/master' into dev 2017-05-07 14:35:43 -07:00
TerryMathews 3381254c65 Establish support for Bathroom Epiphanies Tiger Lily controller
Replacement controller for Filco Majestouch 2 104 key keyboard. BE
advises code will also work with the Black Petal controller - I don't
have one to test with. Tests working perfectly on my Filco.
2017-05-07 17:23:19 -04:00
dbroqua 230c70e285 - Initial commit for branch DK60 2017-05-07 22:56:27 +02:00
coderkun d28d390ad6 Update README for keymap “coderkun_neo2” 2017-05-06 12:25:24 +02:00
coderkun 49046f621b Merge tag '0.5.43' into coderkun_neo2 2017-05-06 12:19:45 +02:00
coderkun 9e7448ea89 Fix F-keys on right hand to start on first key 2017-05-06 12:17:51 +02:00
Tobias O b2083e21a2 lowercase .jpg I think
i guess that fixes the image link - currently its broken
2017-05-05 23:55:06 +02:00
Daniel Shields cb60fe393f Add new keymap for dshields. 2017-05-05 14:41:13 +01:00
Wojciech Siewierski a1e156a3d2 dynamic_macro.h: Do not use backlight_toggle if backlight is disabled
Fixes #1199.
2017-05-05 00:11:24 +02:00
Wojciech Siewierski 10a7cd7e5a dynamic_macro.h: Add debug logs 2017-05-04 23:57:22 +02:00
Wojciech Siewierski 8e94c9b4cb dynamic_macro.h: Make the documentation more clear 2017-05-04 22:39:02 +02:00
Jack Humbert 2704c163da Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix
[ps2avrGB] Add KEYMAP without KC-prefix
2017-05-04 15:07:57 -04:00
Jack Humbert 3af95509b5 Merge pull request #1273 from Vifon/pr_1267_fix
Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
2017-05-04 15:07:04 -04:00
tengg 425f0a768b revise HHKB bootloader_size to 4096 such that sw reset works (#1274) 2017-05-04 10:27:35 -07:00
Wojciech Siewierski 4b50ea15a9 dynamic_macro.h: Do not save the keys being held when stopping the recording
More specifically, we save them and then place the `macro_end` pointer
before them so they are essentially ignored and the other macro may
freely overwrite them.
2017-05-04 01:42:09 +02:00
Wojciech Siewierski 436d661775 dynamic_macro.h: Fix an off-by-two error
We need to check whether we just passed the after-the-end point of the
other macro. Instead we were checking whether we are going to reach it
now.
2017-05-04 01:26:35 +02:00
Wojciech Siewierski 5e2a999278 dynamic_macro.h: Always toggle the backlight twice as a notification
Apparently sometimes the backlight was toggled only once and it was left on.
2017-05-04 00:58:01 +02:00
Wojciech Siewierski 40fe30e4d6 dynamic_macro.h: Ignore all the initial key releases
Right after the user initiates the macro recording, they usually need
to release some keys used to access the DYN_REC_START layers. It makes
sense to ignore them.

Note: The keys used to access the DYN_REC_STOP key are *not* ignored.
2017-05-04 00:14:38 +02:00
Thor77 7f3b1232c4 Use KC_KEYMAP for default-keymap
and remove obsolete explicit line-separator "\"
2017-05-03 22:13:46 +02:00
Thor77 38b076d22d Add KEYMAP without KC_##-prefix
and rename old variant to KEYMAP_KC
2017-05-03 22:01:02 +02:00
Jack Humbert c5cef025ec Merge pull request #1269 from ryanmaclean/patch-6
Cleaning Up Dockerfile Layers Per Official Docs
2017-05-01 12:15:27 -04:00
jpetermans b27fb216ef Testing initial blink support 2017-04-30 16:27:46 -07:00
Ryan MacLean 7ce94eb468 Cleaning Up Dockerfile Layers Per Official Docs
From the official docs: 

```
Note: The official Debian and Ubuntu images automatically run apt-get clean, so explicit invocation is not required.
```

Also added ` && rm -rf /var/lib/apt/lists/*` as part of the install line which probably does what was intended (no need to make a new layer). 

Added apt-get update to the RUN payload, as it should be part of the same layer. 

Both are documented here: https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/
2017-04-30 15:04:00 -07:00
Jack Humbert 26b51383b2 Merge pull request #1266 from ryanmaclean/patch-5
Adding AMJ60 ANSI Maximized Layout
2017-04-30 16:57:14 -04:00
Jack Humbert 29026ec023 Merge pull request #1268 from priyadi/promethium
Promethium keymap update
2017-04-30 11:18:54 -04:00
Jack Humbert 2d732f484c Merge pull request #1264 from fredizzimo/wsl_support
Add possibility to override the command to execute when flashing
2017-04-30 11:17:47 -04:00
Jack Humbert d1d2b87f97 fixes s60_x keyboard 2017-04-30 10:48:17 -04:00
Jack Humbert 43aa59c703 Merge pull request #1263 from Dbroqua/master
Fixed bugs for S60-X RGB version
2017-04-30 10:27:40 -04:00
Priyadi Iman Nurcahyo 343f8d368e Simple RGB backlight theming 2017-04-30 18:04:58 +07:00
Priyadi Iman Nurcahyo 2f28652dcc Syntax fix 2017-04-30 18:03:03 +07:00
Weiyi Lou c8ac556e63 Update vifon keymap to use DYN_REC_STOP 2017-04-30 19:48:07 +10:00
Weiyi Lou 1201d4910f Add cinaeco hhkb keymap 2017-04-30 19:30:39 +10:00
Weiyi Lou 4ff40a551a Add DYN_REC_STOP to dynamic macros
Dynamic macro functionality is modified to check for `DYN_REC_STOP`, so
that macro recording can be stopped with a designated key combination
(e.g. `qs` or anything) instead of mandating the use of a `_DYN` layer.

`_DYN` layer stopping can still be done by passing `DYN_REC_STOP` within
`process_record_user()`:

    bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      uint16_t macro_kc = (keycode == MO(_DYN) ? DYN_REC_STOP : keycode);
      if (!process_record_dynamic_macro(macro_kc, record)) {
        return false;
      }
      return true;
    }
2017-04-30 19:21:44 +10:00
Ryan MacLean ff512ea5b4 Addind Sample Maxed Out Keymap
Keeping hold space for fn1, adding three other user-mappable keys.
2017-04-29 16:18:26 -07:00
Ryan MacLean 9122b34a47 Adding Maximized Layout
Both split shifts and HHKB split backspace.
2017-04-29 16:16:21 -07:00
Fred Sundvik 18b4d24cc3 Add possibility to override the command to execute when flashing 2017-04-29 23:45:27 +03:00
jpetermans ff6beeb7a3 simplified lock led function 2017-04-29 09:22:40 -07:00
dbroqua 7180e195e8 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2017-04-29 15:04:01 +02:00
Damien 584b804ee3 Merge pull request #21 from qmk/master
Merge from QMK
2017-04-29 15:03:52 +02:00
dbroqua 838aae1645 - Fixed bugs in rules.mk for S60-X
- Updated dbroqua layout for S60-X (added backlight)
2017-04-29 15:02:54 +02:00
Priyadi Iman Nurcahyo d8f1949029 Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click frequency 2017-04-29 13:21:27 +07:00
skullydazed cdef372f57 Document the MAGIC keys 2017-04-28 11:56:03 -07:00
htang156 425e7348d8 Modified ht_156 keymap 2017-04-27 23:12:43 -07:00
jpetermans b3945c103c Simplified processing in led_controller; more control at user level. 2017-04-26 23:12:25 -07:00
Jack Humbert 26bbfd7812 Merge pull request #1259 from laelath/master
Added a proper README to the lae3 keymap
2017-04-26 19:22:36 -04:00
Andrew Pritchard cd30a60d0e Change to per-key eager debouncing for ErgoDox EZ.
Empirically, waiting for N consecutive identical scans as a debouncing
strategy doesn't work very well for the ErgoDox EZ where scans are very
slow compared to most keyboards.  Instead, debounce the signals by
eagerly reporting a change as soon as one scan observes it, but then
ignoring further changes from that key for the next N scans.

This is implemented by keeping an extra matrix of uint8 countdowns, such
that only keys whose countdown is currently zero are eligible to change.
When we do observe a change, we bump that key's countdown to DEBOUNCE.
During each scan, every nonzero countdown is decremented.

With this approach to debouncing, much higher debounce constants are
tolerable, because latency does not increase with the constant, and
debounce countdowns on one key do not interfere with events on other
keys.  The only negative effect of increasing the constant is that the
minimum duration of a keypress increases.  Perhaps I'm just extremely
unlucky w.r.t. key switch quality, but I saw occasional bounces even
with DEBOUNCE=10; with 15, I've seen none so far.  That's around 47ms,
which seems like an absolutely insane amount of time for a key to be
bouncy, but at least it works.
2017-04-26 15:29:39 -07:00
laelath 196740a0bb Expanded lae3 keymap readme 2017-04-26 13:56:01 -07:00
Jack Humbert 5a809ac178 Merge pull request #1258 from smt/smt/hhkb
Add smt keymap for HHKB
2017-04-26 15:30:36 -04:00
Jack Humbert 7bd4559b4b Merge pull request #1231 from Dbroqua/master
S60-X RGB support
2017-04-25 14:09:41 -04:00
Jack Humbert 9fa7a788d3 Merge pull request #1253 from laelath/master
Added lae3 keymap
2017-04-25 14:08:52 -04:00
Jack Humbert 627dd8a73c Merge pull request #1255 from ryanmaclean/patch-4
Initial Ortholinear Commit for AMJPad
2017-04-25 14:08:16 -04:00
Jack Humbert 46826adba8 Merge pull request #1257 from MachineIndustries/keyboards/M10A
Add RAMA x Machine Industries M10A to the keyboards directory
2017-04-25 14:07:41 -04:00
Josh Black d6386b108b Add RAMA x Machine Industries M10A to the keyboards directory 2017-04-25 19:00:44 +01:00
Stephen Tudor 4cc41de50b Add smt keymap for HHKB 2017-04-24 11:16:14 -04:00
Justin Frank e2a5dfdba6 Switched Alt and GUI key places 2017-04-23 19:38:40 -07:00
Ryan MacLean d27ff5ccf6 Adding Right Layout 2017-04-22 22:34:14 -07:00
Ryan MacLean 24994046d6 Update keymap.c 2017-04-22 21:26:47 -07:00
Ryan MacLean 2e62ff9807 Initial Ortho Commit (LEFT SIDE)
Using only one layer, and activating it with two keys at the moment. 
As with previous comments, this isn't final, but is a good starting point for a one-handed keyboard, half a Planck-like ortholinear keyboard, or a sample to show a layout with a function layer.
2017-04-22 20:49:34 -07:00
Justin Frank 7f3224b117 Added lae3 keymap 2017-04-22 15:15:17 -07:00
Solomon 187c78f3cb Added an additional clueboard layout. (#1252)
* Current building keymap

* Working media keys

* Added mute key. Fixed volume. Fixed media

* Updating readme

* Swapped readme order
2017-04-22 06:25:41 -07:00
skullydazed a793e094bc Created Porting Your Keyboard to QMK (ARM and other ChibiOS CPUs) (markdown) 2017-04-21 22:24:02 -07:00
skullY 973e91078b Tweak the shift_fn keymap so it works 2017-04-21 21:46:01 -07:00
dbroqua 215dd126d0 - Moved S60-X RGB in sub project for S60-X 2017-04-19 22:12:23 +02:00
Jack Humbert 460b5f8751 Merge pull request #1246 from reversebias/master
Initial support for the Mitosis Keyboard
2017-04-19 08:43:28 -04:00
reversebias 43fd889d7e Update readme.md 2017-04-19 22:39:44 +10:00
Jack Humbert 95242fe0f1 Merge pull request #1245 from fredizzimo/fix_lcd_pin_configuration
Fix LCD SS pin configuration
2017-04-19 07:50:03 -04:00
Jack Humbert 4760b26bec Merge pull request #1244 from ryanmaclean/patch-3
Adding Maximized Keymap
2017-04-19 07:49:46 -04:00
Jack Humbert ff4ad46dca Merge pull request #1243 from Xyverz/master
Removed LT macros
2017-04-19 07:47:56 -04:00
cam 43964438fb First Commit 2017-04-19 20:27:49 +10:00
reversebias 3c3be98a06 Delete temp 2017-04-19 20:15:44 +10:00
reversebias e27c50669a Create temp 2017-04-19 20:12:50 +10:00
Priyadi Iman Nurcahyo f9d226ca50 tune clicks 2017-04-19 12:35:05 +07:00
Priyadi Iman Nurcahyo 3c7db55ec5 Merge remote-tracking branch 'upstream/master' into promethium 2017-04-19 12:04:15 +07:00
Priyadi Iman Nurcahyo ce0efa6b9a Fix LED sequence; bug fixes 2017-04-19 12:03:48 +07:00
Fred Sundvik 430a8e1750 Fix LCD SS pin configuration
There was a typo, so the attempted configuration proably didn't do
what it should have done. I think it left the pin floating, and
could cause the LCD problems issue-1230.
2017-04-19 07:59:39 +03:00
Ryan MacLean 34130d56f1 Adding Sample Max Layout 2017-04-18 21:54:58 -07:00
Ryan MacLean 0a8df2c5e3 Adding Maximized Keymap
For use with grid layout pads.
2017-04-18 21:53:10 -07:00
Xyverz b844fe7efd LT doesn't work with tri_layer. Removed it from this keymap. 2017-04-18 20:36:26 -07:00
Xyverz 3a00aafd39 swapped RAISE with LOWER in layer-tapping macros. 2017-04-18 18:15:46 -07:00
dbroqua fecb932945 - Fixed bug in keymap for s60-X RGB 2017-04-18 22:26:32 +02:00
Jack Humbert be0afd24bf Merge pull request #1239 from priyadi/promethium
Keymap updates
2017-04-18 16:17:27 -04:00
Jack Humbert d926ba22a2 Merge pull request #1238 from priyadi/fauxclicky_fix
Faux clicky bug fixes
2017-04-18 16:16:35 -04:00
Jack Humbert 7a16a30e6a Merge pull request #1236 from Xyverz/master
Revamp TV44 keymap.
2017-04-18 16:08:16 -04:00
Jack Humbert a25d4a90c3 Merge pull request #1235 from siroken3/siroken3
Siroken3
2017-04-18 16:06:27 -04:00
Priyadi Iman Nurcahyo 5bc0c4a011 Fix Planck compatibility 2017-04-19 02:55:19 +07:00
Priyadi Iman Nurcahyo 3fa0b66289 Keymap updates and some adjustment for latest version of QMK 2017-04-19 02:52:57 +07:00
Priyadi Iman Nurcahyo ffa4c72a89 Faux clicky bug fixes 2017-04-19 01:40:16 +07:00
Priyadi Iman Nurcahyo 93b2f23bba Promethium rev2
* 10 more indicator LEDs
* Piezo buzzer
* Uses HC138 decoder to free up 5 pins
* Trackpoint buttons are now part of matrix
2017-04-19 01:38:08 +07:00
Stick 8665ed3efc small changes 2017-04-18 09:46:07 -05:00
Xyverz 41d45afd2a Fixed a weird diff mishap. 2017-04-17 21:54:02 -07:00
Xyverz e11cb44926 Merge branch 'tv44_revamp' 2017-04-17 20:20:27 -07:00
Xyverz a3aadd888f Updated my TV44 keymap to be more planck-like.
Used the current default planck keymap as a guide.
2017-04-17 20:15:57 -07:00
Jack Humbert ae8ac581c0 Merge pull request #1234 from whitef0x0/patch-1
Fixed dvorak layout for Atreus50
2017-04-17 19:02:24 -04:00
David Baldwynn acd63bc03c Fixed dvorak layout for Atreus50 2017-04-17 12:05:47 -07:00
Jack Humbert f637ab69c2 Merge pull request #1228 from fitzsim/fix-keymap-yoruian-macro
Fix KEYMAP_YORUIAN macro
2017-04-17 13:21:03 -04:00
Xyverz a343188dcf macros to make keymap reading easier. 2017-04-16 21:52:49 -07:00
Xyverz a22286e834 Added keymap to TV44 Revamp 2017-04-16 21:09:23 -07:00
htang156 4634e3802c Added simple macros to test. 2017-04-16 17:39:04 -07:00
htang156 c4f93e237e Added media layer for ht_156 2017-04-16 16:08:31 -07:00
htang156 f9aa75fe95 Added ht_156 keymap files 2017-04-16 15:31:05 -07:00
Adam YH Lee 9d4050586d Merge branch 'master' into layouts/adam-lee 2017-04-16 15:20:31 -07:00
Adam YH Lee 857600aa4b Merge branch 'master' into dev 2017-04-16 15:19:20 -07:00
Adam YH Lee 7e930626eb Add a personal layout for adam
Collectively we should keep on working on the "default" layout.
I am adding my own layout to freely explore adjustments
and new features.
2017-04-16 15:06:08 -07:00
Adam YH Lee 22afddb8e8 Replace RALT with RSFT 2017-04-16 14:50:25 -07:00
htang156 3bfe4cdb4f Added END and other keymap file formatting. 2017-04-16 14:19:51 -07:00
htang156 1bab72383c Added DEL and F1 to F12 keys 2017-04-16 14:10:29 -07:00
htang156 ccabf70aeb Added keymap commets to default layout. 2017-04-16 13:40:03 -07:00
jpetermans 046f1baf30 more stable lock led process, added debugging code 2017-04-15 14:37:55 -07:00
skullydazed 6c30fd04d3 Updated Keycodes (markdown) 2017-04-15 13:17:41 -07:00
dbroqua b133b74897 - Added S-60-X RGB directory (based on qmk.sized.io work) 2017-04-15 16:34:33 +02:00
jpetermans c0ec1756af Added backlight step functionality 2017-04-14 18:20:12 -07:00
Adam YH Lee a9f4596062 Add TAB, N, LSFT on Layer 2 2017-04-14 00:02:25 -07:00
Adam YH Lee f076f16e13 Add KC_T on Layer 2 2017-04-13 23:50:57 -07:00
Adam YH Lee 4810a4a812 Add LCTL + L on Layer 2 2017-04-13 23:47:50 -07:00
Thomas Fitzsimmons bc7b1843ba Fix KEYMAP_YORUIAN macro
Fix the ordering of the arguments to the KEYMAP macro.
2017-04-14 02:06:58 -04:00
jpetermans ec1e936dfb fixed bit shift in led_set_bit 2017-04-13 17:51:37 -07:00
jpetermans 1b1adf35bb more flexible led processing functions, all and on/off/toggle
functioning
2017-04-13 17:15:24 -07:00
Jack Humbert b5e8327755 Merge pull request #1226 from fredizzimo/fix_ergodox_righthand_warning
Add missing serial_link.h include
2017-04-13 16:15:13 -04:00
Fred Sundvik 94b14bdd6a Add missing serial_link.h include
Which fixes a warning when building Ergodox Infinity as a righthand
master.
2017-04-13 23:00:27 +03:00
Jack Humbert 0b31a63dd4 Merge pull request #1225 from fredizzimo/fix_lcd_led_status_buffer_overrun
Fix buffer overrun in lcd_keyframes
2017-04-13 15:26:38 -04:00
Fred Sundvik 5c251b5575 Fix buffer overrun in lcd_keyframes
This would often cause the keyboard to crash when restarting the
computer.
2017-04-13 21:40:06 +03:00
Jack Humbert 41a46c7c8e Merge pull request #1224 from fredizzimo/fix_warnings
Fix all warnings and turn on warnings as errors
2017-04-13 14:07:48 -04:00
Adam YH Lee f90321bdcb Update keymap - hopefully more usable 2017-04-13 09:25:05 -07:00
Fred Sundvik d68294615f Add make option for allowing warnings 2017-04-13 16:12:55 +03:00
Fred Sundvik d8e2ff2964 Fix process_unicode_common.c being included twice 2017-04-13 16:03:01 +03:00
Fred Sundvik 07fc34e962 Fix warnings when ACTION_ONESHOT is disabled 2017-04-13 16:00:29 +03:00
Fred Sundvik abda6ff7bb Include host.h from suspend.c 2017-04-13 16:00:29 +03:00
Fred Sundvik 08b9eb26c5 Fix warnings in CMD-Preonic
The startup_sound is defined using MUSICAL_NOTEs, since non-constant
initializer expressions are not allowed in C.
2017-04-13 16:00:29 +03:00
Fred Sundvik 109ae2f1e8 Fix warnings in process_printer 2017-04-13 16:00:29 +03:00
Fred Sundvik a619b93e38 Fix warnings in planck/lucas keymap
Register the unshifted version DE_LESS, rather than the shifted DE_MORE
2017-04-13 16:00:29 +03:00
Fred Sundvik df30d18458 Fix warnings in kitten_paw/ickerwx keymap 2017-04-13 16:00:29 +03:00
Fred Sundvik 737c1fe641 Make MOUSEKEY_MOVE_MAX and MOUSEKEY_WHEEL_MAX configurable
Kitten_paw/ickerwx was doing that
2017-04-13 16:00:29 +03:00
Fred Sundvik bbe8876c8d Rename MS-sculpt-mobile to MS_scuplpt_mobile
Subprojects with "-" have problems, since the build system creates
a define containing the subproject name, and "-" is illegal in
macro names.
2017-04-13 16:00:29 +03:00
Fred Sundvik 738b8d2b9c Add SKIP_VERSION option to speed up compilation 2017-04-13 16:00:29 +03:00
Fred Sundvik e950d4e12f Fix frosty_flake warning when print is disabled 2017-04-13 16:00:29 +03:00
Fred Sundvik 2d1528c69f Fix keymap yoruian on Infinity 2017-04-13 16:00:29 +03:00
Fred Sundvik f7b59427fa Fix name collision between ChibiOS and keymap_german 2017-04-13 16:00:29 +03:00
Fred Sundvik 12159e782c Fix overflow warning in ordinary keymap 2017-04-13 16:00:29 +03:00
Fred Sundvik db6d7207b5 Fix overflow warnings in dvorak_programmer 2017-04-13 16:00:29 +03:00
Fred Sundvik 6535804776 Disable array bounds warning in keymap_function_id_to_action 2017-04-13 16:00:29 +03:00
Fred Sundvik a4ef86034c Fix undefined eeprom warnings in unicode processing 2017-04-13 16:00:29 +03:00
Fred Sundvik f39e9928eb Enable warnings as errors 2017-04-13 16:00:29 +03:00
Fred Sundvik 224fc8a20f Add makefile option to break on errors 2017-04-13 16:00:29 +03:00
Damien a43cb6c0af Merge pull request #20 from qmk/master
Merge from QMK
2017-04-13 13:26:02 +02:00
jpetermans 15635817b5 Updated lock led init 2017-04-12 23:32:38 -07:00
Adam YH Lee dddbcc2af3 Replace double quote with comma 2017-04-12 22:11:08 -07:00
Adam YH Lee 592ff53e41 Enable RGB Animation 2017-04-12 21:19:00 -07:00
Adam YH Lee 73625a603a Merge branch 'master' into miuni32-OA 2017-04-12 20:58:36 -07:00
Johannes Larsson 835adb7848 colemak layout maybe 2017-04-12 23:11:51 +02:00
Jack Humbert d3301c0f8b Merge pull request #1220 from joedevivo/master
mimic atreus firmware defaults
2017-04-12 15:42:46 -04:00
Jack Humbert 456570efa4 Merge pull request #1212 from Xyverz/master
atreus keymap overhaul
2017-04-12 12:46:08 -04:00
Jack Humbert 30ad505dd0 Merge pull request #1213 from nstickney/master
ErgoDox Familiar layout
2017-04-12 12:45:45 -04:00
Jack Humbert 0de2597f7c Merge pull request #1216 from Khord/master
Added breathing macros/mappings and removed mappings to unused layouts
2017-04-12 12:45:03 -04:00
Jack Humbert b7f1ea967a Merge pull request #1222 from kamisamamizu/patch-1
Fixed position of BSLS and BSPC on the xd60
2017-04-12 12:44:11 -04:00
Jack Humbert e5f610b70e Merge pull request #1217 from fredizzimo/ergodox_default_visualizer
Enable Ergodox Infinity LCD visualization
2017-04-12 12:43:46 -04:00
kamisamamizu 446b34edec Fixed position of BSLS and BSPC
They were in the incorrect positions before.
2017-04-12 12:18:38 +02:00
Adam YH Lee 91b11bb4dd Update default layout
This is a 2U Spacebar layout. Spacebar is between V and B.

Issue:

	- RGB MOD does not seem to do anything
2017-04-12 01:12:16 -07:00
Fred Sundvik 1d5567a3a9 Fix code formatting in build_keyboard.mk 2017-04-12 09:52:40 +03:00
jpetermans 0881f2dbfa fixed write_led_page col shift, added option for lock led display 2017-04-11 23:33:48 -07:00
skullydazed f9c62aa363 Link to ChibiOS 2017-04-11 06:56:12 -07:00
skullydazed 1b0f5e4803 Updated Compatible Microcontrollers (markdown) 2017-04-11 06:55:39 -07:00
skullydazed c876bb8748 Adding notes about ARM processors 2017-04-11 06:55:24 -07:00
jpetermans d8e9c183be led init code missing pwm writes for Frame 1 2017-04-10 22:23:45 -07:00
jpetermans dda858c437 revised led controller code to allow for more options
unable to switch picture displays
2017-04-10 17:36:47 -07:00
Joe DeVivo dc96fa24e4 mimic atreus firmware defaults 2017-04-10 17:19:27 -07:00
Fred Sundvik 65b7bf6878 Extract Ergodox default visualizer into simple_visualizer
It's good enough if you only want to change the lcd text and color.
2017-04-09 18:34:59 +03:00
Fred Sundvik c5d2b7ff16 Rename led test to led_keyframes and move animation to Ergodox 2017-04-09 18:34:59 +03:00
Fred Sundvik 306353bf06 Create a file for shared Ergodox Infinity animations 2017-04-09 18:34:59 +03:00
Fred Sundvik c6ca996f4e Combine startup and resume animations 2017-04-09 18:34:59 +03:00
Fred Sundvik ed1710589f Fix suspend not disabling backlight 2017-04-09 18:34:59 +03:00
Fred Sundvik 3074269c4a Move the logo drawing keyframe to lcd_keyframes 2017-04-09 18:34:59 +03:00
Fred Sundvik df67169d42 Move LCD logo to visualizer resources 2017-04-09 18:34:59 +03:00
Fred Sundvik 3eb8785e87 Add automatic flush for the LCD screen 2017-04-09 18:34:59 +03:00
Fred Sundvik 995002fa91 LCD initialization sequence according to the docs
The LCD initialization show now be much better and faster with no
flickering at the startup.

Also fix the contrast control.
2017-04-09 18:34:59 +03:00
Fred Sundvik 3994fb1e79 Yet another try to fix the LCD corruption
It turns out that the ChibiOS K20 SPI driver doesn't handle the
chip select, so it needs to be done manually. Acquiring the bus is
not enough since the pin was in the wrong mode. This is now fixed.

Also increase the frequency of the SPI from around 200kHz to nearly
20 Mhz.
2017-04-09 18:34:59 +03:00
Fred Sundvik b7041d06ae Move common visualizer keyframes into visualizer_keyframes.h 2017-04-09 18:34:59 +03:00
Fred Sundvik 64d63ab422 Remove the need to manually enable the visualizer 2017-04-09 18:34:59 +03:00
Fred Sundvik 1e7585e767 Separated backlight and LCD disable/enable
Also moved them to correct places
2017-04-09 18:34:59 +03:00
Fred Sundvik 5ba228b684 Move LCD backlight keyframes to its own file 2017-04-09 18:34:59 +03:00
Fred Sundvik 5815c5d317 Move LCD keyframes to its own file 2017-04-09 18:34:59 +03:00
Fred Sundvik 05530b193f Delete visualizer example integration
It's much better to refer to the actual code than to to try to
keep some examples up to date.
2017-04-09 18:34:59 +03:00
Fred Sundvik 05bc4880dd Tweaks to the Ergodox default visualizer
No animation, display led statuses and layer name on the same screen
Don't display layer bitmap
Fully saturated colors for caps, less saturated ones normally
2017-04-09 18:34:59 +03:00
Fred Sundvik fa6da78ff3 Simple layer display on Infinity Ergodox default layout 2017-04-09 18:34:59 +03:00
Fred Sundvik 65e8127c91 Add visualizer for Ergodox default 2017-04-09 18:34:59 +03:00
Fred Sundvik 5fbaf31dc2 Brightness for Ergodox Infinity emulated LEDs 2017-04-09 18:34:59 +03:00
Fred Sundvik 39385144e7 Emulate Ergodox EZ leds by LCD colors 2017-04-09 18:34:59 +03:00
Fred Sundvik 9a4ce28683 Display layer bitmap and keyboard led states on the LCD 2017-04-09 18:34:59 +03:00
Fred Sundvik 951b6f33a0 CIE 1931 for the LCD backlight 2017-04-09 18:34:59 +03:00
Fred Sundvik f113f95440 Move CIE1931 and breathing tables to its own file 2017-04-09 18:34:59 +03:00
Fred Sundvik bc97413bf7 Disable LEDs on Infinity Ergodox 2017-04-09 18:34:59 +03:00
Fred Sundvik e6f7a8a47a Display QMK logo at startup of Infinity Ergodox 2017-04-09 18:34:59 +03:00
Fred Sundvik a8f5897b97 Add support for blitting to the Infinity LCD 2017-04-09 18:34:59 +03:00
Fred Sundvik 2b24d35846 Hopefully finally fix the corrupt LCD
The SPI bus is now selected and deselected before each set of commands.
Also speed up things by buffering many commands into a single batch.
2017-04-09 18:34:59 +03:00
Fred Sundvik 503565d174 Only re-send matrix every 5ms
The previous 1ms value was too often, and wouldn't always leave
time for the visualizer
2017-04-09 18:34:59 +03:00
Fred Sundvik 6039a4f6ed Empty implementation of has_onshot_mods_timed_out
When the timeout is zero or not defined, the function now returns false.
Fixes a linker error when the visualizer is enabled
2017-04-09 18:34:59 +03:00
Fred Sundvik f5c8941652 UGFX is compiled once per keyboard instead of keymap 2017-04-09 18:34:59 +03:00
Fred Sundvik bb86be1f1f Remove unneeded makefile include 2017-04-09 18:34:59 +03:00
Fred Sundvik aee9b10e92 Add a keyboard specific visualizer 2017-04-09 18:34:59 +03:00
Dylan Khor a875299d9a Added breathing macros and removed mappings to unused layouts 2017-04-09 02:02:40 -04:00
Xyverz a11053bda8 Cleaned up the keymap:
Added MOD_TAP aliases for keymap.c readability.
Updated README to document said changes.
Added additional Dvorak layer to make using the CMD key easier on Macs.
2017-04-08 22:53:46 -07:00
TerryMathews 3899bec4b6 Merge pull request #1 from qmk/master
Catchup
2017-04-08 00:30:54 -04:00
Xyverz 9237b95ebe More missed keycodes; added PSCR, SLCK, and PAUS to ADJUST layer. 2017-04-07 19:42:05 -07:00
Xyverz 6b0842760b Corrected a missed typo in the readme. 2017-04-07 19:23:27 -07:00
jpetermans a2ac883779 add ability to toggle individual led by address 2017-04-07 15:58:17 -07:00
Stick bcf70c0203 ErgoDox Familiar layout v1 2017-04-07 16:04:43 -05:00
Xyverz 3607522c12 More tweaks to keymap and readme. 2017-04-06 22:26:13 -07:00
Xyverz 303bc6999e Merge remote-tracking branch 'upstream/master' 2017-04-06 22:07:34 -07:00
Xyverz 8813365ec5 Added readme 2017-04-06 22:03:17 -07:00
Xyverz 3a5f9faca9 Reworked Atreus keymap, added README 2017-04-06 22:02:38 -07:00
jpetermans af13e9a12d Moved led page arrays to keymap.c and added keymap header to define
individual led addresses
2017-04-06 16:27:51 -07:00
jpetermans d89114400c Small keymap tweak and clean up. 2017-04-06 15:22:13 -07:00
jpetermans 56be300757 Add Kinetis_i2c settings consistent with whitefox mcuconf 2017-04-06 14:23:14 -07:00
jpetermans 91f2e9fb5e match hal settings to whitefox, fix make rules 2017-04-06 13:53:18 -07:00
jpetermans 02ef122cbb Add led_controller.h to user keymap.c 2017-04-06 13:51:33 -07:00
jpetermans f66361d678 add led init function to header for use in keymap.c 2017-04-06 13:48:31 -07:00
jpetermans da4c2d2e3e Adjust led_controller.c matrix sttings and init function 2017-04-06 13:46:54 -07:00
jpetermans b73c935d36 Added tmk whitefox led files 2017-04-06 13:45:15 -07:00
jpetermans dfb0a512a0 Added personal configs and keymap to infinity60/keymaps 2017-04-06 13:43:22 -07:00
Stick 7e38541124 Merge remote-tracking branch 'upstream/master' 2017-04-06 13:52:53 -05:00
skullydazed 1054d5554a Updated Custom Quantum Functions (markdown) 2017-04-04 23:14:40 -07:00
skullydazed e77a5e1751 Updated Custom Quantum Functions (markdown) 2017-04-04 23:14:27 -07:00
Gabe Y 154305ce1b Fix formatting in BUILD_GUIDE.md (#1208) 2017-04-04 22:39:28 -07:00
skullydazed 1ca879687c Updated Custom Quantum Functions (markdown) 2017-04-04 22:35:21 -07:00
skullydazed 32e55f9182 Updated Custom Quantum Functions (markdown) 2017-04-04 22:33:36 -07:00
skullydazed 34836a16ed Updated Custom Quantum Functions (markdown) 2017-04-04 22:33:12 -07:00
skullydazed b65282f69f Updated Custom Quantum Functions (markdown) 2017-04-04 22:23:01 -07:00
skullydazed 36757de1a7 Updated Custom Quantum Functions (markdown) 2017-04-04 22:16:16 -07:00
skullydazed 891d17f028 Updated Custom Quantum Functions (markdown) 2017-04-04 22:15:41 -07:00
skullydazed 4f48dd7c83 Created Custom Quantum Functions (markdown) 2017-04-04 22:15:17 -07:00
Jack Humbert 0e7a2a77de Updated Becoming a QMK Collaborator (markdown) 2017-04-04 21:42:08 -04:00
Jack Humbert b096b57b0b Created Becoming a QMK Collaborator (markdown) 2017-04-04 21:21:27 -04:00
Jack Humbert 54f69d02d5 Updated _Sidebar (markdown) 2017-04-04 20:00:34 -04:00
Jack Humbert 78cf15384e Created Adding features to QMK (markdown) 2017-04-04 20:00:06 -04:00
Jack Humbert 8b218857ed Revert 923d32a0eff175fac8d67574456ad9e1bd2941eb...f39bad2a7dd5d57e4a80dd15dec21826ef7a2a67 on Key Functions 2017-04-04 19:42:58 -04:00
Jack Humbert 20d69e2ad4 clean-up keycode stuff 2017-04-04 19:42:10 -04:00
Jack Humbert 46179fbb7b split off tmk differences into own page 2017-04-04 19:32:33 -04:00
Jack Humbert c0a8953405 Created Differences from TMK (markdown) 2017-04-04 19:30:13 -04:00
Jack Humbert a07b83fe8e Updated Home (markdown) 2017-04-04 19:25:24 -04:00
Dylan Khor 816ef19f41 Fixed my wording 2017-04-04 15:28:57 -04:00
Dylan Khor 2e78c19054 Added note about homebrew related installation times 2017-04-04 15:26:31 -04:00
Jack Humbert ffffd1b6c1 Merge pull request #1207 from bigtunaIO/master
Add Bigtuna.io Miuni32
2017-04-04 13:41:50 -04:00
Adam Lee 8e7be3adda Set Bootloader Size to 4K
Use Atmel's default bootloader size, rather than Teensy 2.0's [1].

[1] https://github.com/qmk/qmk_firmware/pull/1207#discussion_r109712786
2017-04-04 10:21:32 -07:00
Adam YH Lee 236826e7c1 Merge branch 'miuni32-OA' 2017-04-03 20:36:13 -07:00
Adam YH Lee e18768aa77 Add B1gtuna Miuni32
Miuni32 is a 30% ortholinear board.
Please visit www.bigtuna.io for more information.
2017-04-03 20:34:10 -07:00
Jack Humbert d75a44a02b Merge pull request #1206 from Dan-Saunders/patch-2
Create twolayer.c
2017-04-03 21:13:29 -04:00
Jack Humbert 53951ee086 Merge pull request #1203 from ishtob/master
Updated ssd1306.c fix issues for people not using OLED
2017-04-03 21:12:53 -04:00
Jack Humbert 27aa185222 Merge branch 'master' into master 2017-04-03 21:06:40 -04:00
Stick bee9183e7f Merge remote-tracking branch 'upstream/master' 2017-04-03 16:59:27 -05:00
Dan Saunders 1454d466e7 Create twolayer.c
fixed issue where Default.c "function key" does not work (actually it's changing my LED steps). Changed layout to be more user friendly for people that use the standard spacebar milled top plate.
2017-04-03 15:14:45 -06:00
Jack Humbert 3ac9259742 Merge pull request #1204 from nooges/lets-split-fixes
Let's split fixes
2017-04-03 16:17:55 -04:00
Danny Nguyen fbd9d04559 Include use of either TRS or TRRS 2017-04-03 16:16:46 -04:00
Erez Zukerman 13c882a1fb disables space cadet rollover 2017-04-03 15:11:42 -04:00
Danny Nguyen ed9c18e866 Remove flip-half from keymap 2017-04-03 14:00:33 -04:00
Danny Nguyen 133ed52466 Update Let’s Split readme 2017-04-03 13:24:20 -04:00
Danny Nguyen e3aeab356a Move SSD1306 function declarations to header file 2017-04-03 13:24:20 -04:00
Danny Nguyen d90ac76295 Move defines for RGB to after the config.h include 2017-04-03 13:24:20 -04:00
Danny Nguyen 563961328b Rename COMPACT_KEYMAP to KC_KEYMAP and move to lets_split.h 2017-04-03 13:24:20 -04:00
Danny Nguyen d0cfaba6d2 Revise KEYMAP macro to make left and right halves more clear 2017-04-03 13:24:11 -04:00
ishtob 4e51c1e3ca Update ssd1306.c 2017-04-03 13:17:41 -04:00
Jack Humbert de52bd5d89 quick fix for space cadet shift 2017-04-03 12:42:58 -04:00
Danny Nguyen 48f4c5997b Move defines for RGB to after the config.h include 2017-04-03 12:06:28 -04:00
Danny Nguyen 344ebbac43 Revert removal of avrdude make option 2017-04-03 11:32:54 -04:00
Jack Humbert da53f3a529 Merge pull request #1194 from tong92/master
Adds tong92's keymap to tv44
2017-04-02 22:30:11 -04:00
Jack Humbert 8b3fa01667 Merge pull request #1195 from fudanchii/kbod
Handwired 60% keyboard with 8x8 matrix
2017-04-02 22:29:54 -04:00
Jack Humbert ef4a7a0aa0 Merge pull request #1196 from Dbroqua/master
GH60 - MX HHKB with 7U spacebar
2017-04-02 22:29:24 -04:00
Jack Humbert 1d8e3da233 Merge pull request #1197 from Xyverz/master
Revisions to Xyverz's keymaps
2017-04-02 22:29:07 -04:00
Jack Humbert e2e8b7b799 Merge pull request #1198 from iamschaefer/patch-1
Update readme.md
2017-04-02 22:28:34 -04:00
Alexander Schaefer 570b4605b2 Update readme.md
There's no readme specifically for the Ergodox EZ now, so link to the Ergodox readme.
2017-04-02 18:44:15 -06:00
Xyverz c034b61b1a Merge remote-tracking branch 'upstream/master' 2017-04-02 14:49:39 -07:00
Xyverz 7873046479 removed my handwired boards to a new branch. 2017-04-02 14:48:33 -07:00
Damien 3e41cde9f9 Merge pull request #19 from qmk/master
Merge from qmk
2017-04-02 23:29:12 +02:00
dbroqua e7347ff0de Merge remote-tracking branch 'origin/master' 2017-04-02 23:27:57 +02:00
dbroqua 9e72b7e7e9 - Added MX HHKB like for gh60 with 7u space bar 2017-04-02 23:25:26 +02:00
Priyadi Iman Nurcahyo 0f7a51cef5 Add information about trackpoint 2017-04-02 22:13:05 +07:00
Nurahmadie 649d08742a Use tap-toggle to move between layers.
- Add PDOT key
2017-04-02 18:27:28 +07:00
Nurahmadie 15ddaa7f19 Fix layer stuck, and add numpad support 2017-04-02 18:27:28 +07:00
Nurahmadie f5d78c739d Forgot semicolon, and add reference link 2017-04-02 18:27:28 +07:00
Nurahmadie 10105f645a Add README 2017-04-02 18:27:28 +07:00
Nurahmadie c9dd11d5ab Enable alt-F4 without [Fn]
- Add led indicator when keymap not on base layer \o/
2017-04-02 18:27:28 +07:00
Nurahmadie af7430b896 Add capslock led, and audio buttons
- Also change layer switch to momentary
2017-04-02 18:27:28 +07:00
Nurahmadie 7614c6b7a7 Remove lead keys, fix some typos, rearrange layers 2017-04-02 18:27:28 +07:00
Nurahmadie 8b206e1e75 Add initial keymap
*crossfingers*
2017-04-02 18:27:28 +07:00
Nurahmadie f8ed4ed573 Initial work for my kbod support in qmk_firmware
- Wiring layout done

No actual keymap yet
2017-04-02 18:27:27 +07:00
= e508b5e04e Adds tong92's keymap to tv44 2017-04-02 18:27:24 +09:00
coderkun 049f906b5e Fix keymap “coderkun_neo” to use LALT instead of RALT 2017-04-01 12:17:41 +02:00
coderkun 021edb6ec6 Add several Unicode symbols to keymap “coderkun_neo2” 2017-04-01 12:06:27 +02:00
coderkun c74f47555c Add keymap diagrams to readme of keymap “coderkun_neo2” 2017-04-01 11:15:20 +02:00
coderkun 605c4129cc Merge branch 'master' into coderkun_neo2 2017-04-01 10:56:29 +02:00
Jack Humbert 3448d5d487 Merge pull request #1132 from akatrevorjay/pr/dfu-serial
Allow to specify serial to dfu-util flash
2017-03-31 18:28:26 -04:00
Jack Humbert ec35fea264 Merge pull request #1190 from osamuaoki/master
Fix typo
2017-03-31 18:28:14 -04:00
Jack Humbert 2b4efaba53 Merge pull request #1189 from Zay950/to_push
Unicode input_mode presistance
2017-03-31 18:27:44 -04:00
Osamu Aoki caab4d7e45 Fix typo 2017-04-01 01:39:00 +09:00
nielsenz d1e66e2e07 Worked around some new Makefile issues. 2017-03-30 20:10:34 -07:00
nielsenz 7e54332890 Pulling and pushing troubles 2017-03-30 19:15:43 -07:00
Callum Oakley b9225a28f2 changed hotkey cluster to accomodate awkward software... again 2017-03-30 19:08:15 -07:00
Callum Oakley 200ae0c519 changed hotkey cluster to accomodate awkward software 2017-03-30 19:08:15 -07:00
Travis La Marr eedb767279 Add RN42 Bluetooth module support
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
2017-03-30 19:08:15 -07:00
Osamu Aoki ccbdf90f02 Update to match QMK keymap 2017-03-30 19:08:15 -07:00
Osamu Aoki 3a1ee48cda Typo fix 2017-03-30 19:08:15 -07:00
Osamu Aoki d029e23260 Updated Home (markdown) 2017-03-31 00:39:20 +09:00
Osamu Aoki f39bad2a7d Updated Key Functions (markdown) 2017-03-31 00:35:50 +09:00
Osamu Aoki 46977da417 Updated Home (markdown) 2017-03-31 00:31:28 +09:00
Osamu Aoki 1a675efc4f Updated Keycodes (markdown) 2017-03-31 00:25:12 +09:00
Osamu Aoki 3627a50e63 Updated Home (markdown) 2017-03-31 00:04:21 +09:00
Osamu Aoki 97d6184ed0 Updated Keymap (markdown) 2017-03-30 23:57:59 +09:00
Osamu Aoki 5fb058eb34 Updated Home (markdown) 2017-03-30 23:49:07 +09:00
Jack Humbert b441468795 Merge pull request #1188 from hot-leaf-juice/master
changed hotkey cluster to accomodate awkward software... again
2017-03-30 10:24:37 -04:00
Callum Oakley 3f3f208113 changed hotkey cluster to accomodate awkward software... again 2017-03-30 14:20:18 +01:00
Osamu Aoki 32c511c918 Rename back to right name 2017-03-30 21:51:37 +09:00
Jack Humbert 8994fca4ee Merge pull request #1187 from hot-leaf-juice/master
changed hotkey cluster to acommodate awkward software
2017-03-30 08:46:55 -04:00
Jack Humbert d359b55520 Merge pull request #1185 from exiva/rn42_bluetooth
Add RN42 Bluetooth module support
2017-03-30 08:46:38 -04:00
Jack Humbert 338edcabd7 Merge pull request #1184 from osamuaoki/master
Update keymap.md to QMK
2017-03-30 08:45:56 -04:00
Callum Oakley d145a1192f changed hotkey cluster to accomodate awkward software 2017-03-30 13:22:16 +01:00
Erez Zukerman 923d32a0ef Updated Key Functions (markdown) 2017-03-30 09:14:22 +03:00
Xyverz 571f39da66 Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0 2017-03-29 22:32:39 -07:00
Travis La Marr 71da013995 Add RN42 Bluetooth module support
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
2017-03-29 23:03:04 -04:00
Zay950 2366ebfbbd Merge branch 'master' into to_push 2017-03-29 12:00:38 -07:00
Osamu Aoki c782b269b6 Update to match QMK keymap 2017-03-30 01:03:49 +09:00
Osamu Aoki 4d2be0281c Typo fix 2017-03-30 00:19:44 +09:00
Osamu Aoki 258e2afbbf Typo fixes 2017-03-29 23:41:27 +09:00
Osamu Aoki c3f7df992d Reminding TMK/QMK difference here should be good idea. 2017-03-29 23:38:06 +09:00
Jack Humbert 942f2ccee4 Merge pull request #1183 from Rovanion/real-master
Added instructions for how to build and flash the firmware with teensy_cli
2017-03-29 09:45:22 -04:00
Rovanion Luckey d6e51d2008 Added link to the teensy linux page. 2017-03-29 09:34:20 +02:00
skullydazed 23839b8c6d Clarify the quantum license (#1042)
* Clarify the license for files we have signoff on

* Update against the currently signed off files

* Remove unused and not clearly licensed headers

* Replace an #endif I accidentally removed while resolving merge conflicts
2017-03-28 15:20:36 -07:00
Jack Humbert b83ae5ae5c Merge pull request #1182 from henxing/default_atreus_layout
Default atreus layout
2017-03-28 14:12:41 -04:00
Jack Humbert 49f547dd8e Merge pull request #1139 from Swoy/master
Satan Board "Admiral Strokers" keymap and config
2017-03-28 14:12:21 -04:00
Ole Anders 6de7e5d8dc typo removed {3 ... 2017-03-28 18:45:26 +02:00
Ole Anders 85cac39529 fixed capitalization issue (checkTime => checktime) 2017-03-28 18:41:04 +02:00
Hugh Enxing 3fdc45b4e9 Merge branch 'master' into default_atreus_layout 2017-03-28 12:11:49 -04:00
Ole Anders 411cd4fae2 moved checktime out of function 2017-03-28 17:30:15 +02:00
Ole Anders f504082f7f declaring checktime before the function it is used in. 2017-03-28 17:17:08 +02:00
Ole Anders 256abc64d5 fixed function to not accept any arguments.
As per Pramod's comment on stack overflow:

In C int foo() and int foo(void) are different functions. int foo()
accepts an arbitrary number of arguments, while int foo(void) accepts 0
arguments. In C++ they mean the same thing. I suggest that you use void
consistently when you mean no arguments.
2017-03-28 17:08:01 +02:00
Ole Anders 1b821eca66 removed varable trace option from makefile 2017-03-28 16:55:25 +02:00
Ole Anders 37b7539af3 slight cleanup as per recommendation 2017-03-28 16:52:56 +02:00
Ole Anders c72ca58528 Moved key_timer out of function. 2017-03-28 16:50:44 +02:00
Ole Anders 48dfc77718 removed a carriage return 2017-03-28 15:58:46 +02:00
Ole Anders 62faa20ef6 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-28 15:55:33 +02:00
Ole Anders d5ee0194ab fixed #1139 issues
A fix described by jackhumbert has been sorted out now.
2017-03-28 15:43:04 +02:00
Jack Humbert 5e4daf1c6d Merge pull request #1174 from nooges/atreus50
Add Atreus50 keyboard
2017-03-28 09:34:26 -04:00
Jack Humbert 7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
2017-03-28 09:26:54 -04:00
Jack Humbert 216f669276 Merge pull request #1098 from lambdalisue/tapping-force-hold
Add TAPPING_FORCE_HOLD to regulate behaviour
2017-03-28 09:24:22 -04:00
Jack Humbert cc2fb56ed8 Merge pull request #1167 from smt/smt/satan
Add smt keymap for Satan 'GH60'
2017-03-28 09:18:55 -04:00
Jack Humbert fa09189195 Merge pull request #1162 from Khord/master
My customized keymap + some tunes for the song list
2017-03-28 09:17:16 -04:00
Danny Nguyen 71857ebc3f Move Atreus50 to hardwired directory and update README 2017-03-28 09:17:09 -04:00
Jack Humbert 6e688ad5c2 Merge pull request #1172 from nooges/hexwire-fixes
Let's Split hexwire keymap fixes
2017-03-28 09:16:47 -04:00
Jack Humbert 99b7b50130 Merge pull request #1157 from jtbarrett/tada68_default
Update readme and default layout for TADA68
2017-03-28 09:15:57 -04:00
Jack Humbert c948404739 Merge pull request #1180 from mattdibi/master
Italian layout for ergodox keyboard
2017-03-28 09:14:03 -04:00
Jack Humbert 8a0cf32cf5 Merge pull request #1171 from ishtob/master
SSD1306 I2C OLED display support for let's split
2017-03-28 09:13:41 -04:00
Jack Humbert 0f986a1951 Merge pull request #1168 from newsboytko/newsboytko/frosty-flake
Support Frosty Flake Controller (CM Storm QFR)
2017-03-28 09:10:55 -04:00
Jack Humbert a7811781c5 Merge pull request #1178 from cheesemacfly/master
XD60 different layout
2017-03-28 09:10:02 -04:00
Jack Humbert 417202109b Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAP
Added KC_KEYMAP macro for old style keymaps in Atreus62
2017-03-28 09:09:35 -04:00
Jack Humbert ee6fbaaad8 Merge pull request #1177 from exiva/bluetooth_refactor
Refactor Bluetooth Handling
2017-03-28 09:08:10 -04:00
mattdibi 2104900030 Removed images from ergodox ez italian layout 2017-03-28 10:19:25 +02:00
mattdibi 221b27c508 Fixed layout title in ergodox ez italian keymap 2017-03-28 10:15:18 +02:00
mattdibi b9b9a59f22 Fixed italian kymap readme 2017-03-28 10:13:29 +02:00
mattdibi 512eb5e1d5 Updated readme 2017-03-28 10:10:24 +02:00
mattdibi b6b85ed413 Added italian layout 2017-03-28 09:56:07 +02:00
Stick b6280d0cac unsatisfied with ESC/GRV/TAB positioning 2017-03-27 21:56:47 -05:00
Stick a47e916635 Merge remote-tracking branch 'upstream/master' 2017-03-27 21:19:36 -05:00
Stick a03d946d0c fixed unicode input issue 2017-03-27 21:18:12 -05:00
Erez Zukerman 3c3388d7f6 Updated Mouse keys (markdown) 2017-03-27 09:54:49 +03:00
Erez Zukerman 0605107f13 Updated Mouse keys (markdown) 2017-03-27 09:54:33 +03:00
Erez Zukerman 18bc47ebab Created Mouse keys (markdown) 2017-03-27 09:53:27 +03:00
Erez Zukerman 004a92d9a6 Updated _Sidebar (markdown) 2017-03-27 09:51:57 +03:00
Nicolas Guelpa a32436d5a1 Create README.md 2017-03-26 15:20:44 -04:00
Nicolas Guelpa a89ee25db8 Add files via upload 2017-03-26 15:16:55 -04:00
Nicolas Guelpa c0a6c5f806 fixing layout 2017-03-26 15:07:19 -04:00
agaric 2407b27243 fix link for VAGRANT_GUIDE file 2017-03-25 16:22:08 +09:00
Nicolas Guelpa 739249ff0d Adding different layer 2017-03-24 20:18:59 -04:00
Travis La Marr 43eee52cba Add BLE and EZKey module defines.
Also restored serial init back to original location. Was getting junk data.
2017-03-24 17:14:57 -04:00
Travis La Marr b4ac0598fa Readd bluetooth output direction on standard key input. 2017-03-24 15:55:02 -04:00
Hugh Enxing 25f2295ba8 Swapped placement of Ctrl and Alt keys to match Technomancy's
default layout
2017-03-24 14:31:02 -04:00
Travis La Marr ddc036b69e Refactor Bluetooth Handling
Refactored Bluetooth support to make adding new Bluetooth modules
easier in the future.

* Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now
as there's no difference anymore.
* Made BLUETOOTH_ENABLE build option legacy as not to break existing
keymaps (Falls back to existing EZ Key support if on)
* Removed `ADAFRUIT_BLE_ENABLE` build option
* Created new build option `BLUETOOTH` with module option (Currently
`AdafruitEZKey` & `AdafruitBLE`)
* Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE`
ifdef with selected modules output.
2017-03-24 12:53:55 -04:00
Danny Nguyen 8775a13658 Add RGB support 2017-03-23 14:46:58 -04:00
Danny Nguyen 63e47a6425 Add RGB support for Let’s Split v1 2017-03-23 12:23:20 -04:00
Danny Nguyen 0520341ce4 Cleanup keymap 2017-03-23 11:31:07 -04:00
Danny Nguyen edfb50ea56 Initial commit for Atreus50 with working audio 2017-03-23 09:42:32 -04:00
Danny Nguyen e5c5902e95 Move keymap into config file 2017-03-23 08:51:29 -04:00
Danny Nguyen f3e3ff29a3 Add Makefile in keymap dir 2017-03-23 08:46:35 -04:00
Danny Nguyen 91776772fd Remove line for hands selection via EEPROM, reduce tap duration from 200ms to 150ms 2017-03-23 08:46:35 -04:00
ishtob 2573e581a5 Update readme.md 2017-03-22 15:56:45 -04:00
ishtob d5f56e91e4 Update i2c.c 2017-03-22 15:50:52 -04:00
ishtob bb413383ee Update i2c.c 2017-03-22 15:50:18 -04:00
ishtob 092416325b Update i2c.c 2017-03-22 15:49:21 -04:00
ishtob be0cfbb97e Update i2c.c 2017-03-22 15:48:56 -04:00
ishtob 732a7f2be9 Update matrix.c 2017-03-22 15:47:53 -04:00
ishtob ebb46694e5 Update split_util.c 2017-03-22 15:45:45 -04:00
ishtob 1f7b8a0343 Update matrix.c 2017-03-22 15:45:15 -04:00
ishtob d1865db599 OLED code cleanup 2017-03-22 15:19:01 -04:00
ishtob 80270a2791 Add files via upload 2017-03-22 15:14:33 -04:00
ishtob 30f4507492 OLED code cleanup 2017-03-22 15:11:03 -04:00
ishtob 65317a3a02 Added OLED SSD1306 support to I2C 2017-03-22 15:04:11 -04:00
ishtob 423c68c210 Merged Fliphalf, now defined in config, added OLED
Can now use the following in the keymap config.h to call the flipped matrix

```
#define FLIPHALF
```
2017-03-22 15:02:49 -04:00
ishtob 3a7083d810 Delete rules.mk 2017-03-22 15:00:00 -04:00
ishtob a4bdd6d084 Delete rev2fliphalf.h 2017-03-22 14:59:54 -04:00
ishtob d012b01108 Delete rev2fliphalf.c 2017-03-22 14:59:42 -04:00
ishtob 6167d7937c Delete config.h 2017-03-22 14:59:32 -04:00
ishtob dfb5a0e8f4 Delete Makefile 2017-03-22 14:59:20 -04:00
ishtob f0962bce50 Add files via upload 2017-03-22 14:55:13 -04:00
skullY 7a9437a2e3 Fix a typo 2017-03-21 22:24:34 -07:00
skullY 452949f913 Add #1170 to all the clueboard keymaps 2017-03-21 22:06:47 -07:00
skullydazed dd967f2c05 Merge pull request #1170 from tengg/master
fixed a bug related to mod + Grave with combined ESC/Grave key
2017-03-21 21:54:24 -07:00
tengg 3cba7a43d9 typo fixed 2017-03-22 00:33:44 -04:00
tengg a89998b977 fix typo 2017-03-22 00:28:59 -04:00
tengg 9e0ca927f9 fixed a bug related to mod + Grave with combined ESC/Grave key
This only applies to keymaps that has combined esc/grave. Here we call it theKEY.
Think about the motion when we do shift + theKEY (typing ~), or CMD + theKEY (switching window on MAC). Based on the original code, we must do following sequence:  press shift -> press theKEY -> release theKEY -> release shift. However, it is very possible and natural that we do this stroke sequence instead: press shift -> press theKEY -> release shift -> release theKEY.

If we do the 2nd stroke sequence, the code will del_key(ESC) instead of (GRV) when we release theKEY. This caused some inconvenient issues and ghost typing.

By adding a flag, this issue is eliminated and will not affect any other functions.
2017-03-22 00:03:30 -04:00
Stephen Tudor dce3847ebb Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC. 2017-03-20 14:12:43 -04:00
Dylan Khor 0ec07ddc1c Merge branch 'master' of https://github.com/Khord/qmk_firmware 2017-03-20 13:16:19 -04:00
Dylan Khor d7f2bd2964 add pgup, pgdn, home, end 2017-03-20 13:14:48 -04:00
Stephen Tudor 34c5f8094e Remove tap-dance. Raise will be accessed via holding shift while lower is active 2017-03-20 07:43:45 -04:00
Stephen Tudor b10d950708 Use normal backtick in ESC spot - I've mapped ESC to caps lock 2017-03-20 07:43:24 -04:00
Stephen Tudor 3399e39297 Fix shift tap-dance (can't use one-shot layer) 2017-03-20 07:26:28 -04:00
Gabriel Young b37f510f32 clean up config 2017-03-19 21:19:05 -07:00
Gabriel Young a3a304db9a clean up docs and provide defaults for keymap 2017-03-19 21:11:17 -07:00
Gabriel Young db2da37561 update docs 2017-03-19 20:56:45 -07:00
Gabriel Young df874a228a fix whitespace 2017-03-19 20:46:56 -07:00
Gabriel Young 7e9ca9a976 support LEDs 2017-03-19 20:45:10 -07:00
Gabriel Young a43ae7c92f Swap rows and columns to match the schematic 2017-03-19 20:34:53 -07:00
Gabriel Young 4a97ef6c48 start to define keymap; annoying because rows and columns are swapped from schematic 2017-03-19 19:55:55 -07:00
Gabriel Young d7fc236540 successfully read data from the matrix 2017-03-19 15:59:21 -07:00
Simon Friis Vindum 76b9a2662a MT does work with right-hand side modifiers. See #1166. 2017-03-19 14:00:50 +01:00
Dylan Khor 561da65606 Missing comma 2017-03-19 00:14:43 +00:00
Dylan Khor ca544ecfb6 Don't feel like tap dancing arrows anymore 2017-03-19 00:07:48 +00:00
Gabriel Young 19fd20261b sketch out frosty flake matrix using custom matrix.c based on kitten paw 2017-03-18 16:19:10 -07:00
Gabriel Young 3766f902a0 boilerplate project created with new_project.sh 2017-03-18 15:38:03 -07:00
Gabriel Young 70d83afff9 Merge branch 'qmk/master' 2017-03-18 14:48:27 -07:00
jprmesh e123ed8d5f Added KC_KEYMAP macro for old style keymaps in Atreus62 2017-03-17 09:23:55 -04:00
Benny Powers 3c11a8d241 Added missing codes: KC_MEDIA_FAST_FORWARD and KC_MEDIA_REWIND 2017-03-17 12:44:29 +02:00
Dylan Khor e03ddbe118 tap dance working for esc and arrows 2017-03-16 18:13:53 +00:00
Dylan Khor 4b1d0c5859 remove const 2017-03-16 17:36:31 +00:00
Dylan Khor c7cddfc539 test td changes 2017-03-16 13:27:26 -04:00
Dylan Khor 6ca1c49d38 test fixes for tap dane 2017-03-16 13:07:01 -04:00
Dylan Khor 0c8f71e3c7 test tap dance 2017-03-16 12:44:56 -04:00
Dylan Khor 24d1745951 add config.h for customization 2017-03-16 12:24:31 -04:00
Dylan Khor 683754bce8 added custom tones 2017-03-16 04:11:47 +00:00
Jack Humbert c36a4496eb Update config.h 2017-03-15 23:51:56 -04:00
Jack Humbert c043d1cc47 Update config.h 2017-03-15 23:49:38 -04:00
Dylan Khor 0c0a8ee187 test 2017-03-16 03:46:26 +00:00
Dylan Khor 73a70a2c1c Add Makefile 2017-03-15 23:09:17 -04:00
Dylan Khor cf28f7bfda Add custom keycap 2017-03-15 23:07:29 -04:00
Jack Humbert 335b398a5d Merge pull request #1152 from UnintendedFeature/bugfix/issue1151
readme keymap.h to quantum_keycodes.h
2017-03-15 11:18:32 -04:00
Jack Humbert b794719952 Merge pull request #1090 from qmk/backlight_softpwm
Adds soft PWM backlight for non-timed ports
2017-03-15 11:17:07 -04:00
Jack Humbert ce6dcc2b5d Merge pull request #1146 from khogeland/master
Colemak layout for Clueboard
2017-03-15 11:13:16 -04:00
Jack Humbert 71d6d7b22c Merge pull request #1147 from nooges/numpad20
Add handwired 20-key Numpad
2017-03-15 11:12:52 -04:00
Jack Humbert 8c184847f7 Merge pull request #1150 from nooges/ortho5x13
Add handwired 5x13 ortholinear keyboard
2017-03-15 11:12:30 -04:00
Jack Humbert 8685d73893 Merge pull request #1148 from nooges/hexwire-lets-split
Add Hexwire layout for Let's Split
2017-03-15 11:12:01 -04:00
Jack Humbert 09ee922a63 Merge pull request #1155 from deadcyclo/master
Worked on deadcyclo layout
2017-03-15 11:11:35 -04:00
Jack Humbert b4a3e5ebea Merge pull request #1145 from smt/smt/lets_split
Add smt keymap for Let's Split (based on serial)
2017-03-15 11:00:06 -04:00
Jack Humbert 3554b93cbd Merge pull request #1144 from milestogo/sculpt2
Microsoft sculpt mobile handwire and new shortcuts macro library
2017-03-15 10:59:34 -04:00
Jack Humbert 2e34d4bd85 update for infinity 2017-03-15 10:57:24 -04:00
Danny Nguyen 52ea58805a Add RGB underglow, move keys to allow Adjust layer to be reached 2017-03-14 09:51:48 -04:00
Jack Humbert ec9210959f Update readme.md 2017-03-13 12:12:09 -04:00
nstickney d9efa02cfb added README.md 2017-03-12 22:43:44 -05:00
nstickney 1753c9383e Merge remote-tracking branch 'upstream/master' 2017-03-12 14:51:43 -05:00
nstickney 9895e376e7 added US-International support 2017-03-12 14:51:33 -05:00
Erez Zukerman 987b0f8521 Merge pull request #1154 from dennistruemper/neo2_on_qwerz_hardware
Neo2 on qwertz hardware
2017-03-12 13:50:31 -04:00
James Barrett 96bde794d8 Update readme and default layout for TADA68
Add the default function layer mappings for the keyboard.

Provide flashing instructions in the readme.
2017-03-11 22:09:50 -08:00
Brendan Johan Lee 0d71e631ed [deadcyclo layout] fix an error in layer illustration 2017-03-11 12:27:46 +01:00
Brendan Johan Lee e66b31a648 [deadcyclo layout] Added second unicode layer, more sane layer switches 2017-03-11 12:22:38 +01:00
Dennis Trümper e3f934ed91 remove typo from folder name 2017-03-11 12:09:30 +01:00
Dennis Trümper edb8fcc810 update documentation 2017-03-11 11:44:39 +01:00
Dennis Trümper 303f5aed41 change layer 3 on right thumb back to layer 1 2017-03-11 10:31:22 +01:00
Dennis Trümper f75c7266a3 working but some documentation needed 2017-03-11 00:02:39 +01:00
Stephen Tudor b19e34c81e Forsake spacefn in favor of left shift tapdance. Move media controls. 2017-03-10 16:10:05 -05:00
Stephen Tudor 5ae0cfeef5 Add smt keymap for Satan 'GH60' 2017-03-09 13:58:33 -05:00
Lukas Stiebig 8b09fd8b55 readme keymap.h to quantum_keycodes.h
Changed the quantum/keymap.h to quantum/quantum_keycodes.h because this seems to be the file where they keycodes are defined.
2017-03-09 19:41:14 +01:00
Danny Nguyen 20a48e0198 Add handwired 5x13 ortholinear keyboard 2017-03-09 12:02:05 -05:00
Danny Nguyen a8f872e728 Initial commit for handwired numpad 2017-03-09 10:11:39 -05:00
Danny Nguyen 3df35f712e Add readme for layout 2017-03-09 09:52:33 -05:00
Danny Nguyen 74c6c3d277 Convert keymap to compact version 2017-03-09 09:33:21 -05:00
Danny Nguyen 718b964806 Add hexwire layout for Let’s Split 2017-03-09 09:31:46 -05:00
Kevin Hogeland 06e4b3fe1a Colemak layout for Clueboard 2017-03-09 02:50:23 -08:00
nstickney ce0b8ea676 Merge remote-tracking branch 'upstream/master' 2017-03-08 22:29:12 -06:00
nstickney 82cbe71bb5 found LT(layer, kc) so I could take out TapDance code 2017-03-08 22:28:18 -06:00
Stephen Tudor 8d4bc714e4 Update smt keymap READMEs 2017-03-08 23:16:58 -05:00
Erez Zukerman 7c7a77d4bf Tweaks keymap to reset on boot 2017-03-08 19:43:10 -05:00
milestogo feb858c5a9 Merge branch 'master' into sculpt2 2017-03-08 15:51:30 -08:00
milestogo ffb04bad66 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-03-08 15:50:46 -08:00
milestogo b5bfb5104b docs for babblepaste 2017-03-08 15:48:39 -08:00
Jack Humbert bfa7e6ce04 Merge pull request #1137 from Skrymir/patch-1
Fixed minor error in ergodox infinity section.
2017-03-08 18:37:30 -05:00
Jack Humbert 8d81667fbe Merge pull request #1138 from nooges/magicforce68
Add Handwired Magicforce68
2017-03-08 18:37:09 -05:00
Jack Humbert 97c4c570e2 Merge pull request #1140 from stites/freebsd
Add FreeBSD support in "util/install_dependencies.sh"
2017-03-08 18:36:34 -05:00
Jack Humbert 85121ec50e Merge pull request #1142 from guni77/my_keymap
My keymap
2017-03-08 18:35:37 -05:00
Jack Humbert f392f245f9 Merge pull request #1143 from UnintendedFeature/feature/keymap-german-lukas
keymap german lukas
2017-03-08 18:30:23 -05:00
nstickney fa44e8d4dc corralled image files 2017-03-08 16:26:45 -06:00
Stephen Tudor 88e862e472 Update smt keymaps for consistency 2017-03-08 16:00:23 -05:00
Lukas Stiebig 34fa8fd5d3 readme
Added a readme.md file for the keymap german-lukas.
2017-03-08 21:14:16 +01:00
Lukas Stiebig 2f5143e219 Corrected the description of the layer
Corrected the description of the Shortcuts layer.
2017-03-08 21:09:51 +01:00
Lukas Stiebig 8cc70f4d9d Added german-lukas
Added my keymap called germman-lukas.
2017-03-08 20:58:55 +01:00
Lukas Stiebig 2aa079d93e Left control and alt
Use the left control and the left alt key.
2017-03-08 20:41:35 +01:00
Gunther Gruber cd1eb8d246 added readme file 2017-03-08 11:13:19 +01:00
milestogo 89aba30c7f fix stupid error w/ mode switch 2017-03-08 01:25:33 -08:00
Anand Babu (AB) Periasamy b20106d238 Replace enter with quote and few reorgs 2017-03-08 01:12:12 -08:00
milestogo 01980c96e9 added browser babble, removed code from keymap 2017-03-08 01:06:25 -08:00
nstickney 29e7003fc2 SLASH and WHACK functions added (based on algernon's CT_TA) 2017-03-07 22:31:14 -06:00
nstickney 4880e72b77 SLASH and WHACK functions added (based on algernon's CT_TA) 2017-03-07 22:30:43 -06:00
Danny Nguyen 3d082382b2 Fix function layer actions 2017-03-07 23:08:44 -05:00
Danny Nguyen 7042af7020 Add Makefile 2017-03-07 23:06:41 -05:00
nstickney eab0166f83 Merge remote-tracking branch 'upstream/master' 2017-03-07 19:09:56 -06:00
Ole Anders 1968ec4c24 changed definitions on keymap.c in admiral strokers
Made a few changes to my own keymaps. (organisation)
2017-03-07 19:40:18 +01:00
Ole Anders 25a7c94174 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-07 19:39:00 +01:00
stites a9959783c0 Add freebsd support in "util/install_dependencies.sh"
A simple addition to the `install_dependencies` script which remaps the debian dependencies to their freebsd package-names. After a recursive clone and using gmake, I can successfully build all firmware from the root directory (minus some warnings generated by gcc-4.9.4 which I can procure on request). however there is a problem running tests.
2017-03-07 13:12:10 -05:00
Danny Nguyen 38a83700c3 Update description 2017-03-07 12:29:48 -05:00
Danny Nguyen 2cd2ac02d1 Add readme file 2017-03-07 12:20:52 -05:00
Danny Nguyen f3aef727e1 Set pinout and layout 2017-03-07 12:20:52 -05:00
Danny Nguyen 6ee823a821 Add rule for flashing microcontroller using avrdude 2017-03-07 12:20:52 -05:00
Danny Nguyen 1023a47be6 Copy CMD60 as starting point and rename files 2017-03-07 12:20:52 -05:00
Joshua Colbeck 08cba6c09b Fixed minor error in ergodox infinity section. 2017-03-07 09:43:08 -06:00
milestogo 2f677c24a8 working with preprocessor macros for babblepaste 2017-03-06 00:16:44 -08:00
Damien 24ec8f5097 Merge pull request #18 from qmk/master
Merge from qmk
2017-03-05 22:58:13 +01:00
Kenichi Sasaki fec3b78d78 fix backspace key position. 2017-03-05 21:49:41 +09:00
Xyverz fbbf618a46 Removed preceeding underscore from MASTER_RIGHT in config.h 2017-03-05 03:48:10 -08:00
skullydazed 615bfc4eca Merge pull request #1107 from qmk/clueboard_cleanup
Rework the clueboard keymaps
2017-03-04 10:34:01 -08:00
Kenichi Sasaki 7e518e1d8f fix again 2017-03-04 23:56:58 +09:00
Xyverz 0d9bceb2fe Merge remote-tracking branch 'upstream/master' 2017-03-03 19:28:35 -08:00
Xyverz 68808b22c0 Final tweaks to my Kinesis keymap and readme 2017-03-03 19:27:24 -08:00
Jack Humbert b042428d23 Merge pull request #1126 from folkert4/master
Various QOL changes to Espynn's keymap
2017-03-03 10:29:54 -05:00
Jack Humbert 4ab88f3a9e Merge pull request #1129 from unxmaal/unxmaal_spacefn
Layout: Spacebar long-press as fn, for GH60 and GH60 Satan boards
2017-03-03 10:29:19 -05:00
Jack Humbert 2a5d972004 Merge pull request #1130 from hot-leaf-juice/master
moar hotkeys
2017-03-03 10:28:55 -05:00
Trevor Joynson (trevorj) 515b4dd1f7 Allow to specify serial to dfu-util flash 2017-03-02 18:26:26 -08:00
Gabriel Young 0734f56940 add debug messages to audio 2017-03-02 12:28:12 -08:00
Gabriel Young d11962aeb2 fix 'stop_all_notes' naming to be more consistent 2017-03-02 11:40:06 -08:00
Callum Oakley 61459ab5ba moar hotkeys 2017-03-02 11:40:25 +00:00
Eric Dodd d35809a982 gh60 satan spacefn 2017-03-01 21:40:13 -05:00
Eric Dodd a8a4927622 gh60 spacefn 2017-03-01 21:39:19 -05:00
milestogo b80c97b712 clean up babblepaste 2017-02-28 23:27:49 -08:00
milestogo 0834c520c0 missed config.h stuck modifiers change 2017-02-28 21:54:35 -08:00
milestogo 748401e5c1 keymap and C6 audio testing 2017-02-28 21:53:42 -08:00
skullydazed 82d9abf9f3 Updated License Clarification (markdown) 2017-02-28 21:44:10 -08:00
folkert4 71971e818f Various QOL changes:
Removed some unneeded keys from raise and lower layers
moved the + and = signs, backspace is now more intuitive
moved all the Function keys to CUSTOM layer
added ctrl alt del to CUSTOM layer
simplified the layout picture greatly
2017-02-28 17:49:42 -05:00
Jack Humbert 4c4cf3ca49 Merge pull request #1124 from jmdaly/roadkit_firmware
Add initial version of TheVan Keyboards Roadkit Firmware
2017-02-28 15:48:34 -05:00
Jack Humbert 72c5dd1c93 Merge pull request #1125 from cwhits/upstream
[Planck] Update default keymap for missing keys
2017-02-28 11:51:33 -05:00
Chris Helming 18ba21aa31 Update default maps for missing keys 2017-02-28 11:40:06 -05:00
John M Daly e12b1a237c Add initial version of TheVan Keyboards Roadkit Firmware 2017-02-28 11:17:18 -05:00
Jack Humbert 4583955914 Merge pull request #1116 from hot-leaf-juice/master
keymap update
2017-02-27 22:18:55 -05:00
Jack Humbert 5bfeb229b8 Merge pull request #1119 from phongnh/master
Removes redundant {} which cause build failure when DEBUG_ACTION is set
2017-02-27 22:18:12 -05:00
Jack Humbert b851b0b2ae Merge pull request #1121 from Leszek111/master
add layout
2017-02-27 22:17:36 -05:00
skullydazed 71855087cf Removing eltang as he doesn't show up in the current git blame. 2017-02-27 10:34:21 -08:00
Gunther Gruber 38cf08697b small changes in guni.c keymap to work with new qmk_firmware packet 2017-02-27 09:55:24 +01:00
Gunther Gruber c370c1e1f3 guni keymap 2017-02-27 09:49:06 +01:00
Xyverz d91e09f116 Updates to the README.md 2017-02-26 19:49:10 -08:00
Xyverz 871ac5058a Minor changes to the keymap: Moved thumb-cluster ESC to Media and Keypad layers 2017-02-26 19:45:57 -08:00
bbbd49a175 Ammend readme.md 2017-02-27 00:27:57 +01:00
138b89e1a1 Add colemak_programmer 2017-02-27 00:16:55 +01:00
Gabriel Young 976c856966 Update size estimates in the Makefile
MIDI_ENABLE = no

   text    data     bss     dec     hex filename
      0   17080       0   17080    42b8 satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text    data     bss     dec     hex filename
      0   19494       0   19494    4c26 satan_midi.hex

      +2414 bytes (vs. MIDI_ENABLE = no)

MIDI_ENABLE = yes
      0   20846       0   20846    516e satan_midi.hex

      +1352 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text    data     bss     dec     hex filename
      0   21292       0   21292    532c satan_midi.hex

      +1798 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED
off)

Conclusion:
    +2400 to 4200, depending on config
2017-02-25 21:38:35 -08:00
Gabriel Young b911e1966f Fix redundant process_music.c in sources 2017-02-25 21:13:47 -08:00
Gabriel Young a64ae10662 Update existing keymaps
Update existing keymaps to enable MIDI_BASIC functionality.  Also added
an option MIDI_ENABLE_STRICT to be strict about keycode use (which also
reduces memory footprint at runtime)
2017-02-25 20:41:13 -08:00
nstickney b69b214d52 making numbers more familiar 2017-02-25 22:04:21 -06:00
Gabriel Young ea14ed122f Add basic layer to sample MIDI keycap 2017-02-25 19:37:33 -08:00
Gabriel Young 1000799d1e Factor basic note processing into respective processors 2017-02-25 19:25:33 -08:00
Gabriel Young 525be99ee9 Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED
MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19494	      0	  19494	   4c26	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
MIDI_ADVANCED undefined

   text	   data	    bss	    dec	    hex	filename
      0	  19788	      0	  19788	   4d4c	satan_midi.hex

MIDI_ENABLE = yes
MIDI_BASIC undefined
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_BASIC
#define MIDI_ADVANCED

   text	   data	    bss	    dec	    hex	filename
      0	  21140	      0	  21140	   5294	satan_midi.hex
2017-02-25 15:02:43 -08:00
William Forma 99fc4a330e Updated License Clarification (markdown) 2017-02-25 07:03:10 -07:00
Phong Nguyen d0b4dcc82c Removes redundant {} which cause build failure when DEBUG_ACTION is set 2017-02-25 19:50:46 +07:00
nstickney ebc6948e96 first two layers of ErgoDox Familiar completeC 2017-02-24 17:11:19 -06:00
nstickney 474f7ee3fd initial layer of familiar layout) 2017-02-23 22:24:32 -06:00
nstickney 498dfdd02c Merge https://github.com/qmk/qmk_firmware 2017-02-23 21:15:40 -06:00
nstickney 9b40dd796e familiar layout graphics, etc 2017-02-23 21:13:45 -06:00
Jack Humbert c62f3bd74d Merge pull request #1118 from priyadi/promethium
Various keymap updates
2017-02-23 10:21:23 -05:00
Jack Humbert 352c0e7baa Merge pull request #1117 from priyadi/fix_unicode_map
Fix UNICODE_MAP input_mode problem
2017-02-23 10:20:47 -05:00
Priyadi Iman Nurcahyo af29d0d094 Fix UNICODE_MAP input_mode problem 2017-02-23 18:17:12 +07:00
Priyadi Iman Nurcahyo b27a8dea1b Merge branch 'master' into promethium 2017-02-23 18:11:59 +07:00
Priyadi Iman Nurcahyo 296b927e77 Fix UNICODE_MAP input_mode problem 2017-02-23 18:10:00 +07:00
Jack Humbert 873fee8038 Updated _Sidebar (markdown) 2017-02-22 22:07:12 -05:00
Jack Humbert 74518260b8 Updated _Sidebar (markdown) 2017-02-22 22:06:56 -05:00
Jack Humbert 4d13a8063d Updated _Sidebar (markdown) 2017-02-22 22:06:37 -05:00
Erez Zukerman 0e54e9d528 Documents TT 2017-02-22 21:33:36 -05:00
Erez Zukerman 3cefa5cc82 Updated _Sidebar (markdown) 2017-02-22 21:32:06 -05:00
Erez Zukerman 24be0efd4b Updated _Sidebar (markdown) 2017-02-22 20:03:51 -05:00
Erez Zukerman 39b51573e6 Moves Modding Your Keyboard to its own page 2017-02-22 19:59:27 -05:00
Erez Zukerman 603e3fd2f6 Created Modding your keyboard (markdown) 2017-02-22 19:59:01 -05:00
Erez Zukerman 729fe5d8d4 Moves porting info to its own page 2017-02-22 19:58:21 -05:00
Erez Zukerman c008ac79bf Created Porting your keyboard to QMK (markdown) 2017-02-22 19:58:11 -05:00
Erez Zukerman 203d90d9fe Moves Unicode and foreign-language info into its own page. 2017-02-22 19:56:46 -05:00
Erez Zukerman 6fb9c094ec Created Unicode and additional language support (markdown) 2017-02-22 19:56:31 -05:00
Erez Zukerman 6e88c5014b Moves unit testing into its own page. 2017-02-22 19:53:08 -05:00
Erez Zukerman 2c89a77e67 Created Unit testing (markdown) 2017-02-22 19:52:59 -05:00
Callum Oakley b06961c38b updated readme 2017-02-22 12:26:13 +00:00
Gabriel Young 1d69ccd729 Merge branch 'qmk/master' 2017-02-21 22:01:56 -08:00
Jack Humbert 84b2f86f24 Merge pull request #1113 from kesslern/master
Add dvorak_emacs_software layout for ergodox
2017-02-21 23:35:09 -05:00
Jack Humbert da41cd1adf Merge pull request #1115 from Skrymir/master
Update from upstream
2017-02-21 23:34:23 -05:00
Josh Colbeck e51001efcc Merge remote-tracking branch 'qmk/master' 2017-02-21 20:31:16 -06:00
Callum Oakley 1316ca67af added hotkey cluster 2017-02-21 23:07:22 +00:00
Priyadi Iman Nurcahyo 3dab8a60fc added pause, prtsc & ins to list of keys to be processed on release 2017-02-21 16:40:38 +07:00
Priyadi Iman Nurcahyo 57623805e8 Move caps to FUN layer; add Pause key 2017-02-21 16:36:35 +07:00
Xyverz bf6f7a623d Merge remote-tracking branch 'upstream/master' 2017-02-20 23:54:09 -08:00
Nathan Kessler b9fce16490 Add dvorak_emacs_software layout for ergodox 2017-02-20 22:55:43 -05:00
Priyadi Iman Nurcahyo b306f83c6b Move del back to fun+backspce 2017-02-21 04:00:05 +07:00
Priyadi Iman Nurcahyo 77f9363675 Only process Fnumber on key release, and only when layer is still active 2017-02-21 03:24:32 +07:00
Jack Humbert 7ff41df32c Merge pull request #1097 from stanleylai/master
Added support for LED backlight, XD60v2's RGB underglow LED
2017-02-20 11:10:20 -05:00
Gabriel Young 64eecfc530 fix typos in keymap 2017-02-19 22:23:32 -08:00
nstickney 5abe05147c familiar layout v0.1 from ErgoDox-EZ configurator 2017-02-19 21:25:35 -06:00
Gabriel Young ed15973a3f Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)
satan/keymaps/midi

MIDI_ENABLE = no

   text	   data	    bss	    dec	    hex	filename
      0	  17080	      0	  17080	   42b8	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 3 // default

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex

MIDI_ENABLE = yes
#define MIDI_TONE_KEYCODE_OCTAVES 2 // fewer octaves

   text	   data	    bss	    dec	    hex	filename
      0	  20846	      0	  20846	   516e	satan_midi.hex
2017-02-19 17:45:08 -08:00
Gabriel Young d1fe24ad9f Allow customization of the number of tone keycodes and add example keymap 2017-02-19 17:18:05 -08:00
Gabriel Young ae0752dff5 expose midi_config 2017-02-19 16:43:45 -08:00
Gabriel Young 5e6097f015 add keycodes for transpose range 2017-02-19 16:43:43 -08:00
Gabriel Young dd8f8e6bae implement modulation 2017-02-19 16:43:02 -08:00
Gabriel Young 7c5e510fe2 add support for pedal cc messages 2017-02-19 16:42:45 -08:00
Gabriel Young f67aefc522 remove disabled code 2017-02-19 16:42:04 -08:00
Gabriel Young a4163466cb Alternative version with a tone array
tone array:
   text	   data	    bss	    dec	    hex	filename
      0	  25698	      0	  25698	   6462	satan_newsboytko.hex
0x6480 bytes written into 0x7000 bytes memory (89.73%).

note on array:
   text	   data	    bss	    dec	    hex	filename
      0	  25802	      0	  25802	   64ca	satan_newsboytko.hex
0x6500 bytes written into 0x7000 bytes memory (90.18%).
2017-02-19 16:42:04 -08:00
Gabriel Young f2b2e05f12 clean up commented code 2017-02-19 16:42:04 -08:00
Gabriel Young e405ab4bc6 initial implementation of polyphony using variable length array of notes on 2017-02-19 16:41:59 -08:00
Gabriel Young 5ae1411fc3 Expand MIDI key codes 2017-02-19 16:41:10 -08:00
Gabriel Young 40a8a88e72 Merge branch 'qmk/master' 2017-02-19 14:34:58 -08:00
Kenichi Sasaki c61b5d88a8 change bracket key posision 2017-02-19 22:46:54 +09:00
Stanley Lai 76b1f392ab XD60: Added BL_TOGG back to keymap, with 6 backlight steps 2017-02-18 21:47:11 -08:00
Jack Humbert db1e9a469a helps to save before committing 2017-02-19 00:11:55 -05:00
Jack Humbert c2239e6b96 merging 2017-02-19 00:04:14 -05:00
Stanley Lai d168822477 Updated XD60 readme and photos to reflect v2 PCB 2017-02-18 20:56:17 -08:00
skullydazed 89529a9f17 Updated _Sidebar (markdown) 2017-02-17 14:29:35 -08:00
skullydazed ab7ffc877a Updated _Sidebar (markdown) 2017-02-17 14:29:24 -08:00
skullydazed 93cd47d491 Updated _Sidebar (markdown) 2017-02-17 14:28:59 -08:00
skullydazed 7990cd2c92 Updated _Sidebar (markdown) 2017-02-17 14:28:35 -08:00
skullydazed bcc86a09d5 Updated _Sidebar (markdown) 2017-02-17 14:27:58 -08:00
skullydazed 7d29d5f091 Updated _Sidebar (markdown) 2017-02-17 14:27:34 -08:00
skullydazed e546b7655c Updated Keymap (markdown) 2017-02-17 14:22:55 -08:00
skullydazed 5f9532ea66 Updated Keymap (markdown) 2017-02-17 14:20:25 -08:00
skullydazed 6868497557 Updated Keymap (markdown) 2017-02-17 14:14:10 -08:00
skullydazed 4c9dae0e3b Updated Keymap (markdown) 2017-02-17 14:11:32 -08:00
skullydazed 44cd6aa41a Updated Keymap (markdown) 2017-02-17 14:10:10 -08:00
skullydazed 0bffb86721 Updated Keymap (markdown) 2017-02-17 14:09:50 -08:00
skullydazed 36f8936b03 Created Keymap (markdown) 2017-02-17 14:09:35 -08:00
skullydazed 359245bcc6 Updated FAQ Keymap (markdown) 2017-02-17 13:18:04 -08:00
skullydazed 7da82a6833 Updated FAQ Keymap (markdown) 2017-02-17 13:17:23 -08:00
Kenichi Sasaki ab5d4ae803 fix 2017-02-18 02:19:56 +09:00
Kenichi Sasaki 6d16d282bf remove reset key 2017-02-18 01:27:12 +09:00
Kenichi Sasaki e9b1958df2 Added JIS keymap symbols 2017-02-18 01:07:04 +09:00
Kenichi Sasaki 62aacd06ed copied and Meta(ESC) 2017-02-18 00:40:15 +09:00
skullydazed b51d9d5d3f Updated Home (markdown) 2017-02-16 17:15:38 -08:00
skullydazed 921884de5d Updated Home (markdown) 2017-02-16 17:14:16 -08:00
skullydazed 30bf618864 Updated Home (markdown) 2017-02-16 17:09:39 -08:00
skullydazed d9527a2f74 Updated Keymap examples (markdown) 2017-02-16 17:09:12 -08:00
skullydazed 56e9a286b5 Updated QMK Overview (markdown) 2017-02-16 17:07:39 -08:00
skullydazed cdef9bd02f Updated QMK Overview (markdown) 2017-02-16 17:06:00 -08:00
skullydazed 8d88997ffd Updated QMK Overview (markdown) 2017-02-16 17:05:21 -08:00
skullydazed a3b575b740 Updated QMK Overview (markdown) 2017-02-16 17:04:10 -08:00
skullydazed f9a7dd6cca Created Make Instructions (markdown) 2017-02-16 17:03:17 -08:00
skullydazed 35d9010c63 Updated QMK Overview (markdown) 2017-02-16 17:00:57 -08:00
skullydazed 42f167eb57 Created QMK Overview (markdown) 2017-02-16 17:00:19 -08:00
skullydazed e86e6431fc Updated Home (markdown) 2017-02-16 16:39:43 -08:00
skullydazed b5d35e43c7 Created Macros (markdown) 2017-02-16 16:37:25 -08:00
skullydazed b5af4e6dda Updated Home (markdown) 2017-02-16 16:34:35 -08:00
skullydazed c23a2fc928 Updated Home (markdown) 2017-02-16 16:31:17 -08:00
skullydazed 8bc52c0e86 Created Tap Dance (markdown) 2017-02-16 16:30:12 -08:00
skullydazed ac3753937a Created Leader Key (markdown) 2017-02-16 16:24:28 -08:00
skullydazed 53fde9a1ff Updated Home (markdown) 2017-02-16 16:23:02 -08:00
skullydazed 5730599d18 Created Space Cadet Shift (markdown) 2017-02-16 16:22:17 -08:00
Jack Humbert 2cbd99b663 Updated _Sidebar (markdown) 2017-02-16 19:11:58 -05:00
skullydazed b7501868a0 Updated Home (markdown) 2017-02-16 15:51:26 -08:00
skullydazed d817d8743e Created Key Functions (markdown) 2017-02-16 15:51:14 -08:00
skullydazed d791dd7c91 Updated Keycodes (markdown) 2017-02-16 15:42:13 -08:00
skullydazed ce8d46d74f Updated Keycodes (markdown) 2017-02-16 15:40:49 -08:00
skullydazed cad54d5313 Updated Keycodes (markdown) 2017-02-16 15:39:55 -08:00
skullydazed 3c766d29e2 Updated Keycodes (markdown) 2017-02-16 15:34:53 -08:00
skullydazed 7053347efd Updated Keycodes (markdown) 2017-02-16 15:01:36 -08:00
skullydazed 67c4186a9e Updated Keycodes (markdown) 2017-02-16 14:58:44 -08:00
skullydazed a2a216d316 Updated Keycodes (markdown) 2017-02-16 14:50:55 -08:00
skullydazed 26fda6bfa3 Updated Keycodes (markdown) 2017-02-16 14:50:36 -08:00
skullydazed 18c09dd154 Updated Keycodes (markdown) 2017-02-16 14:48:49 -08:00
skullydazed 2793758db7 Updated Keycodes (markdown) 2017-02-16 14:48:27 -08:00
skullydazed 218bd63294 Updated Keycodes (markdown) 2017-02-16 14:47:56 -08:00
skullydazed ede95297d3 Updated Keycodes (markdown) 2017-02-16 14:47:31 -08:00
skullydazed b663cb63c0 Updated Keycodes (markdown) 2017-02-16 14:46:43 -08:00
skullydazed 0b809313d0 Updated Keycodes (markdown) 2017-02-16 14:45:49 -08:00
skullydazed 459f206ec7 Updated Keycodes (markdown) 2017-02-16 14:45:21 -08:00
skullydazed e1dd99ea74 Updated Keycodes (markdown) 2017-02-16 14:44:32 -08:00
skullydazed b0efdf8795 Updated Keycodes (markdown) 2017-02-16 14:44:23 -08:00
skullydazed e6a45c5092 Updated Keycodes (markdown) 2017-02-16 14:44:12 -08:00
skullydazed 896a48bac0 Updated Keycodes (markdown) 2017-02-16 14:08:58 -08:00
skullydazed e1dc3377a4 Updated Keycodes (markdown) 2017-02-16 14:08:45 -08:00
skullydazed d2e7b8b469 Updated Keycodes (markdown) 2017-02-16 14:08:33 -08:00
skullydazed fcbcff8020 Updated Keycodes (markdown) 2017-02-16 14:08:22 -08:00
skullydazed 615dc93fba Created Keycodes (markdown) 2017-02-16 14:07:56 -08:00
skullY 1d87df5262 Add the mouse_keys layout 2017-02-16 14:04:04 -08:00
Xyverz ca1ec7b121 Fixed the TODO list. 2017-02-16 13:48:54 -08:00
skullY cbef63d8fa Rework the clueboard keymaps a bit. 2017-02-16 13:40:45 -08:00
Stephen Tudor 33bc4c070c Update smt Planck keymap 2017-02-16 14:32:46 -05:00
Stephen Tudor 334edc3c7d Add smt keymap for Let's Split (based on serial) 2017-02-16 14:32:24 -05:00
Jack Humbert 49e72632d2 remove more warnings 2017-02-16 13:13:38 -05:00
Priyadi Iman Nurcahyo c18d0a83e6 Merge branch 'master' into promethium 2017-02-17 00:35:32 +07:00
Priyadi Iman Nurcahyo e5bd81f0a6 Fix integer overflow 2017-02-16 23:56:47 +07:00
Priyadi Iman Nurcahyo 21f4944426 Merge branch 'master' into promethium 2017-02-16 23:53:47 +07:00
Priyadi Iman Nurcahyo 96a8e2d5f5 reposition ins and del key 2017-02-16 23:53:09 +07:00
Jack Humbert 1ac5dc9e52 fix travis and reduce warnings 2017-02-16 11:37:46 -05:00
schwarzgrau 118287420f tiny spelling change "frimware" to "firmware" 2017-02-16 17:24:51 +01:00
Jack Humbert 15dc540cac ignore PRs in versioning 2017-02-16 10:06:02 -05:00
Jack Humbert e34c3936b7 Merge pull request #1105 from nrrkeene/master
The Ordinary Layout v5
2017-02-16 09:49:24 -05:00
Jack Humbert 0b76f4f508 Merge pull request #1103 from priyadi/promethium
My keymap updates
2017-02-16 09:48:58 -05:00
Xyverz 6fa6e6c4c6 Fixed inaccuracies in keymap comments and the readme. 2017-02-15 23:01:27 -08:00
Xyverz 80d5649f25 More refinements to my Kinesis keymap. Added a readme.md file. 2017-02-15 22:54:52 -08:00
Xyverz 1dabceb197 minor adjustments. 2017-02-15 21:56:48 -08:00
Nicholas Keene d99f03a1a6 The Ordinary Layout has all the keys in the right places. 2017-02-15 23:11:04 -06:00
Nicholas Keene 7606f784dd This is the best layout, really, come look 2017-02-15 23:02:30 -06:00
Jack Humbert 77b6ac831e Merge pull request #1104 from qmk/layer_tap_toggle
Adds layer tap toggle as TT(layer)
2017-02-15 23:46:31 -05:00
Nicholas Keene af942f2e57 The Ordinary Layout is the best one, the one you are looking for. Really. Check it out. 2017-02-15 22:33:04 -06:00
Jack Humbert 58823b4e03 fix weirdness with arm and mods 2017-02-15 23:20:35 -05:00
Xyverz ea20a064b9 Added my keymap to the Kinesis project. 2017-02-15 20:14:32 -08:00
Jack Humbert f89499e255 unique variable name 2017-02-15 18:14:07 -05:00
Jack Humbert c2a9acffd7 publicise variables 2017-02-15 17:39:51 -05:00
Jack Humbert 1bb574fe48 add unicode common file, get names right 2017-02-15 17:09:47 -05:00
Jack Humbert 09add35e7f add unicode common file, get names right 2017-02-15 17:09:35 -05:00
Jack Humbert cbabb4d417 split up unicode systems into different files 2017-02-15 16:36:31 -05:00
Jack Humbert 6788cbd762 give error if both unicode/map are enabled 2017-02-15 12:39:58 -05:00
skullydazed 2210a55e98 Adding Stephan Bosebeck's signoff 2017-02-15 08:31:30 -08:00
Jack Humbert 69ea10f9a9 adds layer tap toggle 2017-02-15 11:25:33 -05:00
Priyadi Iman Nurcahyo ac04fe0301 Added README for my keymap 2017-02-15 19:40:33 +07:00
Priyadi Iman Nurcahyo 3882f97d2e Move keyboard specific stuff to keyboard specific files, and vice versa 2017-02-15 19:22:58 +07:00
Priyadi Iman Nurcahyo 1eac297a2f Added copyright notice 2017-02-15 16:39:19 +07:00
Priyadi Iman Nurcahyo c2f0207d59 Merge my Planck-like keyboards 2017-02-15 16:36:31 +07:00
Priyadi Iman Nurcahyo b128617ede Merge branch 'master' into promethium 2017-02-15 15:51:42 +07:00
Nicholas Keene 54785c1976 The Ordinary Layout is boring, normal, typical, expected. 2017-02-14 22:47:11 -06:00
Nicholas Keene e006b4a600 The Ordinary Layout has a feature for one-handed chorded typing 2017-02-14 22:32:31 -06:00
Nicholas Keene 1e09698146 All my friends us The Ordinary Layout because it doesn't force you to change you typing habits 2017-02-14 22:31:54 -06:00
Nicholas Keene c055098952 The Ordinary Layout now has more symbols on the Symbols layer! So useful! 2017-02-14 22:30:07 -06:00
Jack Humbert 7bef285553 Merge pull request #1101 from priyadi/layer_state_set_kb
Add weak layer_state_set_kb hook
2017-02-14 21:33:04 -05:00
Wilba6582 7741f2a498 Updated License Clarification (markdown) 2017-02-15 10:51:54 +11:00
Jack Humbert c94efed1e6 Created _Sidebar (markdown) 2017-02-14 18:04:20 -05:00
Jack Humbert eb5b52c6c6 change jackhumbert to qmk 2017-02-14 18:03:27 -05:00
Jack Humbert 5df4372c81 Updated Compatible Microcontrollers (markdown) 2017-02-14 18:01:20 -05:00
Jack Humbert ba27a11288 Updated Home (markdown) 2017-02-14 17:57:16 -05:00
Jack Humbert f43e6f224b Created Build Environment Setup (markdown) 2017-02-14 17:56:06 -05:00
Priyadi Iman Nurcahyo 168c912027 Move Alt-Tab position 2017-02-15 05:38:40 +07:00
Priyadi Iman Nurcahyo d0ee5292b6 Merge branch 'layer_state_set_kb' into promethium 2017-02-15 05:25:45 +07:00
Priyadi Iman Nurcahyo bd8d717f1f Fix bug fix attempt 2017-02-15 05:25:08 +07:00
Priyadi Iman Nurcahyo 369b3dc723 Merge branch 'layer_state_set_kb' into promethium 2017-02-15 05:23:25 +07:00
Priyadi Iman Nurcahyo d96175937b Bug fix & added default_layer_state_set_kb 2017-02-15 05:20:15 +07:00
Priyadi Iman Nurcahyo 3c8c3ebe3f Bug fix & added default_layer_state_set_kb 2017-02-15 05:19:31 +07:00
Priyadi Iman Nurcahyo 5e31074633 Merge branch 'layer_state_set_kb' into promethium 2017-02-15 05:11:24 +07:00
Priyadi Iman Nurcahyo d369bfb83a Add layer_state_set_kb hook 2017-02-15 05:02:15 +07:00
Priyadi Iman Nurcahyo df311c7b40 num, func, punc 3state layer done right 2017-02-15 05:01:03 +07:00
schwarzgrau 6862ab1609 Updated Home (markdown) 2017-02-14 15:38:05 +01:00
lambdalisue 64f9779fe5 Add TAPPING_FORCE_HOLD to regulate behaviour
See #889 for the detail.
2017-02-14 14:12:54 +09:00
Stanley Lai 3272821d32 Added support for XD60v2 with RGB underglow and LED backlight support 2017-02-13 18:09:02 -08:00
Priyadi Iman Nurcahyo 3758cfd95f GUI layer fixes 2017-02-14 04:17:09 +07:00
Priyadi Iman Nurcahyo 6c692fca7d Alt-tab handling in GUI layer 2017-02-14 03:58:12 +07:00
Stanley Lai a8eba1bdda Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-02-13 12:36:22 -08:00
Priyadi Iman Nurcahyo 7ae677dcb7 remove stand alone punc layer switcher for now 2017-02-14 03:18:34 +07:00
Priyadi Iman Nurcahyo cf97749fb7 Updated Home (markdown) 2017-02-14 02:57:15 +07:00
Priyadi Iman Nurcahyo 02662e3869 Add explicit punctuation key for greek layers 2017-02-14 00:46:06 +07:00
Priyadi Iman Nurcahyo c2531ff43b Func + Num = Punc 2017-02-14 00:44:02 +07:00
Jack Humbert fd2925efba Merge pull request #1094 from priyadi/faux_clicky
Implement faux-clicky feature
2017-02-13 10:58:50 -05:00
Jack Humbert 21ad0c5bcd Merge pull request #1095 from Mauin/gonnerd/reset_documentation
GON NerD: Add reset button to documentation and default keymap
2017-02-13 10:56:47 -05:00
Priyadi Iman Nurcahyo 15e2dbb2a9 move GRV to ESC position 2017-02-13 22:18:36 +07:00
Priyadi Iman Nurcahyo 903e4d3193 Fix faux clicky toggle key 2017-02-13 20:13:33 +07:00
Marvin Ramin 24a40d63c9 define missing KC_NO macro 2017-02-13 13:44:53 +01:00
Priyadi Iman Nurcahyo 75e57b4bcb Merge branch 'faux_clicky' into promethium 2017-02-13 18:01:57 +07:00
Priyadi Iman Nurcahyo 200488bb31 Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2017-02-13 17:58:42 +07:00
Priyadi Iman Nurcahyo 40ced77606 Update my Planck layout 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 97472aabe6 Forgot to add ifdef to optional feature 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 68e5c85999 Remove assignment warning 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 455568d197 Workaround to remove warning 2017-02-13 17:58:06 +07:00
Priyadi Iman Nurcahyo 5d5f2ff50d Some space optimization and housekeeping 2017-02-13 17:58:06 +07:00
Marvin Ramin b28fb29898 adds documentation for reset button and adds one to the default keymap 2017-02-13 09:03:43 +01:00
Priyadi Iman Nurcahyo 8c93c5d9ab Add keycodes to turn on, turn off and toggle faux clicky 2017-02-13 14:55:35 +07:00
milestogo 1622d7147b :
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2017-02-12 21:24:55 -08:00
Jack Humbert 4010360912 adds planck/rev3 makefile so subproject is found 2017-02-12 23:58:44 -05:00
Priyadi Iman Nurcahyo c68e596f32 Implement faux-clicky feature 2017-02-13 08:03:07 +07:00
Jack Humbert 1e97f77278 update travis badge 2017-02-12 20:01:04 -05:00
Jack Humbert 68970679e7 Merge pull request #1092 from lucwastiaux/master
updated ergodox/dvorak_programmer keymap
2017-02-12 19:38:59 -05:00
luc wastiaux 3bf6c43de7 updated readme 2017-02-13 07:46:07 +08:00
luc wastiaux 352d79e1fb Merge remote-tracking branch 'upstream/master' 2017-02-13 07:44:28 +08:00
Jack Humbert 4505db5d0e Merge pull request #1091 from smt/smt/tv44
Add smt keymap for tv44 (MiniVan)
2017-02-12 18:42:44 -05:00
luc wastiaux 5f8535b356 change thumb cluster key to be shift 2017-02-13 07:16:01 +08:00
Stephen Tudor b6730285b4 Add smt keymap for tv44 (MiniVan) 2017-02-12 12:46:24 -05:00
Jack Humbert a773124537 send travis stuff to gitter 2017-02-12 12:23:03 -05:00
Jack Humbert 8d0fdf1008 adds soft pwm for non-timed ports 2017-02-12 11:29:42 -05:00
Priyadi Iman Nurcahyo 97e6bb5a4e Merge branch 'master' into promethium 2017-02-12 17:52:09 +07:00
milestogo 2d655b1830 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-11 22:11:06 -08:00
milestogo 274b1c53fb keymap update 2017-02-11 22:10:44 -08:00
Xyverz 719f6f0293 Merge remote-tracking branch 'upstream/master' 2017-02-11 21:57:54 -08:00
Xyverz 4894150094 Changes to the keymap to accommodate the RGB Underglow lighting. 2017-02-11 21:54:58 -08:00
Xyverz 134c354fc5 Adding a config file so that I can get RGB underglow for my Let's Split 2017-02-11 21:54:05 -08:00
Priyadi Iman Nurcahyo bc1308c112 Update my Planck layout 2017-02-12 05:04:14 +07:00
Jack Humbert a0c2305bd1 Merge pull request #1089 from priyadi/fix_ps2_mouse_warning
Suppress warnings from ps2_mouse.h
2017-02-11 13:18:42 -05:00
Priyadi Iman Nurcahyo 1b7439bfb1 Forgot to add ifdef to optional feature 2017-02-12 00:20:47 +07:00
Priyadi Iman Nurcahyo aaa58a8d79 Supress warnings from ps2_mouse.h 2017-02-12 00:13:36 +07:00
Priyadi Iman Nurcahyo e52d793c79 Merge branch 'master' into promethium 2017-02-12 00:09:25 +07:00
Priyadi Iman Nurcahyo ce6b68f85b Remove assignment warning 2017-02-12 00:07:33 +07:00
Priyadi Iman Nurcahyo 2c1ef84b22 Workaround to remove warning 2017-02-12 00:02:36 +07:00
Priyadi Iman Nurcahyo 89d3ff8f18 Some space optimization and housekeeping 2017-02-12 00:00:01 +07:00
Jack Humbert 6d6b3ee9fb Merge pull request #1065 from milestogo/master
Update to kinesis keymaps
2017-02-11 11:51:06 -05:00
Jack Humbert 3f0b491fc0 Merge pull request #1082 from priyadi/right-side-dual-function
Implement tap mod dual role for right side mods.
2017-02-11 11:50:32 -05:00
Jack Humbert 6bb479ea45 Merge pull request #1085 from priyadi/promethium
Promethium keyboard layout update
2017-02-11 11:49:00 -05:00
Jack Humbert 5bdddb7821 Merge pull request #1087 from mneme/master
Updated keymap for atreus62/mneme
2017-02-11 11:48:39 -05:00
Jack Humbert 199458378b Merge pull request #1088 from Mauin/gon_nerd
add GON NerD
2017-02-11 11:48:11 -05:00
Jack Humbert bfc33a56d7 don't try to build the readme 2017-02-11 11:39:57 -05:00
Marvin Ramin 5daa3a8836 add GON NerD 2017-02-11 17:14:40 +01:00
Priyadi Iman Nurcahyo 4163a3819e Add regular space to B+N on GUI layer for repeating space 2017-02-11 22:16:19 +07:00
Priyadi Iman Nurcahyo 4c05e39a02 Switch to Emoji layer using Punc + greek 2017-02-11 22:13:35 +07:00
Priyadi Iman Nurcahyo 4586b19be3 Turn off capslock when entering num layer 2017-02-11 22:07:04 +07:00
Priyadi Iman Nurcahyo c6123b2e4a Move X in number layer away from space 2017-02-11 22:03:34 +07:00
Priyadi Iman Nurcahyo 513286cf98 LSpace + RSpace = switch layer 2017-02-11 21:54:10 +07:00
David Olsson 52e2afe673 correct spelling in readme 2017-02-11 15:09:30 +01:00
Priyadi Iman Nurcahyo 79de0cd119 Implement Capslock LED 2017-02-11 19:03:18 +07:00
David Olsson 052f81aaca Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-11 10:50:37 +01:00
David Olsson aa69337cf5 update readme 2017-02-11 10:49:53 +01:00
Priyadi Iman Nurcahyo 9fc3afbef4 simplify battery calculation for now 2017-02-11 14:50:43 +07:00
Xyverz 902d5077cd Merge remote-tracking branch 'upstream/master' 2017-02-10 23:34:27 -08:00
Xyverz 4d7105c2cf Added RGB Underglow to my Preonic 2017-02-10 23:30:08 -08:00
Priyadi Iman Nurcahyo b31ac35441 Fix emoji layer 2017-02-11 01:30:08 +07:00
Priyadi Iman Nurcahyo b92515f139 Make room for 'loose keycodes' by halving UNICODE_MAP range 2017-02-11 00:36:08 +07:00
Priyadi Iman Nurcahyo fdd06d3fca RShift + LShift = Capslock 2017-02-11 00:21:27 +07:00
Priyadi Iman Nurcahyo bf31f516e3 Add reset keycode 2017-02-11 00:07:44 +07:00
Priyadi Iman Nurcahyo 909fd4ae64 Generalize layer indicators 2017-02-11 00:07:10 +07:00
Jack Humbert 835556da91 Merge pull request #1083 from VoodaGod/bone2planck
fixed readme (i swear)
2017-02-10 11:03:43 -05:00
Priyadi Iman Nurcahyo 229e38f097 Add ifdefs for keyboard layouts 2017-02-10 22:15:15 +07:00
Priyadi Iman Nurcahyo 5944ab246a Implement battery level indicator 2017-02-10 21:28:46 +07:00
luc wastiaux 420a032e8d made left shift an MO for SHELL_NAV 2017-02-10 21:44:27 +08:00
Priyadi Iman Nurcahyo 07879bf66b Add function to cycle backlight modes 2017-02-10 17:45:12 +07:00
Priyadi Iman Nurcahyo a5b8db52a0 Activate SYS layer by pressing both Ctrls 2017-02-10 17:11:52 +07:00
VoodaGod c0cfacda98 fixed readme (i swear) 2017-02-10 09:51:08 +01:00
Priyadi Iman Nurcahyo 4ffbfe8298 Restore GUI layer 2017-02-10 14:43:56 +07:00
Priyadi Iman Nurcahyo 0f92d305e2 Add slash/question mark to punc/num layer 2017-02-10 14:32:24 +07:00
milestogo b0537f75df Merge branch 'master' into sculpt2 2017-02-09 23:28:39 -08:00
milestogo 41c93575a8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-09 23:28:15 -08:00
milestogo 5ac0e6e6ae dumber sculpt build 2017-02-09 23:23:39 -08:00
Priyadi Iman Nurcahyo a4a57d47ed Reimplement GUI Layer 2017-02-10 13:13:04 +07:00
Jack Humbert 6c462e0c01 Merge pull request #1073 from qmk/backlight_changes
Open backlight functionality to all ports
2017-02-09 20:14:35 -05:00
Priyadi Iman Nurcahyo 27e7eac279 Reorganize punctuation & numbers layer 2017-02-10 06:51:10 +07:00
Priyadi Iman Nurcahyo dee6a6982c Fix LED indicator 2017-02-10 06:31:29 +07:00
Priyadi Iman Nurcahyo 97816df7e7 Implement tap mod dual role for right side mods. 2017-02-10 06:06:59 +07:00
Priyadi Iman Nurcahyo af97d6b58e Add dvorak & norman layout. Add sys layer. 2017-02-10 06:01:59 +07:00
Priyadi Iman Nurcahyo 92308ed0e5 Remove audio stuff 2017-02-10 02:08:55 +07:00
Vincent Pochet eddc161d5d Updated License Clarification (markdown) 2017-02-09 18:04:58 +01:00
Wojciech Siewierski 4d905b17f4 Signing off for GPL licensing 2017-02-09 18:00:54 +01:00
Jack Humbert d537120eab Merge pull request #1078 from VoodaGod/bone2planck
updated Bone2Planck Keymap, Readme & fixed Makefile
2017-02-09 10:38:46 -05:00
Jack Humbert 93ee3bea37 Merge pull request #1079 from r2d2rogers/patch-1
[Typo] correct link to default keymap in readme.
2017-02-09 10:38:09 -05:00
Rob Rogers 2b95f41b91 [Typo] correct link to default keymap in readme. 2017-02-09 09:08:50 -06:00
VoodaGod c330872f47 updated layout & readme 2017-02-09 13:07:59 +01:00
VoodaGod 986b065654 more formatting 2017-02-09 12:17:13 +01:00
VoodaGod 1becbcb013 readme formatting changes 2017-02-09 11:25:50 +01:00
VoodaGod cb590bb37b updated readme 2017-02-09 11:21:52 +01:00
VoodaGod 9a64eb8533 updated bone2planck keymap & readme 2017-02-09 10:01:39 +01:00
Priyadi Iman Nurcahyo 4be4ed3397 Add USB-BLE manual output switching and indicator 2017-02-09 01:40:22 +07:00
Priyadi Iman Nurcahyo 3f2c0bfa86 Merge branch 'master' into promethium 2017-02-09 01:01:24 +07:00
Xyverz 060f075fd1 Added another handwired board, the Atreus50.
Added a layer for WOW to my Atreus62.
2017-02-07 22:14:56 -08:00
Jack Humbert 0a9fda968d Merge pull request #1074 from dungdung/kc60_led
Moved KC60 capslock LED code to standard led_set_kb…
2017-02-07 21:25:00 -05:00
Jack Humbert ad1327cd00 accept numbers in travis build 2017-02-07 20:51:50 -05:00
dungdung 304d84cd08 Moved KC60 capslock LED code to standard led_set_kb so it can be overridden by users 2017-02-07 16:55:40 -08:00
Jack Humbert f5c8c5d4c8 Merge pull request #1070 from jimmyhchan/fixSplit
Lets split readme eeprom master hand fixes
2017-02-07 15:46:29 -05:00
Jimmy Chan 56d2198b3d rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well 2017-02-07 12:36:52 -08:00
Jimmy Chan 048ef311dc udpate readme to reflect QMK and not having the Makefile from ahtn's repo 2017-02-07 12:33:35 -08:00
Jimmy Chan 9c02e2ab49 correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 project. do not default EE_HANDS for the serial keymap
if you compare split_util.h with the original project by ahtn, the
address we look for isLeftHand config went from addr 7 to addr 10
(decimal). The EEP files were not updated.

EE_HANDS should not be enabled by default since it's more confusing for
most users
2017-02-07 12:30:24 -08:00
Jack Humbert b4e30d3929 added functionality for just a port 2017-02-07 15:23:56 -05:00
Jack Humbert d639bd2021 Merge pull request #1072 from nicinabox/improve-ls-avrdude-target
Check for Pro Micro serial port automatically
2017-02-07 13:52:03 -05:00
Jack Humbert 42ea912fde Merge pull request #1062 from luizribeiro/fix-win
Fix V-USB bug on Windows 10
2017-02-07 13:49:10 -05:00
Jack Humbert 13c394fba4 Merge pull request #1071 from dungdung/rgb_tweaks
RGB tweaks
2017-02-07 13:32:31 -05:00
Jack Humbert c0c69a1a7c Merge pull request #1068 from adzenith/master
Minor cleanup
2017-02-07 13:27:41 -05:00
Jack Humbert 3c7fa0acc1 Merge pull request #1046 from LukeSilva/master
Add Tapping Macros to QMK
2017-02-07 13:18:47 -05:00
Jack Humbert 0c2b6951a6 Merge pull request #1057 from priyadi/selectable_output
Implement runtime selectable output (USB or BT)
2017-02-07 13:12:29 -05:00
Jack Humbert de659486f5 pass through travis errors 2017-02-07 12:36:25 -05:00
Jack Humbert c256ad51bd Merge pull request #1056 from upils/master
Add reddot handwired keyboard.
2017-02-07 12:20:29 -05:00
Jack Humbert 790dab27b6 Merge pull request #1053 from TerryMathews/master
Let's Split: establish rev2fliphalf subproject
2017-02-07 12:19:45 -05:00
Jack Humbert 616b8604b0 variable scope fix for travis 2017-02-07 11:53:43 -05:00
Jack Humbert 6a92cc2897 correctly assign bash variable 2017-02-07 02:00:07 -05:00
Jack Humbert c8d5376f11 fix typo 2017-02-07 01:54:58 -05:00
Jack Humbert f79f38d726 add comma 2017-02-07 01:53:46 -05:00
Jack Humbert 2179a548f4 Merge pull request #1069 from hot-leaf-juice/master
change cmd-l and cmd-r for actual home and end
2017-02-07 01:42:30 -05:00
Jack Humbert 19d63ad72c try building only keyboards needed 2017-02-07 01:35:10 -05:00
Jack Humbert e5a2306804 Merge pull request #1041 from folkert4/master
Added Espynn's keymap
2017-02-07 00:37:23 -05:00
Jack Humbert ab07d71b22 Merge pull request #1047 from lordchair/keymap_yale
yale planck layout
2017-02-07 00:30:56 -05:00
Nic Aitch 3dbdd15304 Check for a new serial port every second 2017-02-06 19:57:34 -06:00
Jack Humbert d4c88626bd Merge pull request #1048 from smt/smt/planck
Add smt's keymap for Planck
2017-02-06 20:21:42 -05:00
Jack Humbert 198a2929ed Merge pull request #1059 from qmk/hf/algr_t
Introduces ALGR_T for dual-function AltGr
2017-02-06 19:33:33 -05:00
Jack Humbert b5159c964a Merge pull request #1036 from nicinabox/lets-split-improvements
Lets Split flashing improvements
2017-02-06 19:33:07 -05:00
Jack Humbert 4348fb54d6 Merge pull request #960 from ofples/feature/combos
Keyboard combination triggers
2017-02-06 19:31:45 -05:00
TerryMathews 2a2be010d9 Reverse rev2 and rev2fliphalf
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-06 19:23:10 -05:00
TerryMathews 5d55a44afa Revert "Reverse rev2 and rev2fliphalf"
This reverts commit 0537977ba1.
2017-02-06 19:21:21 -05:00
TerryMathews 0537977ba1 Reverse rev2 and rev2fliphalf
Flipped definitions on what constitutes "fliphalf" by popular demand.
2017-02-06 19:14:57 -05:00
Jack Humbert b6ffda4849 Merge pull request #1010 from SjB/oneshot_timeout_fix
oneshot timeout would only timeout after an event.
2017-02-06 18:57:23 -05:00
Jack Humbert 449ab9109a Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2017-02-06 18:28:50 -05:00
Jack Humbert 35edb382ee [skip build] testing travis script 2017-02-06 18:28:37 -05:00
Jack Humbert 0a3c5c06fe Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs
Add support for Unicode supplementary planes on OS X
2017-02-06 18:00:47 -05:00
Jack Humbert 5c8cdfd2b5 [skip build] testing travis script 2017-02-06 17:51:20 -05:00
dungdung a7882b1ffc Added non-animated gradient mode 2017-02-06 14:18:20 -08:00
dungdung 5a1b68d562 Added mode reverse step function 2017-02-06 14:18:20 -08:00
dungdung 0e548f8b5d Christmas mode now works with even RGBED_NUM
Added Christmas mode steps to reduce red and green colors blending into each other
Added Christmas mode interval
Increased green hue to 120
2017-02-06 14:18:20 -08:00
Jack Humbert 246d2583ff Merge pull request #1030 from SjB/refactor_register_code16
speeding up (un)register_code16
2017-02-06 17:06:53 -05:00
Jack Humbert ee386a29d1 [skip build] testing travis script 2017-02-06 17:00:30 -05:00
Jack Humbert cf8dac3538 [skip build] testing travis script 2017-02-06 16:56:39 -05:00
Jack Humbert 98adda34c9 [skip build] testing travis script 2017-02-06 16:54:54 -05:00
Jack Humbert 470c8436c2 [skip build] testing travis script 2017-02-06 16:46:44 -05:00
Jack Humbert 3a76f24cbd [skip build] testing travis script 2017-02-06 16:42:18 -05:00
Jack Humbert 835cacb031 fixes qmk.fm linking, tests out auto version incrementing 2017-02-06 16:04:28 -05:00
Callum Oakley 21015918b4 change cmd-l and cmd-r for actual home and end 2017-02-06 12:40:32 +00:00
Ole Anders d1fb51976a Added new keymap to the Satan GH60 keyboard.
Added new keymap `Admiral Strokers` to the Satan keyboard. This is an
ISO based layout with tap for brackets/ curly on shft and ctl keys.
Furthermore, there is added arrows and media/volume/special/f-keys layer
on the TAB button when you hold.
2017-02-06 11:53:48 +01:00
Nikolaus Wittenstein 06d21009b2 Minor cleanup 2017-02-05 19:55:27 -05:00
Nikolaus Wittenstein 8cbf61c919 Add new DIODE_DIRECTION option
The previous two options were COL2ROW, ROW2COL; this adds CUSTOM_MATRIX
to disable the built-in matrix scanning code.

Most notably, this obviates the need to set MATRIX_ROW_PINS or
MATRIX_COL_PINS.
2017-02-05 19:47:33 -05:00
Nikolaus Wittenstein d961c80df2 Remove unused matrix_raw variable in matrix.c 2017-02-05 19:41:08 -05:00
bestguy c3ebd9e61b Fix indent to show code formatting, <keymap_colemak.h> was missing 2017-02-05 16:08:31 -08:00
milestogo b0dfb037dc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-04 20:08:07 -08:00
Nikolaus Wittenstein 101465b6ed Add missing header to ergodox ordinary keymap 2017-02-03 21:09:50 -05:00
Nikolaus Wittenstein 3faf06c880 Fix compile warnings in egodox robot_test_layout
Fixes the warning "right shift count >= width of type" by adding UL to
the end of constants.
2017-02-03 21:07:24 -05:00
Nikolaus Wittenstein e667e9f6da Fix compile warnings in light_ws2812.c
Fixes the warning "function declaration isn't a prototype" by explicitly
making the parameter list void.
2017-02-03 21:00:13 -05:00
johannes f936a3d5c2 stuff 2017-02-03 14:10:19 +01:00
Damien Pollet cdece6811d Signing off for GPL licensing 2017-02-03 13:16:19 +01:00
johannes 453cd25ab8 Merge branch 'master' of https://github.com/Johannes-Larsson/qmk_firmware 2017-02-03 10:49:46 +01:00
johannes 8a7daf34a2 initial keymap 2017-02-03 10:47:37 +01:00
Jordi Orlando bd43954a70 Fix username typo 2017-02-02 21:23:53 -06:00
Erez Zukerman f0633f2540 Merge pull request #1063 from osamuaoki/master
Typo fixes
2017-02-02 18:33:04 -05:00
Erez Zukerman eadb1afbd0 fixes typo 2017-02-02 18:32:21 -05:00
Erez Zukerman 404f79ef14 Merge pull request #1058 from edasque/master
Reverted Dockerfile to put the CMD back
2017-02-02 18:31:25 -05:00
skullydazed 4344273c95 Updated License Clarification (markdown) 2017-02-02 13:55:18 -08:00
Osamu Aoki f787f4291a Typo fixes 2017-02-02 23:15:08 +09:00
Erik Dasque 7b798789f9 Updated Home (markdown) 2017-02-02 08:51:36 -05:00
Luiz Ribeiro a3da586505 Fix V-USB bug on Windows 10 2017-02-01 21:57:44 -05:00
Erez Zukerman 45e5b32781 Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods
race condition between oneshot_mods and tap_dance
2017-02-01 20:12:44 -05:00
Erez Zukerman a5d10e8c2e Merge pull request #1054 from deadcyclo/master
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
2017-02-01 20:11:37 -05:00
Priyadi Iman Nurcahyo e7c4f621f1 Restrict outputselect to LUFA only for now 2017-02-01 22:30:06 +07:00
Priyadi Iman Nurcahyo 98f9a2e6df Fix wrong include 2017-02-01 20:18:52 +07:00
Priyadi Iman Nurcahyo 2bef8b5b88 Limit outputselect to AVR only for now 2017-02-01 19:37:52 +07:00
Priyadi Iman Nurcahyo 72e95809a1 Move outputselect to parent dir to satisfy non LUFA keyboards 2017-02-01 17:55:13 +07:00
Priyadi Iman Nurcahyo c17070eca5 Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE 2017-02-01 15:35:21 +07:00
Brendan Johan Lee 02a95ee08c Merge remote-tracking branch 'upstream/master' 2017-02-01 08:56:35 +01:00
lucwastiaux 467e284178 increase timeout for dual mode caps key 2017-02-01 13:46:00 +08:00
Erez Zukerman f46c2b3ca0 Introduces ALGR_T for dual-function AltGr 2017-01-31 21:31:05 -05:00
Erik Dasque 5f79da2d5f Updated Home (markdown) 2017-01-31 20:19:05 -05:00
Erik Dasque 407f949e4b Reverted Dockerfile to put the CMD back 2017-01-31 19:59:59 -05:00
Erez Zukerman 748316fc43 Merge pull request #1039 from zabereer/albert_ergodox_keymap
albert ergodox keymap
2017-01-31 19:29:19 -05:00
Erez Zukerman 0081101c30 Merge pull request #1055 from matzebond/master
update my neo2 keymap
2017-01-31 19:25:46 -05:00
Priyadi Iman Nurcahyo d8a9c63c26 Implement runtime selectable output (USB or BT) 2017-02-01 05:07:05 +07:00
upils f36fc1d2e5 Add reddot handwired keyboard. 2017-01-31 22:37:03 +01:00
milestogo e8ba4838d3 fixing kinesis reboot 2017-01-30 19:39:23 -08:00
Matthias Schmitt 4c3630dc17 update my neo2 keymap 2017-01-30 23:10:28 +01:00
matzebond e97a2215c7 Updated License Clarification (markdown) 2017-01-30 20:23:22 +01:00
Priyadi Iman Nurcahyo aa491523ab Signing off my contributions 2017-01-31 02:02:59 +07:00
skullydazed 24a61213aa Adding signify for @IBNobody 2017-01-30 10:57:07 -08:00
skullydazed 3a1e9890dc Adding signify for @lindhe 2017-01-30 10:45:19 -08:00
skullydazed 6cf5c7e7f4 Adding signify for @yangliu 2017-01-30 10:44:38 -08:00
Brendan Johan Lee f70758622b [deadcyclo layout] Refactoring. Use custom functions and macros 2017-01-30 19:42:27 +01:00
plgruener 50dd22d1bf Updated License Clarification (markdown) 2017-01-30 17:29:40 +01:00
Brendan Johan Lee f400ac1d7d [deadcyclo layout] fixed failing tests 2017-01-30 15:45:16 +01:00
Brendan Johan Lee d43f4a5f57 Merge remote-tracking branch 'upstream/master' 2017-01-30 12:59:17 +01:00
Seb cb5a8feeb2 Updated License Clarification (markdown) 2017-01-30 09:11:07 +01:00
Xyverz 4f163b006e First revision of the XK-66 keyboard. 2017-01-30 00:00:09 -08:00
TerryMathews ef9e544a7e Let's Split: establish rev2fliphalf subproject
Subproject to accomodate second half pad built in opposite orientation
(places TRRS jacks on opposing edges for shorter cable runs)
2017-01-29 22:22:32 -05:00
Jordi Orlando dbeda99de1 Sign off on rgblight.c 2017-01-29 20:08:12 -06:00
TerryMathews 89799309d7 Updated License Clarification (markdown) 2017-01-29 18:31:57 -05:00
DidierLoiseau 761b4e04bf Added my sign off 2017-01-29 21:25:10 +01:00
Wez Furlong 29ea5f92ca Updated License Clarification (markdown) 2017-01-29 12:02:10 -08:00
skullydazed 07b0a4144e Updated License Clarification (markdown) 2017-01-29 10:54:37 -08:00
SjB 5a860b71a1 race condition between oneshot_mods and tap_dance
since the keycode for a tap dance process gets process only after the
TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT -
TAPPING_TERM time to tap or double tap on the key. This fix save the
oneshot_mods into the action.state structure and applies the mods with
the keycode when it's registered. It also unregisters the mod when the
the tap dance process gets reset.
2017-01-29 13:26:31 -05:00
skullydazed 66ec000886 Updated License Clarification (markdown) 2017-01-29 10:19:15 -08:00
SjB 45e0d09414 moved oneshot cancellation code outside of process_record.
The oneshot cancellation code do not depend on the
action_tapping_process and since process_record get called via the
action_tapping_process logic moved the oneshot cancellation code into
the action_exec function just before the action_tapping_process call
2017-01-29 13:01:47 -05:00
SjB f644b9a07a registering a weak_mods when using register_code16
Scenario:
Locking the KC_LSHIFT, and then using a tap dance key that registers a
S(KC_9) will unregister the KC_LSHIFT.

The tap dance or any keycode that is registered should not have the
side effect of cancelling a locked moditifier. We should be using a
similar logic as the TMK codes in tmk_core/comman/action.c:158.
2017-01-29 12:29:43 -05:00
Priyadi Iman Nurcahyo 3835b4bfcc Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2017-01-29 18:38:15 +07:00
Priyadi Iman Nurcahyo 011811af68 minimize LEDs 2017-01-29 18:37:49 +07:00
Priyadi Iman Nurcahyo 306f43e5ee fix greek layers 2017-01-29 18:37:49 +07:00
Priyadi Iman Nurcahyo c5ab0b2b61 Implement greek layers on my Promethium layout 2017-01-29 18:37:49 +07:00
fredizzimo 9413e3958a Updated License Clarification (markdown) 2017-01-29 11:38:43 +02:00
Gergely Nagy 8b66d71521 Updated License Clarification (markdown) 2017-01-29 10:35:44 +01:00
Pavlos Vinieratos 01c7475d12 add my consent. 2017-01-29 09:29:44 +01:00
Jack Humbert 420074d37f Updated License Clarification (markdown) 2017-01-29 02:37:49 -05:00
skullydazed db7de0d47c Updated License Clarification (markdown) 2017-01-28 22:12:54 -08:00
skullydazed 8cad52d8f3 Updated License Clarification (markdown) 2017-01-28 22:12:43 -08:00
skullydazed b1a2c4cd59 Created License Clarification Details (markdown) 2017-01-28 22:08:51 -08:00
skullydazed 6b7e4a9bc9 Updated License Clarification (markdown) 2017-01-28 22:08:15 -08:00
skullydazed 8567544174 Updated License Clarification (markdown) 2017-01-28 22:07:07 -08:00
skullydazed d5de7e20fd Updated License Clarification (markdown) 2017-01-28 22:04:05 -08:00
skullydazed 8347993d6b Updated License Clarification (markdown) 2017-01-28 22:02:36 -08:00
Yale Thomas 8df30c1c56 added picture of layout 2017-01-28 18:44:14 -08:00
Yale Thomas ad0ce40db0 usability tweaks 2017-01-28 18:44:01 -08:00
Yale Thomas d549002d22 mouse keys added 2017-01-28 18:43:40 -08:00
Yale Thomas 4eafa86564 new 'yale' keymap 2017-01-28 18:43:40 -08:00
Stephen Tudor 1d9e0b0120 s/Bkps/Bksp 2017-01-28 20:54:34 -05:00
Luke Silva 77e54e34e1 Add luke keymap, as an example of the tapping macros 2017-01-29 11:27:38 +11:00
Luke Silva a3357d078e Add support for various tapping macros
A macro key can now be easily set to act as a modifier on hold, and
press a shifted key when tapped. Or to switch layers when held, and
again press a shifted key when tapped.

Various other helper defines have been created which send macros when
the key is pressed, released and tapped, cleaning up the
action_get_macro function inside keymap definitions.

The layer switching macros require a GCC extension - 'compound
statements enclosed within parentheses'. The use of this extension is
already present within the macro subsystem of this project, so its use
in this commit should not cause any additional issues.

MACRO_NONE had to be cast to a (macro_t*) to suppress compiler
warnings within some tapping macros.
2017-01-28 18:42:35 +11:00
Stephen Tudor 7c24ecf580 Carry over Planck updates to my Preonic keymap 2017-01-28 01:38:58 -05:00
Stephen Tudor 321904b8e3 Improve Planck keymap
- added escape+shift mod-tap key
- replaced BRITE with backtick
2017-01-28 01:37:59 -05:00
Stephen Tudor fa72689145 Merge branch 'master' into smt/planck
* master:
  Clarify license on abnt2 keymap (#1038)
  replace jackhumbert with qmk
  Add gitter image, start update to qmk org
  Remove COLEMAK from preonic_keycodes enum
  layer defines to enum
  Update readme for smt Preonic keymap
  Add smt keymap for Preonic
  updated all the other keymaps to support the new changes.
  fix: infinity60 keyboard was not using quantum features.
  Compare Makefile with itself instead of using `--help`
2017-01-28 00:51:07 -05:00
skullydazed ec05f65421 Merge pull request #1043 from potz/patch-1
Clarify license on abnt2 keymap (#1038)
2017-01-27 18:40:59 -08:00
skullydazed e364b2267a Updated License Clarification (markdown) 2017-01-27 18:35:59 -08:00
skullydazed 128640a7df Updated License Clarification (markdown) 2017-01-27 18:34:58 -08:00
skullydazed 646d1f83a5 Updated License Clarification (markdown) 2017-01-27 18:31:23 -08:00
skullydazed 143a4ff78f Updated License Clarification (markdown) 2017-01-27 18:19:12 -08:00
skullydazed 00010b47bc Updated License Clarification (markdown) 2017-01-27 17:54:48 -08:00
skullydazed 757a79636b Updated License Clarification (markdown) 2017-01-27 17:54:14 -08:00
skullydazed 35737ee07f Updated License Clarification (markdown) 2017-01-27 17:51:29 -08:00
skullydazed d51ad5db0f Updated License Clarification (markdown) 2017-01-27 17:47:43 -08:00
lucwastiaux f6feee8167 eliminate references to shell_layer 2017-01-28 09:45:13 +08:00
skullydazed 223494e691 Updated License Clarification (markdown) 2017-01-27 17:44:58 -08:00
lucwastiaux a1c53d0f93 documented dual mode capslock 2017-01-28 09:42:55 +08:00
skullydazed 3df44ecfc8 Updated License Clarification (markdown) 2017-01-27 17:08:57 -08:00
milestogo cb2d4fb80b split kinesis layout into ergodox and planck style symbol layers 2017-01-27 16:45:18 -08:00
skullydazed 858efff8e5 Updated License Clarification (markdown) 2017-01-27 16:27:36 -08:00
skullydazed 6a54982324 Updated License Clarification (markdown) 2017-01-27 16:21:25 -08:00
skullydazed 5942b0f103 Updated License Clarification (markdown) 2017-01-27 14:54:42 -08:00
skullydazed 0eebccb283 Updated License Clarification (markdown) 2017-01-27 14:51:58 -08:00
skullydazed d524b3f5e5 Updated License Clarification (markdown) 2017-01-27 14:26:21 -08:00
skullydazed c0a04929f2 Updated License Clarification (markdown) 2017-01-27 14:21:31 -08:00
skullydazed 9adb6f777b Updated License Clarification (markdown) 2017-01-27 14:14:19 -08:00
Potiguar Faga 2fe18a50ec Clarify license on abnt2 keymap (#1038) 2017-01-27 18:22:44 -02:00
skullydazed 5c277651a3 Updated License Clarification (markdown) 2017-01-27 11:30:25 -08:00
folkert4 8c794d73fa Added Espynn's keymap 2017-01-27 13:51:39 -05:00
skullydazed 69581f47d5 Updated License Clarification (markdown) 2017-01-27 10:39:31 -08:00
skullydazed bc68d4ef2c Updated License Clarification (markdown) 2017-01-27 10:38:03 -08:00
skullydazed 4bba3be825 Updated License Clarification (markdown) 2017-01-27 10:35:54 -08:00
skullydazed 228e4add0b Created License Clarification (markdown) 2017-01-27 10:02:33 -08:00
Jack Humbert a28f689387 Merge pull request #869 from dylanjgscott/master
Use `type cmp` to test for cmp in Makefile
2017-01-27 11:23:02 -05:00
lucwastiaux 93c1bfa646 dual capslock functionality, activating shell nav or brackets 2017-01-27 23:55:33 +08:00
Brendan Johan Lee d7aa4724fb Merge remote-tracking branch 'upstream/master' 2017-01-27 15:24:08 +01:00
Brendan Johan Lee 13fa63b192 [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys 2017-01-27 13:53:02 +01:00
Jack Humbert 712f3de16f Merge pull request #1035 from qmk/qmk_org_changes
Updated urls due to transfer to qmk org
2017-01-27 00:28:46 -05:00
Luke Silva cfc4149712 Add ability to use tap macros without using functions 2017-01-27 10:28:42 +11:00
Albert Pretorius fffe76a7b7 albert ergodox keymap 2017-01-26 20:07:47 +00:00
Nic Aitch 890ecf6a2a Update readme 2017-01-26 09:31:40 -06:00
Nic Aitch 3131d65563 Add avrdude target 2017-01-26 09:31:27 -06:00
Luke Silva 87bc36253d Fix documentation for TMK actions 2017-01-26 22:44:22 +11:00
Brendan Johan Lee 8a645aa9ad Merge remote-tracking branch 'upstream/master' 2017-01-26 11:56:32 +01:00
Damien b7b94bfb13 Merge pull request #17 from qmk/master
Merged from QMK project
2017-01-26 09:05:55 +01:00
Jack Humbert c9ca368008 replace jackhumbert with qmk 2017-01-26 01:52:43 -05:00
Jack Humbert aac7c0aa4d Merge pull request #1029 from SjB/qmk_infinity60
fix: infinity60 keyboard was not using quantum features.
2017-01-26 01:28:44 -05:00
Jack Humbert 0212a30aa6 Merge pull request #1033 from smt/smt/preonic
Add smt's keymap for Preonic
2017-01-26 01:27:51 -05:00
Jack Humbert 1b20243092 Add gitter image, start update to qmk org 2017-01-26 01:26:17 -05:00
Stephen Tudor 63e406eca4 Add smt keymap for Planck 2017-01-26 00:24:51 -05:00
Stephen Tudor 6546dddddb Remove COLEMAK from preonic_keycodes enum 2017-01-25 10:57:42 -05:00
Jack Humbert 7e3962f36a Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2017-01-25 10:02:06 -05:00
Jack Humbert 938422ce99 layer defines to enum 2017-01-25 10:02:01 -05:00
Brendan Johan Lee 8af48194f2 [deadcyclo layout] Added lotsof new emojis and some new unicode keys 2017-01-25 15:16:38 +01:00
Stephen Tudor 51fe4f0d34 Update readme for smt Preonic keymap 2017-01-25 01:08:51 -05:00
Stephen Tudor b3cf96ec2e Add smt keymap for Preonic 2017-01-25 00:47:45 -05:00
Brendan Johan Lee d0db044164 Merge remote-tracking branch 'upstream/master' 2017-01-24 21:56:18 +01:00
Brendan Johan Lee 37ed3d13a4 [deadcyclo layout] Added unicode layer 2017-01-24 21:54:34 +01:00
Brendan Johan Lee 3c32e38036 [deadcyclo layout] Added support for ergodox ez shine 2017-01-24 19:10:35 +01:00
Rovanion Luckey 18cc05e2f7 Added instructions for how to build and flash the firmware with teensy_cli. 2017-01-24 10:02:56 +01:00
Jack Humbert 71137deba2 Merge pull request #1014 from SjB/lcd_mods_status
added mods status bit to visualizer.
2017-01-24 00:34:55 -05:00
SjB 9111cc00f5 updated all the other keymaps to support the new changes.
qmk firmware requires the matrix_init_user and matrix_scan_user
function to be implementated. Added these function to all the existing
keymaps.
2017-01-24 00:24:01 -05:00
SjB 2b3859937b speeding up (un)register_code16
In register_code16 and unregister_code16 we call register_code and
unregister_code twice, once for the mods and once for the keycode.
The (un)register_code have many check to see that keycode we have sent
however because we know that we are sending it a mods key, why not
just skip all of it and call (un)register_mods instead. This will skip
alot of checks and should speedup the loop a little.
2017-01-23 23:16:57 -05:00
SjB a777495683 fix: infinity60 keyboard was not using quantum features.
the quantum matrix codes where not being initialized or/and called
so no feature of the quantum firmware could be used. These codes have
been added and now we can enjoy the quantum firmware goodness.
2017-01-23 23:15:31 -05:00
Dylan Scott 245f77b863 Compare Makefile with itself instead of using --help 2017-01-24 13:53:46 +11:00
Jack Humbert 841d7e6a1d turn off rgb_midi in ez 2017-01-23 13:55:24 -05:00
Jack Humbert 6d377bcc9c Merge pull request #1026 from TerryMathews/master
Let's Split: More code cleanup
2017-01-23 00:33:29 -05:00
TerryMathews 372af5e3f6 More code cleanup
Missed a few commented out vestigal defines in revx/config.h that had
been moved to keymap/serial and i2c.
2017-01-22 22:06:53 -05:00
Jack Humbert 0026f4ec09 Merge pull request #1018 from hot-leaf-juice/master
simplified my keymap
2017-01-22 19:01:34 -05:00
Christopher Browne 89461e743e More keyboard map tweaking (#1019)
* Add HOME/END keys as upper/lower on arrow-up/down

* Reduce .hex file size by turning off unneeded options

* Put digit keypad onto left hand upon RAISE; this will sometimes be preferable to double-hits of right hand
2017-01-22 19:01:07 -05:00
Jack Humbert 79a823d802 Merge pull request #1020 from remigius42/master
Swiss German layout for Ergodox EZ & Infinity
2017-01-22 18:59:57 -05:00
Jack Humbert a8a1fbbac8 Merge pull request #1022 from lucwastiaux/master
Improvements to Dvorak Programmer Ergodox keymap
2017-01-22 18:59:12 -05:00
Jack Humbert a54944ac33 Merge pull request #1021 from luizribeiro/ps2avrGB
Support for ps2avrGB / winkeyless.kr boards
2017-01-22 18:58:46 -05:00
Jack Humbert 405b2ae267 Merge pull request #1023 from TerryMathews/master
Corrects Let's Split code
2017-01-22 18:57:44 -05:00
TerryMathews 99d548c4fb Missed commenting out notes at end of line 2017-01-22 15:57:30 -05:00
TerryMathews a00957abca Fixed keymap matrix on rev2
* Fixed keymap matrix in rev2 so that left half and right half match
when in same orientation.
2017-01-22 15:50:08 -05:00
TerryMathews efa526f570 Created lines to uncomment keyboards built upside down
* Reverses column order to fix left-to-right key order that occurs if
PCB assembled upside down.
2017-01-22 15:46:43 -05:00
TerryMathews 9d24943ec1 Refactor code to eliminate duplicate defines
* Moved duplicated defines out of inappropriate source files (matrix
pins in keymap subdirectory)
* Eliminated default keymap directory
* Hardcoded serial keymap to use serial defines and EE_CONFIG
* Hardcoded i2c keymap to use i2c defines
2017-01-22 15:37:48 -05:00
Luiz Ribeiro 84661ac44b Upgrade AVR 8-bit Toolchain to 3.5.4 on Travis 2017-01-22 12:38:42 -05:00
Andreas Schmidt 08c192caea SG Ergodox layout: Updated layout documentation
- Swiss German Ergodox layout:
    Updated layout documentation based on previous
    layout changes.
2017-01-22 12:57:58 +01:00
Andreas Schmidt afd2c2ee9e SG Ergodox layout: Fixed ENTER key mapping
- Swiss German Ergodox layout:
    Additional ENTER key was mapped to wrong layer
    and keyboard half.
2017-01-22 12:43:46 +01:00
Andreas Schmidt c2c8a12022 SG Ergodox layout: Minor code formatting changes
- Swiss German Ergodox layout:
    Removed unnecessary spaces.
2017-01-22 12:35:24 +01:00
Andreas Schmidt 5c4a73d788 SG Ergodox layout: Add ENTER to left keyboard
- Swiss German Ergodox layout:
    Added ENTER key to left keyboard half on media layer
    such that the enter key is available on both halves to
    be able to flash both halves without an additional keyboard.
2017-01-22 12:32:40 +01:00
Andreas Schmidt 3fd9aa3660 SG Ergodox layout: Add <br/> macro to media layer
- Added <br/> macro to media layer of Swiss German layout
    for Ergodox
2017-01-22 12:30:18 +01:00
lucwastiaux 803a861b4e document BRACKETS and SHELL_LAYER 2017-01-22 10:32:17 +08:00
Luiz Ribeiro 642d0acef5 Added a copyright header to the default keymap... ¯\_(ツ)_/¯ 2017-01-21 18:23:44 -05:00
Luiz Ribeiro bfbab75292 Slightly saner default keymap for ps2avrGB and removed some unused code 2017-01-21 18:15:39 -05:00
Luiz Ribeiro 9ce38cbccf Simplified and polished a bit the code changes on tmk_core 2017-01-21 17:18:05 -05:00
Andreas Schmidt eb6abb6305 Renamed JSON source of Ergodox Swiss German
- Renamed the JSON source files for the layout description of
    the Ergodox Swiss German keymap
2017-01-21 20:58:28 +01:00
Andreas Schmidt 6b5cd656fd Correct layout description of ergodox swissgerman
- Added missing HTML macros to media layer.
2017-01-21 20:55:18 +01:00
Andreas Schmidt 250628de04 Removed Ergodox EZ & Infinity specific keymaps
- Removed the keymaps for Swiss German spefic for Ergodox EZ
    and Infinity after previously merging them.
2017-01-21 20:22:24 +01:00
Andreas Schmidt c26c81c7f3 Merged keymap for Ergodox EZ & Infinity
- Merged keymap for Ergodox EZ & Infinity into one single
    keymap using pre-processor macros.
2017-01-21 20:20:47 +01:00
Luiz Ribeiro 461dfd4462 Simplification and code polish on ps2avrGB directory 2017-01-21 13:52:23 -05:00
Luiz Ribeiro f7462aaa61 Got ps2avrGB to work with the V-USB protocol 2017-01-21 12:55:19 -05:00
lucwastiaux 4cf0f7dd16 make shell layer more compatible with default layer 2017-01-21 23:42:23 +08:00
Andreas Schmidt bf0b355bc8 Add Swiss German layout for Ergodox Infinity
- Add Swiss German layout for Ergodox Infinity based on default
    layout for Ergodox EZ.
- Minor changes in the event loop to prevent flashing display
    background lights.
2017-01-21 16:24:41 +01:00
Andreas Schmidt cbb1927d6f Add Swiss German layout for Ergodox EZ
- Add Swiss German layout for Ergodox EZ based on default
    layout for Ergodox EZ.
- Minor changes in the event loop to prevent flashing of leds.
2017-01-21 16:22:40 +01:00
lucwastiaux 01e750a372 couple of changes to the shell layer 2017-01-21 23:15:37 +08:00
Callum Oakley dc3937d485 simplify 2017-01-20 21:22:18 +00:00
Erez Zukerman b420185f5b Added KC_QUES, updated file path. 2017-01-19 20:38:13 -05:00
Xyverz b8b2a55973 Merge remote-tracking branch 'upstream/master' 2017-01-19 06:54:18 -08:00
Xyverz 80bc598585 Added Let's Split 2017-01-19 06:51:24 -08:00
Xyverz c8a0ab1867 Changes to Atreus62 keymap, adding Let's Split keymap. 2017-01-19 06:49:59 -08:00
lucwastiaux 072237bce8 introduce shell_layer 2017-01-19 22:45:30 +08:00
Jack Humbert 10ff962321 Merge pull request #1016 from arthurnn/patch-1
this is the atreus doc
2017-01-18 21:28:43 -05:00
Arthur Nogueira Neves 489d0ab581 this is the atreus doc 2017-01-18 21:12:02 -05:00
David Olsson f35adb4f37 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-01-18 22:58:49 +01:00
SjB 9eb8d05246 added mods status bit to visualizer.
Since we can't read the real_mods and oneshot_mods static variable
directly within the update_user_visualizer_state
function (Threading and serial link). We are know storing the mods
states in the visualizer_keyboard_status_t structure. We can now
display the status of the modifier keys on the LCD display.
2017-01-17 21:57:32 -05:00
Jack Humbert 3d264adfc5 Merge pull request #1013 from mitchlloyd/mitch-keymap-update
Update mitch layout for new keymaps
2017-01-17 16:38:31 -05:00
Mitch Lloyd 0815c7ae17 Update mitch layout for new keymaps 2017-01-17 13:01:07 -08:00
David Olsson d910b94a3c Don't change ralt to lalt, it's really not the same thing on windows. 2017-01-17 19:33:09 +01:00
lucwastiaux 1ac15e6b3a put shell nav under tab, introduce an OSL for the brackets layer 2017-01-17 20:34:05 +08:00
David Olsson 53382d9564 whitespace fixes 2017-01-16 21:31:44 +01:00
David Olsson a37e924e36 vi style arrow keys. Live unicode switch support 2017-01-16 21:10:25 +01:00
Priyadi Iman Nurcahyo 11eb3d5491 Merge branch 'master' into promethium 2017-01-17 01:39:29 +07:00
SjB 6f44ca7a59 oneshot timeout would only timeout after an event.
After setting a ONESHOT_TIMEOUT value, the oneshot layer state would
not expire without an event being triggered (key pressed). The reason
was that in the process_record function we would return priort to
execute the process_action function if it detected a NOEVENT cycle. The
process_action contained the codes to timeout the oneshot layer state.
The codes to clear the oneshot layer state have been move just in
front of where we check for the NOEVENT cycle in the process_record
function.
2017-01-15 23:29:24 -05:00
Damien f91f0a715d Merge pull request #16 from jackhumbert/master
Forked from jackhumbert/qmk_firmware
2017-01-15 11:07:54 -06:00
Jack Humbert 6f44885615 Merge pull request #987 from belak/belak/whitefox-initial-support
Initial whitefox support
2017-01-15 01:14:02 -05:00
Jack Humbert 81b89f8b2b Merge pull request #996 from milestogo/master
kinesis keyboard with subdirectories for different hardware - matches pull #911
2017-01-15 01:13:15 -05:00
Jack Humbert 99d0b54e5e Merge pull request #999 from deadcyclo/master
Adds layer images to the deadcyclo layout readme
2017-01-15 01:12:21 -05:00
Jack Humbert b2dcac9655 Merge pull request #1003 from mneme/master
Layout "Mneme" for Atreus62
2017-01-15 01:12:04 -05:00
Jack Humbert ff76ee8377 Merge pull request #1005 from kd0kkv/patch-1
Update keymap.c
2017-01-15 01:11:38 -05:00
Jack Humbert 5036112d39 Merge pull request #1006 from Vifon/master
Update the vifon keymap
2017-01-15 01:11:04 -05:00
Jack Humbert a896b300ec Merge pull request #1007 from bryan4887/bryan
Added Bryan's keymap
2017-01-15 01:10:39 -05:00
Jack Humbert 5521d854d0 Merge pull request #1009 from getclacking/master
Typo fix
2017-01-15 01:09:50 -05:00
Jason Milkins b56ec38d5c Typo fix 2017-01-15 14:08:17 +08:00
Bryan Hernandez aa0939b5ef Added Bryan's keymap 2017-01-13 21:51:55 -06:00
Erez Zukerman 0fde5a34e2 Merge pull request #1004 from jackhumbert/hf/scmd
Adds SCMD and SCMD_T
2017-01-13 21:16:10 -05:00
Jack Humbert 7288e5ab9c Update quantum_keycodes.h 2017-01-13 14:04:51 -05:00
Wojciech Siewierski c6299a7859 Update the vifon keymap 2017-01-13 18:52:13 +01:00
Noah Andrews 032712866f Link correctly to keycode.txt 2017-01-13 10:21:47 -05:00
kd0kkv c660d5f814 Update keymap.c
Fixed the default querty layout to have a B button and just one F
2017-01-13 08:30:46 -06:00
Xyverz 1074642c36 initial commit of my Atreus62 keymap 2017-01-13 01:51:52 -08:00
David Olsson 236a0b0b60 Update makefile.
Readme.
2017-01-12 16:00:09 +01:00
David Olsson b2419b31d3 - Change docs to match keymap.
- Switched around modifiers on the function layer to match muscle memory.
- Added support for application switching.
2017-01-12 15:36:14 +01:00
Erez Zukerman 3717cf5864 A shot at aliasing 2017-01-12 07:38:07 -05:00
Erez Zukerman 8459bb97c1 Adds SCMD and SCMD_T 2017-01-11 21:57:41 -05:00
Christopher Browne 942b78e8c2 Updated Home (markdown) 2017-01-11 18:36:44 -05:00
Christopher Browne 1cefc94082 Destroyed Build Options (org) 2017-01-11 18:36:08 -05:00
Christopher Browne e7fb34a910 Updated Build Options (org) 2017-01-11 18:25:02 -05:00
Christopher Browne 67868d39f8 Created Build Options (org) 2017-01-11 18:21:41 -05:00
David Olsson ed975f2454 Remove comments and change to correct KN_PLUS instead of KC_PLUS. 2017-01-12 00:14:42 +01:00
David Olsson 1bef7bf45a Link fix in readme. 2017-01-11 23:43:13 +01:00
David Olsson e491f5a4d0 Readme + minor change to make it match reality. 2017-01-11 23:41:07 +01:00
David Olsson 3a453a03ed Atreus62 first semi-final draft 2017-01-11 23:00:34 +01:00
Noah Andrews 8d61e884f2 Fix dfu-programmer link 2017-01-10 14:58:56 -05:00
Brendan Johan Lee c4fca8b6bc Fixed incorrect layer image in deadcyclo readme 2017-01-10 19:23:59 +01:00
Brendan Johan Lee 1121753746 Merge remote-tracking branch 'upstream/master' 2017-01-10 19:21:33 +01:00
Brendan Johan Lee db1aec159d Added layer images to deadcyclo layout readme 2017-01-10 19:20:25 +01:00
Kaleb Elwert a55c5e3ea3 Wait for two ticks rather than 1 2017-01-10 03:00:36 -08:00
Xyverz 7a9a5d0e62 Add files via upload
tidying up the keymap
2017-01-09 19:08:46 -08:00
Kaleb Elwert 0b38204e62 Fix mismatched indentation 2017-01-09 11:57:44 -08:00
Kaleb Elwert 49a00a535f Update clock frequencies to match the infinity ergodox 2017-01-09 11:15:10 -08:00
Kaleb Elwert a702f4631e Increase tick frequency for responsiveness
Based off of PR #866 which did the same thing for the infinity60
2017-01-09 10:54:36 -08:00
Kaleb Elwert ef2ebeb3ca Remove KC_ prefix from KEYMAP macro to match other keyboards 2017-01-09 10:45:34 -08:00
Priyadi Iman Nurcahyo 87b675241a minimize LEDs 2017-01-09 23:19:34 +07:00
Balz Guenat 166f428a2b Updated Home (markdown) 2017-01-09 16:29:04 +01:00
Priyadi Iman Nurcahyo 8c2cc30b0e fix greek layers 2017-01-09 21:24:26 +07:00
Priyadi Iman Nurcahyo cf0650e3f0 Implement greek layers on my Promethium layout 2017-01-09 19:35:01 +07:00
milestogo 9d4cc2f3f1 removing old programmer layout, in favor of milestogo 2017-01-08 22:25:41 -08:00
milestogo 62f1c13c3a trying to clean up duplicate docs 2017-01-08 22:17:47 -08:00
milestogo f74ff86f9c kinesis remap 2017-01-08 22:02:01 -08:00
xyverz 99521a4482 Merge remote-tracking branch 'upstream/master' 2017-01-08 21:47:08 -08:00
xyverz 79343f1c6c Usaility changes to keymap, tidying up a bit. 2017-01-08 21:44:31 -08:00
Jack Humbert 176b93d08e Merge pull request #994 from priyadi/unicode_mods_fix
Unregister all mods before inputting Unicode, and reregister afterwards
2017-01-08 21:12:02 -05:00
Jack Humbert 18d013b25b Merge pull request #993 from priyadi/greek_layer
Greek alphabet layer
2017-01-08 21:11:32 -05:00
Jack Humbert d8b445b03b Merge pull request #990 from replicaJunction/master
Update replicaJunction keymap
2017-01-08 21:10:42 -05:00
Priyadi Iman Nurcahyo 30b80a23f3 Unregister all mods before inputting Unicode, and reregister afterwards 2017-01-09 02:59:10 +07:00
Priyadi Iman Nurcahyo 02055406e8 Greek alphabet layer 2017-01-09 02:50:13 +07:00
Priyadi Iman Nurcahyo 3a71f3534a Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2017-01-09 02:48:07 +07:00
Priyadi Iman Nurcahyo 58b2536bf1 om telolet om 2017-01-08 23:45:16 +07:00
Priyadi Iman Nurcahyo b0a9bd319b om telolet om 2017-01-08 22:45:16 +07:00
Joshua T cfb45027bb Removed build.bat
Make.exe is easy enough to use, and there's no real sense in having a wrapper aroung it.
2017-01-07 14:05:04 -06:00
Joshua T 8f8d104759 Merged from upstream 2017-01-07 14:01:21 -06:00
Joshua T b7b44dc481 Updated README and images to reflect latest keymap 2017-01-07 13:57:51 -06:00
Joshua T 677ae86bde Added another Shift on Extend layer.
This moves the GUI key to the pinkie, but honestly, I never use that function anyway.
2017-01-07 13:07:55 -06:00
Damien 0fb82c15a5 Merge pull request #15 from jackhumbert/master
Merge from qmk
2017-01-07 08:45:19 -06:00
Joshua T fe51724544 Updated Atreus layout to 0.4
Removed Alt on base layer, replaced with Function layer.

Moved function keys to left hand.  Added mouse keys to right hand on the function layer.

Moved middle click on gaming layer to be consistent with mouse layer.

Added macro _USER. Macro contents are not implemented yet.
2017-01-06 19:56:57 -06:00
Joshua T 5ce7ec9ea5 Increased TAPPING_TERM to 200 2017-01-06 17:08:14 -06:00
Joshua T 6fba925f41 Fixed key not matching its diagram 2017-01-06 17:07:58 -06:00
Jack Humbert e7df488a92 Merge pull request #989 from ishigoya/master
Keymap
2017-01-06 17:28:45 -05:00
ishigoya 402e6c13a1 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png
new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png
	modified:   keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/readme.md
2017-01-06 17:53:04 +09:00
ishigoya 0bd03d698c new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c 2017-01-06 16:41:14 +09:00
Kaleb Elwert ca9a3dcb71 Fix unrelated spelling error 2017-01-04 21:20:06 -08:00
Kaleb Elwert ccde1d8b5e Add white fox to keyboards readme 2017-01-04 21:19:32 -08:00
Jack Humbert e5c7b5d8fc Merge pull request #983 from common-nighthawk/master
adds personal keymap for ergodox optimized for macOS with Vim
2017-01-04 23:41:56 -05:00
Jack Humbert 6a59dfb4c6 Merge pull request #984 from deadcyclo/master
Added the deadcyclo layout
2017-01-04 23:41:29 -05:00
Jack Humbert ad290946f2 Merge pull request #988 from jcowgar/master
Added Jeremy’s developers keymap for the Planck
2017-01-04 23:39:52 -05:00
Jeremy Cowgar 5fca9ff4d5 Added Jeremy’s developers keymap for the Planck 2017-01-04 10:51:00 -05:00
Kaleb Elwert 262d31c389 Add whitefox readme 2017-01-04 00:29:58 -08:00
Kaleb Elwert 300c71a023 Remove unneeded define 2017-01-04 00:05:18 -08:00
Kaleb Elwert 8377d5fdc5 Initial whitefox support 2017-01-03 23:41:52 -08:00
Brendan Johan Lee a85aefd27a fix version macro making layer 3 sticky on deadcyclo layout 2017-01-03 15:09:25 +01:00
Brendan Johan Lee b23a963bec Added the deadcyclo layout 2017-01-02 19:12:06 +01:00
Jack Humbert ffc1d97672 Update config.h 2017-01-02 09:57:39 -05:00
Daniel 0de3a5d0b2 reverts change outside of personal keymap. 2017-01-01 21:02:43 -07:00
Daniel acffbb480f adds dedicated double-quote key. 2017-01-01 20:09:30 -07:00
Jack Humbert 847377fb43 Merge pull request #980 from TerryMathews/master
Establish support for AMJPAD
2016-12-31 13:38:10 -05:00
Jonas Oberschweiber 0aa413af44 Add support for supplementary planes for OS X 2016-12-31 19:37:56 +01:00
TerryMathews 925ed44405 Establish support for AMJPAD 2016-12-31 13:19:05 -05:00
Jack Humbert 6dbcc50f56 Merge pull request #975 from fredizzimo/remove_temp_files
Remove extra file that has been commited by mistake
2016-12-30 11:12:47 -05:00
Jack Humbert 4587248cda add warning to install_dep 2016-12-30 11:09:58 -05:00
Jack Humbert f98062081b Merge pull request #976 from fredizzimo/fix_makefile_on_cygwin
Fix makefile on cygwin
2016-12-30 11:08:02 -05:00
Jack Humbert 460bf008f5 Merge pull request #973 from Wilba6582/keycode_refactor
Keycode refactor
2016-12-30 11:07:17 -05:00
Jack Humbert 07e266bbc6 Merge pull request #971 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.10
2016-12-30 11:06:21 -05:00
Jack Humbert 2eced29675 Merge pull request #974 from fredizzimo/remove_malloc_from_sysex
API Sysex fixes
2016-12-30 11:05:50 -05:00
Jack Humbert 8a76075ca7 Merge pull request #972 from mechkeys/rgb_compat
Add extern for 'led' global, set 'weak' attribute for rgblight_set()
2016-12-29 21:42:16 -05:00
Scott Wilson b8e74c378b Removed errant + 2016-12-29 09:32:02 -05:00
Fred Sundvik 1d1f2b4ee2 Clean up the SKIP_GIT code 2016-12-29 15:20:43 +02:00
Fred Sundvik 2acfd2ab2b Remove extra parenthesis from Makefile
Cygwin had trouble running the tests
2016-12-29 14:56:01 +02:00
Fred Sundvik 52430ef0d6 Remove extra file that has been commited by mistake 2016-12-29 12:26:41 +02:00
Fred Sundvik dd685eceb2 API Sysex fixes
Fix memory leaks by using stack instead of malloc
Reduce memory usage by having less temporary bufffers
Remove warnings by adding includes
Decrease code size by 608 bytes (mostly due to not linking malloc)
More robust handling of buffer overflows
2016-12-29 12:13:30 +02:00
Wilba6582 d8a608f3ff Keycode refactor 2016-12-29 18:28:48 +11:00
Scott Wilson 748181dccd Add extern for 'led' global, set 'weak' attribute for rgblight_set() 2016-12-28 16:29:02 -05:00
coderkun b0ade6dc98 Fix return value of hex_to_keycode() function in keymap “coderkun_neo2” 2016-12-28 20:08:45 +01:00
Gergely Nagy eb588d630c ergodox: Update algernon's keymap to v1.10
Miscellaneous
=============

* `µ` can now be entered with UCIS.
* `™` can now be entered with UCIS.

Tools
=====

* `tools/hid-commands` can now find Banshee, and prefers it over Kodi.
* `tools/hid-commands` can now find Chrome too, not juts Chromium.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-12-28 19:27:48 +01:00
Jack Humbert 223cffd92f Merge pull request #968 from ofples/bugfix/right-modifiers
Fixed bug in do_code16
2016-12-28 13:07:16 -05:00
Jack Humbert d3ec88cd07 Merge pull request #966 from Dbroqua/master
Some updates for GH60 and Satan keyboard
2016-12-28 13:04:08 -05:00
dbroqua db48b28eeb - Updated dbroqua layout for Satan keyboard 2016-12-24 14:53:15 +01:00
dbroqua 033f0b92c4 - Added RGB layer on dbroqua GH60 layout 2016-12-24 14:43:07 +01:00
Jack Humbert 273faa4d9c add different scales for music mode 2016-12-23 20:59:00 -05:00
Ofer Plesser 01038ab54c Added check that makes sure a code is a right modifier before considering it as one 2016-12-23 21:51:11 +02:00
Jack Humbert cae269b08b Christmas RGB light mode 2016-12-23 10:29:19 -05:00
dbroqua 6be061c6d4 - Fixed bug in dbroqua layout for Satan keyboard 2016-12-22 19:08:17 +01:00
dbroqua 46ff5f3b90 - Fixed bad typo in dbroqua layout for gh60
- Removed unused function in dbroqua layout for gh60
2016-12-22 08:26:55 +01:00
Erez Zukerman bdca5c22fe Language edits 2016-12-21 21:54:04 -05:00
Erez Zukerman 9675e1357f Update readme.md 2016-12-21 21:09:20 -05:00
Erez Zukerman a81279158b Update readme.md 2016-12-21 21:08:55 -05:00
Erez Zukerman 4e4f365c87 updates readme 2016-12-21 21:05:58 -05:00
Erez Zukerman 10864def46 New default firmware graphic 2016-12-21 21:03:53 -05:00
dbroqua 5ee136a36f - Renamed dbroqua_hhkb as dbroqua for gh60 layout 2016-12-21 23:12:33 +01:00
dbroqua d6c545f471 - Rewrote dbroqua layout for Satan keyboard and adding RGB light 2016-12-21 23:08:30 +01:00
Jack Humbert 2fa36e38cf initial subatomic keymap (text) 2016-12-21 00:22:32 -05:00
Jack Humbert 438a5d685b limit voices by default, add some drums 2016-12-20 19:38:22 -05:00
dbroqua b7696fb3b0 - Updated gh60 files 2016-12-20 18:43:06 +01:00
Jack Humbert 7571474874 Updated Memory write error, use debug for more info (markdown) 2016-12-20 11:11:45 -05:00
Jack Humbert dbf13e9c98 Created Memory write error, use debug for more info (markdown) 2016-12-20 09:51:13 -05:00
Jack Humbert 53ea854462 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-12-19 21:01:27 -05:00
Jack Humbert dd114e648e planck preonic update 2016-12-19 21:01:23 -05:00
Jack Humbert 29c527f0f0 Merge pull request #964 from climbalima/master
added case stl
2016-12-19 14:06:39 -05:00
climbalima 281aa1dad0 added case stl from se7en9057 2016-12-19 14:01:40 -05:00
Jack Humbert 101416eb82 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-12-19 11:18:22 -05:00
Jack Humbert 06c64bbff3 rgb clean-up, api clean-up 2016-12-19 11:18:18 -05:00
Jack Humbert ea926369b8 Merge pull request #963 from Wilba6582/fix_900
Fixes issue #900 KC_PWR not working
2016-12-19 11:07:39 -05:00
Wilba6582 a305da2bc9 Fixes issue #900 2016-12-20 02:46:50 +11:00
Erez Zukerman 29731588b7 Flips off MIDI and API_SYSEX 2016-12-19 08:27:05 -05:00
Jack Humbert 8e28bf39d8 Merge pull request #958 from pvinis/master
make a sysctl MO button so i can quickly use the arrows
2016-12-18 20:56:20 -05:00
Jack Humbert 96cc053799 Merge pull request #961 from Dbroqua/master
Updated kc60 layout for dbroqua_hhkb
2016-12-18 20:55:52 -05:00
Jack Humbert e05fd4fc66 Merge pull request #962 from stanleylai/master
Added XD60 Support
2016-12-18 20:55:38 -05:00
Stanley Lai 5834d4b262 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-12-18 15:35:59 -08:00
Stanley Lai 91913146db Added XD60 support 2016-12-18 15:35:03 -08:00
Stanley Lai b49d7800ae Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-12-17 13:49:13 -08:00
dbroqua e9f69ff46e - Revert local fail o_O 2016-12-17 22:33:45 +01:00
dbroqua c3469b8d21 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:28:56 +01:00
Damien c9803f78b2 Merge pull request #14 from jackhumbert/master
Merged from jackhumbert/qmk_firmware
2016-12-17 22:28:45 +01:00
dbroqua df50bee5a8 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:25:21 +01:00
dbroqua 46b93f02d5 - Added capslock key 2016-12-17 22:25:08 +01:00
Erez Zukerman 8a65c640ec Adds a troubleshooting layout for resetting the EEPROM 2016-12-16 20:53:42 -05:00
Erez Zukerman df32d5b769 Removes alt/j dual function 2016-12-16 20:13:40 -05:00
Ofer Plesser 40abf8bc9c Moved combo processing lower down in process logic 2016-12-16 22:00:29 +02:00
Ofer Plesser 6a462c818c Merge branch 'master' into feature/combos 2016-12-16 21:52:51 +02:00
Ofer Plesser 6e7cfa83b9 Refactored as well as added support for action keys in combos 2016-12-16 21:50:28 +02:00
Pavlos Vinieratos 34d6f07d2c make a sysctl MO button so i can quickly use the arrows 2016-12-16 09:46:03 +01:00
Jack Humbert b8e13167c8 Merge pull request #957 from priyadi/qwertz-dot-comma
Update my layouts using QWERTZ style dot & comma, move QUOT to SCLN position
2016-12-15 22:52:12 -05:00
Priyadi Iman Nurcahyo c641e46567 QWERTZ style dot & comma, move QUOT to SCLN position 2016-12-16 01:16:55 +07:00
Jack Humbert 61ab3018c7 Merge pull request #956 from sgoodwin/master
Make keymap compile again.
2016-12-15 10:02:31 -05:00
Samuel Ryan Goodwin 826c929c49 Make keymap compile again. 2016-12-15 09:52:57 +01:00
Jack Humbert 36dddd45fb Merge pull request #949 from priyadi/promethium
Promethium firmware update
2016-12-15 00:03:18 -05:00
Jack Humbert 803040d4ee Merge pull request #952 from pvinis/master
update my keymap a bit
2016-12-15 00:03:02 -05:00
Jack Humbert 97f9b05efb Merge pull request #953 from priyadi/ibm_terminal
IBM Terminal M-122 converter support
2016-12-15 00:02:45 -05:00
Jack Humbert 2ba7f38bf4 Merge pull request #955 from askreet/powerDrawPerKeyboard
Allow power consumption to be set per-keyboard.
2016-12-15 00:02:19 -05:00
Kyle Smith 83e613ad23 Allow power consumption to be set per-keyboard. 2016-12-14 23:29:33 -05:00
climbalima 16483409cf better switch spacing in svg 2016-12-14 23:11:04 -05:00
lucwastiaux ebe351a690 enable brackets using the - key on the right, and cleanups 2016-12-15 07:22:31 +08:00
Priyadi Iman Nurcahyo e58304c094 My layout for M-122 terminal keyboard 2016-12-14 22:34:23 +07:00
Priyadi Iman Nurcahyo dc49231391 Update KEYMAP macro to be consistent with the rest of QMK 2016-12-14 22:33:56 +07:00
Priyadi Iman Nurcahyo bd5f323bec IBM Terminal M-122 converter support
Code ported from TMK to QMK.
2016-12-14 16:21:01 +07:00
xyverz 0523657923 Merge remote-tracking branch 'upstream/master' 2016-12-13 18:06:49 -08:00
xyverz 592b90dd22 Changes 2016-12-13 18:05:45 -08:00
Priyadi Iman Nurcahyo e5b165c255 fine tune trackpoint initialization 2016-12-14 07:10:28 +07:00
Priyadi Iman Nurcahyo 32e952bda9 disable remote mode 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo 0b54b32361 Enable Adafruit BLE support 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo 9838ddcead Pretend to be Thinkpad USB Keyboard 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo a747343b61 Enable PS2 remote mode 2016-12-14 06:03:27 +07:00
Jack Humbert 20892bf706 Merge pull request #948 from climbalima/master
svg bug fix and added pilcrow to hand wire
2016-12-12 23:32:14 -05:00
climbalima 5dce74d0ff svg bug fix and added pilcrow to hand wire 2016-12-12 22:36:16 -05:00
Jack Humbert ae95834f5a specialise music variables 2016-12-12 16:06:41 -05:00
Jack Humbert 0edfe55bfe re-enable audio and extrakeys 2016-12-12 15:39:07 -05:00
Jack Humbert 0213acbdbe Merge pull request #946 from climbalima/master
Changed lets split svg to support boston meetup pcb
2016-12-12 00:47:48 -05:00
Jack Humbert 6cd55d89e6 Merge pull request #945 from priyadi/planck_priyadi
Remove unneeded options to reduce firmware size
2016-12-12 00:47:29 -05:00
Jack Humbert f2e5ca25db Merge pull request #944 from priyadi/negmousefix
Allow negative values for mouse movements
2016-12-12 00:46:59 -05:00
Jack Humbert a30591cd53 Merge pull request #943 from lucwastiaux/master
Update dvorak_programmer layout
2016-12-12 00:46:32 -05:00
Jack Humbert 02fa4e3ce2 Merge pull request #942 from priyadi/cpp11
The adafruit BLE C++ code requires -std=c++11
2016-12-12 00:46:12 -05:00
climbalima 7bc1caa21c changed svg after merge 2016-12-10 23:18:46 -05:00
climbalima 73d6018296 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-10 23:15:47 -05:00
climbalima 56515ba503 changed svg to support proto pcb 2016-12-10 23:13:36 -05:00
Ofer Plesser b6bf4e0dce Added support for timing out combos if a key as been pressed for longer than COMBO_TERM 2016-12-10 16:11:59 +02:00
Priyadi Iman Nurcahyo a6db20e518 Remove unneeded options to reduce firmware size 2016-12-10 21:08:22 +07:00
Priyadi Iman Nurcahyo 434b286032 Allow negative values for mouse movements 2016-12-10 19:40:44 +07:00
lucwastiaux 75d7eb9cb5 put home/end on thumb cluster 2016-12-10 13:20:05 +08:00
lucwastiaux a3c8949627 readme updates 2016-12-10 12:52:59 +08:00
lucwastiaux 9240f27ba9 Merge remote-tracking branch 'upstream/master' 2016-12-10 12:49:47 +08:00
lucwastiaux dc4c8875ba use thumb cluster key to toggle brackets layer 2016-12-10 12:37:32 +08:00
Ofer Plesser eac8fa7999 Implemented basic key combination feature 2016-12-10 00:49:11 +02:00
Priyadi Iman Nurcahyo 901f29e3aa The adafruit BLE C++ code requires -std=c++11 2016-12-10 04:08:08 +07:00
Damien 13c4080a1d Merge pull request #13 from jackhumbert/master
Merged from qmk
2016-12-09 19:44:03 +01:00
Pavlos Vinieratos 9a59fee667 tap dance for some layers. one tap sysctl, two taps mouse. 2016-12-09 16:01:11 +01:00
Pavlos Vinieratos 063ade6bb5 add light for some layers 2016-12-09 16:00:46 +01:00
Pavlos Vinieratos be2863e56d separate sysctl and mouse layers 2016-12-09 16:00:10 +01:00
Pavlos Vinieratos d5914a4dfe add alt key 2016-12-09 14:37:22 +01:00
Pavlos Vinieratos 5d241479f5 media keys 2016-12-09 14:37:07 +01:00
xyverz 9216bc7377 Merge remote-tracking branch 'upstream/master' 2016-12-06 17:36:19 -08:00
Daniel 1f52dbcac0 removes double-tab brackets and adds back quot to left cmd. 2016-12-06 14:15:23 -06:00
Jack Humbert 985a091a73 Update readme.md 2016-12-06 09:49:05 -05:00
Jack Humbert b251f2582e Updated Home (markdown) 2016-12-06 09:48:37 -05:00
Jack Humbert b22b1fd5fb copy over readme for final time 2016-12-06 09:44:22 -05:00
Erez Zukerman cd41355069 Merge pull request #936 from jackhumbert/f/shine_default
Official default factory firmware for ErgoDox EZ Shine
2016-12-06 07:57:02 -05:00
Erez Zukerman 82922a4937 A new default layout that supports Shine 2016-12-05 20:35:03 -05:00
Erez Zukerman a05b6a72d9 Adjusts config for better mousekey support 2016-12-05 20:34:24 -05:00
Jack Humbert c87d039839 Merge pull request #921 from Wilba6582/raw_hid
Initial version of Raw HID interface
2016-12-05 00:13:37 -05:00
Jack Humbert 1eec2b7277 Update planck.c 2016-12-04 23:11:22 -05:00
Jack Humbert b66845ca7f Update rules.mk 2016-12-04 23:10:44 -05:00
Jack Humbert 7e4341e437 Update rules.mk 2016-12-04 23:01:07 -05:00
Jack Humbert d15d1d3833 Merge pull request #935 from priyadi/promethium
Promethium handwired keyboard firmware update
2016-12-04 21:07:26 -05:00
Priyadi Iman Nurcahyo c7d11fd001 Remove unnecessary build options 2016-12-05 02:15:38 +07:00
Priyadi Iman Nurcahyo e18a75609d Merge branch 'master' into promethium 2016-12-05 02:01:20 +07:00
Jack Humbert dd2911151b Merge pull request #932 from climbalima/master
Added ponoko svg for lets split
2016-12-04 13:53:25 -05:00
Jack Humbert 082f7ed3d3 Merge pull request #933 from priyadi/ps2_mouse_init_user2
Implemented weak ps2_mouse_init_user()
2016-12-04 13:52:17 -05:00
Priyadi Iman Nurcahyo 236c040859 syntax error fix 2016-12-05 01:38:41 +07:00
Priyadi Iman Nurcahyo 07d29b7d29 syntax error fix 2016-12-05 01:22:40 +07:00
Priyadi Iman Nurcahyo d059624bfb Implemented weak ps2_mouse_init_user()
There are a lot of PS/2 commands, some are vendor/device specific, so we
provide a weak ps2_mouse_init_user() to be implemented in each keyboard
that need it.
2016-12-05 01:21:17 +07:00
Priyadi Iman Nurcahyo 73073f270b Trackpoint initialization 2016-12-05 01:15:04 +07:00
Priyadi Iman Nurcahyo 6ef3060b42 Implemented weak ps2_mouse_init_user()
There are a lot of PS/2 commands, some are vendor/device specific, so we
provide a weak ps2_mouse_init_user() to be implemented in each keyboard
that need it.
2016-12-05 01:07:12 +07:00
Priyadi Iman Nurcahyo fc80aa9974 Merge branch 'master' into promethium 2016-12-04 23:57:47 +07:00
Priyadi Iman Nurcahyo a8e5f61805 fix emoji LED indicators. 2016-12-04 23:55:06 +07:00
Priyadi Iman Nurcahyo 75b18773bd fix RGB LED order 2016-12-04 14:51:27 +07:00
climbalima 0f71c81df8 having trouble with conflicts 2016-12-03 17:37:41 -05:00
climbalima 45b7718fb1 cleaned up personal projects 2016-12-03 17:30:40 -05:00
climbalima 59c54d651b Merge https://github.com/climbalima/qmk_firmware 2016-12-03 17:15:22 -05:00
climbalima ae66f0d702 added plate files for lets split 2016-12-03 17:09:11 -05:00
climbalima 2186e5ae85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-03 17:01:26 -05:00
Jack Humbert f39e1b5dfe cleans-up formatting of readme 2016-12-03 14:36:39 -05:00
Jack Humbert d0c667c790 Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse
Improving ps/2 mouse
2016-12-03 10:13:11 -05:00
Jack Humbert 464f7d9687 Merge pull request #916 from wez/ble_4
Connect the adafruit ble code to the lufa main loop
2016-12-03 10:12:38 -05:00
Ofer Plesser f0768f8be9 Forgot to use define in delay instead of hardcoded number 2016-12-03 13:41:56 +02:00
Ofer Plesser 8e2732edf3 Updated ps2 mouse documentation in readme 2016-12-03 13:11:37 +02:00
Ofer Plesser 9f41544e1d Added back PS2_MOUSE_INIT_DELAY define 2016-12-03 13:09:42 +02:00
ofples d639e08a31 Refactored and improved ps2 mouse feature 2016-12-03 13:05:02 +02:00
Wez Furlong 044fa3ff85 Connect the adafruit ble code to the lufa main loop
There are now 3 potential locations to send HID reports:

1. USB
2. The bluefruit easy key
3. Adafruit BLE

Generally speaking, if USB is connected then we should prefer to
send the reports there; it is generally the best channel for this.

The bluefruit module has no feedback about bluetooth connectivity
so the code must speculatively send reports over both USB and bluetooth.

The BLE module has connectivity feedback.  In general we want to
prefer to send HID reports over USB while connected there, even
if BLE is connected.  Except that it is convenient to force them
over BLE while testing the implementation.

This policy has been extracted out into a where_to_send function
which returns a bitmask of which of the channels should be used.
2016-12-02 22:46:23 -08:00
Jack Humbert 7f88c9506c Merge pull request #930 from cbbrowne/master
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
2016-12-02 15:21:04 -05:00
Jack Humbert 11d263118a Merge pull request #929 from jackhumbert/hf/size-warnings
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size
2016-12-02 15:20:44 -05:00
cbbrowne cee0cf8a6e Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 2016-12-02 14:12:55 -05:00
Jack Humbert 245c9508bd adds warnings to 4 keymaps 2016-12-02 13:32:50 -05:00
Jack Humbert e14b0e8e7e Merge pull request #881 from NoahAndrews/patch-1
Recommend WSL on Windows 10 [Discussion]
2016-12-02 13:22:03 -05:00
Jack Humbert 78f8fe361f Merge pull request #915 from wez/ble_3
Add support for Adafruit BLE modules
2016-12-02 13:14:04 -05:00
Jack Humbert 8f0a8cb7a6 Merge pull request #914 from wez/ble_2
Add arduino-alike GPIO pin control helpers
2016-12-02 13:12:56 -05:00
Jack Humbert ead68248c5 Merge pull request #913 from wez/ble_1
Tidy up atomicity in timer.c and ring_buffer.h
2016-12-02 13:12:19 -05:00
Jack Humbert 4bcec04c01 Merge pull request #924 from cbbrowne/master
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
2016-12-02 13:06:31 -05:00
Erez Zukerman 555e41d9e5 Annotates nordic 2016-12-02 13:03:51 -05:00
Erez Zukerman aa70aa3962 Tweaks Kristian's layout again 2016-12-02 13:03:39 -05:00
Erez Zukerman 5d43a2aecf Kristian's keymap 2016-12-02 12:53:18 -05:00
cbbrowne f6e86cd2c9 I also want page-down/page-up on UPPER layer 2016-12-02 12:35:03 -05:00
cbbrowne 570e784140 I want page-down/page-up - put those on LOWER-Left/Right near bottom corner 2016-12-02 12:31:43 -05:00
cbbrowne 95a160bf92 Improve docs on memory usage 2016-12-01 16:31:51 -05:00
cbbrowne af4c44deef Improve docs on SYSEX bit 2016-12-01 16:31:30 -05:00
cbbrowne b787ed9dc6 More notes on .hex size protection 2016-12-01 16:24:03 -05:00
cbbrowne 1f290f6213 Make my builds smaller 2016-12-01 16:21:15 -05:00
cbbrowne 13eb2f826b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-01 12:54:16 -05:00
Erez Zukerman 66b13a66e9 Better layout 2016-11-30 22:22:57 -05:00
Wilba6582 fe001d46fd Initial version of Raw HID interface 2016-12-01 00:44:54 +11:00
cbbrowne ff1b563e85 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-29 12:20:26 -05:00
Jack Humbert 81ea909467 Merge pull request #919 from jackhumbert/hf/robot_test_layout
Test layout for ErgoDox EZ manufacturing robot
2016-11-29 11:22:31 -05:00
Erez Zukerman 4094544d41 Test layout for ErgoDox EZ manufacturing robot 2016-11-29 09:23:16 -05:00
Erez Zukerman 51ae6da99e Merge pull request #918 from jackhumbert/wu5y7
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
2016-11-29 08:16:04 -05:00
Erez Zukerman 7b219a7f60 Merge pull request #917 from gid0/master
keyboards/ergodox/keymaps/bepo : merge from author
2016-11-29 08:13:49 -05:00
Jack Humbert f946d830f9 guess i didnt pull 2016-11-29 00:11:11 -05:00
Jack Humbert efbc205efd Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-29 00:10:06 -05:00
Jack Humbert d0cefef946 enable rgblight by default for ez 2016-11-29 00:09:56 -05:00
Jack Humbert 06f18e95d4 enable api sysex for ez 2016-11-29 00:06:12 -05:00
Jack Humbert 6e0f994950 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-28 23:51:07 -05:00
cbbrowne 5776f39667 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-28 12:27:42 -05:00
Olivier 5a2501d90f Add the AZERTY compatibility layer. 2016-11-28 16:38:03 +01:00
Olivier f02eccbb29 Change layer names (cosmetic change) and reorder them so that the "shift" layer can be accessed from the "alt" layer when in QWERTY compat mode. 2016-11-28 14:16:42 +01:00
Erez Zukerman 84735836e3 Tweaks position of TOG not to conflict with MO 2016-11-28 08:13:32 -05:00
Olivier d2b6438e39 A little cleanup, add some comments, change others. 2016-11-28 14:10:31 +01:00
Erez Zukerman 9caf866618 Tweaks EZ Makefile 2016-11-28 07:59:01 -05:00
Erez Zukerman 2d0ada0190 Pulls LED config into common config for EZ 2016-11-28 07:55:02 -05:00
Olivier 3f1fca2eb8 Adjust comment. 2016-11-28 11:21:23 +01:00
Olivier e26a80508f Reorganize the numeric keypad layer more like a traditional numeric keypad. 2016-11-28 11:20:00 +01:00
Wez Furlong 712476cd28 Add support for Adafruit BLE modules
This implements some helper functions that allow sending key reports
to an SPI based Bluetooth Low Energy module, such as the Adafruit
Feather 32u4 Bluefruit LE.

There is some plumbing required in lufa.c to enable this; that
is in a follow-on commit.
2016-11-27 23:49:44 -08:00
Wez Furlong 8485bb34d2 Add arduino-alike GPIO pin control helpers
Unlike the arduino functions, these don't take abstract pin numbers,
they take pin labels like `B0`.  Also, rather than taking very
generic parameter names, these take slightly more descriptive
enum values.

These improve the clarity of code that would otherwise be inscrutable
bit manipulation in tersely named port register names.
2016-11-27 22:58:34 -08:00
Wez Furlong be4e75423a Tidy up atomicity in timer.c and ring_buffer.h
Adopt the macros for saving/restoring the interrupt state
that are provided by the avr gcc environment.

Removing intialization of the timer value; this shaves off
a few bytes because globals are default initialized to zero.
2016-11-27 22:58:34 -08:00
Olivier d6d0b7eada Merge https://github.com/jackhumbert/qmk_firmware 2016-11-27 23:23:21 +01:00
Daniel a94eb16bd7 removes the double actions from the metakeys. 2016-11-27 16:12:32 -06:00
dbroqua a849bdc581 - Merged 2016-11-27 11:44:30 +01:00
Jack Humbert 7edac212c8 separated into api files/folder 2016-11-26 15:38:44 -05:00
Jack Humbert 1585fc4b61 Merge pull request #908 from priyadi/promethium
My handwired keyboard firmware
2016-11-26 13:40:42 -05:00
Priyadi Iman Nurcahyo 12c1314b02 update docs 2016-11-27 00:40:31 +07:00
Jack Humbert b5c811bde5 Merge pull request #907 from priyadi/unicode_docs
Update Unicode documentation
2016-11-26 12:38:48 -05:00
Jack Humbert 637170d560 Merge pull request #906 from priyadi/unicode_map_fix_warning
fix strict-prototypes warning
2016-11-26 12:38:10 -05:00
Priyadi Iman Nurcahyo a182cbc031 Update Unicode documentation 2016-11-27 00:34:29 +07:00
Priyadi Iman Nurcahyo 6fee7e178f fix strict-prototypes warning 2016-11-26 23:53:15 +07:00
Priyadi Iman Nurcahyo a1f88bf7bf Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2016-11-26 23:48:52 +07:00
Priyadi Iman Nurcahyo 0f39ab5219 remove ifdef on chip type 2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo 7f3c9c6a39 protocols.mk is already included in latest QMK 2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo b5019bef05 change init delay to 2000ms 2016-11-26 23:48:11 +07:00
Priyadi Iman Nurcahyo 8ee389c9b6 My Promethium keyboard firmware 2016-11-26 23:48:11 +07:00
Jack Humbert 746fd15638 Merge pull request #905 from priyadi/ps2_documentation
A few addition to PS2 documentation.
2016-11-26 10:46:41 -05:00
Jack Humbert fbd4c34c0f Merge pull request #904 from priyadi/ps2_remove_hardcoded_pins
PS2 pins configuration belongs to each keyboards config.h
2016-11-26 10:46:29 -05:00
Priyadi Iman Nurcahyo f2214ce1cb remove define checks. didn't work because of include ordering. 2016-11-26 15:57:48 +07:00
Priyadi Iman Nurcahyo d9d67e7b76 add macro error when a required define is missing 2016-11-26 15:26:02 +07:00
Priyadi Iman Nurcahyo f837406ace A few addition to PS2 documentation. 2016-11-26 14:23:55 +07:00
Priyadi Iman Nurcahyo 17acde94ee Fix unterminated ifndef 2016-11-26 14:02:38 +07:00
Priyadi Iman Nurcahyo de1df63953 PS2 pins configuration belongs to each keyboards config.h
Each keyboard might have different pin configuration. And keeping this
here will trigger redefinition warning on keyboards that have PS2
defines.
2016-11-26 13:55:41 +07:00
Priyadi Iman Nurcahyo 2cf9b93758 remove ifdef on chip type 2016-11-26 13:47:03 +07:00
Priyadi Iman Nurcahyo 6313ec7ef9 protocols.mk is already included in latest QMK 2016-11-26 13:46:05 +07:00
Priyadi Iman Nurcahyo b94e5b2aa6 change init delay to 2000ms 2016-11-26 13:44:50 +07:00
Jack Humbert 7a1eca784f Merge pull request #903 from priyadi/ps2_init_delay
Make PS2 init delay configurable.
2016-11-26 01:34:49 -05:00
Priyadi Iman Nurcahyo b5511b9a8a Merge branch 'master' into promethium 2016-11-26 13:31:17 +07:00
Priyadi Iman Nurcahyo 9a071f051c Make PS2 init delay configurable. Some devices are not fully powered up
after 1s.
2016-11-26 13:24:53 +07:00
Priyadi Iman Nurcahyo 4b0d16cd7b My Promethium keyboard firmware 2016-11-26 13:11:40 +07:00
cbbrowne e3c735e400 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-25 12:06:35 -05:00
Jack Humbert bf23ac96f6 Merge pull request #902 from OferPlesser/feature/ps2-mouse-support
PS/2 mouse support
2016-11-25 11:22:44 -05:00
ofples 97e7486d4c Added documentation for PS/2 mouse in readme 2016-11-25 12:10:44 +02:00
ofples 0c9d66eb59 Removed comment 2016-11-25 09:20:41 +02:00
ofples 03d6e165bb Added missing endif for ifdef __AVR_ATmega32U4__ and removed the unnecessary one at the end of the file 2016-11-25 09:17:40 +02:00
ofples 3be13d1ffb Added protocol.mk to build 2016-11-25 09:15:12 +02:00
Jack Humbert 98d7ad6f49 Merge pull request #899 from Wilba6582/suspend_fix
Fixed NO_SUSPEND_POWER_DOWN handling
2016-11-24 22:20:08 -05:00
Jack Humbert f25596b8dc rgblight fixes 2016-11-23 21:28:12 -05:00
Jack Humbert cefa8468fb travis pls 2016-11-23 20:16:38 -05:00
Jack Humbert 2e23689b8e converted to new format 2016-11-23 18:52:02 -05:00
cbbrowne c05cbaf534 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-23 17:47:16 -05:00
Wilba6582 cf3926a8e1 Fixed NO_SUSPEND_POWER_DOWN handling 2016-11-23 19:45:50 +11:00
Jack Humbert 3d7aaa31e4 converted to 8bit messages 2016-11-23 00:30:06 -05:00
Wilba6582 5893f0fa1f Fixed NO_SUSPEND_POWER_DOWN handling 2016-11-23 16:22:57 +11:00
Jack Humbert 2b3a3ca678 Merge pull request #898 from PureSpider/backlight-fix
Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
2016-11-22 18:41:37 -05:00
Jack Humbert e131de3df6 Merge pull request #896 from h-youhei/jp106
Add japanese keymap
2016-11-22 18:39:54 -05:00
PureSpider d37becc0a9 Set backlight status to on if it's at maximum brightness already and the brightness increase keybind is used
Before it was turned on but the status wasn't set to on, so you had to
push the backlight toggle bind twice to turn it off again
2016-11-22 22:12:57 +01:00
h-youhei 2febf9b9f7 Add japanese keymap 2016-11-22 20:40:12 +09:00
Jack Humbert 450a8fb5b6 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-21 20:17:45 -05:00
Jack Humbert 06a2677b7e fix infinity 2016-11-21 20:17:32 -05:00
Jack Humbert 6390033e86 cleaning up midid 2016-11-21 20:14:16 -05:00
Jack Humbert af119baf71 Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
Ergodox dvorak emacs
2016-11-21 20:00:40 -05:00
Jack Humbert 4bb0eaef26 Merge pull request #893 from Sihui/sh-hhkb-jp
[HHKB JP with Dvorak]
2016-11-21 20:00:13 -05:00
Jack Humbert be265decae Merge pull request #892 from fredizzimo/disable_ergodox_lcd
Always initialize the Infinity Ergodox backlight
2016-11-21 19:59:39 -05:00
Jack Humbert 377583d9f3 Merge pull request #891 from g-sam/galson-keymap
adds galson keymap
2016-11-21 19:59:17 -05:00
Jack Humbert 132c079534 Merge pull request #890 from algernon/f/space-cadet/timeout
Add a timeout to space-cadet shift.
2016-11-21 19:58:55 -05:00
Jack Humbert e0fc186c28 Merge pull request #888 from climbalima/master
Added pro micro to maxipad
2016-11-21 19:58:24 -05:00
Jack Humbert ea472fb018 Merge pull request #887 from profet23/atreus62
atreus62 Keyboard Support
2016-11-21 19:58:00 -05:00
Jack Humbert 664c0a036b cleaning up new code 2016-11-21 19:50:55 -05:00
Jack Humbert 27ebacb15d merging lets_split 2016-11-21 19:18:47 -05:00
Jack Humbert c1037b1dc0 working with helper, qmk_helper_windows@05b0105 2016-11-21 18:05:06 -05:00
Jack Humbert b57cf3c0c8 more structure to the package 2016-11-21 12:54:06 -05:00
Sihui Huang b75538c0bf add del to new cmd 2016-11-20 14:45:51 -08:00
Sihui Huang 390a1bda8b add space to NewCmd layer 2016-11-20 13:32:25 -08:00
Sihui Huang ccc34851f2 add space to NewCmd layer 2016-11-20 13:31:41 -08:00
Didier Chagniot 6f24344be7 typo fix 2016-11-20 20:51:05 +01:00
Sihui Huang 23f63ed1b9 Update README.md 2016-11-20 11:18:08 -08:00
Sihui Huang 34aa59c6d5 Update README.md 2016-11-20 11:13:57 -08:00
Sihui Huang 11f17e3b23 Update README.md 2016-11-20 11:12:48 -08:00
Sihui Huang a8b1c47f0f add sh-hhkb-jp layers 2016-11-20 11:10:26 -08:00
Fred Sundvik c86bbf474e Always initialze the Infinity Ergodox backlight
Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.
2016-11-20 19:28:10 +02:00
Jack Humbert 3b990c08dc Merge pull request #878 from sethbc/add_sethbc_gh60_keymap
add sethbc keymap for gh60 and update macro expansion
2016-11-19 13:05:30 -05:00
xyverz f9cf4f75ae Merge remote-tracking branch 'upstream/master' 2016-11-19 09:31:34 -08:00
Seth Chandler df8724ce08 remove KC expansion from GH60 2016-11-19 12:19:21 -05:00
Gergely Nagy 74a1f00713 Fix the Space Cadet timeout code
Define a default TAPPING_TERM in quantum.c, for keyboards that do not
have it set. Fixes the CI failure.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19 18:19:18 +01:00
Seth Chandler 620e4f74d3 move KC expansion to separate macros 2016-11-19 11:37:12 -05:00
Seth Chandler ac7d202d4f merge upstream/master 2016-11-19 11:20:41 -05:00
samgalson@gmail.com 7f5e71d79f adds galson keymap 2016-11-19 14:21:12 +00:00
Gergely Nagy ffa5b1e7ea Add a timeout to space-cadet shift.
When one holds a Space Cadet shift, to have it act as a shift, so that
mouse behaviour changes, when released without any other key pressed, it
still registers a paren. To remedy this, add a hold timeout: if the key
is held longer than TAPPING_TERM, it will not register the parens.

Fixes #884, with the side-effect of not being able to have parens
trigger the OS-side repeat anymore.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-11-19 11:32:09 +01:00
climbalima 102a830bbd changed readme 2016-11-19 00:49:20 -05:00
climbalima e356de2220 added the pinout for pro micro into maxipad 2016-11-19 00:44:52 -05:00
climbalima 01736a502e just saving 2016-11-18 23:40:34 -05:00
Jack Humbert a06115df19 don't always detect a matrix change (fixes debounce) 2016-11-18 23:20:07 -05:00
Jack Humbert ab6557c1a0 wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7 2016-11-18 22:22:29 -05:00
Jack Humbert 161bd5596b midi back and forth 2016-11-18 22:22:24 -05:00
Daniel abee809298 moves brackets to top row. 2016-11-18 11:11:08 -06:00
Erez Zukerman 285c5a91f2 Groundwork for dedicated color keycodes 2016-11-17 20:56:36 -05:00
Erez Zukerman 9bbc9a7ce0 Initial Erez Experimental keymap tweaks 2016-11-17 19:47:08 -05:00
Jack Humbert 3774a7fcda rgb light through midi 2016-11-17 17:42:14 -05:00
xyverz b493f6a4ed Merge remote-tracking branch 'upstream/master' 2016-11-16 22:36:36 -08:00
Benjamin Grabkowitz 6c5fce5c1a Adding readme placeholder 2016-11-16 23:59:42 -05:00
Benjamin Grabkowitz 00d88b74ad Adding Support for atreus62 keyboard. https://github.com/profet23/atreus62 2016-11-16 23:52:36 -05:00
Jack Humbert c38b3e3be9 Merge pull request #883 from climbalima/master
added rev2 lets split after merging with qmk
2016-11-16 21:17:51 -05:00
climbalima b085a34506 fixed readme conflicts 2016-11-16 20:44:49 -05:00
climbalima 21b6b4e6c4 should have fixed conflixed 2016-11-16 19:49:38 -05:00
climbalima 668c739702 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-16 19:28:30 -05:00
climbalima 5cac51a773 Merge https://github.com/climbalima/qmk_firmware 2016-11-16 19:26:38 -05:00
climbalima 1dd6ceb45d Updated my repo to current qmk 2016-11-16 19:18:54 -05:00
Jack Humbert 72e78a017f Merge pull request #882 from seebs/master
dvorak/plover keyboard layout
2016-11-16 17:15:58 -05:00
cbbrowne 5b88e7ab9a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-16 17:05:11 -05:00
Seebs 4da698fda3 dvorak/plover keyboard layout
Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?

Signed-off-by: seebs <seebs@seebs.net>
2016-11-16 15:44:26 -06:00
Jack Humbert 9f1b27c5ba Merge pull request #880 from psyill/master
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-16 14:54:18 -05:00
Jack Humbert e025a94bc2 Merge pull request #879 from sethbc/update_sethbc_ergodox_keymap
update sethbc ergodox keymap
2016-11-16 14:53:52 -05:00
Jack Humbert d85f6deb9b Merge pull request #877 from sethbc/update_sethbc_satan_keymap
update sethbc keymap
2016-11-16 14:51:18 -05:00
Jack Humbert 6dde65c2a9 Merge pull request #876 from Dbroqua/master
Updated kc60/dbroqua layout and added satan/dbroqua_hhkb
2016-11-16 14:49:55 -05:00
Jack Humbert 17e1a4f825 Merge pull request #866 from fredizzimo/infinity60_clockfixes
Increase the infinity60 system tick frequency
2016-11-16 14:42:53 -05:00
Jack Humbert 7541122cad Merge pull request #860 from IBNobody/master
Improved Quantum Matrix
2016-11-16 14:41:10 -05:00
Jack Humbert 530dd3377e animations, midi, etc 2016-11-15 13:18:10 -05:00
climbalima bce6e52391 fixed conflict 2016-11-14 23:08:10 -05:00
climbalima dd22c787b8 fixed extra paste 2016-11-14 23:05:37 -05:00
Noah Andrews 702405f039 Recommend WSL on Windows 10
At this point, I consider the batch scripts @IBNobody and I worked on to mostly be a failure. They've proven to be unreliable, too dependent on the environment they're being run in, and I've seen far too many examples of people having frustrating issues with them that I haven't been able to help them with. They can also produce misleading and confusing error messages. I've been pointing people to use the WSL for a while now. Eventually, I think we should make a proper replacement for the batch scripts, possibly with an environment in msys2. For now, the WSL method in Windows 10 is far more reliable, and is easy to set up. 

I also cleaned up some things in the WSL instructions themselves.
2016-11-14 10:03:18 -05:00
Jack Humbert e9f7487518 mostly working 2016-11-13 23:02:38 -05:00
Hans Ellegård 162f603b1c Added keymap "videck", an ErgoDox keymap for Vi(m) users. 2016-11-13 22:44:41 +01:00
Seth Chandler aa76425395 oops, fixed inverted if statement 2016-11-13 01:04:10 -05:00
Seth Chandler 34bf8558cd update sethbc ergodox keymap 2016-11-13 00:56:46 -05:00
Seth Chandler b2bc215934 add sethbc keymap for gh60 and update macro expansion in connection with same 2016-11-13 00:42:07 -05:00
Seth Chandler 28249498bc update sethbc keymap 2016-11-12 23:56:57 -05:00
Jack Humbert 33e62c080c merging 2016-11-12 20:54:37 -05:00
Damien 0a99cf300c Merge pull request #12 from jackhumbert/master
Merged from qmk
2016-11-12 19:33:07 +01:00
dbroqua 3bc51065a4 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-11-12 19:27:03 +01:00
dbroqua 19ebf6161f - Added dbroqua_hhkb layout for Satan PCB 2016-11-12 19:23:38 +01:00
cbbrowne c609edc362 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-11-11 10:39:11 -05:00
cbbrowne 992ec01b5d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-11 10:39:07 -05:00
Chris Browne de3117f483 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-10 23:32:29 -05:00
climbalima ec0db2933c Merge branch 'master' of https://github.com/climbalima/qmk_firmware
second try
2016-11-10 20:06:54 -05:00
climbalima b5cecb4cc9 Added both revisions into one folder 2016-11-10 20:03:24 -05:00
Jack Humbert 631b8999a7 Merge pull request #868 from potz/master
Add brazilian ABNT2 keymap
2016-11-10 18:45:09 -05:00
climbalima 79f82d3d80 returned to o 2016-11-10 18:43:31 -05:00
climbalima 6e27f6fbde Changes to be committed:
new file:   keyboards/lets_splitv2/Makefile
	new file:   keyboards/lets_splitv2/config.h
	new file:   keyboards/lets_splitv2/i2c.c
	new file:   keyboards/lets_splitv2/i2c.h
	new file:   keyboards/lets_splitv2/imgs/split-keyboard-i2c-schematic.png
	new file:   keyboards/lets_splitv2/imgs/split-keyboard-serial-schematic.png
	new file:   keyboards/lets_splitv2/keymaps/default/keymap.c
	new file:   keyboards/lets_splitv2/lets_split.c
	new file:   keyboards/lets_splitv2/lets_split.h
	new file:   keyboards/lets_splitv2/matrix.c
	new file:   keyboards/lets_splitv2/pro_micro.h
	new file:   keyboards/lets_splitv2/readme.md
	new file:   keyboards/lets_splitv2/serial.c
	new file:   keyboards/lets_splitv2/serial.h
	new file:   keyboards/lets_splitv2/split_util.c
	new file:   keyboards/lets_splitv2/split_util.h
	new file:   keyboards/maxipad/Makefile
	new file:   keyboards/maxipad/config.h
	new file:   keyboards/maxipad/keymaps/default/Makefile
	new file:   keyboards/maxipad/keymaps/default/config.h
	new file:   keyboards/maxipad/keymaps/default/keymap.c
	new file:   keyboards/maxipad/keymaps/default/readme.md
	new file:   keyboards/maxipad/maxipad.c
	new file:   keyboards/maxipad/maxipad.h
	new file:   keyboards/maxipad/readme.md
2016-11-10 18:19:13 -05:00
Zach Nielsen 80c5ada339 Missed removing a function 2016-11-10 13:47:07 -08:00
nielsenz f388bb5bda Removed some common functions from my keymap 2016-11-10 13:39:46 -08:00
Zach Nielsen 4c0aa02b2e Missed some stuff. Added a song (stole it from reddit). 2016-11-10 12:59:55 -08:00
Zach Nielsen c07ef5c6ab Adding my (zach) keymaps for planck and preonic 2016-11-10 12:26:56 -08:00
Zach Nielsen 59bef40aab Keep unicode's input_mode through a power cycle 2016-11-10 12:14:54 -08:00
Erez Zukerman f73a378f0f Merge pull request #870 from NoahAndrews/patch-1
Add proper shortcode for KC_DELETE to keycode.txt
2016-11-10 09:43:38 -05:00
IBNobody 1803dbc6d5 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-11-08 21:11:24 -06:00
Noah Andrews 64218f0f70 Add proper shortcode for KC_DELETE to keycode.txt 2016-11-08 22:05:24 -05:00
Potiguar Faga 7aa31ad338 Add brazilian ABNT2 keymap 2016-11-08 13:32:04 -02:00
cbbrowne 83b67b0cf3 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-11-07 12:49:05 -05:00
cbbrowne cdad01b57a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-07 12:48:34 -05:00
Jack Humbert a9e0fd410c Merge pull request #867 from fredizzimo/variable_trace
Variable trace
2016-11-07 10:55:05 -05:00
Jack Humbert 309d93184e Merge pull request #852 from J3RN/remove-z-slash-controls
Removed the control action when holding z or /
2016-11-07 10:47:32 -05:00
Fred Sundvik 0ba3e523a7 Add documentation for the variable tracing 2016-11-06 22:44:43 +02:00
Fred Sundvik a377017c95 Add possibility to control variable trace from make 2016-11-06 22:11:24 +02:00
Fred Sundvik f519b94be7 Add variable trace
For debugging changes to variables, either normally or as a result
of a memory corruption.
2016-11-06 21:58:34 +02:00
Jonathan Arnett 1d766c596e Removed the control action when holding z or / 2016-11-06 13:48:20 -05:00
Chris Browne a4255664ce Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-11-06 07:52:44 -05:00
Chris Browne 4f1cb9fd5e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-06 07:52:21 -05:00
Fred Sundvik c06e2486ab Increase the infinity60 system tick frequency 2016-11-05 22:45:21 +02:00
lucwastiaux b8e204322a added more shortcut keys 2016-11-05 12:07:33 +08:00
lucwastiaux 78a1dc84dd updated readme 2016-11-05 11:58:23 +08:00
lucwastiaux ff8b4a1d89 removed brackets anywhere but in brackets layer, added mouse layer back in, replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer 2016-11-05 11:56:59 +08:00
Damien 7697f23538 Merge pull request #11 from jackhumbert/master
Merged from jackhumbert
2016-11-03 21:50:31 +01:00
cbbrowne 930ae4b7ff Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-11-01 13:09:27 -04:00
IBNobody 78976d8f7a Adding SKIP_GIT to speed up compiles. 2016-11-01 11:52:58 -05:00
IBNobody 9e6c57af2a Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-11-01 10:56:56 -05:00
Erez Zukerman d5270af111 Implements dedicated text zoom keys 2016-11-01 10:03:58 -04:00
Erez Zukerman 7a9be2562d Merge pull request #851 from J3RN/momentary
Switched to momentary
2016-10-31 21:41:19 -04:00
Erez Zukerman a6401076d5 Merge pull request #843 from lucwastiaux/master
Adding Ergodox Dvorak Programmer layout
2016-10-31 21:40:58 -04:00
Erez Zukerman bd40844e4e Merge pull request #836 from 20lives/master
added new layout
2016-10-31 21:39:40 -04:00
xyverz 8dd422ffe1 Updates to keymap file. 2016-10-31 18:27:05 -07:00
xyverz 063328344a Removed files that weren't supposed to be uploaded from gh60 keymap folder 2016-10-31 18:04:01 -07:00
xyverz 61eb35191a Adding more keymaps. 2016-10-31 17:58:22 -07:00
cbbrowne b90366285f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-31 11:45:54 -04:00
Jack Humbert 964b8574ee Merge pull request #839 from priyadi/planck-priyadi-modification
Update priyadi's keymap for Planck; added readme
2016-10-30 12:26:20 -04:00
Jack Humbert d75de44551 Merge pull request #854 from slebedev/master
Add link to article about Unicode Hex Input in readme
2016-10-30 12:25:52 -04:00
Jack Humbert b0317abe42 Merge pull request #857 from fredizzimo/fix_makefile_too_long_bash
Run each sumbmake in a separate shell
2016-10-30 12:25:22 -04:00
Fred Sundvik d956dd1248 Run each sumbmake in a separate shell
This will fix the situation where the commandline gets too long when
there are many keyboards and keymaps.
2016-10-30 17:03:01 +02:00
IBNobody f403028974 added fixed debounce code 2016-10-29 16:12:58 -05:00
Sergey Lebedev 552f469dfc Add link to article about Unicode Hex Input in readme
For me it wasn't clear what is `Unicode Hex Input`, that article
  clarifies it (at least for me).
2016-10-29 22:08:11 +03:00
IBNobody e40c33f754 Merge branch 'master' of https://github.com/IBNobody/qmk_firmware 2016-10-29 11:13:15 -05:00
IBNobody 32f88c0717 Made scanning more efficient 2016-10-29 10:39:03 -05:00
IBNobody 4c6960835c Refactoring Matrix scanning 2016-10-28 16:24:20 -05:00
IBNobody 508eddf8ba Fixing Debounce - WIP 2016-10-28 14:21:38 -05:00
IBNobody a0fdb6b81a Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-10-28 09:28:47 -05:00
dbroqua 2082c6f110 - Fixed typo in gh60/dbroqua layout 2016-10-26 22:24:26 +02:00
cbbrowne 2a2920d92c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-26 10:55:41 -04:00
lucwastiaux 055247f35d re-introduce brackets layer 2016-10-26 21:00:58 +08:00
Damien 41d7460f53 Merge pull request #10 from jackhumbert/master
Merge from jackhumbert/qmk_firmware
2016-10-26 07:43:58 +02:00
Jack Humbert f44ead1462 Merge pull request #827 from Dbroqua/master
Updated dbroqua layout for HHKB keyboard and added new layout for KC60
2016-10-26 01:19:27 -04:00
Jack Humbert 67cf367a45 Merge pull request #849 from hot-leaf-juice/master
tiny keymap change
2016-10-26 00:52:13 -04:00
Jack Humbert 003cb9124c Merge pull request #848 from andrebeat/fix-dockerfile
Add subproject env var to dockerfile
2016-10-26 00:51:51 -04:00
Jack Humbert cbb7e95284 Merge pull request #847 from yinshanyang/master
added notes on using Arduino Pro Micro 3.3V with Let’s Split
2016-10-26 00:51:39 -04:00
Jack Humbert 8d60354d5a Merge pull request #844 from priyadi/unicode_wincompose_input
Unicode WinCompose input method
2016-10-26 00:48:44 -04:00
Jack Humbert 108d0e89a6 Merge pull request #842 from priyadi/unicode_map_length
UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations
2016-10-26 00:48:00 -04:00
Jack Humbert 3b34cf7e6c Merge pull request #841 from jacwib/master
Update jacwib keymap to version 1.2
2016-10-26 00:47:30 -04:00
Jack Humbert f2dd125a1e Merge pull request #831 from kejadlen/master
add alphadox layouts to atreus and ergodox
2016-10-26 00:46:56 -04:00
Jack Humbert c66c86cace Merge pull request #834 from kazufukurou/master
add programmer dvorak keymap
2016-10-26 00:45:59 -04:00
Alpha Chen 427ea7a889 [alphadox] remove tmk reset code 2016-10-25 09:00:45 -07:00
Alpha Chen e2916f8ab1 [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt 2016-10-25 09:00:45 -07:00
Alpha Chen 22cb73fad3 add alphadox layouts to atreus and ergodox 2016-10-25 09:00:45 -07:00
Callum Oakley 6bbb0b030e replace lock key with general power key 2016-10-25 11:51:32 +01:00
Callum Oakley c0a9fa8eea switched to standard volume keys 2016-10-25 11:37:09 +01:00
Andre Silva 1557d16562 add subproject env var to dockerfile 2016-10-24 20:29:34 +01:00
Joshua T 7d698cc494 Added comments with ASCII art keymaps 2016-10-24 10:30:00 -05:00
Yin Shanyang 7550abbb7f added notes on using Arduino Pro Micro 3.3V with Let’s Split 2016-10-24 15:36:24 +08:00
IBNobody ef8f618027 Fixing Line Terminations 2016-10-23 23:03:26 -05:00
IBNobody 17170ba76d Fixed some large keyboard bugs
Fixed some bugs relating to keyboards with more than 16 columns. Also
added the ability to mask off keyboard matrix bits.
2016-10-23 23:00:43 -05:00
IBNobody 05ceef2350 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-10-23 20:45:20 -05:00
Lior Haim 0d26320cf3 merge upstream 2016-10-23 20:22:28 +03:00
Chris Browne 6a0313ac26 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-23 10:28:47 -04:00
Chris Browne ed8efcf86d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-23 10:28:02 -04:00
jacwib b7611d5037 1.2 update 2016-10-23 15:57:36 +02:00
Priyadi Iman Nurcahyo c6f6172fd5 Use WinCompose unicode input method instead of HexNumpad 2016-10-23 19:35:06 +07:00
Priyadi Iman Nurcahyo 4a666c2010 Unicode WinCompose input method 2016-10-23 19:15:33 +07:00
lucwastiaux 919caaccb7 adding readme 2016-10-23 11:44:16 +08:00
Priyadi Iman Nurcahyo e7d5dc89f2 UNICODE_MAP: remove 5 char limit; ignore leading zeroes; handle OS limitations 2016-10-23 05:36:26 +07:00
jacwib dbcbd8ee3c Update readme to reflect 1.1 changes. 2016-10-22 21:32:39 +02:00
jacwib 83b2149885 Update keymap to reflect 1.1 changes. 2016-10-22 21:29:47 +02:00
jacwib a625c2201a Update readme to reflect changes 2016-10-22 21:29:11 +02:00
lucwastiaux 14ac397d5d add up/down keys on thumb clusters 2016-10-23 00:47:58 +08:00
lucwastiaux 64ac74cab6 remove brackets layer, replace a few shortcuts on thumb cluster 2016-10-23 00:44:34 +08:00
lucwastiaux 97e3106848 type brackets in symbol layer, using bottom row 2016-10-23 00:11:16 +08:00
lucwastiaux e0c9ec54dd add tap-dance support, make right shift double-tap=caplock 2016-10-22 22:39:24 +08:00
lucwastiaux bc8092245c change include files 2016-10-22 22:29:05 +08:00
lucwastiaux 53a2bf9215 added dvorak programmer layout 2016-10-22 22:22:34 +08:00
Priyadi Iman Nurcahyo 5fa44c594f Update priyadi's keymap for Planck; added readme 2016-10-22 18:47:51 +07:00
twentylives 8727976a1a fixed copy-cut-paste buttons 2016-10-21 12:13:44 +03:00
cbbrowne 976136a0b2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-20 12:03:15 -04:00
Erez Zukerman 2e2b9962cd Merge pull request #833 from h-parks/master
Win10 Writer's Block - An ErgoDox Keymap
2016-10-20 08:55:16 -04:00
Erez Zukerman c3dee2bb66 Merge pull request #832 from PhoenixRion/master
Phoenix Layout
2016-10-20 08:53:47 -04:00
twentylives 4ebbb3c297 Merge branch 'master' of https://github.com/20lives/qmk_firmware 2016-10-20 11:07:53 +03:00
twentylives 7090c99adf fixed base layer = key 2016-10-20 11:07:14 +03:00
Artyom Mironov 6e003b1e3f add programmer dvorak keymap 2016-10-19 23:45:55 +03:00
20lives 464af700eb fix readme 2016-10-19 20:26:58 +03:00
twentylives 65c1127b49 update pics and readme 2016-10-19 20:23:10 +03:00
h-parks f2197611c7 Win10 Writer's Block - An ErgoDox Keymap
fix for compiling on infinity:

replaced `_delay_ms()' with `wait_ms()'
included "wait.h"
2016-10-19 09:33:37 -05:00
h-parks 1688c014cc Win10 Writer's Block - An ErgoDox Keymap
This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
2016-10-18 21:58:33 -05:00
Xyverz 91b1aa0994 Add files via upload
Minor layout changes
2016-10-18 16:34:42 -07:00
Xyverz 7920063035 Add files via upload
Minor layout changes.
2016-10-18 16:34:00 -07:00
Xyverz f41d540e81 Add files via upload
Minor changes to my Dvorak keymap. Updated the readme.md to reflect these changes.
2016-10-18 16:28:44 -07:00
cbbrowne 729b4cdef3 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-18 18:11:54 -04:00
IBNobody 826417bfc0 Updating Vision keyboard files 2016-10-18 16:45:45 -05:00
Ryan Ascheman fad20756e3 update header file 2016-10-18 13:58:59 -07:00
Ryan Ascheman cabfd78309 didn't read PR comment close enough, correcting folder 2016-10-18 12:48:07 -07:00
Ryan Ascheman 60326eded2 moving keymap to new location 2016-10-18 12:44:30 -07:00
Ryan Ascheman 55b8b8477c Merge remote-tracking branch 'upstream/master'
* upstream/master: (1239 commits)
  Update ez.c
  removes planck/rev3 temporarily
  Move hand_swap_config to ez.c, removes error for infinity
  Update Makefile
  ergodox: Update algernon's keymap to v1.9
  Added VS Code dir to .gitignore
  Support the Pegasus Hoof controller.
  [Jack & Erez] Simplifies and documents TO
  add readme
  use wait_ms instead of _delay_ms
  add messenger
  init keymap
  Add example keymap
  Adding whiskey_tango_foxtrot_capslock ergodox keymap
  Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table
  CIE 1931 dim curve
  Apply the dim curve to the RGB output
  Update the Cluecard readme files
  Tune snake and knight intervals for Cluecard
  Tunable RGB light intervals
  ...
2016-10-18 12:42:02 -07:00
20lives 48eb5112b5 Update readme.md 2016-10-18 22:35:05 +03:00
20lives 31193b9cff Update readme.md 2016-10-18 22:33:42 +03:00
twentylives 28dfaa20f5 adding dvorak hebrew layout 2016-10-18 22:27:36 +03:00
Jack Humbert 04df74f636 Merge pull request #829 from r2d2rogers/master
Move hand_swap_config to ez.c, removes error for infinity
2016-10-18 15:19:00 -04:00
Jack Humbert d8417f9f6e Merge pull request #824 from dsvensson/pegasushoof
Support the Pegasus Hoof controller.
2016-10-18 15:18:19 -04:00
Rob Rogers 75ea142d01 Update ez.c 2016-10-18 13:59:19 -05:00
Jack Humbert b466628c0b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-18 13:58:20 -04:00
Jack Humbert 18b5c3dccf removes planck/rev3 temporarily 2016-10-18 13:57:56 -04:00
Erez Zukerman 0d8844dcb8 Merge pull request #826 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.9
2016-10-17 18:12:31 -04:00
cbbrowne 778dbe46d2 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-17 10:54:09 -04:00
cbbrowne 0469bd8ffa Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-17 10:53:39 -04:00
Rob Rogers 1dcee07eab Move hand_swap_config to ez.c, removes error for infinity 2016-10-17 08:04:29 -05:00
Chris Browne 62e6789ab2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-16 20:59:52 -04:00
Jack Humbert a889b899e2 working with power limit 2016-10-16 16:03:56 -04:00
Jack Humbert 5f91fb4136 working with power limit 2016-10-16 16:03:33 -04:00
Jack Humbert 80ac73a21c Update Makefile 2016-10-16 15:59:50 -04:00
Jack Humbert 52d7f7d277 Merge pull request #815 from priyadi/unicode_map
Allow unicode up to 0xFFFFF using separate mapping table
2016-10-16 15:49:45 -04:00
Jack Humbert 5e2b843538 Merge pull request #825 from replicaJunction/pr-vscode
Added VS Code dir to .gitignore
2016-10-16 15:49:33 -04:00
dbroqua 911b52a494 - Added HHKB like layout for KC60 pcb 2016-10-16 15:37:47 +02:00
Gergely Nagy f9d8cf35f6 ergodox: Update algernon's keymap to v1.9
Overall changes
===============

* `F12` was replaced by an `Fx` key, that activate the **Media** layer
  as a one-shot layer, and also `Alt` as a one-shot modifier.

Base layer changes
==================

* The `Media Stop` key is now a tap-dance key, and resets the device for
  programming on the fourth tap.

Miscellaneous
=============

* `π` can now be entered with UCIS.
* `🐁` can now be entered with UCIS.

Tools
=====

* The `tools/layer-notify` tool was removed, it was an example, which I
  don't use.

`tools/hid-commands`
--------------------

* Now looks at the `DISABLE_APPSEL_START` environment value, and does
  not display an AppSel notification if it is non-empty.
* Will attempt to re-program the keyboard when receiving a `reflash`
  command.
* No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes
  for any Emacs.
* The `APPSEL_MUSIC` command now includes Kodi in the list too, as the
  last choice.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-10-16 08:01:50 +02:00
Joshua T 2a918718f1 Added VS Code dir to .gitignore 2016-10-15 18:46:39 -05:00
Joshua T d9dede476f Added VS Code dir to .gitignore 2016-10-15 18:40:26 -05:00
Joshua T 896c1e6f1e Added a bit more detail to header 2016-10-15 18:19:09 -05:00
Joshua T a2adff94bb Reversed tilde and grave 2016-10-15 18:05:22 -05:00
Joshua T 825563f34d Moved Extend tab and ^tab 2016-10-15 17:56:09 -05:00
Joshua T 1455a44a44 Added = to match Atreus 2016-10-15 17:41:36 -05:00
Joshua T 80fe2ea676 Switched Tab and Ctrl back 2016-10-15 17:23:25 -05:00
Joshua T 0714981288 Fixed typo 2016-10-15 17:19:07 -05:00
Joshua T c67f6ee872 Added Menu key (the rclick menu) 2016-10-15 17:03:27 -05:00
Joshua T d9db5395b3 Updated layout to 1.2 - lots of changes
Rewrote QWERTY to make it a first-class citizen instead of just a glorified game layer.

Added a lot of keys to Extend layer to bring it in line with my Atreus.

Plenty of other changes too.
2016-10-15 16:51:40 -05:00
Joshua T a9c8f2f5b8 Reduced TAPPING_TERM to 150
Also removed duplicate definition of PREVENT_STUCK_MODIFIERS
2016-10-15 16:44:26 -05:00
Joshua T 8ec7341fb2 Added Ctrl+` (ConEmu shortcut) 2016-10-15 15:28:16 -05:00
Joshua T 2e6a1a53d7 Merge remote-tracking branch 'upstream/master' 2016-10-15 15:14:10 -05:00
dbroqua 28ca1f5345 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-10-14 21:53:37 +02:00
Damien 2098b363ea Merge pull request #9 from jackhumbert/master
Merge from jackhumbert
2016-10-13 21:51:35 +02:00
cbbrowne f74c560be8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-13 13:05:33 -04:00
Daniel Svensson b73adf0dea Support the Pegasus Hoof controller.
Replacement controller for Filco Majestouch TKL keyboards.

matrix.c ported from:
https://github.com/BathroomEpiphanies/epiphanies_tmk_keyboard

More details:
http://bathroomepiphanies.com/controllers/
2016-10-13 12:50:54 +02:00
Erez Zukerman 0a9ad8f335 Merge pull request #818 from pvinis/pvinis-keymap
pvinis keymap
2016-10-13 06:41:51 -04:00
Erez Zukerman 16e362cfc4 Merge pull request #822 from jackhumbert/hotfix/simplify_to
[Jack & Erez] Simplifies and documents TO
2016-10-13 06:41:07 -04:00
Erez Zukerman b7533e0abf Documents TO. 2016-10-12 22:19:35 -04:00
Jack & Erez e27a754b70 [Jack & Erez] Simplifies and documents TO 2016-10-12 22:18:27 -04:00
cbbrowne 99ca59baf8 I keep mis-using UPPER|LOWER/SLASH, and getting RESET.
With RESET shifted to the UPPER+LOWER layer, it is now time to change that key to Alt-Slash, which, in Emacs, does automatic word completion
2016-10-12 12:03:54 -04:00
cbbrowne dbb8cbac18 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-12 11:57:46 -04:00
Pavlos Vinieratos 0853227ede add readme 2016-10-11 11:25:54 +02:00
Pavlos Vinieratos 538cdda78e use wait_ms instead of _delay_ms 2016-10-11 10:34:47 +02:00
Pavlos Vinieratos bcc0fa5c81 add messenger 2016-10-11 10:34:47 +02:00
Pavlos Vinieratos 2855de5f0f init keymap 2016-10-11 10:34:47 +02:00
Erez Zukerman 698d02122b Merge pull request #803 from coderkun/coderkun_neo2
Merge Unicode fixes for keymap “coderkun_neo2”
2016-10-10 19:59:28 -04:00
Erez Zukerman be60c057dc Merge pull request #809 from nathanejohnson/osx_whiskey_tango_foxtrot_capslock
Adding whiskey_tango_foxtrot_capslock ergodox keymap
2016-10-10 19:58:59 -04:00
Chris Browne 92ca95641f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-10-10 17:19:47 -04:00
Chris Browne 4b682ea63e Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-10-10 17:18:15 -04:00
Jack Humbert aa8aa6af75 Merge pull request #808 from npoirey/master
Altgr quick combination and updated readme
2016-10-10 00:22:12 -04:00
Jack Humbert 49fe93fbb3 Merge pull request #811 from Vifon/planck_keymap_vifon
New Planck keymap: vifon
2016-10-10 00:21:01 -04:00
Jack Humbert 0f119e09a5 Merge pull request #810 from Vifon/dynamic_macros
Reduce the default dynamic macro buffer
2016-10-10 00:20:46 -04:00
Jack Humbert 03b6fcdaf0 Merge pull request #814 from fredizzimo/rgb_tuning
Improve the RGB led effects
2016-10-10 00:20:24 -04:00
Jack Humbert 4859be084d Merge pull request #813 from fredizzimo/add_cluecard_rgb_effects
Add a Cluecard keymap for testing the RGB effects
2016-10-10 00:19:34 -04:00
Priyadi Iman Nurcahyo 932705706e Add example keymap 2016-10-10 01:35:41 +07:00
Nathan Johnson e95c1e3f2c Adding whiskey_tango_foxtrot_capslock ergodox keymap 2016-10-09 12:58:31 -05:00
Priyadi Iman Nurcahyo 5b2e455d3b Unicode map framework. Allow unicode up to 0xFFFFF using separate
mapping table
2016-10-10 00:56:09 +07:00
Fred Sundvik ffae9d84c5 CIE 1931 dim curve 2016-10-09 20:07:23 +03:00
Fred Sundvik 92a3a96849 Apply the dim curve to the RGB output
Just like it's supposed to be used. It now looks much better.
2016-10-09 20:04:33 +03:00
Fred Sundvik db4dce7312 Update the Cluecard readme files 2016-10-09 19:37:47 +03:00
Fred Sundvik 02c9a99215 Tune snake and knight intervals for Cluecard 2016-10-09 19:27:11 +03:00
Fred Sundvik 9b0e21f87f Tunable RGB light intervals 2016-10-09 19:26:16 +03:00
Fred Sundvik 0ae07ae64d Tune the snake and knight effect parameters for Cluecard 2016-10-09 19:11:52 +03:00
Jonathan Arnett f284bc6af9 Switched to momentary
Also updated the style of these lines slightly to match the style of the
default keymap
2016-10-09 11:40:08 -04:00
Wojciech Siewierski 26759e126e New Planck keymap: vifon 2016-10-09 13:34:17 +02:00
Wojciech Siewierski 70f32842e5 Reduce the default dynamic macro buffer
There have been reports of it leaving not enough free memory preventing
the keyboard from working properly.
2016-10-09 12:52:39 +02:00
Fred Sundvik 2d7b549e21 Add keymap with audio disabled but RGB effects enabled 2016-10-09 01:38:55 +03:00
Damien 811257a0c8 Merge pull request #8 from jackhumbert/master
Merge from jackhumbert
2016-10-07 22:27:36 +02:00
npoirey 628a48c788 Updated Readme to help windows users use docker for build 2016-10-07 17:21:38 +02:00
npoirey 1048a588c7 Add Altgr combination for non US layouts 2016-10-07 17:21:38 +02:00
IBNobody 973f526bb4 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-10-06 20:17:16 -05:00
Jack Humbert a9df99b81c Merge pull request #807 from hot-leaf-juice/master
minor update to callum planck keymap
2016-10-06 19:44:53 -04:00
Jack Humbert 91d2b64850 Merge pull request #805 from SethSenpai/gamenum
Gamenum
2016-10-06 19:44:39 -04:00
Callum Oakley 387b94a6cf updated readme 2016-10-06 07:24:26 +01:00
Callum Oakley 059990e05a added lock screen button and fixed error in diagram 2016-10-06 07:23:12 +01:00
Jack Humbert b8679bbe04 RGBW lights 2016-10-05 20:41:38 -04:00
SethSenpai b7442999df updated the wrong makefile like a dummy 2016-10-04 07:58:28 +00:00
SethSenpai aac3ba61a5 added rules.mk 2016-10-04 07:52:13 +00:00
IBNobody 8ed1208b42 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-10-03 18:46:10 -05:00
Erez Zukerman d465e3f0c3 Merge pull request #804 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.8
2016-10-03 17:49:23 -04:00
dbroqua 0320fbf6f4 - Updated dbroqua layout for HHKB keyboard (added some missing fn keys) 2016-10-03 23:30:31 +02:00
SethSenpai 0e2786e396 updated readme with images 2016-10-03 18:27:52 +00:00
Gergely Nagy aa9c6e9f59 ergodox: Update algernon's keymap to v1.8
ADORE
-----

* Major rearrangements were made, to reduce pinky use, and to balance
  out the hand usage.

Tools
-----

* The `hid-commands` tool will now display a notification when
  the **AppSel** layer is triggered.
* The `log-to-heatmap.py` tool now treats the innermost keys on the
  bottom row as thumb keys, as far as statistics are concerned.

Miscellaneous
-------------

* Fixed the **Steno** toggle key.
* My wife is now present on the keyboard too.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-10-03 19:20:00 +02:00
coderkun 8dd69a1b05 Overwrite method hex_to_unicode() for make it compatible with Neo 2016-10-03 16:36:21 +02:00
coderkun 4c9071964b Merge branch 'master' into coderkun_neo2 2016-10-03 16:35:40 +02:00
Jack Humbert 86065dca4d Merge pull request #799 from coderkun/master
Declare Unicode method hex_to_keycode() as “weak”
2016-10-03 10:27:06 -04:00
Jack Humbert fc86ef6c95 Merge pull request #798 from Dbroqua/master
Updated dbroqua layout for HHKB keyboard
2016-10-03 10:26:39 -04:00
Jack Humbert 37d587d62b Merge pull request #797 from hot-leaf-juice/master
Made some simplifications leveraging the LALT(), LGUI(), and S() functions.
2016-10-03 10:26:21 -04:00
SethSenpai 0f06e94d5d update readme 2016-10-03 09:07:37 +00:00
SethSenpai 468e855207 moved folder, update readme 2016-10-03 08:59:50 +00:00
SethSenpai c0c0c579ff added gamenum handwired keyboard 2016-10-03 08:53:09 +00:00
coderkun a3f5a4cf58 Declare Unicode method hex_to_keycode() as “weak”
Declare Unicode method hex_to_keycode() as “weak” to be able to override it in keymaps.
2016-10-02 10:37:51 +02:00
coderkun 8655677584 Merge branch 'master' into coderkun_neo2 2016-10-02 10:04:29 +02:00
coderkun a10e100bd5 Add double arrow Unicode characters to FMU layer 2016-10-02 09:55:38 +02:00
dbroqua 6a090c5df7 - Fixed key name in default layer definition 2016-10-01 19:04:11 +02:00
dbroqua 7cd210722d Merge remote-tracking branch 'origin/master' 2016-10-01 18:28:48 +02:00
dbroqua 8747c0786e - Updated dbroqua layout for HHKB keyboard 2016-10-01 18:28:33 +02:00
Callum Oakley 633da3bdb6 Made some simplifications leveraging the LALT(), LGUI(), and S() functions. 2016-10-01 13:03:46 +01:00
xyverz e69e4c1ef2 Merge remote-tracking branch 'jackhumbert/master' 2016-09-30 23:16:50 -07:00
xyverz e3c3170610 More standardization between the three layouts
Swapped Number Row with Symbols between _L1 and _L2.
2016-09-30 23:10:34 -07:00
Xyverz 8cd3a84025 revisions to my keymap again. 2016-09-30 22:43:15 -07:00
Damien 7abd3b4ddd Merge pull request #7 from jackhumbert/master
Merge from jackhumbert
2016-09-30 22:55:07 +02:00
Xyverz a03d72f597 Updates to my Planck keymap - standardizing the bottom row. 2016-09-30 13:05:21 -07:00
Erez Zukerman 35e6870e5c Merge pull request #788 from chwilk/kastyle-refresh
Kastyle refresh
2016-09-30 08:59:59 -04:00
Erez Zukerman fede822fce Merge pull request #789 from cmclen/master
Contributing new keymap to Ergodox
2016-09-30 08:59:24 -04:00
Jack Humbert 7c76d36454 Merge pull request #794 from AGausmann/midi-patch
Missing ifdef statement
2016-09-29 23:32:23 -04:00
Jack Humbert d3fdc3a00f Merge pull request #792 from hot-leaf-juice/master
Big restructure, plus mouse and some convenience keys.
2016-09-29 23:31:59 -04:00
Damien eb0f21a984 Merge pull request #6 from jackhumbert/master
Merge from jackhumbert
2016-09-29 22:59:31 +02:00
Adam Gausmann 8d99140d1b Missing ifdef statement 2016-09-29 14:46:10 -05:00
Callum Oakley 3c7d2e765a Merge branch 'master' of https://github.com/hot-leaf-juice/qmk_firmware 2016-09-29 07:49:45 +01:00
Callum Oakley 2f07ad8e8a added en-dash and gbp keys and updated readme 2016-09-29 07:49:27 +01:00
Callum Oakley c762ea975a big restructure now I only have to consider macOS, also added mouse, more function keys, and some neat macros 2016-09-29 07:49:27 +01:00
Callum Oakley fa2724360b removed windows layer and updated brightness keys for macOS Sierra 2016-09-29 07:49:27 +01:00
Callum Oakley 02635e5924 changed RALT to LALT on Windows 2016-09-29 07:49:27 +01:00
Callum Oakley b2ecd296ae fixed comments 2016-09-29 07:49:27 +01:00
Callum Oakley c593564aca Update readme.md 2016-09-29 07:49:27 +01:00
Callum Oakley ff09695897 Update readme.md 2016-09-29 07:49:27 +01:00
Callum Oakley 6ad8a06c73 updated readme 2016-09-29 07:49:27 +01:00
Callum Oakley b51f51c614 added close key for alt-f4 macro 2016-09-29 07:49:27 +01:00
Callum Oakley 41227856f4 added a toggle between Mac and Windows base layers (with swapped cmd and ctrl) 2016-09-29 07:49:27 +01:00
Callum Oakley ce57b94908 added en-dash and gbp keys and updated readme 2016-09-29 07:47:30 +01:00
Jack Humbert f0db230c46 Merge pull request #790 from IBNobody/master
Fix #770, Fix #779, Update Vision
2016-09-28 23:57:50 -04:00
IBNobody 78767bf208 Fix #770, Fix #779 2016-09-28 20:26:41 -05:00
IBNobody 72e643998f Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-28 20:21:19 -05:00
IBNobody 3d45860dc2 Updating Vision to beta layout. 2016-09-28 20:19:28 -05:00
Callum Oakley 8fa41f1ca1 big restructure now I only have to consider macOS, also added mouse, more function keys, and some neat macros 2016-09-28 23:15:35 +01:00
Chris McLennon cce294df86 Remove config.h 2016-09-28 14:44:41 -05:00
Chris McLennon 65b0eff6d8 Contributing new keymap to Ergodox 2016-09-28 13:24:29 -05:00
Callum Oakley ddb8eb842d removed windows layer and updated brightness keys for macOS Sierra 2016-09-28 08:04:38 +01:00
Callum Oakley 848bb6df43 changed RALT to LALT on Windows 2016-09-28 07:28:08 +01:00
Callum Oakley d387534687 fixed comments 2016-09-28 07:28:08 +01:00
Callum Oakley 1c1aa729b1 Update readme.md 2016-09-28 07:28:08 +01:00
Callum Oakley 65f035933b Update readme.md 2016-09-28 07:28:08 +01:00
Callum Oakley 0c243d0d5d updated readme 2016-09-28 07:28:08 +01:00
Callum Oakley f442348e50 added close key for alt-f4 macro 2016-09-28 07:28:08 +01:00
Callum Oakley 7bca9bc402 added a toggle between Mac and Windows base layers (with swapped cmd and ctrl) 2016-09-28 07:28:08 +01:00
chwilk 32cc2f6bd9 Added description of kastyle keymap 2016-09-27 11:27:09 -05:00
chwilk e1bfe13090 Moved hand_swap_config array so all keyboards get it defined 2016-09-26 15:49:10 -05:00
chwilk 90fd0810db Updated kastyle keymap, including swap hands feature 2016-09-26 01:05:06 -05:00
chwilk 04c0a1c3e2 Added ONEHAND_ENABLE to allow SWAP HANDS actions 2016-09-26 01:04:33 -05:00
Jack Humbert 812219e8a0 Merge pull request #786 from mannkind/patch-1
Fix lets_split.c so that audio can be disabled
2016-09-25 22:43:38 -04:00
Dustin c40ad11615 Fix lets_split.c so that audio can be disabled
Matching the use of `#ifdef AUDIO_ENABLE` used in `matrix_init_kb()` in order to compile firmware for the Let's Split keyboard without audio enabled.
2016-09-25 19:04:20 -07:00
IBNobody 24a953ae64 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-25 16:36:30 -05:00
Jack Humbert f24b3f4589 Merge pull request #785 from jcowgar/master
Added Jeremy’s Atreus Layout
2016-09-25 16:45:08 -04:00
Jack Humbert a64840613f Merge pull request #784 from Dbroqua/master
Added dbroqua layout for HHKB keyboard
2016-09-25 16:44:50 -04:00
Jack Humbert 628c5bcc62 Merge pull request #781 from cbbrowne/master
Recent enhancements to keyboard map
2016-09-25 16:43:55 -04:00
Jeremy Cowgar 77099c777a Added Jeremy’s Atreus Layout 2016-09-25 12:27:29 -04:00
dbroqua f0441f08b8 - Added dbroqua layout for HHKB keyboard 2016-09-25 16:32:06 +02:00
Damien b75cb53c4a Merge pull request #5 from jackhumbert/master
Merge from jackhumbert
2016-09-25 14:03:27 +02:00
Erez Zukerman 6725262516 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-09-23 20:57:41 -04:00
Erez Zukerman 1a96b2cdc8 Disables sleep LED by default 2016-09-23 20:57:36 -04:00
cbbrowne 3f020c0b92 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-23 17:51:32 -04:00
Jack Humbert e1fa9073c2 Merge pull request #778 from TerryMathews/master
Establish support for TADA68
2016-09-23 15:27:20 -04:00
Jack Humbert 3d42d60b7f Merge pull request #776 from DidierLoiseau/issue-772
Fix issue #772 Meh and Hyper not working
2016-09-23 15:26:28 -04:00
TerryMathews e71d4f3235 Disable RGB led support until a suitable pin is located 2016-09-23 14:20:05 -04:00
cbbrowne 888bd89ba7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-23 12:05:25 -04:00
TerryMathews fad5487266 Initial support for TADA68 2016-09-22 23:33:22 -04:00
Erez Zukerman ce6a9a6c38 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-09-22 22:05:18 -04:00
Erez Zukerman 6e5142ca3e Adds EPRM reset key 2016-09-22 22:05:12 -04:00
Erez Zukerman 545f0ca00e Merge pull request #760 from algernon/ergodox-ez/algernon
Update the ergodox/algernon keymap to v1.7
2016-09-22 21:38:59 -04:00
Didier Loiseau d430999047 Fix issue #772 Meh and Hyper not working 2016-09-23 01:20:49 +02:00
cbbrowne 7a183b4e8b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-22 16:32:29 -04:00
Jack Humbert 0f205a854f Merge pull request #771 from UnderSampled/master
Impossible Layout
2016-09-21 15:56:00 -04:00
Jack Humbert bd57faa7bf Merge pull request #769 from pvinis/fix/tap-dance-each-tap-restore
[tap dance] restore each_tap functionality
2016-09-21 15:55:18 -04:00
Jack Humbert 3dc1f39d40 Merge pull request #768 from Dbroqua/master
Updated backlight levels for KC60
2016-09-21 15:53:27 -04:00
Jack Humbert c1414e59c2 Merge pull request #767 from IBNobody/lets_split_reduce_hex_size
Lets split reduce hex size
2016-09-21 15:53:11 -04:00
UnderSampled 9e6a493172 Fixed Impossible Layout readme tables (again) 2016-09-21 18:55:14 +00:00
cbbrowne 3b57a35532 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-21 12:19:23 -04:00
Stephen Christie 073a1f21bb Corrected Impossible Layout readme tables 2016-09-21 14:45:05 +00:00
Stephen Christie 9d629719cb Filled Impossible Layout documentation 2016-09-21 14:41:37 +00:00
Pavlos Vinieratos cda4b534fa add user_data field 2016-09-21 11:29:43 +02:00
Pavlos Vinieratos 0edc82f030 formatting 2016-09-21 11:29:34 +02:00
Pavlos Vinieratos e1f131db8e restore each_tap callback 2016-09-21 10:23:51 +02:00
dbroqua 7a91cce869 - Updated backlight levels for KC60 2016-09-21 08:02:51 +02:00
IBNobody b30e6c1c9e Created I2C and Serial keymaps for unit testing
Having a dedicated I2C keymap and a dedicated serial keymap will allow
the testing suite to check both conditions.
2016-09-20 21:46:33 -05:00
IBNobody 6631abc1cb Made Serial and I2C not include the Other
This saves 192 bytes
2016-09-20 21:38:59 -05:00
IBNobody f956802f29 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-20 20:31:09 -05:00
Jack Humbert d1d54dedac Merge pull request #765 from jakllsch/more-shifted-dvorak-keycodes
Add more shifted Dvorak key code definitions
2016-09-20 21:02:07 -04:00
Jack Humbert 4d493cd05c Merge pull request #763 from Dbroqua/master
Updated dbroqua layout for KC60
2016-09-20 21:00:47 -04:00
Stephen Christie 86e85438d3 Fixed Qwerty Fn layer to match documented design 2016-09-20 15:45:50 -04:00
IBNobody 3b1df7fb00 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-19 21:00:20 -05:00
Stephen Christie 57a6828a7a Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware 2016-09-19 18:05:58 -04:00
Jack Humbert c66b090d4c Copy the main readme.md here 2016-09-19 15:27:06 -04:00
Jonathan A. Kollasch f0021c9cb9 Add more shifted Dvorak key code definitions 2016-09-19 14:25:44 -05:00
cbbrowne 2c3fcc6c08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-19 11:13:53 -04:00
dbroqua 9a2e24fa98 - Removed HHKB like layout 2016-09-19 13:36:36 +02:00
dbroqua 21b6e4c1f3 Merge remote-tracking branch 'origin/master' 2016-09-19 13:26:18 +02:00
Damien c438a2a265 Merge pull request #4 from jackhumbert/master
Merge from jackhumbert
2016-09-19 13:25:37 +02:00
dbroqua 94af0194dd - Updated dbroqua layout for kc60 2016-09-19 13:22:34 +02:00
Jack Humbert 5f9c2f63ff Merge pull request #761 from runcom/fix-yum-installs
util/install_dependecies.sh: fix yum packages
2016-09-19 01:22:38 -04:00
Jack Humbert c678676e41 Merge pull request #755 from IBNobody/master
Fix USER PRINT/NO PRINT warning w/ Bootmagic
2016-09-19 01:21:25 -04:00
Jack Humbert 6282fc8dc1 Merge pull request #751 from erlandsona/master
My Atreus Layout
2016-09-19 01:20:04 -04:00
DidierLoiseau d352a8bc29 Importing and building the project 2016-09-18 21:24:56 +02:00
DidierLoiseau ae7c3a0692 Instruct to use the Eclipse installer instead of extracting the package, describe first launch and plugin installation. 2016-09-18 15:03:27 +02:00
DidierLoiseau 22e234f9b5 Initial version 2016-09-18 13:27:27 +02:00
Antonio Murdaca edc7441800 util/install_dependecies.sh: fix yum packages
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-18 12:42:58 +02:00
Gergely Nagy 3e128552d9 Update the ergodox/algernon keymap to v1.7
Overall changes
===============

* The number row has been completely rearranged on both the **Base** and
  the **ADORE** layers.
* The number/function key behavior was changed: function keys are now on
  the **Media**.
* The `:`/`;` and `-`/`_` keys were put back to their thumb position on
  the bottom row, on both the **Base** and **ADORE** layers.
* The bottom large keys on the inner side of each half now function as
  [tmux](http://tmux.github.io/) keys: the left to send the prefix, the
  right to send the `display-panes` key. The left also doubles as a GNU
  screen prefix key, and sends `C-a` when double tapped.
* A number of functions, such as the **AppSel** layer, now require the
  `hid-commands` tool to be running, with the output of `hid_listen`
  being piped to it.

ADORE
=====

* `Y` and `X` have been swapped again.

Media/Navigation layer
======================

* The function keys are now on this layer.
* Mouse keys have been removed.
* Media start/stop/prev/next have been removed.
* `Print screen` has been removed.
* There is only one screen lock key now.

Heatmap
=======

* Fixed a few issues in the finger-stats calculation.
* The tool now also timestamps and saves all input lines to a logfile,
  which it loads on start, allowing one to continue the collection after
  upgrading the tool.
* The heatmap tool will now colorize the stats by default.
* The periodic stats are now printed in a more compact format.

Tools
=====

* Added a new tool, `tools/layer-notify` that listens to layer change
  events on the HID console, and pops up a notification on layer
  changes.
* Another new tool, `tools/text-to-log.py` has been added that converts
  arbitrary text to a keylogger output, which can be fed to the heatmap
  generator.
* A number of features have been moved to the `tools/hid-commands`
  utility. These generally are OS dependent, and are easier to implement
  on the software side.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-09-18 11:48:47 +02:00
Xyverz 26d6b90dde Update readme.md 2016-09-17 14:43:25 -07:00
dbroqua 602b058b9e - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) 2016-09-17 19:40:56 +02:00
xyverz 6fc5d446f5 Merge remote-tracking branch 'upstream/master' 2016-09-16 22:06:15 -07:00
xyverz d1c35b1255 removed a couple of mod_tap keys since they had some unintended conseqeunces across various platforms. 2016-09-16 22:02:33 -07:00
cbbrowne cc7604d116 Add breathing, as initial implementation with the RAISE/LOWER keys. And throw in extra macros to shorten keymaps 2016-09-16 17:15:33 -04:00
IBNobody bbf06d516a Added notes on vagrant file fixes, UPRINT 2016-09-15 21:44:03 -05:00
IBNobody 39cbf1c221 Fixed Batch Syntax on different versions of Windows 2016-09-15 19:49:29 -05:00
Austin Erlandson ac6125cbea Revert because the IGNORE_MOD_TAP_INTERRUPT flag didn't feel right. 2016-09-15 11:19:54 -05:00
Austin Erlandson e50f15e360 Add IGNORE_MOD_TAP_INTERRUPT to fix overloaded mod keys sending mod on diads... 2016-09-15 10:58:28 -05:00
cbbrowne 24e8d01dc9 Move ALT... 2016-09-15 11:28:12 -04:00
cbbrowne 0db06def9b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-15 11:27:37 -04:00
IBNobody 4f5f5f0103 Fixed Win_Check Verbose mode. 2016-09-15 07:59:14 -05:00
IBNobody edb5e72605 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-15 07:52:10 -05:00
IBNobody 0d3ce58b6b Renamed to Win_Check, Removed SET for privacy. 2016-09-14 22:53:23 -05:00
Erez Zukerman a258358b6c Merge pull request #758 from absenth/development
Absenth Ergodox Keymap Improvements
2016-09-14 22:51:41 -04:00
IBNobody bcc4213edc Marked the Win_Check_Output.txt file as ignored 2016-09-14 21:39:19 -05:00
IBNobody b4622eb894 Fixed a last minute format bug. 2016-09-14 21:34:28 -05:00
IBNobody e72f8dfd7e Adding WinCheck Script for windows install help 2016-09-14 20:22:18 -05:00
Lars R. Noldan 8a01bbc422 Adding Space Cadet, And Correcting Ascii Keymap 2016-09-14 11:54:13 -05:00
Austin Erlandson c8e7cca6ed Copy config overrides to my keymap directory... 2016-09-14 09:39:57 -05:00
IBNobody 9c574b493c Changed Docs, Moved RetroRefit to Handwired 2016-09-13 22:05:10 -05:00
cbbrowne 5d643bb7ee Got Right SHIFT + Right CTRL 2016-09-13 16:29:01 -04:00
cbbrowne 5be2795ca1 C macros for my favorite complex keystrokes 2016-09-13 16:17:51 -04:00
cbbrowne fdeaf1d9f8 Give layers longer names 2016-09-13 15:49:46 -04:00
cbbrowne 344929e067 Give layers longer names 2016-09-13 15:48:50 -04:00
Austin Erlandson 3668b29520 Shorten TAPPING_TERM for better responsiveness of overloaded keys... 2016-09-13 11:20:59 -05:00
Austin Erlandson 6098704145 Small update 2016-09-13 10:35:59 -05:00
IBNobody cb1ac2a3ed Fixed NO_PRINT / USER_PRINT conflict warning. 2016-09-12 20:20:31 -05:00
IBNobody e9a093451e Clean up atomic keymap (#9)
* Added keyboard help macros

* Fixing Atomic PVC keymap / adding print help
2016-09-12 19:54:52 -05:00
IBNobody 658db40df9 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-12 18:56:16 -05:00
Austin Erlandson cf17eb0f43 Get rid of sleep button... 2016-09-12 18:36:41 -05:00
Austin Erlandson 0c3aede09e Latest making use of overloaded modifiers... 2016-09-12 18:23:24 -05:00
Austin Erlandson af4c25c475 My Atreus Layout 2016-09-12 15:20:51 -05:00
cbbrowne 103ba24df2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-12 13:24:31 -04:00
cbbrowne 6a7ef59629 Ongoing experiment; have a special layer for RESET 2016-09-12 13:24:22 -04:00
Erez Zukerman 23faf9ec81 Merge pull request #734 from adiabatic/master
Ergodox EZ: Zweihander keyboard layout updates
2016-09-11 20:28:09 -04:00
Erez Zukerman 862d93e0cb Merge pull request #740 from absenth/development
Absenth's Layout- QWERTY with additional Media Layer Functions.
2016-09-11 20:27:12 -04:00
Erez Zukerman fe4b379287 Merge pull request #746 from DidierLoiseau/bépo
Bépo with firmware remapping for software CSA layout
2016-09-11 20:26:23 -04:00
Jack Humbert 05b4949fd2 Merge pull request #744 from AlliedEnvy/master
Use rules.mk template in new project generator
2016-09-11 19:25:16 -04:00
Jack Humbert ffa12f9235 Merge pull request #743 from shelaf/patch-2
Fix compiler warnings for HHKB
2016-09-11 19:24:59 -04:00
Jack Humbert b06b8f5c18 Merge pull request #742 from dbordak/master
Update Atreus default map
2016-09-11 19:24:34 -04:00
Jack Humbert 5b4f56d6e5 Merge pull request #741 from shelaf/patch-1
fix number of NKRO keys
2016-09-11 19:24:12 -04:00
Didier Loiseau 21747cc310 Added readme.md for bepo_csa 2016-09-11 22:30:05 +02:00
IBNobody 498eddedc5 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-10 21:51:21 -05:00
Didier Loiseau 1aeb59335f Fixed compilation issues after the merge 2016-09-11 02:19:55 +02:00
Didier Loiseau b9014c7575 Merge remote-tracking branch 'remotes/jackhumbert/master' into bépo 2016-09-11 01:26:47 +02:00
Didier Loiseau 60a826923d Added KC_APP on fn+BP_AGRV 2016-09-11 01:16:36 +02:00
Daniel K. Levy 11bcdbc1f5 Use rules.mk template in new project generator 2016-09-10 16:37:08 -05:00
shela 2a8536f00f Variables in Makefile are ignored in rules.mk 2016-09-11 02:46:06 +09:00
Daniel Bordak 475d0b23f6 Add PCBDOWN 2016-09-10 13:35:53 -04:00
Daniel Bordak 054108d1d1 Update to new default keymap 2016-09-10 13:35:53 -04:00
shela 70b4fc808d fix variable value of rules.mk 2016-09-11 02:29:32 +09:00
Daniel Bordak a9e56186e0 Fix typo 2016-09-10 12:16:38 -04:00
shela e25ae23287 fix number of NKRO keys
32byte report = 1byte modifiers + 31byte keys
31byte * 8bit * 1key/bit = 248keys
2016-09-10 23:47:33 +09:00
Didier Chagniot 83b6dd0cd6 readme.md updated 2016-09-10 00:20:21 +02:00
Didier Chagniot 67dfde765f typing with it 2016-09-09 21:42:35 +02:00
Jack Humbert 5010df3d8b Merge pull request #715 from profet23/master
Support for Ergodoxes with 80 keys.
2016-09-09 10:50:39 -04:00
Lars 52121cee7a Updated Image Header 2016-09-08 23:32:11 -05:00
Lars 9c2015ea7f first commit of Absenth's Ergodox Firmware 2016-09-08 23:20:17 -05:00
profet23 b83f76e1b0 Changing keymap name to "profet_80" 2016-09-08 23:34:55 -04:00
Jack Humbert 7c1b5c85b9 Merge pull request #739 from pondrejk/master
util/install_dependencies.sh made executable, fixes #738
2016-09-08 17:50:36 -04:00
Jack Humbert 55a3fb2411 Merge pull request #737 from pondrejk/patch-1
fixed typo in Linux install instructions
2016-09-08 17:50:24 -04:00
Jack Humbert 4caddd1c5b Merge pull request #736 from tong92/master
add tong92 keymap
2016-09-08 17:50:11 -04:00
Jack Humbert 02ff748132 Merge pull request #735 from romanzolotarev/patch-1
Fix typo
2016-09-08 17:49:51 -04:00
Jack Humbert 94ef7f99b8 Merge pull request #733 from cbbrowne/master
Various recent enhancements to my keyboard map
2016-09-08 17:49:35 -04:00
Jack Humbert 4a54ece468 Merge pull request #730 from IBNobody/master
Change NKRO Report Size = 32, User Print
2016-09-08 17:48:54 -04:00
Peter Ondrejka 01163b268a util/install_dependencies.sh made executable, fixes #738 2016-09-08 19:39:27 +02:00
Peter Ondrejka 08c177f00b fixed typo in Linux install instructions 2016-09-08 19:22:26 +02:00
tong92 98e43f995d add tong92 keymap 2016-09-08 23:37:13 +09:00
Roman Zolotarev 740b4bbe46 Fix typo 2016-09-08 21:12:34 +08:00
IBNobody fe2aed0d1c Added User Print - A "light" console out option (#8)
User print disables the normal print messages in the body of QMK/TMK
code and is meant as a lightweight alternative to NOPRINT. Use it when
you only want to do a spot of debugging but lack flash resources for
allowing all of the codebase to print (and store their wasteful
strings).
2016-09-07 23:50:58 -05:00
Nathan Sharfi 273a6cc688 - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃
- remove media-space and media-shift-space; put a play/pause key at media-m instead
- add print screen, scroll lock, and pause/break to the media layer

And in the readme:

- don't say we don't have any Windows-specific keys
- add mnemonics for thumb-alt and thumb-ctrl positioning
2016-09-07 20:28:31 -07:00
Nathan Sharfi e5396ca9e5 zweihander: rename to Makefile 2016-09-07 18:23:01 -07:00
cbbrowne 54214b3abc Borrowed joint Shift/Enter idea from sgoodwin mapping 2016-09-07 13:29:29 -04:00
cbbrowne 73fdd8a769 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-09-07 13:09:14 -04:00
IBNobody 558f3ec1eb Use keyboard config for nkro (#7)
* removing nkro references - wip

* changed NKRO to be defined by keymap_config
2016-09-06 23:19:01 -05:00
Daniel b807867f95 moves brackets from J/K to U/I to remove block of common vim sequence. 2016-09-06 21:56:27 -06:00
profet23 1406118c71 Removing separate ergodox80 project.
Created KEYMAP_80 in ez.h to support 80 key ergodoxes.
Creating default_80 keymap as ez keymap.
2016-09-06 21:59:47 -04:00
Erez Zukerman 0f111182a6 Merge pull request #732 from romanzolotarev/master
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
2016-09-06 21:35:15 -04:00
Erez Zukerman 74d72c724b Merge pull request #729 from joarau/master
norwegian programmer-friendly layout
2016-09-06 21:33:55 -04:00
Roman Zolotarev da16733e7a Change CTL_T(KC_ESC) to KC_LCTRL and update readme 2016-09-07 08:03:19 +08:00
IBNobody f0388a5b13 Merge pull request #6 from IBNobody/fix_magic_key_binding_NKRO
Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKRO
2016-09-06 18:07:48 -05:00
IBNobody e571d4656c Set keyboard_nkro (used by TMK) w/ MAGIC_HOST_NKRO
If NKRO is enabled, also set keyboard_nkro with MAGIC_HOST_NKRO and
MAGIC_UNHOST_NKRO.
2016-09-06 18:02:43 -05:00
IBNobody 91e0f62417 Merge pull request #5 from IBNobody/make_nkro_report_32_bytes
Change NKRO size fron 16 bytes to 32 bytes.
2016-09-06 15:00:51 -05:00
IBNobody 16e706214f Change NKRO size fron 16 bytes to 32 bytes. 2016-09-06 14:59:12 -05:00
IBNobody ff53e16767 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-06 14:57:12 -05:00
joar a3e7042084 norwegian programmer-friendly layout 2016-09-06 16:00:08 +02:00
Erez Zukerman 8b0769fe5a Merge pull request #728 from fitzsim/yoruian
Add new ErgoDox EZ keymap, YORUIAN
2016-09-06 07:07:25 -04:00
Thomas Fitzsimmons ce53c0643d Fix ergodox_yoruian XKB naming 2016-09-06 00:09:14 -04:00
Thomas Fitzsimmons e9ce4960c1 Add new ErgoDox EZ keymap, YORUIAN 2016-09-05 20:53:35 -04:00
Erez Zukerman 5bb29136b1 Merge pull request #686 from coderkun/coderkun_neo2
Merge Ergodox keymap “coderkun_neo2”
2016-09-05 20:33:09 -04:00
Erez Zukerman 45d68486a2 Merge pull request #678 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.6
2016-09-05 20:32:46 -04:00
Jack Humbert 0468093b12 Merge pull request #724 from sgoodwin/master
Add my keymap.
2016-09-05 13:21:24 -04:00
Jack Humbert 751832192c Merge pull request #722 from fredizzimo/fix_always_linking
Fix the ldflags.txt and obj.txt checks
2016-09-05 13:20:59 -04:00
Jack Humbert 4769b85130 Merge pull request #719 from IBNobody/master
Updated docs to show more info on backlight breathing.
2016-09-05 13:20:48 -04:00
Jack Humbert fcc2d43943 Merge pull request #716 from MajorKoos/master
Add support for JD40 MKII PCB
2016-09-05 13:19:58 -04:00
Jack Humbert f1b6729921 Merge pull request #711 from hot-leaf-juice/master
Updated callum's keymap
2016-09-05 13:17:14 -04:00
Jack Humbert 0301d2fdc2 Merge pull request #710 from algernon/h/tap-dance/keyup-seq-start-fix
tap-dance: Do not start a sequence on keyup
2016-09-05 13:16:58 -04:00
Samuel Ryan Goodwin bf5941b335 Add my keymap. 2016-09-05 15:53:52 +02:00
Fred Sundvik 13f3c73386 Fix the ldflags.txt and obj.txt checks
There was a minor typo, which caused the files to not be generated
and therefore the elf files were always linked.
2016-09-04 23:26:49 +03:00
IBNobody f16fece283 Merge pull request #4 from IBNobody/update_atomic_planck_pvc_keymaps
Added diagonal mice macros, breathing ala Atomic
2016-09-04 01:08:36 -05:00
IBNobody f6cb08a5bd Added diagonal mice macros, breathing ala Atomic 2016-09-04 01:07:36 -05:00
IBNobody d55a705bbb Moved breathing backlighting section in readme.md 2016-09-03 23:21:24 -05:00
IBNobody f065652812 Updated doc to contain breathing information. 2016-09-03 20:33:34 -05:00
IBNobody 7fd5b6581a Updated readme to have better backlight breathing info. 2016-09-03 20:29:29 -05:00
IBNobody c20540984e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-09-03 11:52:55 -05:00
Major Koos 11224a00fe Add rules.mk file 2016-09-02 16:42:40 -07:00
Major Koos 295ef0d964 Add support for JD40 MKII PCB
RGB Included.
2016-09-02 16:14:40 -07:00
profet23 36e16b46e3 Removing/editing non applicable readme 2016-09-02 17:18:39 -04:00
Daniel 250f096144 adds tap dance and macro to move underscore and l- and r- brackets to base layer. 2016-09-02 14:35:15 -06:00
profet23 a485e13afe Adding 80 Key Ergodox Support 2016-09-02 16:24:05 -04:00
Callum Oakley e4167c8c53 fixed incorrect key combination for locking screen on macOS 2016-09-02 09:03:39 +01:00
Daniel 0c598f53c1 adds Hyper key. improves media layer. first attempt at tap dance. 2016-09-01 23:37:52 -06:00
Callum Oakley 4c67ccc81e changed some of the wording in the readme 2016-09-01 18:30:49 +01:00
Callum Oakley 8b2a235c8d changed order of modifiers after experimentation, updated readme 2016-09-01 18:14:39 +01:00
Callum Oakley 9c3193f225 Merge remote-tracking branch 'upstream/master' 2016-09-01 17:55:00 +01:00
Joshua T 5520b0022f Merge remote-tracking branch 'upstream/master' 2016-09-01 07:40:46 -05:00
Gergely Nagy acda2b793f tap-dance: Do not start a sequence on keyup
There was an odd case, which confused the hell out of tap-dance: suppose
you had a number of tap-dance keys, on a layer, and as part of the
tap-dance, you turned that layer off - or had it on one-shot to begin
with. In this case, the keydown event would trigger the tap-dance key,
but the keyup would not. This had two funky consequences:

- tap-dance did not correctly register that the dance has ended.
- pressing any other tap-dance key would interrupt the previous
  tap-dance, and potentially input unwanted characters.

To fix this, we simply do not start a tap-dance sequence on keyup, only
when it is pressed. This way the previous sequence has enough time to
time-out and finish properly, and we don't get confused.

This fixes algernon/ergodox-layout#107.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-09-01 08:32:47 +02:00
Daniel dbac9f4954 Merge remote-tracking branch 'upstream/master' 2016-08-31 22:15:47 -06:00
Jack Humbert e28d151a8a Merge pull request #707 from algernon/f/unicode/get-mode
process_unicode: Add get_unicode_input_mode()
2016-08-31 11:28:52 -04:00
Gergely Nagy c9ea236fc3 process_unicode: Add get_unicode_input_mode()
There may be cases where one would like to know the current Unicode
input mode, without having to keep track of it themselves. Add a
function that does just this.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-31 08:21:52 +02:00
Jack Humbert 27f9671a3e Merge pull request #705 from VoodaGod/bone2planck
Bone2planck update
2016-08-30 23:07:24 -04:00
Jason Janse van Rensburg fc2ca62a3b Merge branch 'master'
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
2016-08-30 14:54:00 +02:00
Jack Humbert 8e00c464e6 Merge pull request #703 from jhenahan/feature/jhenahan-keymap
jhenahan Planck layout
2016-08-29 20:16:20 -04:00
Jack Humbert 3301e2219f Merge pull request #700 from algernon/h/ucis/enable-fix
build_keyboard.mk: Restore UCIS_ENABLE support
2016-08-29 20:15:46 -04:00
Damien af24ea558a Merge pull request #3 from jackhumbert/master
Merge from jackhumbert
2016-08-29 22:33:50 +02:00
cbbrowne fba509780e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-29 12:32:03 -04:00
Jack Henahan 6d7637ae3e Update README 2016-08-29 11:43:06 -04:00
Jack Henahan 42f1ce08dc jhenahan layout 2016-08-29 11:35:07 -04:00
Gergely Nagy 2f0395ce72 build_keyboard.mk: Restore UCIS_ENABLE support
During the build system refactor, support for enabling UCIS seems to
have been lost. This little patch adds that back, so that keymaps using
UCIS can be compiled again.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-29 11:30:38 +02:00
IBNobody 6da0eb2b2b Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-28 18:50:06 -05:00
Jack Humbert 6d1e916851 Merge pull request #697 from fredizzimo/fix_gh_token_problem
Fix the .travis.yml so that GH_TOKEN works properly
2016-08-27 19:00:21 -04:00
Jack Humbert 25502277e8 Merge pull request #696 from fredizzimo/community_boards
Update list of community keyboards
2016-08-27 18:56:42 -04:00
Fred Sundvik 83eb9e4eed Fix the .travis.yml so that GH_TOKEN works properly 2016-08-28 01:10:14 +03:00
Fred Sundvik 3bdebd2270 Update list of community keyboards 2016-08-28 00:54:26 +03:00
Jack Humbert 326de65439 Merge pull request #689 from jeebak/tv44-jeebak
Port jeebak's Planck/JD45 keymap to TV44
2016-08-27 17:30:39 -04:00
Jack Humbert 2ac90ed704 Merge pull request #684 from tomb0y/kc60_workman_dead
Correct typo in kc60 workman-dead keymap
2016-08-27 17:30:05 -04:00
Jack Humbert bade8be66c Merge pull request #695 from fredizzimo/dfu-util_instructions
Add dfu-util to the instructions
2016-08-27 17:29:35 -04:00
Jack Humbert 98bedbeb75 Merge pull request #693 from fredizzimo/infinity60
Rename infinity_chibios to infinity60, and add readme
2016-08-27 17:29:12 -04:00
Jack Humbert a1b289c99a Merge pull request #694 from fredizzimo/keyboard_template
Fix the keyboard template with new make syntax
2016-08-27 17:07:49 -04:00
Jack Humbert 4fd5ac8326 Merge pull request #690 from fredizzimo/unit_test
Add Unit Testing support
2016-08-27 17:06:45 -04:00
Fred Sundvik 8ab9c5c55a Rename infinity_chibios to infinity60, and add readme 2016-08-27 23:55:33 +03:00
Fred Sundvik 53302328d0 Add dfu-util to the instructions 2016-08-27 23:43:49 +03:00
Fred Sundvik 1f5838a286 Fix the keyboard template with new make syntax
Also add proper link to the parent
2016-08-27 23:31:15 +03:00
Fred Sundvik 922c4ea3bc Add unit test documentation 2016-08-27 21:57:49 +03:00
Fred Sundvik ca51457327 Another attempt to make keyboards and tests in parallel 2016-08-27 21:57:49 +03:00
Fred Sundvik fd93a9bb29 Make tests and keyboards in two different jobs 2016-08-27 21:57:49 +03:00
Fred Sundvik 03b1d142f2 Add -p parameter to mkdir
So that it's created even when there's a deeper structure
2016-08-27 21:57:49 +03:00
Fred Sundvik 6b92b62802 Travis builds the default all target 2016-08-27 21:57:49 +03:00
Fred Sundvik 6410f0c021 The all target makes all keyboards and all tests 2016-08-27 21:57:49 +03:00
Fred Sundvik 1b963117fe Support for running and cleaning all tests 2016-08-27 21:57:49 +03:00
Fred Sundvik 42baa6cf43 Disable map file creation when building tests
It causes strange linker warnings on cygwin.
2016-08-27 21:57:49 +03:00
Fred Sundvik 7eefb34e7c Detect failures when running multiple tests
Also add better output.
2016-08-27 21:57:49 +03:00
Fred Sundvik ffb0a126f5 Convert tirple_buffered_object_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik bcdf9ab76b Convert transport_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik b3eba797af Convert frame_validator_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik cdd0913bcc Convert frame_router_tests to GTest 2016-08-27 21:57:49 +03:00
Fred Sundvik c692fd1d55 More common settings for unit tests and keyboards 2016-08-27 21:57:49 +03:00
Fred Sundvik fc855cb30e Fix running multiple tests 2016-08-27 21:57:49 +03:00
Fred Sundvik f4429ba48c Running of unit tests
But only if the compilation has succeeded
2016-08-27 21:57:49 +03:00
Fred Sundvik 0a11460175 Build actual tests, convert byte_stuffer_tests 2016-08-27 21:57:49 +03:00
Fred Sundvik 8a9aac6e32 Rules for compiling and linking google test 2016-08-27 21:57:49 +03:00
Fred Sundvik 27a673f5cf The makefile actually calls build_test 2016-08-27 21:57:49 +03:00
Fred Sundvik 6d7cd639a5 Basic framework for parsing test targets 2016-08-27 21:57:49 +03:00
Fred Sundvik cfddec17d5 Add Google Test submodule 2016-08-27 21:57:49 +03:00
Jack Humbert f815b4871e Merge pull request #691 from fredizzimo/fix_line_endings
Fix line endings
2016-08-27 14:54:55 -04:00
Fred Sundvik cff26bc484 Merge branch 'master' into fix_line_endings 2016-08-27 21:01:46 +03:00
Jack Humbert 36b6a96596 Merge pull request #666 from fredizzimo/makefile_overhaul
Makefile overhaul
2016-08-27 13:49:42 -04:00
Fred Sundvik 265df7d5da Fix travis_compiled_push 2016-08-27 20:18:26 +03:00
Fred Sundvik a5b1af4999 Normalize line endings 2016-08-27 18:40:50 +03:00
Fred Sundvik de58ec9738 Set eep files to binary mode 2016-08-27 18:37:28 +03:00
JeeBak Kim 5fe883e74b [tv44] Port jeebak's planck keymap to tv44 2016-08-26 22:18:40 -07:00
JeeBak Kim ff0e0ee459 [tv44] Add "jeebak" keymap folder as a copy of the "default" folder 2016-08-26 14:48:03 -07:00
Fred Sundvik d1e4f2eb08 Merge remote-tracking branch 'upstream/master' into makefile_overhaul 2016-08-26 21:57:17 +03:00
cbbrowne a732003bfd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-26 12:13:50 -04:00
Erez Zukerman 2c8f6557e6 Merge pull request #664 from linsomniac/infinity_readme
Adding nicer Infinity build instructions.
2016-08-26 07:32:24 -04:00
Erez Zukerman 17511870bc Merge pull request #685 from fredizzimo/windows10_instructions_typo
Fix minor typo in the readme
2016-08-26 07:29:12 -04:00
coderkun 137eb118e3 Add box-drawing Unicode characters to keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
coderkun c78b44fb18 Set Unicode input mode and override unicode_input_start() method to keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
coderkun 5b58d7d145 Disable debugging for Ergodox keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
zs 3f0e1b3a8e Correct typo in kc60 workman-dead keymap
and rename README.md to readme.md
2016-08-26 10:42:36 +02:00
Damien 8e058135e2 Merge pull request #2 from jackhumbert/master
Merge from jackhumbert
2016-08-26 07:55:30 +02:00
Fred Sundvik 6cfdd077b5 Fix bad merge
Led should have been added to KC60, not GH60
2016-08-26 00:05:58 +03:00
Fred Sundvik 86ece64176 Fix minor typo in the readme 2016-08-25 23:54:05 +03:00
Fred Sundvik 3300203157 Remove google test submodule
It had been added for some strange reason, allthough it's supposed
to be there only in another branch.
2016-08-25 23:37:18 +03:00
Fred Sundvik fb8365a378 Split vision_division into Makefile/rules.mk 2016-08-25 23:28:10 +03:00
Fred Sundvik 523dff3005 Merge branch 'master' into makefile_overhaul 2016-08-25 23:26:02 +03:00
Jack Humbert 4321f0af7d Merge pull request #659 from Dbroqua/master
- Updated dbroqua layout for planck keyboard
2016-08-25 15:49:50 -04:00
dbroqua 8d0aed39d1 - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) 2016-08-25 20:39:55 +02:00
Jack Humbert f0cb5e9e50 Merge pull request #683 from ickerwx/master
LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example
2016-08-25 12:22:28 -04:00
Jack Humbert 8ebe9c446c Merge pull request #681 from IBNobody/vision_division_dev
Added Port A Pin Mapping / Added Vision Division (WIP)
2016-08-25 11:40:51 -04:00
Jack Humbert 6f6f745385 Merge pull request #682 from jeebak/jd45-jeebak
Port jeebak's Planck keymap to JD45
2016-08-25 11:33:14 -04:00
Jack Humbert 5728d1c9f2 Merge pull request #680 from replicaJunction/layout-atreus-replicaJunction
Added replicaJunction keymap
2016-08-25 11:27:55 -04:00
IBNobody 34eeea787c Fixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix 2016-08-25 08:16:18 -05:00
René Werner 22ef0bbac5 Merge remote-tracking branch 'upstream/master' into kitten_paw 2016-08-25 12:27:29 +02:00
René Werner 1bbd3c1eea fixed defaulf keymap, added my own keymap
now the LEDs are working like they should
2016-08-25 12:25:57 +02:00
JeeBak Kim 94597a27c5 Make the "extra" key in the top row another backspace 2016-08-25 03:06:42 -07:00
Damien c51862b237 Merge pull request #1 from jackhumbert/master
Merge from jackhumbert
2016-08-25 08:58:04 +02:00
dbroqua c34399c592 - Updated kc60/readme
- Added layout examples for kc60
2016-08-25 08:29:30 +02:00
JeeBak Kim 9c0c8c307d [jd45] Port jeebak's planck keymap to jd45 2016-08-24 22:34:03 -07:00
JeeBak Kim 601feed87e [jd45] Add "jeebak" keymap folder as a copy of the "default" folder 2016-08-24 22:23:24 -07:00
IBNobody 8423601ea1 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_division_dev 2016-08-25 00:16:15 -05:00
IBNobody 936a26d04f Added pin support for A0-A7
Vision Division - It works!
2016-08-25 00:15:41 -05:00
Joshua T a72d46d1ec Added replicaJunction keymap 2016-08-24 23:58:59 -05:00
Joshua T b0c3d59681 Fixed getting "stuck" in gaming layer 2016-08-24 23:49:33 -05:00
Joshua T 42fa91a57d Merge remote-tracking branch 'upstream/master' 2016-08-24 23:46:52 -05:00
Joshua T cac69cb580 Several key placement fixes.
* Switched Tab and Super on the default layout
* Moved Shift on Extend to pinky
* Moved Caps Lock to upper right corner
* Moved gaming toggle to avoid blocking Escape
2016-08-24 23:41:14 -05:00
Olivier 73d2a470ee Merge https://github.com/jackhumbert/qmk_firmware 2016-08-25 00:11:37 +02:00
cbbrowne 7c2a24b315 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-24 17:47:09 -04:00
cbbrowne 9778349c4b More notes 2016-08-24 17:47:01 -04:00
Gergely Nagy f512179e66 ergodox: Update algernon's keymap to v1.6
Major changes include:

Base layer changes
------------------

* The parentheses & bracket keys have been merged: tapping them results
  in `[` or `{` (if it was shifted), double tapping leads to `(`.
* The `:;` and `-_` keys are now available on the base layer, on
  their **ADORE** location, too, just below `[{(`/`]})`.
* The `Apps` key has been replaced by `F12`.
* The `-`/`_` is no longer a tap-dance key.

ADORE layer changes
-------------------

* Adjustments were made to the **ADORE** layer, to separate some
  inconvenient combinations.

Miscellaneous changes
---------------------

* `LEAD u` now starts the symbolic unicode input system, instead of the
  OS-one.
* The mouse acceleration keys on the **Navigation and Media* layer have
  been turned into toggles: tap them once to turn them on, until tapped
  again. Tapping an accelerator button will turn all the others off.
* When the **ARROW** layer is on, the *red* and *blue* LEDs light up
  now.

Heatmap
-------

* The built-in keylogger has been greatly enhanced, it now outputs the
  pressed state, and the layer (Dvorak or ADORE). As such, the
  `ADORE_AUTOLOG` option has been removed, instead there is
  `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start
  when the keyboard boots. It defaults to off.
* The heatmap generator received a lot of updates.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-24 23:22:57 +02:00
dbroqua e6dcb8de8c - Fixed layout for kc60 2016-08-24 22:22:14 +02:00
dbroqua 5979051de3 - Updated kc60.h for 2x 1u backspace (K49)
- Added dbroqua layout
2016-08-24 21:53:49 +02:00
Sean Reifschneider 0dfd1712bb Making the existing firmware link better 2016-08-24 09:30:29 -06:00
Sean Reifschneider 7debe7cd77 Changes based on @fredizzimo review, flashing Infinity details 2016-08-24 09:26:41 -06:00
Jack Humbert ad206155aa Merge pull request #679 from algernon/h/ucis/subproject-fix
quantum: Move qk_ucis_state to process_unicode.c
2016-08-24 11:21:17 -04:00
Jack Humbert d2990645ca Merge pull request #646 from nclundsten/master
fix ergodox ez link
2016-08-24 11:14:21 -04:00
Gergely Nagy a058ae40e2 quantum: Move qk_ucis_state to process_unicode.c
In order to not declare the same variable in multiple objects (which
happens when building UCIS-enabled keymap for both the ErgoDox EZ and
the ErgoDox Infinity), move the declaration to the .c file, and keep
only an extern reference in the header.

Many thanks to @fredizzimo for spotting the error in Travis, and
suggesting the fix.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-24 15:39:23 +02:00
dbroqua 235d47e747 - Updated readme by adding link on kle for each layer 2016-08-24 12:57:32 +02:00
Fred Sundvik 2e3834edea Merge remote-tracking branch 'upstream/master' into makefile_overhaul 2016-08-24 10:37:02 +03:00
Fred Sundvik 7c9fff59d0 Fix slight inconsistency
When running make from either a keyboard folder or a subproject
it runs all keymaps for all subprojects and the selected subproject
respectively. Without this fix, the same doesn't happen if your
run make clean for example. As it would just provide you with an
error message. Now this will work as expected.
2016-08-24 10:29:01 +03:00
IBNobody a902206735 Nightly
Prep for Vision build
2016-08-23 23:05:35 -05:00
IBNobody 5d685efa49 Merge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev 2016-08-23 20:53:21 -05:00
IBNobody 9263ade0fb Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-23 20:52:19 -05:00
IBNobody 6c2b7f359c Fixed line ending 2016-08-23 20:47:35 -05:00
IBNobody 3f8672287f Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-23 20:45:06 -05:00
dbroqua d19c0d46d9 Merge remote-tracking branch 'upstream/master' 2016-08-23 20:39:01 +02:00
Jack Humbert a920548471 Merge pull request #677 from SmackleFunky/master
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23 11:05:26 -04:00
dbroqua e65252d591 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	keyboards/planck/keymaps/dbroqua/keymap.c
2016-08-23 13:39:49 +02:00
René Werner 6a61c89477 added my personal keymap
I ported my keymap from tmk to QMK.
2016-08-23 13:20:59 +02:00
René Werner d28942f5d7 Merge branch 'kitten_paw' 2016-08-23 12:17:39 +02:00
René Werner 06c82a063b Fixed wrong keycode in default keymap
Where I used KC_MENU I should have used KC_APP instead.
2016-08-23 12:15:29 +02:00
Jason Green 7009112752 move to ergodox-ez only 2016-08-23 07:04:55 +00:00
Fred Sundvik feebc58d32 Split kitten_paw into Makefile/rules.mk 2016-08-23 09:42:11 +03:00
Fred Sundvik 8f2af3c6bc Merge branch 'master' into makefile_overhaul 2016-08-23 09:38:05 +03:00
Jason Green 104ca8a5e1 Remove unneeded include 2016-08-23 04:49:05 +00:00
Jason Green ec62cbe384 add missing #include 2016-08-23 04:32:40 +00:00
Jack Humbert fb4452c2f5 Merge pull request #671 from Talljoe/one-hand
Add native one-handed support
2016-08-23 00:29:46 -04:00
Jack Humbert 57125ce790 Merge pull request #673 from coderkun/master
Add method to set Unicode input key for ISO 14755
2016-08-23 00:28:01 -04:00
Jack Humbert 3824fa0014 Merge pull request #675 from Xyverz/master
Added missing item K3A to KEYMAP() variable in tv44.h
2016-08-23 00:27:23 -04:00
Jack Humbert 9ca4c9f57f Merge pull request #676 from ickerwx/kitten_paw
Added support for the Kitten Paw controller
2016-08-23 00:26:59 -04:00
Jason Green 86656690f1 TxBolt (Steno) Serial protocol for Ergodox Ez 2016-08-23 04:17:34 +00:00
Jason Green 80d10bef07 Added USB Virtual Serial support 2016-08-23 04:16:35 +00:00
dbroqua 92fe78a5ea - Added PrintScreen key on multimedia layer 2016-08-22 21:19:03 +02:00
René Werner a26ee57eb8 Added support for the Kitten Paw controller
This adds support for the 2016 revision of the Kitten Paw [1] replacement
controller by Bathroom Epiphanies.

[1] http://bathroomepiphanies.com/controllers/
2016-08-22 20:34:29 +02:00
cbbrowne 90abe70586 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-22 13:16:49 -04:00
Sean Reifschneider 0418ecc073 Changes from review by @fredizzimo and @Xyverz 2016-08-22 10:26:18 -06:00
IBNobody 705c775a4a Nightly
Only major change to qmk was the addition of A0-A7 pins for the AT90USB
2016-08-21 22:05:55 -05:00
Xyverz 02f4e5b064 Merge remote-tracking branch 'upstream/master' 2016-08-21 19:02:32 -07:00
Xyverz 364b77563c Added missing key K3A to KEYMAP() macro in tv44.h 2016-08-21 18:59:10 -07:00
Jack Humbert d8c5041f0a Merge pull request #669 from fredizzimo/windows10_build_instructions
Add instructions for Windows 10 subsystem for Linux
2016-08-21 19:13:19 -04:00
Jack Humbert fa18e62d37 Merge pull request #668 from fredizzimo/line_endings
Enforce correct line endings
2016-08-21 19:13:06 -04:00
Jack Humbert 7c140538c7 Merge pull request #674 from kyleberry/master
Fixing Dvorak
2016-08-21 19:09:26 -04:00
dbroqua d7b6d74842 - Inverted key Tab and Esc
- Reorganised bottom row
2016-08-21 23:20:24 +02:00
Kyle Berry 30de8663a9 Fixing Dvorak
Updating with proper Dvorak layout.
2016-08-21 14:01:43 -07:00
coderkun 81594c7883 Drop method to set Unicode input key and declare start and finish methods as “weak” instead 2016-08-21 21:02:18 +02:00
coderkun dffdeb50b7 Add method to set Unicode input key for ISO 14755
https://github.com/jackhumbert/qmk_firmware/issues/672
2016-08-21 20:27:23 +02:00
Fred Sundvik 8f16403179 Change order of variable assignment
BUILD_DIR and TARGET was assigned too late, so the dfu-util target,
which depends on them did not work.
2016-08-21 13:53:36 +03:00
Fred Sundvik 1c69acb7d5 Add longest match to the rule-checking
This fixes cases where you have several keyboards with a common
prefix, like algernon, and algernon-master
2016-08-21 13:10:34 +03:00
Joe Wasson c20bf83afd Add one-hand key to planck/experimental keymap. 2016-08-20 18:47:06 -07:00
Joe Wasson 66adbfcab5 Add default swap configs for a couple of boards. 2016-08-20 17:46:53 -07:00
Joe Wasson 8090f6b499 Improve one-hand support by adding more actions and tap keys. 2016-08-20 17:46:53 -07:00
Joe Wasson dd37860160 Add one-hand support.
This adds an action, `ACTION_SWAP_HANDS`, that swaps the the keys on the keyboard across a keymap-defined hemisphere in order to support one-hand typing without requiring a separate one-handed layer. See updated `doc/keymap.md` for more information.
2016-08-20 17:46:53 -07:00
IBNobody 4807feec8a In Progress Merge 2016-08-20 14:49:16 -05:00
Olivier b5172e3afa Rename file following upstream folder rename. 2016-08-20 18:19:03 +02:00
Fred Sundvik 2a5bdd81d4 Add warning about line endings 2016-08-20 19:11:22 +03:00
Olivier 009ab77d3e Merge https://github.com/jackhumbert/qmk_firmware 2016-08-20 18:07:02 +02:00
Fred Sundvik 704cbd1d2b Add instructions for Windows 10 subsystem for Linux
Also simplify the linux instructions
2016-08-20 19:02:19 +03:00
IBNobody 5febdb0a3c Initial Commmit 2016-08-20 10:26:36 -05:00
Jack Humbert a3f726174c Merge pull request #665 from linsomniac/keymap_jafo
Adding jafo layout.
2016-08-20 11:04:54 -04:00
Jack Humbert a592c9dcf4 Merge pull request #658 from Xyverz/master
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20 11:04:02 -04:00
Jack Humbert 7cef0f56e9 Merge pull request #630 from nrrkeene/master
The Ordinary Layout is the unsurprising layout
2016-08-20 11:01:22 -04:00
Fred Sundvik fd2f957a1a Normalize line endings 2016-08-20 17:59:18 +03:00
Fred Sundvik f0fd840a57 Add .gitattributes to ensure correct line endings
It also ensures that make files and shell script are checked out
with lf endings, for compability with the Windows 10 bash
2016-08-20 17:27:51 +03:00
IBNobody 462e516ad9 Merge 2016-08-20 08:34:42 -05:00
IBNobody 9e3a550840 Merge 2016-08-20 08:31:24 -05:00
IBNobody 2dfe13ac6d fixed color detection routine in makefile 2016-08-20 08:28:30 -05:00
IBNobody e1590abea9 fixed color detection routine in makefile 2016-08-20 08:28:30 -05:00
IBNobody 6bd9235fe3 Merge 2016-08-20 08:16:06 -05:00
Fred Sundvik b26ded3ab1 Comment the Makefile
Also move some messages to message.mk
2016-08-20 14:53:29 +03:00
Fred Sundvik 48f8ab1ae2 Fix the clean target
It now properly cleans all the outputs
2016-08-20 12:44:04 +03:00
Xyverz 70d4ea7904 Merge remote-tracking branch 'upstream/master' 2016-08-19 22:50:55 -07:00
Xyverz e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. 2016-08-19 22:45:20 -07:00
Xyverz aff792545d Changed my keymap to match normal keymaps. 2016-08-19 22:30:34 -07:00
IBNobody dd553d460e fixed color detection routine in makefile 2016-08-19 23:53:22 -05:00
Nicholas Keene 6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:44:08 -05:00
IBNobody 23617779b4 Merge https://github.com/IBNobody/qmk_firmware 2016-08-19 23:39:35 -05:00
Nicholas Keene 8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:38:13 -05:00
IBNobody fdaae7ec88 fixed color detection routine in makefile 2016-08-19 23:37:54 -05:00
Sean Reifschneider d98e5ddf30 Tweaks after review. 2016-08-19 21:50:04 -06:00
Sean Reifschneider 9e03517ae5 Restructuring of the ergodox README. 2016-08-19 21:47:00 -06:00
Sean Reifschneider a25480b3b5 Bringing over changes from default map. 2016-08-19 20:55:50 -06:00
Fred Sundvik da226e6126 Update keyboard readme files with new makefile instructions 2016-08-20 03:56:48 +03:00
Fred Sundvik b4c75569b0 Update readme with new instructions for make 2016-08-20 03:56:47 +03:00
Fred Sundvik e1243339ca Add diffutils to travis.yml and install_dependencies
It has been required for a while now, and now actually checked in
the makefiles. Before, if you didn't have it installed it would
just recompile everything.

The readme hasn't been updated to reflect this, I think we need
to go through that separately, and see what's really needed. Or
just instruct people to run the batch scripts.
2016-08-20 03:56:46 +03:00
Fred Sundvik ab4d7adbb9 Fix the template for the Makefile/rules.mk split 2016-08-20 03:56:45 +03:00
Fred Sundvik f29730da36 Better format for non-silent output 2016-08-20 03:56:44 +03:00
Fred Sundvik 03e31ef8b9 Continue on error 2016-08-20 03:56:43 +03:00
Fred Sundvik 3442e216dc Move bootloader_defs include to build_keyboard
Also fix it for subprojects
2016-08-20 03:56:42 +03:00
Fred Sundvik 9028a412ea Add output specific config file 2016-08-20 03:56:41 +03:00
Fred Sundvik 33fbd3be36 Output specific include paths 2016-08-20 03:56:40 +03:00
Fred Sundvik 3aac4e95c9 More general system for generating several outputs 2016-08-20 03:56:39 +03:00
Fred Sundvik 87bf34a5d3 Pass the target to submake 2016-08-20 03:56:38 +03:00
Fred Sundvik d924eb591e Fix variable name clash with builtin
This caused the submake to be called several times, messing up the
build.
2016-08-20 03:56:37 +03:00
Fred Sundvik 8732265928 Options for silent compilation
A single keyboard is always by default compiled in verbose mode.
While multiple keyboards are compiled in silent mode. This can be
overriden by the silent variable from the command line
2016-08-20 03:56:36 +03:00
Fred Sundvik e4c842de02 Don't run builtin rules for submake
To speed up the compilation
2016-08-20 03:56:35 +03:00
Fred Sundvik 881bde8258 Fix running make in parallel 2016-08-20 03:56:34 +03:00
Fred Sundvik dd8c1a7659 Don't add VERSION as a define
To avoid full recompilation when the git commit hash changes.
2016-08-20 03:56:33 +03:00
Fred Sundvik 60c6e79ecb Move git submodule check and version generation to main Makefile 2016-08-20 03:56:32 +03:00
Fred Sundvik cc2df445ab Remove unneded code from tmk_core/rules.mk 2016-08-20 03:56:31 +03:00
Fred Sundvik 67b294ca66 Actual compilation 2016-08-20 03:56:30 +03:00
Fred Sundvik db5c3b74fb Add color output 2016-08-20 03:56:29 +03:00
Fred Sundvik 0dd629a990 Fix running make from various subfolders 2016-08-20 03:56:28 +03:00
Fred Sundvik a04bb3a3ba Fixed the shortcut targets 2016-08-20 03:56:27 +03:00
Fred Sundvik 3fa6625869 Proper default goals when inside keyboard fodlers 2016-08-20 03:56:26 +03:00
Fred Sundvik 459ddaceda Add backwards compability with makefile variables 2016-08-20 03:56:25 +03:00
Fred Sundvik 4f20061f66 Proper handling for running make from a subproject or keymap dir 2016-08-20 03:56:24 +03:00
Fred Sundvik 051017c312 Split subproject make files into Makefile and rules.mk 2016-08-20 03:56:23 +03:00
Fred Sundvik c83af54513 Support for running from keyboard directory 2016-08-20 03:56:21 +03:00
Fred Sundvik 1ad5578d11 Print error when building non-existing keyboard 2016-08-20 03:56:20 +03:00
Fred Sundvik a6d3500024 Print error message when trying to build non-existing keymap 2016-08-20 03:56:20 +03:00
Fred Sundvik 2dd9c1edcd Proper parsing of keymaps inside subprojects 2016-08-20 03:56:19 +03:00
Fred Sundvik 44441de8ca Split keyboard makefiles into rules and Makefile 2016-08-20 03:56:08 +03:00
Fred Sundvik 0d5caead5a Add default subproject parsing 2016-08-20 03:24:40 +03:00
Fred Sundvik 091fab5103 Slight rearrange of the Makefile for easier readability 2016-08-20 03:24:40 +03:00
Fred Sundvik 286b3b8057 Slight refactoring to remove some verbosity 2016-08-20 03:24:40 +03:00
Fred Sundvik 1df6498721 Subproject parsing
Does not handle keyboards without subprojects correctly yet.
2016-08-20 03:24:40 +03:00
Fred Sundvik 9ee6d4a23d Proper looping for allkb and allkm 2016-08-20 03:24:40 +03:00
Fred Sundvik dfe510d5b8 Refactor common rule list parsing into own function 2016-08-20 03:24:40 +03:00
Fred Sundvik 9b02e66ce0 Add keymap parsing 2016-08-20 03:24:40 +03:00
Fred Sundvik f97ae2b199 Rule parsing to match kebyoards 2016-08-20 03:24:40 +03:00
Fred Sundvik e6e675335d First version of rule parsing
Only handles allkb at the moment.
2016-08-20 03:24:40 +03:00
Fred Sundvik 86706de036 Parsing of makefile variables from starting dir 2016-08-20 03:24:40 +03:00
Jack Humbert a3a312f8f4 Merge pull request #662 from toneman77/iso_satan
Satan Cleanup
2016-08-19 17:55:54 -04:00
Jack Humbert 47b670bced Merge pull request #663 from tomb0y/kc60_workman_dead
Add the workman-dead layout for kc60
2016-08-19 17:54:12 -04:00
Sean Reifschneider 30c63b1495 Noting the change directory. 2016-08-19 14:52:05 -06:00
Sean Reifschneider b918aa6bab Adding submodule note. 2016-08-19 14:49:29 -06:00
Sean Reifschneider 50531068b3 Adding jafo layout. 2016-08-19 14:42:41 -06:00
Sean Reifschneider 32216066e7 Adding nicer Infinity build instructions. 2016-08-19 14:36:41 -06:00
zs a1da23d827 Add the workman-dead layout for kc60 2016-08-19 21:59:08 +02:00
dbroqua b9a284352e - Moved Insert/Del in Esc layer 2016-08-19 21:10:07 +02:00
dbroqua 11aa19a626 - Updated lower and raise layer 2016-08-19 21:00:24 +02:00
Jack Humbert 7bb9d7f0f9 Merge pull request #660 from toneman77/amj60
new keyboard: AMJ60
2016-08-19 11:19:52 -04:00
dbroqua c6e733afce - Added readme file and layout preview 2016-08-19 14:17:07 +02:00
dbroqua b4f23b146f - Moved Home/End/PgUp/PgDn on arrow keys 2016-08-19 14:01:37 +02:00
Toni bc0bd11430 forgot media keys 2016-08-19 10:24:48 +02:00
Toni 225c73ed30 Merge remote-tracking branch 'origin/master' into amj60
merge with upstream
2016-08-19 09:49:56 +02:00
dbroqua 31120ed166 - Moved Brite function on esc to avoid conflict with ctrl key. 2016-08-19 09:39:25 +02:00
dbroqua 578b7e969e - Updated dbroqua layout for planck keyboard 2016-08-19 09:19:55 +02:00
Xyverz ed1291bfbd Added compatibility for the Infinity ErgoDox to my Ergodox keymap.
Updated readme.md to reflect this change.
2016-08-18 22:43:31 -07:00
Jack Humbert 2c59f71090 Merge pull request #655 from Dbroqua/patch-1
Added dbroqua layout for planck keyboard
2016-08-18 19:25:36 -04:00
Jack Humbert 05728cad68 Merge pull request #656 from Vifon/dynamic_macros
Improve the dynamic macro documentation
2016-08-18 19:23:53 -04:00
Wojciech Siewierski ea7115534a Improve the dynamic macro documentation 2016-08-19 00:18:45 +02:00
Damien a5e6da7aa8 Added dbroqua layout for planck keyboard 2016-08-18 22:25:13 +02:00
Jack Humbert 6c359cabbf Merge pull request #652 from iFreilicht/master
Added S60-X keyboard
2016-08-18 10:34:22 -04:00
Jack Humbert ca7fa07bc1 Merge pull request #651 from algernon/f/register16
Add a register/unregister_code16 pair of functions
2016-08-18 10:32:16 -04:00
Jack Humbert 8f32595820 Merge pull request #650 from Xyverz/master
Minor changes to keymaps and other files
2016-08-18 10:31:17 -04:00
Jack Humbert 6e1b89fdc8 Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fix
planck/circuit: Update after the latest tap-dance change
2016-08-18 10:04:02 -04:00
Toni 21dc8381d1 made a correct default KEYMAP. moved the old one to KEYMAP_ANSI
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI
whitespace prettyfying
2016-08-18 15:57:17 +02:00
Toni fe90653886 smyll typo fixed 2016-08-18 15:32:06 +02:00
Toni 0e86c85241 amj60 variant of the readme 2016-08-18 15:30:52 +02:00
Toni 0edf7c7cad first attempt at documentation for the amj60 board 2016-08-18 15:22:34 +02:00
Gergely Nagy 0d9d4b8658 planck/circuit: Update after the latest tap-dance change
Fixes #653.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-18 13:22:16 +02:00
Toni 068e76bbf0 uniform whitespace 2016-08-18 13:10:02 +02:00
Toni 387bd772e1 initial commit for the AMJ60 PCB 2016-08-18 13:06:16 +02:00
Felix Uhl dbfb27326b Added info to docs 2016-08-18 12:15:10 +02:00
Felix Uhl ed6ecff292 Merge pull request #1 from jackhumbert/master
Merging from base Repo
2016-08-18 12:02:31 +02:00
Felix Uhl 73f13c8f26 Bugfixes 2016-08-18 11:56:44 +02:00
Felix Uhl a72dc6da70 Final link fix 2016-08-18 11:45:56 +02:00
Felix Uhl 406ae1a2eb More link fixing 2016-08-18 11:43:32 +02:00
Felix Uhl aa71ebfbba Fixed links again
Note to self: check before commiting.
2016-08-18 11:41:52 +02:00
Felix Uhl d34c0a2fc1 Fixed dead link 2016-08-18 11:40:05 +02:00
Felix Uhl 738151d12a Minor documentation changes 2016-08-18 11:38:04 +02:00
Gergely Nagy 0d28787c5c Add a register/unregister_code16 pair of functions
These functions register not only the 8bit keycode, but the modifiers
too. It doesn't handle the full range of the upper 8bits, just the mods,
but that's a good start.

Changed the tap-dance pair functions to use these, so one can do:

  `ACTION_TAP_DANCE_DOUBLE (KC_COLN, KC_SCLN)`

...and that will do the right thing.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-18 11:29:53 +02:00
Felix Uhl c5f13e5836 Fixed links again 2016-08-18 11:16:10 +02:00
Felix Uhl a865995595 Fixed pictures and links 2016-08-18 11:11:42 +02:00
Felix Uhl 2618260b34 Documentation overhaul. 2016-08-18 10:37:32 +02:00
Toni 864e26f439 cleanup, readability , shift swap in ISO_SPLIT_RSHIFT 2016-08-18 10:06:13 +02:00
Felix Uhl 07924511f3 Small changes, renamed keymap
Added MicMute
Revived all dead keys
Removed OS Shift
2016-08-18 10:01:46 +02:00
Toni 64ecb15310 corrected the split rshift key to reality
fixed my keymap in the process to adjust to that
2016-08-18 09:56:11 +02:00
Xyverz aa37a57e0f One last change to the readme. 2016-08-18 00:38:25 -07:00
Xyverz eb81978ecb One last formatting change 2016-08-18 00:35:32 -07:00
Xyverz 118ad691c4 more formatting changes 2016-08-18 00:34:22 -07:00
Xyverz 4dd641a128 Hopefully this fixes the layout diagrams. 2016-08-18 00:27:54 -07:00
Xyverz 035290b7d8 Added a readme, tidied up comments in the keymap. 2016-08-18 00:22:56 -07:00
Xyverz 47beb763e8 Returned RAISE and LOWER buttons to their original functions - too many inopportune ENTER inputs. :-( 2016-08-18 00:05:24 -07:00
Xyverz 67227e4c71 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 2016-08-17 23:55:58 -07:00
Xyverz 385b827c85 Merge remote-tracking branch 'upstream/master'
this merge is necessary,
2016-08-17 23:53:56 -07:00
Jack Humbert 8144ce8852 Merge pull request #648 from Vifon/dynamic_macros
Implement the dynamic macros that are recorded in runtime
2016-08-17 21:17:30 -04:00
Jack Humbert 39a95897bc Merge pull request #647 from Vifon/process_record_nocache-fix
Fix the process_record_nocache function
2016-08-17 21:16:49 -04:00
Jack Humbert f4f80a0e3a Merge pull request #645 from algernon/f/tap-dance/buffering
tap-dance rework
2016-08-17 21:15:29 -04:00
Jack Humbert 1442a882d4 Merge pull request #640 from toneman77/iso_satan
heavily modified spacefn layout for iso boards using the satan PCB
2016-08-17 21:11:59 -04:00
Jack Humbert f59b61332f Merge pull request #638 from premek/master
Split layout for planck
2016-08-17 21:11:02 -04:00
Jack Humbert 034bf67f2a Merge pull request #637 from mld2443/master
Circuit keymap for Planck keyboard
2016-08-17 21:10:33 -04:00
Wojciech Siewierski 950755edaf Add the dynamic macros documentation to the readme 2016-08-18 01:40:54 +02:00
Wojciech Siewierski 39e8e61258 Implement the dynamic macros that are recorded in runtime 2016-08-18 01:37:13 +02:00
Wojciech Siewierski 644c8c7927 Fix the process_record_nocache function
This function relies on checking the disable_action_cache static
variable before accessing the layer cache.
2016-08-18 01:34:05 +02:00
Xyverz ef95c10c66 Update readme.md 2016-08-17 14:55:01 -07:00
Xyverz e3486caf87 Create readme.md 2016-08-17 14:54:05 -07:00
Nigel Lundsten 3e1d142018 trailing slash 2016-08-17 14:01:27 -07:00
Nigel Lundsten 6bafafc18d fix ergodox link (again?)
/ergodox/ez  is a broken link, seems like the ez stuff is at /ergodox
2016-08-17 14:00:47 -07:00
Toni c024de4a87 wring keypress for german iso fixed. prettified 2016-08-17 15:33:14 +02:00
Gergely Nagy 29f64d7a93 tap-dance: Major rework, to make it more reliable
This reworks how the tap-dance feature works: instead of one global
state, we have a state for each tap-dance key, so we can cancel them
when another tap-dance key is in flight. This fixes #527.

Since we have a state for each key, we can avoid situation where a keyup
would mess with our global state. This fixes #563.

And while here, we also make sure to fire events only once, and this
fixes #574.

There is one breaking change, though: tap-dance debugging support was
removed, because dumping the whole state would increase the firmware
size too much. Any keymap that made use of this, will have to be
updated (but there's no such keymap in the repo).

Also, there's a nice trick used in this rework: we need to iterate
through tap_dance_actions in a few places, to check for timeouts, and so
on. For this, we'd need to know the size of the array. We can't discover
that at compile-time, because tap-dance gets compiled separately. We'd
like to avoid having to terminate the list with a sentinel value,
because that would require updates to all keymaps that use the feature.
So, we keep track of the highest tap-dance code seen so far, and iterate
until that index.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-17 15:05:58 +02:00
Gergely Nagy d78058cc75 tap-dance: Include action_tapping.h for TAPPING_TERM
Include `action_tapping.h`, so the keymap does not have to define a
`TAPPING_TERM` for us, and we can use the default.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-17 10:28:08 +02:00
Joshua T bc1059bc1e Minor changes to Extend and Number layers.
Brought QWERTY layer in line with normal layer. Removed Undo function, as it interfered with Shift. Moved Tab and Shift-Tab, and added Insert.
2016-08-16 21:55:33 -05:00
Toni 8e142d8cbe no more warning thanks to iFreilicht's tip with undef 2016-08-16 17:35:03 +02:00
Toni deedd2f408 in accordance to keymap_makefile_example.mk 2016-08-16 16:44:12 +02:00
Toni 03a24eb86a minor grammer fixes 2016-08-16 16:35:57 +02:00
Toni b1ac91a040 big cleanup and minor refactoring. thanks iFreilicht. 2016-08-16 16:32:42 +02:00
Přemek Vyhnal 2ebfdcac40 Update readme.md 2016-08-16 01:07:34 +02:00
premek a75d4bd593 premek split layout 2016-08-16 00:50:35 +02:00
premek 5abb05ca40 premek split layout 2016-08-16 00:44:58 +02:00
Matt f5ed3e5155 Added my custom Planck layout called Circuit.
* Layout has image and readme, as well as documentation in the code.
2016-08-15 17:26:01 -05:00
Felix Uhl faa3fd48ae Minor changes to felix keymap 2016-08-15 22:57:26 +02:00
Toni 68005ce602 grammar 2016-08-15 21:47:07 +02:00
Toni 7e1be3ae7c reference to reddit post and Terry Mathews 2016-08-15 21:44:20 +02:00
Toni b8cbf7c9c0 script now waits for the user to press the button 2016-08-15 21:18:25 +02:00
Toni 396b59f256 readme now with picture 2016-08-15 21:12:49 +02:00
Toni 94ff9c9fa5 more prettyness 2016-08-15 21:04:11 +02:00
Toni 14de76ea80 Update readme.md
typo
2016-08-15 21:02:40 +02:00
Toni 5cf5e27dcd Update readme.md
attempt to prettify the table
2016-08-15 21:02:07 +02:00
Toni 77f3efbef6 more information. first steps in markdown 2016-08-15 20:59:50 +02:00
Toni ca4968bc44 readme.md added 2016-08-15 20:46:38 +02:00
Toni f89aec98ae removed my personal stuff 2016-08-15 20:32:45 +02:00
Toni 5ecebc3a66 Merge remote-tracking branch 'origin/master' into iso_split_rshift
no idea what is merged
2016-08-15 19:48:53 +02:00
cbbrowne 3cb1dce622 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-15 12:59:27 -04:00
Jack Humbert cc7acfb416 Merge pull request #635 from algernon/f/ucis
Symbolic Unicode Input System
2016-08-15 12:19:01 -04:00
cbbrowne 8a14952e44 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-15 11:19:24 -04:00
Xyverz 5c5c3e626b Adding KC_BSPC to the LT() macro for LOWER resulted in a backspace stroke being sent if the LOWER key was used too quickly.
Switching back to original LOWER macro, but keeping the new RAISE macro.
2016-08-15 06:57:24 -07:00
Xyverz 8e2d69d5a2 Adding u/treasuredfrog's hack to use LT() with the RAISE and LOWER macros. 2016-08-15 06:28:39 -07:00
Gergely Nagy e8845f0daf process_unicode: Introduce a slight delay
When entering unicode codes, use some delay, so the OS has time to
process the information. This is not needed on all systems, but some
seem to require it.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy 43d08629cf process_unicode: Replace register_hex32
It turns out that register_hex32 did not work reliably, and some systems
only allow 7 chars after the unicode magic sequence, while others allow
8. To remedy the situation, store the codes as strings, and type those
in instead of doing bit shifting magic.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy a312cbf712 process_unicode: Use uint32_t for UCIS purposes
Use a single uint32_t to store the unicode of a symbol, instead of an
array of uint16_ts.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy 234dd276cf process_unicode: Make the startup overridable
Extract out the part of `qk_ucis_start` that inputs the placeholder
symbol, and make it weak, so it can be overridden.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy 857aa5bef6 process_unicode: Call process_ucis() automatically
If UCIS is enabled, call process_ucis() automatically from
process_record_quantum().

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy 0b6861827f process_unicode: Handle too long UCIS symbol names
If the symbol name being entered is longer than the max, stop recording
it, and stop processing keycodes apart from the ones that can delete,
finish or cancel the sequence.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy fa06a16360 process_unicode: Add a way to enter unicode symbols by name
The purpose of this change is to allow keymaps to specify a dictionary
of unicode symbol name to code mappings, and let the person at the
keyboard enter unicode symbols by name.

This is done by having a way to trigger unicode symbol input mode, when
all keys are cached until Esc, Enter or Space are pressed. Once that
happens, we try to look up the symbol from our lookup table. If found,
we erase back, and type the unicode magic in to get that symbol. If not
found, we still erase back, start unicode input mode, and replay what
the user typed in.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Gergely Nagy 63e5782d2c process_unicode: Small refactor & linux fix
This moves the unicode input start / end sequences into their own
functions, so keymaps and other functionality can build on it too.

At the same time, it changes how the Linux variant works, to match
reality: CTRL+SHIFT must be unregistered too, and we close the thing
with a Space instead.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-15 10:08:53 +02:00
Xyverz 4f0bcfe724 Merge remote-tracking branch 'upstream/master' 2016-08-14 20:27:41 -07:00
Xyverz 055b887b0d Setup the bottom-row modifiers to be mac-like in their arrangement. 2016-08-14 20:25:52 -07:00
Daniel 8019a074cf minor tweaks to numpad and media layer 2016-08-14 20:43:05 -05:00
Jack Humbert bc8976d277 Merge pull request #634 from di0ib/master
minorca handwired
2016-08-14 21:03:15 -04:00
di0ib 959c48e146 moved to handwired folder 2016-08-14 14:13:58 -10:00
di0ib 288bf4faa3 Merge branch 'master' of https://github.com/di0ib/qmk_firmware 2016-08-14 13:20:00 -10:00
di0ib df56d742b1 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-14 13:19:20 -10:00
Jack Humbert 4865e6f81f Merge pull request #631 from jacwib/master
Jacwib's keymap
2016-08-14 18:50:22 -04:00
Jack Humbert cdd7301b8b Merge pull request #627 from algernon/h/set-unicode-input-mode
process_unicode: Fix set_unicode_input_mode()
2016-08-14 18:50:03 -04:00
Jack Humbert 8bb299255b Merge pull request #624 from Xyverz/master
Added Ergodox Layout with persistent layers, Atreus corrections
2016-08-14 18:49:28 -04:00
di0ib 503ec7f9f6 Updated readme
Added link to Minorca/Sebright blog.
2016-08-14 11:15:46 -10:00
di0ib f58a67c991 cleanup readme 2016-08-14 11:10:12 -10:00
di0ib 1eaa685872 Correct data pin to D5 2016-08-14 11:08:15 -10:00
di0ib 65060ad000 Fix list 2016-08-14 11:07:35 -10:00
di0ib dde9ee572c clean up readnme 2016-08-14 11:06:46 -10:00
di0ib b4218a2b3e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-14 10:58:22 -10:00
di0ib c6c2c3fc14 minorca
minirca with RGB keymap
2016-08-14 10:58:10 -10:00
Toni 5705a40320 increased readability with a defince 2016-08-14 20:06:47 +02:00
Felix Uhl df01d502d4 Ported all keymaps
Old TMK keymaps were ported and confirmed to compile
All keymaps compiled and added to zip-archive.
Documentation was updated.
2016-08-14 13:07:03 +02:00
Felix Uhl 6774f300da Update readme.md 2016-08-14 11:48:59 +02:00
Felix Uhl ec75c04663 Fixed links to keymap sources 2016-08-14 11:44:43 +02:00
jacwib 54e37fd2d1 Fix bug 2016-08-14 11:08:01 +02:00
jacwib 6ba27ea318 Remove pointless comments 2016-08-14 11:02:46 +02:00
jacwib e4e13ddc54 Update readme.md 2016-08-14 10:57:47 +02:00
jacwib 26f4a0cf04 Update Makefile 2016-08-14 10:49:26 +02:00
jacwib 62004866b3 Update config.h 2016-08-14 10:49:06 +02:00
jacwib cf91aa416a Update keymap.c 2016-08-14 10:48:52 +02:00
jacwib 1ab78110bd Update readme.md 2016-08-14 10:48:22 +02:00
jacwib 880486bd24 Jack's keymap. 2016-08-14 10:46:40 +02:00
Xyverz 049343e523 Added my own layout to the Phantom. 2016-08-14 00:33:11 -07:00
Xyverz 97fca1efff Fixing a mixup. Tidying up the keymap. 2016-08-13 20:14:27 -07:00
Xyverz 1920c290a4 Merge remote-tracking branch 'upstream/master' 2016-08-13 19:51:49 -07:00
Erez Zukerman 6323f3d1e7 Merge pull request #623 from algernon/ergodox-ez/algernon
ergodox: Update my keymap to v1.5
2016-08-13 20:12:15 -04:00
Erez Zukerman 5ef3f05215 Merge pull request #626 from tenderlove/readme-link
fix link to ErgoDox EZ
2016-08-13 20:11:34 -04:00
Felix Uhl 911cc68325 Added all original S60-X keymaps
All keymaps that were included in VinnyCordeiro's repository were ported to QMK.
Main Readme was copied over from VC's repo, slightly altered.
Main Makefile was updated to reflect VC's original configuration.
Small changes in felix keymap.
2016-08-14 00:41:09 +02:00
Nicholas Keene ba7f2b1d3f The Ordinary Layout is the unsurprising layout 2016-08-13 15:53:03 -05:00
Ian Sterling e87506767c Removal of old minivan44 folder. 2016-08-13 10:44:42 -07:00
Ian Sterling 2d0f585e42 Renamed minivan44 to tv44 in all occurrences per wishes of
Jack and Evan.
2016-08-13 10:36:08 -07:00
Gergely Nagy 8bdf745909 process_unicode: Fix set_unicode_input_mode()
In the header, this was defined as `set_unicode_input_mode`, but the
implementation had `set_unicode_mode` for a name. Changed the
implementation to match the header.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-13 10:37:01 +02:00
Toni e0aa216905 Merge remote-tracking branch 'origin/master' into iso_split_rshift
update from Upstream
2016-08-13 09:24:24 +02:00
Ian Sterling c07fe96581 Adding the MiniVan44 aka TheVan 44 by u/evangs to the repo.
Initial Commit.
2016-08-12 23:45:40 -07:00
Xyverz 3bae791372 Update keymap.c 2016-08-12 22:30:01 -07:00
Ian Sterling 458607ee5e Corrections to the Atreus Makefile and updates to my keymap 2016-08-12 22:26:30 -07:00
Aaron Patterson 477f1ad0c8 fix link to ErgoDox EZ
This just fixes the readme link to the ErgoDox EZ directory
2016-08-12 19:15:53 -07:00
Jack Humbert 098951905d forces all ergodox keymaps to be ez on qmk.fm (were infinity) 2016-08-12 20:45:43 -04:00
Daniel 558bf2ed07 completes first-pass at media layer 2016-08-12 19:27:44 -05:00
Callum Oakley 993d72b11f added a lock screen key 2016-08-12 21:05:52 +01:00
Daniel 916d12f9fa completes first-pass at symbol layer 2016-08-12 14:37:13 -05:00
Jack Humbert 11d4784d3a Merge pull request #622 from shelaf/master
My HHKB layout
2016-08-12 14:43:04 -04:00
Jack Humbert c6ec63eac3 Merge pull request #621 from shelaf/fix
Fix typo
2016-08-12 14:42:42 -04:00
Toni cafa528b88 only aesthetics 2016-08-12 19:14:48 +02:00
cbbrowne c21a882ec9 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-12 11:17:34 -04:00
Gergely Nagy b98d47abe5 ergodox: Update my keymap to v1.5
Major changes include:

* The **1HAND** layer has been removed.
* A `Delete` key is now available on the right thumb cluster.
* The **ADORE** layer received a major update, see the updated layout
  image.
* It is now possible to enable automatic logging for the **ADORE**
  layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when
  compiling the keymap. It is off by default.
* The `~` key and the `Media Next/Prev` key have been swapped on
  the **base** layer.
* On the **ARROW** layer, `Backspace` has been replaced by `Enter`.
* There is some experimental support for entering Unicode symbols.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-12 16:36:07 +02:00
shela 11e23fd3fd add new line 2016-08-12 21:45:36 +09:00
shela c9272fee08 add new line 2016-08-12 21:33:32 +09:00
shela 1c8d64d3b3 add my keymap 2016-08-12 21:24:43 +09:00
shela e692ebf86a fix typo 2016-08-12 20:38:26 +09:00
Jack Humbert 97cd7afc32 Merge pull request #618 from denolfe/master
Add denolfe satan keymap
2016-08-11 21:34:34 -04:00
Jack Humbert a0ed238c12 Merge pull request #617 from iFreilicht/patch-2
Fix dead link in keycode.txt
2016-08-11 21:34:09 -04:00
Jack Humbert bad77bf4e9 Merge pull request #614 from iFreilicht/patch-1
Update TMK_README.md
2016-08-11 21:33:55 -04:00
Jack Humbert a087a207f1 Merge pull request #608 from finleye/master
Adds keymap based on Kinesis advantage
2016-08-11 21:32:32 -04:00
Felix Uhl 4725942dc7 Small changes
Enabled Bootmagic and ISO layouts on felix keymap
Added unused pins
2016-08-11 21:49:10 +02:00
Xyverz 71e1bb2e1c Delete keymap.c
Not ready to submit this one just yet.
2016-08-11 11:04:57 -07:00
Xyverz eeade4af84 Update keymap.c
Changed right-hand F-key layout in order to add KC_PLUS to _L2.
2016-08-11 09:48:23 -07:00
Xyverz d1f418d85d Update Makefile
Corrected spelling of "ATREUS" in all locations. (ATRUES -> ATREUS)
2016-08-11 09:46:05 -07:00
Elliot DeNolf 56f86413e0 Add denolfe satan keymap 2016-08-11 09:54:02 -06:00
Felix Uhl 38766dbc82 Minor changes to keymaps
Clarified extra keys
Made ISO-keys non-dead in default layout
Added non-US backslash on felix layout
2016-08-11 09:36:37 +02:00
Felix Uhl a41a53baad Fix dead link in keycode.txt
The link to the HID Usage tables was outdated and dead, so I replaced it.
2016-08-11 09:13:38 +02:00
Daniel fe7b46579c completes first-pass at base layer 2016-08-10 19:37:59 -05:00
Felix Uhl aa1a90af66 Added S60-X to keyboards with two layouts. 2016-08-11 00:54:55 +02:00
cbbrowne 83913f9197 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-10 11:36:37 -04:00
Felix Uhl 6975135f54 updated reference
Build setup links to main readme now.
2016-08-10 11:40:51 +02:00
Ian Sterling 0d60355241 Added braces using LSFT(KC_LBRC) and LSFT(KC_RBRC) since the normal RBCR and LBCR didn't work for me. 2016-08-09 23:56:21 -07:00
Ian Sterling 6f700f1eb0 Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds persistent layers
based on the Planck and Preonic setup. The layout arrays are pulled directly from the
ergodox/ez/ez.h keymap definition starting at line 81.
2016-08-09 23:49:27 -07:00
Joshua T 6a24bac9c4 Moved Shift keys to Z and ?
Instead of using a thumb shift, I was given the idea of using the pinky keys as dual-role keys that also send the Shift keypress.

This gives me a Shift key on each hand again, but it will make me learn to Shift with opposite hands after all.
2016-08-09 22:16:21 -05:00
Joshua T 82223aec6c Created build.bat
Helper batch file for building the keyboard.
2016-08-09 21:34:55 -05:00
Joshua T ec67d32bd4 Merged branch master into master 2016-08-09 21:30:31 -05:00
Joshua T ea8638b944 Changed left thumb back to Ctrl/Alt
Removed Shift from left thumb
2016-08-09 21:29:22 -05:00
Joshua T fdb8a4cd65 Created keymap-specific config.h 2016-08-09 21:28:31 -05:00
Joshua T 5d78311612 Reverted Ergodox config.h
I will create a separate config.h for my keymap
2016-08-09 21:27:38 -05:00
Joshua T daa83afe2b Created keymap local config.h file
Reverted the Atreus config.h to default and added one specific to this keymap.
2016-08-09 20:51:22 -05:00
Callum Oakley 2a160bbbe3 Update keymap. (#616)
* changed order of bottom row of symbol layer to ease acess to brackets

* updated readme.md to reflect keymap changes
2016-08-09 12:33:07 -04:00
Xyverz ca3278cc35 adds Xyverz's keymaps (#615)
* Adding my own keymaps to the following keyboards:

Planck, Preonic, Atreus, Ergodox

* Delete dvorak.png

Not reflective of my layout.

* Delete readme.md

file cleanup, removing file that doesn't apply to my layout.

* Delete old_keymap.c

file cleanup

* Delete README.md

file clean up.

* Delete README.md

file cleanup

* Delete keymap.c

file cleanup

* Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility's sake.
Updated the rest of the keymap to reflect the current (as of 19:37 on 08 Aug 2018) default
layout and default makefile.
2016-08-09 12:31:56 -04:00
cbbrowne 6a618fd44d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-09 12:10:48 -04:00
Callum Oakley 49fbcb3e7c Merge remote-tracking branch 'upstream/master' 2016-08-09 12:39:59 +01:00
Callum Oakley 725dd7328f updated readme.md to reflect keymap changes 2016-08-09 11:09:52 +01:00
Callum Oakley 5f37b11f2c changed order of bottom row of symbol layer to ease acess to brackets 2016-08-09 11:03:12 +01:00
Ian Sterling 78a6fae453 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 2016-08-08 19:40:41 -07:00
Ian Sterling 39dd3d674c Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility's sake.
Updated the rest of the keymap to reflect the current (as of 19:37 on 08 Aug 2018) default
layout and default makefile.
2016-08-08 19:35:13 -07:00
Xyverz c062b6a13d Delete keymap.c
file cleanup
2016-08-08 18:52:48 -07:00
Xyverz 4e030313f7 Delete README.md
file cleanup
2016-08-08 18:51:34 -07:00
Xyverz 1493836762 Delete README.md
file clean up.
2016-08-08 18:48:36 -07:00
Xyverz c060afe68e Delete old_keymap.c
file cleanup
2016-08-08 18:47:13 -07:00
Xyverz bf93fa510b Delete readme.md
file cleanup, removing file that doesn't apply to my layout.
2016-08-08 18:46:34 -07:00
Xyverz de1db144d0 Delete dvorak.png
Not reflective of my layout.
2016-08-08 18:44:09 -07:00
Ian Sterling 552399df4c Adding my own keymaps to the following keyboards:
Planck, Preonic, Atreus, Ergodox
2016-08-08 18:34:08 -07:00
skullY adad05c3fb Add support for the cluecard 2016-08-08 16:11:54 -07:00
skullY d561f63bd1 Clueboard: Fix the title in keymaps/skully/readme.md 2016-08-08 13:46:55 -07:00
skullY e85bf50e1a Clueboard: Add some readme.md files and do some minor cleanup. 2016-08-08 13:43:24 -07:00
Corey Finley 76cd7c5444 Adds keymap based on Kinesis advantage 2016-08-08 15:17:10 -04:00
cbbrowne 6ce0195e24 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-08 13:50:01 -04:00
Jack Humbert 55ca218634 Merge pull request #613 from di0ib/master
Convert hex to bin
2016-08-08 12:10:49 -04:00
Jack Humbert 1f4277fe6b Merge pull request #612 from kuel/master
Added file for software implementation of Russian, gave keymap_cyrillic.h a better name.
2016-08-08 12:09:48 -04:00
Jack Humbert a3167bdc09 Merge pull request #609 from sethbc/fix_clueboard_orphaned_files
remove orphaned clueboard files
2016-08-08 12:09:14 -04:00
Jack Humbert 9866c23bff Merge pull request #607 from jeebak/jeebak
Update Jeebak's keymap, w/ KC_COPY, etc. workaround.
2016-08-08 12:07:39 -04:00
Felix Uhl f41c2e6863 Update TMK_README.md
updated link to non-existent build.md file
2016-08-08 17:53:08 +02:00
di0ib 8fab141a02 Convert hex to bin
For flashing via alternative methods like LUFA MassStorage bootloader.
2016-08-07 20:58:59 -10:00
di0ib a36b2a0756 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-07 20:20:16 -10:00
Joshua T 6df31120a1 Merge remote-tracking branch 'upstream/master' 2016-08-07 23:28:59 -05:00
JeeBak Kim ef83f1d04f Tap for ;, hold for GUI, tap for ", hold for Alt 2016-08-07 12:44:45 -07:00
JeeBak Kim 3d86e5b7a7 Tap for Tab, hold for Hyper 2016-08-07 11:05:10 -07:00
kuel 2a0121a786 Removed unnecessary comment 2016-08-07 11:07:38 -05:00
kuel c5ee24a6c3 Add keymap_russian.h, a software implementation of Russian
rename keymap_cyrillic.h to keymap_unicode_cyrillic.h
changed CY_RUBLE and CY_NUMERO to CY_RUBL and CY_NMRO in
 keymap_unicode_cyrillic.h
2016-08-07 11:01:12 -05:00
Toni b5fcb5a744 new variant with the curly braces on tab layer 2016-08-07 11:37:28 +02:00
JeeBak Kim 68e287013b Add Tab Close, New, Reopen macros to TouchCursor layer 2016-08-06 13:36:46 -07:00
JeeBak Kim bda4d15ffa Add Virtual Desktop Switching macros to TouchCursor layer 2016-08-06 12:00:37 -07:00
JeeBak Kim 57218827cb Move KC_ACL1 button 2016-08-06 00:08:59 -07:00
JeeBak Kim 96ed96f924 Fix KC_ALT_TAB/KC_CMD_TAB logic 2016-08-06 00:01:12 -07:00
JeeBak Kim 6483a2a04b Mouse layer updates
- Rename to MOUSECURSOR
- Use "d" key, since middle finger is stronger than pinky
- Shuffle some mouse buttons around
2016-08-05 23:32:00 -07:00
Seth Chandler 545925fb1b remove orphaned clueboard files 2016-08-05 23:19:12 -04:00
Toni dcf672223f enterfn / enterisctrl on hold added 2016-08-05 20:53:58 +02:00
JeeBak Kim 36abd4463f Revert swapp of AltTab/CmdTab in readme. Layout did not change 2016-08-04 14:26:03 -07:00
cbbrowne 64e051652b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-04 11:10:41 -04:00
JeeBak Kim 7db1d7902b Workaround for KC_COPY, etc. based on current AG_NORM/AG_SWAP setting 2016-08-03 21:21:28 -07:00
JeeBak Kim 9a4e72fa71 Add CmdSlash to TouchCursor Layer 2016-08-03 19:19:18 -07:00
JeeBak Kim 16f4a31784 Number layer tweaks 2016-08-03 19:19:18 -07:00
JeeBak Kim fdd89e7f0d Add Alt-Tab, Cmd-Tab, and Ctl-Tab Macros to TouchCursor layer, swap LGUI and LSFT 2016-08-03 19:19:18 -07:00
JeeBak Kim abc3cd4d72 Update readme.md 2016-08-03 19:19:18 -07:00
kuel 8d8709fb79 Merge pull request #1 from jackhumbert/master
Update
2016-08-03 11:24:29 -05:00
Jack Humbert 213cb2c243 Merge pull request #605 from kuel/master
Add keymap_cyrillic.h, lots of cyrillic characters
2016-08-03 00:11:02 -04:00
Jack Humbert 301e46c529 Merge pull request #599 from Depariel/master
Fixed compiling errors and updated keymaps for infinity_chibios
2016-08-03 00:10:41 -04:00
Jack Humbert e62c588921 Merge pull request #561 from 0xdec/patch-1
Clean up formatting & tiny refactor in rgblight.c
2016-08-03 00:08:02 -04:00
Stephen Christie bf2b260429 Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware 2016-08-02 22:51:30 -04:00
Stephen Christie 0acb394ac4 Moved Insert, PrtSc, Pause to Adjust; Corner enter 2016-08-02 22:32:27 -04:00
kuel c70b276b1b Add keymap_cyrillic.h, lots of cyrillic characters 2016-08-02 14:09:01 -05:00
Erez Zukerman 79a9e04706 Merge pull request #592 from sethbc/ez-sethbc
Ez sethbc
2016-08-02 08:03:09 -04:00
Erez Zukerman 8c52327aa6 Merge pull request #593 from J3RN/master
Updated the J3RN ErgoDox keymap
2016-08-02 08:02:27 -04:00
Erez Zukerman 6eab4ecd7e Merge pull request #600 from adiabatic/master
zweihander-osx: add left-hand-thumb tab key
2016-08-02 08:01:56 -04:00
Jack Humbert 461f973c2b correct file name 2016-08-01 23:46:50 -04:00
Jack Humbert 25f138c0d3 fix mkdir cmd 2016-08-01 22:59:25 -04:00
Erez Zukerman 56aa51664e Updates ErgoDox readme 2016-08-01 21:15:01 -04:00
Stephen Christie 76ef37e72d Corrected Qwerty/Fn Mismatch. 2016-08-01 18:54:25 -04:00
Jack Humbert f422f442cf automatically forward ergodox ez 2016-08-01 14:51:26 -04:00
Jack Humbert bb249fb239 Merge pull request #597 from Jiehong/feature/basic_keyboard_doc
feature: add basic doc about how a keyboard works on USB
2016-08-01 02:25:20 -04:00
Jack Humbert d5baa4773d Merge pull request #596 from fredizzimo/rid_of_quick
Fix the makefile dependencies and remove quick targets
2016-08-01 02:24:53 -04:00
Depariel a675c1aee0 added support for Infinity 1.1a (4th drop) matrix, no LED support yet 2016-07-31 23:12:16 -04:00
Stephen Christie 4b74c90cdb Added quote key. 2016-07-31 22:39:25 -04:00
Nathan Sharfi 07a631bd5a Thumb ⌫ into ⇥, numpad & into :, yank home/end
Also: add (back?) in the light-shine disabler
2016-07-31 14:21:08 -07:00
Nathan Sharfi c2419ffecc Remove /keyboard/* files 2016-07-31 14:10:03 -07:00
Nathan Sharfi d889648d53 Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-31 14:02:25 -07:00
Depariel 0c4177e077 fixed typo in hasu/keymap.c 2016-07-31 15:16:55 -04:00
Depariel ceecb7c819 fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap 2016-07-31 14:25:25 -04:00
Jiehong Ma d9bef1658e feature: add basic doc about how a keyboard works on USB
This comes from the discussion on #520
2016-07-31 16:49:31 +02:00
Fred Sundvik fda29be3e7 Travis calls the normal build target, instead of quick 2016-07-31 14:18:51 +03:00
Fred Sundvik 87a1a095d0 Fix the readme for the removed quick target 2016-07-31 14:18:00 +03:00
Fred Sundvik a0dc622199 Remove the quick commands and add proper clean 2016-07-31 14:17:32 +03:00
Fred Sundvik d5a947b324 Also depend on the gcc version 2016-07-31 13:49:04 +03:00
Fred Sundvik 97817a773e Generate version information to version.h
So that only the files that really needs a version are recompiled.
2016-07-31 13:42:05 +03:00
Fred Sundvik 84bfb19554 Force compilation and linking when options changes 2016-07-31 13:42:04 +03:00
Fred Sundvik e58e9af2ab More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.
2016-07-31 13:36:30 +03:00
Fred Sundvik abdf42573a Put the build output inside the root/.build directory 2016-07-31 13:25:49 +03:00
Fred Sundvik f11a0275a8 Enable vpath seraching for source files only 2016-07-31 13:24:25 +03:00
Fred Sundvik 79067662c8 Better "include guards" for the makefiles
Checking for ARCH is not good enough, since some subprojects define it.
Ergodox Ez for example. The leads to running the make from
keyboards/ergodox/ez failing. The keyboard makefile will not be included
in that case, and therefore not the CUSTOM_MATRIX either.

Furthermore the output files are read from many different .build
directories, so it doesn't fail deterministically. For example on the
Travis CI the compilation passes, since there's no outdated objects that
needs recompilation.
2016-07-31 13:22:18 +03:00
Jack Humbert b25dbc484d Merge pull request #594 from jeebak/jeebak
Jeebak's keymap for planck
2016-07-31 01:30:31 -04:00
Jack Humbert 7e000ff476 Merge pull request #590 from jeebak/in-like-flint
Add IN_LIKE_FLINT song
2016-07-31 01:30:09 -04:00
JeeBak Kim 230d313dbd Update readme.md 2016-07-30 17:30:10 -07:00
JeeBak Kim a2ed7ce795 Add additional shortcut keymaps to TOUCHCURSOR layer 2016-07-30 12:52:51 -07:00
JeeBak Kim db8ad8204e Add additional maps for [, and ], to LOWER 2016-07-30 12:52:51 -07:00
JeeBak Kim b54a58859f Make RAISE layer an all numbers/arithmatic layer 2016-07-30 12:52:51 -07:00
JeeBak Kim 216efe6c99 Move reset to a less accessible location 2016-07-30 12:52:51 -07:00
JeeBak Kim e0dd9d6af0 Add -, +, and . to RAISE 2016-07-30 12:52:51 -07:00
JeeBak Kim 6a2c681ae9 Change calls from persistant_default_layer_set() to default_layer_set() 2016-07-30 12:52:51 -07:00
JeeBak Kim eb9416a67d PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers 2016-07-30 12:52:46 -07:00
Jonathan Arnett 1876e100be Updated readme with recent changes 2016-07-30 14:37:54 -04:00
Jack Humbert 17bd4ac062 Updated my keymap 2016-07-30 14:07:27 -04:00
JeeBak Kim 984fc2b630 Media keys for all the "regular" layers 2016-07-30 10:13:50 -07:00
JeeBak Kim 7209310d1b Add mouse layer, and remove default arrow keys (touchcursor only, now) 2016-07-30 10:13:50 -07:00
JeeBak Kim a6bae9fb07 Add numbers to _RAISE 2016-07-30 10:13:49 -07:00
JeeBak Kim 6baf77d8fb Move _RAISE symbols to _LOWER 2016-07-30 10:13:49 -07:00
JeeBak Kim ad7e4af45c Tap for Enter, hold for Shift 2016-07-30 10:13:49 -07:00
JeeBak Kim b5d77440b6 Add personalized TouchCursor layer 2016-07-30 10:13:49 -07:00
JeeBak Kim eb1a06d3ae Tap for Esc, hold for Control 2016-07-30 10:13:44 -07:00
Seth Chandler a6ec5fa74a rebase 2016-07-30 10:46:13 -04:00
Seth Chandler 694567f799 update makefile 2016-07-30 10:42:57 -04:00
Seth Chandler a01d703a58 initial commit of sethbc keymap 2016-07-30 10:42:57 -04:00
Joshua T cf795a6f93 Moved PREVENT_STUCK_MODIFIERS to config.h 2016-07-30 09:19:17 -05:00
Joshua T 0064f1f84c Moved my Ergodox keymap to match upstream changes 2016-07-30 08:46:01 -05:00
Joshua T e9a501d447 Merge remote-tracking branch 'upstream/master' 2016-07-30 08:41:22 -05:00
JeeBak Kim 7d0345ef25 Add IN_LIKE_FLINT song 2016-07-30 01:52:33 -07:00
JeeBak Kim f78a994355 Add "jeebak" keymap folder as a copy of the "default" folder 2016-07-30 00:16:04 -07:00
Jack Humbert 7775f3e4b3 Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox
Update some obsolete references
2016-07-30 02:53:29 -04:00
Gergely Nagy 8a9bf1f165 Update some obsolete references
Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.

Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-30 08:37:30 +02:00
Stephen Christie 5f2d3f27de Moved CapsLk, ScrollLk, and NumLk to Adjust layer 2016-07-30 00:56:43 -04:00
Jack Humbert 0b7557b60f Merge pull request #587 from fredizzimo/documentation_quick_fix
Fix the quick aliases documentation section
2016-07-29 22:33:29 -04:00
Jack Humbert 063983639d Merge pull request #503 from fredizzimo/ergodox_subproject
Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
2016-07-29 22:32:27 -04:00
Fred Sundvik 7d55951050 Fix the quick aliases documentation section
Also move all keyboard customization documentation under the
"Going Beyond the keycodes" heading.
2016-07-29 22:47:35 +03:00
Fred Sundvik 566c79554e Small fix for infinity include guard 2016-07-29 21:09:42 +03:00
Fred Sundvik 6e8a5aca9d Fix typo in the readme. 2016-07-29 21:09:41 +03:00
Fred Sundvik 401dd09077 A couple of more Ergodox readme fixes 2016-07-29 21:09:40 +03:00
Fred Sundvik c65da1f208 Unify the ErgoDox EZ and Infinity documentation 2016-07-29 21:09:39 +03:00
Fred Sundvik 44cefcb40a Refer to the right path in the readme 2016-07-29 21:09:38 +03:00
Fred Sundvik 349f189e83 Move Ergodox readme from ez subfolder to parent 2016-07-29 21:09:37 +03:00
Fred Sundvik ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 2016-07-29 21:09:37 +03:00
Fred Sundvik 592ef7c6f0 Move Infinity Ergodox drivers to subproject, and fix makefile 2016-07-29 21:09:36 +03:00
Fred Sundvik 37052a53f1 Remove the Infinity Ergodox default keymap 2016-07-29 21:09:35 +03:00
Fred Sundvik 650298cec3 Cleanup the townk_osx config.h and make files 2016-07-29 21:09:34 +03:00
Fred Sundvik fd7f20b029 Rename supercoder config_user to config.h
Also fixup the include path of parent config
2016-07-29 21:09:33 +03:00
Fred Sundvik 426e9ecc6f Fix config.h include guards 2016-07-29 21:09:32 +03:00
Fred Sundvik a6577b272e Define weak matrix user function for Infinity Ergodox
So that a few keyboards, which don't use them, links properly.
2016-07-29 21:09:31 +03:00
Fred Sundvik bf1c865c7a Speed up ChibiOS keymap compilation
By sharing the external library object files between the whole
keyboard, instead of re-compiling them for each keymap.
2016-07-29 21:09:30 +03:00
Fred Sundvik 1641743b9d Change _delay_ms to wait_ms in algernon keymap 2016-07-29 21:09:21 +03:00
Fred Sundvik e7670f6d19 Move some of the Ergodox config settings to shared 2016-07-29 20:48:22 +03:00
Fred Sundvik e0f28c2b10 Add empty led control functions to Infinity Ergodox
So that most keymaps compiles and links
2016-07-29 20:48:21 +03:00
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity
There are linker errors due to missing led funcitonality though
2016-07-29 20:48:20 +03:00
Fred Sundvik b0376687f4 All Ez keymaps compiles 2016-07-29 20:48:19 +03:00
Fred Sundvik 9af995c59b Initial structure for Ergodox as subprojects
Only the EZ default keymaps compiles at the moment though.
2016-07-29 20:48:04 +03:00
Erez Zukerman 30003d48f9 Merge pull request #584 from algernon/ergodox-ez/algernon
ergodox_ez: Upgrade my keymap to v1.4
2016-07-29 08:11:37 -04:00
Erez Zukerman 64e76f6ed3 Merge pull request #583 from coderkun/coderkun_neo2
Ergodox EZ: update keymap “coderkun_neo2”
2016-07-29 08:10:46 -04:00
Erez Zukerman 3c235b4bf9 Merge pull request #580 from MatsLanGoH/patch-1
Fixed a typo
2016-07-29 08:09:05 -04:00
Gergely Nagy f82437f08e ergodox_ez: Upgrade my keymap to v1.4
* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-29 12:24:33 +02:00
coderkun 3ace37271b disable sleep LED 2016-07-29 11:28:37 +02:00
coderkun 70755d6614 complete labels for modifiers in keymap schema 2016-07-29 11:07:50 +02:00
coderkun 08239aadea use Ergodox EZ’s third LED for “scroll lock” 2016-07-29 11:07:50 +02:00
coderkun 61fbb47eb6 fix grave (GRV) and acute (ACUT) accents 2016-07-29 11:06:18 +02:00
Stephen Christie c018743729 Connected all layers through Adjust layer 2016-07-29 00:08:48 -04:00
Matthias e8f7038959 Fixed a typo
Fixed a typo in line 738 'void martix_init' to 'void matrix_init'
2016-07-29 10:02:59 +09:00
Jack Humbert 7559edc6e6 Merge pull request #578 from 0xdec/master
0xdec Preonic keymap
2016-07-28 16:34:34 -04:00
Jack Humbert 9b5edbdce9 Merge pull request #577 from hot-leaf-juice/master
Pull request to include my keymap if you want it!
2016-07-28 16:34:16 -04:00
Jack Humbert 16f8426fe2 Merge pull request #573 from algernon/f/make-all-stop-on-error
tmk_core/rules.mk: Make PRINT_ERROR* stop on error
2016-07-28 16:32:37 -04:00
Jordi Orlando 3b39910cb9 Create 0xdec Preonic keymap
An ergonomically optimized Colemak keymap for the grid-layout Preonic
2016-07-28 14:36:20 -05:00
Stephen Christie 6567fa1ebe Fixed Function keys (Impossible layout) 2016-07-28 14:57:45 -04:00
Stephen Christie a4e5a4d566 Modified Qwerty, created Qwerty with numbers 2016-07-28 13:49:25 -04:00
Christopher Browne 2d59c97ec1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-28 12:42:21 -04:00
Jack Humbert 80667e898a Merge pull request #572 from algernon/f/tap-dance-debug
tap-dance: Add some debugging support
2016-07-28 12:28:30 -04:00
Jack Humbert e5ac0e8369 Merge pull request #570 from sethbc/fix_bone2planck_build
Fix bone2planck build
2016-07-28 12:27:46 -04:00
Jack Humbert a6d279a343 Merge pull request #569 from sethbc/fix_stanleylai_warnings
kill warnings filling up travis buildlog
2016-07-28 12:27:11 -04:00
Jack Humbert 36df9fd3fd Merge pull request #568 from sethbc/fix-colemak-osx-pc-no
update NO_AMP to NO_AMPR
2016-07-28 12:26:43 -04:00
Jack Humbert f96a2a74ea Merge pull request #566 from SmackleFunky/master
Allow toggling out of plover layer
2016-07-28 12:26:11 -04:00
Jack Humbert 9171ce1d17 Merge pull request #559 from Talljoe/fix-compiler-warning
Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
2016-07-28 12:24:42 -04:00
Jack Humbert 8d98f37fbb Merge pull request #564 from mazinbokhari/master
Move to keyboards
2016-07-28 12:24:03 -04:00
Callum Oakley 1eeceee355 Added readme.md for custom layout. 2016-07-28 12:15:55 +01:00
Toni 684d869fab added homerow-ish brackets 2016-07-28 11:58:53 +02:00
Callum Oakley 9822b9f743 Added custom keymap.
Added custom keymap.
2016-07-27 21:18:19 +01:00
Toni 6ff8a81520 first try ar adding the parenthesis mess for german iso 2016-07-27 21:11:55 +02:00
Toni 9f21c0aa06 Merge remote-tracking branch 'origin/master' into iso_split_rshift
merge with master
2016-07-27 20:35:13 +02:00
Christopher Browne 911d0a040e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-27 12:57:54 -04:00
Gergely Nagy b21e8b97ac tap-dance: Add some debugging support
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-27 14:49:19 +02:00
Gergely Nagy dd77054790 tmk_core/rules.mk: Make PRINT_ERROR* stop on error
Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes #571, and likely breaks Travis badly.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-27 08:53:05 +02:00
Seth Chandler 180a3da44d remove unnecessary includes 2016-07-27 02:32:15 -04:00
Seth Chandler 95ef3f864e fix numerous errors in bone2planck keymap 2016-07-27 02:30:17 -04:00
Seth Chandler 368d0bdf68 kill warnings filling up travis buildlog 2016-07-27 02:21:09 -04:00
Seth Chandler 13bb3a7379 update NO_AMP to NO_AMPR 2016-07-27 02:06:19 -04:00
SmackleFunky fdd07991de Allow toggling out of plover layer 2016-07-27 04:44:24 +00:00
Mazin Bokhari 3fd1c9d72b Move to keyboards 2016-07-26 22:43:04 -05:00
Stephen Christie 57952949fe General table cleanup. 2016-07-26 23:33:21 -04:00
Erez Zukerman 93f366fa7d Merge pull request #562 from michaelklos/doc
Added Tap Dance Example
2016-07-26 21:54:10 -04:00
Erez Zukerman 685c8ba64c Merge pull request #533 from mazinbokhari/master
Add my layout optimized for working in emacs, vim, command line, etc.
2016-07-26 21:52:39 -04:00
Michael Klos 7e69de061a Added Tap Dance Example
Added (simple) Tap Dance example implementation steps.
2016-07-26 18:41:35 -04:00
Stephen Christie ff8136b883 Modified Plover layer for Impossible's home position. 2016-07-26 17:39:21 -04:00
Stephen Christie 465cf08c63 Removed unused layers (keeping QWERTY for later/reference) 2016-07-26 17:37:56 -04:00
Stephen Christie fb2a7d787a Removed unused layers (left QWERTY for later use/reference) 2016-07-26 17:29:19 -04:00
Christopher Browne 2a349e96bb Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-26 16:35:44 -04:00
Jordi Orlando ea2d2f5d58 Simplify HSV->RGB calculation
De-dupe repeated code
2016-07-26 15:31:22 -05:00
Jack Humbert b66131eeb5 disable midi by default 2016-07-26 15:59:26 -04:00
Jordi Orlando 899c88cd8b Increament -> increment 2016-07-26 14:46:30 -05:00
Jordi Orlando 3a860c4bc2 Clean up rgblight.c
Fix formatting issues, clarify comments
2016-07-26 14:43:45 -05:00
Jason Janse van Rensburg a41a7a9100 include base config.h instead of copying it 2016-07-26 16:19:34 +02:00
Jason Janse van Rensburg 8244fa40cc added config.h, and missing Ins of filpped navigation layer 2016-07-26 14:58:17 +02:00
Joshua T 5607b716ba Merge remote-tracking branch 'upstream/master' 2016-07-26 01:49:24 -05:00
Joshua T 876a6bdd4c Modified Atreus extend and Ergodox.
Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
2016-07-26 01:44:57 -05:00
erlo muvman 26510e6de8 Delete default.png 2016-07-25 20:16:11 -05:00
erlo muvman 3779e1988e Delete default_highres.png 2016-07-25 20:16:07 -05:00
erlo muvman 97efac0f1c Update readme.md 2016-07-25 20:14:19 -05:00
erlo muvman 6e2d7ebd80 Update readme.md 2016-07-25 20:12:48 -05:00
erlo muvman 048e8b7849 Update readme.md 2016-07-25 20:06:58 -05:00
Jason Janse van Rensburg 27d27b179b Merged branch master into bone2planck 2016-07-25 22:55:28 +02:00
Jason Janse van Rensburg 3e462fac31 added missing F keys in flipped layer 2016-07-25 20:21:32 +02:00
Christopher Browne 17a7570e08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-25 12:55:46 -04:00
Jack Humbert f9aadd17e8 Merge pull request #558 from lindhe/master
Fix misspelled command in Norwegian helper
2016-07-25 11:16:54 -04:00
Andreas Lindhé 283ebbe142 Change Nordic ampersand code to match the English
Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"
2016-07-25 12:50:56 +02:00
Toni 5e2e8c89e8 Merge remote-tracking branch 'origin/master' into iso_split_rshift
whatever
2016-07-25 12:49:38 +02:00
Andreas Lindhé b6fa762234 Fix misspelled command in Norwegian helper 2016-07-25 11:29:54 +02:00
Jack Humbert 8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jack Humbert 4aa7d2e206 Merge pull request #554 from robertdale/music-recording-documentation
Added music recording/playing doc
2016-07-24 21:58:23 -04:00
Jack Humbert 24bd931962 Merge pull request #552 from robertdale/music-play-fix
Fixes issue #551 - ensure there's a recording to play before playing
2016-07-24 21:58:01 -04:00
Jack Humbert 41f15d8c34 Merge pull request #550 from Darthabel/fix_bepo
Fix some errors in bepo mapping
2016-07-24 21:57:38 -04:00
Jack Humbert 46f84157ce Merge pull request #549 from locksmithdon/patch-1
Added LEADER_EXTERNS() call to readme.
2016-07-24 21:57:15 -04:00
Jack Humbert 670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic
CMD keymap for Preonic
2016-07-24 21:56:50 -04:00
Jack Humbert 384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup
Satan cleanup
2016-07-24 21:56:23 -04:00
Erez Zukerman 4885225159 Merge pull request #534 from willwm/teckinesis
Teckinesis for ErgoDox EZ
2016-07-24 18:04:59 -07:00
Will Wolff-Myren f4cb84c940 Remove images, per @ezuk request. =) 2016-07-24 14:33:17 -07:00
Joe Wasson f9956c2aac Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled. 2016-07-24 12:56:28 -07:00
Erez Zukerman 1e944a4991 Merge pull request #542 from algernon/f/hold-the-dance
Tap-dance: support for holding keys
2016-07-24 11:36:05 -07:00
Erez Zukerman 36f2e22283 Merge pull request #535 from algernon/ergodox-ez/algernon
ergodox_ez: Update my keymap to v1.3
2016-07-24 11:34:33 -07:00
Robert Dale 812007a241 added music recording/playing doc 2016-07-24 10:23:33 -04:00
Robert Dale 3ea738e450 ensure there's a recording to play before playing; also enables the LGUI button to play a tone 2016-07-24 10:00:39 -04:00
Vivien Alger 7b4d30ee50 Fix some errors in bepo mapping 2016-07-24 10:57:49 +02:00
Don Smith a4034b75c0 Added LEADER_EXTERNS() call.
This seems to be needed in most cases.
2016-07-24 19:18:22 +12:00
Jonathan Lucas e6a41e43aa Updated Readme 2016-07-23 21:26:01 -07:00
commandlinedesign c826bcfc39 Did a derp and forgot to set Trans on Arrow layer 2016-07-23 21:08:00 -07:00
commandlinedesign 4480a74a4b Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position 2016-07-23 21:02:23 -07:00
Jason Janse van Rensburg 4e0bf283f6 added readme 2016-07-24 05:11:07 +02:00
commandlinedesign c1fb82623c Tested, resolved Mouse issue, resolved numpad issue 2016-07-23 20:02:45 -07:00
Jason Janse van Rensburg 1bfd57e234 moved insert 2016-07-24 05:02:06 +02:00
Jason Janse van Rensburg 58f092cf87 moved ctrl 2016-07-24 04:52:35 +02:00
commandlinedesign fbafb9449e Resolved errors 2016-07-23 19:32:02 -07:00
Jason Janse van Rensburg 34bce6f206 fixed stupid errors 2016-07-24 04:08:40 +02:00
Jason Janse van Rensburg 62d4ce73ec Merged branch master into bone2planck 2016-07-24 04:08:01 +02:00
Jonathan Lucas 9b3708f830 Init Readme
This needs a better description.
2016-07-23 18:52:52 -07:00
Jonathan Lucas 3c7075011b Create Makefile
This is untested, use caution.
2016-07-23 18:50:41 -07:00
Jonathan Lucas b5761df57b Create CMD-Preonic Keymap
This is very Alpha-Mode, and has not been tested or even Made yet.
2016-07-23 18:47:36 -07:00
Jonathan Lucas 4059a16118 Merge pull request #1 from jackhumbert/master
Update from parent
2016-07-23 18:44:01 -07:00
Seth Chandler 75f0922711 fix typo in readme and satan.h 2016-07-23 20:55:20 -04:00
Seth Chandler ef533be2d6 cleanup default layout 2016-07-23 20:52:27 -04:00
Seth Chandler 81fe3d962c update sethbc keymap 2016-07-23 20:37:41 -04:00
Stephen Christie 723857bf8a Table for Fn
layer.
2016-07-22 18:19:07 -04:00
Stephen Christie a39eaa7fb5 Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL. 2016-07-22 17:46:23 -04:00
Toni 5631f1436c converted funtions to QMK aliases 2016-07-22 11:17:57 +02:00
Gergely Nagy 13385f5691 readme.md: Update the tap dance docs
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22 09:10:17 +02:00
Gergely Nagy fca34e2ad6 readme.md: algernon is strictly lowercase
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22 09:10:17 +02:00
Gergely Nagy 44e16ffc80 tap-dance: Code cleanup
Removes a number of duplicated code, by passing actions around instead
of keycodes, so the various dance action functions do not have to look
up the action, but the caller does that for them.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22 09:10:17 +02:00
Gergely Nagy ce8cc9219f tap-dance: Support user_data for the callbacks
Refactored the code a little, so all callbacks now receive a `user_data`
pointer, which can be anything. As an example, the key pairs from
`ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions.

This makes it easier to extend the tap dance functionality, and also
simplifies the code a little.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22 09:10:17 +02:00
Gergely Nagy 70e42489de tap-dance: Support for holding keys
With this change, tap dance will now store the pressed state of the
tap-dance key, and allow one to make an action sooner, while the key is
still held, and only unregister when the key is released.

The registration must happen in the `on_dance_finished` callback, while
unregistering goes to `on_reset`. The surrounding code makes sure not to
call either multiple times.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-22 09:10:17 +02:00
Toni 197244e47f more cosmetic changes (whitespace) 2016-07-22 08:14:08 +02:00
Toni c1f014b1dd purely cosmetic changes 2016-07-22 08:13:06 +02:00
Jack Humbert 8e1d96983a Merge pull request #543 from VoodaGod/bone2planck
updated bone2planck
2016-07-21 21:29:54 -04:00
Jack Humbert 66fed12c98 Merge pull request #541 from milestogo/master
initial kinisis advantage build
2016-07-21 21:05:06 -04:00
Jack Humbert 5249b4451c Merge pull request #540 from replicaJunction/feature-atreus-keymapFunction
Adjusted Atreus KEYMAP() function.
2016-07-21 21:04:45 -04:00
Jack Humbert fb0bba5981 Merge pull request #538 from robertdale/preonic-map-correction
Preonic: Corrected the ascii layout to match the coded layout
2016-07-21 21:03:56 -04:00
Jack Humbert d5d2eb8b5a Merge pull request #536 from pvinis/debug-doc
add some debugging doc, after i found out how to print debug messages
2016-07-21 21:02:37 -04:00
Jack Humbert 6f9f9baff4 Merge pull request #530 from sethbc/master
Misc. fixes from sethbc
2016-07-21 21:01:35 -04:00
Jack Humbert 26546f995f Merge pull request #529 from CommandLineDesign/CMD60-newKeymap
Added CMD60 keymap
2016-07-21 20:59:02 -04:00
Jack Humbert 2bed835a33 Merge pull request #525 from edasque/master
Added Docker as a simple way to build firmwares
2016-07-21 20:58:39 -04:00
Jack Humbert fc9f128648 Merge pull request #522 from exiva/extrakey-macfix
Fix OS X Recognizing keyboard as Mouse/Tablet
2016-07-21 20:57:54 -04:00
Jack Humbert fc4ab870f5 Merge pull request #521 from exiva/makefile-wait
Make DFU wait for bootloader
2016-07-21 20:57:32 -04:00
Jack Humbert 940358ed4f Merge pull request #518 from jakllsch/upstream
keymap_extras changes
2016-07-21 20:56:54 -04:00
Jack Humbert 62a6d3a6f5 Merge pull request #516 from pvinis/tap-dance-anyway
Tap dance anyway
2016-07-21 20:56:24 -04:00
Stephen Christie eeb100f87d First draft of the 'impossible' layout. 2016-07-21 18:19:08 -04:00
Joshua Colbeck c56693f858 Merge pull request #4 from Skrymir/macroUpdates
Macro updates
2016-07-20 23:50:06 -05:00
Josh Colbeck aaa180f463 Added reset keys 2016-07-20 23:15:15 -05:00
milestogo 24e4e6dd18 adding traveller keyboard 2016-07-20 21:12:00 -07:00
Joshua Colbeck 03840a8c4d Merge pull request #3 from jackhumbert/master
pulling in remote changes
2016-07-20 21:56:44 -05:00
Jason Janse van Rensburg b0e9dbecee fixed include paths 2016-07-20 17:05:23 +02:00
Jason Janse van Rensburg 32f5b34ad2 reformat 2016-07-20 16:58:10 +02:00
Jason Janse van Rensburg 3d7244e604 updated bone2planck 2016-07-20 16:42:09 +02:00
Joshua T 15ee180f0e Created readme and added screenshots 2016-07-20 00:38:56 -05:00
milestogo 1984861338 initial kinisis advantage build 2016-07-19 22:35:38 -07:00
Joshua T 8ee9c486fd Adjusted Atreus KEYMAP() function.
This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.
2016-07-19 17:46:03 -05:00
Joshua T 2a4947b28b Modified Atreus layout to account for keymap() function 2016-07-19 17:39:15 -05:00
Joshua T 8cb2cf375b Adjusted Atreus KEYMAP() function.
This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.
2016-07-19 17:33:10 -05:00
Joshua T 377bcb00fb Added Gaming layer and removed Dvorak
Also added tap/hold functions on central keys
2016-07-19 17:01:21 -05:00
Pavlos Vinieratos 4e6a8627d8 add a couple of comments 2016-07-19 18:18:57 +02:00
Pavlos Vinieratos d5daec2a58 on_each_tap_fn is called on tap down and tap up 2016-07-19 18:18:57 +02:00
Pavlos Vinieratos 2e815ad9a2 add link to hid_listen 2016-07-19 17:34:23 +02:00
Robert Dale 9c26498f49 added Midi On/Off; Enter is actually transparent 2016-07-19 08:43:41 -04:00
Robert Dale 47223ebee4 Corrected the ascii layout to match the coded layout 2016-07-19 08:00:03 -04:00
Toni 5cd6d607fc changed ctrl back to enter. "j" interfered with my vimming 2016-07-19 09:17:31 +02:00
Toni 1988c180e3 small cosmetic change 2016-07-19 09:16:55 +02:00
Pavlos Vinieratos 6eb21d2680 add some debugging doc, after i found out how to print debug messages 2016-07-19 00:07:50 +02:00
Pavlos Vinieratos d8a979b6d5 add a bit of documentation 2016-07-19 00:01:11 +02:00
Pavlos Vinieratos dda2fd6ff3 in the default case, it should be called if there is actually a tap
dance happening, and in the normal case, it should be called when the
tap down is happening.
2016-07-18 23:34:02 +02:00
Christopher Browne 82f768e6c0 Notes about changes 2016-07-18 16:07:00 -04:00
Toni 4b32a161d0 renamed keymap 2016-07-18 10:50:45 +02:00
Toni 36242d5ac5 reduced makefile size. not so much needed due to "inheritance" 2016-07-18 10:50:19 +02:00
Gergely Nagy 53eb36c085 ergodox_ez: Update my keymap to v1.3
This updates my ErgoDox EZ layout to v1.3, which has the following
noteworthy changes:

* Added support for logging keys, by pressing `LEAD d`. Also included is
  a tool to generate a **heatmap** out of the logs.
* The arrow and navigation keys were rearranged again, and now require
  an additional key being held to activate. See the **base layer** for
  an image that shows where arrows are.
* The **experimental** layer has been redone, and is now
  called **ADORE**, and as such, can be enabled by `LEAD a` now.
* Switching between Dvorak and ADORE is now persisted into EEPROM, and
  survives a reboot.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-18 08:57:30 +02:00
Will Wolff-Myren 3c4620bf81 Update readme.md
* Markdown cleanup
2016-07-17 15:08:04 -07:00
Will Wolff-Myren 8fb4074578 Update readme.md
* Updated layout images, json from Keyboard Layout Designer
* Added links to Keyboard Layout Designer templates.
* Added images of TECK, Kinesis layouts.
2016-07-17 15:04:50 -07:00
Will Wolff-Myren ea2b1670f6 Update description comment. 2016-07-17 14:56:37 -07:00
Will Wolff-Myren 5bf40bfb36 [MEDIA]: Remove Power, Sleep, Mail, MyComp
I kept hitting these on accident while attempting to move the cursor or
mouse. =P
2016-07-17 14:19:22 -07:00
Will Wolff-Myren ecc0fce210 [BASE]: Meh, Hyper now have symbols on both sides
Left: MEH_T(KC_BSLS),ALL_T(KC_SLSH)
Right: ALL_T(KC_LBRC),MEH_T(KC_RBRC)
2016-07-17 14:16:31 -07:00
Toni 11bf8355cf new modifier "J" is crtl 2016-07-17 23:13:49 +02:00
Will Wolff-Myren e9453b3fdc Update Base Layer comment to match new layout. 2016-07-17 14:08:22 -07:00
Will Wolff-Myren 11f8d167ec [BASE]: KC_MINS -> KC_GRV 2016-07-17 14:07:14 -07:00
Will Wolff-Myren e900c39669 RSpec: KC_EQL -> KC_MINS 2016-07-17 14:01:41 -07:00
Will Wolff-Myren 973ea2f917 LSpec: KC_GRV -> KC_EQL 2016-07-17 13:58:43 -07:00
Mazin Bokhari b9102b4bfa Update readme. My layout optimized for emacs & vim 2016-07-17 15:57:23 -05:00
Mazin Bokhari 964c064123 Update readme. My layout optimized for emacs & vim 2016-07-17 15:53:42 -05:00
Will Wolff-Myren abe8bfa3a6 Update .gitignore to include VSCode setting. 2016-07-17 13:50:36 -07:00
Mazin Bokhari 6cd2b48fed Merge branch 'master' of https://github.com/mazinbokhari/qmk_firmware 2016-07-17 15:35:05 -05:00
Mazin Bokhari 1336b0198c Add caps lock; sucks that there is no light for it... 2016-07-17 15:32:53 -05:00
Mazin Bokhari cb25f1ad93 Remove more keys 2016-07-17 14:56:32 -05:00
Mazin Bokhari cfa5a475d0 Move dot in symbol layer 2016-07-17 14:44:37 -05:00
Mazin Bokhari 7a5b7233f2 Move modifier kyes around 2016-07-17 14:43:21 -05:00
Mazin Bokhari 266eacc9ec Remove more unnecessary buttons 2016-07-17 14:29:37 -05:00
Mazin Bokhari 76b5dc84af Add page up/down and home/end to arrow 2016-07-17 14:11:08 -05:00
Mazin Bokhari f83591cff0 Change visual 2016-07-17 14:02:46 -05:00
Mazin Bokhari 742d6dbdc2 Reorganize media keys 2016-07-17 13:55:10 -05:00
Mazin Bokhari ec505d07d2 Remove unnecessary modifiers 2016-07-17 13:35:47 -05:00
Mazin Bokhari d7b1cee2df Edit visual keymap 2016-07-17 13:19:11 -05:00
Mazin Bokhari f76f5af853 Add arrow keys to layer 2016-07-17 13:14:04 -05:00
Mazin Bokhari 6dc5aba315 Minor changes 2016-07-17 13:09:54 -05:00
Mazin Bokhari 8c8f2f898b Add empty arrow layer, reorder some keys in media, map layer keys 2016-07-17 13:02:54 -05:00
Seth Chandler d40d18ab1a don't believe the hex files are posted to qmk.fm 2016-07-17 10:37:45 -04:00
Toni db7aa91e76 helper file for me to stay up-to-date with master 2016-07-17 15:10:14 +02:00
Toni de96513ff2 changes needed for a ISO satan PCB including a split right-shift key 2016-07-17 14:57:56 +02:00
Seth Chandler f6aeaac5b5 update more non-existent readmes for QMK.fm 2016-07-17 03:53:34 -04:00
Seth Chandler 0a2653bac8 update broken link 2016-07-17 03:38:53 -04:00
Seth Chandler 68b1affbbd update audio links 2016-07-17 03:32:02 -04:00
Seth Chandler 45414fed7b update tmk link 2016-07-17 03:28:48 -04:00
Seth Chandler a95ab37162 update link to Vagrant docfile 2016-07-17 03:24:36 -04:00
Seth Chandler 38508180c7 update readmes in certain directories to work with qmk.fm 2016-07-17 03:24:00 -04:00
Pavlos Vinieratos d3091faf36 change naming, and remove extraneous definition 2016-07-17 08:28:03 +02:00
Seth Chandler 6289332759 add custom makefile for sethbc keymap 2016-07-16 23:52:02 -04:00
Seth Chandler f954223749 update makefile to default to no virtual dip switches 2016-07-16 23:51:27 -04:00
Seth Chandler dddaebfa98 update readme images 2016-07-16 23:41:20 -04:00
Jonathan Lucas 2877b858d3 Fix erroneous character
Must have been keeb testing :)
2016-07-16 20:38:55 -07:00
Jonathan Lucas f13f48a35e Added CMD60 keymap 2016-07-16 20:24:14 -07:00
Joshua T 0642126720 Merge branch 'master' of https://github.com/replicaJunction/qmk_firmware 2016-07-15 18:02:38 -05:00
Joshua T 243ae75256 Added default layer switch QWERTY to Colemak 2016-07-15 18:02:23 -05:00
Joshua T c5768a5f32 Added default layer switch QWERTY to Colemak 2016-07-15 17:49:14 -05:00
Joshua T 77377e2784 Fixed a merge conflict 2016-07-15 17:44:39 -05:00
Pavlos Vinieratos f3b56701ed add an anyway and a reset callback
when using tap dance, we have the `regular` callback that is called on
the last tap. this commit adds an `anyway` callback that is called on
every tap, and a `reset` callback that is called on reset of the tap
dance taps.
2016-07-16 00:04:12 +02:00
Pavlos Vinieratos 1a7e954f9f in case its NULL 2016-07-16 00:04:12 +02:00
Erik Dasque aa2a79bbfa Further simplyfying the docker usage
We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com
2016-07-15 13:26:34 -04:00
Erik Dasque 0446263935 Adding Docker build system & documentation 2016-07-15 12:55:40 -04:00
Christopher Browne ba0d81f270 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-15 11:19:52 -04:00
Travis La Marr d48a4cf1eb Fix OS X Recognizing keyboard as Mouse/Tablet
Modified the LUFA USB HID Descriptor to change the logical/usage
minimums for System Control from 0x01 (Mouse) to 0x81 (System Power
Down), this fixes OS X recognizing the Planck as having a mouse and
tablet, even with mousekeys off.
2016-07-15 10:41:32 -04:00
Travis La Marr 0b8c448b30 Make DFU wait for bootloader
Added a loop for waiting for the keyboard to be put in bootloader mode,
rather than failing out. Makes building keymaps easier.
2016-07-15 10:28:23 -04:00
Joshua T 42843d9b62 Merge remote-tracking branch 'upstream/master' 2016-07-15 01:01:19 -05:00
Jonathan A. Kollasch 4278d88615 keymap_dvorak.h: add missing shifted keys, fix whitespace 2016-07-14 11:32:43 -05:00
Jonathan A. Kollasch 25938a09a6 extra_keymaps: use RALT() instead of 0x1400 for AltGr 2016-07-14 11:13:35 -05:00
Jonathan A. Kollasch 010dd13084 keymap_extras: add newline at end of files 2016-07-14 11:10:05 -05:00
Jack Humbert 9ecf9073b9 Merge pull request #489 from Skrymir/master
New ergodox-ez layout
2016-07-14 10:59:23 -04:00
Jack Humbert 8bbbbcddf9 Merge pull request #515 from pvinis/reset-function
extract reset keyboard into a function
2016-07-14 10:53:51 -04:00
Will Wolff-Myren 76469ebbcf Replaced ordinary-media.{png|json} with new media layout 2016-07-14 01:22:15 -07:00
Will Wolff-Myren 1b776f0f33 Replaced ordinary-symbol.{png|json} with new base layout. 2016-07-14 01:03:45 -07:00
Will Wolff-Myren b587245430 Replaced ordinary-base.{png|json} with new base layout. 2016-07-14 00:39:01 -07:00
Will Wolff-Myren 825aead3bd Replaced readme.md with stub
(incl. reference to original layout)
2016-07-14 00:38:00 -07:00
Joshua T 92e7291ad7 Corrected merge conflict 2016-07-13 22:41:02 -05:00
Joshua T f90d89458c Created replicaJunction keymaps. 2016-07-13 22:37:34 -05:00
Will Wolff-Myren 8f3cdea357 Created "teckinesis" keymap folder
(Based on "ordinary" keymap by Nicholas Keene)
2016-07-13 13:17:55 -07:00
Pavlos Vinieratos a28a6e5b79 extract reset keyboard into a function
that makes it easy to call reset_keyboard() from a function in a keymap
2016-07-13 16:38:02 +02:00
Josh Colbeck fb46eb2de1 Added open resource macro
tap to type, hold for resource
2016-07-12 23:52:02 -05:00
Joshua Colbeck 68ceffe53e Merge pull request #2 from jackhumbert/master
Pull from upstream
2016-07-12 23:14:30 -05:00
Christopher Browne f4fbfe6e54 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-12 11:57:15 -04:00
Christopher Browne 477ed703c8 I did not like Space Cadet paren; it jumps in in way too many extra cases 2016-07-12 11:57:05 -04:00
Joshua T 32725dae5b Created replicaJunction keymaps. 2016-07-11 17:49:12 -05:00
Jack Humbert a998a48673 Merge pull request #477 from Smilliam/master
Canceling Space Cadet state with opposite shift key
2016-07-11 09:14:43 -04:00
Jack Humbert 076de6fa75 Merge pull request #506 from stanleylai/master
Added my custom keymap for Satan
2016-07-11 09:14:11 -04:00
skullydazed d5102c7715 Merge pull request #507 from ruiqimao/master
fixed clueboard LED pin assignments and matrix documentation
2016-07-11 02:01:17 -07:00
Ruiqi Mao cb0e102adb fixed clueboard LED pin assignments and matrix documentation 2016-07-11 01:18:35 -07:00
Smilliam 5e58e2281a amended extraneous file edits 2016-07-10 19:10:00 -07:00
Smilliam b12fe6abb2 Made rollover behavior for space cadet optional 2016-07-10 19:04:01 -07:00
Stanley Lai 753cbee5c0 Added my custom keymap for Satan 2016-07-10 12:07:56 -07:00
Jack Humbert 4081fc4d8f Merge pull request #505 from fredizzimo/documentation_fix
Remove out of place documentation, caused by ChibiOS merge
2016-07-10 14:02:10 -04:00
Fred Sundvik c7728780de Remove out of place documentation, caused by ChibiOS merge 2016-07-10 20:00:04 +03:00
Jack Humbert b0300d8d8f Merge pull request #502 from robotmaxtron/master
Adding robotmaxtron's GH60 Keymap
2016-07-09 20:55:58 -04:00
Max Whittingham df958a2dbc Update keymap.c 2016-07-09 18:58:16 -05:00
Jack Humbert 9dc6dfbf96 Merge pull request #500 from TerryMathews/master
Establish Poker clone keymap for Satan
2016-07-09 19:19:05 -04:00
TerryMathews 4decdd2b18 Merge pull request #1 from jackhumbert/master
Catch up with jack's master
2016-07-09 16:46:00 -04:00
TerryMathews 979a0d25f0 Establish Poker clone keymap for Satan
Maps all of the side-print legends on the stock Poker II keycaps that
are feasible (doesn't support repeat rate toggling, Pmode recording).
2016-07-09 16:42:26 -04:00
Max Whittingham 1ab527a4db Cleaning up repo 2016-07-09 03:20:58 -05:00
Erez Zukerman c444f4f702 Documents tap dance 2016-07-08 21:40:57 -04:00
Jack Humbert 4139841e9d Merge pull request #498 from fredizzimo/fix_make_dependencies
Fix make dependencies
2016-07-08 16:44:18 -04:00
Fred Sundvik 6911ead027 Use order only prerequisites to avoid re-linking
The prerequisites at the start of the build process are order-only
so that the trget don't link again. Also added as a dependency to
the compilation to force the messages to be printed at the start
2016-07-08 23:19:48 +03:00
Fred Sundvik e8e300d5c4 Fix name of makefile dep files
The files can't start with a .dot, as the wildcard function wont
find them. So this is fixed by removing the BUILD_DIR from the
name.
2016-07-08 22:59:09 +03:00
Jack Humbert 8610481c37 Merge pull request #496 from fredizzimo/makefile_optimization
Makefile optimization
2016-07-08 12:01:32 -04:00
Fred Sundvik 1e3db59097 Fix the link target 2016-07-08 18:18:33 +03:00
Fred Sundvik ccebceeb6f Don't run git describe for ever file that is built 2016-07-08 17:44:41 +03:00
Fred Sundvik b86b0480d5 Speed up compilation by not using recusive make
The cleaning is done outside the targets, by checking the
requested target name.
2016-07-08 17:20:37 +03:00
Jack Humbert b6e47f7a5f Merge pull request #494 from robbiegill/master
Port support for hhkb-jp from tmk
2016-07-08 08:35:24 -04:00
Jack Humbert a9979c6f42 Merge pull request #493 from TerryMathews/master
Create keycodes for RGB control functions
2016-07-08 08:34:27 -04:00
TerryMathews 564c743aa0 Fix a function mismatch that was causing LEDs to not properly initialize
See #430. Name of function being called at init was updated to
led_init_ports(), but the call itself wasn't renamed.
2016-07-08 03:40:05 -04:00
TerryMathews f7a8682226 Move return out of event if block
According to Jack, this makes the return case not be processed. Doesn't
break anything in the firmware.
2016-07-08 03:32:28 -04:00
Robbie Gill 66ffb1cb3a port missing support for hhkb-jp from tmk 2016-07-07 21:03:20 -07:00
TerryMathews e2ec45a755 Fix cluepad and planck 2016-07-07 23:57:11 -04:00
TerryMathews ccfa7351ad Fix compile error on Clueboard 2016-07-07 23:50:04 -04:00
TerryMathews 50c686587e Create keycodes for RGB control functions
Moves RGB controls out of the macro function and assigns them their own
keycodes:
RGB_TOG (toggle on/off)
RGB_MOD (mode step)
RGB_HUI (increase hue)
RGB_HUD (decrease hue)
RGB_SAI (increase saturation)
RGB_SAD (decrease saturation)
RGB_VAI (increase brightness)
RGB_VAD (decrease brightness)
2016-07-07 23:34:33 -04:00
Jack Humbert e8719e10c4 Merge pull request #491 from fredizzimo/keycode_fixes
Some fixes for keycode processing
2016-07-07 13:57:39 -04:00
Fred Sundvik a2eae81927 Fix IS_CONSUMER macro 2016-07-07 20:04:27 +03:00
Fred Sundvik 0bfb608615 Remove unhandled KC_BTLD, RESET should be used instead 2016-07-07 19:56:55 +03:00
Fred Sundvik 9870082a06 Fix the range for consumer keys 2016-07-07 19:48:39 +03:00
Jack Humbert c1dfb636ef fixes quantum template (actually) 2016-07-07 12:22:10 -04:00
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio 2016-07-07 11:33:34 -04:00
Christopher Browne 97dfbd1afc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-07 11:13:22 -04:00
Jack Humbert ad43d450ca Merge pull request #490 from fredizzimo/integrate_visualizer
Integrate visualizer for ChibiOS and Infinity Ergodox
2016-07-07 09:59:33 -04:00
Jack Humbert 589df84d6c corrects quantum template 2016-07-07 09:58:44 -04:00
Fred Sundvik caedec92d2 Move the visualizer_user file to keymap folder
Also rename it to visualizer.c
2016-07-07 14:42:16 +03:00
Fred Sundvik aaac254ebc Delete lcd_backlight_hal.c
The functionality can now be found in the infinity_erogodox.c file
instead.
2016-07-07 14:29:53 +03:00
Fred Sundvik bcbd8f1c50 Add suspend support to the ChibiOS visualizer 2016-07-07 14:22:45 +03:00
Fred Sundvik dae7c9bfb3 Fix the SERIAL_LINK_ENABLE macro in Visualizer
Rename from USE_SERIAL_LINK -> SERIAL_LINK_ENABLE
2016-07-07 14:12:56 +03:00
Fred Sundvik 7229751ba9 Fix visualizer crash at startup
Visualizer and serial link initialized in the wrong order.
The LED_ENABLED define wasn't set properly
uGfx is always initialized
2016-07-07 14:01:20 +03:00
Fred Sundvik 07d0d5cbe4 Makefile fixes and update of Visualizer 2016-07-07 12:46:10 +03:00
Fred Sundvik 9772e697a0 Add Infinity Ergodox display drivers 2016-07-07 12:45:34 +03:00
Josh Colbeck ac978a50a2 Merge branch 'master' of https://github.com/Skrymir/qmk_firmware 2016-07-06 23:38:58 -05:00
Jack Humbert 21e443101f Merge pull request #484 from jackhumbert/lets-split-support
Add Let's Split support
2016-07-06 23:44:22 -04:00
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 2016-07-06 22:48:19 -04:00
Joshua Colbeck e0e1c119f0 Merge pull request #1 from Skrymir/patch-1
add ergodox layout
2016-07-06 20:29:29 -05:00
Josh Colbeck 5ed673d82d Changed layer switching to momentary
corrected macro
2016-07-06 20:24:57 -05:00
Jack Humbert c88207884b Merge branch 'master' into lets-split-support 2016-07-06 18:05:50 -04:00
Fred Sundvik 70797bb8f2 Makefile changes and files to compile Visualizer 2016-07-07 00:20:20 +03:00
Fred Sundvik 10f3a1b621 Add ugfx submodule 2016-07-07 00:17:32 +03:00
Jack Humbert 5baaf871bb Merge pull request #488 from fredizzimo/add_visualizer
Add visualizer library
2016-07-06 15:02:51 -04:00
Fred Sundvik 6c29655790 Merge commit '73d890a2c9c34b905cd5e74e7146fdd4578dcb96' into add_visualizer 2016-07-06 20:30:58 +03:00
Fred Sundvik f727801bc6 Delete .gitmodules from visualizer 2016-07-06 20:17:16 +03:00
Fred Sundvik 9f33a5593c Add 'quantum/visualizer/' from commit 'bde869aa7ec8601459bc63b9636081d21108d1be'
git-subtree-dir: quantum/visualizer
git-subtree-mainline: 19f480992c
git-subtree-split: bde869aa7e
2016-07-06 20:15:45 +03:00
Jack Humbert 19f480992c Merge pull request #487 from fredizzimo/serial_link_ergodox
Integrate serial link support for ChibiOS and Infinity Ergodox
2016-07-06 09:48:58 -04:00
Fred Sundvik e5726b017a Add setting of the master side to the makefile 2016-07-06 16:06:53 +03:00
Fred Sundvik 4b45deb652 Enable serial_link support for ChibiOS 2016-07-06 16:06:53 +03:00
Fred Sundvik a7e3e4e652 Add serial_link compilation to Infinity Ergodox 2016-07-06 16:06:53 +03:00
Jack Humbert eb6e17be6f adds eep, removes usbconfig.h 2016-07-06 09:04:04 -04:00
Jack Humbert c6d671e54c Merge pull request #482 from fredizzimo/serial_link
Add serial link library
2016-07-06 08:56:57 -04:00
Fred Sundvik d5e7603d55 Remove extra serial_link subdirectory 2016-07-06 13:26:20 +03:00
Fred Sundvik c5bf090d16 Remove CGreen make files 2016-07-06 13:10:30 +03:00
Fred Sundvik 3ac52b2e76 Remove serial_link .gitignore and .gitmodules 2016-07-06 13:09:51 +03:00
Jack Humbert 3577e26fd9 fix/annotate wait_us lines 2016-07-06 00:24:31 -04:00
Jack Humbert cb410729e6 remove uno_slave for now, even though it's freakin cool 2016-07-05 23:56:42 -04:00
Jack Humbert dd2522ba8b add options to config.h 2016-07-05 23:52:18 -04:00
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support 2016-07-05 23:40:58 -04:00
Jack Humbert ce01f88c43 images, docks, clean-up [skip ci] 2016-07-05 23:40:54 -04:00
Jack Humbert d707738616 i2c working 2016-07-05 23:27:10 -04:00
Jack Humbert 96f44e1202 one half working 2016-07-05 18:36:02 -04:00
Fred Sundvik 639cdd363e Add 'quantum/serial_link/' from commit 'a20d513e3cdacbf6e0e70a80402497ad10166434'
git-subtree-dir: quantum/serial_link
git-subtree-mainline: 7d28d6a7bc
git-subtree-split: a20d513e3c
2016-07-05 23:27:47 +03:00
Jack Humbert 7d28d6a7bc Merge pull request #480 from fredizzimo/add_infinity_ergodox
Add infinity ergodox
2016-07-05 13:12:01 -04:00
Fred Sundvik f9a6e34c28 Add dfu-util command for programming
Also add .bin generation, which is needed for dfu-util.
2016-07-05 19:28:17 +03:00
Jack Humbert 421ff74e0c Merge pull request #471 from Chipairon/patch-1
Fix for '~' in spanish layout
2016-07-05 11:05:14 -04:00
Jack Humbert 99846b10e8 Merge pull request #478 from fredizzimo/chibios_subprojects
Suprojects for ChibiOS testing
2016-07-05 11:04:54 -04:00
Fred Sundvik b4cd0cfd15 Infinity Ergodox - Add matrix.c and led.c 2016-07-05 16:50:30 +03:00
Fred Sundvik 74847a84f8 First version of Infinity Ergodox
Mostly just adding the files from the fredizzimo repository. Still
needs some fixing until it works
2016-07-05 16:45:29 +03:00
Fred Sundvik cf6cd15920 Fix typo in teensy_lc_onkey.h 2016-07-05 15:54:59 +03:00
Fred Sundvik 6e4f2e18e6 Don't include common_config.h for ChibiOS test 2016-07-05 15:53:40 +03:00
Fred Sundvik 0a040a89e8 Move ChibiOS test board and ld
Move the ChibiOS test subproject board and ld files to the kebyoard
folder, so that the build system can find them
2016-07-05 15:34:35 +03:00
Fred Sundvik b11657d1c8 Suprojects for ChibiOS testing 2016-07-05 14:56:34 +03:00
Josh Colbeck 74d848c942 Merge remote-tracking branch 'jackhumbert/master' into patch-1 2016-07-04 22:44:26 -05:00
Smilliam 6b0c9cc905 fixed indentation. 2016-07-04 19:58:26 -07:00
Smilliam 1412076df6 Allow Space Cadet state to be canceled by alternate Shift key
Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
2016-07-04 19:56:08 -07:00
Jack Humbert 94d3159d9d correct break/return order for planck and preonic defaults 2016-07-04 22:06:22 -04:00
Josh Colbeck a5fb2b58a5 Merge remote-tracking branch 'jackhumbert/master' into patch-1 2016-07-04 15:41:58 -05:00
Josh Colbeck 497b92c3bd Added macro and readme
macros to for often used eclipse shortcuts
2016-07-04 15:22:13 -05:00
Josh Colbeck 1650adf29a Added new keymap 2016-07-04 12:00:06 -05:00
Christopher Browne 2e1cfaf73f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-04 12:32:08 -04:00
Jack Humbert 9e01b219f3 Fixes typos in keycode.txt 2016-07-04 12:19:01 -04:00
Jack Humbert 86a7b060ef Adds wait to i2c (debounce) 2016-07-04 12:13:41 -04:00
Jack Humbert eafaba6b53 Improves debounce 2016-07-04 12:01:10 -04:00
Pavlos Vinieratos df25033fc6 fix typos 2016-07-04 17:55:32 +02:00
Jack Humbert 8e88d55bfd reverts #343 for the most part (#474) 2016-07-04 11:45:58 -04:00
Josh Colbeck 62a92a71d0 Revert "Changed layout of left hand main layer"
This reverts commit 8149924399.
2016-07-03 21:50:04 -05:00
Jack Humbert cab29b61e4 Updated Home (markdown) 2016-07-03 21:34:20 -04:00
Jack Humbert abfc9265c4 Updated Home (markdown) 2016-07-03 21:33:56 -04:00
Jack Humbert 6b67129c51 Destroyed Build Guide (markdown) 2016-07-03 21:33:40 -04:00
Olivier 4cfb262faa Spellchecking. 2016-07-04 01:10:40 +02:00
Joshua Colbeck 8149924399 Changed layout of left hand main layer 2016-07-03 12:24:44 -05:00
Olivier 703dc26853 Merge https://github.com/jackhumbert/qmk_firmware 2016-07-03 16:58:09 +02:00
Olivier 82edc37238 Move Escape and Insert keys, Escape is now easier to reach (useful for vi). Change the layer switching used to keep a bepo layout on US keyboards. 2016-07-03 16:44:57 +02:00
Olivier 6d195dc60c Add a Makefile for the keymap to disable command mode (to keep the keyboard from going into command mode when both Shift keys are hold at the same time) and to allow issuing a simple "make" in the keymap folder to compile it. 2016-07-03 16:27:08 +02:00
Olivier 9aceaaed4c Replace the "Ctrl+Alt+Fx" macro I was using to switch terminals without moving hands by a numeric layer switch key like on the left half, for consistency. 2016-07-03 15:51:55 +02:00
Olivier 17a3dbc159 Integrate mouse keys into function layer, delete mouse layer. 2016-07-03 14:38:03 +02:00
Jack Humbert 21ee3eb569 Merge pull request #472 from Wigguno/master 2016-07-02 22:19:33 -04:00
Richard f4febd2cf7 Fix other KC60 Keymap Makefiles so they compile properly 2016-07-03 13:49:10 +12:00
Richard 54209dc672 Add my keymap to KC60 2016-07-03 13:44:24 +12:00
Rubén Díaz-Jorge 132c047469 Fix for '~' in spanish layout 2016-07-02 10:26:04 +02:00
Seth Chandler 27354ae877 add HHKB support to satan (#470)
* add HHKB support

* fix indentation
2016-07-01 23:50:51 -04:00
fredizzimo 1b319151aa Add warning when submodules are not updated (#469)
* Add warning when submodules are not updated

* Sh compatible syntax for dirty submodule check
2016-07-01 21:57:59 -04:00
fredizzimo c30aba0bce Add ChibiOS packages to the avr_setup script (#468)
* Add ChibiOS packages to the avr_setup script

* Add git as a dependency

* Rename avr_setup.sh -> install_dependencies.sh

Also fix the Vagrant welcome message to reflect the new directory
structure.
2016-07-01 17:22:09 -04:00
fredizzimo 4d4f7684e6 Add ChibiOS support for QMK (#465)
* Modularity and gcc warnings fixes.

* Add ChibiOS support (USB stack + support files).

* Make usb_main more USB_DRIVER #define independent.

* Move chibios to tool.

* Implement jump-to-bootloader.

* Small updates.

* Fix bootloader-jump compiling.

* Move AVR specific sleep_led.c into avr.

* Add basic sleep_led for chibios.

* Update chibios README.

* NKRO fixes.

* Rename some Makefile defines.

* Move STM32 bootloader address config to separate .h file.

* Add ARM Teensies bootloader code.

* Fix chibios/usb_main GET_REPORT handing.

* Add missing #include to keymap.c.

* Make bootmagic.c code portable (_delay_ms -> wait_ms).

* Move declaration of keymap_config.

Should really not declare variables in .h files - since it's included
in different .c files, a proper linker then complains that the same
variable is declared more than once (once for each .c file that the
offending .h is included in).

* Add eeprom support for chibios/kinetis.

* Rename chibios example keyboard.

* Move chibios/cortex selection to local Makefiles.

* Chibios: use WFI in idle. WIP suspend stuff.

* ChibiOS/kinetis: sending remote wakeup.

* ChibiOS/STM32: send remote wakeup.

* Fix report size of boot protocol.

* Fix drop key stroke

Keyboard report should be checked if its transfer finishs successfully.
Otherwise key stroke can be missing when other key event occurs
before the last report transfer is done.

Boot protocol 10ms interval probably causes this problem in case
it receives key events in a row within the period. NKRO protocol
suffers less or nothing due to its interval 1ms.

* Chibios/usb_main: rename a variable for clarity.

* Add correct chibios/bootloader_jump for infinity KB.

* ChibiOS: make reset request more CMSISy.

* Chibios: Add breathing sleep LED on Kinetis MCUs.

* ChibiOS: Update infinity bootloader code to match updated ChibiOS.

* ChibiOS: prettify/document sleep_led code.

* Chibios: Remove the wait in the main loop.

* Add maple mini code.

* Do timeout when writing to CONSOLE EP queue.

Fixes TMK bug #266.

* Chibios: add 'core/protocol' to the makefiles' search path.

* Chibios: Update to new USB API.

* Chibios: add more guards for transmitting (fix a deadlock bug).

* Add update for chibios in README

* Chibios: Fix a HardFault bug (wait after start).

* Chibios: cleanup usb_main code.

* Chibios: Revert common.mk change (fix AVR linking problem).

* core: Fix chibios user compile options

Compile options can be defined in project Makefile such as UDEFS, UADEFS, UINCDIR, ULIBDIR and ULIBS.

* Sysv format for ChibiOS arm-none-eabi-size

Some new patches to ChibiOS puts heap as it's own section. So the
berkeley format is now useless, as the heap will be included in the
BSS report. The sysv format displays the bss size correctly.

* Fix hard-coded path of CHIBIOS

* Add support for new version of ChibiOS and Contrib

The Kinetis support has moved to a separate Contrib repository in
the newest version of Chibios. There has also been some structure
changes. So this adds support for those, while maintaining back-
wards compability.

* Update ChibiOS instructions

* Chibios: implement sleep LED for STM32.

* Chibios: Update the main chibios README.

* Chibios: fix STM32_BOOTLOADER_ADDRESS name.

* Chibios: make the default bootloader_jump redefinable (weak).

* Chibios: disable LTO (link-time optimisation).

With LTO enabled, sometimes things fail for mysterious reasons
(e.g. bootloader jump on WF with LEDs enabled), just because the
linker optimisation is too aggressive.

* Chibios: add default location for chibios-contrib.

* ChibiOS: update mk to match chibios/master.

* ChibiOS: update instructions.md.

* Add chibi_onekey example.

* Add comments to chibi_onekey Makefile.

* Rename some Makefile defines.

* Move STM32 bootloader address config to separate .h file.

* Rename chibios example keyboard.

* Move chibios/cortex selection to local Makefiles.

* Add Teensy LC onekey example.

* Chibios: use WFI in idle. WIP suspend stuff.

* Update chibi/teensy instructions.

* Update chibios/Teensy instructions.

* Add infinity_chibios

* Add keymap_hasu.c

* Infinity_chibios: select correct bootloader_jump.

* Infinity_chibios: improve comments.

* Add generic STM32F103C8T6 example.

* Add maple mini code.

* STM32F103x fixes.

* Add maple mini pinout pic.

* Chibios: updates for 3.0.4 git.

* Chibios: rename example stm32_onekey -> stm32_f072_onekey.

* Chibios: add makefiles for Teensy 3.x examples.

* Chibios: update Teensy 3.x instructions.

* Chibios: Tsy LC is cortex-m0plus.

* Chibios: add more guards for transmitting (fix a deadlock bug).

* Change README for chibios

* Chibios: update examples to current chibios git.

Match the changes in mainline chibios:
 - update chconf.h
 - update supplied ld scripts structure
 - update Teensy instructions (switch to official
    chibios and introduce contrib)

* Add ChibiOS and ChibiOS-Contrib submodules

Also fix the makefile path for them.

* Moves chibios keyboards to keyboards folder

* First version of ChibiOS compilation

Only the stm32_f072_onkey keyboard is ported at the moment. It
compiles, but still doesn't link.

* More chibios fixes

It now compiles without warnings and links

* Move the teensy_lc_onekey to the keyboards folder

* Clean up the make file rule structure

* Remove keymap_fn_to_action

* Update more ChibiOS keyboards to QMK

Most of them does not compile at the moment though.

* Use older version of Chibios libraries

The newest ones have problems with compilation

* Remove USB_UNCONFIGURED event

It isn't present in the older version of ChibiOS

* Fix the infinity_chibios compilation

* Fix potentially uninitialized variable

* Add missing include

* Fix the ChibiOS makefile

* Fix some Chibios keyboard compilation

* Revert the rules.mk file back to master version

* Combine the chibios and AVR makefiles

With just the required overrides in the respective platform
specific one.

* Slight makefile restrucuring

Platform specific compiler options

* Move avr specific targets out of the main rules

* Fix ChibiOS objcopy

The ChibiOS objcopy needs different parameters, so the parameters
are moved to the corresponding platform rule file

* Fix the objcopy for real this time

The comands were moved around, so chibios used avr and the ohter
way around.

Also change the objsize output format

* Fix the thumb flags

* Fix the infinity hasu keymap

* Per platform cpp flags

* Add gcc-arm-none-eabi package to travis

* Add arm-none-eabi-newlib to travis

* Fix the name of the libnewlib-arm-none-eabi lib

* Fix the ChibiOS paths

So that they are properly relative, and builds don't generate
extra folders

* Fix the board path of stm32_f103_onekey

* Only consider folders with Makefiles as subproject
2016-07-01 10:04:53 -04:00
Christopher Browne 44a5f7630f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-30 12:38:48 -04:00
Jack Humbert a8b55f8c85 Test all subprojects with travis (#464)
* tests all subprojects

* too many paren
2016-06-30 09:51:45 -04:00
Robbie Gill bfd673fbae initial version of handwired/fivethirteen (#462) 2016-06-30 09:13:08 -04:00
TerryMathews fbf697b9ff Fix CAPS_LED logic in Satan (#461)
Needed to invert for proper operation. Previous code had LED on when off
and vice versa.
2016-06-29 22:33:09 -04:00
Jack Humbert 2d80eee6b8 test handwired boards 2016-06-29 21:21:02 -04:00
Jack Humbert ba6fb23f07 adds handwire and onekey example 2016-06-29 20:21:05 -04:00
Jack Humbert 7db2ec1509 updates planck experimental, width of color output 2016-06-29 18:47:53 -04:00
Jack Humbert 8125cdb88c gets rid of rand warning [skip ci] 2016-06-29 18:36:52 -04:00
Jack Humbert 60fd885a6e rand supports other chips 2016-06-29 18:35:29 -04:00
Jack Humbert 197f152dee adds random base64 character generator 2016-06-29 18:29:20 -04:00
Jack Humbert 65faab3b89 Moves features to their own files (process_*), adds tap dance feature (#460)
* non-working commit

* working

* subprojects implemented for planck

* pass a subproject variable through to c

* consolidates clueboard revisions

* thanks for letting me know about conflicts..

* turn off audio for yang's

* corrects starting paths for subprojects

* messing around with travis

* semicolon

* travis script

* travis script

* script for travis

* correct directory (probably), amend files to commit

* remove origin before adding

* git pull, correct syntax

* git checkout

* git pull origin branch

* where are we?

* where are we?

* merging

* force things to happen

* adds commit message, adds add

* rebase, no commit message

* rebase branch

* idk!

* try just pull

* fetch - merge

* specify repo branch

* checkout

* goddammit

* merge? idk

* pls

* after all

* don't split up keyboards

* syntax

* adds quick for all-keyboards

* trying out new script

* script update

* lowercase

* all keyboards

* stop replacing compiled.hex automatically

* adds if statement

* skip automated build branches

* forces push to automated build branch

* throw an add in there

* upstream?

* adds AUTOGEN

* ignore all .hex files again

* testing out new repo

* global ident

* generate script, keyboard_keymap.hex

* skip generation for now, print pandoc info, submodule update

* try trusty

* and sudo

* try generate

* updates subprojects to keyboards

* no idea

* updates to keyboards

* cleans up clueboard stuff

* setup to use local readme

* updates cluepad, planck experimental

* remove extra led.c [ci skip]

* audio and midi moved over to separate files

* chording, leader, unicode separated

* consolidate each [skip ci]

* correct include

* quantum: Add a tap dance feature (#451)

* quantum: Add a tap dance feature

With this feature one can specify keys that behave differently, based on
the amount of times they have been tapped, and when interrupted, they
get handled before the interrupter.

To make it clear how this is different from `ACTION_FUNCTION_TAP`, lets
explore a certain setup! We want one key to send `Space` on single tap,
but `Enter` on double-tap.

With `ACTION_FUNCTION_TAP`, it is quite a rain-dance to set this up, and
has the problem that when the sequence is interrupted, the interrupting
key will be send first. Thus, `SPC a` will result in `a SPC` being sent,
if they are typed within `TAPPING_TERM`. With the tap dance feature,
that'll come out as `SPC a`, correctly.

The implementation hooks into two parts of the system, to achieve this:
into `process_record_quantum()`, and the matrix scan. We need the latter
to be able to time out a tap sequence even when a key is not being
pressed, so `SPC` alone will time out and register after `TAPPING_TERM`
time.

But lets start with how to use it, first!

First, you will need `TAP_DANCE_ENABLE=yes` in your `Makefile`, because
the feature is disabled by default. This adds a little less than 1k to
the firmware size. Next, you will want to define some tap-dance keys,
which is easiest to do with the `TD()` macro, that - similar to `F()`,
takes a number, which will later be used as an index into the
`tap_dance_actions` array.

This array specifies what actions shall be taken when a tap-dance key is
in action. Currently, there are two possible options:

* `ACTION_TAP_DANCE_DOUBLE(kc1, kc2)`: Sends the `kc1` keycode when
  tapped once, `kc2` otherwise.
* `ACTION_TAP_DANCE_FN(fn)`: Calls the specified function - defined in
  the user keymap - with the current state of the tap-dance action.

The first option is enough for a lot of cases, that just want dual
roles. For example, `ACTION_TAP_DANCE(KC_SPC, KC_ENT)` will result in
`Space` being sent on single-tap, `Enter` otherwise.

And that's the bulk of it!

Do note, however, that this implementation does have some consequences:
keys do not register until either they reach the tapping ceiling, or
they time out. This means that if you hold the key, nothing happens, no
repeat, no nothing. It is possible to detect held state, and register an
action then too, but that's not implemented yet. Keys also unregister
immediately after being registered, so you can't even hold the second
tap. This is intentional, to be consistent.

And now, on to the explanation of how it works!

The main entry point is `process_tap_dance()`, called from
`process_record_quantum()`, which is run for every keypress, and our
handler gets to run early. This function checks whether the key pressed
is a tap-dance key. If it is not, and a tap-dance was in action, we
handle that first, and enqueue the newly pressed key. If it is a
tap-dance key, then we check if it is the same as the already active
one (if there's one active, that is). If it is not, we fire off the old
one first, then register the new one. If it was the same, we increment
the counter and the timer.

This means that you have `TAPPING_TERM` time to tap the key again, you
do not have to input all the taps within that timeframe. This allows for
longer tap counts, with minimal impact on responsiveness.

Our next stop is `matrix_scan_tap_dance()`. This handles the timeout of
tap-dance keys.

For the sake of flexibility, tap-dance actions can be either a pair of
keycodes, or a user function. The latter allows one to handle higher tap
counts, or do extra things, like blink the LEDs, fiddle with the
backlighting, and so on. This is accomplished by using an union, and
some clever macros.

In the end, lets see a full example!

```c
enum {
 CT_SE = 0,
 CT_CLN,
 CT_EGG
};

/* Have the above three on the keymap, TD(CT_SE), etc... */

void dance_cln (qk_tap_dance_state_t *state) {
  if (state->count == 1) {
    register_code (KC_RSFT);
    register_code (KC_SCLN);
    unregister_code (KC_SCLN);
    unregister_code (KC_RSFT);
  } else {
    register_code (KC_SCLN);
    unregister_code (KC_SCLN);
    reset_tap_dance (state);
  }
}

void dance_egg (qk_tap_dance_state_t *state) {
  if (state->count >= 100) {
    SEND_STRING ("Safety dance!");
    reset_tap_dance (state);
  }
}

const qk_tap_dance_action_t tap_dance_actions[] = {
  [CT_SE]  = ACTION_TAP_DANCE_DOUBLE (KC_SPC, KC_ENT)
 ,[CT_CLN] = ACTION_TAP_DANCE_FN (dance_cln)
 ,[CT_EGG] = ACTION_TAP_DANCE_FN (dance_egg)
};
```

This addresses #426.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* hhkb: Fix the build with the new tap-dance feature

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* tap_dance: Move process_tap_dance further down

Process the tap dance stuff after midi and audio, because those don't
process keycodes, but row/col positions.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* tap_dance: Use conditionals instead of dummy functions

To be consistent with how the rest of the quantum features are
implemented, use ifdefs instead of dummy functions.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>

* Merge branch 'master' into quantum-keypress-process

# Conflicts:
#	Makefile
#	keyboards/planck/rev3/config.h
#	keyboards/planck/rev4/config.h

* update build script
2016-06-29 17:49:41 -04:00
Jack Humbert 215c2119af Implements subprojects and updates projects for this (#459)
* non-working commit

* working

* subprojects implemented for planck

* pass a subproject variable through to c

* consolidates clueboard revisions

* thanks for letting me know about conflicts..

* turn off audio for yang's

* corrects starting paths for subprojects

* messing around with travis

* semicolon

* travis script

* travis script

* script for travis

* correct directory (probably), amend files to commit

* remove origin before adding

* git pull, correct syntax

* git checkout

* git pull origin branch

* where are we?

* where are we?

* merging

* force things to happen

* adds commit message, adds add

* rebase, no commit message

* rebase branch

* idk!

* try just pull

* fetch - merge

* specify repo branch

* checkout

* goddammit

* merge? idk

* pls

* after all

* don't split up keyboards

* syntax

* adds quick for all-keyboards

* trying out new script

* script update

* lowercase

* all keyboards

* stop replacing compiled.hex automatically

* adds if statement

* skip automated build branches

* forces push to automated build branch

* throw an add in there

* upstream?

* adds AUTOGEN

* ignore all .hex files again

* testing out new repo

* global ident

* generate script, keyboard_keymap.hex

* skip generation for now, print pandoc info, submodule update

* try trusty

* and sudo

* try generate

* updates subprojects to keyboards

* no idea

* updates to keyboards

* cleans up clueboard stuff

* setup to use local readme

* updates cluepad, planck experimental

* remove extra led.c [ci skip]

* disable power up for now

* config files updates

* makefile updates

* .h file updates, config tuning

* disable audio for yang
2016-06-29 16:21:41 -04:00
Christopher Browne c9f509f016 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-28 14:46:50 -04:00
Jack Humbert 755b17f8fc Merge pull request #453 from NoahAndrews/update-docs 2016-06-27 14:32:55 -04:00
Noah Andrews b2d1ff7570 Update readme to direct people to using the MHV AVR Shell 2016-06-27 14:00:48 -04:00
Noah Andrews 1b04e9d01e Long overdue fixes and improvements to environment setup scripts (#448)
* Update setup script 1 for new folder structure

* Improve script 1 output

* Launch elevate if run without admin privileges

* Improve MinGW error message

* Improvements and fixes to second script

* Log elevate output in first script
2016-06-27 09:52:01 -04:00
Anand Babu (AB) Periasamy 57066b1246 zoom and undo keys for ab's planck keymap (#446) 2016-06-27 09:51:12 -04:00
Erez Zukerman e9f5c87207 Merge pull request #447 from abperiasamy/ergo-browser-zoom
zoom and undo keys for ab's beginners ergodox-ez keymap
2016-06-27 09:01:51 -04:00
Anand Babu (AB) Periasamy 7712d55215 zoom and undo keys 2016-06-26 20:24:43 -07:00
Jack Humbert e5d1e4b8ce Preonic keymap update 2016-06-26 16:16:21 -04:00
Jack Humbert 0058c33815 updates preonic default layout 2016-06-26 14:20:57 -04:00
Jack Humbert 00dcac7270 updates planck macros to keycodes, prototype fn_actions 2016-06-26 14:08:11 -04:00
Anand Babu (AB) Periasamy 0314620d26 Swap up and down on ab's layout to match default (#441) 2016-06-24 13:43:12 -04:00
Christopher Browne 4d79e22438 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-24 12:19:34 -04:00
Erez Zukerman 40bfc7231e Merge pull request #440 from abperiasamy/ergo-ab-swap-up-down
Swap up and down keys to match default layout
2016-06-24 08:57:06 -04:00
Erez Zukerman d2fc24d2a0 Merge pull request #438 from tkuichooseyou/master
Added tkuichooseyou keymap; for vim and macOS users
2016-06-24 08:56:01 -04:00
Anand Babu (AB) Periasamy 512a68c0ec Swap up and down to match default layout 2016-06-23 20:17:04 -07:00
Jack Humbert b68b722325 updates ez's matrix to spec 2016-06-23 23:14:21 -04:00
Jack Humbert 13bb6b4b7f Backlight abstraction and other changes (#439)
* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme
2016-06-23 22:18:20 -04:00
Peter ba116ceb49 Add OS specific layers that can be switched with macros (#436) 2016-06-23 20:06:13 -04:00
Teddy Ku b9d29cc355 Added tkuichooseyou keymap; for vim and OSX users 2016-06-23 15:09:04 -04:00
Christopher Browne a4bdb0ac0e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-23 11:34:50 -04:00
Anand Babu (AB) Periasamy bab6a8fde5 AB's practical planck keymap (#435) 2016-06-22 23:36:30 -04:00
Jack & Erez 7e584439ee Updates overall readme 2016-06-22 23:24:47 -04:00
Jack & Erez 2443234555 Adds a Readme for the keyboards subdirectory 2016-06-22 23:17:15 -04:00
Mazin Bokhari aea8d43716 Update readme.md 2016-06-22 21:32:51 -05:00
Mazin Bokhari ce5e41d362 Update readme.md 2016-06-22 21:31:37 -05:00
Mazin Bokhari c72c9a7375 Update readme.md 2016-06-22 21:21:27 -05:00
Mazin Bokhari b43b8bdd17 Update readme.md 2016-06-22 21:20:19 -05:00
Mazin Bokhari 521a56f5eb Update readme.md 2016-06-22 21:05:59 -05:00
Mazin Bokhari 5988820c99 Update readme.md 2016-06-22 21:03:01 -05:00
Christopher Browne 0cd017d485 Use Space Cadet parens on LSFT 2016-06-22 16:51:25 -04:00
Christopher Browne 7eee1526bd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-22 16:42:58 -04:00
Jack Humbert 935f0de55d well that didn't work 2016-06-22 14:33:59 -04:00
Jack Humbert 56bb5b51bc adds author block to readme 2016-06-22 14:30:47 -04:00
Christopher Browne b0caf32741 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-22 11:26:26 -04:00
Erez Zukerman 8c1bfdf0bd Merge pull request #433 from algernon/ergodox-ez/algernon
ergodox_ez: Update the algernon keymap to v1.2
2016-06-22 09:01:51 -04:00
Gergely Nagy 2278956412 ergodox_ez: Update the algernon keymap to v1.2
Noticeable changes since the last pull request:

* The forced NKRO mode can be easily toggled off at compile-time, to
  make the firmware compatible with certain operating systems.
* The `:;` key has changed behaviour: to access the `;` symbol, the key
  needs to be double-tapped, instead of shifted.
* The `=` and `\` keys were swapped, `=` moved to the home row, on both
  the **base** and the **experimental** layers.
* The arrow and navigation keys were redone, they are now more
  accessible, but the navigation keys require an extra tap to access.
* The **Emacs** layer is gone, replaced by a simplified
  **navigation and media** layer.
* `LEAD v` types the firmware version, and the keymap version.
* On the **experimental** layer, the `L` and `Q`, and the `K` and `G`
  keys were swapped.
* The **Steno** layer gained a few more `#` and `*` keys, to make it
  easier on my fingers.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-06-22 08:41:38 +02:00
Jack Humbert 98f0807359 increase leader seq size to 5 2016-06-21 22:55:54 -04:00
Jack Humbert 649b33d778 Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)
* fixes from tmk's repo

* rename keyboard to keyboards
2016-06-21 22:39:54 -04:00
Jack Humbert 464c8e274f adds backlight levels to the satan keyboard (#431)
* enable 4 levels

* remove breathing stuff

* update channels, comments, hex
2016-06-21 22:09:41 -04:00
Jack Humbert e329729d3a adds fuse settings for atmega32u4, fixes keymap_extras includes 2016-06-21 18:32:28 -04:00
Christopher Browne ee3c7892ad Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-21 17:54:12 -04:00
Jack Humbert 1a0bac8bcc Warning reductions (#430)
Warning reductions
2016-06-21 17:42:29 -04:00
dragon788 758a8c64e9 Change base box to avoid breakage in Arch box (#429)
I haven't had a chance to update the Arch base box in a while so using the Ubuntu one is far more likely to succeed for a new user (I did test that box recently as I traded my ErgoDox EZ to a friend and needed to reprogram it for him).
2016-06-21 15:29:54 -04:00
fredizzimo a69d002506 Fix the make all-keyboards command (#422)
Unfortunately the supported targets, like "quick", "all", "clean",
and so on has to be repeated two extra times, but this is the best
I can do with my makefile skills.
2016-06-21 13:31:26 -04:00
Christopher Browne 2d31481008 More notes 2016-06-21 12:55:24 -04:00
Jack Humbert 80c8705419 reduces rgblight warnings, integrates completely (#428) 2016-06-21 12:53:21 -04:00
Christopher Browne 28942b3ba7 Improve docs a bit 2016-06-21 12:45:38 -04:00
Christopher Browne f404124c26 Add filler to make layering clearer;
KC_TRNS gets used a lot; have the blank _______ mnemonic for it
2016-06-21 12:36:26 -04:00
Christopher Browne a6e109caa1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-21 12:30:17 -04:00
Jack Humbert a8375fa15a updates all config.h and Makefiles to correct references, text 2016-06-21 10:21:43 -04:00
Stanley Lai c976c03547 Added stanleylai's personal keymap (#420)
* Added WS2812 support for KC60

* Reorganized WS2812 support into its own keymap

* Fixed relative link in README

* Moved WS2812 mention in README to the bottom

* Fixed titling in WS2812 README

* Reverted KC60 Makefile and default keymap back

* Moved RGB specific config.h to ws2812 keymap folder

* Added my personal keymap

* Updated compiled hex

* Reverted KC60 files to 3f6fac47 before pull request #419
2016-06-21 00:49:54 -04:00
Jack & Erez 650e77c657 Fresh hes for experimental layout 2016-06-20 22:37:31 -04:00
Jack & Erez 76076db725 [Jack & Erez] Fixes Space Cadet right shift 2016-06-20 22:36:36 -04:00
Erez Zukerman f77df7e356 Adapts experimental layout file format 2016-06-20 22:27:17 -04:00
Erez Zukerman eda5e84164 Adds compiled default firmware 2016-06-20 22:00:51 -04:00
Erez Zukerman b85d2f2988 [Jack & Erez] Adds dedicated Version key 2016-06-20 21:59:20 -04:00
Erez Zukerman 881eb8d5f3 [Jack & Erez] Tweaks makefile for sanity 2016-06-20 21:58:58 -04:00
Erez Zukerman 5961de0ce2 Removes .gitattributes 2016-06-20 21:47:04 -04:00
Erez Zukerman cebe08fcd3 [Erez & Jack] Updates build guide 2016-06-20 21:44:37 -04:00
Christopher Browne f6d1ce7863 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-20 12:20:52 -04:00
Jack Humbert 44e098ef2d endline normalisation, treat .hex as bin, updates kc60 hex files 2016-06-19 23:41:10 -04:00
Stanley Lai 3302258abd Added WS2812 support for KC60 (#419)
* Added WS2812 support for KC60

* Reorganized WS2812 support into its own keymap

* Fixed relative link in README

* Moved WS2812 mention in README to the bottom

* Fixed titling in WS2812 README

* Reverted KC60 Makefile and default keymap back

* Moved RGB specific config.h to ws2812 keymap folder
2016-06-19 23:29:42 -04:00
fredizzimo 3f6fac4721 Add quick version of the all-* makefile targets (#417) 2016-06-18 18:09:21 -04:00
Jack Humbert db32864ce7 Cleans up quantum/keymap situation, removes extra lufa folders (#416)
* sorts out keycodes

* move midi around

* remove mbed

* replaces keymap with qmk/keymap_common

* fixes keymap.h

* keymap, config, quantum rearrange

* removes unneeded lufa stuff
2016-06-18 14:30:24 -04:00
Jack Humbert 1923cffd41 allow overriding of TARGET 2016-06-17 22:50:41 -04:00
Jack Humbert 008c8d54a0 adds power_up to quantum's matrix file 2016-06-17 22:09:59 -04:00
Jack Humbert de326d078d prevents ergodox_ez from waking up machine (#375) 2016-06-17 22:06:58 -04:00
Jack Humbert b70248fa21 addresses #369 2016-06-17 21:42:59 -04:00
Jack Humbert c4ea06d255 fix for parent folders with spaces (#403) 2016-06-17 21:10:17 -04:00
Eric Tang e175b8d56f removes extra dfu erase (#415) 2016-06-17 20:25:58 -04:00
Christopher Browne 2cf26915e3 Sample of using build info to generate keystrokes (#412)
* More documentation

* Saving crontab for user  on host

* Restructuring in keeping with recent changes to conventions

* Simplify submitting my fave cbbrowne keystroke by using SEND_STRING()

* Local change, not apropos to have in this repo

* Simplify logic; no need to return so much

* Add in a version key

* Add docs

* Split build date into a separate DEFINE

* Ensure there is a value even if not working within a git repo

* Should not include the compiled code in the repo

* compiled.hex files should not be included in the repo; they represent generated compiled code

* Fix spelling in comment

* Remove more generated files

* Add rule to ignore contents of .build directories; their contents are generated

* Revert removals of compiled files
2016-06-16 17:16:51 -04:00
Christopher Browne f566125c6e Revert removals of compiled files 2016-06-16 16:51:19 -04:00
Christopher Browne b2cc1ff0de Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-16 16:43:27 -04:00
Jack Humbert 91b469d88f correctly test to see if awk exists 2016-06-16 15:48:54 -04:00
Jack Humbert 33e83aaaca make awk optional (uses cat) 2016-06-16 10:42:00 -04:00
Christopher Browne ce1742a31f Add rule to ignore contents of .build directories; their contents are generated 2016-06-15 18:42:30 -04:00
Christopher Browne e7b50feee4 Remove more generated files 2016-06-15 18:42:05 -04:00
Christopher Browne 39cde91475 Fix spelling in comment 2016-06-15 18:39:57 -04:00
Christopher Browne 10fe3f001b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-15 18:38:30 -04:00
Christopher Browne 6d485b0ecd compiled.hex files should not be included in the repo; they represent generated compiled code 2016-06-15 18:35:38 -04:00
Christopher Browne 6e0270b52f Should not include the compiled code in the repo 2016-06-15 18:34:47 -04:00
Christopher Browne 90d0576355 Ensure there is a value even if not working within a git repo 2016-06-15 18:29:27 -04:00
Jack Humbert 77d083ed98 updates experimental planck keymap, adds basic layout 2016-06-15 15:43:40 -04:00
Christopher Browne bb0e0c7eba Split build date into a separate DEFINE 2016-06-15 11:36:27 -04:00
Christopher Browne 4e1bc2d298 Add docs 2016-06-15 11:25:08 -04:00
Christopher Browne 211ebe8734 Add in a version key 2016-06-15 11:19:51 -04:00
Christopher Browne e32b0960af Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-15 11:13:29 -04:00
Gergely Nagy 1d1ced53c7 Update the ergodox-ez/algernon keymap (#409)
Compared to the previous version, the following noteworthy changes have
been made to the keymap:

* The keyboard starts in NKRO mode, bootmagic and other things are
  disabled.
* A STENO layer was added, to be used with Plover.
* An experimental layout was added, something halfway between Dvorak and
  Capewell-Dvorak. A work in progress.
* `LEAD y` types \o/.
* Some keys on the BASE layer have been moved around:
  - `?` moved to the left pinky, left of `Q`.
  - `=` shifted one row down, but `F11` stayed where it was.
  - `-` on the left half was replaced by `Tab`.
  - `Tab`'s original position is taken by a `Media Next`/`Media Prev`
     key.
  - `:` now inputs `;` when shifted.
* `ESC` cancels the **HUN** layer too, not just modifiers.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-06-14 11:28:54 -04:00
Gergely Nagy 4815b97add Makefile: Add QMK_VERSION & co to OPT_DEFS (#408)
This adds the keyboard and keymap built, along with the QMK firmware's
git hash (or a timestamp), to OPT_DEFS. That, in turn, allows keymaps to
make use of these information, and do whatever they want with it. For
example, one could print them on `LEADER v` like this:

```c
SEQ_ONE_KEY (KC_V) {
  SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
}
```

This addresses #366.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-06-14 11:26:42 -04:00
Samuel Goodwin fad5a57156 Add sgoodwin keymap for the KC60 (#410)
* Don't save the ctags file in the repo.

* Initial support for the KC60 board. Only 5x5 working so far.

* Rename because this isn't the same KC60 as others.

* Add in some generic layout.
Pins seem to be in the right order except the 6th column spews
gibberish.

* Don't need this for now.

* Move this to some other folder.

* Trying again to start over.

* Don't need to start over because I figured out why the 'broken' stuff wasn't working.

* Attempt to enable backlighting. It's on on pin B7 like other boards.

* Fix last port changes and fix LED control in keymap.

* Trying some other LED code.

* Bootloader needs to be bigger. Disabling backlight for now.

* Simplify LED code while I try to figure it out.

* Turn back on backlighting.

* Backlighting works now. Just need to get levels or breathing working.

* Trying to allow for turning off the LEDs before I get to brightness levels.

* The missing link: need to run the init_ports function for LEDs to work properly.

* Removing breathing stuff since it bricks the board.

* Clean up default layer.

* Cleanup keymap, KC60 doesn't support a 5th right bottom-row button.

* Add in the keymap I want for now.

* Back to escape by default.

* Move my personal keymap to the new place for keymaps.

* Add the version number for clarity.
2016-06-14 11:21:55 -04:00
TerryMathews 1c5a6733ff adds support for GH60 Satan keyboard (#407)
* adds support for GH60 Satan keyboard

ANSI 125 layout, capslock and backlight implemented, support for
WS2812LED strip included

* added Phantom and GH60 Satan to travis
2016-06-13 21:59:22 -04:00
Christopher Browne 498455403e Renaming planck/cbbrowne in keeping with recent naming conventions (#405)
* More documentation

* Saving crontab for user  on host

* Restructuring in keeping with recent changes to conventions

* Simplify submitting my fave cbbrowne keystroke by using SEND_STRING()

* Local change, not apropos to have in this repo

* Simplify logic; no need to return so much
2016-06-13 19:06:32 -04:00
Christopher Browne c5a034f984 Simplify logic; no need to return so much 2016-06-13 17:59:26 -04:00
Christopher Browne de2f95bc6f Local change, not apropos to have in this repo 2016-06-13 17:33:26 -04:00
Christopher Browne 2fe06e4ef5 Simplify submitting my fave cbbrowne keystroke by using SEND_STRING() 2016-06-13 17:22:45 -04:00
Christopher Browne 3fe26d47a6 Restructuring in keeping with recent changes to conventions 2016-06-13 16:27:33 -04:00
Christopher Browne dc9bf78f2b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-13 16:06:03 -04:00
TerryMathews 25d4772754 adds support for Phantom TKL keyboard (#399)
ANSI 125 layout, capslock and scrolllock implemented, support for
WS2812LED strip included.
2016-06-12 22:26:47 -04:00
Eric Tang 6955719075 Move LED strip initialization (#397) 2016-06-12 18:01:55 -04:00
Jack Humbert 92759be322 change to relative paths instead of absolute 2016-06-12 15:55:05 -04:00
Jack Humbert 42b40e6fde no more cc error on windows 2016-06-11 22:54:34 -04:00
IBNobody 1c2705eea5 fixed color detection routine in makefile 2016-06-11 17:24:28 -05:00
IBNobody 50621a2e6a Merge remote-tracking branch 'remotes/jackhumbert/master' 2016-06-11 13:28:27 -05:00
Jack Humbert d9e4dad0a8 Makefile redo & other features (#395)
* .build containment implemented

* no destructive variable setting - builds in either folder

* make from 3 places

* cleans before each build
* make from root with keyboard=keyboard, keymap=keymap
* make from keyboard/keyboard with keymap=keymap
* make from keymaps/keymap
* only implemented on planck

* adds color diag to avr-gcc

* makefiles for all plancks, clean-up

* quick build-all makefile for plancks

* reformatting of make output (colors)

* color toggle, tmk path corrections

* correct if statement for color

* move config.h to main makefile, updates preonic, atomic

* format update, all keyboards targets

* makefile optional for build all target, alps and arrow_pad updated

* alps updated

* make planck default, trying out travis recipe for all-keyboards

* all-keymaps target, different travis recipe

* updates alps64

* updates keyboards to new format

* updates clue* projects

* all projects updated, specialise EZ .hex, let .hex through

* updates travis

* automatically find root, keyboard, keymap

* silent echo, cleaned-up mass make output

* updates all keyboards' .hex files except EZ

* Rename Bantam44.c to bantam44.c

* Rename Bantam44.h to bantam44.h

* nananana

* adds six key keyboard

* does same to ez as rest

* updates send_string example

* brings ergodox_ez up to date

* updates template/new project script

* adds sixkeyboard

* adds readme for sixkeyboard

* adds sixkeyboard to travis

* filenames, gitignore mess

* define clock prescaler stuff manually

* make quick, size test example

* documentation and dfu-no-build
2016-06-11 13:31:31 -04:00
Erez Zukerman a5d638ad30 Merge pull request #364 from techtomas/techtomas
Rearranged the layer toggles and keys.
2016-06-07 21:18:32 -04:00
Thomas Anderson 623466e340 Updated readme to fix a typo and list out hotkey shortcuts 2016-06-07 13:38:37 -07:00
Aron Griffis fd454e5b74 Add support for vagrant-docker (#389)
* clean trailing ws in Vagrantfile and util/avr_setup.sh

* replace triple quotes with heredoc.

Ruby doesn't have triple quotes; that's a Python thing. This was just being
parsed as multiple strings concatenated.

* add docker support to Vagrantfile

* make wants to find dfu-programmer in vagrant guest
2016-06-07 12:41:55 -04:00
Masahiro Wakame 6b8b332f77 fix HID_RI_LOGICAL_MAXIMUM value (#388) 2016-06-07 11:30:15 -04:00
Erez Zukerman 2fda55ba54 Merge pull request #384 from gid0/master
Merge ErgoDox bepo layout changes.
2016-06-06 23:22:52 -04:00
Jack Humbert 2222621b55 Update HAND_WIRE.md 2016-06-06 21:54:21 -04:00
Eric Tang 219e4a3012 Fix hand wiring guide (#387)
* Fix broken link

* Fix incoherent sentence
2016-06-06 21:53:37 -04:00
Erez Zukerman 408c9e159b Adds Python script to util directory for easier discoverability 2016-06-06 21:47:57 -04:00
TuxForLife ea63714950 Tiny typo (#386) 2016-06-06 10:42:41 -04:00
Olivier cd906f24b1 Spellchecking. 2016-06-06 15:23:40 +02:00
Olivier a62a0480d0 Add some more function keys (vol up / down, mute, undo, cut, copy, paste). 2016-06-06 15:18:42 +02:00
Olivier edf4266839 Add basic README file. 2016-06-05 21:42:25 +02:00
Jack Humbert 3e3a07fc97 adds planck keymap readme 2016-06-05 11:21:37 -04:00
Jack Humbert bdf94c0621 updates the hand-wiring guide 2016-06-05 11:19:17 -04:00
Jack Humbert c6d0da9a37 Updated FAQ Build (markdown) 2016-06-04 16:13:04 -04:00
Jack Humbert e04aff10fa Updated FAQ Build (markdown) 2016-06-04 16:12:41 -04:00
Olivier 4d59d57e64 Move keys and especially TAB more like on a TypeMatrix 2020 keyboard. Add a left SHIFT key. 2016-06-04 20:14:34 +02:00
Jack Humbert 83c52c6009 corrects vagrant script path from @b46f343 2016-06-04 13:30:11 -04:00
Jack Humbert b46f343de7 updates vagrant script path 2016-06-04 13:24:25 -04:00
Jack Humbert 8ca1831daa makes vagrant usable again 2016-06-04 13:18:15 -04:00
Olivier e0762e0ad9 Merged the function and navigation layers. Give access to it with both thumbs. Now you can up / down / page up / page down with only one hand ! 2016-06-04 18:52:22 +02:00
Jack Humbert b36e532b5e cleans up folder structure
* consolidates docs
* deletes converter/
* updates .md references (most)
2016-06-04 00:10:47 -04:00
Noah Andrews 189a3b02fb Add missing elevate.exe file (#377)
* Stops explorer.exe from being started with admin privilieges

* added missing elevate.exe file
2016-06-03 22:42:51 -04:00
Eric Tang 794aed37a0 Improve string sending (#376) 2016-06-03 15:48:40 -04:00
Olivier a4796ba36a Update prebuilt firmware with code from latest pull. 2016-06-02 23:51:06 +02:00
Jack Humbert cc3972e7d6 adds travis badge 2016-06-02 14:23:01 -04:00
Daniel Svensson fd3afbd2f3 Add a Travis recipe. (#374) 2016-06-02 14:17:19 -04:00
Noah Andrews c7005cdfcf Stops explorer.exe from being started with admin privilieges (#373) 2016-06-02 13:00:44 -04:00
Jack Humbert 4635b44533 new line/tab in send_string 2016-06-01 23:00:55 -04:00
Jack Humbert 1c9f33c06a adds send_string functionality (string macros) 2016-06-01 22:50:01 -04:00
IBNobody f3086b57e6 Submitting ArrowPad, A QMK-based 21/24 key keypad (#372)
* Created arrow pad, a QMK based numpad designed for heavy text editing

* Enabled backlighting, numlock indicator, and forced nkro for arrowpad

* WIP Arrowpad 21

* WIP Arrowpad 21

* Combined Arrow Pad 21 and 24

* Combined Arrow Pad 21 and 24

* Removed 21 folder
2016-06-01 21:41:51 -04:00
Jack Humbert 84276ee561 removes stray paren 2016-06-01 16:57:12 -04:00
Erez Zukerman 0457ed4880 Merge pull request #297 from gid0/master
Add an ErgoDox bépo layout.
2016-06-01 08:21:04 -04:00
Fred Sundvik 73d890a2c9 Fix visualizer sleeping too long
The documentation for ugfx gEventWait wait is wrong and the
function takes the time in milliseconds, instead of system ticks.
This caused the the thread to sleep way too long. It also caused
somewhat random sleeping behaviour as the MS2ST function overflows
at around 43 seconds sleep.

The event source is also now initialized correctly, so that the
thread actually can be woken up by events.
2016-06-01 09:22:47 +03:00
Erez Zukerman 56939b1518 Merge pull request #367 from waveform80/fix-unselect-rows-prototype
Squash the prototype compiler warning
2016-05-31 23:42:54 -04:00
Erez Zukerman 0c4085dd53 Merge pull request #368 from waveform80/daves-layout-readme
Added a README and minor tweaks for "dave" KEYMAP
2016-05-31 23:42:11 -04:00
Erez Zukerman bae92b2a10 Merge pull request #356 from johgh/master
ergodox_ez: added dvorak_spanish layout
2016-05-31 23:18:16 -04:00
Nathan Sharfi 6428069eb7 zweihander-osx: Use power instead of eject
KC_EJCT isn't the OS X Eject key and won't restart your computer.
2016-05-31 16:45:22 -07:00
Nathan Sharfi 7b8857a368 zweihander-osx: use eject instead of power
https://support.apple.com/en-us/HT201236 says that ⌃⌘⏏ will quit all apps and then restart your Mac; ⌃⌘-power will shut things down in an…ungraceful fashion.

I reboot into Windows fairly frequently; I'd rather have the nice behavior at my fingertips, not the rude one.
2016-05-31 16:15:35 -07:00
Nathan Sharfi a226255c0b Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-05-31 15:22:45 -07:00
Hartmut Goebel cea4b9a4bb Update to Makefile an ergodox readme (#365)
* Autodetect teensy-loader-cli over teensy_loader_cli.

Some distributions (e.g. Arch Linux, Guix) install teensy_loader_cli
as teensy-loader-cli. Use this one if it is installed.

* Update ergodox_ez/readme.md

- Mention Linux distris providing teensy-loader-cli
- Mention `make teensy ...`
2016-05-31 10:03:04 -04:00
Dave Jones 5e926d7b07 Added a README and minor tweaks 2016-05-31 14:30:36 +01:00
Dave Jones 4ae86e6ff7 Squash the prototype compiler warning
unselect_rows declared with no parameter list; requires (void) to
prevent compiler warning
2016-05-31 14:18:40 +01:00
Thomas Anderson 0755322a90 Rearranged the layer toggles and keys.
Moved the layer toggles to be in more comfortable locations for my typing. Also expanded the use of the media layer (now called APP) and enhanced the text navigation on the control layer
2016-05-30 23:45:55 -07:00
Nathan Sharfi 222e8f031c Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-05-30 15:45:17 -07:00
Nathan Sharfi 13810e4822 zweihander: Add :, disable sleep LED waves 2016-05-30 15:44:59 -07:00
jorge b32731b698 Merge branch 'master' of https://github.com/johgh/qmk_firmware 2016-05-30 19:41:29 +02:00
jorge 314d21c746 ergodox_ez: added dvorak_spanish layout 2016-05-30 19:40:16 +02:00
Fred Sundvik 489288f674 Add a nicer sine based gradient for the LEDs 2016-05-29 21:59:27 +03:00
Erez Zukerman 8ee9be11de Merge pull request #353 from algernon/ergodox-ez/algernon
My layout for the ErgoDox EZ
2016-05-29 13:53:29 -04:00
Samuel Goodwin 478a18d237 Add support for the KC60 v2.0 2015-09-12 (#360)
* Don't save the ctags file in the repo.

* Initial support for the KC60 board. Only 5x5 working so far.

* Rename because this isn't the same KC60 as others.

* Add in some generic layout.
Pins seem to be in the right order except the 6th column spews
gibberish.

* Don't need this for now.

* Move this to some other folder.

* Trying again to start over.

* Don't need to start over because I figured out why the 'broken' stuff wasn't working.

* Attempt to enable backlighting. It's on on pin B7 like other boards.

* Fix last port changes and fix LED control in keymap.

* Trying some other LED code.

* Bootloader needs to be bigger. Disabling backlight for now.

* Simplify LED code while I try to figure it out.

* Turn back on backlighting.

* Backlighting works now. Just need to get levels or breathing working.

* Trying to allow for turning off the LEDs before I get to brightness levels.

* The missing link: need to run the init_ports function for LEDs to work properly.

* Removing breathing stuff since it bricks the board.

* Clean up default layer.

* Cleanup keymap, KC60 doesn't support a 5th right bottom-row button.
2016-05-29 13:18:01 -04:00
Fred Sundvik 0c3189055f Make LED visualization times configurable 2016-05-29 17:42:32 +03:00
Daniel Svensson b85dd60397 Fix build errors (#359)
* brings gh60 up-to-date (needs testing)

* brings hhkb up-to-date (needs testing)

* brings jd45 up-to-date (needs testing)
2016-05-29 10:39:27 -04:00
Erez Zukerman 536ad6813a Corrects a backtick 2016-05-28 20:51:25 -04:00
Erez Zukerman d7ed882d2a Corrects links 2016-05-28 20:50:24 -04:00
Erez Zukerman 8497a45134 Adds a roadmap to the intro section of the docs 2016-05-28 20:48:20 -04:00
Fred Sundvik 9c955145f5 Fix emulator #ifdef check 2016-05-29 02:08:46 +03:00
Jack Humbert a53bc24c4d makes .SILENT (less verbose) by default - override with VERBOSE=1
also took out some @echo newlines to make things a bit cleaner
2016-05-28 15:33:08 -04:00
Jack Humbert 17977a7e24 process_record implementation (non-breaking for process_action ATM) 2016-05-28 15:22:30 -04:00
Jack Humbert 38987d4c15 updates quantum template to prevent backlight conflicts 2016-05-28 12:05:17 -04:00
Jack Humbert de57799530 brings alps64 up-to-date (needs testing) 2016-05-28 11:56:06 -04:00
Fred Sundvik 4d7e4a4780 Don't include lcd_backlight_hal for emulator 2016-05-28 11:13:08 +03:00
jorge f20e17a19e ergodox_ez: added dvorak_spanish layout 2016-05-28 09:57:25 +02:00
Nathan Sharfi e7e83b1f18 zweihander-osx: Add =, :, juggle Home/End 2016-05-27 18:41:16 -07:00
Nathan Sharfi 861f0f78e1 zweihander-osx: Bump ALFRED_LEAD_TIME to 250ms 2016-05-26 15:08:01 -07:00
Jack Humbert 209ee3cd05 removes duplicate double quote and odd whitespace 2016-05-26 17:14:01 -04:00
Christopher Browne d649ab3433 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-26 15:17:00 -04:00
Gergely Nagy 9ff10ab1db ergodox_ez/algernon: Add a HEX file
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-05-26 15:31:25 +02:00
Gergely Nagy c764480b95 ergodox_ez/algernon: New layout.
This is a squashed up version of the layout I have been working on for
the past month or so. Based on Dvorak, with a lot of unconventional
stuff thrown in for good measures.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-05-26 15:27:11 +02:00
Erez Zukerman 89f0472b9e Merge pull request #352 from algernon/ergodox-ez/supercoder
ergodox_ez: Add a SuperCoder keymap
2016-05-26 08:40:20 -04:00
Gergely Nagy 037b3f0ddf ergodox_ez: Add a SuperCoder keymap
Inspired by @faxm0dem, and the SuperCoder 2000 "keyboard".

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-05-26 14:13:20 +02:00
Mazin Bokhari ac02b0f397 Fix formatting 2016-05-26 02:17:07 -05:00
Mazin Bokhari 733596d800 Fix formatting 2016-05-26 02:12:57 -05:00
Erez Zukerman 5501f231d4 Merge pull request #351 from adiabatic/master
Add KC_DQUO ("); update Zweihander
2016-05-25 21:41:18 -04:00
Nathan Sharfi 376403276b Add single and double quotes to numpad layer
…as well as recover from a bunch of Git user errors.
2016-05-25 18:13:00 -07:00
Nathan Sharfi 9d6debd9b2 Add double quote for everyone; update Zweihander 2016-05-25 17:25:04 -07:00
Mazin Bokhari 66f9cdd041 Change bottom keycluster keys to be alt temporarily until a more permanent solution is though up... although you just now lost your arrow keys, so idk what to do about that tomorrow lol 2016-05-25 01:43:06 -05:00
Mazin Bokhari 59dc19940a Add notes 2016-05-25 01:31:57 -05:00
Mazin Bokhari fbbd32376b Add gui macro to bksp and tab (second outter-most keys) on both thumb clusters 2016-05-25 01:25:09 -05:00
Mazin Bokhari 09e172f56a Tap then hold built-in functionality actually overrides the ctrl/alt/etc. macros 2016-05-25 01:21:29 -05:00
Mazin Bokhari 03aeb40516 Change mouse clicks to j and k 2016-05-25 01:19:30 -05:00
Mazin Bokhari fd44d1cb39 Update layout viz 2016-05-25 01:09:18 -05:00
Mazin Bokhari 5486b9e80e Add todo: windows and nix layers 2016-05-25 00:58:08 -05:00
Mazin Bokhari fbbfb3cbad Add todo: override holding macro functionlity 2016-05-25 00:51:16 -05:00
Mazin Bokhari 514a7038b1 Add ctrl macro to spc and ent on thumb cluster (outter-most keys_) 2016-05-25 00:46:43 -05:00
Mazin Bokhari 0b68db4e43 Change rr3c1 from quotes/gui to quotes/ctl 2016-05-25 00:42:58 -05:00
Mazin Bokhari 3b0fd160df Change r3c1 from backspace to esc/control 2016-05-25 00:38:25 -05:00
Mazin Bokhari f5e486b50d Change r2c1 from Del to Tab 2016-05-25 00:23:05 -05:00
Erez Zukerman d06e940a17 [Erez & Jack] Removes keyboards which are not active on qmk 2016-05-24 23:55:29 -04:00
Erez Zukerman 8bc69afc63 [Erez & Jack] Optimizes shift_interrupted array 2016-05-24 23:48:46 -04:00
Erez Zukerman 1237025963 [Erez & Jack] Packages Space Cadet shifts into keycodes 2016-05-24 23:43:58 -04:00
Erez Zukerman f4a426a0b1 [Erez & Jack] Documents new Leader key functionality 2016-05-24 22:37:38 -04:00
IBNobody 26277dbdf4 Merge remote-tracking branch 'remotes/jackhumbert/master' 2016-05-24 17:57:40 -05:00
IBNobody 76e36a787a Merge remote-tracking branch 'remotes/jackhumbert/master' 2016-05-24 17:55:46 -05:00
Christopher Browne 48871b9b6b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-24 12:34:08 -04:00
Jack Humbert 287eb7ad14 Converted audio play functions to *_user (#349)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* Adjusted default planck layout to use the user tone naming

* tabs to spaces

* Rewrote the ALL recipe to allow for faster parallel make

* tabs to spaces

* Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around.

* Tweaked pvc atomic layout to work with the pvc planck.

* updates midi scale calling
2016-05-24 11:56:53 -04:00
Eric Tang 1ae6011cef Clean up #343's code (#348) 2016-05-24 11:44:40 -04:00
Mazin Bokhari 8090fb82ff Initial commit of keymaps/maz with default config 2016-05-24 02:26:16 -05:00
Jack Humbert 897f5b2f9d updates midi in play_note to better octave 2016-05-23 23:44:36 -04:00
Eric Tang aaa758f1d3 Optimize matrix scanning (#343) 2016-05-23 23:42:21 -04:00
Peter d66aa0abf9 adds petereichinger's planck keymap (#340)
* Add custom keymap

* A little readme and remove old layout comments
2016-05-20 11:14:08 -04:00
Erez Zukerman ed349f0c3d Merge pull request #324 from Bubblepoint/master
Add adnw/k_o_y layout
2016-05-19 15:54:16 -04:00
purpleP 0275d444d7 fixed small bug with AUDIO_ENABLED (#339) 2016-05-19 08:36:28 -04:00
Jack Humbert b732b79b49 adapts unicode to quantum.c (#333)
* Unicode

to have unicode input you need to:

- set your OS input method to UNICODE if needed
- enable unicode in your makefile
- copy the action_function from
keyboard/planck/keymaps/unicode/unicode.c to your keymap.c
set the target OS method in your keymap.c: void matrix_init_user() {
set_unicode_mode(UC_OSX); } you can then switch when you want with:
set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX);
set_unicode_mode(UC_WIN);
put some unicode codes in your keymap like so: UC(0x0061)
I did change the bit mask in quantum/keymap_common.c and .h
I’m afraid we will need uint32 to get a total support for all unicode
tables or relocate the handler as @mbarkhau did.

* rearranges keycode values, hooks-up unicode

* removes extra lalt ref

* adds unicode shortcuts and example
2016-05-18 23:47:16 -04:00
Jack Humbert bf545061f2 outputs size when make dfuing 2016-05-18 23:16:33 -04:00
Jack Humbert 0428214b90 adds music and audio toggles (#337)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* music/audio_on_user
2016-05-18 23:14:00 -04:00
heartsekai 465aabe11d Added Swiss-German keymap. (#335) 2016-05-18 15:22:04 -04:00
Fred Sundvik 94519e387a Add callback function for emulator drawing 2016-05-18 09:03:42 +03:00
Fred Sundvik fa8feb21a4 Add custom led and lcd display support 2016-05-18 08:40:36 +03:00
Jack Humbert fe9b1482fd adds KC_NUBS, KC_NUHS and shifted versions to default keymaps 2016-05-17 22:17:23 -04:00
Fred Sundvik 07e412c538 Fix crash when event listener not created 2016-05-17 11:21:38 +03:00
Fred Sundvik 15300cb681 Build lcd_backlight_hal_emulator.c
When the emulator is set, instead of the lcd_backlight_hal.c file.
2016-05-17 09:51:27 +03:00
Fred Sundvik 4e89732617 Enable and fix compilation of more files 2016-05-17 09:45:05 +03:00
Fred Sundvik d79e94adb1 Use ugfx API instead of chibios 2016-05-17 09:35:02 +03:00
Jack Humbert 2425fd295a fixes default planck keymap 2016-05-16 23:08:16 -04:00
Fred Sundvik 15bdef3ee9 Makefile changes to support emulator build 2016-05-16 09:45:39 +03:00
Fred Sundvik a20d513e3c Add function to check if the keyboard is a master 2016-05-15 19:28:15 +03:00
Fred Sundvik 350bc0d22f Merge branch 'master' into led 2016-05-15 14:50:34 +03:00
Fred Sundvik bde869aa7e Merge branch 'chibios-contrib' 2016-05-15 14:08:01 +03:00
Fred Sundvik 81f89cc672 Update include dir for new serial_link include 2016-05-15 13:43:45 +03:00
Fred Sundvik 5651be7a2f Configurable visualizer thread priority 2016-05-15 13:43:45 +03:00
Fred Sundvik a0297a892e Rename system to serial_link
Also combined driver.h with serial_link.h
2016-05-15 13:38:59 +03:00
Fred Sundvik b4ab61171e Configurable serializer thread priority 2016-05-15 12:59:50 +03:00
Fred Sundvik a08bcea998 Don't accept remote objects with the wrong size
Fixes memory corruption when the crc happens to match, but the size
doesn't.
2016-05-15 11:58:20 +03:00
Fred Sundvik 3b422d2ac4 Add debug print for serial link errors
This is disabled by default
2016-05-15 11:36:39 +03:00
Jacob Bilger b79400e0e9 Folders for each keymap.c file (#332)
* Add folders to keymaps

* test

* test
2016-05-15 01:22:51 -04:00
Jack Humbert e2aa980ad5 cleans up default keymaps (olkb) 2016-05-15 01:07:48 -04:00
Jack Humbert fde477a927 updates midi functionality (#331)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* moves midi stuff to quantum.c

* adds additional scales for midi
2016-05-15 00:51:06 -04:00
Jack Humbert bf5c2ccee5 splits process_action up to handle records separately (#329)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* merging?
2016-05-15 00:47:25 -04:00
Jack Humbert 15719f3574 adds a sequencer to the music mode (#330)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* Merge branch 'master' into process-record
2016-05-15 00:40:59 -04:00
Erez Zukerman 1a8c0dd22d Leader key implementation (#326)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* updates process_action functions to return bool
2016-05-15 00:27:32 -04:00
Erez Zukerman 79d26f331a Adds explanatory note re history of TMK and QMK 2016-05-14 22:07:16 -04:00
Jacob Bilger c7d2c79d34 adds Bilger321's planck keymap 2016-05-14 21:11:33 -04:00
Tobias Matt 26e315a6bb readme added 2016-05-14 10:04:14 +02:00
Erez Zukerman 6e72586b6b Merge pull request #320 from Townk/townkmap
Townkmap
2016-05-13 21:54:23 -04:00
Erez Zukerman 9746cd5323 Merge pull request #317 from Twey/master
Updates to `keymaps/twey` to the media layer and for Plover 3.0
2016-05-13 21:51:03 -04:00
Erez Zukerman 7b2cdca744 Merge pull request #307 from sboesebeck/master
minor change to default layouts
2016-05-13 21:50:28 -04:00
Tobias Matt 65645fb8ca Merge remote-tracking branch 'upstream/master' 2016-05-13 10:08:29 +02:00
cwhits 69f05e1afd [planck] adds button for toggling output in plover app (#323)
* [planck] toggle plover output in app when toggling plover layer on keyboard

* [planck] moved plover toggle to separate key

* [planck] renamed toggle button
2016-05-12 15:08:53 -04:00
Ryan Ascheman d1c70328f8 update volume control to match arrow change 2016-05-12 10:32:26 -07:00
Thiago Alves f70dec3ee9 Remove unused variable on the keymap. 2016-05-11 14:01:15 -07:00
Stephan Bösebeck d09d2da1c2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-11 22:05:19 +02:00
Thiago Alves c7d52fda9e Add an initial Readme to the keymap. 2016-05-11 13:04:53 -07:00
Fred Sundvik 25382cb6f2 Fix compute_gradient_color 2016-05-11 22:06:26 +03:00
Erez Zukerman 5845eb05b5 [Erez & Jack] Documents audio output 2016-05-10 20:48:14 -04:00
Thiago Alves 4a041f65e2 Tweak some key positions and changed macro location.
After using the layout a while I learn that the - and = positions should be
swapped since I keep typing = when I intend to type -.

I also, removed the only macro from the top left on the right hand to put the
power button there and since I never use the arrow keys on the separated groups
of keys, I added 4 macros there to get a feel for it.
2016-05-10 16:32:18 -07:00
Thiago Alves 75384689b2 Add custom config.h and revert the changes on the global one.
Some options I defined on the config.h file don't make much sense to other
keymaps so I revert the global config.h and add those options on the keymap
custom one.
2016-05-10 16:17:30 -07:00
James ‘Twey’ Kay a46a0ed4f3 keymaps/twey: fix documentation 2016-05-10 22:33:06 +01:00
James ‘Twey’ Kay 373e441d86 keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that instead 2016-05-10 22:30:17 +01:00
James ‘Twey’ Kay b5c5b71828 keymaps/twey: Add more history keys to media layer; stop using toggleable media layer 2016-05-10 22:23:36 +01:00
Peter e4e0b4e105 Update build guide with instructions to copy the whole keymap folder (#315) 2016-05-09 19:23:51 -04:00
Thiago Alves c2ffedd65c Update the .hex file on the keymap folder. 2016-05-09 15:27:57 -07:00
Thiago Alves 3e43298d79 Revert the Makefile to the original one.
Make sure I customize things as much as possible inside the keymap itself.
2016-05-09 15:27:57 -07:00
Thiago Alves 85f5eaec39 Change the access to the extra layer to be simetric.
Instead of having a key on the left side for one layer and a key on the right
side for the other layer, I put two dedicated layers on each side to get to the
proper layers.
2016-05-09 15:27:57 -07:00
Thiago Alves 6d343f3559 Add my personal keymap for OSX use.
This keymap was created to have a feel keys on a different place and to have as
fewer layers as possible.

Currently I have only 2 extra layers and only one of them is really required to
have all possible keys available.

Check out the README.md file for more information.
2016-05-09 15:27:57 -07:00
Jack Humbert 3f02637f4d Backlight Breathing for Planck and Atomic
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* adds backlight pulse to planck
2016-05-09 13:17:15 -04:00
Jack Humbert 684793360c quantum accommodates more than 16 columns 2016-05-09 00:36:23 -04:00
Erez Zukerman 35a72ca5e1 Adds next tab/prev tab back to symb layer and updates legend 2016-05-08 13:55:30 -04:00
Erez Zukerman 2ac27dd574 A little more tweaking 2016-05-08 13:45:26 -04:00
Erez Zukerman 897396b58f Tweaks layers 1 & 2 in my experimental layout 2016-05-08 13:39:17 -04:00
Erez Zukerman 2ce9644caa Merge pull request #311 from adiabatic/ergodox-zweihander-osx
Add KC_LABK and KC_RABK (< and >)
2016-05-06 18:28:43 -04:00
Nathan Sharfi 05db327b70 Add KC_L[LR]ABK to top-level README 2016-05-06 06:22:26 -07:00
Erez Zukerman 7566ac4241 Merge pull request #310 from nrrkeene/master
Lock layers by pressing both shift keys
2016-05-06 09:13:30 -04:00
Nathan Sharfi c702a522b0 Rearrange code layer on Zweihander
Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons.
2016-05-06 05:47:55 -07:00
Nathan Sharfi 08f3142463 Add KC_LABK and KC_RABK (< and >) 2016-05-06 05:40:02 -07:00
Nathan Sharfi fc4f693cad zweihander: add ⌘X, ⌘C, ⌘V to media thumb keys 2016-05-06 05:19:17 -07:00
Nicholas Keene 481c74cc56 The Ordinary Layout is the layout you are looking for. Come and see. 2016-05-05 23:18:48 -05:00
Nicholas Keene 90a6534729 The Ordinary Layout is extraordinarily familiar and powerful 2016-05-05 23:10:51 -05:00
Erez Zukerman 78bd31f28e Uses @eltang's famous macro! Still not perfect though :( 2016-05-05 23:18:46 -04:00
Erez Zukerman bf6f3fe7f4 [Erez & Jack] Updates docs with one-shot information and config_user.h 2016-05-05 23:18:04 -04:00
Erez Zukerman 9bb368a5fb [Jack & Erez] Defines MOD_HYPR and MOD_MEH 2016-05-05 22:44:24 -04:00
Erez Zukerman cd30f971ae [Jack & Erez] Creates a makefile.mk and a config file for the experimental layout 2016-05-05 22:24:09 -04:00
Erez Zukerman 3a9d1c4279 [Jack & Erez] Enables config_user.h per keymap 2016-05-05 22:23:32 -04:00
Erez Zukerman 8ffc73fcbd [Jack & Erez] Adds an option for user-specific config.h files 2016-05-05 22:21:39 -04:00
Erez Zukerman f293bf2340 [Jack & Erez] Removes duplicate reference, sorts whitespace 2016-05-05 22:19:29 -04:00
Jack Humbert 41b3e399b1 adds keycode shortcuts for OSL and OSM 2016-05-05 21:50:51 -04:00
Thiago Alves 74e97eefd7 Adds oneshot layer and oneshot tap toggling (#308)
This commit is mostly a cherry-pick from `ahtn` at
https://github.com/tmk/tmk_keyboard/pull/255.

These are the changes:

* Adds ACTION_LAYER_ONESHOT
* Adds ONESHOT_TAP_TOGGLE
* Mentions sticky keys in the docs on oneshot.
2016-05-05 21:41:37 -04:00
Tom Duckering d4520cd3ac Referencing the hex file (#309)
Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;)
2016-05-05 18:27:28 -04:00
Jack Humbert 356dba7e61 updates atreus's column mapping 2016-05-05 12:05:09 -04:00
Stephan Bösebeck 2e02886a1e remove typo 2016-05-05 16:52:40 +02:00
Stephan Bösebeck a096d205aa making default osx more ELG conform 2016-05-05 16:48:51 +02:00
Stephan Bösebeck 7060e10669 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-05 16:28:47 +02:00
Nicholas Keene 5daf24b1a5 The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out. 2016-05-04 22:17:47 -05:00
Erez Zukerman dbb1c2f281 Merge pull request #305 from nrrkeene/master
Custom handling for shift keys, improved media layer
2016-05-04 22:31:00 -04:00
Stephan Bösebeck 660511f050 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-04 08:03:25 +02:00
Erez Zukerman 31a697bc05 Merge pull request #304 from adiabatic/ergodox-zweihander-osx
zweihander: comment out action_get_macro()
2016-05-03 22:27:39 -04:00
Nathan Sharfi 6bafe44486 zweihander: comment out action_get_macro() 2016-05-03 19:19:47 -07:00
Nicholas Keene 4b74eca2a5 The Ordinary Layout is arranged as close as possible to a traditional keyboard, but with extra special features 2016-05-03 20:58:27 -05:00
Nicholas Keene 575ca2b96d The Ordinary Layout works the way you expect it to, with extra powerful features 2016-05-03 20:40:15 -05:00
IBNobody 83e1cc241e Clarified audio.c (#302)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs
2016-05-03 13:56:40 -04:00
Stephan Bösebeck 507db3ab13 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-03 08:29:55 +02:00
IBNobody 35d7081899 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-05-02 23:15:56 -05:00
Nicholas Keene 8b0274f60a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-02 21:35:58 -05:00
Erez Zukerman 2c070163ff Merge pull request #300 from Twey/tweymap-momentary
Swap steno/media layers to allow using media keys in the Plover layer…
2016-05-02 21:04:13 -04:00
James ‘Twey’ Kay 1173dbd02f Swap steno/media layers to allow using media keys in the Plover layer; display all active layers, not just the top; use only momentary modifiers 2016-05-02 19:22:32 +01:00
Stephan Bösebeck 61b2b58bee Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-02 14:38:54 +02:00
Erez Zukerman 1ce6da2605 Merge pull request #298 from adiabatic/ergodox-zweihander-osx
ergodox-zweihander-osx: initial commit
2016-05-02 08:30:34 -04:00
Erez Zukerman 98ed12843e Merge pull request #294 from sneako/master
Add my Ergodox EZ config
2016-05-02 08:24:26 -04:00
Erez Zukerman 84b736dc7f Merge pull request #258 from romanzolotarev/master
Add Roman's single layer layout based on Norman
2016-05-02 08:24:11 -04:00
Stephan Bösebeck 0e7a3a25bb new version of the experimental layout. changed media keys in MDIA layer 2016-05-02 13:46:00 +02:00
Nicholas Keene 1076c2b122 The Ordinary Layout is the layout you are looking for. Come and see v3.14. 2016-05-01 23:16:41 -05:00
Nathan Sharfi fe022a508f zweihander: move dim/brighten to 1/2, add ⌘Q 2016-05-01 15:12:38 -07:00
Nathan Sharfi 9b163d2feb zweihander: Add ⌘, ⌘⇧, ⌥⇥, ⌥⇧⇥ 2016-05-01 13:55:00 -07:00
Nathan Sharfi 8ec1d41a28 Ergodox EZ: add zweihander-osx.hex 2016-04-30 22:36:09 -07:00
Nathan Sharfi 262930c8d5 ergodox-zweihander: initial commit 2016-04-30 22:12:13 -07:00
Fred Sundvik f0c8e7c495 Fix a few led test animation issues 2016-04-30 22:45:41 +03:00
Erez Zukerman c3aa0a23ed Merge pull request #292 from abperiasamy/ergo-ab
Beginner's keymap for Ergodox-EZ
2016-04-30 14:56:58 -04:00
Anand Babu (AB) Periasamy ed0798de24 Beginner's keymap for Ergodox-EZ 2016-04-30 11:28:38 -07:00
Olivier dc7b606ff1 Update firmware with latest QMK code. 2016-04-30 16:06:23 +02:00
Olivier 09ea12f9ca Merge https://github.com/jackhumbert/qmk_firmware 2016-04-30 16:03:52 +02:00
Olivier 9d48ba9713 Add a macro for Ctrl+Alt+Fx. 2016-04-30 16:01:37 +02:00
Erez Zukerman e7d56215de Merge pull request #295 from techtomas/techtomas
Add my layout to the list
2016-04-30 07:42:20 -04:00
Jack Humbert 0656f2fa10 moves backlight functionality to keyboard files and updates template makefile
previously there were two backlight.c files (bad)
2016-04-29 22:19:40 -04:00
Jack Humbert 9ab7098c83 fixes plover start sound 2016-04-29 21:21:08 -04:00
Thomas Anderson fb57b2e55d Added readme 2016-04-29 17:25:14 -07:00
Thomas Anderson 711809fdac Finalized my personal layout 2016-04-29 14:42:31 -07:00
Erez Zukerman 9edcfcdf6f Adds brackets to inner vertical keys in experimental layout 2016-04-29 22:39:05 +03:00
Jack Humbert 66e0323881 removes extra voices, updates .hex files 2016-04-29 12:42:55 -04:00
Jack Humbert 2bbf3d5820 stops forcing debug_action 2016-04-28 23:23:33 -04:00
Jack Humbert 27d24faf39 adds condition to one last audio ref in planck default 2016-04-28 23:11:09 -04:00
skullY ca9b85f702 Bring the clueboard firmware size down 2016-04-28 20:07:07 -07:00
sneako b79124ac14 Adding .hex file 2016-04-28 22:20:25 -04:00
sneako 38858338f8 Add my Ergodox EZ config 2016-04-28 21:58:29 -04:00
Erez Zukerman 4f998657e9 Addresses #290 2016-04-29 04:47:06 +03:00
Tobias Matt 4122ad3f7b switch shift and enter thumb key 2016-04-28 15:09:34 +02:00
Tobias Matt a101d9ebcd update hex file 2016-04-28 15:02:40 +02:00
Tobias Matt d4710d8d7a shift to thumb key 2016-04-28 15:01:27 +02:00
skullY ce7dc30cc8 Updating my entry in the README 2016-04-27 10:12:51 -07:00
Christopher Browne c2a3df3123 Saving crontab for user on host 2016-04-27 12:52:47 -04:00
Christopher Browne f59c4b03fa Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-27 12:34:54 -04:00
IBNobody ce75a7675e Updated personal layouts (#291) 2016-04-27 00:25:16 -04:00
a0-c 8fda26db7d gh60 Rev C with LED controls (#289)
* gh60_rev_c

* gh60 Rev C

Support for WASD, Poker, Esc, FN LED clusters

* clean up spacing

* Update README.md

* Added image and pinout

* PCB image
2016-04-26 20:05:05 -04:00
Jack Humbert e024c11f7a actually resolves conflicts in rgblight.c 2016-04-26 13:50:04 -04:00
Jack Humbert c37d52d213 resolves conflicts in rgblight.c
# Conflicts:
#	quantum/rgblight.c
2016-04-26 13:48:36 -04:00
Jack Humbert 27e3294909 updates README, fixes typo in new_project.sh 2016-04-26 13:44:27 -04:00
Erez Zukerman 0edc7a9d87 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-04-26 14:25:45 +03:00
Erez Zukerman ea091e7f1b Honing in on an interval that works for me 2016-04-26 14:25:35 +03:00
Roman Zolotarev bf925fb71c Add Roman's layout with QWERTY 2016-04-26 16:46:43 +08:00
Roman Zolotarev 28f0b64e31 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-26 16:23:10 +08:00
Tobias Matt d280a59c82 add hex file 2016-04-26 08:43:56 +02:00
Tobias Matt 0181663771 organize in subfolder 2016-04-26 08:41:17 +02:00
Jack Humbert bf56838fe9 adds freq LUT for future use 2016-04-26 01:17:00 -04:00
Jack Humbert 140b97a1cd adds delayed vibrato 2016-04-26 01:16:47 -04:00
Bubblepoint 57789c64bd basic layout 2016-04-26 05:39:33 +02:00
Erez Zukerman 6274a216f8 [Erez & Jack] Examples for advanced macro stuff 2016-04-26 05:25:31 +03:00
Ryan Ascheman 7929ee4879 update readme 2016-04-25 15:40:52 -07:00
Erez Zukerman aabcfd5b4e Merge pull request #282 from jasontwong/master
Add new keymap
2016-04-25 06:57:00 -04:00
Jack Humbert 28352f4619 adds revisions of .hex files for planck/preonic 2016-04-25 01:01:41 -04:00
Jack Humbert 0889cc0d9a removes old .hex files 2016-04-25 01:00:34 -04:00
Jack Humbert e7b6bb641c updates default voice, prunes voices 2016-04-25 00:59:47 -04:00
Jack Humbert 170d9b7d15 addresses memory limits concerns for atomic default makefile 2016-04-25 00:25:49 -04:00
Jack Humbert 9fb1e5441f updates preonic default keymap 2016-04-25 00:22:35 -04:00
Jack Humbert 130a485bf7 updates planck default keymap 2016-04-25 00:15:23 -04:00
Jason T. Wong 9f8f34119a Compiled Hex File
The keymap file to use without compilation.
2016-04-24 22:14:09 -04:00
IBNobody f32f80cf32 updating personal atomic keymap (#285) 2016-04-24 22:06:59 -04:00
Erez Zukerman 68532ced24 Merge pull request #280 from Twey/master
Add `quantum/keymap_extras/keymap_plover.h` and a keymap.
2016-04-24 20:33:38 -04:00
James ‘Twey’ Kay 5713083e91 Add Twey's keymap 2016-04-25 01:08:36 +01:00
Fred Sundvik 6313cfd559 Fix some makefile issues, and symbol issues 2016-04-24 17:44:11 +03:00
Fred Sundvik 74baa4895c Run mirrored keyframes for led tests as well 2016-04-24 16:40:41 +03:00
Fred Sundvik 15906b86ae LEDS are flushed automatically
After running the animation, instead of having to do it manually.
This avoids duplicate flushing, and better support for cross-fades.
2016-04-24 16:26:53 +03:00
Fred Sundvik 0530ebb77d Add led crossfading 2016-04-24 16:20:00 +03:00
Fred Sundvik 891edbd533 Add function for running the next keyframe 2016-04-24 16:19:31 +03:00
Fred Sundvik 444132edd0 Add last and first update of frame for anims 2016-04-24 15:45:52 +03:00
Fred Sundvik 0e0488623e Add left to right gradient keyframe for leds 2016-04-24 14:54:40 +03:00
Fred Sundvik a960a1b006 Add fade out for the led test 2016-04-24 14:10:01 +03:00
Fred Sundvik c95b17b536 Add simple led support
Also the first version of a led testing animation
2016-04-24 13:46:19 +03:00
Jason T. Wong 93da70a43a Update keymap image
Why:

* The transparency made it ugly.

This change addresses the need by:

* Make transparent parts white.
2016-04-23 23:36:41 -04:00
Jack Humbert def6853532 adds voice iteration to planck default 2016-04-23 23:30:09 -04:00
Jason T. Wong 762065578b Add new keymap
Why:

* I want a custom keymap that suits my needs.

This change addresses the need by:

* Cloned default keymap.
* Customized layout.
* Updated README.
* Add an image created from keyboard layout editor.
2016-04-23 23:21:13 -04:00
James ‘Twey’ Kay 7ccfaf750d Add a keymap_extras header for Plover 2016-04-23 18:49:10 +01:00
Eric Tang eb09c450de Fix typo (#276) 2016-04-22 16:44:50 -04:00
Jack Humbert a718c53fe7 adds more voice harmonics 2016-04-22 11:58:29 -04:00
Jack Humbert a8086126fe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	quantum/audio/voices.c
2016-04-22 01:04:13 -04:00
Jack Humbert b1900c8dde adds fifth and fourth down voices 2016-04-22 01:02:50 -04:00
IBNobody 082a0f313d fixed compiler warnings (#273) 2016-04-22 01:01:38 -04:00
Jack Humbert 7b3f212500 adds more voices, fixes macro redefines 2016-04-21 23:10:49 -04:00
Jack Humbert fa40e91b56 Merge pull request #271 from eltang/qmk_firmware/eeprom_wear_fix
Update functions used to write to EEPROM
2016-04-21 23:10:00 -04:00
Eric Tang 620ac4b260 Update functions used to write to EEPROM 2016-04-21 20:07:03 -07:00
Jack Humbert 9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 2016-04-21 18:14:25 -04:00
Erez Zukerman a8fd65d86f Merge pull request #265 from sboesebeck/master
ErgodoxLayoutGenerator used
2016-04-21 08:10:39 +03:00
Jack Humbert e89b806b85 converts tabs to spaces 2016-04-21 00:40:00 -04:00
Jack Humbert 73228f5e5d restructures audio, begins voicing 2016-04-21 00:37:45 -04:00
Jack Humbert 2e60054951 fade envelope 2016-04-20 23:16:39 -04:00
Jack Humbert 2e303b40ae start of envelope function 2016-04-20 22:29:01 -04:00
Jack Humbert 7d1a683607 sounds for plover layout 2016-04-20 22:28:47 -04:00
Jack Humbert 157ddccc2c start-up sound working, removes tick with some devices 2016-04-20 20:11:05 -04:00
Jack Humbert 0fd093b400 there is no on 2016-04-20 18:41:10 -04:00
Jack Humbert b0635e58eb delay isn't the problem here 2016-04-20 18:39:36 -04:00
Jack Humbert b8c932f9aa makes the plover keymap correct 2016-04-20 18:39:17 -04:00
Stephan Bösebeck e065ff8cba changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,T - makes it work with custom keycodes 2016-04-20 22:34:02 +02:00
Stephan Bösebeck 17140ec082 added some words about the ELG in the readme 2016-04-20 11:16:29 +02:00
Stephan Bösebeck 13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-20 11:15:59 +02:00
Jack Humbert f489ae1ac0 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-20 01:08:27 -04:00
Jack Humbert de4690593c fixed startup audio with a 500ms delay 2016-04-20 01:08:17 -04:00
Erez Zukerman a9ef1c0a03 Merge pull request #267 from nrrkeene/master
Improved modifier keys, code
2016-04-20 07:48:54 +03:00
Nicholas Keene 5319c2cd6e The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-19 21:56:50 -05:00
Jack Humbert 462601f5e8 breaking changes - restructuring audio.c a little 2016-04-19 21:25:48 -04:00
Stephan Bösebeck f645f9946c re-created all layouts using ErgodoxLayoutGenerator 2016-04-19 23:27:10 +02:00
Ryan Ascheman c1f143124d initial changes, no doc changes 2016-04-19 14:21:23 -07:00
Stephan Bösebeck 6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-19 23:07:11 +02:00
Jack Humbert a2ee277158 updated comments about plover 2016-04-19 17:03:43 -04:00
Jack Humbert 6ae34f20aa added plover to default layout 2016-04-19 17:01:04 -04:00
Jack Humbert fd49dfe5cb vibrato and polyphony paratmeters 2016-04-19 17:00:45 -04:00
Jack Humbert d3fc077fa3 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-19 12:58:16 -04:00
Jack Humbert a2f31c886f getting ready for getters and setters 2016-04-19 12:58:13 -04:00
Stephan Bösebeck 04f36b3681 new overview pic 2016-04-19 15:59:43 +02:00
Jack Humbert 4e0e2504ad Merge pull request #264 from ericlathrop/patch-1
Fix typo
2016-04-19 09:54:46 -04:00
Eric Lathrop 2b38d74795 Fix typo 2016-04-19 08:49:42 -04:00
Stephan Bösebeck a16a9b30b6 added new macro for toggling and holiding layer 2016-04-19 10:37:37 +02:00
Stephan Bösebeck 0fbc52809e new experimental layout 2016-04-19 07:50:29 +02:00
Jack Humbert 78b3a88154 merging in #262 2016-04-18 21:04:29 -04:00
Jack Humbert f2c1e9ddd4 Merge pull request #262 from IBNobody/master
Fixed keyboard snoring while asleep
2016-04-18 21:03:21 -04:00
Jack Humbert e49712b559 note sliding - on right now 2016-04-18 21:01:48 -04:00
IBNobody 499e3096e9 Merge pull request #2 from IBNobody/personal_atomic_planck
Fixed speaker being on during sleep.
2016-04-18 19:48:52 -05:00
IBNobody 4b3358acc2 Fixed speaker being on during sleep. 2016-04-18 18:58:37 -05:00
IBNobody cbcf0abe62 Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck' 2016-04-18 15:47:10 -05:00
IBNobody 4f4b5b8c18 Added CM/DK 2016-04-18 01:58:25 -05:00
Stephan Bösebeck 42fad96be5 added smly layer again 2016-04-18 08:27:58 +02:00
Stephan Bösebeck 9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-18 08:03:22 +02:00
IBNobody 82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 23:16:36 -05:00
IBNobody ef73ab6628 Notes Bugfix 2016-04-17 22:08:05 -05:00
Jack Humbert 89a78f4a11 audio fixes 2016-04-17 21:26:06 -04:00
Jack Humbert 5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 21:15:50 -04:00
IBNobody 5c98ad5960 Added extra songs, LED indicator notes 2016-04-17 20:14:37 -05:00
Jack Humbert d94960be5b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-17 18:19:46 -04:00
Jack Humbert e0ab1dcf4c merging 2016-04-17 18:15:35 -04:00
Jack Humbert ce463ef424 audio fixes 2016-04-17 18:14:42 -04:00
Jack Humbert f1fdeddad3 Merge pull request #261 from a0-c/master
__attribute__ ((weak)) added to led_set
2016-04-17 17:47:26 -04:00
Stephan Bösebeck 6732d6cf1a new png 2016-04-17 23:04:43 +02:00
Stephan Bösebeck a9d8c61dbd new iteration, change of lower row 2016-04-17 23:02:29 +02:00
Stephan Bösebeck 6d40f7c506 added new experimental layout - works with ErgodoxLayoutGenerator 2016-04-17 22:19:47 +02:00
Stephan Bösebeck 7c3345f9b9 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-17 22:17:40 +02:00
IBNobody 23231fa577 Converted goodbye to notes, fixed eighth dotted note macro 2016-04-17 14:16:03 -05:00
Olivier edb2996299 Use aliases where available. No firmware change. 2016-04-17 20:22:07 +02:00
Olivier 920e0865b6 Commit firmware up-to-date with latest upstream qmk_firmware changes. 2016-04-17 20:00:09 +02:00
IBNobody 3103ea542f Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 12:55:19 -05:00
IBNobody d5b72e7bde Fixed many compiler warnings related to print being disabled 2016-04-17 12:54:32 -05:00
Olivier b03a9f7252 Merge https://github.com/jackhumbert/qmk_firmware 2016-04-17 19:54:06 +02:00
a0-c 90289aa53f __attribute__ ((weak)) added to led_set
__attribute__ ((weak)) added to led_set
2016-04-17 06:51:39 -10:00
IBNobody c940e87235 fixed single note play copy/paste bug 2016-04-17 10:41:07 -05:00
Jack Humbert 319fbe344b Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 10:56:12 -04:00
Olivier 0715cf46ac Add underscore "_" character in the qwerty compatibility layer. 2016-04-17 12:15:23 +02:00
IBNobody 29e495be2a Added trimble and tempo adjustments! 2016-04-17 02:52:38 -05:00
IBNobody 943b5b7709 Adding folding to #if, etc 2016-04-17 00:24:58 -05:00
Jack Humbert a67d425f4d planck default layout updates 2016-04-17 01:00:39 -04:00
Jack Humbert e7b9959819 no need for length of play_notes array with macro 2016-04-16 23:15:40 -04:00
IBNobody 45f10b4c4b Fixed how note arrays are used. 2016-04-16 22:10:18 -05:00
Jack Humbert 720e67e558 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-16 23:08:12 -04:00
Jack Humbert 8bbd064cf5 changes to play_notes, goodbye 2016-04-16 23:07:50 -04:00
IBNobody 12a9b2b9ae Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-16 20:37:44 -05:00
IBNobody a87522033d Merging with QMK main to fix rest issues 2016-04-16 20:37:22 -05:00
Jack Humbert 41cc35425a rests between notes as an argument 2016-04-16 21:31:40 -04:00
Jack Humbert 8f4ce501eb Merge pull request #260 from IBNobody/personal_atomic_planck
Atomic TLC and musical note freqs for audio
2016-04-16 21:02:17 -04:00
IBNobody bc65f73c64 Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-16 19:32:29 -05:00
IBNobody 4aea806aa8 Adding Musical Notes 2016-04-16 19:31:32 -05:00
IBNobody b5c22ab5b5 Merging with QMK main to fix audio issues 2016-04-16 19:27:21 -05:00
Jack Humbert c83aa16f1d fixes audio prescaler to emit correct freq 2016-04-16 20:26:02 -04:00
Jack Humbert b8d2e66638 readme clarity for rgbleds 2016-04-16 19:30:15 -04:00
Jack Humbert ab19ebd08a MAGIC functionality, AG swap in default layout 2016-04-16 18:51:58 -04:00
Olivier 5df222d3e0 Even more compatibility with QWERTY systems : added most useful characters needing AltGr on a bepo layout. This compatibility layer is still not perfect, but now usable to type with a bepo-like layout on a qwerty system. 2016-04-16 23:33:18 +02:00
Stephan Bösebeck 38a1d830fa Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-16 22:56:33 +02:00
Olivier 12f13eeef4 More compatibility with QWERTY systems. 2016-04-16 22:48:09 +02:00
Jack Humbert 5f648b6c40 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-16 15:47:20 -04:00
Jack Humbert 86169833c5 updates to preonic default, music mode integrated 2016-04-16 15:47:17 -04:00
Olivier 536e52a05a Simple layer to allow the keyboard to act like a bepo keyboard when plugged on a qwerty system. Doesn't work with modifiers for now. 2016-04-16 20:01:44 +02:00
Olivier 6b8fdb90bc Add mouse navigation keys on a new layer. 2016-04-16 19:23:39 +02:00
Olivier 0cd070d814 More concise, no functional change. 2016-04-16 18:56:31 +02:00
Olivier 6dc48384f3 Allow the "00" keypad key to act like a repeating 0 when held down. 2016-04-16 18:06:16 +02:00
Olivier d3bc854ddf Correct a bug with stuck modifier keys when they were used with other layers (like when selecting with shift and navigation keys) and released before the layout switch keys. 2016-04-16 15:13:02 +02:00
Olivier 5b74261aa9 Second try with a (maybe) more practical layout :
- layer modifiers in the thumb clusters, Alt-F1 - Alt-F4 should now be easier to type
- new Alt and Ctrl keys in the bottom row are more easily reachable with thumbs than the little thumb cluster keys, and feel more like traditional keyboards
- thumb backspace wasn't great due to lower precision and repeat rate than index fingers
2016-04-16 14:53:08 +02:00
Olivier 9a7fd7cb4d Merge branch 'master' of https://github.com/gid0/qmk_firmware 2016-04-16 14:01:00 +02:00
Olivier c2c939af4e Layout preview generated on keyboard-layout-editor.com. 2016-04-16 13:51:19 +02:00
Olivier 560873f13a Layout preview generated on keyboard-layout-editor.com. 2016-04-16 13:51:19 +02:00
Roman Zolotarev fa2eedb7bd Add Roman's single layer layout based on Norman 2016-04-16 16:57:58 +08:00
Jack Humbert 9eadeb574b Merge pull request #257 from VoodaGod/bone2planck
Bone2 Layout adptation for Planck
2016-04-16 01:24:03 -04:00
Jack Humbert 142ce47698 added keymap_extras to path 2016-04-16 01:23:08 -04:00
Jack Humbert d81ef5b7eb new defaults for planck and preonic 2016-04-16 01:19:37 -04:00
Jack Humbert 0b0ec82427 eeprom reset tool 2016-04-16 00:01:22 -04:00
Jack Humbert c294636c66 audio on by default 2016-04-15 23:46:35 -04:00
IBNobody 9d4bfc1bcf Corrected layer macros 2016-04-15 22:40:07 -05:00
Jack Humbert 0faa18eab9 audio enable stored in eeprom 2016-04-15 23:38:21 -04:00
Jason Janse van Rensburg 549b797ad1 My Attempt at adapting the Bone2 layout with Neo2 navigation cluster & number block to the Planck.
Very much a WIP, will most likely start tweaking further once my Planck kit has dropped
2016-04-16 01:36:18 +02:00
IBNobody 2aa51e4416 Tweaking PVC atomic layout 2016-04-15 16:32:44 -05:00
Jack Humbert 9111963663 Merge pull request #256 from jackhumbert/new_defaults
New default planck layout, audio fixes, makefile overwrites, tri-layer quantum-wide
2016-04-15 16:19:43 -04:00
IBNobody 8f85117aa9 Added Audio to my Atomic 2016-04-15 14:42:50 -05:00
IBNobody 39e520c010 Prepping for merge with new_defaults 2016-04-15 13:09:42 -05:00
Jack Humbert ee2ee7f4f0 audio note length fixes 2016-04-15 13:44:07 -04:00
Jack Humbert bb0836c620 the spacessss 2016-04-15 00:26:22 -04:00
Jack Humbert 43a4ffc259 bootmagic somehow not getting enabled, so adding eeconfig to backlight src include cond 2016-04-14 23:53:35 -04:00
Jack Humbert 2597fb7c50 might have broken something 2016-04-14 23:33:46 -04:00
IBNobody 66c1024bd3 fixed merging 2016-04-14 22:33:18 -05:00
IBNobody d4f90fe882 Merge remote-tracking branch 'remotes/jackhumbert/new_defaults' 2016-04-14 22:29:33 -05:00
IBNobody 3993afbb2e adding new per-keymap makefile 2016-04-14 22:27:28 -05:00
Nicholas Keene 63656ea34f The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-14 22:00:15 -05:00
Jack Humbert 63462bf8c1 changing up the makefile a bit 2016-04-14 20:42:14 -04:00
Jack Humbert ddbe430778 new defaults 2016-04-14 19:13:24 -04:00
IBNobody f051496f13 Checkin 2016-04-14 18:01:29 -05:00
Stephan Bösebeck 990254edec Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-14 21:47:33 +02:00
IBNobody cf17687f29 Adding personal build file settings 2016-04-14 12:59:16 -05:00
IBNobody 3dd20f2b6c Rename pc.c to pvc_planck.c 2016-04-14 11:35:49 -05:00
IBNobody d5cc31d7d4 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_atomic_planck 2016-04-14 08:58:10 -05:00
IBNobody 3d601c1bce Rename pc.c to pvc_planck.c 2016-04-14 08:56:27 -05:00
IBNobody 19061f2ff1 Update and rename pc_atomic.c to pvc_atomic.c 2016-04-14 08:54:22 -05:00
IBNobody 4b4d3069b4 Update and rename pc_atomic.c to pvc_atomic.c
Also removed unused FNs
2016-04-14 08:50:01 -05:00
IBNobody 59e041672c Remapped magic bootloader key to B. 2016-04-14 08:20:55 -05:00
IBNobody 44e4320b2e Nightly 2016-04-14 06:34:56 -05:00
Jack Humbert bdb6dceaeb Merge pull request #254 from IBNobody/master
Atomic TLC / Compiler Warning Fixes
2016-04-13 23:31:35 -04:00
IBNobody 7ff57503c6 Merge pull request #1 from IBNobody/pc_planck
Corrected minor spacing issues
2016-04-13 22:08:00 -05:00
IBNobody 2900b48845 Added parenthesis to midi macro. 2016-04-13 22:04:44 -05:00
IBNobody 95a44cdf01 Disabled print. 2016-04-13 22:00:36 -05:00
IBNobody aa9eaa9773 Corrected spacing. 2016-04-13 21:56:27 -05:00
IBNobody 9ff9317720 Corrected spacing. 2016-04-13 21:55:04 -05:00
IBNobody 02893a9d5c Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planck 2016-04-13 21:45:02 -05:00
IBNobody e0ddbba1ef Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-04-13 21:30:04 -05:00
IBNobody 1689f275ac Merge https://github.com/IBNobody/qmk_firmware into pc_planck 2016-04-13 21:22:36 -05:00
IBNobody c8c6409442 Merge remote-tracking branch 'refs/remotes/origin/pc_planck' 2016-04-13 21:07:08 -05:00
IBNobody 517c53efac Merge remote-tracking branch 'refs/remotes/origin/master' into pc_planck 2016-04-13 20:58:08 -05:00
IBNobody 3755ef5ddb Compiler Warnings / Atomic TLC
Corrected compiler warnings for a number of issues.  Gave Atomic some
TLC.
2016-04-13 20:57:51 -05:00
IBNobody 01f5b35396 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck 2016-04-13 19:14:23 -05:00
IBNobody 106e2414df Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-04-13 18:49:13 -05:00
IBNobody 390fd3107a local files
local files
2016-04-13 18:48:25 -05:00
IBNobody caf3e48de8 LOCAL COMMIT
LOCAL COMMIT
2016-04-13 17:40:16 -05:00
skullY 21d4cafb8c Fixup rgb underlight for clueboard1 2016-04-13 14:20:08 -07:00
Jack Humbert 200d5f5068 Merge pull request #252 from Vifon/modifier-release-fix
Optimize source_layers_cache for the cache memory
2016-04-13 16:38:14 -04:00
Wojciech Siewierski 02a3d77940 Optimize source_layers_cache for the cache memory
Swapping the array indices should increase the locality of the memory access.
2016-04-13 22:24:42 +02:00
IBNobody 3a601e76e4 Adding PC Atomic 2016-04-13 14:43:09 -05:00
Christopher Browne 6ec6b61353 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-13 12:02:51 -04:00
Stephan Bösebeck a71ab3ebb6 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-12 15:39:18 +02:00
IBNobody ff06eaf853 Added del 2016-04-12 08:17:02 -05:00
IBNobody 5ef6978cab Adding personal files 2016-04-12 06:55:26 -05:00
Erez Zukerman a0194d7e5f Merge pull request #249 from nrrkeene/master
Version 3, Ordinary Perfected
2016-04-12 09:04:29 +03:00
Erez Zukerman 98497e648d Merge pull request #248 from J3RN/master
Vim-style navigation for j3rn layout
2016-04-12 08:55:24 +03:00
Nicholas Keene 93de95d0cd The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 23:34:41 -05:00
Nicholas Keene 96f75f39c8 The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 23:28:16 -05:00
Nicholas Keene efffbe35c8 The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-11 22:51:12 -05:00
IBNobody 6ef262951c Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-04-11 22:10:15 -05:00
Jonathan Arnett 7635958270 Merge pull request #1 from J3RN/vim-navigation
Added Vim-style navigation
2016-04-11 19:22:23 -04:00
Jonathan Arnett 9e2c767c45 Added README note about Vim-style navigation 2016-04-11 19:19:20 -04:00
Jonathan Arnett 4b03a0f3d5 Stylistic changes 2016-04-11 19:08:24 -04:00
Jonathan Arnett aaa7af752c Make a also toggle Media layer 2016-04-11 19:01:39 -04:00
zozo aeb027ed60 First version of a bepo (french layout based on Dvorak rules) keymap. 2016-04-11 23:27:27 +02:00
Olivier 8f76f1a848 First version of a bepo (french layout based on Dvorak rules) keymap. 2016-04-11 23:27:27 +02:00
Erez Zukerman 511c843829 Merge pull request #246 from romanzolotarev/master
Add a new layout with arrows in the home row
2016-04-11 23:02:08 +03:00
Erez Zukerman 58f2c6fcf2 Merge pull request #246 from romanzolotarev/master
Add a new layout with arrows in the home row
2016-04-11 23:02:08 +03:00
Stephan Bösebeck c2e1d69f27 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-11 21:54:55 +02:00
Jack Humbert d342989f25 Merge pull request #244 from nicosuave/add_nico_planck_keymap
Add nico keymap
2016-04-11 14:52:10 -04:00
Jack Humbert 472e920c03 Merge pull request #236 from tak3over/master
Minor Doc Changes.
2016-04-11 14:51:37 -04:00
Jack Humbert 27e15b5d9f Merge pull request #247 from NoahAndrews/fix-path-script
Fix important bugs in the path script for Windows
2016-04-11 14:50:01 -04:00
Jack Humbert 9837e69a8f Merge pull request #232 from IBNobody/master
Added Error Checking to 2nd Setup Script
2016-04-11 14:37:51 -04:00
NoahAndrews b437de8874 Added admin privilege check
Running this as a non-administrator appears to work at first, but the
changes wouldn't stick on my Win 8.1 system.  It's weird, but this
script needs to run as admin.
2016-04-11 14:30:15 -04:00
IBNobody e4d2b90bda Fixed CD 2016-04-11 13:20:22 -05:00
NoahAndrews 5b86028d14 Updated comment 2016-04-11 14:14:15 -04:00
NoahAndrews 1bc05ac85f Remove failing check
NEWPATH1 (C:\MinGW\msys\bin) won't actually be created until the second
script is run
2016-04-11 14:09:42 -04:00
Roman Zolotarev f26985ad16 Add HJKL layout 2016-04-11 21:45:10 +08:00
Roman Zolotarev d532b04dc1 Add HJKL layout 2016-04-11 21:45:10 +08:00
skullY 97f8f37876 Fixup RGBLIGHT support for clueboard2 2016-04-10 21:16:49 -07:00
Nico Ritschel 077aee09a4 Add my keymap 2016-04-09 11:34:01 -07:00
Fred Sundvik 61f7761c03 Update ugfx with ChibiOS 4 support.
Also change the URL to fredizzimo bitbucket
2016-04-09 19:49:52 +03:00
skullY dc451b505b Add a help message to new_project.sh 2016-04-07 15:09:53 -07:00
tak3over 9e153b1a5c another modification of layers, restored arrow keys and added cut/paste 2016-04-07 10:54:11 -05:00
Erez Zukerman 2557b91644 [Erez & Jack] Documents tri-layer and keymap-specific makefile options 2016-04-07 15:45:11 +03:00
Erez Zukerman 9cfc74c35b [Erez & Jack] Makes tri-layer available across Quantum 2016-04-07 15:21:06 +03:00
Stephan Bösebeck 0befb25739 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-06 22:52:49 +02:00
Erez Zukerman 153a6fb0d3 Merge pull request #182 from Vifon/modifier-release-fix
Fix the layer-dependent modifiers handling
2016-04-06 22:47:31 +03:00
Erez Zukerman 27ee47d0bd Merge pull request #239 from DidierLoiseau/issue-221
Fix issue #221: LGUI(KC_LSFT) does not work
2016-04-06 22:37:02 +03:00
Erez Zukerman d07a1257b3 Merge pull request #215 from nrrkeene/master
Added proper documentation
2016-04-06 22:35:17 +03:00
Erez Zukerman 04e4428e8c Merge pull request #238 from alexjj/master
Submitting my ergodox EZ layout
2016-04-06 22:34:46 +03:00
tak3over e89fd63426 switched raise and lower layers 2016-04-06 11:12:58 -05:00
skullY 0da53d3811 Fixup the cluepad code 2016-04-05 20:27:40 -07:00
skullY 34dd96187c Fix the clueboard2 led code 2016-04-05 20:27:24 -07:00
Didier Loiseau 8d6bbf2757 Fix issue #221: LGUI(KC_LSFT) does not work
- on mod keys, register LGUI, LSFT etc. as normal mods
   instead of weak mods:
  - they won't be cleared by layer switching
  - LSFT(KC_LGUI) will now have the same behavior as LGUI(KC_LSFT)
2016-04-06 01:07:36 +02:00
Didier Loiseau db35212422 Removed D(LSFT) is CSA macros
Were causing stuck LSFT weak mods.
2016-04-06 01:07:34 +02:00
Didier Loiseau 81a889c97d Add delay to CSA macros using dead keys
With the BÉPO over CSA on Windows, the dead keys stop working after a
while, like in
http://superuser.com/questions/776558/suddenly-dead-keys-dont-work

I suspect this is triggered by too fast typing from macros.
2016-04-06 01:05:53 +02:00
Didier Loiseau 08871e56f7 Fix issue #221: LGUI(KC_LSFT) does not work
on mod keys, register LGUI, LSFT etc. as normal mods
 instead of weak mods:
 - they won't be cleared when pressing another key (#188)
 - they won't be cleared by layer switching
 - LSFT(KC_LGUI) will now have the same behavior as LGUI(KC_LSFT)
2016-04-06 00:30:50 +02:00
Didier Loiseau 5bc69c5b0a Fixed compilation issues 2016-04-06 00:09:03 +02:00
tak3over 4eadc2a977 updated my keymap 2016-04-05 16:39:45 -05:00
tak3over 028dd16fe6 Modified keymap 2016-04-05 16:21:45 -05:00
Alex Johnstone 9bd1caed44 Updated hex 2016-04-05 15:51:13 +01:00
Alex Johnstone 50ac511b56 💷 typo 2016-04-05 07:49:35 -07:00
Alex Johnstone 3fd62428a6 💷 typo 2016-04-05 07:48:13 -07:00
Alex Johnstone 1facc53a26 Merge pull request #5 from jackhumbert/master
Sync with upstream
2016-04-05 07:44:37 -07:00
Jack Humbert 931b0a79fc updates to noise 2016-04-05 09:44:01 -04:00
Jack Humbert e1020672ac Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-05 09:21:49 -04:00
Jack Humbert 976d0a327b add silent notes 2016-04-05 09:21:44 -04:00
Wojciech Siewierski 567f256c5d Refactor the source layer cache encoding 2016-04-05 11:08:04 +02:00
tak3over 2a488d1597 Update tak3over.c 2016-04-04 16:51:30 -05:00
Stephan Bösebeck 75c24499f3 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-04 22:35:48 +02:00
tak3over 2ba0de8fcd Merge pull request #2 from jackhumbert/master
Update from source
2016-04-04 13:41:37 -05:00
tak3over ecc8e9230b Merge pull request #1 from tak3over/tak3over-patch-1
Minor documentation error.  Raise and Lower.
2016-04-04 13:23:53 -05:00
tak3over 9cd0c9d589 Minor documentation error. Raise and Lower.
The Raise and Lower keys were transposed in the comment key map for all layers. Assuming _RS and _LW should be mapped to Raise and Lower respectively.  Probably is the same in the other custom keymaps that copied from this default.
2016-04-04 13:19:19 -05:00
Erez Zukerman 0cdf5d292c Merge pull request #235 from mbarkhau/master
add indent to generated keymap
2016-04-04 08:04:31 +03:00
Stephan Bösebeck dee6a4338a minor updates - new PNG 2016-04-03 23:48:22 +02:00
Jack Humbert a90d68739a music mode file 2016-04-03 16:00:10 -04:00
Manuel Barkhau 22691de580 add indent to generated keymap 2016-04-03 21:46:32 +02:00
Erez Zukerman 13dcbfdab1 Links to build guide 2016-04-03 12:52:08 +03:00
Wojciech Siewierski 47dd29513e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into modifier-release-fix 2016-04-03 11:23:00 +02:00
Erez Zukerman 8d39263d24 Merge pull request #213 from mbarkhau/master
Add manuneo layout
2016-04-03 08:56:08 +03:00
Erez Zukerman ddd122c0f0 Merge pull request #234 from sboesebeck/master
several iterations later
2016-04-03 08:46:14 +03:00
Manuel Barkhau 381a9fd553 use action function for unicode 2016-04-02 23:12:38 +02:00
Wojciech Siewierski 8ef14d09b8 Update PREVENT_STUCK_MODIFIERS documentation in README 2016-04-02 19:45:02 +02:00
Wojciech Siewierski 4dce7258d1 Cleanup after merge
- remove a superfluous parenthesis
- wrap lines longer than 80 characters
- add const specifiers where appropriate
- remove unnecessary casts
2016-04-02 19:29:01 +02:00
Wojciech Siewierski 97cc44e063 Merge branch 'modifier-release-fix' of https://github.com/eltang/qmk_firmware into modifier-release-fix 2016-04-02 19:25:10 +02:00
eltang 5a9091689c Update action.c 2016-04-02 10:00:31 -07:00
eltang 6c8e374d57 Update action.c 2016-04-02 09:59:53 -07:00
eltang f4f592910c Update action.c 2016-04-02 09:34:01 -07:00
eltang da101b8866 Update action.c 2016-04-02 09:29:32 -07:00
Didier Loiseau 4289ff7939 Removed remaining ALT_T and CTL_T keys
Having "true" modifiers is more reliable and practical.
- moved APP in place of HOME
- moved HOME in place of LSFT on left thumb
- moved END in place of RSFT on right thumb (Ctrl+End with single hand!)
- removed ALT_T from KC_ESC
2016-04-02 18:16:34 +02:00
Didier Loiseau 4e25342b41 Use TG() to switch to BÉPO over CSA, and use KC_TRNS in LR_CSA
Simplifies future changes to modifier and special keys
+ removed M_TGCSA macro
2016-04-02 18:16:34 +02:00
Didier Loiseau 89b647fe2b Replace Play by temporary num layer with left Alt
- move play on fn+left thumb
- move prev/next besides play
2016-04-02 18:16:33 +02:00
Didier Loiseau 6c672dfdc6 BÉPO over CSA: Altgr-shifted layer
- all characters available directly in CSA
- more explicit names for macros that switch accross CSA layers
- use macros to implement the shifts next to the spaces
2016-04-02 18:16:33 +02:00
Didier Loiseau aa5eb49edd BÉPO over CSA: GR2A-shifted characters in AltGr layer
- define aliases for all GR2A-shifted characters
- use the available characters in BÉPO over CSA AltGr layer
2016-04-02 18:16:33 +02:00
Didier Loiseau b2a4434abb BÉPO over CSA: Fixed key repeat for M_NBSP 2016-04-02 18:16:32 +02:00
Didier Loiseau 3a91ddb074 Use CSA_ as prefix for Canadian Multilingual key aliases
CM is already used for Colemak.
2016-04-02 18:16:32 +02:00
Didier Loiseau 911222892e BÉPO over CSA: GR2A characters in AltGr layer
- define aliases for all GR2A characters (unshifted)
- use the available characters in the BÉPO over CSA AltGr layer
2016-04-02 18:16:31 +02:00
Didier Loiseau fbf1333d87 BÉPO over CSA: unicode support
- implement easy way to define and send unicode characters on Windows
- define 3 characters not available in CSA:
  - en dash: –
  - em dash: —
  - ellipsis: …
2016-04-02 18:16:31 +02:00
Didier Loiseau 7840e69bfa BÉPO over CSA: AltGr layer
- implemented the most useful characters:
  - all French characters + €
  - common programmer characters
- other keys implemented as KC_NO to avoid mistyping a character
  from a lower layer
- AltGr+Shift not supported (yet)
2016-04-02 18:16:30 +02:00
Didier Loiseau a7cef2ca0a Initial BÉPO over CSA with Shift layer
Initial implementation of the BÉPO layout
for use with the Canadian Multilingual Standard layout
(a.k.a. CSA / ACNOR layout) on the OS-side.
- support all bépo characters from the default and shifted layers
2016-04-02 18:16:30 +02:00
Didier Loiseau b8ddbd2181 Added RESET key on fn-= 2016-04-02 18:16:29 +02:00
Didier Loiseau bf78ca1ef2 Use enums to define layers and macros 2016-04-02 18:16:29 +02:00
Didier Loiseau 9e1ee021d7 Swapped w and = to keep the w on the right hand (better for English) 2016-04-02 18:16:28 +02:00
Didier Loiseau 7bb135a1d0 Use BÉPO spécific key aliases with BP_ prefix
keymap_bepo.h: define BP_* keycodes for all possible characters
bepo/keymap.c: use those keycodes in the bépo keymap
2016-04-02 18:16:28 +02:00
Didier Loiseau f044edbed9 Initial bepo layout based on tm2030
No more SFT_T:
- moved ] (bépo W) below Tab
- moved - (bépo =) in place of ] (top right)
- removed SFT_T from ' (bépo M)
- moved \ (bépo Ç) in place of = (bépo %)
- moved = (bépo %) in place of - (bépo =)
2016-04-02 18:13:50 +02:00
eltang fddccc95fe Update action.c 2016-04-02 09:13:13 -07:00
eltang 680301e3e3 Update action.c 2016-04-02 06:48:44 -07:00
Stephan Bösebeck f0424a0c0f Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-04-02 15:15:21 +02:00
Stephan Bösebeck 71cdfe1168 new keymap 2016-04-02 15:14:14 +02:00
Eric-L-T f5365d1c1c Update action.c 2016-04-01 20:04:13 -07:00
Eric-L-T 307f1dee21 Update action.c 2016-04-01 19:54:02 -07:00
Eric-L-T 420fc8620b Update action.c 2016-04-01 18:26:43 -07:00
Stephan Bösebeck aee8715815 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-01 23:54:16 +02:00
Stephan Bösebeck c274699085 minor tweaks at the keymap, new png for documentation 2016-04-01 23:53:09 +02:00
Eric-L-T 9a35f01c55 Update action.c 2016-04-01 13:49:03 -07:00
Eric-L-T cd8dd1b6d6 Update action.h 2016-04-01 13:45:01 -07:00
Eric-L-T 317455178d Update action.c 2016-04-01 13:43:49 -07:00
Jack Humbert de904af360 Merge pull request #233 from tak3over/patch-1
Create tak3over.c
2016-04-01 16:31:18 -04:00
tak3over ad3ec12fb6 Create tak3over.c
Custom keymap with an additional function layer for numpad, pgup, pgdn, del, ins, home, end, and additional arrow keys.
2016-04-01 15:26:09 -05:00
Jack Humbert 54b0a2bf76 adding files is always smart 2016-04-01 14:44:08 -04:00
Erez Zukerman 8e72455608 Merge pull request #226 from squisher/dvorak_intl_squisher
Squisher's international dvorak variant for ergodox ez
2016-04-01 12:11:17 +03:00
IBNobody 12cb69cdb2 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-04-01 00:10:47 -05:00
IBNobody c12be71d11 Added Error Checking to Setup.bat #2
Added check for the MinGW directory. Fixed a bug with script exiting out
of a CMD window. Fixed a bug with script dropping user into MinGW
directory. Fixed a bug with RD not deleting temp. Fixed a bug with
PNPUtil.exe not being present in the path.
2016-04-01 00:10:21 -05:00
Stephan Bösebeck dbd4ab3457 fixed de_osx prefix in keymap include to avoid conflicts 2016-03-31 23:15:59 +02:00
Jack Humbert 5a290a42b0 Merge pull request #230 from IBNobody/master
Fixed Setup Script
2016-03-31 12:09:05 -04:00
IBNobody a3ed432273 Drastically rewrote the path script to handle Explorer's stubborn grasp of EnvVars. Tested on Win7. 2016-03-30 16:31:46 -05:00
Christopher Browne 5bbcc484a8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-30 13:14:01 -04:00
David Mohr 5fae86849a Also add compiled hex file 2016-03-30 09:47:34 -06:00
David Mohr fe6c3e4f0f Squisher's international dvorak variant for ergodox ez
See README.md
2016-03-30 09:47:34 -06:00
Jack Humbert ae47275bf3 Merge pull request #229 from NoahAndrews/patch-5
The readme was also wrong about the conflict between audio and RGB
2016-03-30 11:40:22 -04:00
Noah Andrews ac3f3a85d5 Update README.md 2016-03-30 11:36:35 -04:00
Jack Humbert 6186de5828 Merge pull request #227 from NoahAndrews/patch-4
Fixed minor issues with Preonic readme
2016-03-30 11:07:00 -04:00
Jack Humbert c3c4012417 Merge pull request #228 from mrfoto/fix-planck-diagram
Tiny fix of Planck diagrams
2016-03-30 11:06:07 -04:00
Miha Rekar 3b703eff33 Tiny fix of Planck diagrams 2016-03-30 17:03:03 +02:00
Noah Andrews 09d567045c Fixed minor issues with Preonic readme 2016-03-30 09:17:06 -04:00
Jack Humbert 47b537c87f preonic readme 2016-03-30 00:46:45 -04:00
Jack Humbert e7377dc24b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-03-30 00:45:48 -04:00
Jack Humbert b8ac509570 .hex files 2016-03-30 00:45:37 -04:00
Jack Humbert ac0729787f preonic update 2016-03-30 00:43:07 -04:00
Jack Humbert 4a676746a6 Merge pull request #224 from NoahAndrews/make-keymap-names-consistent
Make keymap names more consistent
2016-03-29 22:37:20 -04:00
Noah Andrews 95fba250ef Updated several keyboard folders to use new keymap naming scheme 2016-03-29 21:53:36 -04:00
Noah Andrews e28334017c Merge remote-tracking branch 'jackhumbert/master' into make-keymap-names-consistent 2016-03-29 20:03:22 -04:00
Jack Humbert 26513b497b Merge pull request #223 from NoahAndrews/patch-3
Fix #198
2016-03-29 16:38:31 -04:00
Noah Andrews 8f1ea16ad5 Fix #198 2016-03-29 16:35:06 -04:00
mbarkhau 77fa2b0056 Update compile_keymap.py 2016-03-29 18:35:47 +02:00
Jack Humbert 49bde5b5c1 Merge pull request #222 from NoahAndrews/patch-2
Fix error in Planck makefile comment
2016-03-29 12:30:00 -04:00
Noah Andrews 2ae44470e0 Fix error in Planck makefile comment
[This comment](https://www.reddit.com/r/olkb/comments/428umx/rgb_underglow/czaivbc) states that because both audio output and RGB support require the user of timer 3, they can't be enabled at the same time. That makes sense, I can see where audio.c uses timer 3. But this comment in the code states that the incompatibility is with MIDI support, which doesn't make sense based on what I see in the code. Please enlighten me if I'm mistaken.
2016-03-29 12:06:32 -04:00
Stephan Bösebeck ac22d1c185 added CTL_Shift / Hash macro 2016-03-29 13:02:14 +02:00
Stephan Bösebeck f7f4f1725e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-29 07:49:54 +02:00
skullY 5e822417d7 Fixup clueboard support and add rgb to clueboard1 2016-03-28 22:49:24 -07:00
Jack Humbert 8bbc1dcf4f Merge pull request #219 from IBNobody/master
Master
2016-03-28 23:17:16 -04:00
Jack Humbert 1f86e8da09 Merge pull request #220 from NoahAndrews/improve-buildguide
Added clarifying steps to Windows section of build guide
2016-03-28 23:16:36 -04:00
Noah Andrews 60570f3e37 Added clarifying steps to Windows section of build guide 2016-03-28 22:02:52 -04:00
IBNobody 1d13aa933b Minor Tweaks and Documentation
Fixed compiler warning by including bootloader.h in keymap_common.c.

Changed FORCE_NKRO to only be applied if NKRO_ENABLE is defined.

Added extra documentation to the template config.h
2016-03-28 19:45:20 -05:00
Noah Andrews 535daad3cd Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide 2016-03-28 18:37:39 -04:00
Manuel Barkhau a2d3c0bd93 add hex file 2016-03-28 23:42:55 +02:00
Manuel Barkhau 295036d4e3 Merge remote-tracking branch 'origin/master' 2016-03-28 21:36:02 +00:00
Manuel Barkhau 32c7832609 Refactor compiler code 2016-03-28 23:35:12 +02:00
IBNobody a70f439672 Added command to turn LED indicators off while sleeping 2016-03-28 16:21:09 -05:00
Stephan Bösebeck 37e68596dd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-28 22:29:18 +02:00
Erez Zukerman 4a43c56844 Merge pull request #216 from msc654/master
Added msc keymap for ergodox_ez
2016-03-28 22:40:58 +03:00
Jack Humbert fd9e5d1510 Merge pull request #214 from cdlm/action-hook
Add per-event user hook function
2016-03-28 11:55:19 -04:00
Jack Humbert 5e2c497d9a Merge pull request #217 from IBNobody/master
Master
2016-03-28 11:51:38 -04:00
Jack Humbert 6a824df99c Merge pull request #218 from awpr/patch-1
Add avr-libc to the Debian build dependencies.
2016-03-28 11:49:03 -04:00
Andrew Pritchard 1fd9dbdbe9 Add avr-libc to the Debian build dependencies.
Without avr-libc the build fails trying to #include_next a header from the standard library, which of course doesn't exist.
2016-03-28 08:39:39 -07:00
Christopher Browne 95a88c09e1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-28 11:29:54 -04:00
Alex Johnstone 48899673af Updated hex 2016-03-28 16:14:25 +01:00
Alex Johnstone 474eaead3c ££££ 2016-03-28 08:09:27 -07:00
Alex Johnstone ad2d3144ed Forgot to change ent/spc 2016-03-28 15:50:09 +01:00
Damien Pollet bcebb3447c Add action-preprocessing kb/user hooks in planck 2016-03-28 16:49:47 +02:00
Damien Pollet 2181be029e Add action-preprocessing hook to keyboard template 2016-03-28 16:49:46 +02:00
Damien Pollet acd64aa841 Rename function to be keyboard-specific 2016-03-28 16:30:00 +02:00
Damien Pollet ef21a855e6 Add per-event user hook function to QMK 2016-03-28 16:30:00 +02:00
Alex Johnstone 482dbe4c45 Didn't 2016-03-28 07:24:51 -07:00
Matthew Carroll a1ce133203 Corrected duplicate image issue 2016-03-28 06:00:05 -04:00
Wojciech Siewierski 1a09e96b95 Update the memory consumption total value in README 2016-03-28 10:05:42 +02:00
leizzer 049e5916a4 Updated Home (markdown) 2016-03-28 02:22:04 -03:00
leizzer 71614e5b98 Updated Home (markdown) 2016-03-28 02:20:27 -03:00
leizzer b803589e29 Build guide in the wiki section 2016-03-28 02:14:52 -03:00
IBNobody 577971ab07 Magic Key Overrides / Keyboard Lock / Forced NKRO
Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock
option to template / Added forced NKRO option to template (disabled by
default)
2016-03-28 00:03:21 -05:00
Matthew Carroll beda4e6fd3 Added msc keymap for ergodox_ez 2016-03-27 23:51:11 -04:00
Alex Johnstone 1415e3108f Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 2016-03-27 20:50:49 -07:00
Alex Johnstone 97b431162c Merge pull request #4 from jackhumbert/master
upstream
2016-03-27 20:15:02 -07:00
Alex Johnstone d3e89b8cbd Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯ 2016-03-27 20:14:03 -07:00
Nicholas Keene 2a9eb3d3a3 The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-27 21:45:31 -05:00
skullY 073b44924c Adding clueboard/cluepad support to qmk 2016-03-27 16:17:40 -07:00
Wojciech Siewierski 36103edb7d Update the memory consumption of PREVENT_STUCK_MODIFIERS in README 2016-03-28 00:25:43 +02:00
Wojciech Siewierski b4f442dfea Cut the memory consumption of PREVENT_STUCK_MODIFIERS in half 2016-03-27 23:51:46 +02:00
IBNobody b7f0110d71 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-03-27 16:17:26 -05:00
Erez Zukerman 80eefb09ac Merge pull request #188 from DidierLoiseau/issue-156
Fix #156: clear weak mods on every key press
2016-03-27 21:09:15 +03:00
Erez Zukerman 16da54cfa0 Merge pull request #211 from nrrkeene/master
The Ordinary Layout is unremarkably mundane and remarkably useful
2016-03-27 09:10:05 +03:00
Erez Zukerman 6a31d92276 Merge pull request #196 from naps62/naps62
Adds naps62's Ergodox EZ layout
2016-03-27 09:08:23 +03:00
Manuel Barkhau 20a3229faf Add manuneo layout 2016-03-27 02:24:35 +00:00
Nicholas Keene e43c0c649d Merge https://github.com/jackhumbert/qmk_firmware 2016-03-26 00:44:20 -05:00
Nicholas Keene 97c4c790cc The Ordinary Layout is unremarkably mundane and remarkably useful 2016-03-26 00:40:54 -05:00
Alex Johnstone 2d90374912 Merge pull request #3 from jackhumbert/master
Pull upstream
2016-03-25 11:16:33 -07:00
Erez Zukerman c9aec8bc24 Merge pull request #207 from romanzolotarev/master
Add important note about brightness on OS X
2016-03-25 19:37:42 +03:00
IBNobody 987ee1115e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-03-25 09:51:16 -05:00
Nicholas Keene d7a1fc81a0 The Ordinary Layout is familiar to users of common keyboards 2016-03-24 23:10:21 -05:00
Jonathan Arnett 6f53e17bf5 Building a row of level switch buttons 2016-03-24 18:30:32 -04:00
Jonathan Arnett f4ba9662f4 A to toggle L2, hjkl to move mouse 2016-03-24 18:30:32 -04:00
Stephan Bösebeck 94e96456b8 minor changes 2016-03-24 10:30:27 +01:00
Stephan Bösebeck 8b883c797f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-24 08:22:21 +01:00
Alex Johnstone fb6dc7499f New 💷 method 2016-03-23 21:13:05 -07:00
Alex Johnstone 02e259dc82 New 💷 method 2016-03-23 21:12:23 -07:00
Alex Johnstone 98593e8c0d New 💷 method 2016-03-23 21:11:05 -07:00
Alex Johnstone 2530f45e2b New 💷 method 2016-03-23 21:06:20 -07:00
Alex Johnstone add089ab1a New 💷 method 2016-03-23 21:04:45 -07:00
Alex Johnstone da63179962 Wrong date 2016-03-23 14:10:55 -07:00
Jack Humbert ba058f8b81 Merge pull request #210 from n0bs/master
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
2016-03-23 13:46:02 -04:00
Norberto Monarrez a5a40a0703 Edited to work with jackhumbert/qmk_firmware pull #190
Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
2016-03-23 13:42:34 -04:00
Jack Humbert 95b0032142 Merge pull request #209 from n0bs/master
Added project folder for Bantam-44
2016-03-23 10:45:16 -04:00
Jack Humbert 02096f78e5 Merge pull request #200 from alexives/add_diagram_to_planck_layout
Added layout diagrams to the default planck keymap
2016-03-23 10:44:31 -04:00
Norberto Monarrez d0c894cfae Added files for Bantam-44 2016-03-23 10:22:43 -04:00
Alex Johnstone 15106471b1 Removed whitespace 2016-03-22 21:52:40 -07:00
Alex Johnstone c7a9a1ebd0 Revised to version 0.1.0 2016-03-22 21:50:53 -07:00
Jack Humbert e8951d6e41 Merge pull request #199 from IBNobody/master
Added LED Indicator Support to QMK Template
2016-03-22 22:15:18 -04:00
IBNobody 3d56ec052e Fixed extra semicolons.
Fixed extra semicolons.
2016-03-22 21:06:22 -05:00
IBNobody 10491ba21f Fixed LED Function Calls
Fixed LED indicator function calls to match how the matrix init function
calls are formatted.
2016-03-22 20:58:44 -05:00
IBNobody ec62d9e85c Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
2016-03-22 20:39:05 -05:00
Christopher Browne a4ff9f2567 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-22 17:29:31 -04:00
Erez Zukerman 403d756ad5 Merge pull request #190 from yoyoerx/function_pointers
Addressing void* return warning & coding style
2016-03-22 21:30:25 +02:00
Alex Johnstone 5872f80c96 Merge pull request #2 from jackhumbert/master
Update my repo to upstream
2016-03-22 10:38:03 -07:00
Alex Johnstone 4a7e131604 Meh -> Hyper 2016-03-22 07:43:28 -07:00
Alex Johnstone 84647efebb Update readme.md 2016-03-22 07:42:47 -07:00
Alex Johnstone c1a520fb81 Added photo 2016-03-22 07:36:40 -07:00
Alex Johnstone d1f446962a Added real life layout 2016-03-22 07:34:07 -07:00
Roman Zolotarev 3087808790 Add important note about brightness on OS X 2016-03-22 22:33:23 +08:00
Stephan Bösebeck 55fa66428c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-22 15:00:20 +01:00
Alex Johnstone 4687162470 Added Readme 2016-03-21 21:43:59 -07:00
Alex Johnstone f6e5e2bd45 added .hex 2016-03-21 20:59:06 -07:00
Alex Johnstone cffd91edbd typos 2016-03-21 20:58:29 -07:00
Alex Johnstone f744e860ff Update keymap.c 2016-03-21 20:51:05 -07:00
Alex Johnstone 65fde3cc12 More updates 2016-03-21 16:03:25 -07:00
yoyoerx baeffd99da Pull request 190 resolution with 'qmk/master' for merge 2016-03-21 17:18:53 -04:00
Erez Zukerman 7f0d77e08c Merge pull request #205 from romanzolotarev/master
Add Roman's Layout
2016-03-21 21:03:25 +02:00
Alex Johnstone af9e9810a0 work in progress 2016-03-20 22:05:08 -07:00
Stephan Bösebeck 1313e0c828 fix number pad, add , 2016-03-20 23:07:38 +01:00
Stephan Bösebeck 7ebc813e82 changing cursor keys, back to "default" cursor key layout, adding ISO-cursor keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though 2016-03-20 23:00:20 +01:00
Stephan Bösebeck d0c62feb7e tweaking it a bit further, fixing things 2016-03-20 22:53:43 +01:00
Stephan Bösebeck 64495d11ba Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-20 22:07:53 +01:00
Erez Zukerman e86f09d262 Merge pull request #203 from XenoBits/master
Improved c# dev layout, only 2 layers now
2016-03-20 22:50:56 +02:00
Erez Zukerman ed830f2a13 Merge pull request #201 from uzytkownik/master
Further improvements to mpiechotka keyboard
2016-03-20 22:28:21 +02:00
Maxime Millet cc0c157287 Fixed png image 2016-03-20 12:54:02 +01:00
Maxime Millet 895bc327c3 CSharp dev layout V2 2016-03-20 12:50:04 +01:00
Roman Zolotarev a429374b78 Update readme 2016-03-19 17:53:58 +08:00
Roman Zolotarev 7138b1e6fc Update layout 2016-03-19 17:43:02 +08:00
Roman Zolotarev f1c265aace Swap volup and voldown 2016-03-18 17:55:21 +08:00
Roman Zolotarev bbe553dba3 Add Roman's Layout
Four layers BASE (Norman), SYMB, PLVR (optimized for Plover), ARRW.
2016-03-18 12:14:03 +08:00
Maciej Piechotka cf986ba504 Add waits to prevent KVM from hanging 2016-03-17 08:18:03 -07:00
Maciej Piechotka fb3b7f32c0 Put frequently used keys in shell (-=) under thumb 2016-03-17 08:18:03 -07:00
Maciej Piechotka 5d8f4ff957 Add missing breaks in mpiechotka ergodox_ez keyboard 2016-03-17 08:18:03 -07:00
Alex Ives 05b0931cfc Added layout diagrams to the default planck keymap
Signed-off-by: Alex Ives <alex@ives.mn>
2016-03-16 22:58:17 -05:00
IBNobody 8a2457d753 Adding Retro_Refit Keyboard
Retro_Refit is an example of using a Teensy to replace a keyboard
controller on an older keyboard. The original 6x15 keyboard had a
non-standard 11x8 matrix.
2016-03-16 10:27:04 -05:00
IBNobody 17628e9922 Removing Teensy SDK Folder
Fixing Github GUI error "fatal: no submodule mapping found in
.gitmodules for path 'teensy-sdk'"
2016-03-16 09:53:56 -05:00
IBNobody eba9a7d74d Adding LED function pointers 2016-03-15 23:52:51 -05:00
Wojciech Siewierski a5cdc3aab1 Expose the pressed_actions_cache global variable 2016-03-15 16:51:50 +01:00
Wojciech Siewierski 73cb87740b Always provide an implementation of process_action_nocache 2016-03-15 16:03:30 +01:00
Miguel Palhas 8aa559b825 Adds naps62's layout 2016-03-15 11:40:15 +00:00
Jack Humbert 35393fa9dc Merge pull request #194 from DidierLoiseau/bépo-keymap-header
Keymap header for the BÉPO layout
2016-03-14 13:42:47 -04:00
Jack Humbert 914f1d6f98 Merge pull request #195 from krid78/master
fixes an obvious typo to have DE_LCBR produce {
2016-03-14 13:42:23 -04:00
Jack Humbert f2cf3f3028 Merge pull request #197 from yoyoerx/windocs
Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build
2016-03-14 13:37:10 -04:00
yoyoerx b8d4af8d4a Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build 2016-03-14 13:19:29 -04:00
Daniel Kriesten bfc6eca44a fixes an obvious typo to have DE_LCBR produce { 2016-03-14 13:35:34 +01:00
Didier Loiseau 7c33f8493f Keymap header for the BÉPO layout 2016-03-13 23:22:21 +01:00
Fred Sundvik 59657355d2 Master mode remains active
It remains active even if the USB link is suspended or otherwise
temporarilly goes down.
2016-03-13 21:38:51 +02:00
Fred Sundvik f4c11740f7 Suspend power off, fix backlight animation
The backlight color animation was using the wrong frame number, so
it didn't work properly.
2016-03-13 21:35:42 +02:00
Fred Sundvik b93d07198a Suspend support for the visualizer 2016-03-13 20:13:02 +02:00
Wojciech Siewierski 20dd9c0326 process_action may be called either with key cache or without it
If one wants to temporarily disable the key cache (for example because
it interferes with a macro), `disable_action_cache` must be set to
`true`. `process_action_nocache` is a simple wrapper doing just that for
a single call.
2016-03-13 00:18:20 +01:00
Fred Sundvik f7275f0ede Configurable baud setting 2016-03-12 22:37:04 +02:00
Fred Sundvik d835ad91a3 Resend the keyboard state every ms
In case there's some errors on the link, and the packet gets lost
2016-03-12 20:08:08 +02:00
Fred Sundvik 315edb4826 Add serial link support for visualizer 2016-03-12 19:42:57 +02:00
Fred Sundvik 32f0171d39 Fix crash when receiving unregistered remotes 2016-03-12 19:41:34 +02:00
Fred Sundvik 11bd4ba0dd Remote object callable from many places
Change init_transport to add_remote_objects, so that it can be
called many times from different places.
2016-03-12 19:35:09 +02:00
Alex Johnstone e4b7ce41e3 Started my keymap 2016-03-11 22:27:03 -08:00
yoyoerx 58bbfc5fa6 PR190hotfix.sh, fresh hexes, makeallhex.sh script 2016-03-11 11:16:19 -05:00
Jack Humbert 45de75f179 Merge pull request #192 from mitchlloyd/mitch-layout
First keyboard layout
2016-03-10 20:43:04 -05:00
Mitch Lloyd 67624d0b61 First keyboard layout 2016-03-10 17:20:08 -08:00
yoyoerx 1d4b408fbc Merge branch 'function_pointers' of github.com:yoyoerx/qmk_keyboard into function_pointers 2016-03-10 11:29:00 -05:00
yoyoerx 641859df84 Addressed void* return warning in all keymaps 2016-03-10 11:28:34 -05:00
Jack Humbert cadd9015dd Merge pull request #191 from yoyoerx/windocs
Cygwin Based Users Guide v0.5 -further corrections
2016-03-10 11:03:27 -05:00
yoyoerx 191488b96f Merge remote-tracking branch 'qmk/master' into windocs 2016-03-10 10:50:17 -05:00
yoyoerx 79e0d7cbc3 Cygwin Based Users Guide v0.5 -further corrections 2016-03-09 15:53:37 -05:00
Jack Humbert 2a9d8b3f30 Merge pull request #187 from yoyoerx/windocs
Cygwin Based Users Guide v0.4 -corrections/dfu build
2016-03-09 15:47:25 -05:00
yoyoerx d58b14e880 Addressed void* return warning & coding style 2016-03-09 14:04:14 -05:00
yoyoerx 6bfb9d17cf Cygwin Based Users Guide v0.4 -corrections/dfu build 2016-03-09 12:16:03 -05:00
Stephan Bösebeck 3119778e0c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-08 23:56:50 +01:00
Didier Loiseau b7a81f0419 Fix #156: clear weak mods on every key press
- new macro_mods bit field for mods applied by macros
- weak_mods now only used for ACT_{L,R}MODS (i.e. LSFT, RSFT, LCTL etc.)
- clear the _weak_ mods on every key *pressed* such that LSFT etc.
  can no more interfere with the next key
2016-03-08 23:14:15 +01:00
Wojciech Siewierski 8d55a12a95 Document the issue of stuck modifiers 2016-03-08 08:48:43 +01:00
Erez Zukerman 7d3ebd7b40 Adds a readme with a link to the blog post 2016-03-08 03:50:57 +02:00
Erez Zukerman de8f99bf6e Merge pull request #185 from nrrkeene/master
The Ordinary Layout is familiar to users of common keyboards
2016-03-07 20:46:33 -05:00
Jack Humbert 10f45a63b6 Merge pull request #177 from yoyoerx/windocs
Documentation for Cygwin in Windows
2016-03-07 10:16:35 -05:00
Nicholas Keene 9d06063a23 The Ordinary Layout, designed to be similar to traditional keyboards, by Nicholas Keene, released to the public domain, no rights reserved 2016-03-06 23:12:29 -06:00
Wojciech Siewierski c2480884aa Fix the layer-dependent modifiers handling
Closes #181.
2016-03-05 14:42:17 +01:00
Jack Humbert 4e4250063e Merge pull request #180 from NoahAndrews/add-build-instructions
Added build instructions to BUILD_GUIDE.md
2016-03-04 23:34:45 -05:00
Noah Andrews 553668550b Added build instructions to BUILD_GUIDE.md 2016-03-04 23:21:29 -05:00
Jack Humbert 4a5a2640b9 Merge pull request #179 from NoahAndrews/add-win-linux-instructions
Added Windows and Linux instructions to BUILD_GUIDE.md
2016-03-04 21:57:39 -05:00
Noah Andrews fe7738f2df Added Windows and Linux instructions to BUILD_GUIDE.md 2016-03-04 21:51:09 -05:00
yoyoerx 2f6f45aa3e Cygwin Based Users Guidev0.2 -formatting revisions 2016-03-04 15:04:42 -05:00
yoyoerx c9c763e000 Cygwin Based Users Guide v0.1 2016-03-04 14:38:38 -05:00
Jack Humbert 825626b1f4 Merge pull request #176 from NoahAndrews/fix-new-projects
Fix building new projects
2016-03-04 10:58:36 -05:00
Noah Andrews ee1b94045e Remove extraneous comma 2016-03-04 10:53:58 -05:00
Jack Humbert 5f3e99f67b Merge pull request #171 from NoahAndrews/restructure-documentation
Restructure documentation
2016-03-04 10:19:28 -05:00
Jack Humbert 3f7180a73e Merge pull request #170 from NoahAndrews/improve-windows-docs
Add scripts for easy Windows environment setup
2016-03-04 10:19:00 -05:00
Jack Humbert cc46f69843 Merge pull request #165 from deepshitgoeshere/deepshitgoeshere-master
added planck keymap and troubleshooting part in the PCB guide
2016-03-04 10:17:14 -05:00
Jack Humbert 984c82a0f8 Merge pull request #175 from NoahAndrews/fix-#174
Fix #174
2016-03-04 10:16:07 -05:00
Noah Andrews de1e200021 Fix #174 2016-03-04 10:15:21 -05:00
Jack Humbert ccf848917b Merge pull request #172 from plgruener/pr1
add missing keys to keymap_neo2.h
2016-03-03 23:35:12 -05:00
Stephan Bösebeck 98fe40caa7 Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-03-03 23:23:56 +01:00
Stephan Bösebeck 2ae8a87af4 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-03 23:23:47 +01:00
plgruener 4ca4322501 update neo keymap 2016-03-03 10:25:23 +01:00
Noah Andrews b9c22ff8fc Clarified recommended Mac setup method 2016-03-02 22:38:22 -05:00
Noah Andrews 492e88b24b Updated README to point to new build guide 2016-03-02 22:33:38 -05:00
Noah Andrews 0eb252eb61 Added Mac section (copy/pasted from PCB_GUIDE.md) 2016-03-02 22:16:43 -05:00
Noah Andrews 04b47cb2eb Renamed handwriting guide to fit repository convention 2016-03-02 22:10:10 -05:00
Noah Andrews 92c3397ffc Added placeholder for windows section of build guide 2016-03-02 22:07:26 -05:00
Noah Andrews 3871ced15c Added Vagrant explanation 2016-03-02 22:03:25 -05:00
Noah Andrews a399823b93 Added stub BUILD_GUIDE.md 2016-03-02 21:53:55 -05:00
Noah Andrews d47cac9bb3 Renamed QUICK_START.md to VAGRANT_GUIDE.md 2016-03-02 21:27:45 -05:00
Noah Andrews 140a311e65 Fix link to MHV AVR Tools 2016-03-02 13:06:33 -05:00
Noah Andrews 45933e84f1 Added documentation for new Windows scripts 2016-03-02 13:02:13 -05:00
Noah Andrews 240f8d9fe0 Renamed scripts to show order 2016-03-02 12:54:53 -05:00
Noah Andrews c03d10d676 Added logging to setup script 2016-03-02 12:48:10 -05:00
Noah Andrews 06de9628be Removed unneeded lines from setup script 2016-03-02 12:25:21 -05:00
Christopher Browne e36a441274 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-02 11:49:00 -05:00
Stephan Bösebeck 46ddbd1fe2 forgot F6 2016-03-02 08:43:21 +01:00
Stephan Bösebeck fbfb034337 updated version, changed F-Key-Layout, minor change in code layer 2016-03-02 08:40:38 +01:00
Stephan Bösebeck 861429aa44 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-03-02 08:32:13 +01:00
Fred Sundvik 168c5b679f Call remote matrix update, when the matrix changes 2016-02-28 23:58:47 +02:00
Fred Sundvik 6fe6d111bf Send the keyboard matrix over the serial link 2016-02-28 22:52:30 +02:00
Fred Sundvik d8d4622802 Improve serial link initialization, and add driver 2016-02-28 21:46:29 +02:00
Fred Sundvik 46482460fa Some small fixes for the serial update loop 2016-02-28 15:52:03 +02:00
Fred Sundvik 9cb139adc4 Add simple loop for updating the serial link 2016-02-27 22:28:35 +02:00
Jack Humbert 93c9d2bc9f Merge pull request #166 from kletord/fix_french_keymap
Fix FR_RCBR declaration in keymap_french.h
2016-02-27 09:31:34 -05:00
Kévin Letord 4a19cc054d Fix FR_RCBR declaration in keymap_french.h 2016-02-27 15:22:54 +01:00
Lucas Hecht 52b3ddb521 Update PCB_GUIDE.md 2016-02-27 02:56:05 +01:00
Lucas Hecht bcf847e58a added "Troubleshooting" section to PCB guide 2016-02-27 01:26:54 +01:00
Lucas Hecht 74761626f5 ignore dfu-programme.exe in commits 2016-02-26 20:03:19 +01:00
Noah Andrews b7a94a1f00 Added Windows environment setup script 2016-02-26 01:53:18 -05:00
Noah Andrews 37c8a23276 Include MSYS directory in Windows path 2016-02-26 00:29:55 -05:00
Noah Andrews 4ad96c60ab Add script to setup the PATH variable on Windows 2016-02-25 23:53:44 -05:00
deepshitgoeshere 92adbe416c Delete keymap_eigen.c 2016-02-25 22:27:59 +01:00
deepshitgoeshere 8def502eee Delete dfu-programmer.exe 2016-02-25 22:27:17 +01:00
deepshitgoeshere e8f17e5136 Delete dfu-programmer.exe 2016-02-25 22:26:44 +01:00
Lucas Hecht cae9993a25 Merge branch 'jackhumbert-master' 2016-02-25 21:45:28 +01:00
Lucas Hecht 34a7012a33 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware into jackhumbert-master 2016-02-25 21:40:16 +01:00
Lucas Hecht bbfdfdcc5f delete old keymap (keymap_eigen.c) 2016-02-25 21:39:32 +01:00
Christopher Browne d3d1f15597 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-25 13:03:44 -05:00
Lucas Hecht 6280adbb6e Added keymap "lucas.c" 2016-02-24 22:54:39 +01:00
Fred Sundvik 17a1102a2a Fix include dir to use uincir instead of just inc 2016-02-24 22:31:01 +02:00
Stephan Bösebeck 3c2f935d87 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-24 17:06:32 +01:00
Jack Humbert 11c591c30d Merge pull request #158 from DidierLoiseau/eclipse-config
Add Eclipse settings files to .gitignore
2016-02-23 11:44:14 -05:00
Fred Sundvik 725929ec8b Fix include paths for new tmk_core update 2016-02-23 09:37:24 +02:00
Christopher Browne eb99e515b3 More documentation 2016-02-22 15:31:13 -05:00
Jack Humbert af6163f934 Merge pull request #159 from Keller-Laminar/patch-1
Include Dvorak underscore and plus keys.
2016-02-22 13:12:19 -05:00
Keller-Laminar 233af3a41c Include Dvorak underscore and plus keys.
There were previously no Dvorak specific underscore and plus key codes. For a keyboard like the Planck which has layers directly to shifted versions of special character keys you were unable to produce those characters using the Lower layer.
2016-02-22 13:06:26 -05:00
Fred Sundvik 36e4869531 Create a thread for the serial link 2016-02-21 23:52:00 +02:00
Fred Sundvik 6873b17117 Support for Chibios compilation
Remove some warnings, change the include paths.
2016-02-21 23:17:59 +02:00
Fred Sundvik 8cbfe79dd9 Add master to single slave transport 2016-02-21 21:47:40 +02:00
Fred Sundvik 7b88b8b7e1 Add slave to master transport 2016-02-21 21:32:01 +02:00
Fred Sundvik 64b7efeb72 Add proper initialization of transport buffers 2016-02-21 21:15:42 +02:00
Fred Sundvik 415ab91c9d Add master to slave transport 2016-02-21 21:04:42 +02:00
Jack Humbert d33681aa22 Merge pull request #157 from DidierLoiseau/typematrix
Small fixes and improvements to tm2030 layout
2016-02-21 13:35:08 -05:00
Didier Loiseau e63126ace2 Added eclipse settings files to .gitignore 2016-02-21 19:23:28 +01:00
Didier Loiseau a40273c7d7 Updated tm2030 keymap.hex 2016-02-21 19:10:03 +01:00
Didier Loiseau e336af79eb Fixed compilation warnings due to missing return statements 2016-02-21 18:56:21 +01:00
Jack Humbert b694fb3417 Merge pull request #153 from spydon/xmonad_keymap
Keymap optimized for xmonad
2016-02-21 12:35:46 -05:00
Jack Humbert 49cb207def Merge pull request #155 from vincent-pochet/fr_ch_extra_keymap
Add extra keymap for swiss french keyboard
2016-02-21 12:35:10 -05:00
Fred Sundvik fe1db50fc3 Writing signals events 2016-02-21 18:51:10 +02:00
Fred Sundvik 2710361cd8 Change the triple buffer object interface 2016-02-21 18:30:04 +02:00
Fred Sundvik 679bfe7c54 More transport WIP 2016-02-21 17:33:31 +02:00
Fred Sundvik 4ee6eadf9e Local and remote objects WIP 2016-02-21 12:53:51 +02:00
Fred Sundvik b7059d35f9 Working triple buffering 2016-02-21 01:07:44 +02:00
Fred Sundvik 8e2d70d11f Simplify the triple buffer implementation 2016-02-21 00:44:25 +02:00
Fred Sundvik 4bb5733cdc Updates to triple buffer 2016-02-20 23:40:52 +02:00
Fred Sundvik 50edb3d90c Add first version of triple buffered object 2016-02-20 22:22:42 +02:00
Fred Sundvik c78eefba49 Add first transport tests 2016-02-20 15:49:31 +02:00
Fred Sundvik ea346125e8 Add some validation for invalid router destinations 2016-02-20 15:28:42 +02:00
Fred Sundvik 532f98eef6 Support for other links sending to master 2016-02-20 15:14:40 +02:00
Fred Sundvik c28e19c546 First link sending to master 2016-02-20 15:02:53 +02:00
Vincent Pochet 1934e8a270 Add extra keymap for swiss french keyboard 2016-02-20 14:01:28 +01:00
Fred Sundvik 82b5037b9d Add master send to specific destinations 2016-02-20 14:52:17 +02:00
Fred Sundvik cee5406ed7 Add complete master broadcast test 2016-02-20 14:32:26 +02:00
Fred Sundvik 4b9fccc756 Start implement router 2016-02-20 13:59:48 +02:00
Fred Sundvik 5a1600e24f Add link parameter 2016-02-20 12:06:23 +02:00
Lukas Klingsbo 39ed50f605 Added a keymap optimized for xmonad
The M(1) function changes layer temporarily (so that numbers can be used)
and holds LGUI which makes it possible to easily change virtual screens
and swap windows inbetween them.
2016-02-18 21:27:02 +01:00
Jack Humbert a6414eb257 Merge pull request #145 from gerbercj/feature/atreus_astar
Add support for Atreus running on A-Star
2016-02-17 21:18:13 -05:00
Chris Gerber 1db3558a92 Change default controller for Atreus from Teensy2 to A-Star 2016-02-17 19:14:25 -05:00
Fred Sundvik 419908e5ef Hide the byte stuffer state inside it 2016-02-17 09:07:38 +02:00
Chris Gerber 47dcec2945 Add support for Atreus running on A-Star 2016-02-15 20:53:56 -05:00
Stephan Bösebeck f0dfe8ab97 testing moving the 6 to the left, having one key more on the right used for hash now
feels a bit more natural to me. Need to investigate further.
2016-02-15 14:13:29 +01:00
Fred Sundvik 8d50880686 Use memcpy instead of cast to avoid alignment issues 2016-02-14 21:49:31 +02:00
Fred Sundvik f22d2543b1 Rename route_frame to route_incoming_frame 2016-02-14 21:34:40 +02:00
Fred Sundvik 0eb62c4ce6 Rename recv_frame to validator_recv_frame 2016-02-14 21:33:14 +02:00
Fred Sundvik 2a6696bd3d Add validator send frame 2016-02-14 21:31:01 +02:00
Fred Sundvik 62058329ff Add crc32 validation of received frames 2016-02-14 21:13:16 +02:00
Fred Sundvik a3ec3bbef8 Start implement frame validator 2016-02-14 20:45:59 +02:00
Fred Sundvik 713465fb41 Add some full round trip tests
Mostly to ensure that the receive and send framing works the same
way. Especially for the special case with 254 non-zeros.
2016-02-14 20:07:51 +02:00
Fred Sundvik 6956c177da Add byte stuffing send support for large frames 2016-02-14 19:56:22 +02:00
Fred Sundvik 2f3ea76428 Fix name of some unit tests 2016-02-14 19:03:34 +02:00
Fred Sundvik f3beeb0270 Hanlde sending of zero bytes for small packets 2016-02-14 18:59:01 +02:00
Fred Sundvik a089eaa868 Add sending of small frames with no zeroes 2016-02-14 17:45:25 +02:00
Fred Sundvik 26537474ae Add byte stuffer recv handling of too long frames 2016-02-14 15:57:44 +02:00
Fred Sundvik e8cb6d8023 Bytestuffer recv handling of long frames 2016-02-14 15:28:57 +02:00
Fred Sundvik eefb5b5634 Mutiple frame handling for byte stuffer
Also handles unexpected data.
2016-02-14 14:25:54 +02:00
Fred Sundvik ce3a21cbea Implement receive of valid small byte stuffed frames 2016-02-14 14:04:51 +02:00
Fred Sundvik 8a991a266e Rename files to match what they actually do
Also add validator before routing.
2016-02-14 13:05:50 +02:00
Fred Sundvik 1f1bc183dd Start implementing data_link 2016-02-14 12:45:12 +02:00
Fred Sundvik 3eaddd6514 Use cgreen test runner instead of executables 2016-02-14 01:58:26 +02:00
Fred Sundvik 3c6b93a491 Add separate makefile for tests 2016-02-14 01:31:01 +02:00
Fred Sundvik e9a1474bb6 Add makefile for compiling and running unit tests 2016-02-14 00:20:14 +02:00
Fred Sundvik e70cefc12f Add cgreen unit test library and makefile 2016-02-14 00:05:58 +02:00
fredizzimo ffc425603d Initial commit 2016-02-13 23:26:39 +02:00
Fred Sundvik c5db02925c Clean up wrong license information 2016-02-13 22:20:47 +02:00
Fred Sundvik 8479e6aa39 Update readme and license
Also add integration examples
2016-02-13 22:08:49 +02:00
Fred Sundvik 8ce60649c8 Initialize backlight and LCD during visualizer_init 2016-02-13 20:29:49 +02:00
Fred Sundvik 209167d4d6 Compile the user visualizer 2016-02-13 19:53:22 +02:00
Fred Sundvik 9e58d022ba Add visualizer
A generic visualizer that supports animations. There's a few
predefined keyframe types included, and more can be added by the
user.
2016-02-13 19:38:23 +02:00
Fred Sundvik 01b955aa64 Add LCD backlight support
Also possibility to disable the LCD support
2016-02-13 19:21:16 +02:00
Fred Sundvik fb681b5a60 Add makefile that includes ugfx 2016-02-13 17:47:39 +02:00
Fred Sundvik bb75446b0b Add uGFX submodule v 2.4 2016-02-13 16:44:14 +02:00
fredizzimo 4452f4965d Add MIT license 2016-02-13 14:18:48 +02:00
Erez Zukerman 2c29ce3cfe Merge pull request #141 from XenoBits/master
Ergodox EZ new keymap for C# developers
2016-02-12 08:50:01 -05:00
Maxime Millet 9eea6850f9 Another readme.md improvement 2016-02-12 12:01:36 +01:00
Maxime Millet 8f1bafece5 Improved readme 2016-02-12 12:00:13 +01:00
Maxime Millet 8c051f2d05 Added C# developer keymap 2016-02-12 11:54:27 +01:00
Fred Sundvik 3568065141 Add readme 2016-02-12 09:33:38 +02:00
Jack Humbert 043ac26c24 Merge pull request #140 from lasko/master
A slightly different default layout
2016-02-11 23:58:08 -05:00
Lasko Height d290e09d7b Added pageup, pagedown, home, and end keys 2016-02-11 20:52:59 -08:00
Lasko Height 006d277ec1 Added a Tenkey layer and moved the del key 2016-02-11 20:46:12 -08:00
Lasko Height d3488f131c Adding my initial layout 2016-02-11 20:20:09 -08:00
Lasko Height 073a6c206e Adding my initial layout 2016-02-11 20:19:07 -08:00
Erez Zukerman f4fc7fd4d5 Merge pull request #139 from joarau/norwegian-colemak-ergodox-with-norwegian-definitions
Norwegian Colemak Ergodox and Norwegian key definitions
2016-02-11 20:40:47 -05:00
joar 2f7cda63d0 Norwegian Colemak Ergodox and Norwegian key definitions 2016-02-11 16:28:28 +01:00
Erez Zukerman 9f6966f765 More tweaks to experimental layout 2016-02-11 16:55:10 +02:00
Erez Zukerman 9e075e28be Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-02-11 16:39:40 +02:00
Erez Zukerman ec4428b1c6 Merge pull request #138 from Willyfrog/master
ergodox_ez for emacs + mac + altgr users
2016-02-10 15:40:25 -05:00
Guillermo Vayá f96186ed9c add image 2016-02-10 19:04:26 +01:00
Erez Zukerman 8aeaa6df81 Merge pull request #137 from uzytkownik/master
Add mpiechotka ergodox ez keymap
2016-02-10 08:24:06 -05:00
Guillermo Vayá 3c805548d9 added .hex file 2016-02-10 09:47:11 +01:00
Maciej Piechotka 03f61dcdb4 Add mpiechotka ergodox ez keymap 2016-02-09 23:37:02 -08:00
Jack Humbert 0206976267 Merge pull request #136 from cbbrowne/master
Random improvements
2016-02-08 14:25:22 -05:00
Christopher Browne 8079dc0682 Eliminate switch statement by using contiguous character ranges 2016-02-08 11:25:55 -05:00
Christopher Browne bbcc1046a6 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-08 10:53:50 -05:00
Erez Zukerman cd90dd9f6d Corrects typo 2016-02-08 15:22:56 +02:00
Erez Zukerman 67f14d938b Merge pull request #130 from jacobono/jacobono
Jacobono
2016-02-08 08:01:54 -05:00
Erez Zukerman ac84fa47fc Updates documentation, adds Cmd/Win dual-function key 2016-02-08 14:56:19 +02:00
Phil Hagelberg 2b0b5d804a Add Atreus 2016-02-08 18:23:15 +07:00
Jack Humbert f575079357 Merge pull request #134 from dragon788/patch-2
Added note about using avr_setup.sh
2016-02-07 22:00:45 -05:00
dragon788 34a8ad506c Added note about using avr_setup.sh
On most Linux distributions the avr_setup.sh script can be sourced ```. avr_setup.sh``` or under Bash ```source avr_setup.sh```. This will try and detect the appropriate package manager and install the required packages.
2016-02-07 17:16:28 -06:00
Didier Loiseau a2f6ab16c0 FN macro: use layer_invert() instead of modifying layer_state directly
- fixes stuck keys from the temporary layers
  (see also jackhumbert/qmk_firmware#78)
- removed the workaround for jackhumbert/qmk_firmware#81
  (using layer_invert() fixes the problem)
2016-02-07 23:33:37 +01:00
Didier Loiseau 7ba42b994b Fixed inconsistency between comment and actual numeric layer
- KC_INS should only be present on Fn layer
2016-02-07 23:33:37 +01:00
DidierLoiseau 47fc8b8dbd Fixed link to Magic doc in Dvorak section 2016-02-07 23:31:27 +01:00
Jack Humbert bc4f20853d advanced macro stuff for README 2016-02-07 16:28:48 -05:00
Jack Humbert 8967c0705b advanced macro stuff for README 2016-02-07 11:15:03 -05:00
Jack Humbert cf2c641557 advanced macro stuff for README 2016-02-07 11:14:47 -05:00
Jack Humbert 3a6e88d6f8 advanced macro stuff for README 2016-02-07 11:13:22 -05:00
Jack Humbert e6a2c77fde README changes 2016-02-07 10:41:00 -05:00
Jack Humbert 623666888f Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-02-07 10:39:01 -05:00
Jack Humbert 5dc0d1dc20 README changes 2016-02-07 10:38:57 -05:00
Jack Humbert 8d785de796 Merge pull request #131 from Vifon/patch-1
Use boolean AND instead of bitwise (possible typo)
2016-02-07 09:30:39 -05:00
Wojciech Siewierski 65b41e2e59 Use boolean AND instead of bitwise (possible typo)
Fortunately seems harmless.
2016-02-07 11:48:28 +01:00
Christopher Browne 04759d63ef Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-06 19:49:52 -05:00
Christopher Browne fe1519de07 Add in XOR of lowest 8 bits of system timer to encourage more randomness of the digits/letters chosen 2016-02-06 19:42:08 -05:00
Daniel Mijares b5b9885df7 add hex file 2016-02-06 13:59:30 -05:00
Daniel Mijares f5c1d6d1db my personal ergodox keymap layout
with pngs of layout and readme
2016-02-06 11:38:20 -05:00
Jack Humbert 240e8c6340 Merge pull request #129 from cbbrowne/master
Example of some "Random Keys"
2016-02-05 19:12:05 -05:00
Jack Humbert 832575f2e7 Update PCB_GUIDE.md 2016-02-05 19:06:25 -05:00
Erez Zukerman 3c683aa9f2 Fixes CM_SCLN and updates docs for Colemak 2016-02-05 16:28:24 +02:00
Erez Zukerman 1b0d0c6848 Tweaks symbol layer (see changleog) 2016-02-05 16:22:21 +02:00
tmk 29664234e2 Updated TMK Based Projects (markdown) 2016-02-05 13:33:43 +09:00
Jack Humbert 51964eda0c Merge pull request #126 from fernandodeperto/keymap_nordic
Fix 2 macros in the Nordic keymap
2016-02-04 20:01:57 -05:00
Fernando Mendonca c29ad125a7 Fix 2 macros in the Nordic keymap
By testing I found out that, at least on Linux using the Swedish layout,
two macros present on this file were wrong, for the backslash and pipe
keys. Jack helped me find the correct combination for the backslash and
that led me to the right one for pipe.
2016-02-05 01:50:54 +01:00
tmk e5e7dbebf6 Updated TMK Based Projects (markdown) 2016-02-05 09:22:16 +09:00
tmk 6778c175f5 Updated TMK Based Projects (markdown) 2016-02-05 09:22:01 +09:00
Erez Zukerman 8698edbb28 Merge pull request #124 from zorab47/disable-console-by-default
Disable Ergodox EZ debug console for improved performance
2016-02-04 15:13:44 -05:00
Erez Zukerman 434bcccae0 Merge pull request #125 from gkubed/patch-1
Update QUICK_START.md
2016-02-04 15:06:49 -05:00
Guyon Cumby 2ae39aaa86 Update QUICK_START.md
Fix ErgoDox EZ readme.md link
2016-02-04 12:09:25 -05:00
Charles Maresh a9ad5c55c8 Disable console for improved performance
Commenting out the line is the only way to disable the console, as the
value of CONSOLE_ENABLE isn't checked. There are only checks for its
existence; setting it to `yes` or `no` doesn't change the compilation.
2016-02-03 17:05:49 -06:00
Christopher Browne 73f14db8ad Remove obsolete comments 2016-02-03 16:54:38 -05:00
Christopher Browne 0d44544491 Comment things more 2016-02-03 16:47:54 -05:00
Christopher Browne 7919839b1a Random characters now working AOK 2016-02-03 16:46:24 -05:00
Christopher Browne 259e5e28e6 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-02-03 13:42:42 -05:00
Christopher Browne 674c62734d More experiments with mapping, notably adding in the random bits 2016-02-03 13:40:45 -05:00
Christopher Browne c39b53bb9a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-02-03 12:49:55 -05:00
tmk a38fc1beae Created Report Descriptor (markdown) 2016-02-02 14:41:14 +09:00
Christopher Browne a51009f300 Merge branch 'master' of github.com:cbbrowne/qmk_firmware 2016-02-01 20:53:58 -05:00
Christopher Browne 1466f5a36e Set up a macro that writes cbbrowne. So that is a nice example of how it works.
Probably ought to write up some docs on this to improve it.
2016-02-01 19:13:23 -05:00
Christopher Browne 91c4681656 More samples, some not entirely working yet.
I am trying to mess around with MACRO(), but it is not there quite yet...
2016-02-01 18:50:19 -05:00
Jack Humbert 2ce9c19478 Merge pull request #123 from cbbrowne/master
README notes and cbbrowne layout
2016-02-01 11:42:45 -05:00
Christopher Browne 41c17baccf Add notes on what sorts of actions are risky 2016-02-01 11:37:17 -05:00
Christopher Browne 5273c73bef Many of the changes I wanted 2016-02-01 11:11:21 -05:00
Erez Zukerman f24c69d177 Refreshes default keymap for single tap L1 switch 2016-02-01 15:37:27 +02:00
Jack Humbert 1ee080701b Merge pull request #116 from tachk/readmeFix
Fix for broken link in readme.
2016-01-31 20:40:34 -05:00
Jack Humbert dc06288cb7 Merge pull request #119 from seancaffery/teensynote
Clarify Atreus support
2016-01-31 20:40:19 -05:00
Christopher Browne db2d97d8dc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-31 13:08:47 -05:00
Erez Zukerman 1dbd6c2ba1 Merge pull request #118 from sboesebeck/master
created new layer for egosooters like counterstrike
2016-01-31 10:54:59 -05:00
Guillermo Vayá 34eb5dfb97 new emacs + osx + deadkeys layout 2016-01-31 11:44:41 +01:00
Sean Caffery ad6bc8794e Clarify Atreus support 2016-01-31 15:54:11 +11:00
Stephan Bösebeck 602090a430 some fixes in readme 2016-01-31 00:21:34 +01:00
Stephan Bösebeck 1531350125 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-31 00:17:25 +01:00
Christopher Browne 59998daa59 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-30 15:43:34 -05:00
Erez Zukerman 3008c6c6f7 Merge pull request #117 from coderkun/master
Merge changes for coderkun’s Neo2 layout
2016-01-30 15:27:06 -05:00
coderkun a75cc8463f add build instructions to readme 2016-01-30 12:37:09 +01:00
coderkun 38f8ed9a0c correct link and some minor details in readme file 2016-01-30 12:29:30 +01:00
coderkun d959f23e5e add readme file for coderkun’s Neo2 layout 2016-01-30 12:26:32 +01:00
coderkun 57bd21d8a6 Merge remote-tracking branch 'upstream/master' 2016-01-30 12:08:27 +01:00
coderkun 7f4eb72b9d add layers for poor man’s QWERTZ and poor man’s Neo including Neo’s layer 4 2016-01-30 12:06:31 +01:00
Kacey A d97c77447f Fix for broken link in readme. 2016-01-30 02:56:37 -08:00
Jack Humbert 3985f97d87 Merge pull request #115 from seancaffery/sean/atreus
Add Teensy2 Atreus support
2016-01-29 23:47:27 -05:00
Sean Caffery c363d6b061 Add Teensy2 Atreus support 2016-01-30 15:30:33 +11:00
Jack Humbert 7d6716bede audio on reset 2016-01-29 23:27:36 -05:00
Jack Humbert 0a71166a2d missing file 2016-01-29 23:11:25 -05:00
Stephan Bösebeck bf64046a04 fixed some copy paste errors 2016-01-29 23:43:56 +01:00
Stephan Bösebeck 7b989a962e added a egoshooter layer 2016-01-29 23:31:58 +01:00
Christopher Browne 55ccf839c1 More notes 2016-01-29 15:49:48 -05:00
Christopher Browne af795d6298 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-29 15:39:57 -05:00
Christopher Browne 580c3e1d55 On Linux, run dfu-programmer as root 2016-01-29 15:35:51 -05:00
Christopher Browne 05d43b0687 Notes on what's done, and plans to change my key mapping 2016-01-29 13:01:28 -05:00
Christopher Browne 9aca1c70b7 Notes on what's done, and plans to change my key mapping 2016-01-29 12:57:52 -05:00
Christopher Browne 5e64f710dc Bunch of reformatting, improvements to comments 2016-01-29 12:49:43 -05:00
Christopher Browne 753ffa4eed Latest version of cbbrowne key maps 2016-01-29 12:21:10 -05:00
Stephan Bösebeck 791e3d73b3 Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-01-29 07:49:05 +01:00
Stephan Bösebeck 93a74d9cb1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-29 07:46:48 +01:00
Christopher Browne 71bd4818cb Added in a keypad layer that replaces Dvorak 2016-01-28 18:01:40 -05:00
Stephan Bösebeck 6ac29c4ac8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-28 22:10:25 +01:00
Erez Zukerman 2006084656 Merge pull request #113 from chschmitz/master
New German layout for ErgoDox, similar to Kinesis Ergo Elan and regular German keyboards
2016-01-28 15:19:20 -05:00
Christoph Schmitz 21c4dfe983 Added .hex file. 2016-01-28 20:22:48 +01:00
Christoph Schmitz 9bb20de578 Fixed graphics. 2016-01-28 20:20:19 +01:00
Christoph Schmitz a38fa4b727 Added media layer. 2016-01-28 20:17:45 +01:00
Christoph Schmitz 9abd1eea79 Added links. 2016-01-28 20:05:58 +01:00
Christoph Schmitz 28d2b93b0a Added documentation. 2016-01-28 19:55:14 +01:00
Christoph Schmitz c8e7f9bbfc Made all layer change keys momentary. Removed Hyper and Meh in favor of layer 1 and 2 on both halves. 2016-01-28 19:53:58 +01:00
tmk 79f28ac3bd Created USB HID (markdown) 2016-01-29 01:11:35 +09:00
Stephan Bösebeck f153374517 added new macros 2016-01-28 15:58:19 +01:00
Stephan Bösebeck 2776251ffc playing more with cursor keys 2016-01-28 15:37:52 +01:00
Stephan Bösebeck 4beb0115ff playing a bit with cursor keys 2016-01-28 14:56:55 +01:00
Stephan Bösebeck 240db0c7d8 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-28 09:40:50 +01:00
Christoph Schmitz fdad7ecff9 Switched up and down keys to be closer to the vi etc. world. 2016-01-27 22:05:11 +01:00
Christoph Schmitz 0c66ca026e Fixed circonflex key. 2016-01-27 20:24:14 +01:00
Christoph Schmitz bf257e3b37 Fixed regarding Ctrl and Alt keys. 2016-01-27 20:14:11 +01:00
Christoph Schmitz 1308135655 Added a German layout inspired by the Kinesis Ergo Elan and based on the "german" keymap. 2016-01-27 19:47:42 +01:00
Adrian L Lange 5a7d3dce95 Updated TMK Based Projects (markdown) 2016-01-27 14:30:52 +01:00
Adrian L Lange aee41b1293 Updated TMK Based Projects (markdown) 2016-01-27 13:45:50 +01:00
Adrian L Lange 6b368a8edc Added link to embedding page 2016-01-27 13:44:43 +01:00
Adrian L Lange e13934c60a Updated Embedding (markdown) 2016-01-27 13:42:44 +01:00
Adrian L Lange 611ca00918 Added a warning 2016-01-27 13:42:05 +01:00
Adrian L Lange 5eef65f9b4 Created Embedding (markdown) 2016-01-27 13:40:02 +01:00
Adrian L Lange 9b9a1a946e Typo 2016-01-27 12:58:13 +01:00
tmk 78783e23d8 Created Kiibohd (asciidoc) 2016-01-27 08:48:49 +09:00
Jack Humbert 30db300d94 Merge pull request #110 from mollat/master
add mollat keymap
2016-01-26 13:01:35 -05:00
AM 1946c7ce9a add mollat keymap 2016-01-26 18:46:06 +01:00
Stephan Bösebeck f6dab10288 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-25 21:47:57 +01:00
Jack Humbert 3ea6927b70 Merge pull request #109 from petereichinger/master
Fix flickering when sleeping
2016-01-25 11:56:00 -05:00
Peter Eichinger 78192791bc Merge branch 'master' into flicker-fix 2016-01-25 17:46:50 +01:00
Erez Zukerman e9356dcad5 Merge pull request #107 from tonyabra/config/tonyabra-osx
Simplified osx layout for ergodox ez
2016-01-25 07:04:44 -05:00
Stephan Bösebeck da7f259a1f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-25 10:52:29 +01:00
tonyabra baddbc6b23 Simplified osx layout for ergodox ez 2016-01-24 23:33:26 -06:00
Jack Humbert 99c72d0d9b Merge pull request #106 from yangliu/planck-rgb
RGB Underglow with WS2812 LEDs
2016-01-24 21:31:08 -05:00
Yang Liu f277079dfa no message 2016-01-24 18:16:40 -08:00
Yang Liu 6bc5e0cc31 Update README 2016-01-24 18:12:19 -08:00
Yang Liu 2d29795de8 add one more photo 2016-01-24 17:56:43 -08:00
Yang Liu 84657a9e4b Add a photo for the demonstration of RGB underflow 2016-01-24 17:54:35 -08:00
Yang Liu 2647c7cd84 fix bugs in animation effects 2016-01-24 17:19:33 -08:00
Yang Liu ba9ac457b2 Integrate WS2812 code into quantum core 2016-01-24 17:05:47 -08:00
Yang Liu 0a40654b82 Add support for WS2812 LEDs 2016-01-24 13:14:50 -08:00
Stephan Bösebeck f958b2e832 typo fix 2016-01-24 21:54:31 +01:00
Peter Eichinger c5f90eb99b Remove led_off() it is not used 2016-01-24 11:13:11 +01:00
Jack Humbert fd72a46c13 Makefile back to defaults 2016-01-23 20:52:01 -05:00
Jack Humbert 24f2698fba changes to the template 2016-01-23 20:45:52 -05:00
Jack Humbert 6a55a5fe48 not sure how this got here.. 2016-01-23 20:40:40 -05:00
Jack Humbert 9a1ae948c9 Merge pull request #104 from jackhumbert/smarkefile
Rework Planck file structure
2016-01-23 20:37:00 -05:00
Jack Humbert ae620fe856 rename file 2016-01-23 20:35:13 -05:00
Jack Humbert 5143c59bdf Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-23 20:34:05 -05:00
Jack Humbert 544a49329c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-23 20:33:35 -05:00
Jack Humbert c753bfcc14 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audio 2016-01-23 20:32:51 -05:00
Jack Humbert e5aee62e54 starting the hand-wiring guide 2016-01-23 20:29:54 -05:00
Erez Zukerman a50f4d6229 Merge pull request #102 from sboesebeck/master
osx_de/keymap.c file is missing...
2016-01-23 17:02:31 -05:00
Stephan Bösebeck 42a22af446 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-23 22:41:05 +01:00
Erez Zukerman 85f72d3225 Merge pull request #97 from DidierLoiseau/typematrix
TypeMatrix 2030 Layout for ErgoDox EZ
2016-01-23 14:17:44 -05:00
DidierLoiseau 3e31fa4c50 Fixed rendering of the Layer Switching section 2016-01-23 19:29:14 +01:00
DidierLoiseau 606d63e602 Fixed small issues in README.md
- fixed rendering of the basic layer on GitHub
- fixed missing Calculator, Mail & Browser Home keys in Fn Layer
2016-01-23 19:18:37 +01:00
Didier Loiseau b0d7d9d922 Added keymap.hex 2016-01-23 18:59:06 +01:00
Didier Loiseau 294bd25615 Moved layout description to README.md and added more details 2016-01-23 18:56:32 +01:00
Didier Loiseau 96b9089d9f Added Calculator, Mail and Browser Home application keys. 2016-01-23 18:16:19 +01:00
Didier Loiseau 67583b2f4a Renamed "Numbers Layer" to "Numeric Layer" 2016-01-23 18:04:45 +01:00
Didier Loiseau e5f84058bb Implemented new folders structure.
moved keymap_typematrix.c to tm2030/keymap.c
2016-01-23 16:59:33 +01:00
Didier Loiseau ad2a4c3203 Merge remote-tracking branch 'jackhumbert/master' into typematrix 2016-01-23 16:44:59 +01:00
Erez Zukerman 306f183b1c Merge pull request #100 from RageZBla/colemak
Add colemak keymap to Ergodox EZ.
2016-01-23 08:39:29 -05:00
Olivier Lechevalier 51fec6647a Add colemak keymap to Ergodox EZ. 2016-01-23 14:09:42 +09:00
Peter Eichinger b2badef7d0 Backlight fix from reddit
https://www.reddit.com/r/olkb/comments/41ur41/crazy_flashing_when_my_computer_sleeps/
2016-01-22 17:37:22 +01:00
Jack Humbert a18dcc0fb1 Merge pull request #98 from xaocon/fix_tap
Single tap enable ACTION_LAYER_TAP_TOGGLE layer
2016-01-22 11:35:04 -05:00
Evan Pitstick caf82bcace Single tap enable ACTION_LAYER_TAP_TOGGLE layer 2016-01-22 07:33:56 -05:00
Stephan Bösebeck f95e3e701c new hex file 2016-01-22 08:22:59 +01:00
Stephan Bösebeck 9d03f48643 reinstalled lost file, updated with some tweaks 2016-01-22 08:22:23 +01:00
Stephan Bösebeck 610b77f1f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-22 08:19:39 +01:00
Stephan Bösebeck f0a873aca1 changed some places, disabled layer3, in file it's ADNW now 2016-01-22 08:18:13 +01:00
Erez Zukerman e44920fd81 Merge pull request #95 from jackhumbert/keymap_folders
New per-folder format for ErgoDox EZ keymaps
2016-01-21 20:55:06 -05:00
Erez Zukerman 776017aa26 Adds the hex files too 2016-01-22 03:53:53 +02:00
Erez Zukerman 1598a8c46a Introduces new subdirectory structure 2016-01-22 03:51:59 +02:00
Stephan Bösebeck a07a8079da added koy layer to default, but disabled it 2016-01-21 09:50:06 +01:00
Stephan Bösebeck ce9086c507 replaced qwertz with adnw-koy as default 2016-01-21 09:37:58 +01:00
Stephan Bösebeck fa53ad5136 swapping modeswitch and Acut-Chars on thumb block 2016-01-21 09:13:44 +01:00
Jack Humbert a820533ab7 keymap.c changes, disable grep stuff 2016-01-20 00:15:29 -05:00
Jack Humbert eb61700912 better integrations 2016-01-20 00:06:52 -05:00
Erez Zukerman 7f84ab6ad9 Adds a bunch of compiled files 2016-01-20 05:49:38 +02:00
Erez Zukerman 922545240b renames readme 2016-01-20 05:34:00 +02:00
Erez Zukerman 6b0ca4aee4 Renames hex 2016-01-20 05:31:56 +02:00
Erez Zukerman d97daecbf7 Updates Markdown image link 2016-01-20 05:30:35 +02:00
Erez Zukerman f25bb0ef52 Adds a readme and hex for my experimental layout 2016-01-20 05:26:10 +02:00
Erez Zukerman 5adc810e8c New per-folder format for ErgoDox EZ keymaps 2016-01-20 05:19:50 +02:00
Jack Humbert 8b7e86b2c3 Merge pull request #94 from plgruener/german_aliases
complete keymap_german.h (all alphanumerics)
2016-01-19 14:09:55 -05:00
plgruener da09312dd5 complete keymap_german.h (all alphanumerics)
add 'DE_'-prefixed aliases for all alphanumerics, so it becomes
immediatly obvious which layout we are assuming.
2016-01-19 20:04:08 +01:00
Erez Zukerman 1454e4664d Makes ' into a dual-action key for LGui 2016-01-19 17:55:47 +02:00
Erez Zukerman 9afa3772de Adds an experimental keymap for my own use 2016-01-19 17:37:36 +02:00
Erez Zukerman 393f26f250 Merge pull request #73 from dragon788/dragon_mod
Requesting some comments and review on my changes
2016-01-18 19:38:32 -05:00
Jack Humbert 0c3aed93db Merge pull request #93 from petereichinger/master
LCAG modifier combo and AutoHotkey international characters
2016-01-18 16:38:15 -05:00
Peter Eichinger d466216088 Fix code formatting in international characters readme entry 2016-01-18 22:33:26 +01:00
Peter Eichinger 783eafac6e Readme for LCAG modifier combo and international characters with AutoHotkey 2016-01-18 22:31:36 +01:00
Peter Eichinger 48eb980c2a Add defines for CtrlAltGui modifiers 2016-01-18 21:56:00 +01:00
dragon788 6774167900 Command line programming not default, enable by reading quickstart and comments in Vagrantfile 2016-01-17 17:13:08 -06:00
dragon788 ceb7257a9d Allow passthru of Teensy to Virtualbox for programming 2016-01-17 16:08:47 -06:00
dragon788 67f7507d7c Fixing Debian/Ubuntu updates to be completely non-interactive 2016-01-17 13:20:28 -06:00
dragon788 b305e622b5 Note about Virtualbox incompatibilities 2016-01-17 12:39:28 -06:00
Hans Viktorin 943d1cc673 Updated TMK Based Projects (markdown) 2016-01-17 15:53:36 +01:00
Didier Loiseau fb18130408 Implemented Dvorak layer 2016-01-17 15:02:33 +01:00
dragon788 ebd209d285 Update README.md 2016-01-16 20:46:15 -06:00
dragon788 6c22bd6665 Create QUICK_START.md describing Vagrantfile usage
Provides links to software required to use the Vagrantfile.
2016-01-16 20:43:43 -06:00
Erez Zukerman 9d387f05e0 Merge pull request #88 from J3RN/j3rn-keymap
Add J3RN's Mac-centric Ergodox EZ keymap
2016-01-16 20:39:23 -05:00
dragon788 e04464c7ab Having media layer defined causes toggles to 'stick' rather than be momentary in my experience 2016-01-16 12:31:13 -06:00
dragon788 6940a961fd Resetting keymap_default.c to origin/master not just my fork's master 2016-01-16 12:21:49 -06:00
dragon788 a19f149eb2 Moving my layout to its own file, made plover layout file, restoring default keymap to its default status 2016-01-16 12:15:06 -06:00
dragon788 987ac16afd Updated avr script and added notes to Vagrantfile 2016-01-16 11:44:27 -06:00
Ralf Schmitt f4b5b8486f Updated TMK Based Projects (markdown) 2016-01-16 17:18:58 +01:00
Adrian L Lange 006a1f806a Added link to project 2016-01-16 16:53:55 +01:00
Adrian L Lange 0e5b64f092 Rename title 2016-01-16 16:52:46 +01:00
Adrian L Lange c4f5db9351 Update links to documentation 2016-01-16 16:12:40 +01:00
Jonathan Arnett 10ab4eff06 Merge branch 'master' into j3rn-keymap 2016-01-16 09:54:46 -05:00
Jonathan Arnett 2de371564d Added keymap_j3rn_README.md 2016-01-16 09:49:21 -05:00
Jack Humbert 2dcdbb8f67 Merge branch 'smarkefile' of https://github.com/jackhumbert/tmk_keyboard into smarkefile 2016-01-16 01:09:21 -05:00
Jack Humbert f66a251e5d I guess I can reference #90 in the commit message 2016-01-16 01:08:50 -05:00
Jack Humbert 547fa6e461 I guess I can reference #90 in the commit message 2016-01-16 01:01:32 -05:00
Jack Humbert c9a096dc99 added error for keymap file not existing 2016-01-16 00:57:35 -05:00
Jack Humbert dfe7004bc5 new keymap folder structure and makefile magic 2016-01-16 00:52:31 -05:00
Jack Humbert 4faddd3449 working 2016-01-16 00:06:51 -05:00
Jack Humbert 6e3c36360e sounds 2016-01-15 23:10:30 -05:00
Vinícius Cordeiro 266aae0ebc Adding the S60-X to the list of supported keyboards. 2016-01-16 00:16:12 -02:00
tmk 85d56eea38 Updated TMK Based Projects (markdown) 2016-01-16 11:08:36 +09:00
tmk 97fe4201aa Updated Keymap examples (markdown) 2016-01-16 10:56:01 +09:00
tmk 32df47053b Updated TMK Based Projects (markdown) 2016-01-16 10:24:45 +09:00
tmk 8bccc5d217 Updated TMK Own Projects (markdown) 2016-01-16 10:24:16 +09:00
tmk b3f45e2efd Updated TMK Own Projects (markdown) 2016-01-16 10:22:35 +09:00
tmk f743e65ab7 Updated Home (markdown) 2016-01-16 10:21:46 +09:00
tmk 5133bb146e Updated TMK based Projects (markdown) 2016-01-16 10:21:23 +09:00
tmk f95480e3ca Updated TMK own projects (markdown) 2016-01-16 10:21:06 +09:00
tmk 053b3b9847 Created TMK own projects (markdown) 2016-01-16 10:20:33 +09:00
tmk 53278bc658 Updated TMK based Projects (markdown) 2016-01-16 10:18:37 +09:00
tmk 4a34a192b5 Updated Home (markdown) 2016-01-16 10:18:17 +09:00
tmk a5bf8cc4e1 Updated TMK Projects (markdown) 2016-01-16 10:17:09 +09:00
Didier Loiseau 93e350caa1 Added shifts on the thumbs 2016-01-16 00:38:13 +01:00
Erez Zukerman 9487e92a6e Merge pull request #89 from coderkun/master
add coderkun’s ErgodoxEZ keymap (Neo2)
2016-01-15 15:28:10 -05:00
Erez Zukerman a579ffff6b Merge pull request #87 from sboesebeck/master
added some macros, create full de_osx include file
2016-01-15 15:23:33 -05:00
coderkun 47fce7e0a9 merge upstream 2016-01-15 20:21:23 +01:00
coderkun bd9aebc84a merge upstream 2016-01-15 20:19:45 +01:00
coderkun 57bf227f6d add basic layer 2 2016-01-15 19:09:13 +01:00
Jonathan Arnett 79940c5825 Change lower-left control to momentary L1
There's so many control keys in this keymap, one needed to go. So, I changed
the lower-left control key to be a momentary L1, just like the same key on the
right side.
2016-01-15 11:36:27 -05:00
Jonathan Arnett 8585269a07 Version 1.0.0 2016-01-15 11:36:21 -05:00
Stephan Bösebeck 7783b47b8b updated cheat sheet, hex file 2016-01-15 16:04:55 +01:00
Stephan Bösebeck e44c30f203 using keymap_german_osx.h more, adding macros for CTRL/CMD-V combination 2016-01-15 15:55:00 +01:00
Stephan Bösebeck 28964bb04b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-13 22:55:48 +01:00
Stephan Bösebeck 5b14d9d84b Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-01-13 22:55:37 +01:00
Erez Zukerman 46f4494e55 Merge pull request #84 from sboesebeck/master
new alternative layout ADNW_Koy
2016-01-13 15:39:17 -05:00
Jack Humbert 8b76d1ba4c Merge pull request #83 from lxol/feature/hhkb-qmk
migrate hhkb to QMK firmware
2016-01-13 09:55:58 -05:00
Stephan Bösebeck 831a21899f updating layout png 2016-01-13 14:04:46 +01:00
Stephan Bösebeck 6215ce2a89 adding fixed hex file 2016-01-13 13:37:29 +01:00
Stephan Bösebeck 2bde3f550f typo fix 2016-01-13 13:30:01 +01:00
Stephan Bösebeck eea41339b9 added adnw layout 2016-01-13 13:17:28 +01:00
Stephan Bösebeck 7ef03c59db typo and copy past fix 2016-01-13 13:16:05 +01:00
Stephan Bösebeck 06bdd4869f minor fix 2016-01-13 11:53:09 +01:00
Stephan Bösebeck c9a76723ac bugfix 2016-01-13 11:45:35 +01:00
Stephan Bösebeck ddab0dc32c updated ANDW layout 2016-01-13 11:38:24 +01:00
Stephan Bösebeck 8e17ca0339 Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware 2016-01-13 11:24:54 +01:00
Stephan Bösebeck 684c6849f9 andw layout added 2016-01-13 11:21:55 +01:00
Alex Olkhovskiy 0c9227f691 migrate hhkb to QMK firmware 2016-01-13 09:46:55 +00:00
Jack Humbert 4c100dbbef note seq, start-up beeps, function beeps 2016-01-13 00:25:31 -05:00
dragon788 71ee3eb2e7 All dfu dependencies in place, multi-line syntax to make it easy to add/read 2016-01-12 21:41:43 -06:00
Stephan Bösebeck 6e837f6fef Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-12 22:52:32 +01:00
Erez Zukerman a085265aaa Disables debug console by default for improved performance 2016-01-12 22:32:29 +02:00
coderkun e4d087c7c0 add basic layer 1 2016-01-12 07:01:02 +01:00
coderkun 6050971d01 add neo2 keymap for ergodoxEZ 2016-01-12 06:28:24 +01:00
Jack Humbert 263344d42f beeps on lock keymap 2016-01-11 18:00:07 -05:00
Jack Humbert 0f867796de timer 3 2016-01-11 17:52:35 -05:00
Jack Humbert 29de37d5c0 pwm audio 2016-01-11 16:53:33 -05:00
Didier Loiseau d3e4cc9af6 Implement cut/copy/paste as macros
Workaround for jackhumbert/qmk_firmware#81
+ added macro names
+ removed unused macro 0
2016-01-10 19:49:08 +01:00
Didier Loiseau d9b1c8d360 Added fn-eject, fn-power .. fn-pause keys
Eject does not work though, see jackhumbert/qmk_firmware#82
and tmk/tmk_keyboard#250
2016-01-10 19:15:33 +01:00
Erez Zukerman 5e376cb595 Merge pull request #80 from agriffis/kinesis-clone
Add ergodox_ez keymap to match Kinesis Contoured.
2016-01-10 10:57:13 -05:00
Aron Griffis 386ca6531b Rename to keymap_kines-ish.c and add README 2016-01-10 10:25:16 -05:00
Erez Zukerman de01abdf8c Merge pull request #79 from agriffis/cleanup-default
Minor cleanup to refer to SYMB and MDIA in default ergodox_ez keymap rather than hard-coding numbers.
2016-01-10 10:14:56 -05:00
Stephan Bösebeck 2311754a89 added mouse wheel support, CMD-V/CMD-C instead of CTRL 2016-01-10 00:02:05 +01:00
Stephan Bösebeck 6ccf3d2da1 removed left space key in favor of a backspace 2016-01-09 23:47:26 +01:00
Stephan Bösebeck 6f9cd2d489 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-09 23:37:34 +01:00
Aron Griffis 8607859c77 Add ergodox_ez keymap to match Kinesis Contoured.
This keymap attempts to match the Kinesis Contoured (aka Advantage) default
layout as closely as possible. See
http://www.kinesis-ergo.com/wp-content/uploads/2013/06/advantage_layout_win.pdf

Apart from the obvious mappings, this keymap also:

* removes the dual-purpose momentary layer/normal keys: Z, /, and Grv;
  because the author--coming from a Kinesis keyboard--finds the delays and
  accidental modifiers to be more disconcerting than helpful.

* puts Esc in the bottom left since there's no place for it in the top
  left to match the Kinesis.

* changes the bottom-right key into an L2 toggle since there's otherwise no
  way to get to L2.

* adds PrScr, ScrLk and Pause to the L1 keymap, down the left side, since
  they're present on the Kinesis but not available in the default
  ergodox_ez keymap.
2016-01-09 13:17:25 -05:00
Aron Griffis 25b4a98a75 Refer to SYMB and MDIA in default ergodox_ez keymap. 2016-01-09 12:35:42 -05:00
Didier Loiseau bfda6ee417 Split fn layer from numbers layer to better match the TM behaviour
- removed access to layer 2 from ";" key
- "fn" key toggles both layers 1 & 2
- replaced media and mouse layer by fn layer
- renamed symbol layer to numbers layer
- moved all F-keys together on left hand
2016-01-09 18:21:21 +01:00
Didier Loiseau 38a0e62a10 Layer 1: restore backspace, ralt and ctl on right hand
- home replaced by KC_TRNS to make backspace available
- prev/next moved left to space to restore ralt
- arrows moved down to have reversed T-shape
- added ctl on bottom right KpEnter, to match layer 0
- removed alt from mute, as it was already no more in layer 0
2016-01-09 18:15:49 +01:00
Didier Loiseau 56070d424b Added description of the layout and main differences with real TM 2016-01-09 18:15:48 +01:00
Didier Loiseau 2818acefe6 Make bottom row more similar to the TM
- keep home/end at the same location
- RAlt as first key on the bottom right row
- left/right arrows moved on the thumb, near the other arrows
- added Alt on App
- added Alt on Mute in Layer 1
- removed ALT from left spaces to avoid issues when pressing too slowly
2016-01-09 18:15:48 +01:00
Didier Loiseau 8677ec0c9f Use 3rd led as caps-lock indicator 2016-01-09 18:10:24 +01:00
Didier Loiseau ac94577cbe TypeMatrix keymap: Layer 1 (Fn Layer) 2016-01-09 18:10:24 +01:00
Didier Loiseau 900c1f991d Initial TypeMatrix keymap: Layer 0 2016-01-09 18:10:10 +01:00
Didier Loiseau 00c3ecc238 Initial TypeMatrix keymap: Layer 0 2016-01-08 23:57:37 +01:00
Jack Humbert 11ce694557 Merge pull request #77 from chwilk/master
Keymap to approximate Kinesis Advantage line of keyboards
2016-01-08 11:54:40 -05:00
chwilk 92dcabe099 Moving around modifiers to match KA better 2016-01-08 10:47:14 -06:00
Jack Humbert 1633c5d493 Merge pull request #74 from sethherr/patch-3
Fix homebrew references
2016-01-06 12:22:48 -05:00
Seth Herr 1d463d961f Fix homebrew references
Replaces #64
2016-01-06 09:41:42 -06:00
Stephan Bösebeck d74332c11d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-06 14:28:13 +01:00
Jack Humbert 9f4716a4b1 Merge pull request #60 from rothgar/dvorak
added dvorak keymap and layout picture
2016-01-06 00:04:59 -05:00
Jack Humbert ff8f171cc1 Merge pull request #70 from sperochon/ergodox_ez_fr
Ergodox_ez french OS X
2016-01-06 00:02:27 -05:00
Jack Humbert 670256c943 Merge pull request #71 from andruby/andrew_osx
Andrew's OSX ergodox ez keymap
2016-01-06 00:01:56 -05:00
dragon788 ee424f8608 Adding update of vagrant VM every time it is booted 2016-01-05 22:39:49 -06:00
Andrew Fecheyr a4a4952f4b Andrew's OSX ergodox ez keymap 2016-01-05 11:44:08 +01:00
Sébastien Pérochon bee19e5261 ergodox_ez: Add keymap_osx_fr hex file 2016-01-05 10:56:10 +01:00
Sébastien Pérochon 14b4a01e7e ergodox_ez: Add French keymap for OSX (keymap_osx_fr) based on keymap_default_osx 2016-01-05 10:49:49 +01:00
Sébastien Pérochon 48eff6dd89 quantum: Add French keymap for OSX (keymap_french_osx) 2016-01-05 10:49:36 +01:00
Justin Garrison 6da712ce5e added jgarr keymap for custom dvorak layout :yay: 2016-01-04 09:18:06 -08:00
John Wells 9335aa3965 Fix broken link to keymap 2016-01-04 09:57:49 -07:00
tmk f791834c68 Updated FAQ (markdown) 2016-01-04 19:38:20 +09:00
dragon788 ab7d6dca41 Adding Vagrantfile for easier compile environment setup 2016-01-03 22:21:30 -06:00
tmk b681171774 Updated FAQ (markdown) 2016-01-04 11:41:19 +09:00
Stephan Bösebeck 3bb3e7a72c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-01-04 00:02:08 +01:00
dragon788 a07d2df99c Added calculator shortcut button to numpad/symbol layer 2016-01-02 21:16:45 -06:00
dragon788 ae842a5a0f Fixed Plover layer label and updated keymap 2016-01-02 18:46:31 -06:00
dragon788 45fec698d8 Added proper link back to Plover layout source 2016-01-02 15:12:00 -06:00
dragon788 4c3ecbc0b7 Added plover layer 2016-01-02 15:05:33 -06:00
Jack Humbert 0f2c7730d4 Merge pull request #68 from waveform80/daves-comments
Added comments to LED stuff and included .hex file
2016-01-02 14:22:43 -05:00
Dave Jones dcc9948fae Added comments to LED stuff and included .hex file 2016-01-02 18:23:49 +00:00
Jack Humbert 5259f36d03 Merge pull request #66 from gdiegel/master
Fix for faulty fn layer
2016-01-02 11:58:40 -05:00
Jack Humbert 41d4cf05ef Merge pull request #67 from waveform80/daves-keymap
Dave's custom keymap
2016-01-02 11:58:27 -05:00
Dave Jones 7ba06c9e0d Dave's custom keymap
This moves the keys closer to a traditional layout with some redundancy
around the middle to compensate for fast non-traditional typists like
myself who tend to wander from the home row a fair bit. Navigation keys
are provided in layer 2 (accessed by left thumb button), programming
symbols and classic numeric keypad in layer 1 (accessed by right thumb
button). Permanent layer switching is provided with a smaller thumb
button. Ctrl provided in place of caps lock (because no-one needs
caps/num lock), space, backspace, enter, shift all in traditional
positions with layer 1 providing things like equals, tilde and
apostrophe (an attempt to re-use existing muscle memory).

LEDs are pimped to the point of being silly (fading in/out on layer
switch, rolling on reboot ... because I can). Power and reset keys
provided on left thumb pad in layer 2.

No meh or hyper as I haven't found a burning need for them yet.
2016-01-02 11:19:52 +00:00
Gabriel Diegel 1cdcbc9865 Fix incorrect number of rows on fn layer. Add additional navigation keys
to fn layer
2016-01-02 10:31:47 +01:00
Erez Zukerman 9c5f30ed83 Merge pull request #63 from MattLeBeauViewpoint/master
Small change to filename spelling in README
2015-12-31 20:07:37 -05:00
MattLeBeauViewpoint f1dea975d2 Small change to filename spelling in README
Edited filename to remove plural case in example so that prefix is
correctly parsed in step 6.
2015-12-31 10:16:51 -08:00
dragon788 d901511f76 Fixed button conflicts on mouse/media layer 2015-12-30 23:53:38 -06:00
dragon788 c760a273fb Added note about avr-libc also being required at least for arch 2015-12-30 23:22:29 -06:00
dragon788 24e30249a4 Moving everything around, tap delays driving me nuts 2015-12-30 23:03:33 -06:00
Justin Garrison 14a5b4b5c8 added dvorak keymap and layout picture 2015-12-30 00:19:55 -08:00
abjr e6423f50a4 Updated FAQ (markdown) 2015-12-29 17:05:50 -05:00
dragon788 f68f1c7432 Merge branch 'master' of github.com:dragon788/qmk_firmware_ez 2015-12-28 14:45:13 -06:00
dragon788 d1f8d0104b Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
2015-12-28 14:44:49 -06:00
dragon788 01dc8b3244 Merge branch 'master' of github.com:dragon788/qmk_firmware_ez
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
2015-12-27 13:15:03 -06:00
Stephan Bösebeck 381ca294fe minor fixes, added backtick to left thumbblock 2015-12-25 00:00:30 +01:00
dragon788 b61ea5dfaf Updated keymap ascii art and made thumb cluster more standard ErgoDox/Kinesis-like 2015-12-23 22:05:59 -06:00
Jack Humbert 9814343336 Merge pull request #56 from sboesebeck/master
fix number pad for german keys
2015-12-23 12:01:27 -05:00
Erez Zukerman 58e237d2dc Updates readme 2015-12-23 15:28:13 +02:00
Stephan Bösebeck 7115196ddf fix number pad for german keys 2015-12-23 13:32:15 +01:00
Jack Humbert 694fe4e1e2 Merge pull request #55 from sboesebeck/master
fixed some typos, learned, DE_-keycodes are for Win, not OSX
2015-12-22 17:51:32 -05:00
Stephan Bösebeck d3e54552fb fixed some typos, learned, DE_-keycodes are for Win, not OSX 2015-12-22 23:49:27 +01:00
Jack Humbert b1fbd4c9ca Merge pull request #53 from sboesebeck/master
minor updates
2015-12-21 19:31:31 -05:00
Stephan Bösebeck 370e9028ac new firmware file containing current changes 2015-12-22 01:25:57 +01:00
Stephan Bösebeck 5f0965ce39 added png file for layout documentation 2015-12-22 01:23:53 +01:00
Stephan Bösebeck d35b563816 minor changes, fixes 2015-12-22 01:18:03 +01:00
Jack Humbert 40119017f2 Merge pull request #52 from technovangelist/master
first attempt at a working workman layout for the ergodoxez
2015-12-21 11:52:11 -05:00
Technovangelist 42ca2e6684 swapped the space and enter to get the space under where the thumb is. 2015-12-21 10:20:02 -05:00
Technovangelist a67ef035b8 first attempt at a working workman layout for the ergodoxez 2015-12-21 09:52:10 -05:00
chwilk 2b1a256825 Added keymap variant to approximate Kin Adv 2015-12-20 22:09:26 -06:00
Gabriel Diegel d7d092de5f Use planck-style arrow keys 2015-12-20 23:05:15 +01:00
Jack Humbert e70cdb0693 Merge pull request #47 from pnutster/master
OSX Kinesis-like Mapping
2015-12-19 23:50:05 -05:00
Jack Humbert 765c1b9f4d Merge pull request #46 from sboesebeck/master
German layout for osx
2015-12-19 23:49:26 -05:00
Piet Nutbey cc79f17424 Fixed keymap "graphic" 2015-12-19 23:24:59 -05:00
Piet Nutbey ac3513b79f corrected folder 2015-12-19 22:50:48 -05:00
Piet Nutbey 190562288c OSX Kinesis-like Mapping
OS X Kinesis Like key mapping. Only the default layer was changed into
a more Kinesis-like mapping. Hopefully useful as a starting point.
2015-12-19 21:38:56 -05:00
Stephan Bösebeck 737afc9dc7 added hex file 2015-12-20 01:00:23 +01:00
Stephan Bösebeck 203528869d typo fix 2015-12-20 00:59:13 +01:00
Stephan Bösebeck f35609bd89 minor change 2015-12-20 00:57:35 +01:00
Stephan Bösebeck 1b579212d4 added hex file and readme 2015-12-20 00:54:43 +01:00
Stephan Bösebeck 56104858fc first version for german osx layout 2015-12-20 00:49:19 +01:00
Jack Humbert e0acb8a0ee Merge pull request #45 from matzebond/master
German keymap + ErgoDox keymaps
2015-12-19 14:26:14 -05:00
Erez Zukerman 11f0724951 Further clarifies README 2015-12-19 19:00:59 +02:00
Matthias Schmitt 7b7870bae1 Add neo2 keymap and neo2 ergodox layout 2015-12-19 01:41:23 +01:00
Matthias Schmitt 6c15dac7db Add Ctrl-Shift tap modifier 2015-12-19 01:39:44 +01:00
Matthias Schmitt 3dbcad51d1 Add german keymap and german ergodox layout 2015-12-19 01:22:12 +01:00
Erez Zukerman 7f22b67f8a Updates readme 2015-12-18 16:03:47 +02:00
Jack Humbert 0a58ce3881 jack's ergodox layout 2015-12-17 22:44:09 -05:00
Erez Zukerman f4efa110f8 Fixes media keys on OSX layout 2015-12-18 04:08:27 +02:00
Erez Zukerman c7c414b2fb Adds a new default keymap for OSX with working prev/next keys 2015-12-18 03:48:41 +02:00
Erez Zukerman 7923f212e1 Moves compiled default keymap + legends to keymaps directory 2015-12-18 03:42:47 +02:00
tmk dd5bfb6f3e Created Test for ASCIIDOC (asciidoc) 2015-12-17 13:48:33 +09:00
tmk de235b3e07 Updated Home (markdown) 2015-12-17 12:32:38 +09:00
tmk 23c6af02c2 Updated FAQ (markdown) 2015-12-17 12:28:56 +09:00
Erez Zukerman 4f4553cb90 A compiled version which sends left click in mouse mode 2015-12-16 19:03:30 +02:00
Erez Zukerman 85b7c339dd Merge pull request #41 from joshmccall221/right_click_fix
Left click was mapped to scroll wheel. This fixes that. :)
2015-12-16 12:01:45 -05:00
Josh McCall 4e290a7d59 Left click was mapped to scroll wheel. This fixes that. :) 2015-12-16 10:21:42 -06:00
Josh McCall c63c615ff8 add left click and vim keys 2015-12-16 04:12:57 -06:00
Gabriel Diegel daa8a008db Fix typos and add comments, swap plus with equals, swap pipe with
backslash, move slash, change cursor keys to make the classic shape
2015-12-15 21:36:01 +01:00
Jack Humbert 23846997f6 Merge pull request #39 from gdiegel/master
New keymap
2015-12-14 23:30:59 -05:00
Jack Humbert 2e79054ab8 Merge pull request #40 from alexeyzab/keymap-alexey
Atreus-like keymap
2015-12-14 23:30:42 -05:00
Alexey Zabelin 0c89fea71f Add new keymap
The goal of this keymap is to simulate the Atreus layout. Since I've
been using it for quite a while I figured this might help me transition
to Planck.
2015-12-14 21:22:50 -05:00
tmk 1b495b94a9 Updated FAQ Keymap (markdown) 2015-12-14 15:58:09 +09:00
tmk 33b55c11a8 Updated FAQ Keymap (markdown) 2015-12-14 15:55:43 +09:00
Gabriel Diegel 3018fa4dc6 Remove redundant definitions 2015-12-13 16:02:01 +01:00
Gabriel Diegel 5d9ff9b61a Rename keymap 2015-12-13 15:40:44 +01:00
Gabriel Diegel 2deadfc7ff Fix keymaps, add documentation 2015-12-13 15:39:27 +01:00
Gabriel Diegel d00b4238e3 Add gdl keymap 2015-12-13 15:32:44 +01:00
tmk 59adb168b4 Updated FAQ Build (markdown) 2015-12-10 06:11:33 +09:00
tmk f3b7863b56 Updated FAQ Build (markdown) 2015-12-09 14:45:22 +09:00
tmk bf88dfa5db Updated FAQ Keymap (markdown) 2015-12-09 12:04:14 +09:00
tmk 4e9170156e Updated FAQ Keymap (markdown) 2015-12-09 12:03:07 +09:00
tmk fbbf8b501f Updated Keymap examples (markdown) 2015-12-09 10:16:04 +09:00
tmk 304be86c80 Updated Keymap examples (markdown) 2015-12-09 10:13:29 +09:00
tmk 45ce7048d5 Updated Keymap examples (markdown) 2015-12-07 09:48:35 +09:00
tmk 79a23399e8 Created Keymap examples (markdown) 2015-12-07 09:47:52 +09:00
tmk 77a877f5d3 Updated Home (markdown) 2015-12-07 09:47:32 +09:00
tmk 7139a0704b Updated Other Protjects (markdown) 2015-12-05 13:50:39 +09:00
tmk 869e6316d0 Updated Other Protjects (markdown) 2015-12-05 13:47:59 +09:00
tmk 70cf332498 Created Other Protjects (markdown) 2015-12-05 13:45:42 +09:00
tmk b2d1c4950c Updated Home (markdown) 2015-12-05 13:44:05 +09:00
tmk 0e8f5b0d91 Updated Home (markdown) 2015-12-05 13:43:32 +09:00
tmk d03be6dbcb Updated Projects (markdown) 2015-12-05 13:43:04 +09:00
Jack Humbert 43afb2ebef Merge pull request #38 from alcesleo/patch-2
Make links work in TMK_README
2015-11-27 00:31:15 -05:00
tmk 1ef3dee821 Updated FAQ Build (markdown) 2015-11-27 10:59:33 +09:00
tmk 79aa1f3484 Updated FAQ Build (markdown) 2015-11-27 10:59:07 +09:00
tmk a5fc9c9165 Updated FAQ Build (markdown) 2015-11-27 10:56:20 +09:00
Jimmy Börjesson 4cf8920c39 Make links work in TMK_README 2015-11-26 19:56:37 +01:00
Jack Humbert 11d6e66979 atomic hex 2015-11-21 15:01:33 -05:00
Paul Williamson 03c1f72594 Updated file path for tmk_core 2015-11-11 12:06:40 +00:00
Erez Zukerman 1edb050d20 Adds Hyper on the left side 2015-11-10 04:43:20 +02:00
Erez Zukerman ea44ac4a62 Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c
2015-11-10 04:40:52 +02:00
Erez Zukerman 926ce2262f Uses App key as Alt when held 2015-11-10 04:39:53 +02:00
Erez Zukerman 24cb218de0 Uses App key as Alt when held 2015-11-10 04:33:55 +02:00
Erez Zukerman 407f41cd9a [Jack & Erez] Adds standalone versions of Hyper and Meh 2015-11-10 04:18:44 +02:00
Erez Zukerman f5ec585ed8 [Erez & Jack] Adds Meh key (Hyper without Win/Cmd) 2015-11-10 04:14:59 +02:00
Erez Zukerman 80397187cd Enabled NKRO by default, drops irrelevant makefile options 2015-11-10 03:56:52 +02:00
Jack Humbert 3d1117db50 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-11-09 14:24:56 -05:00
Jack Humbert 8e9153ce12 Michelle's layout 2015-11-09 14:24:49 -05:00
Jack Humbert d2d75b9759 Merge pull request #36 from justinyhuang/master
added support for JD45
2015-11-07 09:52:59 -05:00
HuangYang 6ec6279d82 minor change for the keyboard info 2015-11-06 22:29:50 -07:00
HuangYang 765f8a2aef added support for jd45 2015-11-06 22:26:12 -07:00
Jack Humbert 6485c7d7da nkro info 2015-11-05 12:07:03 -05:00
Jack Humbert 3511a830ac readme 2015-10-30 00:49:47 -04:00
Jack Humbert 5901f5911b atomic files 2015-10-30 00:49:11 -04:00
Jack Humbert eb2795b4d6 atomic up-to-date 2015-10-30 00:48:17 -04:00
Erez Zukerman 3ac4f1519f Fixes link 2015-10-30 05:43:01 +02:00
Erez Zukerman 04a36ecbf4 [Erez & Jack] Updates documentation 2015-10-30 05:42:19 +02:00
Jack Humbert 93812e52b5 readmes\! 2015-10-29 18:37:29 -04:00
Jack Humbert 39915b1748 homebrew instructions 2015-10-29 15:12:51 -04:00
Erez Zukerman 4b0c54324a Adds Hyper key, tweaks ErgoDox EZ default keymap 2015-10-29 00:16:53 +02:00
tmk 8002d8dc29 Updated FAQ Keymap (markdown) 2015-10-29 06:21:33 +09:00
tmk c38bac480b Updated FAQ Keymap (markdown) 2015-10-29 06:03:25 +09:00
tmk 483de13114 Updated FAQ Keymap (markdown) 2015-10-29 05:50:25 +09:00
Jack Humbert ea0e1169e6 README 2015-10-28 13:58:21 -04:00
Jack Humbert e3050bba67 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-28 13:54:43 -04:00
Jack Humbert 8643e01286 merging 2015-10-28 13:54:41 -04:00
Jack Humbert 1fb8b4ce3a changes 2015-10-28 00:56:15 -04:00
Jack Humbert b8ebba012b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-27 23:49:55 -04:00
Jack Humbert dee171b425 ht to mt 2015-10-27 23:44:10 -04:00
Jack Humbert 18da1e6801 layer tap, mod tap 2015-10-27 23:06:18 -04:00
Erez Zukerman f024a462cd Fixes rolling combos for mod-tap keys 2015-10-28 04:19:13 +02:00
Erez Zukerman d3db8d62f6 More work on ErgoDox EZ default keymap 2015-10-28 04:07:15 +02:00
Jack Humbert d9f08e6177 toggle and hold-tap action shortcuts 2015-10-27 22:00:52 -04:00
Jack Humbert 909d30553f updated EZ makefile with tmk_core changes 2015-10-27 21:13:10 -04:00
Erez Zukerman 2739aa8d78 Initial working version of ErgoDox EZ layout using new syntax 2015-10-28 02:55:28 +02:00
Jack Humbert d311fd8d1a Merge pull request #34 from jackhumbert/tmk-master
merging from tmk, new_project script and template
2015-10-27 14:52:18 -04:00
Jack Humbert 6f3141965e new project script 2015-10-27 14:33:18 -04:00
Jack Humbert d35402938f reverting gh60 2015-10-27 12:49:07 -04:00
Jack Humbert 0e93ee235f reverting gh60 2015-10-27 12:47:12 -04:00
Jack Humbert 547da78335 merging tmk 2015-10-27 12:42:30 -04:00
Jack Humbert a766918d5c README changes 2015-10-27 11:54:46 -04:00
Jack Humbert 53f7c6535d Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-27 00:48:30 -04:00
Jack Humbert 5a268d97ec READMEs 2015-10-27 00:48:22 -04:00
Jack Humbert 018e7a2e37 Merge pull request #28 from abienz/master
Added volume down to function layer
2015-10-26 23:17:37 -04:00
Jack Humbert a6913550c8 fixed MOs 2015-10-26 23:17:19 -04:00
Jack Humbert 7f8643a6a6 Merge pull request #32 from jackhumbert/hf/comments
[Jack & Erez] Comments + tiny updates and cleanup
2015-10-26 23:15:06 -04:00
Jack Humbert cc1c32671e fixed makefile, added MO DF shortcuts 2015-10-26 20:02:25 -04:00
Erez Zukerman 0c47e8b008 [Jack & Erez] Comments + tiny updates and cleanup 2015-10-27 00:54:46 +02:00
Jack Humbert 402122744c ez with leds 2015-10-26 16:57:45 -04:00
Jack Humbert 35a81f5b8b added ergodox 2015-10-26 16:32:37 -04:00
Jack Humbert 46e7fb2d3c quantum separated 2015-10-26 14:49:46 -04:00
Jack Humbert ff8d8a50df fixes for bluetooth without usb 2015-10-25 21:40:56 -04:00
Jack Humbert 61fea81a24 spanish layout 2015-10-25 14:02:26 -04:00
Jack Humbert 31dd8ea34a french keycodes 2015-10-25 12:50:46 -04:00
Jack Humbert 484a9d12f0 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-25 12:11:13 -04:00
Jack Humbert e61a5ed806 nordic shortcuts 2015-10-25 12:11:04 -04:00
Jack Humbert abc1c0e31e Update README.md 2015-10-24 21:18:56 -04:00
Jack Humbert 71a8fd8b12 bluetooth working with usb 2015-10-23 20:12:04 -04:00
Jack Humbert bbb21f60e9 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-10-22 13:37:56 -04:00
Jack Humbert c966e7982c bluetooth 2015-10-22 13:37:45 -04:00
tmk 06e9019a06 Updated FAQ Keymap (markdown) 2015-10-21 07:03:53 +09:00
tmk caf197b905 Updated FAQ Keymap (markdown) 2015-10-21 07:03:11 +09:00
tmk ee732d7753 Updated FAQ Keymap (markdown) 2015-10-21 07:03:01 +09:00
tmk fa33719ada Add doc of HHKB original keycodes 2015-10-21 06:59:26 +09:00
tmk 6fe4af82fa Fix port setting of alps64/matrix.c 2015-10-15 11:48:14 +09:00
Jack Humbert d664234bab Merge pull request #31 from cr3473/master
Modified numpad/tenkey layout
2015-10-11 23:35:59 -04:00
cr3473 1b8ef914ff Modified numpad/tenkey layout
improved ease of use
2015-10-11 20:31:49 -07:00
tmk 2196a5facf Updated FAQ (markdown) 2015-10-07 16:31:02 +09:00
tmk d28ecc1e4a Updated FAQ (markdown) 2015-10-07 16:29:38 +09:00
tmk eeaef60ffa Updated FAQ Keymap (markdown) 2015-10-07 04:09:04 +09:00
tmk 6e1a6d1981 Updated FAQ Keymap (markdown) 2015-10-06 15:57:00 +09:00
tmk 50e0b35560 Updated FAQ Keymap (markdown) 2015-10-06 15:56:44 +09:00
tmk f7ae70962c Updated FAQ Keymap (markdown) 2015-10-06 15:49:17 +09:00
tmk 1b0fec884f Updated FAQ Keymap (markdown) 2015-10-06 15:43:51 +09:00
tmk 7328ba0f3b Updated FAQ Keymap (markdown) 2015-10-05 04:05:56 +09:00
tmk 9d25855bb0 Updated FAQ Keymap (markdown) 2015-10-05 04:02:42 +09:00
tmk 08f1bde358 Updated FAQ Keymap (markdown) 2015-10-05 03:51:26 +09:00
tmk db193b8cf9 Updated FAQ (markdown) 2015-10-03 07:04:27 +09:00
tmk 8d47fe7bc7 Updated FAQ (markdown) 2015-10-03 07:03:58 +09:00
tmk 6163f0ea51 Updated FAQ Keymap (markdown) 2015-09-27 05:48:41 +09:00
Jack Humbert 40148c430e BL 2015-09-26 00:58:17 -04:00
Jack Humbert a230aba402 pcb hex 2015-09-26 00:39:48 -04:00
Jack Humbert 266ff2344e backlight 2015-09-25 23:50:17 -04:00
Jun Wako 5ce9bf8353 Merge commit 'fdc38ef3f92af7adeeb4de49550d8838c8a39b5c' 2015-09-24 12:29:11 +09:00
Jun Wako fdc38ef3f9 Squashed 'tmk_core/' changes from dc0e46e..57d27a8
57d27a8 Merge branch 'core_update_150924' into core
024abe3 core: Fix NKRO ifdef
7aa2d30 core: Fix for disabling NKRO in Boot protocol
95651fd core: Fix message print of debug command
c20cd29 lufa: Fix endpoint bank mode for ATMega32u2
82ac21f next_usb: Fix next_kbd_set_leds()
537d9c7 Change to KC_BOOTLOADER(KC_BTLD)
f2b3772 Add an assignable RESET key
fc99257 Fix parenthesis
e852582 Fix weak modifier clear in action macro
c2a6c5c core: Fix lufa suspend callback(#234)
fa548c5 usb_usb: Ignore error usage(0x01-03) report
513d95c usb_usb: Support locking key indicator LED
cd78802 core: Add keymap section ldscript for ATMega32U2
70c9abd Add description for non-US keys on keycode.h
538c192 lufa: Fix console flush #223
87628c9 Revert "Make action_for_key a weak symbol"
3c0a1ba Make action_for_key a weak symbol
6bb0d7d ibm4704_usb: Fix protocol handling
b6ef5cf Add keyboard_setup() and matrix_setup()
f4bb8b2 ibm4704_usb: Fix interrupt of clock(rising edge)
0c1fcc1 usb_usb: Change debug LED pin config
595710d Reduce code size of magic commands
6bed174 Add description of AVR bootloader and boot section
54c6a01 Merge commit 'f6d56675f9f981c5464f0ca7a1fbb0162154e8c5'
d18d42e Merge branch 'core-update2' into core
febec88 Add compile options '-fdata-sections'

git-subtree-dir: tmk_core
git-subtree-split: 57d27a8e39173a589b4abae74851f95c39940174
2015-09-24 12:29:11 +09:00
Jun Wako 77afc5a76f core: Fix NKRO ifdef 2015-09-24 01:35:10 +09:00
Jun Wako 79fd952da4 ibm4704: Add keymap for Alps 102-key 2015-09-24 01:33:50 +09:00
Jack Humbert 1da07810c7 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-09-21 02:13:25 -04:00
Jack Humbert f512923456 new default layout 2015-09-21 02:13:15 -04:00
Jack Humbert 72267bb212 Merge pull request #30 from cr3473/master
rearranged dedicated cursor keys
2015-09-20 11:30:27 -04:00
cr3473 7ed793b292 rearranged dedicated cursor keys
now in standart TLK style cluster
VIM style still available in upper layer
2015-09-19 23:52:42 -07:00
tmk ed9766a7d4 core: Fix for disabling NKRO in Boot protocol 2015-09-20 14:34:13 +09:00
tmk e8a4a63ec4 core: Fix message print of debug command 2015-09-20 10:51:30 +09:00
tmk bf3d4b3c06 lufa: Fix endpoint bank mode for ATMega32u2 2015-09-20 10:48:47 +09:00
tmk 0b14b56006 next_usb: Fix for mssing key event 2015-09-20 10:44:09 +09:00
tmk c1f36042b4 next_usb: Change LEDs usage for CapsLock status 2015-09-20 10:43:12 +09:00
tmk 4fd703e995 next_usb: Change for TMK converter configuration 2015-09-20 10:41:54 +09:00
tmk 276fc93016 next_usb: Fix keymap 2015-09-20 10:36:24 +09:00
tmk 9b99f8f864 next_usb: Fix next_kbd_set_leds() 2015-09-20 10:33:25 +09:00
tmk 8008a8a9dc Updated FAQ (markdown) 2015-09-19 18:31:10 +09:00
tmk 6147f5705a Merge branch 'skullydazed-assignable_RESET' 2015-09-16 13:07:35 +09:00
tmk 498654fc4c Change to KC_BOOTLOADER(KC_BTLD) 2015-09-16 13:01:06 +09:00
skullY bb8c1d29fa Add an assignable RESET key 2015-09-16 12:35:21 +09:00
tmk dc04983fd7 Merge branch 'ibm4704_alps102' 2015-09-16 11:26:07 +09:00
Jack Humbert c8d58a9f19 unicode working, i think 2015-09-15 00:33:57 -04:00
Jack Humbert febd7886a1 unicode working, i think 2015-09-15 00:31:41 -04:00
Jack Humbert f610c65f10 unicode working, i think 2015-09-14 23:55:26 -04:00
Jack Humbert 6ec03b2218 unicode working, i think 2015-09-14 23:54:49 -04:00
Jack Humbert b9e42a8753 Merge pull request #29 from kaymmm/nobacklight
use preprocessor conditional on backlight initialization
2015-09-14 15:21:01 -04:00
Keith Miyake 6a4ee574bc use preprocessor conditional on backlight initialization 2015-09-14 15:10:12 -04:00
Jack Humbert 5bb7ef0012 rows to col option, maybe 2015-09-13 22:10:01 -04:00
tmk a8d4daa761 Fix parenthesis 2015-09-12 11:26:37 +09:00
tmk 0c21b263f9 Fix weak modifier clear in action macro 2015-09-12 11:25:41 +09:00
tmk 9f1d23bfe1 Add Ateml toolchain and remove specific chip name 2015-09-12 05:27:37 +09:00
tmk a63a9c7845 ibm4704: Add keymap for Alps models
https://geekhack.org/index.php?topic=54706.msg1858175#msg1858175
2015-09-07 08:58:18 +09:00
Jack Humbert b89a9cdc91 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-09-06 18:58:00 -04:00
Jack Humbert 44625de59a beeps in an if 2015-09-06 18:57:23 -04:00
tmk 455fd51a87 Fix 'enable break' commands for Alps models
https://geekhack.org/index.php?topic=54706.msg1856618#msg1856618
2015-09-05 09:00:33 +09:00
abienz 3510b38ced Added volume down to function layer 2015-09-01 16:38:22 +01:00
Jack Humbert 3072349a6d Merge pull request #27 from abienz/master
Added extended keymap for colemak Atomic
2015-09-01 11:27:31 -04:00
abienz ab9b40512d Added extended keymap for colemak Atomic 2015-09-01 15:58:15 +01:00
Jack Humbert ed384bd437 beeps update 2015-08-31 12:39:53 -04:00
tmk c8f3e845e7 Updated FAQ Build (markdown) 2015-08-31 10:40:59 +09:00
Jack Humbert 91176d854b speaker working, midi out 2015-08-29 11:54:38 -04:00
Jack Humbert d63c2e3995 fixed lufa git stuff 2015-08-26 17:27:52 -04:00
Jack Humbert 9b46f4021e midi on planck 2015-08-25 17:06:38 -04:00
Jack Humbert e6dd47db45 good enough for a preview 2015-08-25 12:30:32 -04:00
Jack Humbert cda23c754e midi working 2015-08-24 19:31:12 -04:00
Jack Humbert b8425e8b58 makefile stuff 2015-08-23 15:31:51 -04:00
Jack Humbert fd7a465d0d adding default hex 2015-08-22 11:11:48 -04:00
Jack Humbert 5d2baede8a making the extended keymap the default - no more 'common' 2015-08-22 11:10:57 -04:00
Jack Humbert 476e29d119 Merge pull request #26 from jackhumbert/midi
Midi
2015-08-21 23:14:48 -04:00
Jack Humbert b191f8c60f midi 2015-08-21 23:13:33 -04:00
Jack Humbert 04885a3b44 preonic 2015-08-21 10:46:53 -04:00
Jack Humbert fb4fe52c0a midi 2015-08-20 00:42:28 -04:00
Jack Humbert e528087ee5 midi 2015-08-20 00:42:08 -04:00
Jack Humbert 2d76b5c3d4 lock 2015-08-18 15:03:13 -04:00
Jack Humbert 1e598743b0 matrix 2015-08-16 22:29:53 -04:00
Jack Humbert b2d4969f8f atomic 2015-08-16 17:56:56 -04:00
Jack Humbert c9cbff446f merging 2015-08-16 17:56:15 -04:00
Jack Humbert c5a8287dea ok 2015-08-16 17:52:49 -04:00
Jack Humbert 88704200a5 ok 2015-08-16 17:52:21 -04:00
Jack Humbert f7bca5c41a ok 2015-08-16 17:52:03 -04:00
Jack Humbert b3f638f491 ok 2015-08-16 17:51:53 -04:00
tmk 14466e820d Updated Previously Asked Questions (markdown => asciidoc) 2015-08-10 10:20:55 +09:00
tmk 86fa48e1ee Updated Previously Asked Questions (mediawiki => markdown) 2015-08-10 10:20:26 +09:00
tmk 7c8a062cd7 Updated Previously Asked Questions (asciidoc => mediawiki) 2015-08-10 10:20:05 +09:00
tmk bd9d75701c Updated Previously Asked Questions (asciidoc) 2015-08-10 10:17:13 +09:00
tmk d5bbecc134 Updated Previously Asked Questions (asciidoc) 2015-08-10 10:17:01 +09:00
tmk 3290a75dd0 Updated Previously Asked Questions (asciidoc) 2015-08-10 10:16:36 +09:00
tmk b216768cef Updated Previously Asked Questions (asciidoc) 2015-08-10 10:16:16 +09:00
tmk c797334f51 Updated Previously Asked Questions (asciidoc) 2015-08-10 10:15:47 +09:00
tmk f98e803e5c Updated Previously Asked Questions (asciidoc) 2015-08-10 10:04:23 +09:00
tmk c84d220b07 Updated Previously Asked Questions (asciidoc) 2015-08-10 10:03:41 +09:00
tmk 3ea6555f88 Updated Previously Asked Questions (asciidoc) 2015-08-10 10:02:46 +09:00
tmk 13b8908951 Updated Previously Asked Questions (asciidoc) 2015-08-10 09:43:38 +09:00
tmk 4a37910295 Updated Previously Asked Questions (mediawiki => asciidoc) 2015-08-10 09:43:16 +09:00
tmk 2945841985 Updated Previously Asked Questions (mediawiki) 2015-08-10 09:35:55 +09:00
tmk 08e31e7995 Updated Previously Asked Questions (markdown => mediawiki) 2015-08-10 09:34:59 +09:00
tmk 7d3dda21a5 Updated Previously Asked Questions (markdown) 2015-08-09 16:18:55 +09:00
tmk e451b38848 Updated Previously Asked Questions (markdown) 2015-08-09 16:17:29 +09:00
tmk dcc1abcdd5 Updated Previously Asked Questions (markdown) 2015-08-09 16:17:05 +09:00
tmk 94ccc65542 Updated Previously Asked Questions (markdown) 2015-08-09 16:13:34 +09:00
tmk c25b5b0093 Created Previously Asked Questions (markdown) 2015-08-09 16:12:01 +09:00
tmk 79cf2d59ae Fix #239 unresponsive keys of HHKB JP during power saving 2015-08-08 16:01:26 +09:00
Jack Humbert e12c0de608 Update PCB_GUIDE.md 2015-08-03 14:19:24 -04:00
Jack Humbert 0aa0f75432 Merge pull request #25 from orcinus/master
Fixed brightness control; Reduced number of brightness levels to 4.
2015-07-25 14:55:02 -04:00
Ante Vukorepa 1f52d60ef1 Fixed brightness control; Reduced number of brightness levels to 4. 2015-07-25 17:11:31 +02:00
tmk 35203cad6a core: Fix lufa suspend callback(#234)
With matrix_power_down() in suspend event HHKB JP doesn't start up for some reason.
It is unneeded in actual and removed.
2015-07-23 12:05:51 +09:00
tmk d4220ac9f3 hhkb: Add power saving code of matrix scan for JP 2015-07-23 11:57:15 +09:00
Jack Humbert b8c8ecbcd6 Merge pull request #24 from cr3473/master
added 1337 layer :)
2015-07-20 16:57:35 -04:00
cr3473 16af7f259b added 1337 layer :) 2015-07-20 13:53:02 -07:00
tmk 1efdd867c8 usb_usb: Ignore error usage(0x01-03) report 2015-07-15 16:02:20 +09:00
tmk 6f5e8ce17e usb_usb: Support locking key indicator LED 2015-07-15 15:13:15 +09:00
tmk e1e0e5b4fb onekey: Add V-USB build 2015-07-12 06:59:58 +09:00
tmk 5f06f26e03 ps2_usb: Fix for V-USB build 2015-07-12 06:32:53 +09:00
tmk 448aa73c39 ps2_usb: Fix for mbed build 2015-07-12 06:24:39 +09:00
tmk 8746ad98cc core: Add keymap section ldscript for ATMega32U2 2015-07-12 05:44:10 +09:00
tmk ce8b1e5f13 m0110_usb: Change keymap and Makefile 2015-07-11 17:10:42 +09:00
tmk 2c22bbda5a Updated FAQ Keymap (markdown) 2015-07-04 06:10:28 +09:00
Wilba6582 138156d4a0 Update for Atomic PCB Rev 0 2015-06-30 17:35:18 +10:00
tmk 507ebb34f5 alps64: Change keymaps and USB descriptors. 2015-06-26 08:49:03 +09:00
tmk 070a6be638 Add description for non-US keys on keycode.h 2015-06-26 08:34:10 +09:00
Jack Humbert efe8304e79 Merge pull request #23 from huntse/for_upstream
Current smh keymap
2015-06-09 11:11:31 -04:00
Ruslan Ohitin 410bc48e5a Updated FAQ (markdown) 2015-06-09 16:32:24 +06:00
Sean Hunter 77a7b180df Current smh keymap 2015-06-09 10:12:57 +01:00
Jack Humbert ae2e7fdf26 Update PCB_GUIDE.md 2015-06-07 13:40:11 -04:00
Jack Humbert 96c2a6b56e Merge pull request #22 from cr3473/master
added mouse scroll keymapping
2015-06-04 18:08:21 -04:00
cr3473 3bc50429a7 added mouse scroll keymapping
rearranged mouse button layout
2015-06-04 15:04:12 -07:00
Jack Humbert 9e8c88dcbd Merge pull request #21 from cr3473/master
Layout changes
2015-06-03 16:55:26 -04:00
cr3473 bec97387a1 added screenlock mapping 2015-06-03 13:33:36 -07:00
cr3473 1a64149375 revert to DEL only on upper layer :) 2015-06-03 13:20:14 -07:00
Jack Humbert 085efb4ff5 Merge pull request #20 from cr3473/master
PCB doc edits and keymap update
2015-06-02 17:10:06 -04:00
cr3473 f33d45f200 Merge branch 'master' of github.com:jackhumbert/tmk_keyboard
Conflicts:
	keyboard/planck/PCB_GUIDE.md
2015-06-02 14:04:05 -07:00
cr3473 bcb04570ea PCB Guide edits and update to joe's keymap 2015-06-02 13:58:45 -07:00
Jack Humbert 6001a9347b Merge pull request #19 from cr3473/master
Makefile - MATRIX selection
2015-06-02 15:42:58 -04:00
angerthosenear cea51941a4 Create extended_keymap_angerthosenear.c
Adding my keymap to the available keymaps list.
2015-06-02 12:23:34 -07:00
John Lindquist af4f016b4f Update PCB_GUIDE.md 2015-06-02 12:23:34 -07:00
Jack Humbert 68f48fcc58 guide 2015-06-02 12:23:34 -07:00
Jack Humbert a53efa4561 Create PCB_GUIDE.md 2015-06-02 12:23:34 -07:00
Jack Humbert dd3598dce6 daniel 2015-06-02 12:23:34 -07:00
Jack Humbert caa7727e96 daniel 2015-06-02 12:23:34 -07:00
Jack Humbert 5ca7538578 catching up 2015-06-02 12:23:34 -07:00
cr3473 bb9e23c319 Merge branch 'master' of github.com:jackhumbert/tmk_keyboard 2015-06-02 12:16:50 -07:00
cr3473 59f2001b31 Added ability to set the MATRIX in build/make 2015-06-02 12:12:44 -07:00
tmk a551608873 sun_usb: LED update for hotplug keyboard into converter 2015-06-03 00:49:55 +09:00
tmk 49b0c7e5ef sun_usb: Fix LED status update at startup 2015-06-03 00:29:36 +09:00
tmk 37af88217d sun_usb: Fix serial recv intrrupt trriger edge #228 2015-06-02 23:59:16 +09:00
Jack Humbert 81c672391a Merge pull request #18 from angerthosenear/master
Create extended_keymap_angerthosenear.c
2015-06-01 18:50:17 -04:00
angerthosenear 44bc2eefa3 Create extended_keymap_angerthosenear.c
Adding my keymap to the available keymaps list.
2015-06-01 17:46:08 -05:00
Jack Humbert 3d303eb6c7 Merge pull request #17 from johnlindquist/patch-1
Update PCB_GUIDE.md
2015-06-01 18:01:34 -04:00
John Lindquist 78e567896b Update PCB_GUIDE.md 2015-06-01 15:55:34 -06:00
Jack Humbert 07d090db8b guide 2015-05-30 15:47:21 -04:00
Jack Humbert 7e67c3ceda Create PCB_GUIDE.md 2015-05-30 13:31:52 -04:00
Jack Humbert 85cc5d890e daniel 2015-05-27 23:15:08 -04:00
Jack Humbert f2ec0f3a2c Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-05-27 22:43:37 -04:00
Jack Humbert e7435a4022 daniel 2015-05-27 22:43:34 -04:00
Jack Humbert ed7607645a Merge pull request #16 from cr3473/master
fixed the macros for hard colemak
2015-05-27 17:09:28 -04:00
cr3473 8c788f70f6 fixed the macros for hard colemak 2015-05-27 14:03:45 -07:00
Jack Humbert 1add9b72e7 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-05-27 12:26:02 -04:00
Jack Humbert 49ba5817c4 catching up 2015-05-27 12:25:38 -04:00
Jack Humbert c59255879d Merge pull request #15 from cr3473/master
Keymap updates
2015-05-27 12:25:03 -04:00
cr3473 a286c38797 New, improved, extended layout 2015-05-27 08:35:55 -07:00
cr3473 b36d1a87da Merge remote-tracking branch 'upstream/master' 2015-05-27 08:29:48 -07:00
tmk fdce0c9cc0 lufa: Fix console flush #223
Old console sent unneeded empty data every one milli sencond.
After this fix console flushes endpoint data bank every 50ms only when needed.
2015-05-22 18:11:42 +09:00
Jack Humbert d61d1f5ca3 layouts, default 2015-05-21 19:59:39 -04:00
tmk 5b46031658 Revert "Make action_for_key a weak symbol"
This reverts commit c17b8a599e.

The commit made compile error and its intention is unclear.
2015-05-21 20:30:10 +09:00
tmk 32abfacbc7 Merge pull request #216 from DigitalBrains1/modelm101
Add 101-key Model M terminal keyboard
2015-05-21 10:41:36 +09:00
tmk 63c07c9a0f Merge pull request #217 from SaskatoonTechworks/tmk_core_action
Make action_for_key a weak symbol
2015-05-21 10:35:56 +09:00
Dan McGregor c17b8a599e Make action_for_key a weak symbol 2015-05-19 11:29:28 -07:00
Jack Humbert cdccebafe1 default w/qwerty 2015-05-19 01:03:54 -04:00
Jack Humbert b90ee43f57 files 2015-05-18 21:14:21 -04:00
tmk 81137b7a61 Merge branch 'ibm4704_fix_protocol' 2015-05-19 00:40:49 +09:00
tmk 80fd3b0b24 ibm4704_usb: Fix protocol handling 2015-05-19 00:39:44 +09:00
tmk 6b588eb7f7 Add keyboard_setup() and matrix_setup() 2015-05-19 00:39:43 +09:00
tmk 9a2282157f ibm4704_usb: Fix interrupt of clock(rising edge) 2015-05-19 00:39:43 +09:00
Jun Wako 6014d1014e ps2_usb: Fix pin configuration 2015-05-18 14:01:53 +09:00
Peter Lebbing 965110a041 Add 101-key Model M terminal keyboard 2015-05-17 17:18:40 +02:00
tmk cd71aeb63e Updated FAQ Keymap (markdown) 2015-05-16 23:58:50 +09:00
Jack Humbert 0e189b6bdd quark 2015-05-15 21:57:29 -04:00
tmk 2d9e0d5cab ibm4704_usb: Add keymaps for 107 and 50-key 2015-05-14 13:02:13 +09:00
tmk c01ecce137 Revert "hhkb: Fix bug of matrix initialization for JP"
This reverts commit adfd5b92eb.
2015-05-13 17:31:26 +09:00
tmk 8e7153d190 hhkb: Change document 2015-05-13 17:26:24 +09:00
tmk 1ed54a5dc9 adb_usb: Change README 2015-05-13 17:19:25 +09:00
tmk a8822a16b4 hhkb: Fix scan rate for HHKB JP #203 2015-05-13 16:53:32 +09:00
tmk b085d762d5 hhkb: Add build options 2015-05-13 16:40:08 +09:00
tmk 81fe1fda61 hhkb: Change keymap 2015-05-13 16:30:14 +09:00
tmk 177400b7e0 alps64: Change keymap 2015-05-13 16:25:41 +09:00
tmk e86166c904 adb_usb: Change keymap 2015-05-13 16:23:53 +09:00
tmk 9a7eeb4918 usb_usb: Fix keymap 2015-05-13 16:08:37 +09:00
tmk b8fba54a20 usb_usb: Change debug LED pin config 2015-05-13 15:59:49 +09:00
tmk 67137a908a Reduce code size of magic commands 2015-05-13 15:29:30 +09:00
tmk 192024124b Add description of AVR bootloader and boot section 2015-05-13 15:01:49 +09:00
tmk 6057e915b5 usb_usb: Fix initialize procedure 2015-05-13 13:58:10 +09:00
tmk f6d56675f9 Squashed 'tmk_core/' changes from caca2c0..dc0e46e
dc0e46e Rename LUFA to LUFA-git
3bfa7fa Remove LUFA-120730
215b764 Merge commit 'afa0f22a9299686fd88f58ce09c5b521ac917e8f' as 'protocol/lufa/LUFA'
afa0f22 Squashed 'protocol/lufa/LUFA/' content from commit def7fca
c0c42fa Remove submodule of LUFA
30f897d Merge commit '87ced33feb74e79c3281dda36eb6d6d153399b41' as 'protocol/usb_hid/USB_Host_Shield_2.0'
87ced33 Squashed 'protocol/usb_hid/USB_Host_Shield_2.0/' content from commit aab4a69
14f6d49 Remove submodule of USB_Host_Shield_2.0

git-subtree-dir: tmk_core
git-subtree-split: dc0e46eaa4367d4e218f8816e3c117895820f07c
2015-05-13 11:13:10 +09:00
tmk f1f2066657 Merge commit 'f6d56675f9f981c5464f0ca7a1fbb0162154e8c5' 2015-05-13 11:13:10 +09:00
Jun Wako 1c73e574f1 Add compile options '-fdata-sections' 2015-05-10 10:01:16 +09:00
tmk 81545bbe10 Updated FAQ Build (markdown) 2015-05-09 13:33:56 +09:00
Jack Humbert cb3e499cc7 backlight stuff 2015-05-07 15:34:46 -04:00
tmk b4f1638643 Updated FAQ (markdown) 2015-05-06 10:12:46 +09:00
tmk c9b11560bf Updated FAQ (markdown) 2015-05-06 10:07:23 +09:00
tmk ff1130f76d Updated FAQ (markdown) 2015-05-06 08:27:22 +09:00
Jack Humbert 1e0ae2936b quark 2015-05-02 23:00:47 -04:00
Jack Humbert 03963bad85 Merge pull request #14 from rswiernik/master
Fixed quite a few things
2015-04-29 11:02:34 -04:00
Reed Swiernik 15110bf7a0 Corrected makefile common var 2015-04-29 02:55:16 -04:00
Reed Swiernik 85f8506caa Moved keymap file location and fixed bugs in keymap_reed.c 2015-04-29 02:55:00 -04:00
tmk 663909772e Merge branch 'mek-apelsin-lola' 2015-04-28 11:45:25 +09:00
tmk 4d116a04e9 Squashed 'tmk_core/' changes from b9e0ea0..caca2c0
caca2c0 Add mouse support to ADB
5b0835a Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'
f2f7556 Remove unneeded tap delays #201
8124195 Fix URL of HID Usage Tables pdf
0bb4679 Fix typo of doc/keycode.txt
b24fa1a Fix handling of consumer usage #199
6ae1a3d Improve anti-ghosting behavior for fast typing
a4c9763 Fix dfu-programmer parameters
b62b3f2 Move ring_buffer.h file
6ec424f Fix debug print
502fb0c Fix ibm4704 protocol with using interrupt

git-subtree-dir: tmk_core
git-subtree-split: caca2c01553394d959550034c817520d575c7fa0
2015-04-28 11:27:10 +09:00
tmk d9fee5571d Merge commit '4d116a04e94cf0d19317d5b44e4fa9f34a3e5594' 2015-04-28 11:27:10 +09:00
tmk 3e0c1937f4 Updated Git subtree (markdown) 2015-04-28 10:27:11 +09:00
tmk 398c4feed4 Created Git subtree (markdown) 2015-04-28 10:26:11 +09:00
Mekaniserad Apelsin 7780fd1c01 Add mouse support to ADB
Adding the makefile options ADB_MOUSE_ENABLE and ADB_MOUSE_ACCMAX.
Might have gone overboard with comments, and tried but failed at not
adding more than necessary outside the converter/adb_usb/ folder.
2015-04-26 08:57:00 +02:00
Jack Humbert 61b4d273da Merge pull request #13 from rswiernik/master
Updated Readme and Build info
2015-04-25 12:50:56 -04:00
Reed Swiernik eadb08b113 Update README.md 2015-04-25 12:18:45 -04:00
Reed Swiernik 79f70b20d9 Update README.md
Switched around more readme stuff
2015-04-25 12:18:34 -04:00
Reed Swiernik d0391d9ed7 Update README.md
This stupid readme...
2015-04-25 12:18:21 -04:00
Reed Swiernik 835207193a Update README.md
Updated formatting again...
2015-04-25 12:18:11 -04:00
Reed Swiernik c85f68d9cd Update README.md
Changed formatting mistake
2015-04-25 12:17:54 -04:00
Reed Swiernik e3ebae521e Updated readme with new build info 2015-04-25 12:17:42 -04:00
Reed Swiernik b060714efd Changed del key and added docs 2015-04-25 12:17:28 -04:00
Reed Swiernik 0541af4ff9 Updated makefile to properly handle non extended keymaps 2015-04-25 12:17:18 -04:00
Reed Swiernik 480b313b1e Added keymap w/ game mode 2015-04-25 12:17:07 -04:00
Reed Swiernik bf1987e233 updated makefile 2015-04-25 12:16:51 -04:00
Jun Wako 55fc97f957 Change mbed sdk path 2015-04-24 16:27:40 +09:00
Jun Wako 1fe4406f37 Squashed 'tmk_core/' changes from 7967731..b9e0ea0
b9e0ea0 Merge commit '7fa9d8bdea3773d1195b04d98fcf27cf48ddd81d' as 'tool/mbed/mbed-sdk'
7fa9d8b Squashed 'tool/mbed/mbed-sdk/' content from commit 7c21ce5

git-subtree-dir: tmk_core
git-subtree-split: b9e0ea08cb940de20b3610ecdda18e9d8cd7c552
2015-04-24 16:26:14 +09:00
Jun Wako a3d96d3aa9 Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8' 2015-04-24 16:26:14 +09:00
Jun Wako 1d5bac21dc Fix README 2015-04-24 16:24:39 +09:00
tmk 22dd5dae98 Update for the latest mbed sdk 2015-04-24 15:03:59 +09:00
Jun Wako 1f4a22ee81 Remove unneeded tap delays #201 2015-04-23 20:18:01 +09:00
Jun Wako 3f32b22478 Fix URL of HID Usage Tables pdf 2015-04-23 17:30:45 +09:00
Jun Wako f9045bea6e Fix typo of doc/keycode.txt 2015-04-23 17:20:59 +09:00
Jun Wako 7c3f14b7bb Fix handling of consumer usage #199 2015-04-23 17:02:28 +09:00
Jun Wako 4e50df476d Merge branch 'mtharp-anti-ghost' 2015-04-23 16:33:35 +09:00
Michael Tharp b52e29582a Improve anti-ghosting behavior for fast typing
Keypresses would be forgotten if they began while ghosting, even if they
were still pressed after ghosting ended.
2015-04-23 16:32:38 +09:00
Jun Wako bd24de44b7 Fix dfu-programmer parameters 2015-04-23 16:07:24 +09:00
Jun Wako c412300536 sun_usb: import dastels's keymap of Type 3
https://github.com/dastels/tmk_keyboard/tree/master/converter/sun3_usb
2015-04-23 15:24:28 +09:00
Jun Wako c2485ebac5 Merge branch 'ibm4704_ext' 2015-04-22 14:37:13 +09:00
Jun Wako e98b800723 Move ring_buffer.h file 2015-04-22 14:35:20 +09:00
tmk d5482f29f4 Fix debug print 2015-04-22 14:18:13 +09:00
tmk d42aa47809 Fix ibm4704 protocol with using interrupt 2015-04-22 14:18:13 +09:00
tmk 5ea50bfb30 Add keymap codelet for 77-key and 107-key 2015-04-22 14:18:13 +09:00
Jun Wako 799993c414 Update README 2015-04-22 13:52:28 +09:00
Jun Wako a20ef7052c Squashed 'tmk_core/' changes from 05caacc..7967731
7967731 Update README

git-subtree-dir: tmk_core
git-subtree-split: 7967731b8bcb1f0c26f7f1f909273e6ad7ae8f36
2015-04-22 13:29:13 +09:00
Jun Wako 79cfa894af Merge commit 'a20ef7052c6e937d2f7672dd59456e55a5c08296' into master_ng 2015-04-22 13:29:13 +09:00
tmk 5d7a4e3059 Updated FAQ (markdown) 2015-04-13 10:53:40 +09:00
tmk ac01b69edf Updated FAQ (markdown) 2015-04-13 10:51:28 +09:00
tmk 5031ae08bf Updated FAQ (markdown) 2015-04-13 10:50:34 +09:00
tmk 7860d09914 Change TMK_DIR setting 2015-04-10 01:53:24 +09:00
tmk a074364c37 Squashed 'tmk_core/' content from commit 05caacc
git-subtree-dir: tmk_core
git-subtree-split: 05caaccec92694bb24c8c3c3a9940b96efd4605c
2015-04-10 01:32:04 +09:00
tmk 1a02ebcc61 Merge commit 'a074364c3731d66b56d988c8a6c960a83ea0e0a1' as 'tmk_core' 2015-04-10 01:32:04 +09:00
tmk 6746e37088 Remove core library and build files 2015-04-10 01:25:48 +09:00
tmk b4e2d325f3 Change TOP_DIR to TMK_DIR in makefiles 2015-04-09 16:20:42 +09:00
Jun Wako 08ec8bbe5d usb_hid: Update USB_Host_Shield_2.0 2015-04-07 10:24:52 +09:00
Jun Wako 63f462a460 hhkb: Chane keymap for hasu 2015-04-07 09:29:06 +09:00
Jun Wako adfd5b92eb hhkb: Fix bug of matrix initialization for JP 2015-04-07 09:27:28 +09:00
tmk d5ac54449a Add alps64 2015-04-05 14:41:14 +09:00
Jack Humbert 71f7713739 Merge pull request #10 from huntse/pull_req
Latest custom map with lower + raise
2015-04-02 11:23:21 -04:00
Sean Hunter 4209486b13 Latest custom map with lower + raise 2015-04-02 15:05:35 +01:00
Jun Wako 2b7d217ebb Fix for dfu-programmer 0.7 #182 2015-03-26 15:09:28 +09:00
tmk 2c11165fb6 Updated FAQ Keymap (markdown) 2015-03-24 16:39:28 +09:00
tmk 9761907332 Updated FAQ Keymap (markdown) 2015-03-24 16:39:04 +09:00
tmk 2931b8c18c Updated FAQ Keymap (markdown) 2015-03-24 16:31:11 +09:00
tmk 0eff2b199d Updated FAQ Keymap (markdown) 2015-03-24 16:30:35 +09:00
Jack Humbert f1daa266ad macros 2015-03-23 00:35:05 -04:00
Jack Humbert 4454ded0af macros 2015-03-23 00:33:54 -04:00
Jun Wako 0d222db31f infinity: Fix disabling watchdog
- watchdog is timed out before disabling it by mbed startup
- old booloader disable watchdog while new(2015/01) doesn't
2015-03-22 10:51:30 +09:00
Jack Humbert 9514ee8df7 Update README.md 2015-03-21 01:24:01 -04:00
Jack Humbert 2e0fd30185 Merge pull request #9 from tmk/master
updating
2015-03-21 01:20:24 -04:00
Jack Humbert a33ec2f504 updated readme 2015-03-21 01:17:22 -04:00
Jack Humbert 3d286a813e colemak shortcuts 2015-03-21 01:01:09 -04:00
Jack Humbert 5c45ba947c function stuff too 2015-03-20 22:49:32 -04:00
Jack Humbert a94beded1a Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-03-20 13:46:40 -04:00
Jack Humbert 708f95a472 working extended keymap 2015-03-20 13:36:13 -04:00
Jack Humbert b688e68539 Create keymap_tim.c 2015-03-19 14:18:41 -04:00
Jack Humbert afa0f9d0aa Merge pull request #8 from nathanrosspowell/master
Housekeeping on `keymap_nathan.c`, updated documentation
2015-03-19 00:12:01 -04:00
Nathan Ross Powell e9df959c13 Update keymap_nathan.c
Remove macro for KEYMAP_GRID that is in keymap_common.h.
Add comments with ASCII art for the two layouts in keymap_common.h.
2015-03-18 23:58:21 -04:00
Nathan Ross Powell e958baca81 Delete .keymap_nathan.c.swp 2015-03-18 23:39:01 -04:00
Nathan Ross Powell 80c4cdb245 Merge remote-tracking branch 'upstream/master' 2015-03-18 23:33:42 -04:00
Jun Wako d23d95381a m0110: Fix Makefile 2015-03-19 06:56:56 +09:00
Jun Wako 9b4914b005 m0110: Fix README.md and keymap_intl.c 2015-03-19 06:39:13 +09:00
Jun Wako e3169ccc45 m0110: Add support for international keyboard 2015-03-19 06:25:48 +09:00
Jack Humbert 9c3a956634 Update README.md 2015-03-18 10:19:40 -04:00
Jack Humbert 9307a0a3e4 Merge pull request #6 from tmk/master
pulling from tmk
2015-03-16 12:01:35 -04:00
Jack Humbert be86aefdbd Rename handwire-matrix.c to matrix-handwire.c 2015-03-16 11:59:49 -04:00
Jack Humbert a296c83805 Create handwire-matrix.c 2015-03-16 11:59:21 -04:00
Jack Humbert 0fc820c090 Merge pull request #5 from Wilba6582/master
Pulling in PCB changes
2015-03-16 11:58:05 -04:00
Wilba6582 65680819df Replaced tabs with spaces to match TMK convention. 2015-03-17 00:56:41 +11:00
Wilba6582 b80b6b369c Added backlight.h, backlight.c 2015-03-17 00:51:36 +11:00
Wilba6582 15b9bce6ba Initial commit for Planck PCB Rev 1.
- Backlight on PB7 controlled by Timer1 Fast PWM (no interrupts).
- Backlight commands connected temporarily to top left keys.
- Backlight init called from matrix.c, since there's no generic keyboard_init() override function.
2015-03-17 00:43:37 +11:00
tmk 5e5aee44e5 Updated FAQ Keymap (markdown) 2015-03-09 20:34:06 +09:00
tmk 506c776300 Updated FAQ Keymap (markdown) 2015-03-09 20:30:35 +09:00
tmk d6141c0bce Updated FAQ Keymap (markdown) 2015-03-09 20:28:55 +09:00
tmk b64631d02c Updated FAQ Keymap (markdown) 2015-03-09 20:23:18 +09:00
tmk b321f44ff6 Updated FAQ Keymap (markdown) 2015-03-09 20:22:02 +09:00
tmk 1650d4692c Updated FAQ Keymap (markdown) 2015-03-07 14:19:44 +09:00
Jack Humbert 0fcb3b65f8 brett 2015-03-05 14:29:33 -05:00
Jun Wako c35c4283b9 infinity: For production model and add SpaceFn 2015-03-05 10:38:18 +09:00
Jack Humbert ceff93844b simon 2015-03-02 20:37:17 -05:00
cr3473 a4cf9ae660 layout changes to fix some nav issues
also to simplify and make way for a few ideas
2015-03-01 17:06:39 -05:00
Jack Humbert ea6de22aee brett 2015-02-26 16:35:54 -05:00
Jack Humbert a538f71e41 led oops 2015-02-23 23:44:11 -05:00
Jack Humbert 64dc4784e4 vlad 2015-02-21 15:35:09 -05:00
Jack Humbert 7884125b79 joe 2015-02-19 20:10:24 -05:00
Jack Humbert 88cc5ce883 joe 2015-02-19 19:41:45 -05:00
Jack Humbert cf4363c910 joe 2015-02-19 19:39:35 -05:00
Jack Humbert a4d091eb52 joe 2015-02-19 19:35:57 -05:00
Jack Humbert 4a3c0839f9 sean 2015-02-15 16:29:35 -05:00
Jack Humbert 24218b58b4 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2015-02-05 12:58:18 -05:00
Jack Humbert 46b38fa64a Merge pull request #4 from pepers/master
defined semi-standard and short space layouts
2015-01-27 12:45:11 -05:00
pepers b8c91951e1 defined semi-standard and short space layouts 2015-01-27 12:32:23 -05:00
Jun Wako abf482de8e Fix call parameter of suspend_power_down() 2015-01-26 11:25:22 +09:00
tmk e872dd2149 Merge pull request #176 from xauser/forhasu
NerD bugfix
2015-01-25 22:02:34 +09:00
Jack Humbert 1d3f3cde78 Merge pull request #3 from pepers/master
defined KEYMAP_GRID for grid layouts
2015-01-23 14:26:27 -05:00
pepers 438ff3465e defined KEYMAP_GRID for grid layouts 2015-01-23 14:17:32 -05:00
Jack Humbert 6cae90793f Create keymap_matthew.c 2015-01-23 12:15:44 -05:00
Jack Humbert 09655cc5d5 Create keymap_nathan.c 2015-01-23 12:14:55 -05:00
Jack Humbert adf7b56e6f subproject commit? 2015-01-23 12:13:06 -05:00
Jack Humbert 6f735ca130 Update README.md 2015-01-23 12:11:28 -05:00
tmk 64e64e5153 Updated FAQ Build (markdown) 2015-01-22 13:13:53 +09:00
Ralf Schmitt e0f32742e9 Kitten Paw, fix main README link to project. 2015-01-21 21:16:49 +01:00
Ralf Schmitt 012ec9e379 NerD, turn BRK into PAUS to get bootloader jump back. 2015-01-21 21:16:09 +01:00
tmk 771347c4a6 Add external projects using tmk_keyboard 2015-01-19 12:43:30 +09:00
tmk c1ac7f159f Merge pull request #148 from cub-uanic/patch-1
Fix keycode.txt
2015-01-19 12:13:21 +09:00
tmk aa95d6ff62 Merge pull request #151 from bswinnerton/typo-fix
Fixing typo in console mode
2015-01-19 11:58:04 +09:00
tmk 2e75b138c1 Merge branch 'vovcacik-ghost_squid' 2015-01-19 11:18:43 +09:00
tmk a5122d5aba Merge branch 'ghost_squid' of https://github.com/vovcacik/tmk_keyboard into vovcacik-ghost_squid
Conflicts:
	README.md
2015-01-19 11:17:05 +09:00
tmk 703ca9de21 Merge pull request #164 from cub-uanic/patch-2
Update other_projects.md - added TMK/Ergodox
2015-01-19 11:08:05 +09:00
tmk 1cda7b79fb Fix typo 'keyobard' #166 2015-01-19 10:35:06 +09:00
tmk 8279226123 Merge branch 'xauser-forhasu' 2015-01-19 10:21:01 +09:00
tmk 507e0636f0 Revert "Changed hotkey for bootloader jump"
This reverts commit f31cbc7219.
2015-01-19 10:20:20 +09:00
tmk d32b955af6 Merge branch 'forhasu' of https://github.com/xauser/tmk_keyboard into xauser-forhasu 2015-01-19 10:19:47 +09:00
tmk 40fd75e5ed hhkb: Update RN-42 docs 2015-01-19 10:13:42 +09:00
Ralf Schmitt 07b54cb513 Added missing keyboards to main README 2015-01-18 11:47:40 +01:00
Ralf Schmitt 2d74020331 Added NerD 80% (TKL) support 2015-01-18 11:45:24 +01:00
Ralf Schmitt d9b5f5110e Added NerD 60% support 2015-01-18 11:43:37 +01:00
Ralf Schmitt f31cbc7219 Changed hotkey for bootloader jump 2015-01-18 11:42:43 +01:00
Nathan Ross Powell e7289bb029 KC_INSERT should be KC_INS
The short name was incorrectly set as `KC_INT` when we want `KC_INS`.
2015-01-16 00:07:22 -05:00
tmk c610bae631 Merge branch 'rn42_integrate' 2015-01-16 11:51:34 +09:00
tmk 099701dd31 hhkb: Integrate RN-42 support, remove hhkb_rn42 2015-01-16 10:21:18 +09:00
Jack Humbert 83a3d7a3da Update README.md 2015-01-15 19:58:38 -05:00
tmk ce66988650 hhkb_rn42: Move doc 2015-01-16 08:26:59 +09:00
tmk 3e88e8b761 hhkb: Fix layer stuck of keymap_hasu
- In mouse key layer with holding semicolon, press Fn0, release
  semicolon and release Fn0 now layer 1 is stuck.
2015-01-16 05:22:29 +09:00
Jack Humbert a7a808795e Update README.md 2015-01-15 13:06:43 -05:00
tmk 65a2ce94a3 Merge branch 'rn42' 2015-01-15 17:12:26 +09:00
tmk 517817b9c7 rn42: Update doc 2015-01-15 17:08:49 +09:00
tmk 2626a32260 Use pgmspace for RN-42 commands 2015-01-15 17:08:49 +09:00
tmk 3b3af3bae0 Increase buffer of rn42_gets() and change rn42_linked() 2015-01-15 17:08:49 +09:00
tmk 1b95b3c51a rn42: Add commands for RN-42 2015-01-15 17:08:49 +09:00
tmk 4f121de7ad rn42: Add rn42_getc and rn42_gets 2015-01-15 17:08:49 +09:00
tmk a679928620 Fxi layer stuck of keymap_hasu
- In mouse key layer with holding semicolon, press Fn0, release
  semicolon and release Fn0 now layer 1 is stuck.
2015-01-15 17:08:49 +09:00
tmk 884c2ab0f2 Update doc 2015-01-15 17:08:49 +09:00
tmk 160e02d06a Change RN42 state display 2015-01-15 17:08:49 +09:00
tmk ebe4373258 Fix power saving while USB suspended
- doesn't pwoer save while Bluetooth turns on
2015-01-15 17:08:49 +09:00
tmk 86f82dd02d Add wait for charging capacitance of ADC S/H 2015-01-15 17:08:48 +09:00
tmk 2d7973fc3f Fix: enable digital input for PF5 2015-01-15 17:08:48 +09:00
tmk 25aee431bd Clean ADC code of battery_voltage() 2015-01-15 17:08:48 +09:00
tmk 825be9d121 Disable input buffer for ADC 2015-01-15 17:08:48 +09:00
tmk de29f986a7 Update MEMO 2015-01-15 17:08:48 +09:00
tmk 570bcb2ed1 Add LUFA device state to command info 2015-01-15 17:08:48 +09:00
tmk 20caf673d8 Fix lufa sendchar() infinite wait loop
- FrameNumber is not updated when adapter powered
- can be blocked in sendchar() when pluged into AC adapter
2015-01-15 17:08:48 +09:00
tmk 9179246a1d Fix USB plug-in while BT mode falls to be enumerated 2015-01-15 17:08:48 +09:00
tmk 05795cb003 Compensate timer during prower down 2015-01-15 17:08:48 +09:00
Jack Humbert a54da1b926 Merge remote-tracking branch 'upstream/master' 2015-01-14 22:48:54 -05:00
Jack Humbert 4225f0353c Merge branch 'planck-jack' 2015-01-14 22:43:01 -05:00
Jack Humbert 173dbe3b28 Create keymap_shane.c 2015-01-14 21:36:25 -05:00
tmk 12e5912c9a Updated FAQ Build (markdown) 2015-01-14 09:35:19 +09:00
tmk 756706a704 Updated FAQ Keymap (markdown) 2015-01-14 09:25:28 +09:00
tmk 126ba262ef Updated FAQ Build (markdown) 2015-01-14 09:25:15 +09:00
tmk 8bb74c6062 Updated FAQ (markdown) 2015-01-14 09:24:15 +09:00
tmk c716bc0234 Updated FAQ Build (markdown) 2015-01-14 09:23:20 +09:00
tmk 7c80d1d777 Updated FAQ (markdown) 2015-01-14 09:20:55 +09:00
tmk 416f946463 Updated FAQ (markdown) 2015-01-14 09:20:06 +09:00
tmk 9f02c070ca Updated FAQ (markdown) 2015-01-14 09:16:02 +09:00
tmk 00ec258e31 Created FAQ Build (markdown) 2015-01-14 09:15:50 +09:00
tmk 3c27d7b048 Updated FAQ (markdown) 2015-01-14 09:15:29 +09:00
tmk 28c9339859 Updated Home (markdown) 2015-01-14 09:13:36 +09:00
tmk 07baa1b65d Updated FAQ Keymap (markdown) 2015-01-14 09:11:36 +09:00
Jack Humbert 2e0d872ab7 sean 2015-01-13 18:05:37 -05:00
tmk b33cd7d7ec Updated mbed cortex porting (markdown) 2015-01-14 07:03:23 +09:00
tmk 111593b6d8 Updated mbed cortex porting (markdown) 2015-01-14 07:03:11 +09:00
tmk 4785e6d228 Updated mbed cortex porting (markdown) 2015-01-14 07:02:26 +09:00
tmk a94c683ab9 Updated FAQ Keymap (markdown) 2015-01-14 05:19:43 +09:00
tmk f27207e807 Updated FAQ Keymap (markdown) 2015-01-14 05:16:09 +09:00
tmk 2f44de6240 Updated FAQ Keymap (markdown) 2015-01-14 05:15:42 +09:00
tmk 59c8a733e6 Updated FAQ Keymap (markdown) 2015-01-14 05:03:47 +09:00
Jack Humbert 98f486a633 atomic 2015-01-12 12:39:24 -05:00
Jack Humbert 42fe42274f names 2015-01-12 12:37:16 -05:00
Jun Wako 10a6b2c7d8 hhkb: Add Makefile.jp for HHKB JP 2015-01-11 01:54:17 +09:00
Jack Humbert d6f2f878f9 dotcom 2015-01-05 16:32:15 -05:00
Jack Humbert 33e2a6285f dotcom 2015-01-05 16:27:03 -05:00
Jack Humbert 2de53795d6 Update keymap_jack.c 2015-01-05 13:11:34 -05:00
Jun Wako 3dbb762dcc Merge branch 'mbed_infinity' 2015-01-04 17:22:06 +09:00
Jun Wako d0fefb76f8 infinity: Add initial files for keyboard support 2015-01-04 17:21:43 +09:00
Jun Wako c6e533ce83 infinity: Move project specific files to local 2015-01-04 17:21:43 +09:00
Jun Wako 4acde45102 Fix linker script for NVIC vector on RAM 2015-01-04 17:21:43 +09:00
Jun Wako d5e5dbd0aa Add openocd config files for K20 2015-01-04 17:21:43 +09:00
Jun Wako e259a722e7 Add keyboard/infinity 2015-01-04 17:21:43 +09:00
Jun Wako 5419130291 Fix ps2 protocol build using ps2_io.h 2015-01-04 17:21:43 +09:00
Jun Wako 75a59e4d12 Update makefiles to mbed-sdk 14666bb 2015-01-04 17:21:42 +09:00
Jun Wako 8f1e311cd7 Ad hoc fix of print and debug for mbed 2015-01-04 17:21:42 +09:00
Oleg Kostyuk 02a9f8a906 Update other_projects.md - added TMK/Ergodox 2015-01-03 15:10:45 +02:00
tmk 06527bde4f bluefruit, pjrc: Update protocols for new API 2015-01-03 12:09:41 +09:00
tmk 22d99f26af Fix modifier stuck of Lock command(#127) 2015-01-01 12:17:11 +09:00
Jun Wako 2e17aa2d60 usb_usb: update README 2014-12-30 13:52:53 +09:00
tmk 2acb2f0937 Updated mbed cortex porting (markdown) 2014-12-29 20:30:46 -08:00
tmk 4b46263952 Updated mbed cortex porting (markdown) 2014-12-29 20:30:31 -08:00
tmk 48a3cbf9b3 Updated mbed cortex porting (markdown) 2014-12-29 20:19:32 -08:00
tmk edfb9363dd Updated mbed cortex porting (markdown) 2014-12-29 20:18:04 -08:00
tmk 75cb446d36 Created mbed cortex porting (markdown) 2014-12-29 20:17:06 -08:00
tmk 464b9a80d4 Updated Home (markdown) 2014-12-29 20:15:33 -08:00
Vlastimil Ovčáčík a6d33e2c98 Added support for The Ghost Squid controller used for CM XT keyboard.
- initial commit
- created as clone of the kitten_paw subproject with pins adjusted for CM
  XT
2014-12-28 09:49:57 +01:00
Jun Wako 6a97efcea9 Merge branch 'mumchristmas-Apple_media_key_fix' #160 2014-12-26 13:30:18 +09:00
Jun Wako af556d39d2 Remove unwanted white space 2014-12-26 13:27:06 +09:00
Colt Ma 5a8dbc63ea Add keycode for Fast Forward & Rewind
KC_MEDIA_FAST_FORWARD
KC_MEDIA_REWIND
2014-12-26 11:02:25 +08:00
tmk bb25960424 [ps2,terminal_usb] Quick fix for build problem 2014-12-24 11:11:07 +09:00
tmk b105d83bce Updated FAQ (markdown) 2014-12-15 19:07:42 -08:00
Jack Humbert ed8d9a099d added planck folder 2014-12-14 10:30:27 -05:00
Jack Humbert 79849ee534 Update keymap_common.h 2014-12-12 12:12:36 -05:00
Jack Humbert 4e3397ca8a Update matrix.c 2014-12-12 12:12:06 -05:00
Jack Humbert 4a8b9b8a2e Update keymap_planck.c 2014-12-12 12:11:46 -05:00
Jack Humbert e4c4d6ad0a Merge pull request #1 from charlesmartin/patch-2
Update keymap_planck.c
2014-12-11 17:42:46 -05:00
charlesmartin 5cc0d353a5 Update keymap_planck.c 2014-12-11 17:41:00 -05:00
Jack Humbert d9a1b9086f led 2014-12-11 17:36:42 -05:00
Jun Wako a0d6bb1818 usb_usb: Add SpaceFn and hasu keymap 2014-12-11 03:52:05 +09:00
Jun Wako b47450da9f Merge branch 'usb_usb_hub' 2014-12-11 01:00:32 +09:00
Jun Wako 30864ea5e4 Update README 2014-12-11 00:59:08 +09:00
Jun Wako 27795b6b19 Change debug print config 2014-12-11 00:27:37 +09:00
Jun Wako c9674d388d Add USB Hub support 2014-12-10 23:52:38 +09:00
Jun Wako 0a181c7eb5 Add submodule legitimate USB_Host_Shield_2.0 2014-12-10 15:54:24 +09:00
Jun Wako 4b69ed2280 Remove submodule USB_Host_Shield_2.0 2014-12-10 15:20:32 +09:00
Jun Wako 0a9d9b8f9c Fix print init; print_set_sendchar in main 2014-12-10 15:10:25 +09:00
Jun Wako 9de992ba0b Change USB PID 2014-12-10 14:52:39 +09:00
Jack Humbert 1c6770f18c init 2014-12-08 17:05:41 -05:00
Jack Humbert 6c27cba5df init 2014-12-08 17:05:02 -05:00
Jun Wako f6f698dda0 usb_usb: Update for new core layout 2014-12-05 09:59:08 +09:00
Brooks Swinnerton 60acd8996d Fixing typo in console mode 2014-11-30 13:27:59 -05:00
tmk 69fe8cf232 Updated FAQ (markdown) 2014-11-26 21:06:32 -08:00
tmk bf5638e511 Updated FAQ (markdown) 2014-11-26 20:17:46 -08:00
tmk f7172ff5a6 Updated FAQ Keymap (markdown) 2014-11-26 18:13:26 -08:00
tmk cca7b10727 Updated FAQ Keymap (markdown) 2014-11-26 18:12:44 -08:00
tmk d4437d6694 Updated FAQ Keymap (markdown) 2014-11-26 18:12:07 -08:00
tmk 4178b00533 Updated FAQ Keymap (markdown) 2014-11-26 18:11:41 -08:00
tmk 686476fa93 Updated FAQ (markdown) 2014-11-26 17:42:52 -08:00
tmk 2a7bd276a4 Updated FAQ (markdown) 2014-11-26 17:41:59 -08:00
tmk e40086b2fe Updated FAQ (markdown) 2014-11-26 17:41:40 -08:00
tmk bdafdf1ef8 Updated FAQ (markdown) 2014-11-26 17:40:28 -08:00
tmk 083c77390a Created FAQ Keymap (markdown) 2014-11-26 17:40:02 -08:00
tmk 1793bfd096 Updated Home (markdown) 2014-11-26 17:38:54 -08:00
tmk b129491366 Updated Home (markdown) 2014-11-26 17:38:39 -08:00
tmk ae8ddde1cf Updated Home (markdown) 2014-11-26 17:35:24 -08:00
tmk 4192bce16b hhkb: Change keymap and bootmagic salt key 2014-11-25 11:44:57 +09:00
tmk cc5693e0f1 Merge branch 'u2_fix' 2014-11-24 16:19:00 +09:00
tmk b92ea1f985 Fix endpoint buffer setting for AT90USB82/162. 2014-11-24 16:04:03 +09:00
tmk ed52ebb987 Merge branch 'merge_rn42' 2014-11-24 15:36:53 +09:00
tmk e2077cad45 Change key_t to keypos_t 2014-11-24 15:14:52 +09:00
tmk a996396045 Fix debug.h 2014-11-24 14:33:50 +09:00
tmk 363950982a Merge branch 'rn42' into merge_rn42
Conflicts:
	.gitignore
	common.mk
	common/debug_config.h
	common/print.h
2014-11-24 13:50:33 +09:00
tmk 43f121497f Created HHKB Alt controller (markdown) 2014-11-23 19:07:09 -08:00
tmk 3d9d4bfe3e Updated Home (markdown) 2014-11-23 19:03:45 -08:00
tmk 60096e11c7 Update doc 2014-11-23 13:44:11 +09:00
tmk 1f96edaed6 Remove MCU dependent code from common/keyboard.c 2014-11-23 13:38:10 +09:00
tmk 608ebe2686 Matrix power saving 2014-11-23 13:08:05 +09:00
Oleg Kostyuk 1a9cec9a03 Documentation: small mistake
Originally reported as https://github.com/cub-uanic/tmk_keyboard/issues/10, all credits to @olivierpons
2014-11-20 23:55:47 +02:00
tmk c2d830c07c USB initialize when plug-in during battery powered 2014-11-20 17:24:56 +09:00
Jun Wako eb90ed6238 ps2_usb: Fix README 2014-11-20 16:47:40 +09:00
tmk 09e6f71bff adb_usb: Remove old comment of Makefile 2014-11-20 01:32:20 +09:00
tmk 1961641463 Merge branch 'action_fix' 2014-11-18 04:10:48 +09:00
tmk 67416629e3 Updated FAQ (markdown) 2014-11-16 22:24:54 -08:00
tmk 00a8847daf Updated FAQ (markdown) 2014-11-16 22:00:14 -08:00
tmk c5dfee04af Updated FAQ (markdown) 2014-11-16 21:50:43 -08:00
tmk e6d58d5ac2 Updated FAQ (markdown) 2014-11-16 21:49:31 -08:00
tmk a58b9ddbd5 Add initializer of debug_config for GCC < 4.6.0(#144) 2014-11-14 22:53:25 +09:00
tmk 8180709132 Fix for 'unnamed field in initializer' GCC bug(Fix #143) 2014-11-14 17:49:48 +09:00
Simon Stapleton 7b0b8ee017 ignore files with trailing ~ 2014-11-14 17:25:49 +09:00
tmk c49cb01002 Merge pull request #142 from 0mark/master
fixed vusb variant of converter ps2usb
2014-11-14 04:56:00 +09:00
Stefan Mark 93915040e7 fixed vusb variant of converter ps2usb 2014-11-13 12:07:56 +01:00
tmk e52a7cf448 Updated FAQ (markdown) 2014-11-08 21:32:43 -08:00
tmk 9e51e54240 Updated FAQ (markdown) 2014-11-08 21:32:20 -08:00
tmk fb3c7c0572 Updated FAQ (markdown) 2014-11-02 18:02:12 -08:00
tmk b4eea94baa Updated FAQ (markdown) 2014-11-02 17:58:42 -08:00
tmk f91c584a44 Updated FAQ (markdown) 2014-10-16 23:42:21 -07:00
tmk 6c06b9031f Add power control of key switch board 2014-10-02 09:58:47 +09:00
tmk 821c719e98 Add action 'Momentary switching with Modifiers' 2014-09-29 10:29:33 +09:00
tmk 7219c4a4b6 Updated FAQ (markdown) 2014-09-28 00:53:13 -07:00
tmk 6ec6c8017f Updated FAQ (markdown) 2014-09-28 00:44:31 -07:00
tmk 8daad815e8 Updated FAQ (markdown) 2014-09-28 00:41:36 -07:00
tmk 8cec0bc9d6 Fix typo of variable name 2014-09-24 15:52:31 +09:00
tmk 27967f2008 Add TMK converter support to Next converter
- change protocol stack to LUFA
2014-09-24 15:50:29 +09:00
tmk bfd2d969b4 Add keyboard LED control via Bluetooth 2014-09-22 14:20:49 +09:00
tmk dd3ab65ec3 Merge branch 'usb_usb_fix' 2014-09-22 10:53:35 +09:00
tmk e3f4f7d8c4 Merge branch 'scottjad-master' into usb_usb_fix 2014-09-22 10:52:27 +09:00
tmk ea524d7bef Adhoc fix compile error of usb_usb 2014-09-22 10:42:20 +09:00
tmk 2015027da3 Add FET swtich for battery ADC 2014-09-20 06:12:49 +09:00
Scott Jaderholm a59dea558e usb_usb: Remove mention of downloading LUFA 2014-09-14 21:38:10 -07:00
Scott Jaderholm c35e3e8596 usb_usb: Remove mention of merged usb_hid branch 2014-09-14 21:37:20 -07:00
tmk d8dd18b421 Improve rn42_task time resolution 2014-09-05 11:37:05 +09:00
tmk 38714e8c85 Update MEMO and remove a build option to save flash 2014-09-04 17:39:29 +09:00
tmk 3b81ffc16c Monitor battery and alert low voltage 2014-09-04 17:08:23 +09:00
tmk 02939ab1d8 Add battery management 2014-09-04 05:30:00 +09:00
tmk 807ed33a9a Fix rn42_linked() to use pullup 2014-08-30 15:59:41 +09:00
tmk b9e265368f Merge branch 'rhaberkorn-serial-mouse' 2014-08-26 17:48:34 +09:00
tmk 4799c99b4d Add serialmouser_usb project 2014-08-26 17:46:41 +09:00
tmk c672cbc31c Add option 7bit data to serial_soft.c 2014-08-26 17:39:04 +09:00
tmk c4530ab0a8 Add serial_mouse_task in keyboard.c 2014-08-26 17:36:44 +09:00
tmk 8f5f25fcd5 Revert lufa/lufa.c 2014-08-26 17:35:16 +09:00
tmk 8b9c61ade5 Revert ps2_usb/Makefile and config.h 2014-08-26 17:34:10 +09:00
tmk b316f19871 Merge branch 'serial-mouse' of git://github.com/rhaberkorn/tmk_keyboard into rhaberkorn-serial-mouse 2014-08-26 05:02:37 +09:00
tmk 10eb70acb4 Merge pull request #134 from xauser/master
Support for Lightpad keypad
2014-08-26 04:59:43 +09:00
Ralf Schmitt af19f56ec9 Support for Lightpad keypad 2014-08-24 16:31:12 +02:00
tmk 28c1bf294c Add files missing for JP support. 2014-08-24 09:51:21 +09:00
tmk 4f22a45b99 Add support for HHKB JP 2014-08-20 13:36:15 +09:00
tmk 523cc6aa2e Add build option and Sun specific commands 2014-08-01 13:26:42 +09:00
tmk 17f22da3cf Update MEMO.txt 2014-07-30 14:38:27 +09:00
tmk e4b9541041 Add connection indicator 2014-07-30 14:38:27 +09:00
tmk f441ad07cc Add initial setting of Linked pin 2014-07-30 14:38:27 +09:00
tmk ae28b16fc6 Add battery monitor and LED control 2014-07-30 14:38:27 +09:00
tmk 21e68fbea4 Add help message 2014-07-30 14:38:27 +09:00
tmk 4b2b32a14b Add rn42_lined(): connection status(GPIO2) 2014-07-30 14:38:26 +09:00
tmk 3e7875455e Add flow control by firmware to serial_uart 2014-07-30 14:38:26 +09:00
tmk 50bcaa66c4 Clean up mbed_onekey 2014-07-30 14:38:26 +09:00
tmk 59ea5e02f7 Mkdir rn42 2014-07-30 14:38:26 +09:00
tmk b4e4f599df Add rn42_task 2014-07-30 14:38:26 +09:00
tmk fa545c87f7 Fix rn42.h API 2014-07-30 14:38:26 +09:00
tmk 862f519e24 Add software UART and battery monitor 2014-07-30 14:38:26 +09:00
tmk 01fa462e2c Fix configure mode of RN-42 2014-07-30 14:38:26 +09:00
tmk 1619d68cb2 Update MEMO.txt 2014-07-30 14:38:26 +09:00
tmk 6cec158d1a Update TODO 2014-07-30 14:38:26 +09:00
tmk faf9adb315 Change keymap for rn42
- rn42 doesn't support mouse button 4 and 5
- rn42 deosn't support browser back and forward
2014-07-30 14:38:26 +09:00
tmk cd86104377 Fix consumer key bug 2014-07-30 14:38:26 +09:00
tmk 31a298f9d9 Add RN-42 Bluetooth module support 2014-07-30 14:38:26 +09:00
tmk be19b2bf32 Change buffer size: 256 bytes 2014-07-30 14:38:26 +09:00
tmk 47bc3016d3 Ad hoc fix of command API 2014-07-30 14:38:25 +09:00
tmk 4069776c02 Add initial files for RN-42 2014-07-30 14:38:25 +09:00
tmk ea60dae6e6 Fix for new API(key_t to keypos_t) 2014-07-30 14:38:25 +09:00
tmk 54aee16a84 Fix timer.h to include AVR specific header 2014-07-30 14:38:25 +09:00
tmk 2e0e21d444 Port action_* to mbed 2014-07-30 14:38:25 +09:00
tmk adbb86b1ec Merge branch 'mbed' into dev 2014-07-30 14:37:05 +09:00
tmk a9f5f201ad Add checksum tool for NXP LPC 2014-07-30 14:07:43 +09:00
tmk b4a91ecf4e Add LED indicator support in mbed 2014-07-30 14:07:43 +09:00
tmk 4c8e0fd0bd Port ps2_usb to mbed 2014-07-30 14:07:43 +09:00
tmk 80c3ff5fa0 Fix build files for mbed 2014-07-30 14:07:43 +09:00
tmk e81c70149e Fix common files for mbed 2014-07-30 14:07:43 +09:00
tmk ee70fe59ee Fix debug.h and remove debug_config.h 2014-07-30 14:07:43 +09:00
tmk c67ae2a6b5 Port action_* to mbed 2014-07-30 14:07:43 +09:00
tmk 04fe78ee0a Fix print and timer 2014-07-30 14:07:43 +09:00
tmk 867f115bee Port timer to mbed 2014-07-30 14:07:43 +09:00
tmk f15b2691c9 Add keyboard/mbed_onekey 2014-07-30 14:07:43 +09:00
Robin Haberkorn 03fd4a6ff0 updated copyrights: serial_mouse.h, serial_mouse_microsoft.c and serial_mouse_mousesystems.c are new 2014-07-27 17:58:41 +02:00
Robin Haberkorn eb90284494 serial_mouse: simplified clipping of X/Y/V/H changes below -127 using a MAX macro 2014-07-27 17:38:32 +02:00
Robin Haberkorn 0bfba7acc4 factored out serial_mouse_init() into serial_mouse.h 2014-07-27 17:38:31 +02:00
Robin Haberkorn 7dde35d4f7 integrated serial mouse drivers as a feature into the firmware architecture
* can be enabled by defining Makefile macro SERIAL_MOUSE_MICROSOFT_ENABLE or
   SERIAL_MOUSE_MOUSESYSTEMS_ENABLE.
 * Serial implementation can be chosen via SERIAL_MOUSE_USE_SOFT and
   SERIAL_MOUSE_USE_UART macros
 * UART configuration still has to be done in config.h: I added working clauses
   for both mouse protocols to ps2_usb's config.h
2014-07-27 17:38:31 +02:00
Robin Haberkorn 388fe60c67 fixed PS/2 keyboard converter config
When using the PS/2 interrupt implementation, the DATA pin should be
PD0 as the documentation (README.md) states.
2014-07-27 16:26:38 +02:00
Robin Haberkorn 6bf8000e63 added serial mouse driver for Microsoft and Mousesystems mice
* Both drivers use the interface defined in serial_mouse.h
 * They should work with any UART implementation (hardware/software UART)
 * The Microsoft driver is currently untested.
   The Mousesystems driver is confirmed to work.
2014-07-27 16:23:23 +02:00
tmk 79840c678e Just ignore ADB Service Request
- to support Adjustable keyboard(composite device?)
2014-07-21 18:17:52 +09:00
tmk 31b3e4bc38 Fix 'debug-off' target of hhkb to remove 'print' 2014-07-20 00:37:49 +09:00
tmk 32997200f7 Fix NKRO code when NKRO is disable 2014-07-20 00:31:40 +09:00
tmk 452866319b Fix READEM of hhkb and doc/build.md 2014-07-10 15:28:36 +09:00
tmk 92004d6786 Fix document on HHKB internal 2014-07-09 16:33:40 +09:00
tmk 6013483050 Add HHKB JP support
- scan matrix about twice faster
2014-07-09 15:31:52 +09:00
tmk 34373185b7 Merge pull request #124 from kairyu/6kro
USB 6KRO with pseudo- or half- NKRO feature
2014-07-07 12:46:12 +09:00
tmk 3eeb0a9623 Merge pull request #112 from shayneholmes/ee_nkro_use_reserved_bit
Adding NKRO virtual dip-switch, using existing bit in keymap byte.
2014-07-07 12:01:01 +09:00
tmk 326e559719 Merge pull request #125 from tibounise/patch-1
Fixing typo
2014-07-07 11:14:44 +09:00
tmk 7079ba5d51 Merge pull request #126 from xauser/master
Added support for bpiphany's Kitten Paw controller
2014-07-07 11:13:31 +09:00
Ralf Schmitt a70acecb1c Added support for bpiphany's Kitten Paw controller (Costar Majestouch) 2014-06-27 13:04:23 +02:00
tmk 9c8d0f6c0d Change keymaps of M0110 2014-06-22 14:15:38 +09:00
TiBounise 91b65c0a54 Fixing typo 2014-06-20 18:43:57 +02:00
tmk 30bbfe92b3 Updated FAQ (markdown) 2014-06-19 21:14:25 -07:00
tmk 3c446334e9 Updated FAQ (markdown) 2014-06-19 21:12:04 -07:00
tmk 382eaebd3d Fix debug print of ps2_mouse 2014-06-15 14:04:16 +09:00
tmk aad92d81cb Fix keymap of ps2_usb 2014-06-12 17:33:02 +09:00
tmk 9fdb02017b Add Ctrl + Up(SpaceFN) -> PgUp 2014-06-12 17:23:02 +09:00
tmk caf7b4e68a Make keymap_hhkb as default and change keymap_hasu 2014-06-12 17:19:58 +09:00
tmk ed8cf12d25 Add ISO keymap(issue #35) and use new keymap API 2014-05-21 02:43:19 +09:00
tmk 520ddc19a1 Updated FAQ (markdown) 2014-05-19 18:39:29 -07:00
tmk f1ed69fa7b Updated FAQ (markdown) 2014-05-19 18:38:09 -07:00
tmk b828fff788 Updated FAQ (markdown) 2014-05-16 16:26:25 -07:00
tmk 7fad7ddb0b Updated FAQ (markdown) 2014-05-14 12:38:02 -07:00
Kai Ryu ac570686b6 New branch for 6KRO feature 2014-05-13 14:57:13 +09:00
tmk ea13eaf1c0 Updated FAQ (markdown) 2014-05-12 17:56:34 -07:00
tmk 50a763a460 Updated FAQ (markdown) 2014-05-12 17:56:12 -07:00
tmk fa9ce5771f Updated FAQ (markdown) 2014-04-30 20:45:43 -07:00
tmk abe5edcaa7 Fix set LED for NKRO keyboard interface 2014-04-29 19:46:37 +09:00
tmk b03717a10c Unused endpoint of console OUT is commentout'd 2014-04-29 19:45:01 +09:00
tmk 7209c1d387 Add Makefiles for TMK converters. 2014-04-29 19:43:25 +09:00
tmk 110eea578b Fix remotewakeup of PJRC stack(Fix #121)
- without this fix wakeup often fails
- keyboard can wakeup once or twice but fails after that
2014-04-28 16:41:35 +09:00
tmk 37cf260764 Check if LUFA-git really exists(Fix #118) 2014-04-28 08:55:07 +09:00
tmk 22854eb71b NKRO is disable when SET_PROTOCOL(boot)
- Command can force to enable NKRO even when boot mode
- After boot keyboard may be in boot mode due to BIOS' request
2014-04-27 05:36:41 +09:00
tmk b1a827aaa6 Updated FAQ (markdown) 2014-04-26 12:53:55 -07:00
tmk 5e3f2d2b2e Make NKRO deafult when it is available
- NKRO is used only when keyboard_protocol = 1(report)
2014-04-27 04:16:49 +09:00
tmk 62d5ca9b81 Updated Projects (markdown) 2014-04-25 21:13:36 -07:00
tmk 2dbd047aa5 Updated Home (markdown) 2014-04-25 20:38:27 -07:00
tmk 9893fac5c5 Created Projects (markdown) 2014-04-25 20:37:46 -07:00
tmk 62117e7ea7 Change MCU setting to ATmega32U2 2014-04-25 15:26:11 +09:00
tmk 2db27ecedd Fix description of pin usage 2014-04-25 15:16:12 +09:00
tmk fc3a20c534 Add LUFA git repository(release 140302) 2014-04-25 13:39:35 +09:00
tmk ad4cba172b Move macro definitions from lufa.c to lufa.h 2014-04-25 12:19:14 +09:00
tmk 00e9a342df Fix 'Shift Parentheses' example 2014-04-25 11:47:02 +09:00
tmk 3c5add5f80 Change LUFA build options 2014-04-24 11:26:06 +09:00
tmk 22d1aeb409 Updated FAQ (markdown) 2014-04-21 18:11:45 -07:00
tmk 6fc76b224b Updated FAQ (markdown) 2014-04-21 18:10:48 -07:00
tmk a5d4a1f3e1 Return when ready check loop is timeouted(Fix #115) 2014-04-22 01:37:32 +09:00
tmk c6902681e7 Change PollingIntervalMS to 10ms(Fix #114) 2014-04-21 12:18:12 +09:00
tmk 7963233140 Updated FAQ (markdown) 2014-04-14 16:16:06 -07:00
tmk 0f34b9fd44 Updated FAQ (markdown) 2014-04-14 15:31:02 -07:00
tmk d3388d3468 Updated FAQ (markdown) 2014-04-11 19:32:25 -07:00
tmk cecb912e53 Updated Compatible Microcontrollers (markdown) 2014-04-10 19:14:41 -07:00
Shayne Holmes e5bafff725 Adding NKRO virtual dip-switch, using existing bit in keymap byte.
This takes the last, reserved bit there, but doesn't necessitate
a revision to the magic number because it doesn't alter byte order.
Add reference to NKRO virtual dip-switch to documentation.
2014-04-09 15:54:16 -07:00
tmk 894a387d1f Merge pull request #110 from xauser/master
Enhanced Backlight Support
2014-04-09 10:02:53 +09:00
Ralf Schmitt 589d99b448 New macro: ACTION_BACKLIGHT_LEVEL(level)
To have full control of the backlight level.
2014-04-08 21:02:46 +02:00
tmk 5c63751790 Merge pull request #106 from CJNE/patch-1
Show correct function name for default layer set
2014-03-28 09:22:42 +09:00
Johan Isacsson 13fbab9d8b Show correct function name for default layer set 2014-03-27 23:59:25 +01:00
tmk 2f0837bd6e Updated FAQ (markdown) 2014-03-25 08:01:56 -07:00
tmk 0e03275c40 Updated FAQ (markdown) 2014-03-25 08:01:30 -07:00
tmk ae74a81356 Updated FAQ (markdown) 2014-03-25 08:00:41 -07:00
tmk 43669fb270 Updated FAQ (markdown) 2014-03-24 17:01:43 -07:00
tmk 1722e04e73 Merge pull request #102 from xauser/master
Support for Lightsaber keyboard
2014-03-24 10:45:46 +09:00
Ralf Schmitt 1482fe92a0 Added Lightsaber FN-layer 2014-03-22 13:13:37 +01:00
Ralf Schmitt 498ea75d1b Lightsaber clean ups 2014-03-22 12:41:45 +01:00
Ralf Schmitt 526d988a0c Added basic led+backlight support 2014-03-19 23:58:08 +01:00
Ralf Schmitt 160678a7b8 Updated Lightsaber read me 2014-03-19 00:21:45 +01:00
Ralf Schmitt 5ca3bde10a Support for Lightsaber keyboard 2014-03-19 00:15:56 +01:00
tmk 01a218f36b Updated FAQ (markdown) 2014-03-16 13:39:50 -07:00
tmk 5383d37925 Updated FAQ (markdown) 2014-03-06 17:07:50 -08:00
tmk 10932b8f90 Updated FAQ (markdown) 2014-03-06 17:07:06 -08:00
tmk a25df9432b Updated FAQ (markdown) 2014-03-06 17:04:09 -08:00
tmk bf6d2b5ebd Updated FAQ (markdown) 2014-03-03 17:20:54 -08:00
tmk 700a77a0f3 Updated FAQ (markdown) 2014-03-03 17:17:50 -08:00
tmk 4464a288a1 Updated FAQ (markdown) 2014-03-03 17:16:27 -08:00
tmk f893628865 Updated FAQ (markdown) 2014-03-03 15:17:00 -08:00
tmk ab4f24a16a Updated FAQ (markdown) 2014-03-03 15:08:02 -08:00
tmk fb94b97e48 Updated FAQ (markdown) 2014-03-02 22:16:28 -08:00
tmk e7069410ff Updated FAQ (markdown) 2014-03-01 12:53:20 -08:00
tmk cd7cba54fe Updated FAQ (markdown) 2014-03-01 12:34:51 -08:00
tmk ef9902f5ed Updated FAQ (markdown) 2014-03-01 12:13:29 -08:00
tmk 51e37dc5cd Updated FAQ (markdown) 2014-03-01 12:12:59 -08:00
tmk 81055457fa Updated FAQ (markdown) 2014-02-28 18:09:22 -08:00
tmk 5e2f882230 Updated FAQ (markdown) 2014-02-28 18:07:46 -08:00
tmk 50fc1a5a5b Updated FAQ (markdown) 2014-02-28 17:44:30 -08:00
tmk 7a8e9cc136 Created FAQ (markdown) 2014-02-28 17:42:00 -08:00
tmk 1a0be5e750 Updated Home (markdown) 2014-02-28 17:23:32 -08:00
tmk 7474e14d06 Fix markdown syntax 2014-02-17 16:57:02 +09:00
tmk a03a197fe2 Merge branch 'ibm4704' 2014-02-17 16:43:19 +09:00
tmk 48d27378f4 Fix README.md and ibm4704.txt 2014-02-17 16:42:43 +09:00
tmk 01f02e8457 Change IS_COMMAND macro 2014-02-17 16:41:40 +09:00
tmk 188ab49dd3 Merge branch 'ibm4704' 2014-02-13 09:45:54 +09:00
tmk 428b236461 Add converter/ibm4704_usb 2014-02-13 09:45:02 +09:00
tmk 294aa396da Rename a file 2014-02-13 09:33:34 +09:00
tmk 776ccd3e67 Change keymap_plain.c 2014-02-11 01:55:49 +09:00
tmk 4ab0ebb199 Change pin configuration 2014-02-11 00:37:19 +09:00
tmk 47d812bfd6 Add connector pinouts 2014-02-10 23:49:57 +09:00
tmk 902afcc509 Add doc 4704.txt and protocol comment 2014-02-10 11:05:18 +09:00
tmk 0f827cf94c Add keymap_hasu.c 2014-02-10 10:01:42 +09:00
tmk 89c7b9b097 Add README.md 2014-02-10 07:02:48 +09:00
tmk 54a06c2520 Change error no and clean debug code 2014-02-10 06:46:43 +09:00
tmk c4efadf68a Tweak keyboard initialize 2014-02-09 08:25:23 +09:00
tmk ebe951a445 Add Initial files of 4704_usb 2014-02-09 02:42:17 +09:00
tmk cb3a547ebf Make modifiers 'weak' in macro 2014-01-28 10:55:51 +09:00
Thomas Russell Murphy 767690aa59 Adding link to the Compatible Microcontrollers list. 2014-01-25 18:11:37 -08:00
Thomas Russell Murphy 1f419424c4 Updated to confirm ATmega32U2 on a custom board. 2014-01-25 18:10:11 -08:00
Thomas Russell Murphy a86c1e2b71 Spellchecking keyboard README files. 2014-01-07 11:03:18 +09:00
Thomas Russell Murphy 3ee5f565ae Spellchecking converter README files. 2014-01-07 11:03:18 +09:00
tmk 6e9260cc17 Merge pull request #92 from bgould/upstream
Added NeXT keyboard converter
2014-01-06 17:57:30 -08:00
Benjamin Gould f7bb7c4fa9 Added NeXT keyboard converter 2014-01-06 17:07:10 -05:00
tmk a35cf0e458 Merge pull request #90 from thomasrussellmurphy/master
Spellcheck of README.md and Documentation
2014-01-02 21:10:16 -08:00
Thomas Russell Murphy e0a95d4075 Spellchecked documentation. 2014-01-02 19:05:52 -05:00
Thomas Russell Murphy 22bd315b64 Spellcheck of README.md 2014-01-02 18:37:20 -05:00
tmk 73ab537bfc Add TRS-80 model 100 instruction 2014-01-03 08:05:19 +09:00
tmk cb33e78126 Merge branch 'master' of github.com:tmk/tmk_keyboard 2014-01-03 07:10:53 +09:00
tmk 92cda14f7a Add ascii_usb ASCII Serial Console terminal converter 2014-01-03 07:07:42 +09:00
tmk dcfae0beb5 Merge pull request #88 from sigma/sun_usb_fixes
Sun usb fixes
2013-12-28 03:08:11 -08:00
Yann Hodique 8e9498f066 fix hard-coded keys
values provided to macro were not used for the "K61,K49,K33, K30" block
2013-12-26 21:52:58 -08:00
Yann Hodique 8fc26a1360 fix compilation 2013-12-26 21:16:27 -08:00
tmk 37bf34d5b1 Merge pull request #86 from tibounise/master
Fixing a typo
2013-12-16 16:02:08 -08:00
TiBounise 696a7fbc6f Fixing a typo 2013-12-16 19:53:02 +01:00
tmk ac1acca8d7 Add description of keyboard report in report.h 2013-12-16 21:56:44 +09:00
tmk c9dee36e42 Make ps2_usart default and fix SpaceFN 2013-12-02 12:04:50 +09:00
tmk 0b917d4f10 Fix README.md of hhkb 2013-11-30 12:33:32 +09:00
tmk 6d76e60095 Merge branch 'hhkb_spaceFN' 2013-11-30 12:04:39 +09:00
tmk 119c34e094 Add SpaceFN layout for HHKB 2013-11-30 12:03:19 +09:00
tmk e3bcdd8211 Add SpaceFN keymap and JIS keymap 2013-11-29 23:52:29 +09:00
tmk fd7833388c Add new keymap framework 2013-11-29 09:12:28 +09:00
tmk d2a83dae8f Merge pull request #80 from gblargg/master
Fixed handling of ADB event with key down and key up for same key all in...
2013-11-27 23:35:38 -08:00
tmk fd9ee507a5 Merge branch 'modstaptoggle' of git://github.com/simonmelhart/tmk_keyboard into simonmelhart-modstaptoggle
Conflicts:
	common/action_code.h
2013-11-28 16:31:06 +09:00
tmk f3132adb33 Merge pull request #81 from bgould/master
Add support for Adafruit's Bluefruit
2013-11-27 23:23:08 -08:00
tmk bc5b64d832 Merge branch 'ps2_keyboard_fix' 2013-11-28 16:02:29 +09:00
tmk 0b9c0f6012 Add new keymap file 2013-11-28 16:00:16 +09:00
tmk 10b2b1ae43 Fix key stack and PS/2 Overrun 2013-11-28 15:50:55 +09:00
tmk 8b4fa599cf Add included header file and fix debug print 2013-11-28 14:44:59 +09:00
tmk 05be3d85d1 Fix pin configuration of onekey for PS/2 mouse 2013-11-28 14:43:47 +09:00
tmk 4eb27ee890 Add ps2_interrupt.c 2013-11-28 14:20:00 +09:00
tmk 532e100450 Add ps2_usart.c and fix set_led at USB wake 2013-11-28 11:31:48 +09:00
Benjamin Gould f7db144959 changed tabs to spaces in bluefruit.c 2013-11-27 00:32:20 -05:00
Benjamin Gould 05792e2b83 Added bluefruit protocol and converter for 70% M 2013-11-27 00:24:57 -05:00
Shay Green 263c462656 Fixed handling of ADB event with key down and key up for same key all in one 2013-11-26 15:21:43 -06:00
tmk 9d26053f1c Fix ps2_host_recv_response 2013-11-26 14:31:57 +09:00
tmk 9ae9742ac5 Add ps2_busywait.c and recfactor PS/2 protocol 2013-11-25 17:43:26 +09:00
tmk d5ecbb83da Add printf macro as alias of xprintf 2013-11-25 17:39:45 +09:00
tmk 04c9501574 Fix Makfile and config.h for LUFA in ps2_usb 2013-11-25 11:25:44 +09:00
Simon Melhart a6afa845b9 Add tap toggle modifiers
Including documentation.
2013-11-20 09:21:33 -08:00
tmk 444e7cc53b Updated Compatible Microcontrollers (markdown) 2013-11-17 16:39:10 -08:00
Thomas Russell Murphy f427a6c6d8 Created page. Initial list is the ATmega32U4 from the Teensy. 2013-11-17 11:47:36 -08:00
tmk b0365c7ac3 Initial Commit 2012-05-13 18:36:16 -07:00
6317 changed files with 788574 additions and 90941 deletions
+24
View File
@@ -0,0 +1,24 @@
-I.
-I./drivers
-I./drivers/avr
-I./keyboards/ergodox_ez
-I./keyboards/ergodox_ez/keymaps/vim
-I./lib
-I./lib/lufa
-I./quantum
-I./quantum/api
-I./quantum/audio
-I./quantum/keymap_extras
-I./quantum/process_keycode
-I./quantum/serial_link
-I./quantum/template
-I./quantum/tools
-I./quantum/visualizer
-I./tmk_core
-I./tmk_core/common
-I./tmk_core/common/debug.h
-I./tmk_core/protocol
-I./tmk_core/protocol/lufa
-I./util
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
+36
View File
@@ -0,0 +1,36 @@
# EditorConfig helps developers define and maintain consistent coding styles between different editors and IDEs
# editorconfig.org
root = true
[*]
indent_style = space
indent_size = 2
# We recommend you to keep these unchanged
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
[*.md]
trim_trailing_whitespace = false
indent_size = 4
# Make these match what we have in .gitattributes
[*.mk]
end_of_line = lf
[Makefile]
end_of_line = lf
[*.sh]
end_of_line = lf
# The gitattributes file will handle the line endings conversion properly according to the operating system settings for other files
# We don't have gitattributes properly for these
# So if the user have for example core.autocrlf set to true
# the line endings would be wrong.
[lib/**]
end_of_line = unset
+94
View File
@@ -0,0 +1,94 @@
# auto for anything unspecified
* text=auto
# sources
*.c text
*.cc text
*.cxx text
*.cpp text
*.c++ text
*.hpp text
*.h text
*.h++ text
*.hh text
*.bat text
*.coffee text
*.css text
*.htm text
*.html text
*.inc text
*.ini text
*.js text
*.jsx text
*.json text
*.less text
*.php text
*.pl text
*.py text
*.rb text
*.sass text
*.scm text
*.scss text
*.sh text
*.sql text
*.styl text
*.ts text
*.xml text
*.xhtml text
# make files (need to always use lf for compatibility with Windows 10 bash)
Makefile eol=lf
*.mk eol=lf
# make files (need to always use lf for compatibility with Windows 10 bash)
*.sh eol=lf
# documentation
*.markdown text
*.md text
*.mdwn text
*.mdown text
*.mkd text
*.mkdn text
*.mdtxt text
*.mdtext text
*.txt text
AUTHORS text
CHANGELOG text
CHANGES text
CONTRIBUTING text
COPYING text
INSTALL text
license text
LICENSE text
NEWS text
readme text
*README* text
TODO text
GRAPHICS
*.ai binary
*.bmp binary
*.eps binary
*.gif binary
*.ico binary
*.jng binary
*.jp2 binary
*.jpg binary
*.jpeg binary
*.jpx binary
*.jxr binary
*.pdf binary
*.png binary
*.psb binary
*.psd binary
*.svg text
*.svgz binary
*.tif binary
*.tiff binary
*.wbmp binary
*.webp binary
# hex files
*.hex binary
*.eep binary
+59
View File
@@ -1,10 +1,69 @@
.dep .dep
*.o *.o
*.bin
*.eep *.eep
*.elf *.elf
*.hex *.hex
*.qmk
!util/bootloader.hex
!quantum/tools/eeprom_reset.hex
*.log
*.lss *.lss
*.lst *.lst
*.map *.map
*.sym *.sym
*.swp
tags tags
*~
build/
.build/
*.bak
.vagrant/
quantum/version.h
.idea/
CMakeLists.txt
cmake-build-debug
doxygen/
.DS_STORE
/util/wsl_downloaded
/util/win_downloaded
/keyboards/*/Makefile
/keyboards/*/*/Makefile
/keyboards/*/*/*/Makefile
/keyboards/*/*/*/*/Makefile
/keyboards/*/*/*/*/*/Makefile
/keyboards/*/keymaps/Makefile
/keyboards/*/*/keymaps/Makefile
/keyboards/*/*/*/keymaps/Makefile
/keyboards/*/*/*/*/keymaps/Makefile
/keyboards/*/*/*/*/*/keymaps/Makefile
# Eclipse/PyCharm/Other IDE Settings
.cproject
.project
.settings/
.idea
.browse.VC.db*
*.stackdump
util/Win_Check_Output.txt
# Let these ones be user specific, since we have so many different configurations
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/tasks.json
.vscode/last.sql
.vscode/temp.sql
.stfolder
.tags
# ignore image files
*.png
*.jpg
*.gif
# Do not ignore MiniDox left/right hand eeprom files
!keyboards/minidox/*.eep
# things travis sees
secrets.tar
id_rsa_*
/.vs
+13 -3
View File
@@ -1,3 +1,13 @@
[submodule "protocol/usb_hid/USB_Host_Shield_2.0"] [submodule "lib/chibios"]
path = protocol/usb_hid/USB_Host_Shield_2.0 path = lib/chibios
url = git@github.com:tmk/USB_Host_Shield_2.0.git url = https://github.com/qmk/ChibiOS
[submodule "lib/chibios-contrib"]
path = lib/chibios-contrib
url = https://github.com/qmk/ChibiOS-Contrib
branch = k-type-fix
[submodule "lib/ugfx"]
path = lib/ugfx
url = https://github.com/qmk/uGFX
[submodule "lib/googletest"]
path = lib/googletest
url = https://github.com/google/googletest
+44
View File
@@ -0,0 +1,44 @@
os: linux
dist: trusty
sudo: required
group: edge
language: c
branches:
except:
- /^.*-automated-build$/
- /^[0-9]+\.[0-9]+\.[0-9]+/
env:
global:
- secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
before_install:
- wget http://ww1.microchip.com/downloads/en/DeviceDoc/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
install:
- tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
- export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
- npm install -g moxygen
before_script:
- avr-gcc --version
script:
- make test:all AUTOGEN=false
- bash util/travis_build.sh
- bash util/travis_docs.sh
addons:
apt:
packages:
- dfu-programmer
- pandoc
- gcc-arm-none-eabi
- binutils-arm-none-eabi
- libnewlib-arm-none-eabi
- diffutils
- dos2unix
- doxygen
after_success:
bash util/travis_compiled_push.sh
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/afce403d65f143dfac09
on_success: always # options: [always|never|change] default: always
on_failure: always # options: [always|never|change] default: always
on_start: never # options: [always|never|change] default: always
+6
View File
@@ -0,0 +1,6 @@
// Suggested extensions
{
"recommendations": [
"EditorConfig.EditorConfig"
]
}
+16
View File
@@ -0,0 +1,16 @@
// Place your settings in this file to overwrite default and user settings.
{
// Unofficially, QMK uses spaces for indentation
"editor.insertSpaces": true,
// Configure glob patterns for excluding files and folders.
"files.exclude": {
"**/.build": true,
"**/*.hex": true
},
"files.associations": {
"*.h": "c",
"*.c": "c",
"*.cpp": "cpp",
"*.hpp": "cpp"
}
}
+15
View File
@@ -0,0 +1,15 @@
# Code Of Conduct
QMK strives to be an inclusive and tolerant community. We welcome participation from anyone regardless of age, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, political belief, race, religion, or sexual identity and orientation.
> “A gentle word turns away wrath, but a harsh word stirs up anger.”
Our users, contributors, and collaborators are expected to treat each other with respect, to assume good intentions, and to gently correct, where possible, rather than react with escalation. Some examples of behavior we will not tolerate include, but is not limited to:
* The use of sexualized language or imagery
* Unwelcome advances, sexual or otherwise
* Insults or derogatory comments, or personal or political attacks
* Publishing others private information without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
If someone is violating this Code of Conduct you may email hello@qmk.fm to bring your concern to the Members. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident.
+28
View File
@@ -0,0 +1,28 @@
FROM debian:jessie
MAINTAINER Erik Dasque <erik@frenchguys.com>
RUN apt-get update && apt-get install --no-install-recommends -y build-essential \
gcc \
unzip \
wget \
zip \
gcc-avr \
binutils-avr \
avr-libc \
dfu-programmer \
dfu-util \
gcc-arm-none-eabi \
binutils-arm-none-eabi \
libnewlib-arm-none-eabi \
git \
software-properties-common \
avrdude \
&& rm -rf /var/lib/apt/lists/*
ENV keyboard=ergodox
ENV subproject=ez
ENV keymap=default
VOLUME /qmk
WORKDIR /qmk
CMD make clean ; make keyboard=${keyboard} subproject=${subproject} keymap=${keymap}
+266
View File
@@ -0,0 +1,266 @@
# Doxyfile 1.8.14
# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for qmk_firmware (github.com/qmk/qmk_firmware)
#
# All text after a double hash (##) is considered a comment and is placed in
# front of the TAG it is preceding.
#
# All text after a single hash (#) is considered a comment and will be ignored.
# The format is:
# TAG = value [value, ...]
# For lists, items can also be appended using:
# TAG += value [value, ...]
# Values that contain spaces should be placed between quotes (\" \").
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
DOXYFILE_ENCODING = UTF-8
PROJECT_NAME = "QMK Firmware"
PROJECT_NUMBER = https://github.com/qmk/qmk_firmware
PROJECT_BRIEF = "Keyboard controller firmware for Atmel AVR and ARM USB families"
OUTPUT_DIRECTORY = doxygen
ALLOW_UNICODE_NAMES = NO
OUTPUT_LANGUAGE = English
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
ABBREVIATE_BRIEF = "The $name class" \
"The $name widget" \
"The $name file" \
is \
provides \
specifies \
contains \
represents \
a \
an \
the
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
FULL_PATH_NAMES = YES
STRIP_FROM_PATH =
STRIP_FROM_INC_PATH =
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 4
ALIASES =
TCL_SUBST =
OPTIMIZE_OUTPUT_FOR_C = YES
OPTIMIZE_OUTPUT_JAVA = NO
OPTIMIZE_FOR_FORTRAN = NO
OPTIMIZE_OUTPUT_VHDL = NO
EXTENSION_MAPPING =
MARKDOWN_SUPPORT = YES
TOC_INCLUDE_HEADINGS = 2
AUTOLINK_SUPPORT = YES
BUILTIN_STL_SUPPORT = NO
CPP_CLI_SUPPORT = NO
SIP_SUPPORT = NO
IDL_PROPERTY_SUPPORT = YES
DISTRIBUTE_GROUP_DOC = NO
GROUP_NESTED_COMPOUNDS = NO
SUBGROUPING = YES
INLINE_GROUPED_CLASSES = NO
INLINE_SIMPLE_STRUCTS = NO
TYPEDEF_HIDES_STRUCT = NO
LOOKUP_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
EXTRACT_ALL = NO
EXTRACT_PRIVATE = NO
EXTRACT_PACKAGE = NO
EXTRACT_STATIC = NO
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
EXTRACT_ANON_NSPACES = NO
HIDE_UNDOC_MEMBERS = NO
HIDE_UNDOC_CLASSES = NO
HIDE_FRIEND_COMPOUNDS = NO
HIDE_IN_BODY_DOCS = NO
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = NO
HIDE_SCOPE_NAMES = YES
HIDE_COMPOUND_REFERENCE= NO
SHOW_INCLUDE_FILES = YES
SHOW_GROUPED_MEMB_INC = NO
FORCE_LOCAL_INCLUDES = NO
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
SORT_BRIEF_DOCS = NO
SORT_MEMBERS_CTORS_1ST = NO
SORT_GROUP_NAMES = NO
SORT_BY_SCOPE_NAME = NO
STRICT_PROTO_MATCHING = NO
GENERATE_TODOLIST = YES
GENERATE_TESTLIST = YES
GENERATE_BUGLIST = YES
GENERATE_DEPRECATEDLIST= YES
ENABLED_SECTIONS =
MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
SHOW_FILES = YES
SHOW_NAMESPACES = YES
FILE_VERSION_FILTER =
LAYOUT_FILE =
CITE_BIB_FILES =
#---------------------------------------------------------------------------
# Configuration options related to warning and progress messages
#---------------------------------------------------------------------------
QUIET = NO
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_AS_ERROR = NO
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE =
#---------------------------------------------------------------------------
# Configuration options related to the input files
#---------------------------------------------------------------------------
INPUT = tmk_core quantum drivers
INPUT_ENCODING = UTF-8
FILE_PATTERNS = *.c \
*.cc \
*.cxx \
*.cpp \
*.c++ \
*.h \
*.hh \
*.hxx \
*.hpp \
*.h++
RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS =
EXCLUDE_SYMBOLS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS = *
EXAMPLE_RECURSIVE = NO
IMAGE_PATH =
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
FILTER_SOURCE_PATTERNS =
USE_MDFILE_AS_MAINPAGE =
#---------------------------------------------------------------------------
# Configuration options related to source browsing
#---------------------------------------------------------------------------
SOURCE_BROWSER = YES
INLINE_SOURCES = NO
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = NO
REFERENCES_RELATION = NO
REFERENCES_LINK_SOURCE = YES
SOURCE_TOOLTIPS = YES
USE_HTAGS = NO
VERBATIM_HEADERS = YES
#---------------------------------------------------------------------------
# Configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 5
IGNORE_PREFIX =
#---------------------------------------------------------------------------
# Configuration options related to disabled outputs
#---------------------------------------------------------------------------
GENERATE_HTML = NO
GENERATE_LATEX = NO
GENERATE_RTF = NO
GENERATE_MAN = NO
GENERATE_DOCBOOK = NO
GENERATE_AUTOGEN_DEF = NO
GENERATE_PERLMOD = NO
#---------------------------------------------------------------------------
# Configuration options related to the XML output
#---------------------------------------------------------------------------
GENERATE_XML = YES
XML_OUTPUT = xml
XML_PROGRAMLISTING = YES
#---------------------------------------------------------------------------
# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = NO
EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
PREDEFINED =
EXPAND_AS_DEFINED =
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
# Configuration options related to external references
#---------------------------------------------------------------------------
TAGFILES =
GENERATE_TAGFILE =
ALLEXTERNALS = NO
EXTERNAL_GROUPS = YES
EXTERNAL_PAGES = YES
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
#---------------------------------------------------------------------------
CLASS_DIAGRAMS = YES
MSCGEN_PATH =
DIA_PATH =
HIDE_UNDOC_RELATIONS = YES
HAVE_DOT = NO
DOT_NUM_THREADS = 0
DOT_FONTNAME = Helvetica
DOT_FONTSIZE = 10
DOT_FONTPATH =
CLASS_GRAPH = YES
COLLABORATION_GRAPH = YES
GROUP_GRAPHS = YES
UML_LOOK = NO
UML_LIMIT_NUM_FIELDS = 10
TEMPLATE_RELATIONS = NO
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
CALL_GRAPH = NO
CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
DIRECTORY_GRAPH = YES
DOT_IMAGE_FORMAT = png
INTERACTIVE_SVG = NO
DOT_PATH =
DOTFILE_DIRS =
MSCFILE_DIRS =
DIAFILE_DIRS =
PLANTUML_JAR_PATH =
PLANTUML_CFG_FILE =
PLANTUML_INCLUDE_PATH =
DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 0
DOT_TRANSPARENT = NO
DOT_MULTI_TARGETS = NO
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
View File
+606
View File
@@ -0,0 +1,606 @@
ifndef VERBOSE
.SILENT:
endif
# Never run this makefile in parallel, as it could screw things up
# It won't affect the submakes, so you still get the speedup from specifying -jx
.NOTPARALLEL:
# Allow the silent with lower caps to work the same way as upper caps
ifdef silent
SILENT = $(silent)
endif
ifdef SILENT
SUB_IS_SILENT := $(SILENT)
endif
# We need to make sure that silent is always turned off at the top level
# Otherwise the [OK], [ERROR] and [WARN] messages won't be displayed correctly
override SILENT := false
ifndef SUB_IS_SILENT
QMK_VERSION := $(shell git describe --abbrev=0 --tags 2>/dev/null)
ifneq ($(QMK_VERSION),)
$(info QMK Firmware $(QMK_VERSION))
endif
endif
ON_ERROR := error_occurred=1
BREAK_ON_ERRORS = no
STARTING_MAKEFILE := $(firstword $(MAKEFILE_LIST))
ROOT_MAKEFILE := $(lastword $(MAKEFILE_LIST))
ROOT_DIR := $(dir $(ROOT_MAKEFILE))
ifeq ($(ROOT_DIR),)
ROOT_DIR := .
endif
ABS_STARTING_MAKEFILE := $(abspath $(STARTING_MAKEFILE))
ABS_ROOT_MAKEFILE := $(abspath $(ROOT_MAKEFILE))
ABS_STARTING_DIR := $(dir $(ABS_STARTING_MAKEFILE))
ABS_ROOT_DIR := $(dir $(ABS_ROOT_MAKEFILE))
STARTING_DIR := $(subst $(ABS_ROOT_DIR),,$(ABS_STARTING_DIR))
BUILD_DIR := $(ROOT_DIR)/.build
TEST_DIR := $(BUILD_DIR)/test
ERROR_FILE := $(BUILD_DIR)/error_occurred
MAKEFILE_INCLUDED=yes
# Helper function to process the newt element of a space separated path
# It works a bit like the traditional functional head tail
# so the CURRENT_PATH_ELEMENT will become the new head
# and the PATH_ELEMENTS are the rest that are still unprocessed
define NEXT_PATH_ELEMENT
$$(eval CURRENT_PATH_ELEMENT := $$(firstword $$(PATH_ELEMENTS)))
$$(eval PATH_ELEMENTS := $$(wordlist 2,9999,$$(PATH_ELEMENTS)))
endef
# We change the / to spaces so that we more easily can work with the elements
# separately
PATH_ELEMENTS := $(subst /, ,$(STARTING_DIR))
# Initialize the path elements list for further processing
$(eval $(call NEXT_PATH_ELEMENT))
# This function sets the KEYBOARD; KEYMAP and SUBPROJECT to the correct
# variables depending on which directory you stand in.
# It's really a very simple if else chain, if you squint enough,
# but the makefile syntax makes it very verbose.
# If we are in a subfolder of keyboards
#
# *** No longer needed **
#
# ifeq ($(CURRENT_PATH_ELEMENT),keyboards)
# $(eval $(call NEXT_PATH_ELEMENT))
# KEYBOARD := $(CURRENT_PATH_ELEMENT)
# $(eval $(call NEXT_PATH_ELEMENT))
# # If we are in a subfolder of keymaps, or in other words in a keymap
# # folder
# ifeq ($(CURRENT_PATH_ELEMENT),keymaps)
# $(eval $(call NEXT_PATH_ELEMENT))
# KEYMAP := $(CURRENT_PATH_ELEMENT)
# # else if we are not in the keyboard folder itself
# else ifneq ($(CURRENT_PATH_ELEMENT),)
# # the we can assume it's a subproject, as no other folders
# # should have make files in them
# SUBPROJECT := $(CURRENT_PATH_ELEMENT)
# $(eval $(call NEXT_PATH_ELEMENT))
# # if we are inside a keymap folder of a subproject
# ifeq ($(CURRENT_PATH_ELEMENT),keymaps)
# $(eval $(call NEXT_PATH_ELEMENT))
# KEYMAP := $(CURRENT_PATH_ELEMENT)
# endif
# endif
# endif
define GET_KEYBOARDS
All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))
All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/rules.mk))
All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/rules.mk))
KEYMAPS_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/keymaps/*/rules.mk))
KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/keymaps/*/rules.mk))
KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/keymaps/*/rules.mk))
KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk))
KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK)))
endef
$(eval $(call GET_KEYBOARDS))
# Only consider folders with makefiles, to prevent errors in case there are extra folders
#KEYBOARDS += $(patsubst $(ROOD_DIR)/keyboards/%/rules.mk,%,$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
list-keyboards:
echo $(KEYBOARDS)
exit 0
define PRINT_KEYBOARD
$(info $(PRINTING_KEYBOARD))
endef
generate-keyboards-file:
$(foreach PRINTING_KEYBOARD,$(KEYBOARDS),$(eval $(call PRINT_KEYBOARD)))
exit 0
clean:
echo -n 'Deleting .build ... '
rm -rf $(BUILD_DIR)
echo 'done'
exit 0
#Compatibility with the old make variables, anything you specify directly on the command line
# always overrides the detected folders
ifdef keyboard
KEYBOARD := $(keyboard)
endif
ifdef keymap
KEYMAP := $(keymap)
endif
# Uncomment these for debugging
# $(info Keyboard: $(KEYBOARD))
# $(info Keymap: $(KEYMAP))
# $(info Subproject: $(SUBPROJECT))
# $(info Keyboards: $(KEYBOARDS))
# Set the default goal depending on where we are running make from
# this handles the case where you run make without any arguments
.DEFAULT_GOAL := all:all
ifneq ($(KEYMAP),)
.DEFAULT_GOAL := $(KEYBOARD):$(KEYMAP)
else ifneq ($(KEYBOARD),)
# Inside a keyboard folder, build all keymaps for all subprojects
# Note that this is different from the old behaviour, which would
# build only the default keymap of the default keyboard
.DEFAULT_GOAL := $(KEYBOARD):all
endif
# Compare the start of the RULE variable with the first argument($1)
# If the rules equals $1 or starts with $1:, RULE_FOUND is set to true
# and $1 is removed from the RULE variable
# Otherwise the RULE_FOUND variable is set to false, and RULE left as it was
# The function is a bit tricky, since there's no built in $(startswith) function
define COMPARE_AND_REMOVE_FROM_RULE_HELPER
ifeq ($1,$$(RULE))
RULE:=
RULE_FOUND := true
else
STARTCOLON_REMOVED=$$(subst START$1:,,START$$(RULE))
ifneq ($$(STARTCOLON_REMOVED),START$$(RULE))
RULE_FOUND := true
RULE := $$(STARTCOLON_REMOVED)
else
RULE_FOUND := false
endif
endif
endef
# This makes it easier to call COMPARE_AND_REMOVE_FROM_RULE, since it makes it behave like
# a function that returns the value
COMPARE_AND_REMOVE_FROM_RULE = $(eval $(call COMPARE_AND_REMOVE_FROM_RULE_HELPER,$1))$(RULE_FOUND)
# Recursively try to find a match for the start of the rule to be checked
# $1 The list to be checked
# If a match is found, then RULE_FOUND is set to true
# and MATCHED_ITEM to the item that was matched
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER3
ifneq ($1,)
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,$$(firstword $1)),true)
MATCHED_ITEM := $$(firstword $1)
else
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$$(wordlist 2,9999,$1)))
endif
endif
endef
# A recursive helper function for finding the longest match
# $1 The list to be checked
# It works by always removing the currently matched item from the list
# and call itself recursively, until a match is found
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER2
# Stop the recursion when the list is empty
ifneq ($1,)
RULE_BEFORE := $$(RULE)
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER3,$1))
# If a match is found in the current list, otherwise just return what we had before
ifeq ($$(RULE_FOUND),true)
# Save the best match so far and call itself recursively
BEST_MATCH := $$(MATCHED_ITEM)
BEST_MATCH_RULE := $$(RULE)
RULE_FOUND := false
RULE := $$(RULE_BEFORE)
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$$(filter-out $$(MATCHED_ITEM),$1)))
endif
endif
endef
# Recursively try to find the longest match for the start of the rule to be checked
# $1 The list to be checked
# If a match is found, then RULE_FOUND is set to true
# and MATCHED_ITEM to the item that was matched
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER
BEST_MATCH :=
$$(eval $$(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER2,$1))
ifneq ($$(BEST_MATCH),)
RULE_FOUND := true
RULE := $$(BEST_MATCH_RULE)
MATCHED_ITEM := $$(BEST_MATCH)
else
RULE_FOUND := false
MATCHED_ITEM :=
endif
endef
# Make it easier to call TRY_TO_MATCH_RULE_FROM_LIST
TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND)
define ALL_IN_LIST_LOOP
OLD_RULE$1 := $$(RULE)
$$(eval $$(call $1,$$(ITEM$1)))
RULE := $$(OLD_RULE$1)
endef
define PARSE_ALL_IN_LIST
$$(foreach ITEM$1,$2,$$(eval $$(call ALL_IN_LIST_LOOP,$1)))
endef
# The entry point for rule parsing
# parses a rule in the format <keyboard>:<keymap>:<target>
# but this particular function only deals with the first <keyboard> part
define PARSE_RULE
RULE := $1
COMMANDS :=
# If the rule starts with all, then continue the parsing from
# PARSE_ALL_KEYBOARDS
ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
$$(eval $$(call PARSE_ALL_KEYBOARDS))
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true)
$$(eval $$(call PARSE_TEST))
# If the rule starts with the name of a known keyboard, then continue
# the parsing from PARSE_KEYBOARD
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
$$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
# Otherwise use the KEYBOARD variable, which is determined either by
# the current directory you run make from, or passed in as an argument
else ifneq ($$(KEYBOARD),)
$$(eval $$(call PARSE_KEYBOARD,$$(KEYBOARD)))
else
$$(info make: *** No rule to make target '$1'. Stop.)
$$(info |)
$$(info | QMK's make format recently changed to use folder locations and colons:)
$$(info | make project_folder:keymap[:target])
$$(info | Examples:)
$$(info | make planck/rev4:default:dfu)
$$(info | make planck:default)
$$(info |)
endif
endef
# $1 = Keyboard
# Parses a rule in the format <keymap>:<target>
# the keyboard is already known when entering this function
define PARSE_KEYBOARD
# If we want to compile the default subproject, then we need to
# include the correct makefile to determine the actual name of it
CURRENT_KB := $1
# KEYBOARD_FOLDERS := $$(subst /, , $(CURRENT_KB))
DEFAULT_FOLDER := $$(CURRENT_KB)
# We assume that every rules.mk will contain the full default value
$$(eval include $(ROOT_DIR)/keyboards/$$(CURRENT_KB)/rules.mk)
ifneq ($$(DEFAULT_FOLDER),$$(CURRENT_KB))
$$(eval include $(ROOT_DIR)/keyboards/$$(DEFAULT_FOLDER)/rules.mk)
endif
CURRENT_KB := $$(DEFAULT_FOLDER)
# 5/4/3/2/1
KEYBOARD_FOLDER_PATH_1 := $$(CURRENT_KB)
KEYBOARD_FOLDER_PATH_2 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_1)))
KEYBOARD_FOLDER_PATH_3 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_2)))
KEYBOARD_FOLDER_PATH_4 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_3)))
KEYBOARD_FOLDER_PATH_5 := $$(patsubst %/,%,$$(dir $$(KEYBOARD_FOLDER_PATH_4)))
KEYBOARD_FOLDER_1 := $$(notdir $$(KEYBOARD_FOLDER_PATH_1))
KEYBOARD_FOLDER_2 := $$(notdir $$(KEYBOARD_FOLDER_PATH_2))
KEYBOARD_FOLDER_3 := $$(notdir $$(KEYBOARD_FOLDER_PATH_3))
KEYBOARD_FOLDER_4 := $$(notdir $$(KEYBOARD_FOLDER_PATH_4))
KEYBOARD_FOLDER_5 := $$(notdir $$(KEYBOARD_FOLDER_PATH_5))
KEYMAPS :=
# get a list of all keymaps
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_1)/keymaps/*/.)))
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_2)/keymaps/*/.)))
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
# this might be needed, but in a different form
#KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \
$$(KEYBOARD_FOLDER_3) $$(KEYBOARD_FOLDER_4) $$(KEYBOARD_FOLDER_5), $$(KEYMAPS)))
KEYBOARD_LAYOUTS :=
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_5)/rules.mk)","")
LAYOUTS :=
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_5)/rules.mk)
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
endif
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_4)/rules.mk)","")
LAYOUTS :=
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_4)/rules.mk)
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
endif
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_3)/rules.mk)","")
LAYOUTS :=
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_3)/rules.mk)
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
endif
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_2)/rules.mk)","")
LAYOUTS :=
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_2)/rules.mk)
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
endif
ifneq ("$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_1)/rules.mk)","")
LAYOUTS :=
$$(eval include $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_1)/rules.mk)
KEYBOARD_LAYOUTS := $$(sort $$(LAYOUTS) $$(KEYBOARD_LAYOUTS))
endif
LAYOUT_KEYMAPS :=
$$(foreach LAYOUT,$$(KEYBOARD_LAYOUTS),$$(eval LAYOUT_KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/layouts/*/$$(LAYOUT)/*/.)))))
KEYMAPS := $$(sort $$(KEYMAPS) $$(LAYOUT_KEYMAPS))
# if the rule after removing the start of it is empty (we haven't specified a kemap or target)
# compile all the keymaps
ifeq ($$(RULE),)
$$(eval $$(call PARSE_ALL_KEYMAPS))
# The same if all was specified
else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
$$(eval $$(call PARSE_ALL_KEYMAPS))
# Try to match the specified keyamp with the list of known keymaps
else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYMAPS)),true)
$$(eval $$(call PARSE_KEYMAP,$$(MATCHED_ITEM)))
# Otherwise try to match the keymap from the current folder, or arguments to the make command
else ifneq ($$(KEYMAP),)
$$(eval $$(call PARSE_KEYMAP,$$(KEYMAP)))
# Otherwise, make all keymaps, again this is consistent with how it works without
# any arguments
else
$$(eval $$(call PARSE_ALL_KEYMAPS))
endif
endef
# if we are going to compile all keyboards, match the rest of the rule
# for each of them
define PARSE_ALL_KEYBOARDS
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS)))
endef
# $1 Subproject
# When entering this, the keyboard and subproject are known, so now we need
# to determine which keymaps are going to get compiled
# define PARSE_SUBPROJECT
# endef
# If we want to parse all subprojects, but the keyboard doesn't have any,
# then use defaultsp instead
# define PARSE_ALL_SUBPROJECTS
# ifeq ($$(SUBPROJECTS),)
# $$(eval $$(call PARSE_SUBPROJECT,defaultsp))
# else
# $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_SUBPROJECT,$$(SUBPROJECTS)))
# endif
# endef
# $1 Keymap
# This is the meat of compiling a keyboard, when entering this, everything is known
# keyboard, subproject, and keymap
# Note that we are not directly calling the command here, but instead building a list,
# which will later be processed
define PARSE_KEYMAP
CURRENT_KM = $1
# The rest of the rule is the target
# Remove the leading ":" from the target, as it acts as a separator
MAKE_TARGET := $$(patsubst :%,%,$$(RULE))
# We need to generate an unique indentifer to append to the COMMANDS list
CURRENT_KB_UNDER := $$(subst /,_,$$(CURRENT_KB))
COMMAND := COMMAND_KEYBOARD_$$(CURRENT_KB_UNDER)_KEYMAP_$$(CURRENT_KM)
# If we are compiling a keyboard without a subproject, we want to display just the name
# of the keyboard, otherwise keyboard/subproject
KB_SP := $$(CURRENT_KB)
# Format it in bold
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
# Specify the variables that we are passing forward to submake
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM)
# And the first part of the make command
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
# The message to display
MAKE_MSG := $$(MSG_MAKE_KB)
# We run the command differently, depending on if we want more output or not
# The true version for silent output and the false version otherwise
$$(eval $$(call BUILD))
endef
define BUILD
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
COMMANDS += $$(COMMAND)
COMMAND_true_$$(COMMAND) := \
printf "$$(MAKE_MSG)" | \
$$(MAKE_MSG_FORMAT); \
LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \
if [ $$$$? -gt 0 ]; \
then $$(PRINT_ERROR_PLAIN); \
elif [ "$$$$LOG" != "" ] ; \
then $$(PRINT_WARNING_PLAIN); \
else \
$$(PRINT_OK); \
fi;
COMMAND_false_$$(COMMAND) := \
printf "$$(MAKE_MSG)\n\n"; \
$$(MAKE_CMD) $$(MAKE_VARS) SILENT=false; \
if [ $$$$? -gt 0 ]; \
then error_occurred=1; \
fi;
endef
# Just parse all the keymaps for a specific keyboard
define PARSE_ALL_KEYMAPS
$$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYMAP,$$(KEYMAPS)))
endef
define BUILD_TEST
TEST_NAME := $1
MAKE_TARGET := $2
COMMAND := $1
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)"
MAKE_MSG := $$(MSG_MAKE_TEST)
$$(eval $$(call BUILD))
ifneq ($$(MAKE_TARGET),clean)
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
TESTS += $$(TEST_NAME)
TEST_MSG := $$(MSG_TEST)
$$(TEST_NAME)_COMMAND := \
printf "$$(TEST_MSG)\n"; \
$$(TEST_EXECUTABLE); \
if [ $$$$? -gt 0 ]; \
then error_occurred=1; \
fi; \
printf "\n";
endif
endef
define PARSE_TEST
TESTS :=
TEST_NAME := $$(firstword $$(subst :, ,$$(RULE)))
TEST_TARGET := $$(subst $$(TEST_NAME),,$$(subst $$(TEST_NAME):,,$$(RULE)))
ifeq ($$(TEST_NAME),all)
MATCHED_TESTS := $$(TEST_LIST)
else
MATCHED_TESTS := $$(foreach TEST,$$(TEST_LIST),$$(if $$(findstring $$(TEST_NAME),$$(TEST)),$$(TEST),))
endif
$$(foreach TEST,$$(MATCHED_TESTS),$$(eval $$(call BUILD_TEST,$$(TEST),$$(TEST_TARGET))))
endef
# Set the silent mode depending on if we are trying to compile multiple keyboards or not
# By default it's on in that case, but it can be overridden by specifying silent=false
# from the command line
define SET_SILENT_MODE
ifdef SUB_IS_SILENT
SILENT_MODE := $(SUB_IS_SILENT)
else ifeq ($$(words $$(COMMANDS)),1)
SILENT_MODE := false
else
SILENT_MODE := true
endif
endef
include $(ROOT_DIR)/message.mk
ifeq ($(strip $(BREAK_ON_ERRORS)), yes)
HANDLE_ERROR = exit 1
else
HANDLE_ERROR = echo $$error_occurred > $(ERROR_FILE)
endif
# The empty line is important here, as it will force a new shell to be created for each command
# Otherwise the command line will become too long with a lot of keyboards and keymaps
define RUN_COMMAND
+error_occurred=0;\
$(COMMAND_$(SILENT_MODE)_$(COMMAND))\
if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi;
endef
define RUN_TEST
+error_occurred=0;\
$($(TEST)_COMMAND)\
if [ $$error_occurred -gt 0 ]; then $(HANDLE_ERROR); fi;
endef
# Let's match everything, we handle all the rule parsing ourselves
.PHONY: %
%:
# Check if we have the CMP tool installed
cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi;
# Check if the submodules are dirty, and display a warning if they are
ifndef SKIP_GIT
if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --init lib/chibios; fi
if [ ! -e lib/chibios-contrib ]; then git submodule sync lib/chibios-contrib && git submodule update --init lib/chibios-contrib; fi
if [ ! -e lib/ugfx ]; then git submodule sync lib/ugfx && git submodule update --init lib/ugfx; fi
git submodule status --recursive 2>/dev/null | \
while IFS= read -r x; do \
case "$$x" in \
\ *) ;; \
*) printf "$(MSG_SUBMODULE_DIRTY)";break;; \
esac \
done
endif
rm -f $(ERROR_FILE) > /dev/null 2>&1
$(eval $(call PARSE_RULE,$@))
$(eval $(call SET_SILENT_MODE))
# Run all the commands in the same shell, notice the + at the first line
# it has to be there to allow parallel execution of the submake
# This always tries to compile everything, even if error occurs in the middle
# But we return the error code at the end, to trigger travis failures
$(foreach COMMAND,$(COMMANDS),$(RUN_COMMAND))
if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
$(foreach TEST,$(TESTS),$(RUN_TEST))
if [ -f $(ERROR_FILE) ]; then printf "$(MSG_ERRORS)" & exit 1; fi;
# These no longer work because of the colon system
# All should compile everything
# .PHONY: all
# all: all-keyboards test-all
# Define some shortcuts, mostly for compatibility with the old syntax
# .PHONY: all-keyboards
# all-keyboards: all\:all\:all
# .PHONY: all-keyboards-defaults
# all-keyboards-defaults: all\:default
# .PHONY: test
# test: test-all
# .PHONY: test-clean
# test-clean: test-all-clean
lib/%:
git submodule sync $?
git submodule update --init $?
git-submodule:
git submodule sync --recursive
git submodule update --init --recursive
ifdef SKIP_VERSION
SKIP_GIT := yes
endif
# Generate the version.h file
ifndef SKIP_GIT
GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S")
else
GIT_VERSION := NA
endif
ifndef SKIP_VERSION
BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
$(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h)
$(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h)
else
BUILD_DATE := NA
endif
include $(ROOT_DIR)/testlist.mk
-274
View File
@@ -1,274 +0,0 @@
TMK Keyboard Firmware Collection
================================
This is a keyboard firmware with some useful features for Atmel AVR controller.
Source code is available here: <http://github.com/tmk/tmk_keyboard>
Features
--------
These features can be used in your keyboard.
* Multi-layer Keymap - Multiple keyboard layouts with layer switching
* Mouse key - Mouse control with keyboard
* System Control Key - Power Down, Sleep, Wake Up and USB Remote Wake up
* Media Control Key - Volume Down/Up, Mute, Next/Prev track, Play, Stop and etc
* USB NKRO - 120 keys(+ 8 modifiers) simultaneously
* PS/2 mouse support - PS/2 mouse(TrackPoint) as composite device
* Keyboard protocols - PS/2, ADB, M0110, Sun and other old keyboard protocols
* User Function - Customizable function of key with writing code
* Macro - Very primitive at this time
* Keyboard Tricks - Oneshot modifier and modifier with tapping feature
* Debug Console - Messages for debug and interaction with firmware
* Virtual DIP Switch - Configurations stored EEPROM(Boot Magic)
* Locking CapsLock - Mechanical switch support for CapsLock
* Breathing Sleep LED - Sleep indicator with charm during USB suspend
* Backlight - Control backlight levels
Projects
--------
You can find some keyboard specific projects under `converter` and `keyboard` directory.
### converter
* [ps2_usb](converter/ps2_usb/) - [PS/2 keyboard to USB][GH_ps2]
* [adb_usb](converter/adb_usb/) - [ADB keyboard to USB][GH_adb]
* [m0110_usb](converter/m0110_usb) - [Machintosh 128K/512K/Plus keyboard to USB][GH_m0110]
* [terminal_usb](converter/terminal_usb/) - [IBM Model M terminal keyboard(PS/2 scancode set3) to USB][GH_terminal]
* [news_usb](converter/news_usb/) - [Sony NEWS keyboard to USB][GH_news]
* [x68k_usb](converter/x68k_usb/) - [Sharp X68000 keyboard to USB][GH_x68k]
* [sun_usb](converter/sun_usb/) - [Sun] to USB(type4, 5 and 3?)
* [pc98_usb](converter/pc98_usb/) - [PC98] to USB
* [usb_usb](converter/usb_usb/) - USB to USB(experimental)
### keyboard
* [hhkb](keyboard/hhkb/) - [Happy Hacking Keyboard pro][GH_hhkb] **my main board**
* [gh60](keyboard/gh60/) - [GH60] DIY 60% keyboard [prototype][GH60_proto] **my second board**
* [hbkb](keyboard/hbkb/) - [Happy Buckling spring keyboard][GH_hbkb](IBM Model M 60% mod)
* [hid_liber](keyboard/hid_liber/) - [HID liberation][HID_liber] controller (by alaricljs)
* [phantom](keyboard/phantom/) - [Phantom] keyboard (by Tranquilite)
* [IIgs_Standard](keyboard/IIgs/) - Apple [IIGS] keyboard mod(by JeffreySung)
* [macway](keyboard/macway/) - [Compact keyboard mod][GH_macway] [retired]
* [KMAC](keyboard/kmac/) - Korean custom keyboard
[GH_macway]: http://geekhack.org/showwiki.php?title=Island:11930
[GH_hhkb]: http://geekhack.org/showwiki.php?title=Island:12047
[GH_ps2]: http://geekhack.org/showwiki.php?title=Island:14618
[GH_adb]: http://geekhack.org/showwiki.php?title=Island:14290
[GH_hhkb_bt]: http://geekhack.org/showwiki.php?title=Island:20851
[GH_m0110]: http://geekhack.org/showwiki.php?title=Island:24965
[GH_news]: http://geekhack.org/showwiki.php?title=Island:25759
[GH_terminal]: http://geekhack.org/showwiki.php?title=Island:27272
[GH_x68k]: http://geekhack.org/showwiki.php?title=Island:29060
[GH_hbkb]: http://geekhack.org/showwiki.php?title=Island:29483
[HID_liber]: http://deskthority.net/wiki/HID_Liberation_Device_-_DIY_Instructions
[Phantom]: http://geekhack.org/index.php?topic=26742
[GH60]: http://geekhack.org/index.php?topic=34959
[GH60_proto]: http://geekhack.org/index.php?topic=37570.0
[PC98]: http://en.wikipedia.org/wiki/NEC_PC-9801
[Sun]: http://en.wikipedia.org/wiki/Sun-3
[IIGS]: http://en.wikipedia.org/wiki/Apple_IIGS
License
-------
**GPLv2** or later. Some protocol files are under **Modified BSD License**.
LUFA, PJRC and V-USB stack have their own license respectively.
Build Firmware and Program Controller
-------------------------------------
See [doc/build.md](doc/build.md).
Change your keymap
------------------
See [doc/keymap.md](doc/keymap.md).
Magic Comannds
--------------
To see help press `Magic` + `H`.
`Magic` key bind may be `LShift` + `RShift` in many project, 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
**TBD**
### Boot Magic Configuration - Virtual DIP Switch
Boot Magic are executed during boot up time. Press Magic key below then pulgin 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 [common/bootmagic.h](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(`Casp 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`)
#### 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`)
#### Caution
Unintentional use of this feature will cause user confusion.
TODO: Magic key combination to avoid unintentional press during plug in
**TBD**
Mechanical Locking support
--------------------------
This feature makes it possible for you to use mechanical switch for `CapsLock`, `NumLock` or `ScrollLock`. To enable this feature define these macros in `config.h` and use `KC_LCAP`, `KC_LNUM` or `KC_LSCR` in keymap for locking key instead of normal `KC_CAPS`, `KC_NLCK` or `KC_SLCK`. Resync option tries to keep lock switch state consistent with keyboard LED state.
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
Start Your Own Project
-----------------------
**TBD**
### Config.h Options
#### 1. USB vendor/product ID and device description
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0xBEEF
#define MANUFACTURER t.m.k.
#define PRODUCT Macway mod
#define DESCRIPTION t.m.k. keyboard firmware for Macway mod
#### 2. Keyboard matrix configuration
#define MATRIX_ROWS 8
#define MATRIX_COLS 8
#define MATRIX_HAS_GHOST
Architecture
------------
Architecture Diagram
+---------------+---------------+-------------+
| Host | Keyboard | Matrix, LED |
___________ |-----------+-+ +-------------+ | +-----------|
/ /| Keys/Mouse | Protocol |d| | Action | | | Protocol |
/__________/ |<-----------| LUFA |r| | Layer, Tap | | | Matrix |
|.--------.| | LED | V-USB |i| |-------------| | | PS/2,IBM | __________________
|| || |----------->| PJRC |v| | Keymap | | | ADB,M0110| Keys / /_/_/_/_/_/_/_/ /|
|| Host || | Console | iWRAP(BT)|e| | Mousekey | | | SUN/NEWS |<----------/ /_/_/_/_/_/_/_/ / /
||________||/.<-----------| UART |r| | Report | | | X68K/PC98| Control / /_/_/_/_/_/_/_/ / /
`_========_'/| |---------------------------------------------|-------->/___ /_______/ ___/ /
|_o______o_|/ | Sendchar, Print, Debug, Command, ... | |_________________|/
+---------------------------------------------+ Keyboard
Debuging
--------
Use PJRC's `hid_listen` to see debug messages. You can use the tool for debug even if firmware use LUFA stack.
You can use xprintf() to display debug info on `hid_listen`, see `common/xprintf.h`.
Files and Directories
-------------------
### Top
* common/ - common codes
* protocol/ - keyboard protocol support
* keyboard/ - keyboard projects
* converter/ - protocol converter projects
* doc/ - documents
* common.mk - Makefile for common
* protoco.mk - Makefile for protocol
* rules.mk - Makefile for build rules
### Common
* host.h
* host_driver.h
* keyboard.h
* command.h
* keymap.h
* action.h
* keycode.h
* matrix.h
* led.h
* mousekey.h
* report.h
* debug.h
* print.h
* bootloader.h
* sendchar.h
* timer.h
* util.h
### Keyboard Protocols
* lufa/ - LUFA USB stack
* pjrc/ - PJRC USB stack
* vusb/ - Objective Development V-USB
* iwrap/ - Bluetooth HID for Bluegiga iWRAP
* ps2.c - PS/2 protocol
* adb.c - Apple Desktop Bus protocol
* m0110.c - Macintosh 128K/512K/Plus keyboard protocol
* news.c - Sony NEWS keyboard protocol
* x68k.c - Sharp X68000 keyboard protocol
* serial_soft.c - Asynchronous Serial protocol implemented by software
Conding Style
-------------
- Doesn't use Tab to indent, use 4-spaces instead.
Other Keyboard Firmware Projects
------------------
See [doc/other_projects.md](doc/other_projects.md).
Vendored
+98
View File
@@ -0,0 +1,98 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
Vagrant.configure(2) do |config|
# You can only have one config.vm.box uncommented at a time
# Comment this and uncomment another if you don't want to use the minimal Arch box
#config.vm.box = "dragon788/arch-ala-elasticdog"
# VMware/Virtualbox 64 bit
config.vm.box = "phusion/ubuntu-14.04-amd64"
#
# VMware/Virtualbox 64 bit
#config.vm.box = "puphpet/centos65-x64"
#
# The opensuse boxes don't have dfu-util in their default repositories
#
# The virtualbox version has tools issues
# VMware/Virtualbox 64 bit
#config.vm.box = "bento/opensuse-13.2-x86_64"
#
# Virtualbox only
#config.vm.box = "bento/opensuse-13.2-i386"
# config.vm.box = ""
# config.vm.box = ""
# This section allows you to customize the Virtualbox VM
# settings, ie showing the GUI or upping the memory
# or cores if desired
config.vm.provider "virtualbox" do |vb|
# Hide the VirtualBox GUI when booting the machine
vb.gui = false
# Uncomment the below lines if you want to program
# your Teensy via the VM rather than your host OS
#vb.customize ['modifyvm', :id, '--usb', 'on']
#vb.customize ['usbfilter', 'add', '0',
# '--target', :id,
# '--name', 'teensy',
# '--vendorid', '0x16c0',
# '--productid','0x0478'
# ]
# Customize the amount of memory on the VM:
vb.memory = "512"
end
# This section allows you to customize the VMware VM
# settings, ie showing the GUI or upping the memory
# or cores if desired
config.vm.provider "vmware_workstation" do |vmw|
# Hide the VMware GUI when booting the machine
vmw.gui = false
# Customize the amount of memory on the VM:
vmw.memory = "512"
end
config.vm.provider "vmware_fusion" do |vmf|
# Hide the vmfare GUI when booting the machine
vmf.gui = false
# Customize the amount of memory on the VM:
vmf.memory = "512"
end
# Docker provider pulls from hub.docker.com respecting docker.image if
# config.vm.box is nil. Note that this bind-mounts from the current dir to
# /vagrant in the guest, so unless your UID is 1000 to match vagrant in the
# image, you'll need to: chmod -R a+rw .
config.vm.provider "docker" do |docker, override|
override.vm.box = nil
docker.image = "jesselang/debian-vagrant:jessie"
docker.has_ssh = true
end
# This script ensures the required packages for AVR programming are installed
# It also ensures the system always gets the latest updates when powered on
# If this causes issues you can run a 'vagrant destroy' and then
# add a # before ,args: and run 'vagrant up' to get a working
# non-updated box and then attempt to troubleshoot or open a Github issue
config.vm.provision "shell", run: "always", path: "./util/install_dependencies.sh", args: "-update"
config.vm.post_up_message = <<-EOT
Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win)
or 'vagrant ssh-config' and Putty or Bitvise SSH or another SSH tool
Change directory (cd) to the keyboard you wish to program
(Optionally) modify your layout,
then run 'make clean'
and then 'make' to compile the .eep and .hex files.
Or you can copy and paste the example line below.
cd /vagrant; cd keyboards; cd ergodox; make clean; make
EOT
end
+1
View File
File diff suppressed because one or more lines are too long
+46
View File
@@ -0,0 +1,46 @@
{
"structure": {
"summary": "_summary.md"
},
"plugins" : [
"edit-link",
"forkmegithub",
"hints",
"page-toc",
"terminal",
"toolbar",
"bulk-redirect"
],
"pluginsConfig": {
"edit-link": {
"base": "https://github.com/qmk/qmk_firmware/edit/master/docs",
"label": "Suggest an edit"
},
"forkmegithub": {
"color": "red",
"url": "https://github.com/qmk/qmk_firmware"
},
"page-toc": {
"selector": ".markdown-section h1, .markdown-section h2"
},
"terminal": {
"copyButtons": true,
"fade": false,
"style": "flat"
},
"toolbar": {
"buttons": [
{
"label": "QMK Firmware",
"icon": "fa fa-github",
"url": "https://github.com/qmk/qmk_firmware"
}
]
},
"bulk-redirect": {
"basepath": "/",
"redirectsFile": "docs/redirects.json"
}
},
"root": "./docs/"
}
+62
View File
@@ -0,0 +1,62 @@
# Copyright 2017 Jack Humbert
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# If it's possible that multiple bootloaders can be used for one project,
# you can leave this unset, and the correct size will be selected
# automatically.
#
# Sets the bootloader defined in the keyboard's/keymap's rules.mk
# Current options:
# atmel-dfu
# lufa-dfu
# qmk-dfu
# halfkay
# caterina
# bootloadHID
#
# BOOTLOADER_SIZE can still be defined manually, but it's recommended
# you add any possible configuration to this list
ifeq ($(strip $(BOOTLOADER)), atmel-dfu)
OPT_DEFS += -DBOOTLOADER_ATMEL_DFU
OPT_DEFS += -DBOOTLOADER_DFU
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(BOOTLOADER)), lufa-dfu)
OPT_DEFS += -DBOOTLOADER_LUFA_DFU
OPT_DEFS += -DBOOTLOADER_DFU
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(BOOTLOADER)), qmk-dfu)
OPT_DEFS += -DBOOTLOADER_QMK_DFU
OPT_DEFS += -DBOOTLOADER_DFU
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(BOOTLOADER)), halfkay)
OPT_DEFS += -DBOOTLOADER_HALFKAY
BOOTLOADER_SIZE = 512
endif
ifeq ($(strip $(BOOTLOADER)), caterina)
OPT_DEFS += -DBOOTLOADER_CATERINA
BOOTLOADER_SIZE = 4096
endif
ifeq ($(strip $(BOOTLOADER)), bootloadHID)
OPT_DEFS += -DBOOTLOADER_BOOTLOADHID
BOOTLOADER_SIZE = 4096
endif
ifdef BOOTLOADER_SIZE
OPT_DEFS += -DBOOTLOADER_SIZE=$(strip $(BOOTLOADER_SIZE))
endif
+33
View File
@@ -0,0 +1,33 @@
# Copyright 2017 Fred Sundvik
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#include $(TMK_PATH)/protocol.mk
TEST_PATH=tests/$(TEST)
$(TEST)_SRC= \
$(TEST_PATH)/keymap.c \
$(TMK_COMMON_SRC) \
$(QUANTUM_SRC) \
$(SRC) \
tests/test_common/matrix.c \
tests/test_common/test_driver.cpp \
tests/test_common/keyboard_report_util.cpp \
tests/test_common/test_fixture.cpp
$(TEST)_SRC += $(patsubst $(ROOTDIR)/%,%,$(wildcard $(TEST_PATH)/*.cpp))
$(TEST)_DEFS=$(TMK_COMMON_DEFS) $(OPT_DEFS)
$(TEST)_CONFIG=$(TEST_PATH)/config.h
VPATH+=$(TOP_DIR)/tests/test_common
+289
View File
@@ -0,0 +1,289 @@
ifndef VERBOSE
.SILENT:
endif
.DEFAULT_GOAL := all
include common.mk
# 5/4/3/2/1
KEYBOARD_FOLDER_PATH_1 := $(KEYBOARD)
KEYBOARD_FOLDER_PATH_2 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_1)))
KEYBOARD_FOLDER_PATH_3 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_2)))
KEYBOARD_FOLDER_PATH_4 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_3)))
KEYBOARD_FOLDER_PATH_5 := $(patsubst %/,%,$(dir $(KEYBOARD_FOLDER_PATH_4)))
KEYBOARD_FOLDER_1 := $(notdir $(KEYBOARD_FOLDER_PATH_1))
KEYBOARD_FOLDER_2 := $(notdir $(KEYBOARD_FOLDER_PATH_2))
KEYBOARD_FOLDER_3 := $(notdir $(KEYBOARD_FOLDER_PATH_3))
KEYBOARD_FOLDER_4 := $(notdir $(KEYBOARD_FOLDER_PATH_4))
KEYBOARD_FOLDER_5 := $(notdir $(KEYBOARD_FOLDER_PATH_5))
KEYBOARD_FILESAFE := $(subst /,_,$(KEYBOARD))
TARGET ?= $(KEYBOARD_FILESAFE)_$(KEYMAP)
KEYBOARD_OUTPUT := $(BUILD_DIR)/obj_$(KEYBOARD_FILESAFE)
# Force expansion
TARGET := $(TARGET)
MASTER ?= left
ifdef master
MASTER = $(master)
endif
ifeq ($(MASTER),right)
OPT_DEFS += -DMASTER_IS_ON_RIGHT
else
ifneq ($(MASTER),left)
$(error MASTER does not have a valid value(left/right))
endif
endif
KEYBOARD_PATHS :=
KEYBOARD_PATH_1 := keyboards/$(KEYBOARD_FOLDER_PATH_1)
KEYBOARD_PATH_2 := keyboards/$(KEYBOARD_FOLDER_PATH_2)
KEYBOARD_PATH_3 := keyboards/$(KEYBOARD_FOLDER_PATH_3)
KEYBOARD_PATH_4 := keyboards/$(KEYBOARD_FOLDER_PATH_4)
KEYBOARD_PATH_5 := keyboards/$(KEYBOARD_FOLDER_PATH_5)
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/rules.mk)","")
KEYBOARD_PATHS += $(KEYBOARD_PATH_5)
include $(KEYBOARD_PATH_5)/rules.mk
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/rules.mk)","")
KEYBOARD_PATHS += $(KEYBOARD_PATH_4)
include $(KEYBOARD_PATH_4)/rules.mk
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/rules.mk)","")
KEYBOARD_PATHS += $(KEYBOARD_PATH_3)
include $(KEYBOARD_PATH_3)/rules.mk
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/rules.mk)","")
KEYBOARD_PATHS += $(KEYBOARD_PATH_2)
include $(KEYBOARD_PATH_2)/rules.mk
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/rules.mk)","")
KEYBOARD_PATHS += $(KEYBOARD_PATH_1)
include $(KEYBOARD_PATH_1)/rules.mk
endif
KEYBOARD_SRC :=
KEYBOARD_C_1 := $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).c
KEYBOARD_C_2 := $(KEYBOARD_PATH_2)/$(KEYBOARD_FOLDER_2).c
KEYBOARD_C_3 := $(KEYBOARD_PATH_3)/$(KEYBOARD_FOLDER_3).c
KEYBOARD_C_4 := $(KEYBOARD_PATH_4)/$(KEYBOARD_FOLDER_4).c
KEYBOARD_C_5 := $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).c
ifneq ("$(wildcard $(KEYBOARD_C_5))","")
KEYBOARD_SRC += $(KEYBOARD_C_5)
endif
ifneq ("$(wildcard $(KEYBOARD_C_4))","")
KEYBOARD_SRC += $(KEYBOARD_C_4)
endif
ifneq ("$(wildcard $(KEYBOARD_C_3))","")
KEYBOARD_SRC += $(KEYBOARD_C_3)
endif
ifneq ("$(wildcard $(KEYBOARD_C_2))","")
KEYBOARD_SRC += $(KEYBOARD_C_2)
endif
ifneq ("$(wildcard $(KEYBOARD_C_1))","")
KEYBOARD_SRC += $(KEYBOARD_C_1)
endif
OPT_DEFS += -DKEYBOARD_$(KEYBOARD_FILESAFE)
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/$(KEYBOARD_FOLDER_1).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_1).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/$(KEYBOARD_FOLDER_2).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_2).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/$(KEYBOARD_FOLDER_3).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_3).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/$(KEYBOARD_FOLDER_4).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_4).h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/$(KEYBOARD_FOLDER_5).h)","")
QMK_KEYBOARD_H = $(KEYBOARD_FOLDER_5).h
endif
# We can assume a ChibiOS target When MCU_FAMILY is defined , since it's not used for LUFA
ifdef MCU_FAMILY
FIRMWARE_FORMAT=bin
PLATFORM=CHIBIOS
else
PLATFORM=AVR
FIRMWARE_FORMAT=hex
endif
ifeq ($(PLATFORM),CHIBIOS)
include $(TMK_PATH)/chibios.mk
OPT_OS = chibios
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_5)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_5)/boards/$(BOARD)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_5)/boards/$(BOARD)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_4)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_4)/boards/$(BOARD)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_4)/boards/$(BOARD)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_3)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_3)/boards/$(BOARD)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_3)/boards/$(BOARD)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_2)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/boards/$(BOARD)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_2)/boards/$(BOARD)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_1)/bootloader_defs.h
else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h)","")
OPT_DEFS += -include $(KEYBOARD_PATH_1)/boards/$(BOARD)/bootloader_defs.h
else ifneq ("$(wildcard $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h)","")
OPT_DEFS += -include $(TOP_DIR)/drivers/boards/$(BOARD)/bootloader_defs.h
endif
endif
CONFIG_H :=
ifneq ("$(wildcard $(KEYBOARD_PATH_5)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_5)/config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_4)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_4)/config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_3)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_3)/config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_2)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_2)/config.h
endif
ifneq ("$(wildcard $(KEYBOARD_PATH_1)/config.h)","")
CONFIG_H += $(KEYBOARD_PATH_1)/config.h
endif
# Save the defines and includes here, so we don't include any keymap specific ones
PROJECT_DEFS := $(OPT_DEFS)
PROJECT_INC := $(VPATH) $(EXTRAINCDIRS) $(KEYBOARD_PATHS)
PROJECT_CONFIG := $(CONFIG_H)
MAIN_KEYMAP_PATH_1 := $(KEYBOARD_PATH_1)/keymaps/$(KEYMAP)
MAIN_KEYMAP_PATH_2 := $(KEYBOARD_PATH_2)/keymaps/$(KEYMAP)
MAIN_KEYMAP_PATH_3 := $(KEYBOARD_PATH_3)/keymaps/$(KEYMAP)
MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP)
MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP)
ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_5)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_5)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_5)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_5)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_4)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_4)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_4)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_4)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_3)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_3)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_3)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_3)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_2)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_2)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_2)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_2)
else ifneq ("$(wildcard $(MAIN_KEYMAP_PATH_1)/keymap.c)","")
-include $(MAIN_KEYMAP_PATH_1)/rules.mk
KEYMAP_C := $(MAIN_KEYMAP_PATH_1)/keymap.c
KEYMAP_PATH := $(MAIN_KEYMAP_PATH_1)
else ifneq ($(LAYOUTS),)
include build_layout.mk
else
$(error Could not find keymap)
# this state should never be reached
endif
# User space stuff
USER_PATH := users/$(KEYMAP)
-include $(USER_PATH)/rules.mk
ifneq ("$(wildcard users/$(KEYMAP)/config.h)","")
CONFIG_H += users/$(KEYMAP)/config.h
endif
# Object files directory
# To put object files in current directory, use a dot (.), do NOT make
# this an empty or blank macro!
KEYMAP_OUTPUT := $(BUILD_DIR)/obj_$(TARGET)
ifneq ("$(wildcard $(KEYMAP_PATH)/config.h)","")
CONFIG_H += $(KEYMAP_PATH)/config.h
endif
# # project specific files
SRC += $(KEYBOARD_SRC) \
$(KEYMAP_C) \
$(QUANTUM_SRC)
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax
# Search Path
VPATH += $(KEYMAP_PATH)
VPATH += $(KEYBOARD_PATHS)
VPATH += $(COMMON_VPATH)
VPATH += $(USER_PATH)
include common_features.mk
include $(TMK_PATH)/protocol.mk
include $(TMK_PATH)/common.mk
include bootloader.mk
SRC += $(TMK_COMMON_SRC)
OPT_DEFS += $(TMK_COMMON_DEFS)
EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
ifeq ($(PLATFORM),AVR)
ifeq ($(strip $(PROTOCOL)), VUSB)
include $(TMK_PATH)/protocol/vusb.mk
else
include $(TMK_PATH)/protocol/lufa.mk
endif
include $(TMK_PATH)/avr.mk
endif
ifeq ($(PLATFORM),CHIBIOS)
include $(TMK_PATH)/protocol/chibios.mk
endif
ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
VISUALIZER_DIR = $(QUANTUM_DIR)/visualizer
VISUALIZER_PATH = $(QUANTUM_PATH)/visualizer
include $(VISUALIZER_PATH)/visualizer.mk
endif
ALL_CONFIGS := $(PROJECT_CONFIG) $(CONFIG_H)
OUTPUTS := $(KEYMAP_OUTPUT) $(KEYBOARD_OUTPUT)
$(KEYMAP_OUTPUT)_SRC := $(SRC)
$(KEYMAP_OUTPUT)_DEFS := $(OPT_DEFS) $(GFXDEFS) \
-DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYBOARD_H=\"$(QMK_KEYBOARD_H)\" -DQMK_KEYBOARD_CONFIG_H=\"$(KEYBOARD_PATH_1)/config.h\" \
-DQMK_KEYMAP=\"$(KEYMAP)\" -DQMK_KEYMAP_H=\"$(KEYMAP).h\" -DQMK_KEYMAP_CONFIG_H=\"$(KEYMAP_PATH)/config.h\" \
-DQMK_SUBPROJECT -DQMK_SUBPROJECT_H -DQMK_SUBPROJECT_CONFIG_H
$(KEYMAP_OUTPUT)_INC := $(VPATH) $(EXTRAINCDIRS)
$(KEYMAP_OUTPUT)_CONFIG := $(CONFIG_H)
$(KEYBOARD_OUTPUT)_SRC := $(CHIBISRC) $(GFXSRC)
$(KEYBOARD_OUTPUT)_DEFS := $(PROJECT_DEFS) $(GFXDEFS)
$(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(GFXINC)
$(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
# Default target.
all: build check-size
# Change the build target to build a HEX file or a library.
build: elf cpfirmware
#build: elf hex eep lss sym
#build: lib
include $(TMK_PATH)/rules.mk
+18
View File
@@ -0,0 +1,18 @@
LAYOUTS_PATH := layouts
LAYOUTS_REPOS := $(patsubst %/,%,$(sort $(dir $(wildcard $(LAYOUTS_PATH)/*/))))
define SEARCH_LAYOUTS_REPO
LAYOUT_KEYMAP_PATH := $$(LAYOUTS_REPO)/$$(LAYOUT)/$$(KEYMAP)
LAYOUT_KEYMAP_C := $$(LAYOUT_KEYMAP_PATH)/keymap.c
ifneq ("$$(wildcard $$(LAYOUT_KEYMAP_C))","")
-include $$(LAYOUT_KEYMAP_PATH)/rules.mk
KEYMAP_C := $$(LAYOUT_KEYMAP_C)
KEYMAP_PATH := $$(LAYOUT_KEYMAP_PATH)
endif
endef
define SEARCH_LAYOUTS
$$(foreach LAYOUTS_REPO,$$(LAYOUTS_REPOS),$$(eval $$(call SEARCH_LAYOUTS_REPO)))
endef
$(foreach LAYOUT,$(LAYOUTS),$(eval $(call SEARCH_LAYOUTS)))
+67
View File
@@ -0,0 +1,67 @@
ifndef VERBOSE
.SILENT:
endif
.DEFAULT_GOAL := all
include common.mk
TARGET=test/$(TEST)
GTEST_OUTPUT = $(BUILD_DIR)/gtest
TEST_OBJ = $(BUILD_DIR)/test_obj
OUTPUTS := $(TEST_OBJ)/$(TEST) $(GTEST_OUTPUT)
GTEST_INC := \
$(LIB_PATH)/googletest/googletest/include\
$(LIB_PATH)/googletest/googlemock/include\
GTEST_INTERNAL_INC :=\
$(LIB_PATH)/googletest/googletest\
$(LIB_PATH)/googletest/googlemock
$(GTEST_OUTPUT)_SRC :=\
googletest/src/gtest-all.cc\
googletest/src/gtest_main.cc\
googlemock/src/gmock-all.cc
$(GTEST_OUTPUT)_DEFS :=
$(GTEST_OUTPUT)_INC := $(GTEST_INC) $(GTEST_INTERNAL_INC)
LDFLAGS += -lstdc++ -lpthread -shared-libgcc
CREATE_MAP := no
VPATH +=\
$(LIB_PATH)/googletest\
$(LIB_PATH)/googlemock
all: elf
VPATH += $(COMMON_VPATH)
PLATFORM:=TEST
ifneq ($(filter $(FULL_TESTS),$(TEST)),)
include tests/$(TEST)/rules.mk
endif
include common_features.mk
include $(TMK_PATH)/common.mk
include $(QUANTUM_PATH)/serial_link/tests/rules.mk
ifneq ($(filter $(FULL_TESTS),$(TEST)),)
include build_full_test.mk
endif
$(TEST_OBJ)/$(TEST)_SRC := $($(TEST)_SRC)
$(TEST_OBJ)/$(TEST)_INC := $($(TEST)_INC) $(VPATH) $(GTEST_INC)
$(TEST_OBJ)/$(TEST)_DEFS := $($(TEST)_DEFS)
$(TEST_OBJ)/$(TEST)_CONFIG := $($(TEST)_CONFIG)
include $(TMK_PATH)/native.mk
include $(TMK_PATH)/rules.mk
$(shell mkdir -p $(BUILD_DIR)/test 2>/dev/null)
$(shell mkdir -p $(TEST_OBJ) 2>/dev/null)
+19 -67
View File
@@ -1,72 +1,24 @@
COMMON_DIR = common include message.mk
SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/keyboard.c \
$(COMMON_DIR)/action.c \
$(COMMON_DIR)/action_tapping.c \
$(COMMON_DIR)/action_macro.c \
$(COMMON_DIR)/action_layer.c \
$(COMMON_DIR)/action_util.c \
$(COMMON_DIR)/keymap.c \
$(COMMON_DIR)/timer.c \
$(COMMON_DIR)/print.c \
$(COMMON_DIR)/bootloader.c \
$(COMMON_DIR)/suspend.c \
$(COMMON_DIR)/xprintf.S \
$(COMMON_DIR)/util.c
# Directory common source files exist
TOP_DIR = .
TMK_DIR = tmk_core
TMK_PATH = $(TOP_DIR)/$(TMK_DIR)
LIB_PATH = $(TOP_DIR)/lib
# Option modules QUANTUM_DIR = quantum
ifdef BOOTMAGIC_ENABLE QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR)
SRC += $(COMMON_DIR)/bootmagic.c
SRC += $(COMMON_DIR)/eeconfig.c
OPT_DEFS += -DBOOTMAGIC_ENABLE
endif
ifdef MOUSEKEY_ENABLE DRIVER_DIR = drivers
SRC += $(COMMON_DIR)/mousekey.c DRIVER_PATH = $(TOP_DIR)/$(DRIVER_DIR)
OPT_DEFS += -DMOUSEKEY_ENABLE
OPT_DEFS += -DMOUSE_ENABLE
endif
ifdef EXTRAKEY_ENABLE BUILD_DIR := $(TOP_DIR)/.build
OPT_DEFS += -DEXTRAKEY_ENABLE
endif
ifdef CONSOLE_ENABLE COMMON_VPATH := $(TOP_DIR)
OPT_DEFS += -DCONSOLE_ENABLE COMMON_VPATH += $(TMK_PATH)
else COMMON_VPATH += $(QUANTUM_PATH)
OPT_DEFS += -DNO_PRINT COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
OPT_DEFS += -DNO_DEBUG COMMON_VPATH += $(QUANTUM_PATH)/audio
endif COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
COMMON_VPATH += $(QUANTUM_PATH)/api
ifdef COMMAND_ENABLE COMMON_VPATH += $(DRIVER_PATH)
SRC += $(COMMON_DIR)/command.c
OPT_DEFS += -DCOMMAND_ENABLE
endif
ifdef NKRO_ENABLE
OPT_DEFS += -DNKRO_ENABLE
endif
ifdef SLEEP_LED_ENABLE
SRC += $(COMMON_DIR)/sleep_led.c
OPT_DEFS += -DSLEEP_LED_ENABLE
OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
endif
ifdef BACKLIGHT_ENABLE
SRC += $(COMMON_DIR)/backlight.c
OPT_DEFS += -DBACKLIGHT_ENABLE
endif
ifdef KEYMAP_SECTION_ENABLE
OPT_DEFS += -DKEYMAP_SECTION_ENABLE
EXTRALDFLAGS = -Wl,-L$(TOP_DIR),-Tldscript_keymap_avr5.x
endif
# Version string
OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
# Search Path
VPATH += $(TOP_DIR)/common
-541
View File
@@ -1,541 +0,0 @@
/*
Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "host.h"
#include "keycode.h"
#include "keyboard.h"
#include "mousekey.h"
#include "command.h"
#include "led.h"
#include "backlight.h"
#include "action_layer.h"
#include "action_tapping.h"
#include "action_macro.h"
#include "action_util.h"
#include "action.h"
#ifdef DEBUG_ACTION
#include "debug.h"
#else
#include "nodebug.h"
#endif
void action_exec(keyevent_t event)
{
if (!IS_NOEVENT(event)) {
dprint("\n---- action_exec: start -----\n");
dprint("EVENT: "); debug_event(event); dprintln();
}
keyrecord_t record = { .event = event };
#ifndef NO_ACTION_TAPPING
action_tapping_process(record);
#else
process_action(&record);
if (!IS_NOEVENT(record.event)) {
dprint("processed: "); debug_record(record); dprintln();
}
#endif
}
void process_action(keyrecord_t *record)
{
keyevent_t event = record->event;
#ifndef NO_ACTION_TAPPING
uint8_t tap_count = record->tap.count;
#endif
if (IS_NOEVENT(event)) { return; }
action_t action = layer_switch_get_action(event.key);
dprint("ACTION: "); debug_action(action);
#ifndef NO_ACTION_LAYER
dprint(" layer_state: "); layer_debug();
dprint(" default_layer_state: "); default_layer_debug();
#endif
dprintln();
switch (action.kind.id) {
/* Key and Mods */
case ACT_LMODS:
case ACT_RMODS:
{
uint8_t mods = (action.kind.id == ACT_LMODS) ? action.key.mods :
action.key.mods<<4;
if (event.pressed) {
if (mods) {
add_weak_mods(mods);
send_keyboard_report();
}
register_code(action.key.code);
} else {
unregister_code(action.key.code);
if (mods) {
del_weak_mods(mods);
send_keyboard_report();
}
}
}
break;
#ifndef NO_ACTION_TAPPING
case ACT_LMODS_TAP:
case ACT_RMODS_TAP:
{
uint8_t mods = (action.kind.id == ACT_LMODS_TAP) ? action.key.mods :
action.key.mods<<4;
switch (action.layer_tap.code) {
#ifndef NO_ACTION_ONESHOT
case MODS_ONESHOT:
// Oneshot modifier
if (event.pressed) {
if (tap_count == 0) {
register_mods(mods);
}
else if (tap_count == 1) {
dprint("MODS_TAP: Oneshot: start\n");
set_oneshot_mods(mods);
}
else {
register_mods(mods);
}
} else {
if (tap_count == 0) {
clear_oneshot_mods();
unregister_mods(mods);
}
else if (tap_count == 1) {
// Retain Oneshot mods
}
else {
clear_oneshot_mods();
unregister_mods(mods);
}
}
break;
#endif
default:
if (event.pressed) {
if (tap_count > 0) {
if (record->tap.interrupted) {
dprint("MODS_TAP: Tap: Cancel: add_mods\n");
// ad hoc: set 0 to cancel tap
record->tap.count = 0;
register_mods(mods);
} else {
dprint("MODS_TAP: Tap: register_code\n");
register_code(action.key.code);
}
} else {
dprint("MODS_TAP: No tap: add_mods\n");
register_mods(mods);
}
} else {
if (tap_count > 0) {
dprint("MODS_TAP: Tap: unregister_code\n");
unregister_code(action.key.code);
} else {
dprint("MODS_TAP: No tap: add_mods\n");
unregister_mods(mods);
}
}
break;
}
}
break;
#endif
#ifdef EXTRAKEY_ENABLE
/* other HID usage */
case ACT_USAGE:
switch (action.usage.page) {
case PAGE_SYSTEM:
if (event.pressed) {
host_system_send(action.usage.code);
} else {
host_system_send(0);
}
break;
case PAGE_CONSUMER:
if (event.pressed) {
host_consumer_send(action.usage.code);
} else {
host_consumer_send(0);
}
break;
}
break;
#endif
#ifdef MOUSEKEY_ENABLE
/* Mouse key */
case ACT_MOUSEKEY:
if (event.pressed) {
mousekey_on(action.key.code);
mousekey_send();
} else {
mousekey_off(action.key.code);
mousekey_send();
}
break;
#endif
#ifndef NO_ACTION_LAYER
case ACT_LAYER:
if (action.layer_bitop.on == 0) {
/* Default Layer Bitwise Operation */
if (!event.pressed) {
uint8_t shift = action.layer_bitop.part*4;
uint32_t bits = ((uint32_t)action.layer_bitop.bits)<<shift;
uint32_t mask = (action.layer_bitop.xbit) ? ~(((uint32_t)0xf)<<shift) : 0;
switch (action.layer_bitop.op) {
case OP_BIT_AND: default_layer_and(bits | mask); break;
case OP_BIT_OR: default_layer_or(bits | mask); break;
case OP_BIT_XOR: default_layer_xor(bits | mask); break;
case OP_BIT_SET: default_layer_and(mask); default_layer_or(bits); break;
}
}
} else {
/* Layer Bitwise Operation */
if (event.pressed ? (action.layer_bitop.on & ON_PRESS) :
(action.layer_bitop.on & ON_RELEASE)) {
uint8_t shift = action.layer_bitop.part*4;
uint32_t bits = ((uint32_t)action.layer_bitop.bits)<<shift;
uint32_t mask = (action.layer_bitop.xbit) ? ~(((uint32_t)0xf)<<shift) : 0;
switch (action.layer_bitop.op) {
case OP_BIT_AND: layer_and(bits | mask); break;
case OP_BIT_OR: layer_or(bits | mask); break;
case OP_BIT_XOR: layer_xor(bits | mask); break;
case OP_BIT_SET: layer_and(mask); layer_or(bits); break;
}
}
}
break;
#ifndef NO_ACTION_TAPPING
case ACT_LAYER_TAP:
case ACT_LAYER_TAP_EXT:
switch (action.layer_tap.code) {
case OP_TAP_TOGGLE:
/* tap toggle */
if (event.pressed) {
if (tap_count < TAPPING_TOGGLE) {
layer_invert(action.layer_tap.val);
}
} else {
if (tap_count <= TAPPING_TOGGLE) {
layer_invert(action.layer_tap.val);
}
}
break;
case OP_ON_OFF:
event.pressed ? layer_on(action.layer_tap.val) :
layer_off(action.layer_tap.val);
break;
case OP_OFF_ON:
event.pressed ? layer_off(action.layer_tap.val) :
layer_on(action.layer_tap.val);
break;
case OP_SET_CLEAR:
event.pressed ? layer_move(action.layer_tap.val) :
layer_clear();
break;
default:
/* tap key */
if (event.pressed) {
if (tap_count > 0) {
dprint("KEYMAP_TAP_KEY: Tap: register_code\n");
register_code(action.layer_tap.code);
} else {
dprint("KEYMAP_TAP_KEY: No tap: On on press\n");
layer_on(action.layer_tap.val);
}
} else {
if (tap_count > 0) {
dprint("KEYMAP_TAP_KEY: Tap: unregister_code\n");
unregister_code(action.layer_tap.code);
} else {
dprint("KEYMAP_TAP_KEY: No tap: Off on release\n");
layer_off(action.layer_tap.val);
}
}
break;
}
break;
#endif
#endif
/* Extentions */
#ifndef NO_ACTION_MACRO
case ACT_MACRO:
action_macro_play(action_get_macro(record, action.func.id, action.func.opt));
break;
#endif
#ifdef BACKLIGHT_ENABLE
case ACT_BACKLIGHT:
if (!event.pressed) {
switch (action.backlight.id) {
case BACKLIGHT_INCREASE:
backlight_increase();
break;
case BACKLIGHT_DECREASE:
backlight_decrease();
break;
case BACKLIGHT_TOGGLE:
backlight_toggle();
break;
case BACKLIGHT_STEP:
backlight_step();
break;
}
}
break;
#endif
case ACT_COMMAND:
break;
#ifndef NO_ACTION_FUNCTION
case ACT_FUNCTION:
action_function(record, action.func.id, action.func.opt);
break;
#endif
default:
break;
}
}
/*
* Utilities for actions.
*/
void register_code(uint8_t code)
{
if (code == KC_NO) {
return;
}
#ifdef LOCKING_SUPPORT_ENABLE
else if (KC_LOCKING_CAPS == code) {
#ifdef LOCKING_RESYNC_ENABLE
// Resync: ignore if caps lock already is on
if (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) return;
#endif
add_key(KC_CAPSLOCK);
send_keyboard_report();
del_key(KC_CAPSLOCK);
send_keyboard_report();
}
else if (KC_LOCKING_NUM == code) {
#ifdef LOCKING_RESYNC_ENABLE
if (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) return;
#endif
add_key(KC_NUMLOCK);
send_keyboard_report();
del_key(KC_NUMLOCK);
send_keyboard_report();
}
else if (KC_LOCKING_SCROLL == code) {
#ifdef LOCKING_RESYNC_ENABLE
if (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) return;
#endif
add_key(KC_SCROLLLOCK);
send_keyboard_report();
del_key(KC_SCROLLLOCK);
send_keyboard_report();
}
#endif
else if IS_KEY(code) {
// TODO: should push command_proc out of this block?
if (command_proc(code)) return;
#ifndef NO_ACTION_ONESHOT
/* TODO: remove
if (oneshot_state.mods && !oneshot_state.disabled) {
uint8_t tmp_mods = get_mods();
add_mods(oneshot_state.mods);
add_key(code);
send_keyboard_report();
set_mods(tmp_mods);
send_keyboard_report();
oneshot_cancel();
} else
*/
#endif
{
add_key(code);
send_keyboard_report();
}
}
else if IS_MOD(code) {
add_mods(MOD_BIT(code));
send_keyboard_report();
}
else if IS_SYSTEM(code) {
host_system_send(KEYCODE2SYSTEM(code));
}
else if IS_CONSUMER(code) {
host_consumer_send(KEYCODE2CONSUMER(code));
}
}
void unregister_code(uint8_t code)
{
if (code == KC_NO) {
return;
}
#ifdef LOCKING_SUPPORT_ENABLE
else if (KC_LOCKING_CAPS == code) {
#ifdef LOCKING_RESYNC_ENABLE
// Resync: ignore if caps lock already is off
if (!(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) return;
#endif
add_key(KC_CAPSLOCK);
send_keyboard_report();
del_key(KC_CAPSLOCK);
send_keyboard_report();
}
else if (KC_LOCKING_NUM == code) {
#ifdef LOCKING_RESYNC_ENABLE
if (!(host_keyboard_leds() & (1<<USB_LED_NUM_LOCK))) return;
#endif
add_key(KC_NUMLOCK);
send_keyboard_report();
del_key(KC_NUMLOCK);
send_keyboard_report();
}
else if (KC_LOCKING_SCROLL == code) {
#ifdef LOCKING_RESYNC_ENABLE
if (!(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK))) return;
#endif
add_key(KC_SCROLLLOCK);
send_keyboard_report();
del_key(KC_SCROLLLOCK);
send_keyboard_report();
}
#endif
else if IS_KEY(code) {
del_key(code);
send_keyboard_report();
}
else if IS_MOD(code) {
del_mods(MOD_BIT(code));
send_keyboard_report();
}
else if IS_SYSTEM(code) {
host_system_send(0);
}
else if IS_CONSUMER(code) {
host_consumer_send(0);
}
}
void register_mods(uint8_t mods)
{
if (mods) {
add_mods(mods);
send_keyboard_report();
}
}
void unregister_mods(uint8_t mods)
{
if (mods) {
del_mods(mods);
send_keyboard_report();
}
}
void clear_keyboard(void)
{
clear_mods();
clear_keyboard_but_mods();
}
void clear_keyboard_but_mods(void)
{
clear_weak_mods();
clear_keys();
send_keyboard_report();
#ifdef MOUSEKEY_ENABLE
mousekey_clear();
mousekey_send();
#endif
#ifdef EXTRAKEY_ENABLE
host_system_send(0);
host_consumer_send(0);
#endif
}
bool is_tap_key(key_t key)
{
action_t action = layer_switch_get_action(key);
switch (action.kind.id) {
case ACT_LMODS_TAP:
case ACT_RMODS_TAP:
case ACT_LAYER_TAP:
case ACT_LAYER_TAP_EXT:
return true;
case ACT_MACRO:
case ACT_FUNCTION:
if (action.func.opt & FUNC_TAP) { return true; }
return false;
}
return false;
}
/*
* debug print
*/
void debug_event(keyevent_t event)
{
dprintf("%04X%c(%u)", (event.key.row<<8 | event.key.col), (event.pressed ? 'd' : 'u'), event.time);
}
void debug_record(keyrecord_t record)
{
debug_event(record.event);
#ifndef NO_ACTION_TAPPING
dprintf(":%u%c", record.tap.count, (record.tap.interrupted ? '-' : ' '));
#endif
}
void debug_action(action_t action)
{
switch (action.kind.id) {
case ACT_LMODS: dprint("ACT_LMODS"); break;
case ACT_RMODS: dprint("ACT_RMODS"); break;
case ACT_LMODS_TAP: dprint("ACT_LMODS_TAP"); break;
case ACT_RMODS_TAP: dprint("ACT_RMODS_TAP"); break;
case ACT_USAGE: dprint("ACT_USAGE"); break;
case ACT_MOUSEKEY: dprint("ACT_MOUSEKEY"); break;
case ACT_LAYER: dprint("ACT_LAYER"); break;
case ACT_LAYER_TAP: dprint("ACT_LAYER_TAP"); break;
case ACT_LAYER_TAP_EXT: dprint("ACT_LAYER_TAP_EXT"); break;
case ACT_MACRO: dprint("ACT_MACRO"); break;
case ACT_COMMAND: dprint("ACT_COMMAND"); break;
case ACT_FUNCTION: dprint("ACT_FUNCTION"); break;
default: dprint("UNKNOWN"); break;
}
dprintf("[%X:%02X]", action.kind.param>>8, action.kind.param&0xff);
}
-75
View File
@@ -1,75 +0,0 @@
/*
Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_H
#define ACTION_H
#include <stdint.h>
#include <stdbool.h>
#include "keyboard.h"
#include "keycode.h"
#include "action_code.h"
#include "action_macro.h"
/* tapping count and state */
typedef struct {
bool interrupted :1;
bool reserved2 :1;
bool reserved1 :1;
bool reserved0 :1;
uint8_t count :4;
} tap_t;
/* Key event container for recording */
typedef struct {
keyevent_t event;
#ifndef NO_ACTION_TAPPING
tap_t tap;
#endif
} keyrecord_t;
/* Execute action per keyevent */
void action_exec(keyevent_t event);
/* action for key */
action_t action_for_key(uint8_t layer, key_t key);
/* macro */
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt);
/* user defined special function */
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
/* Utilities for actions. */
void process_action(keyrecord_t *record);
void register_code(uint8_t code);
void unregister_code(uint8_t code);
void register_mods(uint8_t mods);
void unregister_mods(uint8_t mods);
//void set_mods(uint8_t mods);
void clear_keyboard(void);
void clear_keyboard_but_mods(void);
void layer_switch(uint8_t new_layer);
bool is_tap_key(key_t key);
/* debug */
void debug_event(keyevent_t event);
void debug_record(keyrecord_t record);
void debug_action(action_t action);
#endif /* ACTION_H */
-138
View File
@@ -1,138 +0,0 @@
#include <stdint.h>
#include "keyboard.h"
#include "action.h"
#include "util.h"
#include "action_layer.h"
#ifdef DEBUG_ACTION
#include "debug.h"
#else
#include "nodebug.h"
#endif
/*
* Default Layer State
*/
uint32_t default_layer_state = 0;
static void default_layer_state_set(uint32_t state)
{
debug("default_layer_state: ");
default_layer_debug(); debug(" to ");
default_layer_state = state;
default_layer_debug(); debug("\n");
clear_keyboard_but_mods(); // To avoid stuck keys
}
void default_layer_debug(void)
{
dprintf("%08lX(%u)", default_layer_state, biton32(default_layer_state));
}
void default_layer_set(uint32_t state)
{
default_layer_state_set(state);
}
#ifndef NO_ACTION_LAYER
void default_layer_or(uint32_t state)
{
default_layer_state_set(default_layer_state | state);
}
void default_layer_and(uint32_t state)
{
default_layer_state_set(default_layer_state & state);
}
void default_layer_xor(uint32_t state)
{
default_layer_state_set(default_layer_state ^ state);
}
#endif
#ifndef NO_ACTION_LAYER
/*
* Keymap Layer State
*/
uint32_t layer_state = 0;
static void layer_state_set(uint32_t state)
{
dprint("layer_state: ");
layer_debug(); dprint(" to ");
layer_state = state;
layer_debug(); dprintln();
clear_keyboard_but_mods(); // To avoid stuck keys
}
void layer_clear(void)
{
layer_state_set(0);
}
void layer_move(uint8_t layer)
{
layer_state_set(1UL<<layer);
}
void layer_on(uint8_t layer)
{
layer_state_set(layer_state | (1UL<<layer));
}
void layer_off(uint8_t layer)
{
layer_state_set(layer_state & ~(1UL<<layer));
}
void layer_invert(uint8_t layer)
{
layer_state_set(layer_state ^ (1UL<<layer));
}
void layer_or(uint32_t state)
{
layer_state_set(layer_state | state);
}
void layer_and(uint32_t state)
{
layer_state_set(layer_state & state);
}
void layer_xor(uint32_t state)
{
layer_state_set(layer_state ^ state);
}
void layer_debug(void)
{
dprintf("%08lX(%u)", layer_state, biton32(layer_state));
}
#endif
action_t layer_switch_get_action(key_t key)
{
action_t action;
action.code = ACTION_TRANSPARENT;
#ifndef NO_ACTION_LAYER
uint32_t layers = layer_state | default_layer_state;
/* check top layer first */
for (int8_t i = 31; i >= 0; i--) {
if (layers & (1UL<<i)) {
action = action_for_key(i, key);
if (action.code != ACTION_TRANSPARENT) {
return action;
}
}
}
/* fall back to layer 0 */
action = action_for_key(0, key);
return action;
#else
action = action_for_key(biton32(default_layer_state), key);
return action;
#endif
}
-77
View File
@@ -1,77 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_LAYER_H
#define ACTION_LAYER_H
#include <stdint.h>
#include "keyboard.h"
#include "action.h"
/*
* Default Layer
*/
extern uint32_t default_layer_state;
void default_layer_debug(void);
void default_layer_set(uint32_t state);
#ifndef NO_ACTION_LAYER
/* bitwise operation */
void default_layer_or(uint32_t state);
void default_layer_and(uint32_t state);
void default_layer_xor(uint32_t state);
#else
#define default_layer_or(state)
#define default_layer_and(state)
#define default_layer_xor(state)
#endif
/*
* Keymap Layer
*/
#ifndef NO_ACTION_LAYER
extern uint32_t layer_state;
void layer_debug(void);
void layer_clear(void);
void layer_move(uint8_t layer);
void layer_on(uint8_t layer);
void layer_off(uint8_t layer);
void layer_invert(uint8_t layer);
/* bitwise operation */
void layer_or(uint32_t state);
void layer_and(uint32_t state);
void layer_xor(uint32_t state);
#else
#define layer_state 0
#define layer_clear()
#define layer_move(layer)
#define layer_on(layer)
#define layer_off(layer)
#define layer_invert(layer)
#define layer_or(state)
#define layer_and(state)
#define layer_xor(state)
#define layer_debug()
#endif
/* return action depending on current layer status */
action_t layer_switch_get_action(key_t key);
#endif
-74
View File
@@ -1,74 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <util/delay.h>
#include "action.h"
#include "action_macro.h"
#ifdef DEBUG_ACTION
#include "debug.h"
#else
#include "nodebug.h"
#endif
#ifndef NO_ACTION_MACRO
#define MACRO_READ() (macro = pgm_read_byte(macro_p++))
void action_macro_play(const macro_t *macro_p)
{
macro_t macro = END;
uint8_t interval = 0;
if (!macro_p) return;
while (true) {
switch (MACRO_READ()) {
case KEY_DOWN:
MACRO_READ();
dprintf("KEY_DOWN(%02X)\n", macro);
register_code(macro);
break;
case KEY_UP:
MACRO_READ();
dprintf("KEY_UP(%02X)\n", macro);
unregister_code(macro);
break;
case WAIT:
MACRO_READ();
dprintf("WAIT(%u)\n", macro);
{ uint8_t ms = macro; while (ms--) _delay_ms(1); }
break;
case INTERVAL:
interval = MACRO_READ();
dprintf("INTERVAL(%u)\n", interval);
break;
case 0x04 ... 0x73:
dprintf("DOWN(%02X)\n", macro);
register_code(macro);
break;
case 0x84 ... 0xF3:
dprintf("UP(%02X)\n", macro);
unregister_code(macro&0x7F);
break;
case END:
default:
return;
}
// interval
{ uint8_t ms = interval; while (ms--) _delay_ms(1); }
}
}
#endif
-102
View File
@@ -1,102 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_MACRO_H
#define ACTION_MACRO_H
#include <stdint.h>
#include <avr/pgmspace.h>
#define MACRO_NONE 0
#define MACRO(...) ({ static const macro_t __m[] PROGMEM = { __VA_ARGS__ }; &__m[0]; })
typedef uint8_t macro_t;
#ifndef NO_ACTION_MACRO
void action_macro_play(const macro_t *macro_p);
#else
#define action_macro_play(macro)
#endif
/* Macro commands
* code(0x04-73) // key down(1byte)
* code(0x04-73) | 0x80 // key up(1byte)
* { KEY_DOWN, code(0x04-0xff) } // key down(2bytes)
* { KEY_UP, code(0x04-0xff) } // key up(2bytes)
* WAIT // wait milli-seconds
* INTERVAL // set interval between macro commands
* END // stop macro execution
*
* Ideas(Not implemented):
* modifiers
* system usage
* consumer usage
* unicode usage
* function call
* conditionals
* loop
*/
enum macro_command_id{
/* 0x00 - 0x03 */
END = 0x00,
KEY_DOWN,
KEY_UP,
/* 0x04 - 0x73 (reserved for keycode down) */
/* 0x74 - 0x83 */
WAIT = 0x74,
INTERVAL,
/* 0x84 - 0xf3 (reserved for keycode up) */
/* 0xf4 - 0xff */
};
/* TODO: keycode:0x04-0x73 can be handled by 1byte command else 2bytes are needed
* if keycode between 0x04 and 0x73
* keycode / (keycode|0x80)
* else
* {KEY_DOWN, keycode} / {KEY_UP, keycode}
*/
#define DOWN(key) KEY_DOWN, (key)
#define UP(key) KEY_UP, (key)
#define TYPE(key) DOWN(key), UP(key)
#define WAIT(ms) WAIT, (ms)
#define INTERVAL(ms) INTERVAL, (ms)
/* key down */
#define D(key) DOWN(KC_##key)
/* key up */
#define U(key) UP(KC_##key)
/* key type */
#define T(key) TYPE(KC_##key)
/* wait */
#define W(ms) WAIT(ms)
/* interval */
#define I(ms) INTERVAL(ms)
/* for backward comaptibility */
#define MD(key) DOWN(KC_##key)
#define MU(key) UP(KC_##key)
#endif /* ACTION_MACRO_H */
-213
View File
@@ -1,213 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "host.h"
#include "report.h"
#include "debug.h"
#include "action_util.h"
#include "timer.h"
static inline void add_key_byte(uint8_t code);
static inline void del_key_byte(uint8_t code);
#ifdef NKRO_ENABLE
static inline void add_key_bit(uint8_t code);
static inline void del_key_bit(uint8_t code);
#endif
static uint8_t real_mods = 0;
static uint8_t weak_mods = 0;
// TODO: pointer variable is not needed
//report_keyboard_t keyboard_report = {};
report_keyboard_t *keyboard_report = &(report_keyboard_t){};
#ifndef NO_ACTION_ONESHOT
static int8_t oneshot_mods = 0;
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
static int16_t oneshot_time = 0;
#endif
#endif
void send_keyboard_report(void) {
keyboard_report->mods = real_mods;
keyboard_report->mods |= weak_mods;
#ifndef NO_ACTION_ONESHOT
if (oneshot_mods) {
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
if (TIMER_DIFF_16(timer_read(), oneshot_time) >= ONESHOT_TIMEOUT) {
dprintf("Oneshot: timeout\n");
clear_oneshot_mods();
}
#endif
keyboard_report->mods |= oneshot_mods;
if (has_anykey()) {
clear_oneshot_mods();
}
}
#endif
host_keyboard_send(keyboard_report);
}
/* key */
void add_key(uint8_t key)
{
#ifdef NKRO_ENABLE
if (keyboard_nkro) {
add_key_bit(key);
return;
}
#endif
add_key_byte(key);
}
void del_key(uint8_t key)
{
#ifdef NKRO_ENABLE
if (keyboard_nkro) {
del_key_bit(key);
return;
}
#endif
del_key_byte(key);
}
void clear_keys(void)
{
// not clear mods
for (int8_t i = 1; i < REPORT_SIZE; i++) {
keyboard_report->raw[i] = 0;
}
}
/* modifier */
uint8_t get_mods(void) { return real_mods; }
void add_mods(uint8_t mods) { real_mods |= mods; }
void del_mods(uint8_t mods) { real_mods &= ~mods; }
void set_mods(uint8_t mods) { real_mods = mods; }
void clear_mods(void) { real_mods = 0; }
/* weak modifier */
uint8_t get_weak_mods(void) { return weak_mods; }
void add_weak_mods(uint8_t mods) { weak_mods |= mods; }
void del_weak_mods(uint8_t mods) { weak_mods &= ~mods; }
void set_weak_mods(uint8_t mods) { weak_mods = mods; }
void clear_weak_mods(void) { weak_mods = 0; }
/* Oneshot modifier */
#ifndef NO_ACTION_ONESHOT
void set_oneshot_mods(uint8_t mods)
{
oneshot_mods = mods;
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
oneshot_time = timer_read();
#endif
}
void clear_oneshot_mods(void)
{
oneshot_mods = 0;
#if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
oneshot_time = 0;
#endif
}
#endif
/*
* inspect keyboard state
*/
uint8_t has_anykey(void)
{
uint8_t cnt = 0;
for (uint8_t i = 1; i < REPORT_SIZE; i++) {
if (keyboard_report->raw[i])
cnt++;
}
return cnt;
}
uint8_t has_anymod(void)
{
return bitpop(real_mods);
}
uint8_t get_first_key(void)
{
#ifdef NKRO_ENABLE
if (keyboard_nkro) {
uint8_t i = 0;
for (; i < REPORT_BITS && !keyboard_report->nkro.bits[i]; i++)
;
return i<<3 | biton(keyboard_report->nkro.bits[i]);
}
#endif
return keyboard_report->keys[0];
}
/* local functions */
static inline void add_key_byte(uint8_t code)
{
int8_t i = 0;
int8_t empty = -1;
for (; i < REPORT_KEYS; i++) {
if (keyboard_report->keys[i] == code) {
break;
}
if (empty == -1 && keyboard_report->keys[i] == 0) {
empty = i;
}
}
if (i == REPORT_KEYS) {
if (empty != -1) {
keyboard_report->keys[empty] = code;
}
}
}
static inline void del_key_byte(uint8_t code)
{
for (uint8_t i = 0; i < REPORT_KEYS; i++) {
if (keyboard_report->keys[i] == code) {
keyboard_report->keys[i] = 0;
}
}
}
#ifdef NKRO_ENABLE
static inline void add_key_bit(uint8_t code)
{
if ((code>>3) < REPORT_BITS) {
keyboard_report->nkro.bits[code>>3] |= 1<<(code&7);
} else {
dprintf("add_key_bit: can't add: %02X\n", code);
}
}
static inline void del_key_bit(uint8_t code)
{
if ((code>>3) < REPORT_BITS) {
keyboard_report->nkro.bits[code>>3] &= ~(1<<(code&7));
} else {
dprintf("del_key_bit: can't del: %02X\n", code);
}
}
#endif
-57
View File
@@ -1,57 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ACTION_UTIL_H
#define ACTION_UTIL_H
#include <stdint.h>
#include "report.h"
extern report_keyboard_t *keyboard_report;
void send_keyboard_report(void);
/* key */
void add_key(uint8_t key);
void del_key(uint8_t key);
void clear_keys(void);
/* modifier */
uint8_t get_mods(void);
void add_mods(uint8_t mods);
void del_mods(uint8_t mods);
void set_mods(uint8_t mods);
void clear_mods(void);
/* weak modifier */
uint8_t get_weak_mods(void);
void add_weak_mods(uint8_t mods);
void del_weak_mods(uint8_t mods);
void set_weak_mods(uint8_t mods);
void clear_weak_mods(void);
/* oneshot modifier */
void set_oneshot_mods(uint8_t mods);
void clear_oneshot_mods(void);
void oneshot_toggle(void);
void oneshot_enable(void);
void oneshot_disable(void);
/* inspect */
uint8_t has_anykey(void);
uint8_t has_anymod(void);
uint8_t get_first_key(void);
#endif
-77
View File
@@ -1,77 +0,0 @@
/*
Copyright 2013 Mathias Andersson <wraul@dbox.se>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "backlight.h"
#include "eeconfig.h"
#include "debug.h"
backlight_config_t backlight_config;
void backlight_init(void)
{
/* check signature */
if (!eeconfig_is_enabled()) {
eeconfig_init();
}
backlight_config.raw = eeconfig_read_backlight();
backlight_set(backlight_config.enable ? backlight_config.level : 0);
}
void backlight_increase(void)
{
if(backlight_config.level < BACKLIGHT_LEVELS)
{
backlight_config.level++;
backlight_config.enable = 1;
eeconfig_write_backlight(backlight_config.raw);
}
dprintf("backlight increase: %u\n", backlight_config.level);
backlight_set(backlight_config.level);
}
void backlight_decrease(void)
{
if(backlight_config.level > 0)
{
backlight_config.level--;
backlight_config.enable = !!backlight_config.level;
eeconfig_write_backlight(backlight_config.raw);
}
dprintf("backlight decrease: %u\n", backlight_config.level);
backlight_set(backlight_config.level);
}
void backlight_toggle(void)
{
backlight_config.enable ^= 1;
eeconfig_write_backlight(backlight_config.raw);
dprintf("backlight toggle: %u\n", backlight_config.enable);
backlight_set(backlight_config.enable ? backlight_config.level : 0);
}
void backlight_step(void)
{
backlight_config.level++;
if(backlight_config.level > BACKLIGHT_LEVELS)
{
backlight_config.level = 0;
}
backlight_config.enable = !!backlight_config.level;
eeconfig_write_backlight(backlight_config.raw);
dprintf("backlight step: %u\n", backlight_config.level);
backlight_set(backlight_config.level);
}
-148
View File
@@ -1,148 +0,0 @@
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
#include <util/delay.h>
#include "bootloader.h"
#ifdef PROTOCOL_LUFA
#include <LUFA/Drivers/USB/USB.h>
#endif
/* Boot Section Size in *BYTEs*
* Teensy halfKay 512
* Teensy++ halfKay 1024
* Atmel DFU loader 4096
* LUFA bootloader 4096
* USBaspLoader 2048
*/
#ifndef BOOTLOADER_SIZE
#warning To use bootloader_jump() you need to define BOOTLOADER_SIZE in config.h.
#define BOOTLOADER_SIZE 4096
#endif
#define FLASH_SIZE (FLASHEND + 1L)
#define BOOTLOADER_START (FLASH_SIZE - BOOTLOADER_SIZE)
/*
* Entering the Bootloader via Software
* http://www.fourwalledcubicle.com/files/LUFA/Doc/120730/html/_page__software_bootloader_start.html
*/
#define BOOTLOADER_RESET_KEY 0xB007B007
uint32_t reset_key __attribute__ ((section (".noinit")));
/* initialize MCU status by watchdog reset */
void bootloader_jump(void) {
#ifdef PROTOCOL_LUFA
USB_Disable();
cli();
_delay_ms(2000);
#endif
#ifdef PROTOCOL_PJRC
cli();
UDCON = 1;
USBCON = (1<<FRZCLK);
UCSR1B = 0;
_delay_ms(5);
#endif
// watchdog reset
reset_key = BOOTLOADER_RESET_KEY;
wdt_enable(WDTO_250MS);
for (;;);
}
/* this runs before main() */
void bootloader_jump_after_watchdog_reset(void) __attribute__ ((used, naked, section (".init3")));
void bootloader_jump_after_watchdog_reset(void)
{
if ((MCUSR & (1<<WDRF)) && reset_key == BOOTLOADER_RESET_KEY) {
reset_key = 0;
// My custom USBasploader requires this to come up.
MCUSR = 0;
// Seems like Teensy halfkay loader requires clearing WDRF and disabling watchdog.
MCUSR &= ~(1<<WDRF);
wdt_disable();
// This is compled into 'icall', address should be in word unit, not byte.
((void (*)(void))(BOOTLOADER_START/2))();
}
}
#if 0
/* Jumping To The Bootloader
* http://www.pjrc.com/teensy/jump_to_bootloader.html
*
* This method doen't work when using LUFA. idk why.
* - needs to initialize more regisers or interrupt setting?
*/
void bootloader_jump(void) {
#ifdef PROTOCOL_LUFA
USB_Disable();
cli();
_delay_ms(2000);
#endif
#ifdef PROTOCOL_PJRC
cli();
UDCON = 1;
USBCON = (1<<FRZCLK);
UCSR1B = 0;
_delay_ms(5);
#endif
/*
* Initialize
*/
#if defined(__AVR_AT90USB162__)
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0;
TIMSK0 = 0; TIMSK1 = 0; UCSR1B = 0;
DDRB = 0; DDRC = 0; DDRD = 0;
PORTB = 0; PORTC = 0; PORTD = 0;
#elif defined(__AVR_ATmega32U4__)
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
TIMSK0 = 0; TIMSK1 = 0; TIMSK3 = 0; TIMSK4 = 0; UCSR1B = 0; TWCR = 0;
DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0; TWCR = 0;
PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
#elif defined(__AVR_AT90USB646__)
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
#elif defined(__AVR_AT90USB1286__)
EIMSK = 0; PCICR = 0; SPCR = 0; ACSR = 0; EECR = 0; ADCSRA = 0;
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0; TIMSK3 = 0; UCSR1B = 0; TWCR = 0;
DDRA = 0; DDRB = 0; DDRC = 0; DDRD = 0; DDRE = 0; DDRF = 0;
PORTA = 0; PORTB = 0; PORTC = 0; PORTD = 0; PORTE = 0; PORTF = 0;
#endif
/*
* USBaspLoader
*/
#if defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
// This makes custom USBasploader come up.
MCUSR = 0;
// initialize ports
PORTB = 0; PORTC= 0; PORTD = 0;
DDRB = 0; DDRC= 0; DDRD = 0;
// disable interrupts
EIMSK = 0; EECR = 0; SPCR = 0;
ACSR = 0; SPMCSR = 0; WDTCSR = 0; PCICR = 0;
TIMSK0 = 0; TIMSK1 = 0; TIMSK2 = 0;
ADCSRA = 0; TWCR = 0; UCSR0B = 0;
#endif
// This is compled into 'icall', address should be in word unit, not byte.
((void (*)(void))(BOOTLOADER_START/2))();
}
#endif
-632
View File
@@ -1,632 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <util/delay.h>
#include "keycode.h"
#include "host.h"
#include "keymap.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "timer.h"
#include "keyboard.h"
#include "bootloader.h"
#include "action_layer.h"
#include "action_util.h"
#include "eeconfig.h"
#include "sleep_led.h"
#include "led.h"
#include "command.h"
#include "backlight.h"
#ifdef MOUSEKEY_ENABLE
#include "mousekey.h"
#endif
#ifdef PROTOCOL_PJRC
# include "usb_keyboard.h"
# ifdef EXTRAKEY_ENABLE
# include "usb_extra.h"
# endif
#endif
#ifdef PROTOCOL_VUSB
# include "usbdrv.h"
#endif
static bool command_common(uint8_t code);
static void command_common_help(void);
static bool command_console(uint8_t code);
static void command_console_help(void);
#ifdef MOUSEKEY_ENABLE
static bool mousekey_console(uint8_t code);
static void mousekey_console_help(void);
#endif
static uint8_t numkey2num(uint8_t code);
static void switch_default_layer(uint8_t layer);
typedef enum { ONESHOT, CONSOLE, MOUSEKEY } cmdstate_t;
static cmdstate_t state = ONESHOT;
bool command_proc(uint8_t code)
{
switch (state) {
case ONESHOT:
if (!IS_COMMAND())
return false;
return (command_extra(code) || command_common(code));
case CONSOLE:
command_console(code);
break;
#ifdef MOUSEKEY_ENABLE
case MOUSEKEY:
mousekey_console(code);
break;
#endif
default:
state = ONESHOT;
return false;
}
return true;
}
/* This allows to define extra commands. return false when not processed. */
bool command_extra(uint8_t code) __attribute__ ((weak));
bool command_extra(uint8_t code)
{
return false;
}
/***********************************************************
* Command common
***********************************************************/
static void command_common_help(void)
{
print("\n\n----- Command Help -----\n");
print("c: enter console mode\n");
print("d: toggle debug enable\n");
print("x: toggle matrix debug\n");
print("k: toggle keyboard debug\n");
print("m: toggle mouse debug\n");
#ifdef SLEEP_LED_ENABLE
print("z: toggle sleep LED test\n");
#endif
print("v: print device version & info\n");
print("t: print timer count\n");
print("s: print status\n");
print("e: print eeprom config\n");
#ifdef NKRO_ENABLE
print("n: toggle NKRO\n");
#endif
print("0/F10: switch to Layer0 \n");
print("1/F1: switch to Layer1 \n");
print("2/F2: switch to Layer2 \n");
print("3/F3: switch to Layer3 \n");
print("4/F4: switch to Layer4 \n");
print("PScr: power down/remote wake-up\n");
print("Caps: Lock Keyboard(Child Proof)\n");
print("Paus: jump to bootloader\n");
}
#ifdef BOOTMAGIC_ENABLE
static void print_eeconfig(void)
{
print("default_layer: "); print_dec(eeconfig_read_default_layer()); print("\n");
debug_config_t dc;
dc.raw = eeconfig_read_debug();
print("debug_config.raw: "); print_hex8(dc.raw); print("\n");
print(".enable: "); print_dec(dc.enable); print("\n");
print(".matrix: "); print_dec(dc.matrix); print("\n");
print(".keyboard: "); print_dec(dc.keyboard); print("\n");
print(".mouse: "); print_dec(dc.mouse); print("\n");
keymap_config_t kc;
kc.raw = eeconfig_read_keymap();
print("keymap_config.raw: "); print_hex8(kc.raw); print("\n");
print(".swap_control_capslock: "); print_dec(kc.swap_control_capslock); print("\n");
print(".capslock_to_control: "); print_dec(kc.capslock_to_control); print("\n");
print(".swap_lalt_lgui: "); print_dec(kc.swap_lalt_lgui); print("\n");
print(".swap_ralt_rgui: "); print_dec(kc.swap_ralt_rgui); print("\n");
print(".no_gui: "); print_dec(kc.no_gui); print("\n");
print(".swap_grave_esc: "); print_dec(kc.swap_grave_esc); print("\n");
print(".swap_backslash_backspace: "); print_dec(kc.swap_backslash_backspace); print("\n");
#ifdef BACKLIGHT_ENABLE
backlight_config_t bc;
bc.raw = eeconfig_read_backlight();
print("backlight_config.raw: "); print_hex8(bc.raw); print("\n");
print(".enable: "); print_dec(bc.enable); print("\n");
print(".level: "); print_dec(bc.level); print("\n");
#endif
}
#endif
static bool command_common(uint8_t code)
{
static host_driver_t *host_driver = 0;
switch (code) {
#ifdef SLEEP_LED_ENABLE
case KC_Z:
// test breathing sleep LED
print("Sleep LED test\n");
sleep_led_toggle();
led_set(host_keyboard_leds());
break;
#endif
#ifdef BOOTMAGIC_ENABLE
case KC_E:
print("eeconfig:\n");
print_eeconfig();
break;
#endif
case KC_CAPSLOCK:
if (host_get_driver()) {
host_driver = host_get_driver();
host_set_driver(0);
print("Locked.\n");
} else {
host_set_driver(host_driver);
print("Unlocked.\n");
}
break;
case KC_H:
case KC_SLASH: /* ? */
command_common_help();
break;
case KC_C:
debug_matrix = false;
debug_keyboard = false;
debug_mouse = false;
debug_enable = false;
command_console_help();
print("\nEnter Console Mode\n");
print("C> ");
state = CONSOLE;
break;
case KC_PAUSE:
clear_keyboard();
print("\n\nJump to bootloader... ");
_delay_ms(1000);
bootloader_jump(); // not return
print("not supported.\n");
break;
case KC_D:
if (debug_enable) {
print("\nDEBUG: disabled.\n");
debug_matrix = false;
debug_keyboard = false;
debug_mouse = false;
debug_enable = false;
} else {
print("\nDEBUG: enabled.\n");
debug_enable = true;
}
break;
case KC_X: // debug matrix toggle
debug_matrix = !debug_matrix;
if (debug_matrix) {
print("\nDEBUG: matrix enabled.\n");
debug_enable = true;
} else {
print("\nDEBUG: matrix disabled.\n");
}
break;
case KC_K: // debug keyboard toggle
debug_keyboard = !debug_keyboard;
if (debug_keyboard) {
print("\nDEBUG: keyboard enabled.\n");
debug_enable = true;
} else {
print("\nDEBUG: keyboard disabled.\n");
}
break;
case KC_M: // debug mouse toggle
debug_mouse = !debug_mouse;
if (debug_mouse) {
print("\nDEBUG: mouse enabled.\n");
debug_enable = true;
} else {
print("\nDEBUG: mouse disabled.\n");
}
break;
case KC_V: // print version & information
print("\n\n----- Version -----\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);
break;
case KC_S:
print("\n\n----- Status -----\n");
print_val_hex8(host_keyboard_leds());
#ifdef PROTOCOL_PJRC
print_val_hex8(UDCON);
print_val_hex8(UDIEN);
print_val_hex8(UDINT);
print_val_hex8(usb_keyboard_leds);
print_val_hex8(usb_keyboard_protocol);
print_val_hex8(usb_keyboard_idle_config);
print_val_hex8(usb_keyboard_idle_count);
#endif
#ifdef PROTOCOL_PJRC
# if USB_COUNT_SOF
print_val_hex8(usbSofCount);
# endif
#endif
break;
#ifdef NKRO_ENABLE
case KC_N:
clear_keyboard(); //Prevents stuck keys.
keyboard_nkro = !keyboard_nkro;
if (keyboard_nkro)
print("NKRO: enabled\n");
else
print("NKRO: disabled\n");
break;
#endif
#ifdef EXTRAKEY_ENABLE
case KC_PSCREEN:
// TODO: Power key should take this feature? otherwise any key during suspend.
#ifdef PROTOCOL_PJRC
if (suspend && remote_wakeup) {
usb_remote_wakeup();
} else {
host_system_send(SYSTEM_POWER_DOWN);
host_system_send(0);
_delay_ms(500);
}
#else
host_system_send(SYSTEM_POWER_DOWN);
_delay_ms(100);
host_system_send(0);
_delay_ms(500);
#endif
break;
#endif
case KC_ESC:
case KC_GRV:
case KC_0:
switch_default_layer(0);
break;
case KC_1 ... KC_9:
switch_default_layer((code - KC_1) + 1);
break;
case KC_F1 ... KC_F12:
switch_default_layer((code - KC_F1) + 1);
break;
default:
print("?");
return false;
}
return true;
}
/***********************************************************
* Command console
***********************************************************/
static void command_console_help(void)
{
print("\n\n----- Console Help -----\n");
print("ESC/q: quit\n");
#ifdef MOUSEKEY_ENABLE
print("m: mousekey\n");
#endif
}
static bool command_console(uint8_t code)
{
switch (code) {
case KC_H:
case KC_SLASH: /* ? */
command_console_help();
break;
case KC_Q:
case KC_ESC:
print("\nQuit Console Mode\n");
state = ONESHOT;
return false;
#ifdef MOUSEKEY_ENABLE
case KC_M:
mousekey_console_help();
print("\nEnter Mousekey Console\n");
print("M0>");
state = MOUSEKEY;
return true;
#endif
default:
print("?");
return false;
}
print("C> ");
return true;
}
#ifdef MOUSEKEY_ENABLE
/***********************************************************
* Mousekey console
***********************************************************/
static uint8_t mousekey_param = 0;
static void mousekey_param_print(void)
{
print("\n\n----- Mousekey Parameters -----\n");
print("1: mk_delay(*10ms): "); pdec(mk_delay); print("\n");
print("2: mk_interval(ms): "); pdec(mk_interval); print("\n");
print("3: mk_max_speed: "); pdec(mk_max_speed); print("\n");
print("4: mk_time_to_max: "); pdec(mk_time_to_max); print("\n");
print("5: mk_wheel_max_speed: "); pdec(mk_wheel_max_speed); print("\n");
print("6: mk_wheel_time_to_max: "); pdec(mk_wheel_time_to_max); print("\n");
}
#define PRINT_SET_VAL(v) print(#v " = "); print_dec(v); print("\n");
static void mousekey_param_inc(uint8_t param, uint8_t inc)
{
switch (param) {
case 1:
if (mk_delay + inc < UINT8_MAX)
mk_delay += inc;
else
mk_delay = UINT8_MAX;
PRINT_SET_VAL(mk_delay);
break;
case 2:
if (mk_interval + inc < UINT8_MAX)
mk_interval += inc;
else
mk_interval = UINT8_MAX;
PRINT_SET_VAL(mk_interval);
break;
case 3:
if (mk_max_speed + inc < UINT8_MAX)
mk_max_speed += inc;
else
mk_max_speed = UINT8_MAX;
PRINT_SET_VAL(mk_max_speed);
break;
case 4:
if (mk_time_to_max + inc < UINT8_MAX)
mk_time_to_max += inc;
else
mk_time_to_max = UINT8_MAX;
PRINT_SET_VAL(mk_time_to_max);
break;
case 5:
if (mk_wheel_max_speed + inc < UINT8_MAX)
mk_wheel_max_speed += inc;
else
mk_wheel_max_speed = UINT8_MAX;
PRINT_SET_VAL(mk_wheel_max_speed);
break;
case 6:
if (mk_wheel_time_to_max + inc < UINT8_MAX)
mk_wheel_time_to_max += inc;
else
mk_wheel_time_to_max = UINT8_MAX;
PRINT_SET_VAL(mk_wheel_time_to_max);
break;
}
}
static void mousekey_param_dec(uint8_t param, uint8_t dec)
{
switch (param) {
case 1:
if (mk_delay > dec)
mk_delay -= dec;
else
mk_delay = 0;
PRINT_SET_VAL(mk_delay);
break;
case 2:
if (mk_interval > dec)
mk_interval -= dec;
else
mk_interval = 0;
PRINT_SET_VAL(mk_interval);
break;
case 3:
if (mk_max_speed > dec)
mk_max_speed -= dec;
else
mk_max_speed = 0;
PRINT_SET_VAL(mk_max_speed);
break;
case 4:
if (mk_time_to_max > dec)
mk_time_to_max -= dec;
else
mk_time_to_max = 0;
PRINT_SET_VAL(mk_time_to_max);
break;
case 5:
if (mk_wheel_max_speed > dec)
mk_wheel_max_speed -= dec;
else
mk_wheel_max_speed = 0;
PRINT_SET_VAL(mk_wheel_max_speed);
break;
case 6:
if (mk_wheel_time_to_max > dec)
mk_wheel_time_to_max -= dec;
else
mk_wheel_time_to_max = 0;
PRINT_SET_VAL(mk_wheel_time_to_max);
break;
}
}
static void mousekey_console_help(void)
{
print("\n\n----- Mousekey Parameters Help -----\n");
print("ESC/q: quit\n");
print("1: select mk_delay(*10ms)\n");
print("2: select mk_interval(ms)\n");
print("3: select mk_max_speed\n");
print("4: select mk_time_to_max\n");
print("5: select mk_wheel_max_speed\n");
print("6: select mk_wheel_time_to_max\n");
print("p: print prameters\n");
print("d: set default values\n");
print("up: increase prameters(+1)\n");
print("down: decrease prameters(-1)\n");
print("pgup: increase prameters(+10)\n");
print("pgdown: decrease prameters(-10)\n");
print("\nspeed = delta * max_speed * (repeat / time_to_max)\n");
print("where delta: cursor="); pdec(MOUSEKEY_MOVE_DELTA);
print(", wheel="); pdec(MOUSEKEY_WHEEL_DELTA); print("\n");
print("See http://en.wikipedia.org/wiki/Mouse_keys\n");
}
static bool mousekey_console(uint8_t code)
{
switch (code) {
case KC_H:
case KC_SLASH: /* ? */
mousekey_console_help();
break;
case KC_Q:
case KC_ESC:
mousekey_param = 0;
print("\nQuit Mousekey Console\n");
print("C> ");
state = CONSOLE;
return false;
case KC_P:
mousekey_param_print();
break;
case KC_1:
case KC_2:
case KC_3:
case KC_4:
case KC_5:
case KC_6:
case KC_7:
case KC_8:
case KC_9:
case KC_0:
mousekey_param = numkey2num(code);
print("selected parameter: "); pdec(mousekey_param); print("\n");
break;
case KC_UP:
mousekey_param_inc(mousekey_param, 1);
break;
case KC_DOWN:
mousekey_param_dec(mousekey_param, 1);
break;
case KC_PGUP:
mousekey_param_inc(mousekey_param, 10);
break;
case KC_PGDN:
mousekey_param_dec(mousekey_param, 10);
break;
case KC_D:
mk_delay = MOUSEKEY_DELAY/10;
mk_interval = MOUSEKEY_INTERVAL;
mk_max_speed = MOUSEKEY_MAX_SPEED;
mk_time_to_max = MOUSEKEY_TIME_TO_MAX;
mk_wheel_max_speed = MOUSEKEY_WHEEL_MAX_SPEED;
mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;
print("set default values.\n");
break;
default:
print("?");
return false;
}
print("M"); pdec(mousekey_param); print("> ");
return true;
}
#endif
/***********************************************************
* Utilities
***********************************************************/
static uint8_t numkey2num(uint8_t code)
{
switch (code) {
case KC_1: return 1;
case KC_2: return 2;
case KC_3: return 3;
case KC_4: return 4;
case KC_5: return 5;
case KC_6: return 6;
case KC_7: return 7;
case KC_8: return 8;
case KC_9: return 9;
case KC_0: return 0;
}
return 0;
}
static void switch_default_layer(uint8_t layer)
{
print("switch_default_layer: "); print_dec(biton32(default_layer_state));
print(" to "); print_dec(layer); print("\n");
default_layer_set(1UL<<layer);
clear_keyboard();
}
-29
View File
@@ -1,29 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef COMMAND_H
#define COMMAND
#ifdef COMMAND_ENABLE
bool command_proc(uint8_t code);
/* This allows to extend commands. Return 0 when command is not processed. */
bool command_extra(uint8_t code);
#else
#define command_proc(code) false
#endif
#endif
-62
View File
@@ -1,62 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DEBUG_H
#define DEBUG_H 1
#include "print.h"
#include "debug_config.h"
#ifndef NO_DEBUG
#define dprint(s) do { if (debug_enable) print(s); } while (0)
#define dprintln() do { if (debug_enable) print_crlf(); } while (0)
#define dprintf(fmt, ...) do { if (debug_enable) __xprintf(PSTR(fmt), ##__VA_ARGS__); } while (0)
#define dmsg(s) dprintf("%s at %s: %S\n", __FILE__, __LINE__, PSTR(s))
/* DO NOT USE these anymore */
#define debug(s) do { if (debug_enable) print(s); } while (0)
#define debugln(s) do { if (debug_enable) print_crlf(); } while (0)
#define debug_S(s) do { if (debug_enable) print_S(s); } while (0)
#define debug_P(s) do { if (debug_enable) print_P(s); } while (0)
#define debug_msg(s) do { \
if (debug_enable) { \
print(__FILE__); print(" at "); print_dec(__LINE__); print(" in "); print(": "); print(s); \
} \
} while (0)
#define debug_dec(data) do { if (debug_enable) print_dec(data); } while (0)
#define debug_decs(data) do { if (debug_enable) print_decs(data); } while (0)
#define debug_hex4(data) do { if (debug_enable) print_hex4(data); } while (0)
#define debug_hex8(data) do { if (debug_enable) print_hex8(data); } while (0)
#define debug_hex16(data) do { if (debug_enable) print_hex16(data); } while (0)
#define debug_hex32(data) do { if (debug_enable) print_hex32(data); } while (0)
#define debug_bin8(data) do { if (debug_enable) print_bin8(data); } while (0)
#define debug_bin16(data) do { if (debug_enable) print_bin16(data); } while (0)
#define debug_bin32(data) do { if (debug_enable) print_bin32(data); } while (0)
#define debug_bin_reverse8(data) do { if (debug_enable) print_bin_reverse8(data); } while (0)
#define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0)
#define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0)
#define debug_hex(data) debug_hex8(data)
#define debug_bin(data) debug_bin8(data)
#define debug_bin_reverse(data) debug_bin8(data)
#else
#include "nodebug.h"
#endif
#endif
-51
View File
@@ -1,51 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DEBUG_CONFIG_H
#define DEBUG_CONFIG_H 1
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
/* NOTE: Not portable. Bit field order depends on implementation */
typedef union {
uint8_t raw;
struct {
bool enable:1;
bool matrix:1;
bool keyboard:1;
bool mouse:1;
uint8_t reserved:4;
};
} debug_config_t;
debug_config_t debug_config;
/* for backward compatibility */
#define debug_enable (debug_config.enable)
#define debug_matrix (debug_config.matrix)
#define debug_keyboard (debug_config.keyboard)
#define debug_mouse (debug_config.mouse)
#ifdef __cplusplus
}
#endif
#endif
-45
View File
@@ -1,45 +0,0 @@
#include <stdint.h>
#include <stdbool.h>
#include <avr/eeprom.h>
#include "eeconfig.h"
void eeconfig_init(void)
{
eeprom_write_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
eeprom_write_byte(EECONFIG_DEBUG, 0);
eeprom_write_byte(EECONFIG_DEFAULT_LAYER, 0);
eeprom_write_byte(EECONFIG_KEYMAP, 0);
eeprom_write_byte(EECONFIG_MOUSEKEY_ACCEL, 0);
#ifdef BACKLIGHT_ENABLE
eeprom_write_byte(EECONFIG_BACKLIGHT, 0);
#endif
}
void eeconfig_enable(void)
{
eeprom_write_word(EECONFIG_MAGIC, EECONFIG_MAGIC_NUMBER);
}
void eeconfig_disable(void)
{
eeprom_write_word(EECONFIG_MAGIC, 0xFFFF);
}
bool eeconfig_is_enabled(void)
{
return (eeprom_read_word(EECONFIG_MAGIC) == EECONFIG_MAGIC_NUMBER);
}
uint8_t eeconfig_read_debug(void) { return eeprom_read_byte(EECONFIG_DEBUG); }
void eeconfig_write_debug(uint8_t val) { eeprom_write_byte(EECONFIG_DEBUG, val); }
uint8_t eeconfig_read_default_layer(void) { return eeprom_read_byte(EECONFIG_DEFAULT_LAYER); }
void eeconfig_write_default_layer(uint8_t val) { eeprom_write_byte(EECONFIG_DEFAULT_LAYER, val); }
uint8_t eeconfig_read_keymap(void) { return eeprom_read_byte(EECONFIG_KEYMAP); }
void eeconfig_write_keymap(uint8_t val) { eeprom_write_byte(EECONFIG_KEYMAP, val); }
#ifdef BACKLIGHT_ENABLE
uint8_t eeconfig_read_backlight(void) { return eeprom_read_byte(EECONFIG_BACKLIGHT); }
void eeconfig_write_backlight(uint8_t val) { eeprom_write_byte(EECONFIG_BACKLIGHT, val); }
#endif
-140
View File
@@ -1,140 +0,0 @@
/*
Copyright 2011,2012,2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <util/delay.h>
#include "keyboard.h"
#include "matrix.h"
#include "keymap.h"
#include "host.h"
#include "led.h"
#include "keycode.h"
#include "timer.h"
#include "print.h"
#include "debug.h"
#include "command.h"
#include "util.h"
#include "sendchar.h"
#include "bootmagic.h"
#include "eeconfig.h"
#include "backlight.h"
#ifdef MOUSEKEY_ENABLE
# include "mousekey.h"
#endif
#ifdef PS2_MOUSE_ENABLE
# include "ps2_mouse.h"
#endif
#ifdef MATRIX_HAS_GHOST
static bool has_ghost_in_row(uint8_t row)
{
matrix_row_t matrix_row = matrix_get_row(row);
// No ghost exists when less than 2 keys are down on the row
if (((matrix_row - 1) & matrix_row) == 0)
return false;
// Ghost occurs when the row shares column line with other row
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
if (i != row && (matrix_get_row(i) & matrix_row))
return true;
}
return false;
}
#endif
void keyboard_init(void)
{
timer_init();
matrix_init();
#ifdef PS2_MOUSE_ENABLE
ps2_mouse_init();
#endif
#ifdef BOOTMAGIC_ENABLE
bootmagic();
#endif
#ifdef BACKLIGHT_ENABLE
backlight_init();
#endif
}
/*
* Do keyboard routine jobs: scan mantrix, light LEDs, ...
* This is repeatedly called as fast as possible.
*/
void keyboard_task(void)
{
static matrix_row_t matrix_prev[MATRIX_ROWS];
static uint8_t led_status = 0;
matrix_row_t matrix_row = 0;
matrix_row_t matrix_change = 0;
matrix_scan();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
matrix_row = matrix_get_row(r);
matrix_change = matrix_row ^ matrix_prev[r];
if (matrix_change) {
if (debug_matrix) matrix_print();
#ifdef MATRIX_HAS_GHOST
if (has_ghost_in_row(r)) {
matrix_prev[r] = matrix_row;
continue;
}
#endif
for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & ((matrix_row_t)1<<c)) {
action_exec((keyevent_t){
.key = (key_t){ .row = r, .col = c },
.pressed = (matrix_row & ((matrix_row_t)1<<c)),
.time = (timer_read() | 1) /* time should not be 0 */
});
// record a processed key
matrix_prev[r] ^= ((matrix_row_t)1<<c);
// process a key per task call
goto MATRIX_LOOP_END;
}
}
}
}
// call with pseudo tick event when no real key event.
action_exec(TICK);
MATRIX_LOOP_END:
#ifdef MOUSEKEY_ENABLE
// mousekey repeat & acceleration
mousekey_task();
#endif
#ifdef PS2_MOUSE_ENABLE
ps2_mouse_task();
#endif
// update LED
if (led_status != host_keyboard_leds()) {
led_status = host_keyboard_leds();
keyboard_set_leds(led_status);
}
}
void keyboard_set_leds(uint8_t leds)
{
if (debug_keyboard) { debug("keyboard_set_led: "); debug_hex8(leds); debug("\n"); }
led_set(leds);
}
-186
View File
@@ -1,186 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <avr/pgmspace.h>
#include "keymap.h"
#include "report.h"
#include "keycode.h"
#include "action_layer.h"
#include "action.h"
#include "action_macro.h"
#include "debug.h"
static action_t keycode_to_action(uint8_t keycode);
/* converts key to action */
action_t action_for_key(uint8_t layer, key_t key)
{
uint8_t keycode = keymap_key_to_keycode(layer, key);
switch (keycode) {
case KC_FN0 ... KC_FN31:
return keymap_fn_to_action(keycode);
#ifdef BOOTMAGIC_ENABLE
case KC_CAPSLOCK:
case KC_LOCKING_CAPS:
if (keymap_config.swap_control_capslock || keymap_config.capslock_to_control) {
return keycode_to_action(KC_LCTL);
}
return keycode_to_action(keycode);
case KC_LCTL:
if (keymap_config.swap_control_capslock) {
return keycode_to_action(KC_CAPSLOCK);
}
return keycode_to_action(KC_LCTL);
case KC_LALT:
if (keymap_config.swap_lalt_lgui) {
if (keymap_config.no_gui) {
return keycode_to_action(ACTION_NO);
}
return keycode_to_action(KC_LGUI);
}
return keycode_to_action(KC_LALT);
case KC_LGUI:
if (keymap_config.swap_lalt_lgui) {
return keycode_to_action(KC_LALT);
}
if (keymap_config.no_gui) {
return keycode_to_action(ACTION_NO);
}
return keycode_to_action(KC_LGUI);
case KC_RALT:
if (keymap_config.swap_ralt_rgui) {
if (keymap_config.no_gui) {
return keycode_to_action(ACTION_NO);
}
return keycode_to_action(KC_RGUI);
}
return keycode_to_action(KC_RALT);
case KC_RGUI:
if (keymap_config.swap_ralt_rgui) {
return keycode_to_action(KC_RALT);
}
if (keymap_config.no_gui) {
return keycode_to_action(ACTION_NO);
}
return keycode_to_action(KC_RGUI);
case KC_GRAVE:
if (keymap_config.swap_grave_esc) {
return keycode_to_action(KC_ESC);
}
return keycode_to_action(KC_GRAVE);
case KC_ESC:
if (keymap_config.swap_grave_esc) {
return keycode_to_action(KC_GRAVE);
}
return keycode_to_action(KC_ESC);
case KC_BSLASH:
if (keymap_config.swap_backslash_backspace) {
return keycode_to_action(KC_BSPACE);
}
return keycode_to_action(KC_BSLASH);
case KC_BSPACE:
if (keymap_config.swap_backslash_backspace) {
return keycode_to_action(KC_BSLASH);
}
return keycode_to_action(KC_BSPACE);
#endif
default:
return keycode_to_action(keycode);
}
}
/* Macro */
__attribute__ ((weak))
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
return MACRO_NONE;
}
/* Function */
__attribute__ ((weak))
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
{
}
/* translates keycode to action */
static action_t keycode_to_action(uint8_t keycode)
{
action_t action;
switch (keycode) {
case KC_A ... KC_EXSEL:
case KC_LCTRL ... KC_RGUI:
action.code = ACTION_KEY(keycode);
break;
case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));
break;
case KC_AUDIO_MUTE ... KC_WWW_FAVORITES:
action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));
break;
case KC_MS_UP ... KC_MS_ACCEL2:
action.code = ACTION_MOUSEKEY(keycode);
break;
case KC_TRNS:
action.code = ACTION_TRANSPARENT;
break;
default:
action.code = ACTION_NO;
break;
}
return action;
}
#ifdef USE_LEGACY_KEYMAP
/*
* Legacy keymap support
* Consider using new keymap API instead.
*/
__attribute__ ((weak))
uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
{
return keymap_get_keycode(layer, key.row, key.col);
}
/* Legacy keymap support */
__attribute__ ((weak))
action_t keymap_fn_to_action(uint8_t keycode)
{
action_t action = { .code = ACTION_NO };
switch (keycode) {
case KC_FN0 ... KC_FN31:
{
uint8_t layer = keymap_fn_layer(FN_INDEX(keycode));
uint8_t key = keymap_fn_keycode(FN_INDEX(keycode));
if (key) {
action.code = ACTION_LAYER_TAP_KEY(layer, key);
} else {
action.code = ACTION_LAYER_MOMENTARY(layer);
}
}
return action;
default:
return action;
}
}
#endif
-71
View File
@@ -1,71 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KEYMAP_H
#define KEYMAP_H
#include <stdint.h>
#include <stdbool.h>
#include "action.h"
#ifdef BOOTMAGIC_ENABLE
/* NOTE: Not portable. Bit field order depends on implementation */
typedef union {
uint8_t raw;
struct {
bool swap_control_capslock:1;
bool capslock_to_control:1;
bool swap_lalt_lgui:1;
bool swap_ralt_rgui:1;
bool no_gui:1;
bool swap_grave_esc:1;
bool swap_backslash_backspace:1;
bool reserved:1;
};
} keymap_config_t;
keymap_config_t keymap_config;
#endif
/* translates key to keycode */
uint8_t keymap_key_to_keycode(uint8_t layer, key_t key);
/* translates Fn keycode to action */
action_t keymap_fn_to_action(uint8_t keycode);
#ifdef USE_LEGACY_KEYMAP
/*
* Legacy keymap
* Consider using new keymap API above instead.
*/
/* keycode of key */
__attribute__ ((deprecated))
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col);
/* layer to move during press Fn key */
__attribute__ ((deprecated))
uint8_t keymap_fn_layer(uint8_t fn_bits);
/* keycode to send when release Fn key without using */
__attribute__ ((deprecated))
uint8_t keymap_fn_keycode(uint8_t fn_bits);
#endif
#endif
-56
View File
@@ -1,56 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MATRIX_H
#define MATRIX_H
#include <stdint.h>
#include <stdbool.h>
#if (MATRIX_COLS <= 8)
typedef uint8_t matrix_row_t;
#elif (MATRIX_COLS <= 16)
typedef uint16_t matrix_row_t;
#elif (MATRIX_COLS <= 32)
typedef uint32_t matrix_row_t;
#else
#error "MATRIX_COLS: invalid value"
#endif
#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col))
/* number of matrix rows */
uint8_t matrix_rows(void);
/* number of matrix columns */
uint8_t matrix_cols(void);
/* intialize matrix for scaning. should be called once. */
void matrix_init(void);
/* scan all key states on matrix */
uint8_t matrix_scan(void);
/* whether modified from previous scan. used after matrix_scan. */
bool matrix_is_modified(void) __attribute__ ((deprecated));
/* whether a swtich is on */
bool matrix_is_on(uint8_t row, uint8_t col);
/* matrix state on row */
matrix_row_t matrix_get_row(uint8_t row);
/* print matrix for debug */
void matrix_print(void);
#endif
-69
View File
@@ -1,69 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MOUSEKEY_H
#define MOUSEKEY_H
#include <stdbool.h>
#include "host.h"
/* max value on report descriptor */
#define MOUSEKEY_MOVE_MAX 127
#define MOUSEKEY_WHEEL_MAX 127
#ifndef MOUSEKEY_MOVE_DELTA
#define MOUSEKEY_MOVE_DELTA 5
#endif
#ifndef MOUSEKEY_WHEEL_DELTA
#define MOUSEKEY_WHEEL_DELTA 1
#endif
#ifndef MOUSEKEY_DELAY
#define MOUSEKEY_DELAY 300
#endif
#ifndef MOUSEKEY_INTERVAL
#define MOUSEKEY_INTERVAL 50
#endif
#ifndef MOUSEKEY_MAX_SPEED
#define MOUSEKEY_MAX_SPEED 10
#endif
#ifndef MOUSEKEY_TIME_TO_MAX
#define MOUSEKEY_TIME_TO_MAX 20
#endif
#ifndef MOUSEKEY_WHEEL_MAX_SPEED
#define MOUSEKEY_WHEEL_MAX_SPEED 8
#endif
#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
#define MOUSEKEY_WHEEL_TIME_TO_MAX 40
#endif
uint8_t mk_delay;
uint8_t mk_interval;
uint8_t mk_max_speed;
uint8_t mk_time_to_max;
uint8_t mk_wheel_max_speed;
uint8_t mk_wheel_time_to_max;
void mousekey_task(void);
void mousekey_on(uint8_t code);
void mousekey_off(uint8_t code);
void mousekey_clear(void);
void mousekey_send(void);
#endif
-49
View File
@@ -1,49 +0,0 @@
/*
Copyright 2013 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef NODEBUG_H
#define NODEBUG_H 1
#include "debug_config.h"
#define dprint(s)
#define dprintln(s)
#define dprintf(fmt, ...)
#define dmsg(s)
#define debug(s)
#define debugln(s)
#define debug_S(s)
#define debug_P(s)
#define debug_msg(s)
#define debug_dec(data)
#define debug_decs(data)
#define debug_hex4(data)
#define debug_hex8(data)
#define debug_hex16(data)
#define debug_hex32(data)
#define debug_bin8(data)
#define debug_bin16(data)
#define debug_bin32(data)
#define debug_bin_reverse8(data)
#define debug_bin_reverse16(data)
#define debug_bin_reverse32(data)
#define debug_hex(data)
#define debug_bin(data)
#define debug_bin_reverse(data)
#endif
-139
View File
@@ -1,139 +0,0 @@
/* Copyright 2012 Jun Wako <wakojun@gmail.com> */
/* Very basic print functions, intended to be used with usb_debug_only.c
* http://www.pjrc.com/teensy/
* Copyright (c) 2008 PJRC.COM, LLC
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef PRINT_H__
#define PRINT_H__ 1
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "xprintf.h"
#include "util.h"
// this macro allows you to write print("some text") and
// the string is automatically placed into flash memory :)
// TODO: avoid collision with arduino/Print.h
#ifndef __cplusplus
#define print(s) print_P(PSTR(s))
#endif
#define println(s) print_P(PSTR(s "\n"))
/* for old name */
#define pdec(data) print_dec(data)
#define pdec16(data) print_dec(data)
#define phex(data) print_hex8(data)
#define phex16(data) print_hex16(data)
#define pbin(data) print_bin8(data)
#define pbin16(data) print_bin16(data)
#define pbin_reverse(data) print_bin_reverse8(data)
#define pbin_reverse16(data) print_bin_reverse16(data)
/* print value utility */
#define print_val_dec(v) xprintf(#v ": %u\n", v)
#define print_val_decs(v) xprintf(#v ": %d\n", v)
#define print_val_hex8(v) xprintf(#v ": %X\n", v)
#define print_val_hex16(v) xprintf(#v ": %02X\n", v)
#define print_val_hex32(v) xprintf(#v ": %04lX\n", v)
#define print_val_bin8(v) xprintf(#v ": %08b\n", v)
#define print_val_bin16(v) xprintf(#v ": %016b\n", v)
#define print_val_bin32(v) xprintf(#v ": %032lb\n", v)
#define print_val_bin_reverse8(v) xprintf(#v ": %08b\n", bitrev(v))
#define print_val_bin_reverse16(v) xprintf(#v ": %016b\n", bitrev16(v))
#define print_val_bin_reverse32(v) xprintf(#v ": %032lb\n", bitrev32(v))
#ifndef NO_PRINT
#ifdef __cplusplus
extern "C" {
#endif
/* function pointer of sendchar to be used by print utility */
void print_set_sendchar(int8_t (*print_sendchar_func)(uint8_t));
/* print string stored in data memory(SRAM)
* print_S("hello world");
* This consumes precious SRAM memory space for string.
*/
void print_S(const char *s);
void print_lf(void);
void print_crlf(void);
/* print string stored in program memory(FLASH)
* print_P(PSTR("hello world");
* This consumes relatively abundant FLASH memory area not SRAM.
*/
#define print_P(s) xputs(s)
/* decimal */
#define print_dec(i) xprintf("%u", i)
#define print_decs(i) xprintf("%d", i)
/* hex */
#define print_hex4(i) xprintf("%X", i)
#define print_hex8(i) xprintf("%02X", i)
#define print_hex16(i) xprintf("%04X", i)
#define print_hex32(i) xprintf("%08lX", i)
/* binary */
#define print_bin4(i) xprintf("%04b", i)
#define print_bin8(i) xprintf("%08b", i)
#define print_bin16(i) xprintf("%016b", i)
#define print_bin32(i) xprintf("%032lb", i)
#define print_bin_reverse8(i) xprintf("%08b", bitrev(i))
#define print_bin_reverse16(i) xprintf("%016b", bitrev16(i))
#define print_bin_reverse32(i) xprintf("%032lb", bitrev32(i))
#ifdef __cplusplus
}
#endif
#else
#define print_set_sendchar(func)
#define print_S(s)
#define print_P(s)
#define print_dec(data)
#define print_decs(data)
#define print_hex4(data)
#define print_hex8(data)
#define print_hex16(data)
#define print_hex32(data)
#define print_bin4(data)
#define print_bin8(data)
#define print_bin16(data)
#define print_bin32(data)
#define print_bin_reverse8(data)
#define print_bin_reverse16(data)
#define print_bin_reverse32(data)
#endif
#endif
-160
View File
@@ -1,160 +0,0 @@
/*
Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef REPORT_H
#define REPORT_H
#include <stdint.h>
#include "keycode.h"
/* report id */
#define REPORT_ID_MOUSE 1
#define REPORT_ID_SYSTEM 2
#define REPORT_ID_CONSUMER 3
/* mouse buttons */
#define MOUSE_BTN1 (1<<0)
#define MOUSE_BTN2 (1<<1)
#define MOUSE_BTN3 (1<<2)
#define MOUSE_BTN4 (1<<3)
#define MOUSE_BTN5 (1<<4)
/* Consumer Page(0x0C)
* following are supported by Windows: http://msdn.microsoft.com/en-us/windows/hardware/gg463372.aspx
*/
#define AUDIO_MUTE 0x00E2
#define AUDIO_VOL_UP 0x00E9
#define AUDIO_VOL_DOWN 0x00EA
#define TRANSPORT_NEXT_TRACK 0x00B5
#define TRANSPORT_PREV_TRACK 0x00B6
#define TRANSPORT_STOP 0x00B7
#define TRANSPORT_STOP_EJECT 0x00CC
#define TRANSPORT_PLAY_PAUSE 0x00CD
/* application launch */
#define AL_CC_CONFIG 0x0183
#define AL_EMAIL 0x018A
#define AL_CALCULATOR 0x0192
#define AL_LOCAL_BROWSER 0x0194
/* application control */
#define AC_SEARCH 0x0221
#define AC_HOME 0x0223
#define AC_BACK 0x0224
#define AC_FORWARD 0x0225
#define AC_STOP 0x0226
#define AC_REFRESH 0x0227
#define AC_BOOKMARKS 0x022A
/* supplement for Bluegiga iWRAP HID(not supported by Windows?) */
#define AL_LOCK 0x019E
#define TRANSPORT_RECORD 0x00B2
#define TRANSPORT_REWIND 0x00B4
#define TRANSPORT_EJECT 0x00B8
#define AC_MINIMIZE 0x0206
/* Generic Desktop Page(0x01) - system power control */
#define SYSTEM_POWER_DOWN 0x0081
#define SYSTEM_SLEEP 0x0082
#define SYSTEM_WAKE_UP 0x0083
/* key report size(NKRO or boot mode) */
#if defined(PROTOCOL_PJRC) && defined(NKRO_ENABLE)
# include "usb.h"
# define REPORT_SIZE KBD2_SIZE
# define REPORT_KEYS (KBD2_SIZE - 2)
# define REPORT_BITS (KBD2_SIZE - 1)
#elif defined(PROTOCOL_LUFA) && defined(NKRO_ENABLE)
# include "protocol/lufa/descriptor.h"
# define REPORT_SIZE NKRO_EPSIZE
# define REPORT_KEYS (NKRO_EPSIZE - 2)
# define REPORT_BITS (NKRO_EPSIZE - 1)
#else
# define REPORT_SIZE 8
# define REPORT_KEYS 6
#endif
#ifdef __cplusplus
extern "C" {
#endif
typedef union {
uint8_t raw[REPORT_SIZE];
struct {
uint8_t mods;
uint8_t reserved;
uint8_t keys[REPORT_KEYS];
};
#ifdef NKRO_ENABLE
struct {
uint8_t mods;
uint8_t bits[REPORT_BITS];
} nkro;
#endif
} __attribute__ ((packed)) report_keyboard_t;
/*
typedef struct {
uint8_t mods;
uint8_t reserved;
uint8_t keys[REPORT_KEYS];
} __attribute__ ((packed)) report_keyboard_t;
*/
typedef struct {
uint8_t buttons;
int8_t x;
int8_t y;
int8_t v;
int8_t h;
} __attribute__ ((packed)) report_mouse_t;
/* keycode to system usage */
#define KEYCODE2SYSTEM(key) \
(key == KC_SYSTEM_POWER ? SYSTEM_POWER_DOWN : \
(key == KC_SYSTEM_SLEEP ? SYSTEM_SLEEP : \
(key == KC_SYSTEM_WAKE ? SYSTEM_WAKE_UP : 0)))
/* keycode to consumer usage */
#define KEYCODE2CONSUMER(key) \
(key == KC_AUDIO_MUTE ? AUDIO_MUTE : \
(key == KC_AUDIO_VOL_UP ? AUDIO_VOL_UP : \
(key == KC_AUDIO_VOL_DOWN ? AUDIO_VOL_DOWN : \
(key == KC_MEDIA_NEXT_TRACK ? TRANSPORT_NEXT_TRACK : \
(key == KC_MEDIA_PREV_TRACK ? TRANSPORT_PREV_TRACK : \
(key == KC_MEDIA_STOP ? TRANSPORT_STOP : \
(key == KC_MEDIA_EJECT ? TRANSPORT_STOP_EJECT : \
(key == KC_MEDIA_PLAY_PAUSE ? TRANSPORT_PLAY_PAUSE : \
(key == KC_MEDIA_SELECT ? AL_CC_CONFIG : \
(key == KC_MAIL ? AL_EMAIL : \
(key == KC_CALCULATOR ? AL_CALCULATOR : \
(key == KC_MY_COMPUTER ? AL_LOCAL_BROWSER : \
(key == KC_WWW_SEARCH ? AC_SEARCH : \
(key == KC_WWW_HOME ? AC_HOME : \
(key == KC_WWW_BACK ? AC_BACK : \
(key == KC_WWW_FORWARD ? AC_FORWARD : \
(key == KC_WWW_STOP ? AC_STOP : \
(key == KC_WWW_REFRESH ? AC_REFRESH : \
(key == KC_WWW_FAVORITES ? AC_BOOKMARKS : 0)))))))))))))))))))
#ifdef __cplusplus
}
#endif
#endif
-95
View File
@@ -1,95 +0,0 @@
#include <stdint.h>
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
#include "led.h"
#include "sleep_led.h"
/* Software PWM
* ______ ______ __
* | ON |___OFF___| ON |___OFF___| ....
* |<-------------->|<-------------->|<- ....
* PWM period PWM period
*
* 256 interrupts/period[resolution]
* 64 periods/second[frequency]
* 256*64 interrupts/second
* F_CPU/(256*64) clocks/interrupt
*/
#define SLEEP_LED_TIMER_TOP F_CPU/(256*64)
void sleep_led_init(void)
{
/* Timer1 setup */
/* CTC mode */
TCCR1B |= _BV(WGM12);
/* Clock selelct: clk/1 */
TCCR1B |= _BV(CS10);
/* Set TOP value */
uint8_t sreg = SREG;
cli();
OCR1AH = (SLEEP_LED_TIMER_TOP>>8)&0xff;
OCR1AL = SLEEP_LED_TIMER_TOP&0xff;
SREG = sreg;
}
void sleep_led_enable(void)
{
/* Enable Compare Match Interrupt */
TIMSK1 |= _BV(OCIE1A);
}
void sleep_led_disable(void)
{
/* Disable Compare Match Interrupt */
TIMSK1 &= ~_BV(OCIE1A);
}
void sleep_led_toggle(void)
{
/* Disable Compare Match Interrupt */
TIMSK1 ^= _BV(OCIE1A);
}
/* Breathing Sleep LED brighness(PWM On period) table
* (64[steps] * 4[duration]) / 64[PWM periods/s] = 4 second breath cycle
*
* http://www.wolframalpha.com/input/?i=%28sin%28+x%2F64*pi%29**8+*+255%2C+x%3D0+to+63
* (0..63).each {|x| p ((sin(x/64.0*PI)**8)*255).to_i }
*/
static const uint8_t breathing_table[64] PROGMEM = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 6, 10,
15, 23, 32, 44, 58, 74, 93, 113, 135, 157, 179, 199, 218, 233, 245, 252,
255, 252, 245, 233, 218, 199, 179, 157, 135, 113, 93, 74, 58, 44, 32, 23,
15, 10, 6, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
ISR(TIMER1_COMPA_vect)
{
/* Software PWM
* timer:1111 1111 1111 1111
* \_____/\/ \_______/____ count(0-255)
* \ \______________ duration of step(4)
* \__________________ index of step table(0-63)
*/
static union {
uint16_t row;
struct {
uint8_t count:8;
uint8_t duration:2;
uint8_t index:6;
} pwm;
} timer = { .row = 0 };
timer.row++;
// LED on
if (timer.pwm.count == 0) {
led_set(1<<USB_LED_CAPS_LOCK);
}
// LED off
if (timer.pwm.count == pgm_read_byte(&breathing_table[timer.pwm.index])) {
led_set(0);
}
}
-76
View File
@@ -1,76 +0,0 @@
#include "suspend.h"
#include "matrix.h"
#include "action.h"
#include "backlight.h"
void suspend_power_down(void)
{
#ifdef BACKLIGHT_ENABLE
backlight_set(0);
#endif
#ifndef NO_SUSPEND_POWER_DOWN
// Enable watchdog to wake from MCU sleep
cli();
wdt_reset();
// Watchdog Interrupt and System Reset Mode
//wdt_enable(WDTO_1S);
//WDTCSR |= _BV(WDIE);
// Watchdog Interrupt Mode
wdt_intr_enable(WDTO_120MS);
// TODO: more power saving
// See PicoPower application note
// - I/O port input with pullup
// - prescale clock
// - BOD disable
// - Power Reduction Register PRR
// sleep in power down mode
set_sleep_mode(SLEEP_MODE_PWR_DOWN);
sleep_enable();
sei();
sleep_cpu();
sleep_disable();
// Disable watchdog after sleep
wdt_disable();
#endif
}
bool suspend_wakeup_condition(void)
{
matrix_scan();
for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
if (matrix_get_row(r)) return true;
}
return false;
}
// run immediately after wakeup
void suspend_wakeup_init(void)
{
// clear keyboard state
clear_keyboard();
#ifdef BACKLIGHT_ENABLE
backlight_init();
#endif
}
#ifndef NO_SUSPEND_POWER_DOWN
/* watchdog timeout */
ISR(WDT_vect)
{
/* wakeup from MCU sleep mode */
/*
// blink LED
static uint8_t led_state = 0;
static uint8_t led_count = 0;
led_count++;
if ((led_count & 0x07) == 0) {
led_set((led_state ^= (1<<USB_LED_CAPS_LOCK)));
}
*/
}
#endif
-32
View File
@@ -1,32 +0,0 @@
#ifndef SUSPEND_H
#define SUSPEND_H
#include <stdint.h>
#include <stdbool.h>
#include <avr/sleep.h>
#include <avr/wdt.h>
#include <avr/interrupt.h>
#define wdt_intr_enable(value) \
__asm__ __volatile__ ( \
"in __tmp_reg__,__SREG__" "\n\t" \
"cli" "\n\t" \
"wdr" "\n\t" \
"sts %0,%1" "\n\t" \
"out __SREG__,__tmp_reg__" "\n\t" \
"sts %0,%2" "\n\t" \
: /* no outputs */ \
: "M" (_SFR_MEM_ADDR(_WD_CONTROL_REG)), \
"r" (_BV(_WD_CHANGE_BIT) | _BV(WDE)), \
"r" ((uint8_t) ((value & 0x08 ? _WD_PS3_MASK : 0x00) | \
_BV(WDIE) | (value & 0x07)) ) \
: "r0" \
)
void suspend_power_down(void);
bool suspend_wakeup_condition(void);
void suspend_wakeup_init(void);
#endif
-116
View File
@@ -1,116 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <avr/io.h>
#include <avr/interrupt.h>
#include <stdint.h>
#include "timer.h"
// counter resolution 1ms
// NOTE: union { uint32_t timer32; struct { uint16_t dummy; uint16_t timer16; }}
volatile uint32_t timer_count = 0;
void timer_init(void)
{
// Timer0 CTC mode
TCCR0A = 0x02;
#if TIMER_PRESCALER == 1
TCCR0B = 0x01;
#elif TIMER_PRESCALER == 8
TCCR0B = 0x02;
#elif TIMER_PRESCALER == 64
TCCR0B = 0x03;
#elif TIMER_PRESCALER == 256
TCCR0B = 0x04;
#elif TIMER_PRESCALER == 1024
TCCR0B = 0x05;
#else
# error "Timer prescaler value is NOT vaild."
#endif
OCR0A = TIMER_RAW_TOP;
TIMSK0 = (1<<OCIE0A);
}
inline
void timer_clear(void)
{
uint8_t sreg = SREG;
cli();
timer_count = 0;
SREG = sreg;
}
inline
uint16_t timer_read(void)
{
uint32_t t;
uint8_t sreg = SREG;
cli();
t = timer_count;
SREG = sreg;
return (t & 0xFFFF);
}
inline
uint32_t timer_read32(void)
{
uint32_t t;
uint8_t sreg = SREG;
cli();
t = timer_count;
SREG = sreg;
return t;
}
inline
uint16_t timer_elapsed(uint16_t last)
{
uint32_t t;
uint8_t sreg = SREG;
cli();
t = timer_count;
SREG = sreg;
return TIMER_DIFF_16((t & 0xFFFF), last);
}
inline
uint32_t timer_elapsed32(uint32_t last)
{
uint32_t t;
uint8_t sreg = SREG;
cli();
t = timer_count;
SREG = sreg;
return TIMER_DIFF_32(t, last);
}
// excecuted once per 1ms.(excess for just timer count?)
ISR(TIMER0_COMPA_vect)
{
timer_count++;
}
-67
View File
@@ -1,67 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TIMER_H
#define TIMER_H 1
#include <stdint.h>
#ifndef TIMER_PRESCALER
# if F_CPU > 16000000
# define TIMER_PRESCALER 256
# elif F_CPU > 2000000
# define TIMER_PRESCALER 64
# elif F_CPU > 250000
# define TIMER_PRESCALER 8
# else
# define TIMER_PRESCALER 1
# endif
#endif
#define TIMER_RAW_FREQ (F_CPU/TIMER_PRESCALER)
#define TIMER_RAW TCNT0
#define TIMER_RAW_TOP (TIMER_RAW_FREQ/1000)
#if (TIMER_RAW_TOP > 255)
# error "Timer0 can't count 1ms at this clock freq. Use larger prescaler."
#endif
#define TIMER_DIFF(a, b, max) ((a) >= (b) ? (a) - (b) : (max) - (b) + (a))
#define TIMER_DIFF_8(a, b) TIMER_DIFF(a, b, UINT8_MAX)
#define TIMER_DIFF_16(a, b) TIMER_DIFF(a, b, UINT16_MAX)
#define TIMER_DIFF_32(a, b) TIMER_DIFF(a, b, UINT32_MAX)
#define TIMER_DIFF_RAW(a, b) TIMER_DIFF_8(a, b)
#ifdef __cplusplus
extern "C" {
#endif
extern volatile uint32_t timer_count;
void timer_init(void);
void timer_clear(void);
uint16_t timer_read(void);
uint32_t timer_read32(void);
uint16_t timer_elapsed(uint16_t last);
uint32_t timer_elapsed32(uint32_t last);
#ifdef __cplusplus
}
#endif
#endif
-103
View File
@@ -1,103 +0,0 @@
/*---------------------------------------------------------------------------
Extended itoa, puts and printf (C)ChaN, 2011
-----------------------------------------------------------------------------*/
#ifndef XPRINTF_H
#define XPRINTF_H
#include <inttypes.h>
#include <avr/pgmspace.h>
extern void (*xfunc_out)(uint8_t);
#define xdev_out(func) xfunc_out = (void(*)(uint8_t))(func)
/* This is a pointer to user defined output function. It must be initialized
before using this modle.
*/
void xputc(char chr);
/* This is a stub function to forward outputs to user defined output function.
All outputs from this module are output via this function.
*/
/*-----------------------------------------------------------------------------*/
void xputs(const char *string_p);
/* The string placed in the ROM is forwarded to xputc() directly.
*/
/*-----------------------------------------------------------------------------*/
void xitoa(long value, char radix, char width);
/* Extended itoa().
value radix width output
100 10 6 " 100"
100 10 -6 "000100"
100 10 0 "100"
4294967295 10 0 "4294967295"
4294967295 -10 0 "-1"
655360 16 -8 "000A0000"
1024 16 0 "400"
0x55 2 -8 "01010101"
*/
/*-----------------------------------------------------------------------------*/
#define xprintf(format, ...) __xprintf(PSTR(format), ##__VA_ARGS__)
#define xsprintf(str, format, ...) __xsprintf(str, PSTR(format), ##__VA_ARGS__)
#define xfprintf(func, format, ...) __xfprintf(func, PSTR(format), ##__VA_ARGS__)
void __xprintf(const char *format_p, ...); /* Send formatted string to the registered device */
void __xsprintf(char*, const char *format_p, ...); /* Put formatted string to the memory */
void __xfprintf(void(*func)(uint8_t), const char *format_p, ...); /* Send formatted string to the specified device */
/* Format string is placed in the ROM. The format flags is similar to printf().
%[flag][width][size]type
flag
A '0' means filled with '0' when output is shorter than width.
' ' is used in default. This is effective only numeral type.
width
Minimum width in decimal number. This is effective only numeral type.
Default width is zero.
size
A 'l' means the argument is long(32bit). Default is short(16bit).
This is effective only numeral type.
type
'c' : Character, argument is the value
's' : String placed on the RAM, argument is the pointer
'S' : String placed on the ROM, argument is the pointer
'd' : Signed decimal, argument is the value
'u' : Unsigned decimal, argument is the value
'X' : Hexdecimal, argument is the value
'b' : Binary, argument is the value
'%' : '%'
*/
/*-----------------------------------------------------------------------------*/
char xatoi(char **str, long *ret);
/* Get value of the numeral string.
str
Pointer to pointer to source string
"0b11001010" binary
"0377" octal
"0xff800" hexdecimal
"1250000" decimal
"-25000" decimal
ret
Pointer to return value
*/
#endif
+198
View File
@@ -0,0 +1,198 @@
# Copyright 2017 Fred Sundvik
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
SERIAL_DIR := $(QUANTUM_DIR)/serial_link
SERIAL_PATH := $(QUANTUM_PATH)/serial_link
SERIAL_SRC := $(wildcard $(SERIAL_PATH)/protocol/*.c)
SERIAL_SRC += $(wildcard $(SERIAL_PATH)/system/*.c)
SERIAL_DEFS += -DSERIAL_LINK_ENABLE
COMMON_VPATH += $(SERIAL_PATH)
ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
OPT_DEFS += -DAPI_SYSEX_ENABLE
SRC += $(QUANTUM_DIR)/api/api_sysex.c
OPT_DEFS += -DAPI_ENABLE
SRC += $(QUANTUM_DIR)/api.c
MIDI_ENABLE=yes
endif
MUSIC_ENABLE := 0
ifeq ($(strip $(AUDIO_ENABLE)), yes)
OPT_DEFS += -DAUDIO_ENABLE
MUSIC_ENABLE := 1
SRC += $(QUANTUM_DIR)/process_keycode/process_audio.c
ifeq ($(PLATFORM),AVR)
SRC += $(QUANTUM_DIR)/audio/audio.c
else
SRC += $(QUANTUM_DIR)/audio/audio_arm.c
endif
SRC += $(QUANTUM_DIR)/audio/voices.c
SRC += $(QUANTUM_DIR)/audio/luts.c
endif
ifeq ($(strip $(MIDI_ENABLE)), yes)
OPT_DEFS += -DMIDI_ENABLE
MUSIC_ENABLE := 1
SRC += $(QUANTUM_DIR)/process_keycode/process_midi.c
endif
ifeq ($(MUSIC_ENABLE), 1)
SRC += $(QUANTUM_DIR)/process_keycode/process_music.c
endif
ifeq ($(strip $(COMBO_ENABLE)), yes)
OPT_DEFS += -DCOMBO_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_combo.c
endif
ifeq ($(strip $(STENO_ENABLE)), yes)
OPT_DEFS += -DSTENO_ENABLE
VIRTSER_ENABLE := yes
SRC += $(QUANTUM_DIR)/process_keycode/process_steno.c
endif
ifeq ($(strip $(VIRTSER_ENABLE)), yes)
OPT_DEFS += -DVIRTSER_ENABLE
endif
ifeq ($(strip $(FAUXCLICKY_ENABLE)), yes)
OPT_DEFS += -DFAUXCLICKY_ENABLE
SRC += $(QUANTUM_DIR)/fauxclicky.c
endif
ifeq ($(strip $(POINTING_DEVICE_ENABLE)), yes)
OPT_DEFS += -DPOINTING_DEVICE_ENABLE
OPT_DEFS += -DMOUSE_ENABLE
SRC += $(QUANTUM_DIR)/pointing_device.c
endif
ifeq ($(strip $(UCIS_ENABLE)), yes)
OPT_DEFS += -DUCIS_ENABLE
UNICODE_COMMON = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_ucis.c
endif
ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
OPT_DEFS += -DUNICODEMAP_ENABLE
UNICODE_COMMON = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_unicodemap.c
endif
ifeq ($(strip $(UNICODE_ENABLE)), yes)
OPT_DEFS += -DUNICODE_ENABLE
UNICODE_COMMON = yes
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode.c
endif
ifeq ($(strip $(UNICODE_COMMON)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_unicode_common.c
endif
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
OPT_DEFS += -DRGBLIGHT_ENABLE
SRC += $(QUANTUM_DIR)/rgblight.c
CIE1931_CURVE = yes
LED_BREATHING_TABLE = yes
ifeq ($(strip $(RGBLIGHT_CUSTOM_DRIVER)), yes)
OPT_DEFS += -DRGBLIGHT_CUSTOM_DRIVER
else
SRC += ws2812.c
endif
endif
ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
OPT_DEFS += -DTAP_DANCE_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_tap_dance.c
endif
ifeq ($(strip $(KEY_LOCK_ENABLE)), yes)
OPT_DEFS += -DKEY_LOCK_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_key_lock.c
endif
ifeq ($(strip $(PRINTING_ENABLE)), yes)
OPT_DEFS += -DPRINTING_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_printer.c
SRC += $(TMK_DIR)/protocol/serial_uart.c
endif
ifeq ($(strip $(AUTO_SHIFT_ENABLE)), yes)
OPT_DEFS += -DAUTO_SHIFT_ENABLE
SRC += $(QUANTUM_DIR)/process_keycode/process_auto_shift.c
ifeq ($(strip $(AUTO_SHIFT_MODIFIERS)), yes)
OPT_DEFS += -DAUTO_SHIFT_MODIFIERS
endif
endif
ifeq ($(strip $(SERIAL_LINK_ENABLE)), yes)
SRC += $(patsubst $(QUANTUM_PATH)/%,%,$(SERIAL_SRC))
OPT_DEFS += $(SERIAL_DEFS)
VAPTH += $(SERIAL_PATH)
endif
ifneq ($(strip $(VARIABLE_TRACE)),)
SRC += $(QUANTUM_DIR)/variable_trace.c
OPT_DEFS += -DNUM_TRACED_VARIABLES=$(strip $(VARIABLE_TRACE))
ifneq ($(strip $(MAX_VARIABLE_TRACE_SIZE)),)
OPT_DEFS += -DMAX_VARIABLE_TRACE_SIZE=$(strip $(MAX_VARIABLE_TRACE_SIZE))
endif
endif
ifeq ($(strip $(LCD_ENABLE)), yes)
CIE1931_CURVE = yes
endif
ifeq ($(strip $(BACKLIGHT_ENABLE)), yes)
ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
CIE1931_CURVE = yes
endif
ifeq ($(strip $(BACKLIGHT_CUSTOM_DRIVER)), yes)
OPT_DEFS += -DBACKLIGHT_CUSTOM_DRIVER
endif
endif
ifeq ($(strip $(CIE1931_CURVE)), yes)
OPT_DEFS += -DUSE_CIE1931_CURVE
LED_TABLES = yes
endif
ifeq ($(strip $(LED_BREATHING_TABLE)), yes)
OPT_DEFS += -DUSE_LED_BREATHING_TABLE
LED_TABLES = yes
endif
ifeq ($(strip $(LED_TABLES)), yes)
SRC += $(QUANTUM_DIR)/led_tables.c
endif
ifeq ($(strip $(TERMINAL_ENABLE)), yes)
SRC += $(QUANTUM_DIR)/process_keycode/process_terminal.c
OPT_DEFS += -DTERMINAL_ENABLE
endif
ifeq ($(strip $(USB_HID_ENABLE)), yes)
include $(TMK_DIR)/protocol/usb_hid.mk
endif
QUANTUM_SRC:= \
$(QUANTUM_DIR)/quantum.c \
$(QUANTUM_DIR)/keymap_common.c \
$(QUANTUM_DIR)/keycode_config.c \
$(QUANTUM_DIR)/process_keycode/process_leader.c
ifndef CUSTOM_MATRIX
QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
endif
-131
View File
@@ -1,131 +0,0 @@
#----------------------------------------------------------------------------
# On command line:
#
# make all = Make software.
#
# make clean = Clean out built project files.
#
# make coff = Convert ELF to AVR COFF.
#
# make extcoff = Convert ELF to AVR Extended COFF.
#
# make program = Download the hex file to the device.
# Please customize your programmer settings(PROGRAM_CMD)
#
# make teensy = Download the hex file to the device, using teensy_loader_cli.
# (must have teensy_loader_cli installed).
#
# make dfu = Download the hex file to the device, using dfu-programmer (must
# have dfu-programmer installed).
#
# make flip = Download the hex file to the device, using Atmel FLIP (must
# have Atmel FLIP installed).
#
# make dfu-ee = Download the eeprom file to the device, using dfu-programmer
# (must have dfu-programmer installed).
#
# make flip-ee = Download the eeprom file to the device, using Atmel FLIP
# (must have Atmel FLIP installed).
#
# make debug = Start either simulavr or avarice as specified for debugging,
# with avr-gdb or avr-insight as the front end for debugging.
#
# make filename.s = Just compile filename.c into the assembler code only.
#
# make filename.i = Create a preprocessed source file for use in submitting
# bug reports to the GCC project.
#
# To rebuild project do "make clean" then "make all".
#----------------------------------------------------------------------------
# Target file name (without extension).
TARGET = adb_usb_lufa
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# project specific files
SRC = keymap.c \
matrix.c \
led.c \
adb.c
CONFIG_H = config.h
# MCU name
#MCU = at90usb1287
MCU = atmega32u4
# Processor frequency.
# This will define a symbol, F_CPU, in all source code files equal to the
# processor frequency in Hz. You can then use this symbol in your source code to
# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
# automatically to create a 32-bit value in your source code.
#
# This will be an integer division of F_USB below, as it is sourced by
# F_USB after it has run through any CPU prescalers. Note that this value
# does not *change* the processor frequency - it should merely be updated to
# reflect the processor speed set externally so that the code can use accurate
# software delays.
F_CPU = 16000000
#
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
# Interrupt driven control endpoint task(+60)
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in *bytes*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
# Optimize size but this may cause error "relocation truncated to fit"
#EXTRALDFLAGS = -Wl,--relax
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-63
View File
@@ -1,63 +0,0 @@
# Target file name (without extension).
TARGET = adb_usb_pjrc
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c \
adb.c
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
# Boot Section Size in *bytes*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+5000)
EXTRAKEY_ENABLE = yes # Audio control and System control(+600)
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover(+500)
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-78
View File
@@ -1,78 +0,0 @@
ADB to USB keyboard converter
=============================
This firmware converts ADB keyboard protocol to USB.
You can use PJRC Teensy for this converter, though, other USB AVR(ATMega32U4, AT90USB64/128 or etc) should work.
But binary size is about 10KB or more it doesn't fit into 8K flash like ATMega8U2.
Discuss: http://geekhack.org/showwiki.php?title=Island:14290
Build
-----
0. Connect ADB keyboard to Teensy by 3 lines(Vcc, GND, Data). By default Data line uses port D0.
This converter uses AVR's internal pull-up, but it seems to be too weak, in particular when you want to use a long or coiled cable.
The external pull-up resistor(1K-10K Ohm) on Data is strongly recommended.
1. Define following macros for ADB connection in config.h if you use other than port D0.
ADB_PORT, ADB_PIN, ADB_DDR, ADB_DATA_BIT
2. make
3. program Teensy
LOCKING CAPSLOCK
----------------
Many of old ADB keyboards have mechanical push-lock switch for Capslock key and this converter supports the locking Capslock key by default. See README in top directory for more detail about this feature.
Also you may want to remove locking pin from the push-lock switch to use capslock as a normal momentary switch.
http://www.youtube.com/watch?v=9wqnt2mGJ2Y
Keymap
------
You can change a keymap by editing code of keymap.c like following.
This is a keymap for AEK, however, also used for other keyboards.
How to define the keymap is probably obvious. You can find key symbols in keycode.h.
If you want to define some keymaps than just one, see hhkb/keymap.c and
macway/keymap.c as examples. Keymap(layer) switching may needs a bit of
effort at this time.
/* Default Layer: plain keymap
* ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,---.
* |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|
* `---' `---------------' `---------------' `---------------' `-----------' `---'
* ,-----------------------------------------------------------. ,-----------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| =| /| *|
* |-----------------------------------------------------------| |-----------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| -|
* |-----------------------------------------------------------| `-----------' |---------------|
* |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| +|
* |-----------------------------------------------------------| ,---. |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
* |-----------------------------------------------------------| ,-----------. |-----------|Ent|
* |Ctrl |Gui |Alt | Space | | | | |Lef|Dow|Rig| | 0| .| |
* `-----------------------------------------------------------' `-----------' `---------------'
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK, PWR,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,EQL, PSLS,PAST,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, PMNS,
LCAP,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
Magic command
-------------
To get help press `h` holding Magic key. Magic key is `Power key`.
Notes
-----
Many ADB keyboards has no discrimination between right modifier and left one,
you will always see left control even if you press right control key.
Apple Extended Keyboard and Apple Extended Keyboard II are the examples.
Though ADB protocol itsef has the ability of distinction between right and left.
And most ADB keyboard has no NKRO functionality, though ADB protocol itsef has that.
See protocol/adb.c for more info.
EOF
-63
View File
@@ -1,63 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0ADB
#define DEVICE_VER 0x0101
#define MANUFACTURER t.m.k.
#define PRODUCT ADB keyboard converter
#define DESCRIPTION convert ADB keyboard to USB
/* matrix size */
#define MATRIX_ROWS 16 // keycode bit: 3-0
#define MATRIX_COLS 8 // keycode bit: 6-4
#define MATRIX_ROW(code) ((code)>>3&0x0F)
#define MATRIX_COL(code) ((code)&0x07)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* legacy keymap support */
#define USE_LEGACY_KEYMAP
/* ADB port setting */
#define ADB_PORT PORTD
#define ADB_PIN PIND
#define ADB_DDR DDRD
#define ADB_DATA_BIT 0
//#define ADB_PSW_BIT 1 // optional
/* key combination for command */
#ifndef __ASSEMBLER__
#include "adb.h"
#include "matrix.h"
#define IS_COMMAND() ( \
matrix_is_on(MATRIX_ROW(ADB_POWER), MATRIX_COL(ADB_POWER)) \
)
#endif
#endif
-214
View File
@@ -1,214 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Keymap for ADB keyboard
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "keymap.h"
#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
#define KEYMAP_ALL( \
K35, K7A,K78,K63,K76, K60,K61,K62,K64, K65,K6D,K67,K6F, K69,K6B,K71, K7F, \
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74, K47,K51,K4B,K43, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79, K59,K5B,K5C,K4E, \
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \
K36,K3A,K37, K31, K7C,K7D, K3B,K3D,K3C, K52, K41,K4C, \
/* for ISO/JIS keyboard */ \
K0A, /* NON-US \ and | 0x64 */ \
K34, /* Keypad ENTER 0x58 */ \
K40, /* F17 0x6C */ \
K44, /* F18? 0x6d */ \
K4F, /* F18 0x6d */ \
K50, /* F19 0x6e */ \
K5A, /* F20 0x6f */ \
K5D, /* INTL3(Yen) 0x89 */ \
K5E, /* INTL1(Ro) 0x87 */ \
K5F, /* Keypad Comma 0x85 */ \
K66, /* LANG2(Eisu) 0x91 */ \
K68, /* LANG1(Kana) 0x90 */ \
K6A, /* F16 0x6B */ \
K6E /* Application 0x65 */ \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_NO }, \
{ KC_##K40, KC_##K41, KC_NO, KC_##K43, KC_##K44, KC_##K45, KC_NO, KC_##K47 }, \
{ KC_NO, KC_NO, KC_NO, KC_##K4B, KC_##K4C, KC_NO, KC_##K4E, KC_##K4F }, \
{ KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F }, \
{ KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67 }, \
{ KC_##K68, KC_##K69, KC_##K6A, KC_##K6B, KC_NO, KC_##K6D, KC_##K6E, KC_##K6F }, \
{ KC_NO, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \
{ KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_NO, KC_##K7F } \
}
/* Apple Extended Keyboard US
* ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,---.
* |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|
* `---' `---------------' `---------------' `---------------' `-----------' `---'
* ,-----------------------------------------------------------. ,-----------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| =| /| *|
* |-----------------------------------------------------------| |-----------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| -|
* |-----------------------------------------------------------| `-----------' |---------------|
* |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| +|
* |-----------------------------------------------------------| ,---. |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
* |-----------------------------------------------------------| ,-----------. |-----------|Ent|
* |Ctrl |Opt |Cmd | Space | |Opt |Ctrl | |Lef|Dow|Rig| | 0| .| |
* `-----------------------------------------------------------' `-----------' `---------------'
*/
#define KEYMAP_EXTENDED_US( \
K35, K7A,K78,K63,K76, K60,K61,K62,K64, K65,K6D,K67,K6F, K69,K6B,K71, K7F, \
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74, K47,K51,K4B,K43, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79, K59,K5B,K5C,K4E, \
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \
K36,K3A,K37, K31, K7C,K7D, K3B,K3D,K3C, K52, K41,K4C \
) KEYMAP_ALL( \
K35, K7A,K78,K63,K76, K60,K61,K62,K64, K65,K6D,K67,K6F, K69,K6B,K71, K7F, \
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K72,K73,K74, K47,K51,K4B,K43, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E,K2A, K75,K77,K79, K59,K5B,K5C,K4E, \
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K45, \
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K3E, K53,K54,K55, \
K36,K3A,K37, K31, K7C,K7D, K3B,K3D,K3C, K52, K41,K4C, \
/* for ISO/JIS keyboard */ \
NONUS_BSLASH, /* NON-US \ and | 0x64 */ \
KP_ENTER, /* Keypad ENTER 0x58 */ \
F17, /* F17 0x6C */ \
F18, /* F18? 0x6d */ \
F18, /* F18 0x6d */ \
F19, /* F19 0x6e */ \
F20, /* F20 0x6f */ \
INT3, /* INTL3(Yen) 0x89 */ \
INT1, /* INTL1(Ro) 0x87 */ \
KP_COMMA, /* Keypad Comma 0x85 */ \
LANG2, /* LANG2(Eisu) 0x91 */ \
LANG1, /* LANG1(Kana) 0x90 */ \
F16, /* F16 0x6B */ \
APPLICATION /* Application 0x65 */ \
)
/* M0116
* +-------+
* | power |
* +-------+
* +---+---+---+---+---+---+---+---+---+---+---+---+---+-----+ +---+---+---+---+
* |esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | bks | |clr| = | / | * |
* +---------------------------------------------------------+ +---+---+---+---+
* | tab | q | w | e | r | t | y | u | i | o | p | [ | ] | | | 7 | 8 | 9 | + |
* +-----------------------------------------------------+ | +---+---+---+---+
* | ctrl | a | s | d | f | g | h | j | k | l | ; | ' |return| | 4 | 5 | 6 | - |
* +---------------------------------------------------------+ +---+---+---+---+
* | shift | z | x | c | v | b | n | m | , | . | / | shift | | 1 | 2 | 3 | |
* +---------------------------------------------------------+ +-------+---|ent|
* |cap|opt|comnd| ` | | \ |lef|rig|dwn|up | | 0 | . | |
* +---------------------------------------------------------+ +-------+---+---+
*/
#define KEYMAP_M0116( \
K7F, \
K35,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K51,K4B,K43, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E, K59,K5B,K5C,K45, \
K36,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K4E, \
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K7B, K53,K54,K55, \
K39,K3A,K37,K32, K31, K2A,K3B,K3C,K3D,K3E, K52, K41,K4C \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_NO, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_NO, KC_##K35, KC_##K36, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_NO }, \
{ KC_NO, KC_##K41, KC_NO, KC_##K43, KC_NO, KC_##K45, KC_NO, KC_##K47 }, \
{ KC_NO, KC_NO, KC_NO, KC_##K4B, KC_##K4C, KC_NO, KC_##K4E, KC_NO }, \
{ KC_NO, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_NO, KC_##K5B, KC_##K5C, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO , KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO , KC_NO, KC_NO , KC_##K7B, KC_NO, KC_NO, KC_NO, KC_##K7F } \
}
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
0, // Fn0
0, // Fn1
0, // Fn2
0, // Fn3
0, // Fn4
0, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_NO, // Fn0
KC_NO, // Fn1
KC_NO, // Fn2
KC_NO, // Fn3
KC_NO, // Fn4
KC_NO, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KEYMAP_EXTENDED_US(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,PAUS, PWR,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PEQL,PSLS,PAST,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9, PMNS,
LCAP,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RGUI,RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return KEYCODE(layer, row, col);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-27
View File
@@ -1,27 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <util/delay.h>
#include "adb.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
adb_host_kbd_led(~usb_led);
}
-221
View File
@@ -1,221 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* scan matrix
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "print.h"
#include "util.h"
#include "debug.h"
#include "adb.h"
#include "matrix.h"
#if (MATRIX_COLS > 16)
# error "MATRIX_COLS must not exceed 16"
#endif
#if (MATRIX_ROWS > 255)
# error "MATRIX_ROWS must not exceed 255"
#endif
static bool is_modified = false;
// matrix state buffer(1:on, 0:off)
#if (MATRIX_COLS <= 8)
static uint8_t matrix[MATRIX_ROWS];
#else
static uint16_t matrix[MATRIX_ROWS];
#endif
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
#endif
static void register_key(uint8_t key);
inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}
inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}
void matrix_init(void)
{
adb_host_init();
// wait for keyboard to boot up and receive command
_delay_ms(1000);
// Enable keyboard left/right modifier distinction
// Addr:Keyboard(0010), Cmd:Listen(10), Register3(11)
// upper byte: reserved bits 0000, device address 0010
// lower byte: device handler 00000011
adb_host_listen(0x2B,0x02,0x03);
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
debug_enable = true;
//debug_matrix = true;
//debug_keyboard = true;
//debug_mouse = true;
print("debug enabled.\n");
return;
}
uint8_t matrix_scan(void)
{
uint16_t codes;
uint8_t key0, key1;
is_modified = false;
_delay_ms(12); // delay for preventing overload of poor ADB keyboard controller
codes = adb_host_kbd_recv();
key0 = codes>>8;
key1 = codes&0xFF;
if (debug_matrix && codes) {
print("adb_host_kbd_recv: "); phex16(codes); print("\n");
}
if (codes == 0) { // no keys
return 0;
} else if (codes == 0x7F7F) { // power key press
register_key(0x7F);
} else if (codes == 0xFFFF) { // power key release
register_key(0xFF);
} else if (key0 == 0xFF) { // error
xprintf("adb_host_kbd_recv: ERROR(%d)\n", codes);
return key1;
} else {
register_key(key0);
if (key1 != 0xFF) // key1 is 0xFF when no second key.
register_key(key1);
}
return 1;
}
bool matrix_is_modified(void)
{
return is_modified;
}
inline
bool matrix_has_ghost(void)
{
#ifdef MATRIX_HAS_GHOST
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
if (matrix_has_ghost_in_row(i))
return true;
}
#endif
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
inline
#if (MATRIX_COLS <= 8)
uint8_t matrix_get_row(uint8_t row)
#else
uint16_t matrix_get_row(uint8_t row)
#endif
{
return matrix[row];
}
void matrix_print(void)
{
if (!debug_matrix) return;
#if (MATRIX_COLS <= 8)
print("r/c 01234567\n");
#else
print("r/c 0123456789ABCDEF\n");
#endif
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
#if (MATRIX_COLS <= 8)
pbin_reverse(matrix_get_row(row));
#else
pbin_reverse16(matrix_get_row(row));
#endif
#ifdef MATRIX_HAS_GHOST
if (matrix_has_ghost_in_row(row)) {
print(" <ghost");
}
#endif
print("\n");
}
}
uint8_t matrix_key_count(void)
{
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
#if (MATRIX_COLS <= 8)
count += bitpop(matrix[i]);
#else
count += bitpop16(matrix[i]);
#endif
}
return count;
}
#ifdef MATRIX_HAS_GHOST
inline
static bool matrix_has_ghost_in_row(uint8_t row)
{
// no ghost exists in case less than 2 keys on
if (((matrix[row] - 1) & matrix[row]) == 0)
return false;
// ghost exists in case same state as other row
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
if (i != row && (matrix[i] & matrix[row]) == matrix[row])
return true;
}
return false;
}
#endif
inline
static void register_key(uint8_t key)
{
uint8_t col, row;
col = key&0x07;
row = (key>>3)&0x0F;
if (key&0x80) {
matrix[row] &= ~(1<<col);
} else {
matrix[row] |= (1<<col);
}
is_modified = true;
}
-97
View File
@@ -1,97 +0,0 @@
# Target file name (without extension).
TARGET = m0110_lufa
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = matrix.c \
led.c \
m0110.c
# To use own keymap file run make like: make keymap=hasu
ifdef keymap
SRC += keymap_$(keymap).c
else
SRC += keymap.c
endif
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
#
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# *Comment out* to disable the options.
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
KEYMAP_SECTION_ENABLE = yes # fixed address keymap for keymap editor
#---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-73
View File
@@ -1,73 +0,0 @@
# Target file name (without extension).
TARGET = m0110_pjrc
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = matrix.c \
led.c \
m0110.c
# To use own keymap file run make like: make keymap=hasu
ifdef keymap
SRC += keymap_$(keymap).c
else
SRC += keymap.c
endif
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# *Comment out* to disable the options.
#
#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-134
View File
@@ -1,134 +0,0 @@
M0110/M0110A to USB keyboard converter
======================================
This firmware converts the protocol of Apple Macintosh keyboard **M0110**, **M0110A** and **M0120** into USB. Target of this project is USB AVR controller **ATmega32U4**. Using this converter you can revive these retro keyboards with modern computer.
Pics of **M0110 + M0120** and **M0110A**.
![M0110+M0120](http://i.imgur.com/dyvXb2Tm.jpg)
![M0110A](http://i.imgur.com/HuHOEoHm.jpg)
- M0110A support was contributed by [skagon@github](https://github.com/skagon).
- M0120 also is supported. keys(+ * / and ,) on M0120 are recognized as cursor keys.
Update
------
- 2013/08: Change port for signals `PF` to `PD`
- 2013/09: Change port again, it uses inversely `PD0` for data and `PD1` for clock line now.
Building Hardware
-----------------
You need **4P4C** cable and **ATMega32U4** board like PJRC [Teensy]. Port of the MCU `PD1` is assigned to `CLOCK` line and `PD0` to `DATA` by default, you can change pin configuration with editing `config.h`.
[![M0110 Converter](http://i.imgur.com/4G2ZOegm.jpg)](http://i.imgur.com/4G2ZOeg.jpg)
### 4P4C phone handset cable
Note that original cable used with Mac is **straight** while phone handset cable is **crossover**.
<http://en.wikipedia.org/wiki/Modular_connector#4P4C>
Close-up pic of handset cable. You can see one end of plug has reverse color codes against the other. Click to enlarge.
[![4P4C cable](http://i.imgur.com/3S9P1mYm.jpg?1)](http://i.imgur.com/3S9P1mY.jpg?1)
[Teensy]: http://www.pjrc.com/teensy/
### Socket Pinout
- <http://pinouts.ru/Inputs/MacKeyboard_pinout.shtml>
![Jack fig](http://www.kbdbabel.org/conn/kbd_connector_macplus.png)
### Pull-up Registor
You may need pull-up registors on signal lines(`CLOCK`, `DATA`) in particular when you have long or coiled cable. **1k-10k Ohm** will be OK for this purpose. In that case the converter may not read signal from keyboard correctly without pull-up resistors.
Building Frimware
-----------------
To compile firmware you need AVR GCC. You can edit *Makefile* and *config.h* to change compile options and pin configuration.
$ git clone git://github.com/tmk/tmk_keyboard.git (or download source)
$ cd m0110_usb
$ make -f Makefile clean
$ make -f Makefile
and program your Teensy with [PJRC Teensy loader](http://www.pjrc.com/teensy/loader.html).
Keymap
------
You can change keymaps by editing *keymap.c*.
### M0110 & M0120
#### *Default Layer*
,---------------------------------------------------------. ,---------------.
| `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| -|Lft|Rgt|
|---------------------------------------------------------| |---------------|
|Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| Up|
|---------------------------------------------------------| |---------------|
|Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| Dn|
|---------------------------------------------------------| |---------------|
|Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| |
`---------------------------------------------------------' |-----------|Ent|
|Ctl|Gui | Space |Alt |Ctl| | 0| .| |
`-----------------------------------------------' `---------------'
- `Space` and `Enter` also work as `Fn` layer switch key when holding down.
#### *Function Layer(WASD/HHKB)*
,---------------------------------------------------------. ,---------------.
|Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| -|Lft|Rgt|
|---------------------------------------------------------| |---------------|
|Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| \| | 7| 8| 9| Up|
|---------------------------------------------------------| |---------------|
|Caps |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Enter | | 4| 5| 6| Dn|
|---------------------------------------------------------| |---------------|
|Shift |End| |PgD| | | | |End|PgD|Dow|Shift | | 1| 2| 3| |
`---------------------------------------------------------' |-----------|Ent|
|Ctl|Gui | Space |Alt |Ctl| | 0| .| |
`-----------------------------------------------' `---------------'
### M0110A
#### *Default Layer*
,---------------------------------------------------------. ,---------------.
| `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *|
|---------------------------------------------------------| |---------------|
|Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
|-----------------------------------------------------' | |---------------|
|Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| +|
|---------------------------------------------------------| |---------------|
|Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft| Up| | 1| 2| 3| |
|---------------------------------------------------------| |-----------|Ent|
|Ctrl |Gui | Space | \|Lft|Rgt|Dwn| | 0| .| |
`---------------------------------------------------------' `---------------'
- `Space` and `Enter` also work as `Fn` layer switch key when holding down.
- `Backslash(\)` also works as `Alt` when holding down.
#### *Function Layer(WASD/HHKB)*
,---------------------------------------------------------. ,---------------.
|Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| =| /| *|
|---------------------------------------------------------| |---------------|
|Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| | | 7| 8| 9| -|
|-----------------------------------------------------' | |---------------|
|Caps |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Enter | | 4| 5| 6| +|
|---------------------------------------------------------| |---------------|
|Shift |End| |PgD| | | | |End|PgD|Dow|Shif|PgU| | 1| 2| 3| |
|---------------------------------------------------------| |-----------|Ent|
|Ctrl |Gui | Space | \|Hom|End|PgD| | 0| .| |
`---------------------------------------------------------' `---------------'
Debug
-----
You can use [PJRC HID listen](http://www.pjrc.com/teensy/hid_listen.html) to see debug output. The converter has some functions for debug, press `<Command>+H` simultaneously to get help.
- Command: `Shift+Option+Command`(`Shift+Alt+Gui` or `Shift+Alt+Control`)
-62
View File
@@ -1,62 +0,0 @@
/*
Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0110
#define DEVICE_VER 0x0101
#define MANUFACTURER t.m.k.
#define PRODUCT M0110 keyboard converter
#define DESCRIPTION convert M0110 keyboard to USB
/* matrix size */
#define MATRIX_ROWS 14
#define MATRIX_COLS 8
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* magic key */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LGUI)) || \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_LALT) | MOD_BIT(KC_LCTL)) \
)
/* boot magic key */
#define BOOTMAGIC_KEY_SALT KC_FN0
#define BOOTMAGIC_KEY_CAPSLOCK_TO_CONTROL KC_LCAP
/* ports */
#define M0110_CLOCK_PORT PORTD
#define M0110_CLOCK_PIN PIND
#define M0110_CLOCK_DDR DDRD
#define M0110_CLOCK_BIT 1
#define M0110_DATA_PORT PORTD
#define M0110_DATA_PIN PIND
#define M0110_DATA_DDR DDRD
#define M0110_DATA_BIT 0
#endif
-223
View File
@@ -1,223 +0,0 @@
/*
Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* M0110A Support was contributed by skagon@github */
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "keymap.h"
/*
* The keymap works with both M0110 and M0110A keyboards. As you can see, the M0110A is a superset
* of the M0110 keyboard, with only one exception: 'Enter' in M0110 does not exist
* on the M0110A, but since it generates a unique scan code which is not used for some other key in
* the M0110A, they are totally interchangeable. In fact, the M0110A is functionally (almost)
* identical to the combination of the M0110 along with the M0120 keypad. The only difference
* (which is causing some problems as you will read below) is that the M0110+M0120 don't have
* dedicated arrow keys, while the M0110A does. However, the M0120 did have arrow keys, which
* doubled as the [comma], [/], [*] and [+] keys, when used with the [Shift] key. The M0110A has
* substituted the [comma] key with the [=] key, however its scancode is the same.
*
* Physical layout:
* M0110A
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Bcksp| |Clr| =| /| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
* |-----------------------------------------------------' | |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| +|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
* |---------------------------------------------------------' |-----------|Ent|
* |Opt |Mac | Space | \|Lft|Rgt|Dn | | 0| .| |
* `---------------------------------------------------------' `---------------'
*
* M0110 M0120
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| -| +| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| /|
* |---------------------------------------------------------| |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| ,|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| |
* `---------------------------------------------------------' |-----------|Ent|
* |Opt|Mac | Space |Ent |Opt| | 0| .| |
* `-----------------------------------------------' `---------------'
* With Shift keys on M0120 work as curosor.(-:Left *:Right /:Up ,:Down)
*
* NOTE: \ is located differently.
* NOTE: Enter on M0110 is different from Enter on keypad(M0120 and M0110A).
* NOTE: Left Shift and right Shift are logically same key.
* NOTE: Left Option and right Option are logically same key.
*/
/* Keymap definition Macro
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
* |-----------------------------------------------------' | |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| +|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
* |---------------------------------------------------------| |-----------|Ent|
* |Opt |Mac | Space |Ent| \|Lft|Rgt|Dn | | 0| .| |
* `---------------------------------------------------------' `---------------'
* NOTE: Ent between Space and \ means Enter on M0110.
*/
#define KEYMAP( \
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K68,K6D,K62, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E, K59,K5B,K5C,K4E, \
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K66, \
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K4D, K53,K54,K55,K4C, \
K3A,K37, K31, K34,K2A,K46,K42,K48, K52, K41 \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_NO, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_NO, KC_NO, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_##K41, KC_##K42, KC_NO, KC_NO, KC_NO, KC_##K46, KC_##K47 }, \
{ KC_##K48, KC_NO, KC_NO, KC_NO, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO }, \
{ KC_NO, KC_NO, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_NO, KC_##K5B, KC_##K5C, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_##K62, KC_NO, KC_NO, KC_NO, KC_##K66, KC_NO }, \
{ KC_##K68, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K6D, KC_NO, KC_NO }, \
}
#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 = {
#endif
/* Default:
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
* |-----------------------------------------------------' | |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Enter | | 4| 5| 6| +|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
* |---------------------------------------------------------| |-----------|Ent|
* |Ctl |Gui | Space |Alt| \|Lft|Rgt|Dn | | 0| .| |
* `---------------------------------------------------------' `---------------'
*/
[0] = KEYMAP(
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, CLR, EQL, PSLS,PAST,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS,
LCAP,A, S, D, F, G, H, J, K, L, SCLN,QUOT, FN15, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, UP, P1, P2, P3, PENT,
LCTL,LGUI, FN16, LALT,FN31,LEFT,RGHT,DOWN, P0, PDOT
),
/* Cursor Layer(WASD, IJKL)
* ,---------------------------------------------------------. ,---------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delet| |Nlk| =| /| *|
* |---------------------------------------------------------| |---------------|
* |Caps |Hom| Up|PgU| | | | |Psc|Slk|Pau|Up |Ins| | | 7| 8| 9| -|
* |-----------------------------------------------------' | |---------------|
* |Caps |Lef|Dow|Rig| | | | |Hom|PgU|Lef|Rig|Enter | | 4| 5| 6| +|
* |---------------------------------------------------------| |---------------|
* |Shift |End| |PgD| | | | |End|PgD|Dow|Shif|PgU| | 1| 2| 3| |
* |---------------------------------------------------------| |-----------|Ent|
* |Ctl |Gui | Space |Alt | \|Hom|End|PgD| | 0| .| |
* `---------------------------------------------------------' `---------------'
*/
[3] = KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, INS, P7, P8, P9, PMNS,
LCAP,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, FN15, P4, P5, P6, PPLS,
LSFT,END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, PGUP, P1, P2, P3, PENT,
LCTL,LGUI, FN16, LALT,FN31,HOME,END, PGDN, P0, PDOT
),
[4] = KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
CAPS,HOME,UP, PGUP,NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, INS, P7, P8, P9, PMNS,
LCAP,LEFT,DOWN,RGHT,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, FN15, P4, P5, P6, PPLS,
LSFT,END, NO, PGDN,NO, NO, NO, NO, END, PGDN,DOWN, PGUP, P1, P2, P3, PENT,
LCTL,LGUI, FN16, LALT,FN31,HOME,END, PGDN, P0, PDOT
),
[7] = {},
};
/*
* Fn action definition
*/
#ifdef KEYMAP_SECTION_ENABLE
const uint16_t fn_actions[] __attribute__ ((section (".keymap.fn_actions"))) = {
#else
static const uint16_t fn_actions[] PROGMEM = {
#endif
[0] = ACTION_LAYER_MOMENTARY(1),
[1] = ACTION_LAYER_MOMENTARY(2),
[2] = ACTION_LAYER_MOMENTARY(3),
[3] = ACTION_LAYER_MOMENTARY(4),
[4] = ACTION_LAYER_MOMENTARY(5),
[5] = ACTION_LAYER_MOMENTARY(6),
[6] = ACTION_LAYER_MOMENTARY(7),
[7] = ACTION_LAYER_TOGGLE(1),
[8] = ACTION_LAYER_TOGGLE(2),
[9] = ACTION_LAYER_TOGGLE(3),
[10] = ACTION_LAYER_TAP_TOGGLE(1),
[11] = ACTION_LAYER_TAP_TOGGLE(2),
[12] = ACTION_LAYER_TAP_TOGGLE(3),
[13] = ACTION_LAYER_TAP_KEY(1, KC_F),
[14] = ACTION_LAYER_TAP_KEY(2, KC_J),
[15] = ACTION_LAYER_TAP_KEY(3, KC_ENTER),
[16] = ACTION_LAYER_TAP_KEY(4, KC_SPACE),
[17] = ACTION_LAYER_TAP_KEY(5, KC_SCOLON),
[18] = ACTION_LAYER_TAP_KEY(6, KC_QUOTE),
[19] = ACTION_LAYER_TAP_KEY(7, KC_SLASH),
[20] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_SPACE),
[21] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_SPACE),
[22] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_QUOTE),
[23] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENTER),
[24] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_ESC),
[25] = ACTION_MODS_TAP_KEY(MOD_LCTL, KC_BSPACE),
[26] = ACTION_MODS_ONESHOT(MOD_LCTL),
[27] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_ESC),
[28] = ACTION_MODS_TAP_KEY(MOD_LSFT, KC_BSPACE),
[29] = ACTION_MODS_ONESHOT(MOD_LSFT),
[30] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_GRAVE),
[31] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_BSLASH),
};
/* translates key to keycode */
uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
{
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
}
/* translates Fn index to action */
action_t keymap_fn_to_action(uint8_t keycode)
{
action_t action;
action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]);
return action;
}
-201
View File
@@ -1,201 +0,0 @@
/*
Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* M0110A Support was contributed by skagon@github */
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "keymap.h"
/*
* The keymap works with both M0110 and M0110A keyboards. As you can see, the M0110A is a superset
* of the M0110 keyboard, with only one exception: 'Enter' in M0110 does not exist
* on the M0110A, but since it generates a unique scan code which is not used for some other key in
* the M0110A, they are totally interchangeable. In fact, the M0110A is functionally (almost)
* identical to the combination of the M0110 along with the M0120 keypad. The only difference
* (which is causing some problems as you will read below) is that the M0110+M0120 don't have
* dedicated arrow keys, while the M0110A does. However, the M0120 did have arrow keys, which
* doubled as the [comma], [/], [*] and [+] keys, when used with the [Shift] key. The M0110A has
* substituted the [comma] key with the [=] key, however its scancode is the same.
*
* Physical layout:
* M0110A
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Bcksp| |Clr| =| /| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
* |-----------------------------------------------------' | |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
* |---------------------------------------------------------' |-----------|Ent|
* |Opt |Mac | Space | \|Lft|Rgt|Dn | | 0| .| |
* `---------------------------------------------------------' `---------------'
*
* M0110 M0120
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| -| +| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| /|
* |---------------------------------------------------------| |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| ,|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | | 1| 2| 3| |
* `---------------------------------------------------------' |-----------|Ent|
* |Opt|Mac | Space |Ent |Opt| | 0| .| |
* `-----------------------------------------------' `---------------'
* With Shift keys on M0120 work as curosor.(-:Left *:Right /:Up ,:Down)
*
* NOTE: \ is located differently.
* NOTE: Enter on M0110 is different from Enter on keypad(M0120 and M0110A).
* NOTE: Left Shift and right Shift are logically same key.
* NOTE: Left Option and right Option are logically same key.
*/
/* Keymap definition Macro
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Clr| =| /| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| | | 7| 8| 9| -|
* |-----------------------------------------------------' | |---------------|
* |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return| | 4| 5| 6| +|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shft|Up | | 1| 2| 3| |
* |---------------------------------------------------------| |-----------|Ent|
* |Opt |Mac | Space |Ent| \|Lft|Rgt|Dn | | 0| .| |
* `---------------------------------------------------------' `---------------'
* NOTE: Ent between Space and \ means Enter on M0110.
*/
#define KEYMAP( \
K32,K12,K13,K14,K15,K17,K16,K1A,K1C,K19,K1D,K1B,K18,K33, K47,K68,K6D,K62, \
K30,K0C,K0D,K0E,K0F,K11,K10,K20,K22,K1F,K23,K21,K1E, K59,K5B,K5C,K4E, \
K39,K00,K01,K02,K03,K05,K04,K26,K28,K25,K29,K27, K24, K56,K57,K58,K66, \
K38,K06,K07,K08,K09,K0B,K2D,K2E,K2B,K2F,K2C, K4D, K53,K54,K55,K4C, \
K3A,K37, K31, K34,K2A,K46,K42,K48, K52, K41 \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_NO, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_NO, KC_NO, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_##K41, KC_##K42, KC_NO, KC_NO, KC_NO, KC_##K46, KC_##K47 }, \
{ KC_##K48, KC_NO, KC_NO, KC_NO, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO }, \
{ KC_NO, KC_NO, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_NO, KC_##K5B, KC_##K5C, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_##K62, KC_NO, KC_NO, KC_NO, KC_##K66, KC_NO }, \
{ KC_##K68, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K6D, KC_NO, KC_NO }, \
}
#define KEYCODE(layer, row, col) (pgm_read_byte(&keymaps[(layer)][(row)][(col)]))
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
1, // Fn0
2, // Fn1
3, // Fn2
1, // Fn3
2, // Fn4
0, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_ENTER, // Fn0
KC_SCOLON, // Fn1
KC_SLASH, // Fn2
KC_UP, // Fn3
KC_NO, // Fn4
KC_NO, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Default:
* M0110 M0120
* ,---------------------------------------------------------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backs| |Gui| -| +| *|
* |---------------------------------------------------------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 7| 8| 9| /|
* |---------------------------------------------------------| |---------------|
* |Ctrl | A| S| D| F| G| H| J| K| L| Fn| '|Return| | 4| 5| 6| ,|
* |---------------------------------------------------------| |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| Fn|Shift | | 1| 2| 3| |
* `---------------------------------------------------------' |-----------|Ent|
* |Fn |alt | Space |Gui |Fn | | 0| .| |
* `-----------------------------------------------' `---------------'
*/
KEYMAP(
ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, NLCK,EQL, PSLS,PAST,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, P7, P8, P9, PMNS,
LCTL,A, S, D, F, G, H, J, K, L, FN1, QUOT, FN0, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN2, FN3, P1, P2, P3, PENT,
FN4, LALT, SPC, LGUI,BSLS,LGUI,RCTL,RCTL, LGUI, PDOT
),
// HHKB & WASD
KEYMAP(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, NO, P7, P8, P9, PMNS,
LCTL,VOLD,VOLU,MUTE,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, FN0, P4, P5, P6, PPLS,
LSFT,NO, NO, NO, NO, NO, NO, NO, END, PGDN,DOWN, FN3, P1, P2, P3, PENT,
LCTL,LALT, SPC, LGUI,INS, LGUI,RCTL,RCTL, P0, PDOT
),
// vi mousekeys
KEYMAP(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
CAPS,NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,PSCR,SLCK,PAUS, P7, P8, P9, PMNS,
LCTL,VOLD,VOLU,MUTE,NO, NO, MS_L,MS_D,MS_U,MS_R,FN1, NO, ENT, P4, P5, P6, PPLS,
LSFT,NO, NO, NO, NO, BTN3,BTN2,BTN1,NO, NO, NO, NO, P1, P2, P3, PENT,
FN4, LALT, BTN1, LGUI,NO, LGUI,RCTL,RCTL, P0, PDOT
),
// vi cusorkeys
KEYMAP(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, DEL, NLCK,EQL, PSLS,PAST,
CAPS,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, PSCR,SLCK,PAUS, P7, P8, P9, PMNS,
LCTL,NO, NO, NO, NO, NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, P4, P5, P6, PPLS,
LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, NO, P1, P2, P3, PENT,
LCTL,LALT, SPC, LGUI,INS, LGUI,RCTL,RCTL, P0, PDOT
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return KEYCODE(layer, row, col);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-24
View File
@@ -1,24 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdint.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
}
-142
View File
@@ -1,142 +0,0 @@
/*
Copyright 2011,2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* scan matrix
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "print.h"
#include "util.h"
#include "debug.h"
#include "host.h"
#include "led.h"
#include "m0110.h"
#include "matrix.h"
#define CAPS 0x39
#define CAPS_BREAK (CAPS | 0x80)
#define ROW(key) ((key)>>3&0x0F)
#define COL(key) ((key)&0x07)
static bool is_modified = false;
// matrix state buffer(1:on, 0:off)
static uint8_t *matrix;
static uint8_t _matrix0[MATRIX_ROWS];
static void register_key(uint8_t key);
inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}
inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}
void matrix_init(void)
{
m0110_init();
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
matrix = _matrix0;
return;
}
uint8_t matrix_scan(void)
{
uint8_t key;
is_modified = false;
key = m0110_recv_key();
if (key == M0110_NULL) {
return 0;
} else if (key == M0110_ERROR) {
return 0;
} else {
is_modified = true;
register_key(key);
}
if (debug_enable) {
print("["); phex(key); print("]\n");
}
return 1;
}
bool matrix_is_modified(void)
{
return is_modified;
}
inline
bool matrix_has_ghost(void)
{
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
inline
uint8_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
void matrix_print(void)
{
print("\nr/c 01234567\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
pbin_reverse(matrix_get_row(row));
print("\n");
}
}
uint8_t matrix_key_count(void)
{
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += bitpop(matrix[i]);
}
return count;
}
inline
static void register_key(uint8_t key)
{
if (key&0x80) {
matrix[ROW(key)] &= ~(1<<COL(key));
} else {
matrix[ROW(key)] |= (1<<COL(key));
}
}
-74
View File
@@ -1,74 +0,0 @@
#
# Makefile for PJRC Teensy
#
# Target file name (without extension).
TARGET = news_usb_pjrc
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c \
news.c
CONFIG_H = config_pjrc.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
# Boot Section Size in *bytes*
# Teensy halfKay 512
# Teensy++ halfKay 1024
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBaspLoader 2048
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# *Comment out* to disable the options.
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+5000)
EXTRAKEY_ENABLE = yes # Audio control and System control(+600)
CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
NKRO_ENABLE = yes # USB Nkey Rollover(+500)
#---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-62
View File
@@ -1,62 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x5021
#define MANUFACTURER t.m.k.
#define PRODUCT SONY NEWS keyboard converter
#define DESCRIPTION converts SONY NEWS protocol into USB
/* matrix size */
#define MATRIX_ROWS 16 // keycode bit: 3-0
#define MATRIX_COLS 8 // keycode bit: 6-4
/* legacy keymap support */
#define USE_LEGACY_KEYMAP
/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
)
/* Asynchronous USART
* 8-data bit, non parity, 1-stop bit, no flow control
*/
#ifdef __AVR_ATmega32U4__
# define NEWS_KBD_RX_VECT USART1_RX_vect
# define NEWS_KBD_RX_DATA UDR1
# define NEWS_KBD_RX_BAUD 9600
# define NEWS_KBD_RX_UBBR ((F_CPU/(16UL*NEWS_KBD_RX_BAUD))-1)
# define NEWS_KBD_RX_INIT() do { \
UBRR1L = (uint8_t) NEWS_KBD_RX_UBBR; \
UBRR1H = (uint8_t) (NEWS_KBD_RX_UBBR>>8); \
UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); \
} while(0)
#else
# error "USART configuration is needed."
#endif
#endif
-125
View File
@@ -1,125 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "util.h"
#include "keymap.h"
// Following macros help you to define a keymap with the form of actual keyboard layout.
/* SONY NEWS NWP-5461 */
#define KEYMAP( \
K7A, K01,K02,K03,K04,K05, K06,K07,K08,K09,K0A, K68,K69, K64,K65,K52, \
K0B,K0C,K0D,K0E,K0F,K10,K11,K12,K13,K14,K15,K16,K17,K18,K19, K6A, K4B,K4C,K4D,K4E, \
K1A,K1B,K1C,K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27, K6B, K4F,K50,K51,K56, \
K28,K29,K2A,K2B,K2C,K2D,K2E,K2F,K30,K31,K32,K33,K34, K35, K6C, K53,K54,K55,K5A, \
K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K42, K6D, K57,K59,K58, \
K43,K44,K45, K46, K47, K48,K49,K4A, K6E, K66,K5B,K5C,K5D \
) { \
{ KC_NO, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F }, \
{ KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47 }, \
{ KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F }, \
{ KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_##K5C, KC_##K5D, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_##K64, KC_##K65, KC_##K66, KC_NO }, \
{ KC_##K68, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_##K6D, KC_##K6E, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, }, \
{ KC_NO, KC_NO, KC_##K7A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
}
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
0, // Fn0
0, // Fn1
0, // Fn2
0, // Fn3
0, // Fn4
0, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_NO, // Fn0
KC_NO, // Fn1
KC_NO, // Fn2
KC_NO, // Fn3
KC_NO, // Fn4
KC_NO, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: default
* ,---. ,------------------------, ,------------------------. ,---------.
* |Pow| | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10| | F11| F12| ,-----------.
* `---' `------------------------' `------------------------' `---------' | *| /| +|
* ,-------------------------------------------------------------. ,---. ,---------------|
* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| BS | |Hlp| | 7| 8| 9| -|
* |-------------------------------------------------------------| |---| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]|Del| | |Ins| | 4| 5| 6| ,|
* |---------------------------------------------------------' | |---| |---------------|
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| '| `|Return| |Clr| | 1| 2| 3| |
* |-------------------------------------------------------------| |---| |-----------|Ent|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /| |Shift | |PgU| | 0| .| Up| |
* |-------------------------------------------------------------| |---| |---------------|
* |Alt |Gui |Alt | Space | |Gui|App|Ctrl | |PgD| |Tab|Lef|Dow|Rig|
* `-------------------------------------------------------------' `---' `---------------'
*/
KEYMAP(
PWR, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PAST,PSLS,PPLS,
ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,BSPC, HELP, P7, P8, P9, PMNS,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,DEL, INS, P4, P5, P6, PCMM,
LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT,GRV, ENT, CLR, P1, P2, P3, PENT,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RO, RSFT, PGUP, P0, PDOT,UP,
LALT,CAPS,LALT, SPC, ERAS, RALT,RGUI,RCTL, PGDN, TAB, LEFT,DOWN,RGHT
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-26
View File
@@ -1,26 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdint.h"
#include "news.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
// not supported now
}
-142
View File
@@ -1,142 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "print.h"
#include "util.h"
#include "news.h"
#include "matrix.h"
#include "debug.h"
/*
* Matrix Array usage:
*
* ROW: 16
* COL:8
*
* 8bit wide
* +---------+
* 0|00 ... 07|
* 1|08 ... 0F|
* :| ... |
* :| ... |
* E|70 ... 77|
* F|78 ... 7F|
* +---------+
*
*/
static uint8_t matrix[MATRIX_ROWS];
#define ROW(code) ((code>>3)&0xF)
#define COL(code) (code&0x07)
static bool is_modified = false;
inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}
inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}
void matrix_init(void)
{
news_init();
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
return;
}
uint8_t matrix_scan(void)
{
is_modified = false;
uint8_t code;
code = news_recv();
if (code == 0) {
return 0;
}
phex(code); print(" ");
if (code&0x80) {
// break code
if (matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] &= ~(1<<COL(code));
is_modified = true;
}
} else {
// make code
if (!matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] |= (1<<COL(code));
is_modified = true;
}
}
return code;
}
bool matrix_is_modified(void)
{
return is_modified;
}
inline
bool matrix_has_ghost(void)
{
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
inline
uint8_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
void matrix_print(void)
{
print("\nr/c 01234567\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
pbin_reverse(matrix_get_row(row));
print("\n");
}
}
uint8_t matrix_key_count(void)
{
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += bitpop(matrix[i]);
}
return count;
}
-83
View File
@@ -1,83 +0,0 @@
# Target file name (without extension).
TARGET = pc98_usb
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c \
protocol/serial_uart.c
# protocol/serial_soft.c
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
#
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options
# *Comment out* to disable the options.
#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
#NKRO_ENABLE = yes # USB Nkey Rollover
# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-70
View File
@@ -1,70 +0,0 @@
PC98 to USB keyboard protocol converter
=======================================
Target MCU is ATMega32u4 but other USB capable AVR will also work.
Connector
---------
8Pin mini DIN
___ ___
/ |_| \
/ 8 7 6 \
| 5 4 3 |
\_ 2 1 _/
\_____/
(receptacle)
Wiring: You can change this with ediging config.h.
Pin mini DIN MCU
----------------------------------
1 ~RST PD1
2 GND GND
3 ~RDY PD4
4 RXD PD2
5 ~RTY PD5
6 NC
7 NC
8 5V VCC
Protocol
--------
Singnal: Asynchronous, Positive logic, 19200baud, Least bit first
Frame format: 1-Start bit(Lo), 8-Data bits, Odd-Parity, 1-Stop bit
This converter uses software method for testing purpose. AVR UART engine will work better.
Build Firmware
--------------
Just use 'make'
$ cd pc98_usb
$ make
Then, load the binary to MCU with your favorite programmer.
Other PC98 converter projects and resource
------------------------------------------
PC98 to USB
http://davy.nyacom.net/kbd98usb/
PC98 to PS/2
http://www.tsp.ne.jp/~sawada/mago/c_gka98at.htm
http://www.tsp.ne.jp/~sawada/mago/src/gka98at.asm
PC98 keyboard commands
http://www.webtech.co.jp/company/doc/undocumented_mem/io_kb.txt
Inhibit repeating key:
0x9C, 0x70
-123
View File
@@ -1,123 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x9898
#define DEVICE_VER 0x0100
#define MANUFACTURER t.m.k.
#define PRODUCT PC98 keyboard converter
#define DESCRIPTION converts PC98 keyboard protocol into USB
/* matrix size */
#define MATRIX_ROWS 16
#define MATRIX_COLS 8
/* key combination for command */
#define IS_COMMAND() ( \
host_get_first_key() == KC_CANCEL \
)
/* PC98 Reset Port shared with TXD */
#define PC98_RST_DDR DDRD
#define PC98_RST_PORT PORTD
#define PC98_RST_BIT 3
/* PC98 Ready Port */
#define PC98_RDY_DDR DDRD
#define PC98_RDY_PORT PORTD
#define PC98_RDY_BIT 4
/* PC98 Retry Port */
#define PC98_RTY_DDR DDRD
#define PC98_RTY_PORT PORTD
#define PC98_RTY_BIT 5
/*
* PC98 Serial(USART) configuration
* asynchronous, positive logic, 19200baud, bit order: LSB first
* 1-start bit, 8-data bit, odd parity, 1-stop bit
*/
/*
* Software Serial
*/
#define SERIAL_SOFT_BAUD 19200
#define SERIAL_SOFT_PARITY_ODD
#define SERIAL_SOFT_BIT_ORDER_LSB
#define SERIAL_SOFT_LOGIC_POSITIVE
/* RXD Port */
#define SERIAL_SOFT_RXD_DDR DDRD
#define SERIAL_SOFT_RXD_PORT PORTD
#define SERIAL_SOFT_RXD_PIN PIND
#define SERIAL_SOFT_RXD_BIT 2
#define SERIAL_SOFT_RXD_READ() (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
/* RXD Interupt */
#define SERIAL_SOFT_RXD_VECT INT2_vect
#define SERIAL_SOFT_RXD_INIT() do { \
/* pin configuration: input with pull-up */ \
SERIAL_SOFT_RXD_DDR &= ~(1<<SERIAL_SOFT_RXD_BIT); \
SERIAL_SOFT_RXD_PORT |= (1<<SERIAL_SOFT_RXD_BIT); \
/* enable interrupt: INT2(falling edge) */ \
EICRA |= ((1<<ISC21)|(0<<ISC20)); \
EIMSK |= (1<<INT2); \
sei(); \
} while (0)
#define SERIAL_SOFT_RXD_INT_ENTER()
#define SERIAL_SOFT_RXD_INT_EXIT() do { \
/* clear interrupt flag */ \
EIFR = (1<<INTF2); \
} while (0)
/* TXD Port */
#define SERIAL_SOFT_TXD_DDR DDRD
#define SERIAL_SOFT_TXD_PORT PORTD
#define SERIAL_SOFT_TXD_PIN PIND
#define SERIAL_SOFT_TXD_BIT 3
#define SERIAL_SOFT_TXD_HI() do { SERIAL_SOFT_TXD_PORT |= (1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_SOFT_TXD_LO() do { SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_SOFT_TXD_INIT() do { \
/* pin configuration: output */ \
SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \
/* idle */ \
SERIAL_SOFT_TXD_ON(); \
} while (0)
/*
* Hardware Serial(UART)
*/
#ifdef __AVR_ATmega32U4__
#define SERIAL_UART_BAUD 19200
#define SERIAL_UART_DATA UDR1
#define SERIAL_UART_UBRR ((F_CPU/(16UL*SERIAL_UART_BAUD))-1)
#define SERIAL_UART_RXD_VECT USART1_RX_vect
#define SERIAL_UART_TXD_READY (UCSR1A&(1<<UDRE1))
#define SERIAL_UART_INIT() do { \
UBRR1L = (uint8_t) SERIAL_UART_UBRR; /* baud rate */ \
UBRR1H = (uint8_t) (SERIAL_UART_UBRR>>8); /* baud rate */ \
UCSR1B |= (1<<RXCIE1) | (1<<RXEN1); /* RX interrupt, RX: enable */ \
UCSR1B |= (0<<TXCIE1) | (1<<TXEN1); /* TX interrupt, TX: enable */ \
UCSR1C |= (1<<UPM11) | (1<<UPM10); /* parity: none(00), even(01), odd(11) */ \
sei(); \
} while(0)
#else
#error "USART configuration is needed."
#endif
#endif
-208
View File
@@ -1,208 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "action.h"
#include "action_macro.h"
#include "util.h"
#include "keymap.h"
/* PC-9801-98-S02 Raku Raku keyboard(Luckyboard) Normal Mode
,---------------------------------------------------------------.
| 60| 61| 62| 63| 64| 65| 66| 67| 68| 69| 6A| 6B| 36| 37| 3F| 3E|
`---------------------------------------------------------------'
,---------------------------------------------------------------.
| 00| 01| 02| 03| 04| 05| 58| 71| 06| 07| 08| 09| 0A| 0E|
|---------------------------------------------------------------|
| 0F| 10| 11| 12| 13| 14| 3A | 15| 16| 17| 18| 19| 1C|
|---------------------------------------------------------'. |
| 74| 20| 21| 22| 23| 24| 3B | 3C | 25| 26| 27| 28| 29| |
|---------------------------------------------------------------|
| 70| 2A| 2B| 2C| 2D| 2E| 38| 3D | 39| 2F| 30| 31| 32| 33| 70|
`---------------------------------------------------------------'
| 73| 51| 5B| 59| 34| 5A| 35| xx|
`-----------------------------------------------'
xx: 74 35 F4 B5
*/
#define KEYMAP( \
K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K36, K37, K3F, K3E, \
K00, K01, K02, K03, K04, K05, K58, K71, K06, K07, K08, K09, K0A, K0E, \
K0F, K10, K11, K12, K13, K14, K3A, K15, K16, K17, K18, K19, K1C, \
K74, K20, K21, K22, K23, K24, K3B, K3C, K25, K26, K27, K28, K29, \
K70,K2A, K2B, K2C, K2D, K2E, K38, K3D, K39, K2F, K30, K31, K32, K33, \
K73, K51, K5B, K59, K34, K5A, K35 \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_NO, KC_NO, KC_NO, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_NO, KC_NO, KC_##K1C, KC_NO, KC_NO, KC_NO }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_##K51, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67 }, \
{ KC_##K68, KC_##K69, KC_##K6A, KC_##K6B, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##K70, KC_##K71, KC_NO, KC_##K73, KC_##K74, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
}
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
,---------------------------------------------------------------.
| 60| 61| 62| 63| 64| 65| 66| 67| 68| 69| 6A| 6B| 36| 37| 3F| 3E|
`---------------------------------------------------------------'
,---------------------------------------------------------------.
| 00| 01| 02| 03| 04| 05| 58| 71| 06| 07| 08| 09| 0A| 0E|
|---------------------------------------------------------------|
| 0F| 10| 11| 12| 13| 14| 3A | 15| 16| 17| 18| 19| 1C|
|---------------------------------------------------------------|
| 74| 20| 21| 22| 23| 24| MINS| EQL| 25| 26| 27| 28| 29| |
|---------------------------------------------------------------|
| 70| 2A| 2B| 2C| 2D| 2E| 38| 3D | 39| 2F| 30| 31| 32| 33| 70|
`---------------------------------------------------------------'
| 73| 51| 5B| 59| 34| 5A| 35| xx|
`-----------------------------------------------'
*/
KEYMAP(
CANCEL,COPY, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, FN6,
ESC, 1, 2, 3, 4, 5, FN4, FN5, 6, 7, 8, 9, 0, BSPC,
TAB, Q, W, E, R, T, UP, Y, U, I, O, P, ENT,
LCTL, A, S, D, F, G, MINS, EQL, H, J, K, L, FN2,
LSFT, Z, X, C, V, B, GRV, BSLS, QUOT, N, M,COMM, DOT, FN1,
LGUI, LALT, LCTL, LSFT, SPC, SPC, RALT
),
KEYMAP(
PAUS,COPY, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14,
GRV, F1, F2, F3, F4, F5, NO, NO, F6, F7, F8, F9, F10, DEL,
TAB, Q, W, E, R, T, UP, HOME,PGDN,PGUP, END, P, ENT,
LCTL, A, S, D, F, G, MINS, EQL, LEFT,DOWN, UP,RGHT,SCLN,
LSFT, Z, X, C, V, B, INS, DOWN, DEL,HOME,PGDN,PGUP, END,TRNS,
LGUI, LALT, LCTL, LSFT, SPC, SPC, RALT
),
KEYMAP(
PAUS,COPY, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, F14,
GRV, F1, F2, F3, F4, F5, NO, NO, F6, F7, F8, F9, F10, DEL,
TAB, Q, W, E, R, T, UP, WH_L,WH_D,WH_U,WH_R, P, ENT,
LCTL, A, S, D, F, G, MINS, EQL, MS_L,MS_D,MS_U,MS_R,TRNS,
LSFT, Z, X, C, V, B, INS, DOWN, BTN3,BTN2,BTN1,BTN4,BTN5,TRNS,
LGUI, LALT, LCTL, LSFT, SPC, SPC, RALT
),
};
static const uint8_t PROGMEM overlays[][MATRIX_ROWS][MATRIX_COLS] = {};
/*
* Macro definition
*/
enum macro_id {
LBRACKET,
RBRACKET,
DUMMY,
};
const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
{
keyevent_t event = record->event;
//uint8_t tap_count = record->tap_count;
switch (id) {
case LBRACKET:
return (event.pressed ?
MACRO( T(LBRC), END ) :
MACRO( T(LBRC), END ) );
case RBRACKET:
return (event.pressed ?
MACRO( T(RBRC), END ) :
MACRO( T(RBRC), END ) );
}
return MACRO_NONE;
}
/*
* Action function
*/
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
{
/*
keyevent_t event = record->event;
uint8_t tap_count = record->tap_count;
switch (id) {
case 0xFF:
action_macro_play(get_macro(opt, event.pressed));
break;
}
*/
}
/*
* Fn actions
*/
static const uint16_t PROGMEM fn_actions[] = {
ACTION_LAYER_TAP_TOGGLE(0), // FN0
ACTION_LAYER_TAP_KEY(1, KC_SLASH), // FN1
ACTION_LAYER_TAP_KEY(2, KC_SCLN), // FN2
ACTION_LAYER_MOMENTARY(2), // FN3
ACTION_MACRO(LBRACKET), // FN4
ACTION_MACRO(RBRACKET), // FN5
ACTION_MACRO(DUMMY), // FN6
};
/*
* No need to edit.
*/
#define KEYMAPS_SIZE (sizeof(keymaps) / sizeof(keymaps[0]))
#define FN_ACTIONS_SIZE (sizeof(fn_actions) / sizeof(fn_actions[0]))
/* translates key to keycode */
uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
{
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
} else {
// fall back to layer 0
return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]);
}
}
/* translates Fn keycode to action */
action_t keymap_fn_to_action(uint8_t keycode)
{
action_t action;
if (FN_INDEX(keycode) < FN_ACTIONS_SIZE) {
action.code = pgm_read_word(&fn_actions[FN_INDEX(keycode)]);
} else {
action.code = ACTION_NO;
}
return action;
}
-33
View File
@@ -1,33 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdint.h"
#include "serial.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
uint8_t sun_led = 0;
if (usb_led & (1<<USB_LED_NUM_LOCK)) sun_led |= (1<<0);
if (usb_led & (1<<USB_LED_COMPOSE)) sun_led |= (1<<1);
if (usb_led & (1<<USB_LED_SCROLL_LOCK)) sun_led |= (1<<2);
if (usb_led & (1<<USB_LED_CAPS_LOCK)) sun_led |= (1<<3);
serial_send(0x0E);
serial_send(sun_led);
}
-211
View File
@@ -1,211 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "print.h"
#include "util.h"
#include "matrix.h"
#include "debug.h"
#include "protocol/serial.h"
/*
* Matrix Array usage:
*
* ROW: 16(4bits)
* COL: 8(3bits)
*
* 8bit wide
* +---------+
* 0|00 ... 07|
* 1|08 ... 0F|
* :| ... |
* :| ... |
* E|70 ... 77|
* F|78 ... 7F|
* +---------+
*/
static uint8_t matrix[MATRIX_ROWS];
#define ROW(code) ((code>>3)&0xF)
#define COL(code) (code&0x07)
static bool is_modified = false;
inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}
inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}
static void pc98_inhibit_repeat(void)
{
uint8_t code;
while (serial_recv()) ;
RETRY:
PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
_delay_ms(500);
serial_send(0x9C);
PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
_delay_ms(100);
while (!(code = serial_recv())) ;
print("PC98: send 9C: "); print_hex8(code); print("\n");
if (code != 0xFA) goto RETRY;
PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
_delay_ms(100);
serial_send(0x70);
PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
_delay_ms(100);
//code = serial_recv();
while (!(code = serial_recv())) ;
print("PC98: send 70: "); print_hex8(code); print("\n");
if (code != 0xFA) goto RETRY;
}
void matrix_init(void)
{
PC98_RST_DDR |= (1<<PC98_RST_BIT);
PC98_RDY_DDR |= (1<<PC98_RDY_BIT);
PC98_RTY_DDR |= (1<<PC98_RTY_BIT);
PC98_RST_PORT |= (1<<PC98_RST_BIT);
PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
PC98_RTY_PORT |= (1<<PC98_RTY_BIT);
serial_init();
// PC98 reset
/*
PC98_RST_PORT &= ~(1<<PC98_RST_BIT);
_delay_us(15);
PC98_RST_PORT |= (1<<PC98_RST_BIT);
_delay_us(13);
PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
*/
_delay_ms(500);
pc98_inhibit_repeat();
// PC98 ready
PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
debug("init\n");
return;
}
uint8_t matrix_scan(void)
{
is_modified = false;
uint16_t code;
PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
_delay_us(30);
code = serial_recv2();
PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
if (code == -1) return 0;
if (code == 0x60) {
pc98_inhibit_repeat();
/*
PC98_RDY_PORT |= (1<<PC98_RDY_BIT);
_delay_ms(100);
serial_send(0x96);
PC98_RDY_PORT &= ~(1<<PC98_RDY_BIT);
*/
return 0;
}
print_hex8(code); print(" ");
if (code&0x80) {
// break code
if (matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] &= ~(1<<COL(code));
is_modified = true;
}
} else {
// make code
if (!matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] |= (1<<COL(code));
is_modified = true;
}
}
return code;
}
bool matrix_is_modified(void)
{
return is_modified;
}
inline
bool matrix_has_ghost(void)
{
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
inline
uint8_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
void matrix_print(void)
{
print("\nr/c 01234567\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
pbin_reverse(matrix_get_row(row));
print("\n");
}
}
uint8_t matrix_key_count(void)
{
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += bitpop(matrix[i]);
}
return count;
}
-75
View File
@@ -1,75 +0,0 @@
# Target file name (without extension).
TARGET = ps2_usb
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
# Build Options
# *Comment out* to disable the options.
#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
NKRO_ENABLE = yes # USB Nkey Rollover
PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened)
#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes # uses primitive reference code
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c
ifdef PS2_USE_USART
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
endif
ifdef PS2_USE_INT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_INT
endif
ifdef PS2_USE_BUSYWAIT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif
#CONFIG_H = config_pjrc_usart.h
CONFIG_H = config.h
#---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-75
View File
@@ -1,75 +0,0 @@
# Target file name (without extension).
TARGET = ps2_usb_jis
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
# Build Options
# *Comment out* to disable the options.
#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
NKRO_ENABLE = yes # USB Nkey Rollover
#PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened)
#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
PS2_USE_BUSYWAIT = yes # uses primitive reference code
# keyboard dependent files
SRC = keymap_jis.c \
matrix.c \
led.c
ifdef PS2_USE_USART
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
endif
ifdef PS2_USE_INT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_INT
endif
ifdef PS2_USE_BUSYWAIT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif
#CONFIG_H = config_pjrc_usart.h
CONFIG_H = config.h
#---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-101
View File
@@ -1,101 +0,0 @@
# Target file name (without extension).
TARGET = ps2_usb_vusb
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c
# Use USART for PS/2. With V-USB INT and BUSYWAIT code is not useful.
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
CONFIG_H = config.h
# V-USB debug level: To use ps2_usart.c level must be 0
# ps2_usart.c requires USART to receive PS/2 signal.
OPT_DEFS += -DDEBUG_LEVEL=0
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
#MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
MCU = atmega168
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 20000000
# Build Options
# comment out to disable the options.
#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
#NKRO_ENABLE = yes # USB Nkey Rollover
NO_UART = yes # UART is unavailable
#---------------- Programming Options --------------------------
AVRDUDE = avrdude
# Type: avrdude -c ? to get a full listing.
AVRDUDE_PROGRAMMER = usbasp
AVRDUDE_PORT =
AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
# Uncomment the following if you want avrdude's erase cycle counter.
# Note that this counter needs to be initialized first using -Yn,
# see avrdude manual.
#AVRDUDE_ERASE_COUNTER = -y
# Uncomment the following if you do /not/ wish a verification to be
# performed after programming the device.
#AVRDUDE_NO_VERIFY = -V
# Increase verbosity level. Please use this when submitting bug
# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
# to submit bug reports.
#AVRDUDE_VERBOSE = -v -v
#AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
AVRDUDE_FLAGS = -p $(MCU) -c $(AVRDUDE_PROGRAMMER)
AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
# USBasp 2048
OPT_DEFS += -DBOOTLOADER_SIZE=2048
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/vusb.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-122
View File
@@ -1,122 +0,0 @@
PS/2 to USB keyboard converter
==============================
This firmware converts PS/2 keyboard protocol to USB and supports only Scan Code Set 2.
This will works on USB AVR(ATMega32U4, AT90USB) or V-USB(ATMega168, 328...).
Features
--------
Mouse keys
You can emulates mouse move and button click using keyboard.
System/Media control
You can sends Power event, Volume down/up and Mute.
USB NKRO(actually 120KRO+8Modifiers)
You can tolggles NKRO feature.
Keymap customization
You can customize keymaps easily by editing source code. See keymap.c.
PS/2 signal handling implementations
------------------------------------
Following three methods are used to implement PS/2 signal handling.
a. Simple and stupid busy-wait(ps2.c)
This is expected to implemented with portable C code for reference.
b. Interrupt driven(ps2.c)
Uses external interrupt to detect falling edge of clock line.
c. USART hardware module(ps2_usart.c)
Uses AVR USART engine to recevie PS/2 signal. Recomended and default.
This is required to work with V-USB, preceding two methods tend to
miss signal edges while V-USB handles USB.
To select method edit Makefile.
Connect Wires
-------------
In case of Teensy2.0(ATMega32U4):
0. Connect Vcc and GND.
1. Connect Clock and Data line.
For a. Clock is on PF0 and Data on PF1.
For b. Clock is on PD1 and Data on PD2.
For c. Clock is on PD5 and Data on PD2.
2. Optionally you need pull-up register. 1K-10K Ohm is OK.
To change pin configuration edit config.h.
Build Frimware
--------------
1. Edit Makefile for build options and MCU setting.
Use 'atmega32u4' for Teensy 2.0 or 'at90usb1286' for Teensy++ 2.0.
2. make
Just type `make` in a terminal.
Use `-f Makefile.vusb` option to build V-USB converter.
Use `-f Makefile.jis` option to use JIS keyboard.
3. program MCU.
In case of Teensy use `Teensy Loader`.(http://www.pjrc.com/teensy/loader.html)
Otherwise you want to use `avrdude` or `dfu-programmer`.
Demonstration of Features
-------------------------
In default configuration, you can try several keymaps, mousekeys and USB NKRO.
Use following magic key combinations to enable some features.
keymaps and NKRO:
Magic+0: Qwerty with mousekeys(default)
Magic+1: Qwerty without mousekeys
Magic+2: Colemak
Magic+3: Dvorak
Magic+4: Workman
Magic+N: toggles NKRO/6KRO(6KRO by default)
Magic+Esc: sends Power Event(Power button)
where Magic=(LShift+RShift) or (LControl+RShift)
Fn layer function:
Fn0+(hjkl): Mousekey move(vi cursor like)
Fn0+(yuio): Mouse wheel(left,down,up,right)
Fn0+space: Mouse left button
Fn0+(mnb): Mouse buttons(m=left, n=right, b=middle)
Fn0+(zxc): Media control(Volup, Voldown, Mute)
Fn1+(hjkl): Cursor move(vi cursor like)
Fn1+(nm,.): Cursor move(Home,PageDown,PageUp,End)
where Fn0=;, Fn1=/
Keymap
------
You can change a keymap by editing code of keymap. See common/keycode.h for key symbols.
V-USB Support
-------------
You can also use this converter on ATmega(168/328) with V-USB instead of Teensy.
The converter on V-USB lacks some features for now: USB NKRO and System/Media control.
Circuit
-------
+---+ +---------------+
USB GND | | ATmega168 |
=== C3 | |
5V <-------+--------+---|Vcc,AVCC | PS/2
R1 | | ====
D- <----+--+-----R2-----|INT1 RXD|------->DATA
D+ <----|---+----R3-----|INT0 XCK|------->CLOCK
Z1 Z2 | | ->5V
GND<----+---+--+--+-----|GND | ->GND
| | | |
| C2-+--|XTAL1 |
| X1 | |
+--C3-+--|XTAL2 |
+---------------+
R1: 1.5K Ohm
R2,R3: 68 Ohm
Z1,Z2: Zenner 3.6V
C1,C2: 22pF
C3: 0.1uF
X1: Crystal 20MHz(16MHz/12MHz)
EOF
-170
View File
@@ -1,170 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#include <avr/interrupt.h>
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6512
#define MANUFACTURER t.m.k.
#define PRODUCT PS/2 keyboard converter
#define DESCRIPTION convert PS/2 keyboard to USB
/* matrix size */
#define MATRIX_ROWS 32 // keycode bit: 3-0
#define MATRIX_COLS 8 // keycode bit: 6-4
/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) || \
keyboard_report->mods == (MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RSHIFT)) \
)
/* legacy keymap support */
#define USE_LEGACY_KEYMAP
#ifdef PS2_USE_USART
#if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)
/* XCK for clock line and RXD for data line */
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 5
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 2
/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
/* set DDR of CLOCK as input to be slave */
#define PS2_USART_INIT() do { \
PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \
PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \
UCSR1C = ((1 << UMSEL10) | \
(3 << UPM10) | \
(0 << USBS1) | \
(3 << UCSZ10) | \
(0 << UCPOL1)); \
UCSR1A = 0; \
UBRR1H = 0; \
UBRR1L = 0; \
} while (0)
#define PS2_USART_RX_INT_ON() do { \
UCSR1B = ((1 << RXCIE1) | \
(1 << RXEN1)); \
} while (0)
#define PS2_USART_RX_POLL_ON() do { \
UCSR1B = (1 << RXEN1); \
} while (0)
#define PS2_USART_OFF() do { \
UCSR1C = 0; \
UCSR1B &= ~((1 << RXEN1) | \
(1 << TXEN1)); \
} while (0)
#define PS2_USART_RX_READY (UCSR1A & (1<<RXC1))
#define PS2_USART_RX_DATA UDR1
#define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
#define PS2_USART_RX_VECT USART1_RX_vect
#elif defined(__AVR_ATmega168__) || defined(__AVR_ATmega168P__) || defined(__AVR_ATmega328P__)
/* XCK for clock line and RXD for data line */
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 4
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 0
/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
/* set DDR of CLOCK as input to be slave */
#define PS2_USART_INIT() do { \
PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \
PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \
UCSR0C = ((1 << UMSEL00) | \
(3 << UPM00) | \
(0 << USBS0) | \
(3 << UCSZ00) | \
(0 << UCPOL0)); \
UCSR0A = 0; \
UBRR0H = 0; \
UBRR0L = 0; \
} while (0)
#define PS2_USART_RX_INT_ON() do { \
UCSR0B = ((1 << RXCIE0) | \
(1 << RXEN0)); \
} while (0)
#define PS2_USART_RX_POLL_ON() do { \
UCSR0B = (1 << RXEN0); \
} while (0)
#define PS2_USART_OFF() do { \
UCSR0C = 0; \
UCSR0B &= ~((1 << RXEN0) | \
(1 << TXEN0)); \
} while (0)
#define PS2_USART_RX_READY (UCSR0A & (1<<RXC0))
#define PS2_USART_RX_DATA UDR0
#define PS2_USART_ERROR (UCSR0A & ((1<<FE0) | (1<<DOR0) | (1<<UPE0)))
#define PS2_USART_RX_VECT USART_RX_vect
#endif
#endif
#ifdef PS2_USE_INT
/* uses INT1 for clock line(ATMega32U4) */
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 1
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 2
#define PS2_INT_INIT() do { \
EICRA |= ((1<<ISC11) | \
(0<<ISC10)); \
} while (0)
#define PS2_INT_ON() do { \
EIMSK |= (1<<INT1); \
} while (0)
#define PS2_INT_OFF() do { \
EIMSK &= ~(1<<INT1); \
} while (0)
#define PS2_INT_VECT INT1_vect
#endif
#ifdef PS2_USE_BUSYWAIT
#define PS2_CLOCK_PORT PORTF
#define PS2_CLOCK_PIN PINF
#define PS2_CLOCK_DDR DDRF
#define PS2_CLOCK_BIT 0
#define PS2_DATA_PORT PORTF
#define PS2_DATA_PIN PINF
#define PS2_DATA_DDR DDRF
#define PS2_DATA_BIT 1
#endif
#endif
-379
View File
@@ -1,379 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Keymap for PS/2 keyboard
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "keymap.h"
// Following macros help you to define a keymap with the form of actual keyboard layout.
/* US layout plus all other various keys */
#define KEYMAP_ALL( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \
\
K61, /* for European ISO */ \
K51, K13, K6A, K64, K67, /* for Japanese JIS */ \
K08, K10, K18, K20, K28, K30, K38, K40, K48, K50, K57, K5F, /* F13-24 */ \
KB7, KBF, KDE, /* System Power, Sleep, Wake */ \
KA3, KB2, KA1, /* Mute, Volume Up, Volume Down */ \
KCD, K95, KBB, KB4, KD0, /* Next, Previous, Stop, Pause, Media Select */ \
KC8, KAB, KC0, /* Mail, Calculator, My Computer */ \
K90, KBA, KB8, KB0, /* WWW Search, Home, Back, Forward */ \
KA8, KA0, K98 /* WWW Stop, Refresh, Favorites */ \
) { \
{ KC_NO, KC_##K01, KC_NO, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_NO }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO }, \
{ KC_##K18, KC_NO, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_NO }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_NO }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_NO }, \
{ KC_##K38, KC_NO, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_NO }, \
{ KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \
{ KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO }, \
{ KC_##K50, KC_##K51, KC_##K52, KC_NO, KC_##K54, KC_##K55, KC_NO, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_NO, KC_##K5D, KC_NO, KC_##K5F }, \
{ KC_NO, KC_##K61, KC_NO, KC_NO, KC_##K64, KC_NO, KC_##K66, KC_##K67 }, \
{ KC_NO, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_NO, KC_NO, KC_NO }, \
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \
{ KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_##K7E, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_##K83, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##K90, KC_##K91, KC_NO, KC_NO, KC_##K94, KC_##K95, KC_NO, KC_NO }, \
{ KC_##K98, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K9F }, \
{ KC_##KA0, KC_##KA1, KC_NO, KC_##KA3, KC_NO, KC_NO, KC_NO, KC_##KA7 }, \
{ KC_##KA8, KC_NO, KC_NO, KC_##KAB, KC_NO, KC_NO, KC_NO, KC_##KAF }, \
{ KC_##KB0, KC_NO, KC_##KB2, KC_NO, KC_##KB4, KC_NO, KC_NO, KC_##KB7 }, \
{ KC_##KB8, KC_NO, KC_##KBA, KC_##KBB, KC_NO, KC_NO, KC_NO, KC_##KBF }, \
{ KC_##KC0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##KC8, KC_NO, KC_##KCA, KC_NO, KC_NO, KC_##KCD, KC_NO, KC_NO }, \
{ KC_##KD0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_##KDA, KC_NO, KC_NO, KC_NO, KC_##KDE, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_##KE9, KC_NO, KC_##KEB, KC_##KEC, KC_NO, KC_NO, KC_NO }, \
{ KC_##KF0, KC_##KF1, KC_##KF2, KC_NO, KC_##KF4, KC_##KF5, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_##KFA, KC_NO, KC_##KFC, KC_##KFD, KC_##KFE, KC_NO }, \
}
/* US layout */
#define KEYMAP( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \
) \
KEYMAP_ALL( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \
\
NUBS, \
RO, KANA, JYEN, HENK, MHEN, \
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \
SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \
AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \
MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \
MAIL, CALCULATOR, MY_COMPUTER, \
WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \
WWW_STOP, WWW_REFRESH, WWW_FAVORITES \
)
/* ISO layout */
#define KEYMAP_ISO( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D,K5A, K6B,K73,K74,K79, \
K12,K61,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \
) \
KEYMAP_ALL( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \
\
K61, \
RO, KANA, JYEN, HENK, MHEN, \
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \
SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \
AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \
MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \
MAIL, CALCULATOR, MY_COMPUTER, \
WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \
WWW_STOP, WWW_REFRESH, WWW_FAVORITES \
)
/* JIS layout */
#define KEYMAP_JIS( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K67,K29,K64,K13, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \
) \
KEYMAP_ALL( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \
\
NUBS, \
K51, K13, K6A, K64, K67, \
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \
SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \
AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \
MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \
MAIL, CALCULATOR, MY_COMPUTER, \
WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \
WWW_STOP, WWW_REFRESH, WWW_FAVORITES \
)
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
5, // Fn0
6, // Fn1
0, // Fn2
0, // Fn3
0, // Fn4
0, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_SCLN, // Fn0
KC_SLSH, // Fn1
KC_NO, // Fn2
KC_NO, // Fn3
KC_NO, // Fn4
KC_NO, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
// The keymap is a 32*8 byte array which convert a PS/2 scan code into a USB keycode.
// See keycode.h for USB keycodes. You should omit a 'KC_' prefix of USB keycodes in keymap macro.
// Use KEYMAP_ISO() or KEYMAP_JIS() instead of KEYMAP() if your keyboard is ISO or JIS.
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: default
* ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,-----------.
* |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|Slp|Wak|
* `---' `---------------' `---------------' `---------------' `-----------' `-----------'
* ,-----------------------------------------------------------. ,-----------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa| |Ins|Hom|PgU| |NmL| /| *| -|
* |-----------------------------------------------------------| |-----------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| |
* |-----------------------------------------------------------| `-----------' |-----------| +|
* |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return | | 4| 5| 6| |
* |-----------------------------------------------------------| ,---. |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
* |-----------------------------------------------------------| ,-----------. |-----------|Ent|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl| |Lef|Dow|Rig| | 0| .| |
* `-----------------------------------------------------------' `-----------' `---------------'
* ; = Fn0(to Layer 5)
* / = Fn1(to Layer 6)
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9,
CAPS,A, S, D, F, G, H, J, K, L, FN0, QUOT, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN1, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
/* 1: plain Qwerty without layer switching
* ,-----------------------------------------------------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
* |-----------------------------------------------------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
* |-----------------------------------------------------------|
* |CapsLo| A| S| D| F| G| H| J| K| L| ;| '|Return |
* |-----------------------------------------------------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9,
CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
/* 2: Colemak http://colemak.com
* ,-----------------------------------------------------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
* |-----------------------------------------------------------|
* |Tab | Q| W| F| P| G| J| L| U| Y| ;| [| ]| \|
* |-----------------------------------------------------------|
* |BackSp| A| R| S| T| D| H| N| E| I| O| '|Return |
* |-----------------------------------------------------------|
* |Shift | Z| X| C| V| B| K| M| ,| ,| /|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
* `----------------------------------------------------------'
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, Q, W, F, P, G, J, L, U, Y, SCLN,LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9,
BSPC,A, R, S, T, D, H, N, E, I, O, QUOT, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, K, M, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
/* 3: Dvorak http://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard
* ,-----------------------------------------------------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| [| ]|Backspa|
* |-----------------------------------------------------------|
* |Tab | '| ,| .| P| Y| F| G| C| R| L| /| =| \|
* |-----------------------------------------------------------|
* |BackSp| A| O| E| U| I| D| H| T| N| S| -|Return |
* |-----------------------------------------------------------|
* |Shift | ;| Q| J| K| X| B| M| Wl V| Z|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, LBRC,RBRC,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, QUOT,COMM,DOT, P, Y, F, G, C, R, L, SLSH,EQL, BSLS, DEL, END, PGDN, P7, P8, P9,
CAPS,A, O, E, U, I, D, H, T, N, S, MINS, ENT, P4, P5, P6, PPLS,
LSFT,SCLN,Q, J, K, X, B, M, W, V, Z, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
/* 4: Workman http://viralintrospection.wordpress.com/2010/09/06/a-different-philosophy-in-designing-keyboard-layouts/
* ,-----------------------------------------------------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backspa|
* |-----------------------------------------------------------|
* |Tab | Q| D| R| W| B| J| F| U| P| ;| [| ]| \|
* |-----------------------------------------------------------|
* |CapsLo| A| S| H| T| G| Y| N| E| O| I| '|Return |
* |-----------------------------------------------------------|
* |Shift | Z| X| M| C| V| K| L| ,| ,| /|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, Q, D, R, W, B, J, F, U, P, SCLN,LBRC,RBRC,BSLS, DEL, END, PGDN, P7, P8, P9,
BSPC,A, S, H, T, G, Y, N, E, O, I, QUOT, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, M, C, V, K, L, COMM,DOT, SLSH, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
/* 5: Mouse keys
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa|
* |-----------------------------------------------------------|
* |Tab |MwL|MwU|McU|WwU|WwR|MwL|MwD|MwU|MwR| | | | \|
* |-----------------------------------------------------------|
* |CapsLo| |McL|McD|McR| |McL|McD|McU|McR|Fn0| |Return |
* |-----------------------------------------------------------|
* |Shift |VoD|VoU|Mut|Mb2|Mb3|Mb2|Mb1|VoD|VoU|Mut|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Mb1 |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
* Mc = mouse cursor, Mw = mouse wheel, Mb = mouse button
* Vo = Volume, Mut = Mute
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSLS, DEL, END, PGDN, P7, P8, P9,
CAPS,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, ENT, P4, P5, P6, PPLS,
LSFT,VOLD,VOLU,MUTE,BTN2,BTN3,BTN2,BTN1,VOLD,VOLU,MUTE, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, BTN1, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
/* 6: Cursor keys
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa|
* |-----------------------------------------------------------|
* |Tab |Hom|PgU| Up|PgU|End|Hom|PgD|PgU|End| | | | \|
* |-----------------------------------------------------------|
* |CapsLo| |Lef|Dow|Rig| |Lef|Dow| Up|Rig| | |Return |
* |-----------------------------------------------------------|
* |Shift | | | | | |Hom|PgD|PgU|End|Fn1|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
*/
KEYMAP(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, NO, NO, NO, BSLS, DEL, END, PGDN, P7, P8, P9,
CAPS,NO, NO, NO, NO, NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT, P4, P5, P6, PPLS,
LSFT,VOLD,VOLU,MUTE,NO, NO, HOME,PGDN,PGUP,END, FN1, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, SPC, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-297
View File
@@ -1,297 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Keymap for PS/2 keyboard
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "keymap.h"
// Following macros help you to define a keymap with the form of actual keyboard layout.
/* US layout plus all other various keys */
#define KEYMAP_ALL( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \
\
K61, /* for European ISO */ \
K51, K13, K6A, K64, K67, /* for Japanese JIS */ \
K08, K10, K18, K20, K28, K30, K38, K40, K48, K50, K57, K5F, /* F13-24 */ \
KB7, KBF, KDE, /* System Power, Sleep, Wake */ \
KA3, KB2, KA1, /* Mute, Volume Up, Volume Down */ \
KCD, K95, KBB, KB4, KD0, /* Next, Previous, Stop, Pause, Media Select */ \
KC8, KAB, KC0, /* Mail, Calculator, My Computer */ \
K90, KBA, KB8, KB0, /* WWW Search, Home, Back, Forward */ \
KA8, KA0, K98 /* WWW Stop, Refresh, Favorites */ \
) { \
{ KC_NO, KC_##K01, KC_NO, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_NO }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_NO }, \
{ KC_##K18, KC_NO, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_NO }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_NO }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_NO }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_NO }, \
{ KC_##K38, KC_NO, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_NO }, \
{ KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_NO }, \
{ KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_NO }, \
{ KC_##K50, KC_##K51, KC_##K52, KC_NO, KC_##K54, KC_##K55, KC_NO, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_NO, KC_##K5D, KC_NO, KC_##K5F }, \
{ KC_NO, KC_##K61, KC_NO, KC_NO, KC_##K64, KC_NO, KC_##K66, KC_##K67 }, \
{ KC_NO, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_NO, KC_NO, KC_NO }, \
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \
{ KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_##K7E, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_##K83, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##K90, KC_##K91, KC_NO, KC_NO, KC_##K94, KC_##K95, KC_NO, KC_NO }, \
{ KC_##K98, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_##K9F }, \
{ KC_##KA0, KC_##KA1, KC_NO, KC_##KA3, KC_NO, KC_NO, KC_NO, KC_##KA7 }, \
{ KC_##KA8, KC_NO, KC_NO, KC_##KAB, KC_NO, KC_NO, KC_NO, KC_##KAF }, \
{ KC_##KB0, KC_NO, KC_##KB2, KC_NO, KC_##KB4, KC_NO, KC_NO, KC_##KB7 }, \
{ KC_##KB8, KC_NO, KC_##KBA, KC_##KBB, KC_NO, KC_NO, KC_NO, KC_##KBF }, \
{ KC_##KC0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_##KC8, KC_NO, KC_##KCA, KC_NO, KC_NO, KC_##KCD, KC_NO, KC_NO }, \
{ KC_##KD0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_##KDA, KC_NO, KC_NO, KC_NO, KC_##KDE, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
{ KC_NO, KC_##KE9, KC_NO, KC_##KEB, KC_##KEC, KC_NO, KC_NO, KC_NO }, \
{ KC_##KF0, KC_##KF1, KC_##KF2, KC_NO, KC_##KF4, KC_##KF5, KC_NO, KC_NO }, \
{ KC_NO, KC_NO, KC_##KFA, KC_NO, KC_##KFC, KC_##KFD, KC_##KFE, KC_NO }, \
}
/* JIS layout */
#define KEYMAP_JIS( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K67,K29,K64,K13, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA \
) \
KEYMAP_ALL( \
K76,K05,K06,K04,K0C,K03,K0B,K83,K0A,K01,K09,K78,K07, KFC,K7E,KFE, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, KF0,KEC,KFD, K77,KCA,K7C,K7B, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, KF1,KE9,KFA, K6C,K75,K7D, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, K6B,K73,K74,K79, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, KF5, K69,K72,K7A, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, KEB,KF2,KF4, K70, K71,KDA, \
\
NUBS, \
K51, K13, K6A, K64, K67, \
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \
SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \
AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \
MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \
MAIL, CALCULATOR, MY_COMPUTER, \
WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \
WWW_STOP, WWW_REFRESH, WWW_FAVORITES \
)
#define KEYMAP_JIS_COMPACT( \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K6A,K66, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52,K5D, K5A, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A,K51, K59, \
K14,K9F,K11, K67,K29,K64,K13, K91,KA7,KAF,K94 \
) \
KEYMAP_ALL( \
ESC,F1, F2, F3, F4, F5, F6, F7, F8, F9, F10,F11,F12, PSCR,SLCK,BRK, \
K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K66, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS, \
K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B,K5D, DEL, END, PGDN, P7, P8, P9, \
K58,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K5A, P4, P5, P6, PPLS, \
K12,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K59, UP, P1, P2, P3, \
K14,K9F,K11, K29, K91,KA7,KAF,K94, LEFT,DOWN,RGHT, P0, PDOT,PENT, \
\
NUBS, \
K51, K13, K6A, K64, K67, \
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24, \
SYSTEM_POWER, SYSTEM_SLEEP, SYSTEM_WAKE, \
AUDIO_MUTE, AUDIO_VOL_UP, AUDIO_VOL_DOWN, \
MEDIA_NEXT_TRACK, MEDIA_PREV_TRACK, MEDIA_STOP, MEDIA_PLAY_PAUSE, MEDIA_SELECT, \
MAIL, CALCULATOR, MY_COMPUTER, \
WWW_SEARCH, WWW_HOME, WWW_BACK, WWW_FORWARD, \
WWW_STOP, WWW_REFRESH, WWW_FAVORITES \
)
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
1, // Fn0
2, // Fn1
1, // Fn2
2, // Fn3
3, // Fn4
4, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_SCLN, // Fn0
KC_SLSH, // Fn1
KC_BSPC, // Fn2
KC_NO, // Fn3
KC_NO, // Fn4
KC_SPC, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
// The keymap is a 32*8 byte array which convert a PS/2 scan code into a USB keycode.
// See keycode.h for USB keycodes. You should omit a 'KC_' prefix of USB keycodes in keymap macro.
// Use KEYMAP_ISO() or KEYMAP_JIS() instead of KEYMAP() if your keyboard is ISO or JIS.
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: JIS LAYOUT
* ,---. ,---------------. ,---------------. ,---------------. ,-----------. ,-----------.
* |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |Pwr|Slp|Wak|
* `---' `---------------' `---------------' `---------------' `-----------' `-----------'
* ,-----------------------------------------------------------. ,-----------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| JY|Bsp| |Ins|Hom|PgU| |NmL| /| *| -|
* |-----------------------------------------------------------| |-----------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Ret | |Del|End|PgD| | 7| 8| 9| |
* |------------------------------------------------------` | `-----------' |-----------| +|
* |CapsLo| A| S| D| F| G| H| J| K| L| ;| :| \| | | 4| 5| 6| |
* |-----------------------------------------------------------| ,---. |---------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift | |Up | | 1| 2| 3| |
* |-----------------------------------------------------------| ,-----------. |-----------|Ent|
* |Ctrl |Gui |Alt |MHEN| Space |HENK|KANA|Alt |Gui |Menu|Ctrl| |Lef|Dow|Rig| | 0| .| |
* `-----------------------------------------------------------' `-----------' `---------------'
*/
/*
KEYMAP_JIS(
ESC, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, PSCR,SLCK,BRK,
GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, DEL, END, PGDN, P7, P8, P9,
CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT,BSLS, ENT, P4, P5, P6, PPLS,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH,RO, RSFT, UP, P1, P2, P3,
LCTL,LGUI,LALT, MHEN,SPC, HENK,KANA, RALT,RGUI,APP, RCTL, LEFT,DOWN,RGHT, P0, PDOT,PENT
),
*/
/* 0: HHKB-wise
* ,-----------------------------------------------------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `|
* |-----------------------------------------------------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Bsp |
* |------------------------------------------------------` |
* |Ctrl | A| S| D| F| G| H| J| K| L| ;| :|Ret| |
* |-----------------------------------------------------------|
* |Shift | Z| X| C| V| B| N| M| ,| ,| /| RO|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt |MHEN| Space |HENK|KANA|Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
*/
KEYMAP_JIS_COMPACT(
ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,BSPC,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC,
LCTL,A, S, D, F, G, H, J, K, L, FN0, QUOT,GRV, ENT,
LSFT,Z, X, C, V, B, N, M, COMM,DOT, FN1, RSFT, FN4,
LCTL,LGUI,LALT, LALT,FN5, FN2, FN3, RALT,RGUI,APP, LGUI
),
/* 1: Mouse keys
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa|
* |-----------------------------------------------------------|
* |Tab |MwL|MwU|McU|WwU|WwR|MwL|MwD|MwU|MwR| | | | \|
* |-----------------------------------------------------------|
* |CapsLo| |McL|McD|McR| |McL|McD|McU|McR|Fn0| |Return |
* |-----------------------------------------------------------|
* |Shift |VoD|VoU|Mut|Mb2|Mb3|Mb2|Mb1|VoD|VoU|Mut|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Mb1 |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
* Mc = mouse cursor, Mw = mouse wheel, Mb = mouse button
* Vo = Volume, Mut = Mute
*/
KEYMAP_JIS_COMPACT(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL,
TAB, WH_L,WH_D,MS_U,WH_U,WH_R,WH_L,WH_D,WH_U,WH_R,NO, NO, NO,
LCTL,NO, MS_L,MS_D,MS_R,NO, MS_L,MS_D,MS_U,MS_R,FN0, NO, NO, ENT,
LSFT,NO, NO, BTN1,BTN2,BTN3,BTN2,BTN1,BTN2,BTN3,NO, RSFT, RSFT,
LCTL,LGUI,LALT, LALT,BTN1,FN2, RALT, RALT,RGUI,APP, LGUI
),
/* 2: Cursor keys
* ,-----------------------------------------------------------.
* |Esc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Backspa|
* |-----------------------------------------------------------|
* |Tab |Hom|PgU| Up|PgU|End|Hom|PgD|PgU|End| | | | \|
* |-----------------------------------------------------------|
* |CapsLo| |Lef|Dow|Rig| |Lef|Dow| Up|Rig| | |Return |
* |-----------------------------------------------------------|
* |Shift | | | | | |Hom|PgD|PgU|End|Fn1|Shift |
* |-----------------------------------------------------------|
* |Ctrl |Gui |Alt | Space |Alt |Gui |Menu|Ctrl|
* `-----------------------------------------------------------'
*/
KEYMAP_JIS_COMPACT(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL,
TAB, HOME,PGUP,UP, PGDN,END, HOME,PGDN,PGUP,END, NO, NO, NO,
LCTL,HOME,LEFT,DOWN,RGHT,END, LEFT,DOWN,UP, RGHT,NO, NO, NO, ENT,
LSFT,NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN1, RSFT, RSFT,
LCTL,LGUI,LALT, LALT,BTN1,BSPC,FN3, RALT,RGUI,APP, LGUI
),
/* 3: HHKB Fn layer */
KEYMAP_JIS_COMPACT(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL,
CAPS,NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, NO,
LCTL,VOLD,VOLU,MUTE,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT,NO, ENT,
LSFT,NO, NO, NO, NO, NO, NO, NO, END, PGDN,DOWN,RSFT, FN4,
LCTL,LGUI,LALT, LALT,SPC, BSPC,NO, RALT,RGUI,APP, LGUI
),
/* 4: Number */
KEYMAP_JIS_COMPACT(
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F8, F10, F11, F12, INS, DEL,
TAB, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, NO,
LCTL,1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, ENT,
LSFT,NO, NO, NO, NO, NO, NO, NO, NO, NO, NO, RSFT, RSFT,
LCTL,LGUI,LALT, LALT,FN5, BSPC,NO, RALT,RGUI,APP, LGUI
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-452
View File
@@ -1,452 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "print.h"
#include "util.h"
#include "debug.h"
#include "ps2.h"
#include "matrix.h"
static void matrix_make(uint8_t code);
static void matrix_break(uint8_t code);
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
#endif
/*
* Matrix Array usage:
* 'Scan Code Set 2' is assigned into 256(32x8)cell matrix.
* Hmm, it is very sparse and not efficient :(
*
* Notes:
* Both 'Hanguel/English'(F1) and 'Hanja'(F2) collide with 'Delete'(E0 71) and 'Down'(E0 72).
* These two Korean keys need exceptional handling and are not supported for now. Sorry.
*
* 8bit wide
* +---------+
* 0| |
* :| XX | 00-7F for normal codes(without E0-prefix)
* f|_________|
* 10| |
* :| E0 YY | 80-FF for E0-prefixed codes
* 1f| | (<YY>|0x80) is used as matrix position.
* +---------+
*
* Exceptions:
* 0x83: F7(0x83) This is a normal code but beyond 0x7F.
* 0xFC: PrintScreen
* 0xFE: Pause
*/
static uint8_t matrix[MATRIX_ROWS];
#define ROW(code) (code>>3)
#define COL(code) (code&0x07)
// matrix positions for exceptional keys
#define F7 (0x83)
#define PRINT_SCREEN (0xFC)
#define PAUSE (0xFE)
static bool is_modified = false;
inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}
inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}
void matrix_init(void)
{
ps2_host_init();
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
return;
}
/*
* PS/2 Scan Code Set 2: Exceptional Handling
*
* There are several keys to be handled exceptionally.
* The scan code for these keys are varied or prefix/postfix'd
* depending on modifier key state.
*
* Keyboard Scan Code Specification:
* http://www.microsoft.com/whdc/archive/scancode.mspx
* http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/scancode.doc
*
*
* 1) Insert, Delete, Home, End, PageUp, PageDown, Up, Down, Right, Left
* a) when Num Lock is off
* modifiers | make | break
* ----------+---------------------------+----------------------
* Ohter | <make> | <break>
* LShift | E0 F0 12 <make> | <break> E0 12
* RShift | E0 F0 59 <make> | <break> E0 59
* L+RShift | E0 F0 12 E0 F0 59 <make> | <break> E0 59 E0 12
*
* b) when Num Lock is on
* modifiers | make | break
* ----------+---------------------------+----------------------
* Other | E0 12 <make> | <break> E0 F0 12
* Shift'd | <make> | <break>
*
* Handling: These prefix/postfix codes are ignored.
*
*
* 2) Keypad /
* modifiers | make | break
* ----------+---------------------------+----------------------
* Ohter | <make> | <break>
* LShift | E0 F0 12 <make> | <break> E0 12
* RShift | E0 F0 59 <make> | <break> E0 59
* L+RShift | E0 F0 12 E0 F0 59 <make> | <break> E0 59 E0 12
*
* Handling: These prefix/postfix codes are ignored.
*
*
* 3) PrintScreen
* modifiers | make | break
* ----------+--------------+-----------------------------------
* Other | E0 12 E0 7C | E0 F0 7C E0 F0 12
* Shift'd | E0 7C | E0 F0 7C
* Control'd | E0 7C | E0 F0 7C
* Alt'd | 84 | F0 84
*
* Handling: These prefix/postfix codes are ignored, and both scan codes
* 'E0 7C' and 84 are seen as PrintScreen.
*
* 4) Pause
* modifiers | make(no break code)
* ----------+--------------------------------------------------
* Other | E1 14 77 E1 F0 14 F0 77
* Control'd | E0 7E E0 F0 7E
*
* Handling: Both code sequences are treated as a whole.
* And we need a ad hoc 'pseudo break code' hack to get the key off
* because it has no break code.
*
*/
uint8_t matrix_scan(void)
{
// scan code reading states
static enum {
INIT,
F0,
E0,
E0_F0,
// Pause
E1,
E1_14,
E1_14_77,
E1_14_77_E1,
E1_14_77_E1_F0,
E1_14_77_E1_F0_14,
E1_14_77_E1_F0_14_F0,
// Control'd Pause
E0_7E,
E0_7E_E0,
E0_7E_E0_F0,
} state = INIT;
is_modified = false;
// 'pseudo break code' hack
if (matrix_is_on(ROW(PAUSE), COL(PAUSE))) {
matrix_break(PAUSE);
}
uint8_t code;
while ((code = ps2_host_recv())) {
switch (state) {
case INIT:
switch (code) {
case 0xE0:
state = E0;
break;
case 0xF0:
state = F0;
break;
case 0xE1:
state = E1;
break;
case 0x83: // F7
matrix_make(F7);
state = INIT;
break;
case 0x84: // Alt'd PrintScreen
matrix_make(PRINT_SCREEN);
state = INIT;
break;
default: // normal key make
if (code < 0x80) {
matrix_make(code);
} else {
debug("unexpected scan code at INIT: "); debug_hex(code); debug("\n");
}
state = INIT;
}
break;
case E0: // E0-Prefixed
switch (code) {
case 0x12: // to be ignored
case 0x59: // to be ignored
state = INIT;
break;
case 0x7E: // Control'd Pause
state = E0_7E;
break;
case 0xF0:
state = E0_F0;
break;
default:
if (code < 0x80) {
matrix_make(code|0x80);
} else {
debug("unexpected scan code at E0: "); debug_hex(code); debug("\n");
}
state = INIT;
}
break;
case F0: // Break code
switch (code) {
case 0x83: // F7
matrix_break(F7);
state = INIT;
break;
case 0x84: // Alt'd PrintScreen
matrix_break(PRINT_SCREEN);
state = INIT;
break;
default:
if (code < 0x80) {
matrix_break(code);
} else {
debug("unexpected scan code at F0: "); debug_hex(code); debug("\n");
}
state = INIT;
}
break;
case E0_F0: // Break code of E0-prefixed
switch (code) {
case 0x12: // to be ignored
case 0x59: // to be ignored
state = INIT;
break;
default:
if (code < 0x80) {
matrix_break(code|0x80);
} else {
debug("unexpected scan code at E0_F0: "); debug_hex(code); debug("\n");
}
state = INIT;
}
break;
// following are states of Pause
case E1:
switch (code) {
case 0x14:
state = E1_14;
break;
default:
state = INIT;
}
break;
case E1_14:
switch (code) {
case 0x77:
state = E1_14_77;
break;
default:
state = INIT;
}
break;
case E1_14_77:
switch (code) {
case 0xE1:
state = E1_14_77_E1;
break;
default:
state = INIT;
}
break;
case E1_14_77_E1:
switch (code) {
case 0xF0:
state = E1_14_77_E1_F0;
break;
default:
state = INIT;
}
break;
case E1_14_77_E1_F0:
switch (code) {
case 0x14:
state = E1_14_77_E1_F0_14;
break;
default:
state = INIT;
}
break;
case E1_14_77_E1_F0_14:
switch (code) {
case 0xF0:
state = E1_14_77_E1_F0_14_F0;
break;
default:
state = INIT;
}
break;
case E1_14_77_E1_F0_14_F0:
switch (code) {
case 0x77:
matrix_make(PAUSE);
state = INIT;
break;
default:
state = INIT;
}
break;
// Following are states of Control'd Pause
case E0_7E:
if (code == 0xE0)
state = E0_7E_E0;
else
state = INIT;
break;
case E0_7E_E0:
if (code == 0xF0)
state = E0_7E_E0_F0;
else
state = INIT;
break;
case E0_7E_E0_F0:
if (code == 0x7E)
matrix_make(PAUSE);
state = INIT;
break;
default:
state = INIT;
}
phex(code);
}
return 1;
}
bool matrix_is_modified(void)
{
return is_modified;
}
inline
bool matrix_has_ghost(void)
{
#ifdef MATRIX_HAS_GHOST
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
if (matrix_has_ghost_in_row(i))
return true;
}
#endif
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
inline
uint8_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
void matrix_print(void)
{
print("\nr/c 01234567\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
pbin_reverse(matrix_get_row(row));
#ifdef MATRIX_HAS_GHOST
if (matrix_has_ghost_in_row(row)) {
print(" <ghost");
}
#endif
print("\n");
}
}
uint8_t matrix_key_count(void)
{
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += bitpop(matrix[i]);
}
return count;
}
#ifdef MATRIX_HAS_GHOST
inline
static bool matrix_has_ghost_in_row(uint8_t row)
{
// no ghost exists in case less than 2 keys on
if (((matrix[row] - 1) & matrix[row]) == 0)
return false;
// ghost exists in case same state as other row
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
if (i != row && (matrix[i] & matrix[row]) == matrix[row])
return true;
}
return false;
}
#endif
inline
static void matrix_make(uint8_t code)
{
if (!matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] |= 1<<COL(code);
is_modified = true;
}
}
inline
static void matrix_break(uint8_t code)
{
if (matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] &= ~(1<<COL(code));
is_modified = true;
}
}
-377
View File
@@ -1,377 +0,0 @@
/* Name: usbconfig.h
* Project: V-USB, virtual USB port for Atmel's(r) AVR(r) microcontrollers
* Author: Christian Starkjohann
* Creation Date: 2005-04-01
* Tabsize: 4
* Copyright: (c) 2005 by OBJECTIVE DEVELOPMENT Software GmbH
* License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
* This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $
*/
#ifndef __usbconfig_h_included__
#define __usbconfig_h_included__
/*
General Description:
This file is an example configuration (with inline documentation) for the USB
driver. It configures V-USB for USB D+ connected to Port D bit 2 (which is
also hardware interrupt 0 on many devices) and USB D- to Port D bit 4. You may
wire the lines to any other port, as long as D+ is also wired to INT0 (or any
other hardware interrupt, as long as it is the highest level interrupt, see
section at the end of this file).
*/
/* ---------------------------- Hardware Config ---------------------------- */
#define USB_CFG_IOPORTNAME D
/* This is the port where the USB bus is connected. When you configure it to
* "B", the registers PORTB, PINB and DDRB will be used.
*/
#define USB_CFG_DMINUS_BIT 3
/* This is the bit number in USB_CFG_IOPORT where the USB D- line is connected.
* This may be any bit in the port.
*/
#define USB_CFG_DPLUS_BIT 2
/* This is the bit number in USB_CFG_IOPORT where the USB D+ line is connected.
* This may be any bit in the port. Please note that D+ must also be connected
* to interrupt pin INT0! [You can also use other interrupts, see section
* "Optional MCU Description" below, or you can connect D- to the interrupt, as
* it is required if you use the USB_COUNT_SOF feature. If you use D- for the
* interrupt, the USB interrupt will also be triggered at Start-Of-Frame
* markers every millisecond.]
*/
#define USB_CFG_CLOCK_KHZ (F_CPU/1000)
/* Clock rate of the AVR in kHz. Legal values are 12000, 12800, 15000, 16000,
* 16500, 18000 and 20000. The 12.8 MHz and 16.5 MHz versions of the code
* require no crystal, they tolerate +/- 1% deviation from the nominal
* frequency. All other rates require a precision of 2000 ppm and thus a
* crystal!
* Since F_CPU should be defined to your actual clock rate anyway, you should
* not need to modify this setting.
*/
#define USB_CFG_CHECK_CRC 0
/* Define this to 1 if you want that the driver checks integrity of incoming
* data packets (CRC checks). CRC checks cost quite a bit of code size and are
* currently only available for 18 MHz crystal clock. You must choose
* USB_CFG_CLOCK_KHZ = 18000 if you enable this option.
*/
/* ----------------------- Optional Hardware Config ------------------------ */
/* #define USB_CFG_PULLUP_IOPORTNAME D */
/* If you connect the 1.5k pullup resistor from D- to a port pin instead of
* V+, you can connect and disconnect the device from firmware by calling
* the macros usbDeviceConnect() and usbDeviceDisconnect() (see usbdrv.h).
* This constant defines the port on which the pullup resistor is connected.
*/
/* #define USB_CFG_PULLUP_BIT 4 */
/* This constant defines the bit number in USB_CFG_PULLUP_IOPORT (defined
* above) where the 1.5k pullup resistor is connected. See description
* above for details.
*/
/* --------------------------- Functional Range ---------------------------- */
#define USB_CFG_HAVE_INTRIN_ENDPOINT 1
/* Define this to 1 if you want to compile a version with two endpoints: The
* default control endpoint 0 and an interrupt-in endpoint (any other endpoint
* number).
*/
#define USB_CFG_HAVE_INTRIN_ENDPOINT3 1
/* Define this to 1 if you want to compile a version with three endpoints: The
* default control endpoint 0, an interrupt-in endpoint 3 (or the number
* configured below) and a catch-all default interrupt-in endpoint as above.
* You must also define USB_CFG_HAVE_INTRIN_ENDPOINT to 1 for this feature.
*/
#define USB_CFG_EP3_NUMBER 3
/* If the so-called endpoint 3 is used, it can now be configured to any other
* endpoint number (except 0) with this macro. Default if undefined is 3.
*/
/* #define USB_INITIAL_DATATOKEN USBPID_DATA1 */
/* The above macro defines the startup condition for data toggling on the
* interrupt/bulk endpoints 1 and 3. Defaults to USBPID_DATA1.
* Since the token is toggled BEFORE sending any data, the first packet is
* sent with the oposite value of this configuration!
*/
#define USB_CFG_IMPLEMENT_HALT 0
/* Define this to 1 if you also want to implement the ENDPOINT_HALT feature
* for endpoint 1 (interrupt endpoint). Although you may not need this feature,
* it is required by the standard. We have made it a config option because it
* bloats the code considerably.
*/
#define USB_CFG_SUPPRESS_INTR_CODE 0
/* Define this to 1 if you want to declare interrupt-in endpoints, but don't
* want to send any data over them. If this macro is defined to 1, functions
* usbSetInterrupt() and usbSetInterrupt3() are omitted. This is useful if
* you need the interrupt-in endpoints in order to comply to an interface
* (e.g. HID), but never want to send any data. This option saves a couple
* of bytes in flash memory and the transmit buffers in RAM.
*/
#define USB_CFG_INTR_POLL_INTERVAL 10
/* If you compile a version with endpoint 1 (interrupt-in), this is the poll
* interval. The value is in milliseconds and must not be less than 10 ms for
* low speed devices.
*/
#define USB_CFG_IS_SELF_POWERED 0
/* Define this to 1 if the device has its own power supply. Set it to 0 if the
* device is powered from the USB bus.
*/
#define USB_CFG_MAX_BUS_POWER 100
/* Set this variable to the maximum USB bus power consumption of your device.
* The value is in milliamperes. [It will be divided by two since USB
* communicates power requirements in units of 2 mA.]
*/
#define USB_CFG_IMPLEMENT_FN_WRITE 1
/* Set this to 1 if you want usbFunctionWrite() to be called for control-out
* transfers. Set it to 0 if you don't need it and want to save a couple of
* bytes.
*/
#define USB_CFG_IMPLEMENT_FN_READ 0
/* Set this to 1 if you need to send control replies which are generated
* "on the fly" when usbFunctionRead() is called. If you only want to send
* data from a static buffer, set it to 0 and return the data from
* usbFunctionSetup(). This saves a couple of bytes.
*/
#define USB_CFG_IMPLEMENT_FN_WRITEOUT 0
/* Define this to 1 if you want to use interrupt-out (or bulk out) endpoints.
* You must implement the function usbFunctionWriteOut() which receives all
* interrupt/bulk data sent to any endpoint other than 0. The endpoint number
* can be found in 'usbRxToken'.
*/
#define USB_CFG_HAVE_FLOWCONTROL 0
/* Define this to 1 if you want flowcontrol over USB data. See the definition
* of the macros usbDisableAllRequests() and usbEnableAllRequests() in
* usbdrv.h.
*/
#define USB_CFG_DRIVER_FLASH_PAGE 0
/* If the device has more than 64 kBytes of flash, define this to the 64 k page
* where the driver's constants (descriptors) are located. Or in other words:
* Define this to 1 for boot loaders on the ATMega128.
*/
#define USB_CFG_LONG_TRANSFERS 0
/* Define this to 1 if you want to send/receive blocks of more than 254 bytes
* in a single control-in or control-out transfer. Note that the capability
* for long transfers increases the driver size.
*/
/* #define USB_RX_USER_HOOK(data, len) if(usbRxToken == (uchar)USBPID_SETUP) blinkLED(); */
/* This macro is a hook if you want to do unconventional things. If it is
* defined, it's inserted at the beginning of received message processing.
* If you eat the received message and don't want default processing to
* proceed, do a return after doing your things. One possible application
* (besides debugging) is to flash a status LED on each packet.
*/
/* #define USB_RESET_HOOK(resetStarts) if(!resetStarts){hadUsbReset();} */
/* This macro is a hook if you need to know when an USB RESET occurs. It has
* one parameter which distinguishes between the start of RESET state and its
* end.
*/
/* #define USB_SET_ADDRESS_HOOK() hadAddressAssigned(); */
/* This macro (if defined) is executed when a USB SET_ADDRESS request was
* received.
*/
#define USB_COUNT_SOF 0
/* define this macro to 1 if you need the global variable "usbSofCount" which
* counts SOF packets. This feature requires that the hardware interrupt is
* connected to D- instead of D+.
*/
/* #ifdef __ASSEMBLER__
* macro myAssemblerMacro
* in YL, TCNT0
* sts timer0Snapshot, YL
* endm
* #endif
* #define USB_SOF_HOOK myAssemblerMacro
* This macro (if defined) is executed in the assembler module when a
* Start Of Frame condition is detected. It is recommended to define it to
* the name of an assembler macro which is defined here as well so that more
* than one assembler instruction can be used. The macro may use the register
* YL and modify SREG. If it lasts longer than a couple of cycles, USB messages
* immediately after an SOF pulse may be lost and must be retried by the host.
* What can you do with this hook? Since the SOF signal occurs exactly every
* 1 ms (unless the host is in sleep mode), you can use it to tune OSCCAL in
* designs running on the internal RC oscillator.
* Please note that Start Of Frame detection works only if D- is wired to the
* interrupt, not D+. THIS IS DIFFERENT THAN MOST EXAMPLES!
*/
#define USB_CFG_CHECK_DATA_TOGGLING 0
/* define this macro to 1 if you want to filter out duplicate data packets
* sent by the host. Duplicates occur only as a consequence of communication
* errors, when the host does not receive an ACK. Please note that you need to
* implement the filtering yourself in usbFunctionWriteOut() and
* usbFunctionWrite(). Use the global usbCurrentDataToken and a static variable
* for each control- and out-endpoint to check for duplicate packets.
*/
#define USB_CFG_HAVE_MEASURE_FRAME_LENGTH 0
/* define this macro to 1 if you want the function usbMeasureFrameLength()
* compiled in. This function can be used to calibrate the AVR's RC oscillator.
*/
#define USB_USE_FAST_CRC 0
/* The assembler module has two implementations for the CRC algorithm. One is
* faster, the other is smaller. This CRC routine is only used for transmitted
* messages where timing is not critical. The faster routine needs 31 cycles
* per byte while the smaller one needs 61 to 69 cycles. The faster routine
* may be worth the 32 bytes bigger code size if you transmit lots of data and
* run the AVR close to its limit.
*/
/* -------------------------- Device Description --------------------------- */
#define USB_CFG_VENDOR_ID (VENDOR_ID & 0xFF), ((VENDOR_ID >> 8) & 0xFF)
/* USB vendor ID for the device, low byte first. If you have registered your
* own Vendor ID, define it here. Otherwise you may use one of obdev's free
* shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
* *** IMPORTANT NOTE ***
* This template uses obdev's shared VID/PID pair for Vendor Class devices
* with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
* the implications!
*/
#define USB_CFG_DEVICE_ID (PRODUCT_ID & 0xFF), ((PRODUCT_ID >> 8) & 0xFF)
/* This is the ID of the product, low byte first. It is interpreted in the
* scope of the vendor ID. If you have registered your own VID with usb.org
* or if you have licensed a PID from somebody else, define it here. Otherwise
* you may use one of obdev's free shared VID/PID pairs. See the file
* USB-IDs-for-free.txt for details!
* *** IMPORTANT NOTE ***
* This template uses obdev's shared VID/PID pair for Vendor Class devices
* with libusb: 0x16c0/0x5dc. Use this VID/PID pair ONLY if you understand
* the implications!
*/
#define USB_CFG_DEVICE_VERSION 0x00, 0x01
/* Version number of the device: Minor number first, then major number.
*/
#define USB_CFG_VENDOR_NAME 't', '.', 'm', '.', 'k', '.'
#define USB_CFG_VENDOR_NAME_LEN 6
/* These two values define the vendor name returned by the USB device. The name
* must be given as a list of characters under single quotes. The characters
* are interpreted as Unicode (UTF-16) entities.
* If you don't want a vendor name string, undefine these macros.
* ALWAYS define a vendor name containing your Internet domain name if you use
* obdev's free shared VID/PID pair. See the file USB-IDs-for-free.txt for
* details.
*/
#define USB_CFG_DEVICE_NAME 'P', 'S', '/', '2', ' ', 'k', 'e', 'y', 'b', 'o', 'a', 'r', 'd', ' ', 'c', 'o', 'n', 'v', 'e', 'r', 't', 'e', 'r'
#define USB_CFG_DEVICE_NAME_LEN 23
/* Same as above for the device name. If you don't want a device name, undefine
* the macros. See the file USB-IDs-for-free.txt before you assign a name if
* you use a shared VID/PID.
*/
/*#define USB_CFG_SERIAL_NUMBER 'N', 'o', 'n', 'e' */
/*#define USB_CFG_SERIAL_NUMBER_LEN 0 */
/* Same as above for the serial number. If you don't want a serial number,
* undefine the macros.
* It may be useful to provide the serial number through other means than at
* compile time. See the section about descriptor properties below for how
* to fine tune control over USB descriptors such as the string descriptor
* for the serial number.
*/
#define USB_CFG_DEVICE_CLASS 0
#define USB_CFG_DEVICE_SUBCLASS 0
/* See USB specification if you want to conform to an existing device class.
* Class 0xff is "vendor specific".
*/
#define USB_CFG_INTERFACE_CLASS 3 /* HID */
#define USB_CFG_INTERFACE_SUBCLASS 1 /* Boot */
#define USB_CFG_INTERFACE_PROTOCOL 1 /* Keyboard */
/* See USB specification if you want to conform to an existing device class or
* protocol. The following classes must be set at interface level:
* HID class is 3, no subclass and protocol required (but may be useful!)
* CDC class is 2, use subclass 2 and protocol 1 for ACM
*/
#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH 0
/* Define this to the length of the HID report descriptor, if you implement
* an HID device. Otherwise don't define it or define it to 0.
* If you use this define, you must add a PROGMEM character array named
* "usbHidReportDescriptor" to your code which contains the report descriptor.
* Don't forget to keep the array and this define in sync!
*/
/* #define USB_PUBLIC static */
/* Use the define above if you #include usbdrv.c instead of linking against it.
* This technique saves a couple of bytes in flash memory.
*/
/* ------------------- Fine Control over USB Descriptors ------------------- */
/* If you don't want to use the driver's default USB descriptors, you can
* provide our own. These can be provided as (1) fixed length static data in
* flash memory, (2) fixed length static data in RAM or (3) dynamically at
* runtime in the function usbFunctionDescriptor(). See usbdrv.h for more
* information about this function.
* Descriptor handling is configured through the descriptor's properties. If
* no properties are defined or if they are 0, the default descriptor is used.
* Possible properties are:
* + USB_PROP_IS_DYNAMIC: The data for the descriptor should be fetched
* at runtime via usbFunctionDescriptor(). If the usbMsgPtr mechanism is
* used, the data is in FLASH by default. Add property USB_PROP_IS_RAM if
* you want RAM pointers.
* + USB_PROP_IS_RAM: The data returned by usbFunctionDescriptor() or found
* in static memory is in RAM, not in flash memory.
* + USB_PROP_LENGTH(len): If the data is in static memory (RAM or flash),
* the driver must know the descriptor's length. The descriptor itself is
* found at the address of a well known identifier (see below).
* List of static descriptor names (must be declared PROGMEM if in flash):
* char usbDescriptorDevice[];
* char usbDescriptorConfiguration[];
* char usbDescriptorHidReport[];
* char usbDescriptorString0[];
* int usbDescriptorStringVendor[];
* int usbDescriptorStringDevice[];
* int usbDescriptorStringSerialNumber[];
* Other descriptors can't be provided statically, they must be provided
* dynamically at runtime.
*
* Descriptor properties are or-ed or added together, e.g.:
* #define USB_CFG_DESCR_PROPS_DEVICE (USB_PROP_IS_RAM | USB_PROP_LENGTH(18))
*
* The following descriptors are defined:
* USB_CFG_DESCR_PROPS_DEVICE
* USB_CFG_DESCR_PROPS_CONFIGURATION
* USB_CFG_DESCR_PROPS_STRINGS
* USB_CFG_DESCR_PROPS_STRING_0
* USB_CFG_DESCR_PROPS_STRING_VENDOR
* USB_CFG_DESCR_PROPS_STRING_PRODUCT
* USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER
* USB_CFG_DESCR_PROPS_HID
* USB_CFG_DESCR_PROPS_HID_REPORT
* USB_CFG_DESCR_PROPS_UNKNOWN (for all descriptors not handled by the driver)
*
* Note about string descriptors: String descriptors are not just strings, they
* are Unicode strings prefixed with a 2 byte header. Example:
* int serialNumberDescriptor[] = {
* USB_STRING_DESCRIPTOR_HEADER(6),
* 'S', 'e', 'r', 'i', 'a', 'l'
* };
*/
#define USB_CFG_DESCR_PROPS_DEVICE 0
#define USB_CFG_DESCR_PROPS_CONFIGURATION USB_PROP_IS_DYNAMIC
//#define USB_CFG_DESCR_PROPS_CONFIGURATION 0
#define USB_CFG_DESCR_PROPS_STRINGS 0
#define USB_CFG_DESCR_PROPS_STRING_0 0
#define USB_CFG_DESCR_PROPS_STRING_VENDOR 0
#define USB_CFG_DESCR_PROPS_STRING_PRODUCT 0
#define USB_CFG_DESCR_PROPS_STRING_SERIAL_NUMBER 0
//#define USB_CFG_DESCR_PROPS_HID USB_PROP_IS_DYNAMIC
#define USB_CFG_DESCR_PROPS_HID 0
#define USB_CFG_DESCR_PROPS_HID_REPORT USB_PROP_IS_DYNAMIC
//#define USB_CFG_DESCR_PROPS_HID_REPORT 0
#define USB_CFG_DESCR_PROPS_UNKNOWN 0
/* ----------------------- Optional MCU Description ------------------------ */
/* The following configurations have working defaults in usbdrv.h. You
* usually don't need to set them explicitly. Only if you want to run
* the driver on a device which is not yet supported or with a compiler
* which is not fully supported (such as IAR C) or if you use a differnt
* interrupt than INT0, you may have to define some of these.
*/
/* #define USB_INTR_CFG MCUCR */
/* #define USB_INTR_CFG_SET ((1 << ISC00) | (1 << ISC01)) */
/* #define USB_INTR_CFG_CLR 0 */
/* #define USB_INTR_ENABLE GIMSK */
/* #define USB_INTR_ENABLE_BIT INT0 */
/* #define USB_INTR_PENDING GIFR */
/* #define USB_INTR_PENDING_BIT INTF0 */
/* #define USB_INTR_VECTOR INT0_vect */
#endif /* __usbconfig_h_included__ */
-83
View File
@@ -1,83 +0,0 @@
# Target file name (without extension).
TARGET = sun_usb
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c \
command_extra.c \
protocol/serial_soft.c
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
#
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options
# *Comment out* to disable the options.
#
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug
#NKRO_ENABLE = yes # USB Nkey Rollover
# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-79
View File
@@ -1,79 +0,0 @@
Sun to USB keyboard protocol converter
======================================
Target MCU is ATMega32u4 but other USB capable AVR will also work.
Supported keyboards: Sun Type 5 Keyboard, CTCSP SHORT TYPE KEYBOARD(CKUB)
CTCSP SHORT TYPE KEYBOARD: http://imgur.com/a/QIv6p
Connector
---------
8Pin mini DIN
___ ___
/ |_| \
/ 8 7 6 \
| 5 4 3 |
\_ 2 1 _/
\_____/
(receptacle)
Wiring:
Pin mini DIN MCU
----------------------------------
1 GND GND
2 GND GND
3 5V
4 RX/TX(Mouse)
5 RX PD3
6 TX PD2
7 GND GND
8 5V VCC
Protocol
--------
Singnal: Asynchronous, Negative logic, 1200baud, No Flow control
Frame format: 1-Start bit, 8-Data bits, No-Parity, 1-Stop bit
AVR USART engine expects positive logic while Sun keyboard signal is negative.
To use AVR UART engine you need exteral inverter in front of RX and TX pin.
Otherwise you can software serial routine to communicate the keyboard.
This converter uses software method, you doesn't need any inverter part.
Commands From System To Keyboard
0x01 Reset
Keyboard responds with following byte sequence:
Success: 0xFF 0x04 0x7F
Fail: 0x7E 0x01 0x7F
0x02 Bell On
0x03 Bell Off
0x0A Click On
0x0B Click Off
0x0E LED
followed by LED status byte:
bit: 3 2 1 0
LED: CapsLk ScrLk Compose NumLk
0x0F Layout
Keyboard responds with 'Layout Response' 0xFE 0xXX
Commands From Keyboard To System
0x7F Idle
means no keys pressed.
0xFE Layout Response
0xFF Reset Response(followed by 0x04)
Reference
http://kentie.net/article/sunkbd/page2.htm
http://kentie.net/article/sunkbd/KBD.pdf
Build Firmware
--------------
Just use 'make'
$ cd sun_usb
$ make
Then, load the binary to MCU with your favorite programmer.
-43
View File
@@ -1,43 +0,0 @@
#include "stdbool.h"
#include "stdint.h"
#include "keycode.h"
#include "serial.h"
#include "print.h"
#include "command.h"
bool command_extra(uint8_t code)
{
switch (code) {
case KC_H:
case KC_SLASH: /* ? */
print("\n\n----- Sun converter Help -----\n");
print("UP: Bell On\n");
print("DOWN: Bell Off\n");
print("LEFT: Click On\n");
print("RIGHT: Click Off\n");
return false;
case KC_UP:
print("Bell On\n");
serial_send(0x02);
break;
case KC_DOWN:
print("Bell Off\n");
serial_send(0x03);
break;
case KC_LEFT:
print("Click On\n");
serial_send(0x0A);
break;
case KC_RIGHT:
print("Click Off\n");
serial_send(0x0B);
break;
case KC_NUMLOCK:
print("layout\n");
serial_send(0x0F);
break;
default:
return false;
}
return true;
}
-89
View File
@@ -1,89 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x3333
#define DEVICE_VER 0x0100
#define MANUFACTURER t.m.k.
#define PRODUCT Sun keyboard converter
#define DESCRIPTION converts Sun keyboard protocol into USB
/* matrix size */
#define MATRIX_ROWS 16
#define MATRIX_COLS 8
/* key combination for command */
#define IS_COMMAND() ( \
keyboard_report->mods == (MOD_BIT(KC_LALT) | MOD_BIT(KC_RALT)) || \
keyboard_report->mods == (MOD_BIT(KC_LGUI) | MOD_BIT(KC_RGUI)) || \
keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
)
/* legacy keymap support */
#define USE_LEGACY_KEYMAP
/* Serial(USART) configuration
* asynchronous, negative logic, 1200baud, no flow control
* 1-start bit, 8-data bit, non parity, 1-stop bit
*/
#define SERIAL_SOFT_BAUD 1200
#define SERIAL_SOFT_PARITY_NONE
#define SERIAL_SOFT_BIT_ORDER_LSB
#define SERIAL_SOFT_LOGIC_NEGATIVE
/* RXD Port */
#define SERIAL_SOFT_RXD_ENABLE
#define SERIAL_SOFT_RXD_DDR DDRD
#define SERIAL_SOFT_RXD_PORT PORTD
#define SERIAL_SOFT_RXD_PIN PIND
#define SERIAL_SOFT_RXD_BIT 2
#define SERIAL_SOFT_RXD_VECT INT2_vect
/* RXD Interupt */
#define SERIAL_SOFT_RXD_INIT() do { \
/* pin configuration: input with pull-up */ \
SERIAL_SOFT_RXD_DDR &= ~(1<<SERIAL_SOFT_RXD_BIT); \
SERIAL_SOFT_RXD_PORT |= (1<<SERIAL_SOFT_RXD_BIT); \
/* enable interrupt: INT2(rising edge) */ \
EICRA |= ((1<<ISC21)|(1<<ISC20)); \
EIMSK |= (1<<INT2); \
sei(); \
} while (0)
#define SERIAL_SOFT_RXD_INT_ENTER()
#define SERIAL_SOFT_RXD_INT_EXIT() do { \
/* clear interrupt flag */ \
EIFR = (1<<INTF2); \
} while (0)
#define SERIAL_SOFT_RXD_READ() (SERIAL_SOFT_RXD_PIN&(1<<SERIAL_SOFT_RXD_BIT))
/* TXD Port */
#define SERIAL_SOFT_TXD_ENABLE
#define SERIAL_SOFT_TXD_DDR DDRD
#define SERIAL_SOFT_TXD_PORT PORTD
#define SERIAL_SOFT_TXD_PIN PIND
#define SERIAL_SOFT_TXD_BIT 3
#define SERIAL_SOFT_TXD_HI() do { SERIAL_SOFT_TXD_PORT |= (1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_SOFT_TXD_LO() do { SERIAL_SOFT_TXD_PORT &= ~(1<<SERIAL_SOFT_TXD_BIT); } while (0)
#define SERIAL_SOFT_TXD_INIT() do { \
/* pin configuration: output */ \
SERIAL_SOFT_TXD_DDR |= (1<<SERIAL_SOFT_TXD_BIT); \
/* idle */ \
SERIAL_SOFT_TXD_ON(); \
} while (0)
#endif
-192
View File
@@ -1,192 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "util.h"
#include "keymap.h"
/* Sun type 5 keyboard
,-------. ,---, ,---------------. ,---------------. ,---------------. ,-----------. ,---------------.
| 76 | | | | 05| 06| 08| 0A| | 0C| 0E| 10| 11| | 12| 07| 09| 0B| | 16| 17| 15| | 2D| 02| 04| 30|
`-------' `---' `---------------' `---------------' `---------------' `-----------' `---------------'
,-------. ,-----------------------------------------------------------. ,-----------. ,---------------.
| 01| 03| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2C| 34| 60| | 62| 2E| 2F| 47|
|-------| |-----------------------------------------------------------| |------------ |---------------|
| 19| 1A| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 2B | | 42| 4A| 7B| | 44| 45| 46| |
|-------| |-----------------------------------------------------------| `-----------' |-----------| 7D|
| 31| 33| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| |
|-------| |-----------------------------------------------------------| ,---. |-----------|---|
| 48| 49| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E | | 14| | 70| 71| 72| |
|-------| |-----------------------------------------------------------| .-----------. |-----------| 5A|
| 5F| 61| | 77 | 13| 78 |*73 | 79 |*74 |*75| 7A | 43| 0D| | 18| 1B| 1C| | 5E | 32| |
`-------' `-----------------------------------------------------------' `-----------' `---------------'
*/
#define KEYMAP( \
K76, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, K16,K17,K15, K2D,K02,K04,K30, \
K01,K03, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, K2C,K34,K60, K62,K2E,K2F,K47, \
K19,K1A, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K2B, K42,K4A,K7B, K44,K45,K46,K7D, \
K31,K33, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, K5B,K5C,K5D, \
K48,K49, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, K70,K71,K72,K5A, \
K5F,K61, K77,K13, K78, K73, K79, K74, K75, K7A, K43, K0D, K18,K1B,K1C, K5E, K32 \
) { \
{ KC_NO, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_NO, }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F }, \
{ KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47 }, \
{ KC_##K48, KC_##K49, KC_##K4A, KC_NO, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F }, \
{ KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F }, \
{ KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67 }, \
{ KC_##K68, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_##K6D, KC_##K6E, KC_NO }, \
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \
{ KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_NO, KC_##K7D, KC_NO, KC_NO } \
}
/* CTCSP SHORT TYPE KEYBOARD */
#define SHORT_TYPE( \
K01, K05,K06,K08,K0A,K0C,K0E, K61,K49,K33, K30, K2C,K34,K60, \
K10,K11,K12,K07,K09,K0B, K42,K4A,K7B, \
K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, \
K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K2B, \
K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, \
K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K0D,K14,K6E, \
K77,K13, K78, K79, K7A,K43,K62,K18,K1B,K1C \
) KEYMAP( \
HELP, K05,K06,K08,K0A, K0C,K0E,K10,K11, K12,K07,K09,K0B, PSCR,SLCK,PAUS, MUTE,VOLD,VOLU,PWR, \
K01, AGAIN, K1D,K1E,K1F,K20,K21,K22,K23,K24,K25,K26,K27,K28,K29,K58,K2A, K2C, K34, K60, K62, PSLS,PAST,PMNS, \
MENU, UNDO, K35, K36,K37,K38,K39,K3A,K3B,K3C,K3D,K3E,K3F,K40,K41, K2B, K42, K4A, K7B, P7, P8, P9, PPLS, \
SELECT, COPY, K4C, K4D,K4E,K4F,K50,K51,K52,K53,K54,K55,K56,K57, K59, P4, P5, P6, \
EXECUTE,PASTE, K63, K64,K65,K66,K67,K68,K69,K6A,K6B,K6C,K6D, K6E, K14, P1, P2, P3, PENT, \
FIND, CUT, K77,K13, K78, HENK, K79, MHEN, KANA, K7A,K43,K0D, K18, K1B, K1C, P0, PDOT \
)
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
2, // Fn0
3, // Fn1
4, // Fn2
0, // Fn3
0, // Fn4
0, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_NO, // Fn0
KC_SCLN, // Fn1
KC_SLSH, // Fn2
KC_NO, // Fn3
KC_NO, // Fn4
KC_NO, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
KEYMAP(
HELP, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10,F11,F12, PSCR,SLCK,PAUS, MUTE,VOLD,VOLU,PWR,
STOP, AGAIN, ESC,1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
MENU, UNDO, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSPC, DEL, END, PGDN, P7, P8, P9, PPLS,
SELECT, COPY, LCTL, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT, P4, P5, P6,
EXECUTE,PASTE, LSFT, Z, X, C, V, B, N, M, COMM,DOT,SLSH, RSFT, UP, P1, P2, P3, PENT,
FIND, CUT, CAPS, LALT, LGUI,HENK, SPC, MHEN,KANA,RGUI,APP, RALT, LEFT,DOWN,RGHT, P0, PDOT
),
*/
// 0: default
SHORT_TYPE(
STOP, F1,F2,F3,F4, F5, F6, CUT,PASTE,COPY,PWR, INS, HOME,PGUP,
F7,F8,F9,F10,F11,F12, DEL, END, PGDN,
ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSPC,
LCTL, A, S, D, F, G, H, J, K, L, SCLN,QUOT, ENT,
LSFT, Z, X, C, V, B, N, M, COMM,DOT, SLSH, RALT,UP, RSFT,
CAPS,LALT,LGUI, SPC, RGUI,APP, NLCK,LEFT,DOWN,RGHT
),
// 1: with layer keys
SHORT_TYPE(
ESC, F1,F2,F3,F4, F5, F6, CUT,PASTE,COPY,PWR, INS, HOME,PGUP,
F7,F8,F9,F10,F11,F12, DEL, END, PGDN,
ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, BSLS,GRV,
TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSPC,
LCTL, A, S, D, F, G, H, J, K, L, FN1, QUOT, ENT,
LSFT, Z, X, C, V, B, N, M, COMM,DOT, FN2, RSFT,UP, FN0,
CAPS,LALT,LGUI, SPC, RGUI,RALT,FN0, LEFT,DOWN,RGHT
),
// 2: HHKB
SHORT_TYPE(
ESC, F1,F2,F3,F4, F5, F6, CUT,PASTE,COPY,PWR, INS, HOME,PGUP,
F7,F8,F9,F10,F11,F12, DEL, END, PGDN,
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL,
CAPS, NO, NO, NO, NO, NO, NO, NO, PSCR,SLCK,PAUS,UP, NO, BSPC,
LCTL, VOLD,VOLU,MUTE,NO, NO, NO, NO, HOME,PGUP,LEFT,RGHT, ENT,
LSFT, Z, X, C, V, B, NO, NO, END, PGDN,DOWN, RSFT,PGUP,FN0,
CAPS,LALT,LGUI, SPC, RGUI,RALT,FN0, HOME,PGDN,END
),
// 3: Mousekey
SHORT_TYPE(
ESC, F1,F2,F3,F4, F5, F6, CUT,PASTE,COPY,PWR, INS, HOME,PGUP,
F7,F8,F9,F10,F11,F12, DEL, END, PGDN,
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL,
CAPS, NO, NO, NO, NO, NO, WH_L,WH_D,WH_U,WH_R,NO, NO, NO, BSPC,
LCTL, NO, ACL0,ACL1,ACL2,NO, MS_L,MS_D,MS_U,MS_R,FN1, NO, ENT,
LSFT, NO, NO, NO, NO, BTN3,BTN2,BTN1,NO, NO, NO, RSFT,UP, NO,
CAPS,LALT,LGUI, BTN1, RGUI,RALT,NO, LEFT,DOWN,RGHT
),
// 4: Cursor
SHORT_TYPE(
ESC, F1,F2,F3,F4, F5, F6, CUT,PASTE,COPY,PWR, INS, HOME,PGUP,
F7,F8,F9,F10,F11,F12, DEL, END, PGDN,
GRV, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, INS, DEL,
CAPS, NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, NO, NO, NO, BSPC,
LCTL, NO, NO, NO, NO, NO, LEFT,DOWN,UP, RGHT,NO, NO, ENT,
LSFT, NO, NO, NO, NO, NO, HOME,PGDN,PGUP,END, FN2, RSFT,UP, NO,
CAPS,LALT,LGUI, BTN1, RGUI,RALT,NO, LEFT,DOWN,RGHT
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-33
View File
@@ -1,33 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdint.h"
#include "serial.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
uint8_t sun_led = 0;
if (usb_led & (1<<USB_LED_NUM_LOCK)) sun_led |= (1<<0);
if (usb_led & (1<<USB_LED_COMPOSE)) sun_led |= (1<<1);
if (usb_led & (1<<USB_LED_SCROLL_LOCK)) sun_led |= (1<<2);
if (usb_led & (1<<USB_LED_CAPS_LOCK)) sun_led |= (1<<3);
serial_send(0x0E);
serial_send(sun_led);
}
-159
View File
@@ -1,159 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/io.h>
#include <util/delay.h>
#include "print.h"
#include "util.h"
#include "matrix.h"
#include "debug.h"
#include "protocol/serial.h"
/*
* Matrix Array usage:
*
* ROW: 16(4bits)
* COL: 8(3bits)
*
* 8bit wide
* +---------+
* 0|00 ... 07|
* 1|08 ... 0F|
* :| ... |
* :| ... |
* E|70 ... 77|
* F|78 ... 7F|
* +---------+
*/
static uint8_t matrix[MATRIX_ROWS];
#define ROW(code) ((code>>3)&0xF)
#define COL(code) (code&0x07)
static bool is_modified = false;
inline
uint8_t matrix_rows(void)
{
return MATRIX_ROWS;
}
inline
uint8_t matrix_cols(void)
{
return MATRIX_COLS;
}
void matrix_init(void)
{
print_enable = true;
debug_enable = true;
serial_init();
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
return;
}
uint8_t matrix_scan(void)
{
is_modified = false;
uint8_t code;
code = serial_recv();
if (!code) return 0;
debug_hex(code); debug(" ");
switch (code) {
case 0x7E: // reset fail
case 0xFE: // layout
case 0xFF: // reset success
_delay_ms(500);
// ignore response byte
debug("(response ignored:");
while ((code = serial_recv())) { debug(" "); debug_hex(code); }
debug(") ");
// FALL THROUGH
case 0x7F:
// all keys up
for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix[i] = 0x00;
return 0;
}
if (code&0x80) {
// break code
if (matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] &= ~(1<<COL(code));
is_modified = true;
}
} else {
// make code
if (!matrix_is_on(ROW(code), COL(code))) {
matrix[ROW(code)] |= (1<<COL(code));
is_modified = true;
}
}
return code;
}
bool matrix_is_modified(void)
{
return is_modified;
}
inline
bool matrix_has_ghost(void)
{
return false;
}
inline
bool matrix_is_on(uint8_t row, uint8_t col)
{
return (matrix[row] & (1<<col));
}
inline
uint8_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
void matrix_print(void)
{
print("\nr/c 01234567\n");
for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": ");
pbin_reverse(matrix_get_row(row));
print("\n");
}
}
uint8_t matrix_key_count(void)
{
uint8_t count = 0;
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
count += bitpop(matrix[i]);
}
return count;
}
-113
View File
@@ -1,113 +0,0 @@
# Target file name (without extension).
TARGET = terminal_lufa
# Directory common source filess exist
TOP_DIR = ../..
# Directory keyboard dependent files exist
TARGET_DIR = .
# keyboard dependent files
SRC = keymap.c \
matrix.c \
led.c
CONFIG_H = config.h
# MCU name, you MUST set this to match the board you are using
# type "make clean" after changing this, so all files will be rebuilt
#MCU = at90usb162 # Teensy 1.0
MCU = atmega32u4 # Teensy 2.0
#MCU = at90usb646 # Teensy++ 1.0
#MCU = at90usb1286 # Teensy++ 2.0
# Processor frequency.
# Normally the first thing your program should do is set the clock prescaler,
# so your program will run at the correct speed. You should also set this
# variable to same clock speed. The _delay_ms() macro uses this, and many
# examples use this variable to calculate timings. Do not add a "UL" here.
F_CPU = 16000000
#
# LUFA specific
#
# Target architecture (see library "Board Types" documentation).
ARCH = AVR8
# Input clock frequency.
# This will define a symbol, F_USB, in all source code files equal to the
# input clock frequency (before any prescaling is performed) in Hz. This value may
# differ from F_CPU if prescaling is used on the latter, and is required as the
# raw input clock is fed directly to the PLL sections of the AVR for high speed
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
# at the end, this will be done automatically to create a 32-bit value in your
# source code.
#
# If no clock division is performed on the input clock inside the AVR (via the
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
F_USB = $(F_CPU)
# Interrupt driven control endpoint task
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Boot Section Size in bytes
# Teensy halfKay 512
# Atmel DFU loader 4096
# LUFA bootloader 4096
OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
#BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
#MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
#EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
COMMAND_ENABLE = yes # Commands for debug and configuration
#SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
#
# PS/2 protocol implementations
# USART is recommended if it is available, others are for reference purpose.
# INT implementation will drop simultaneous key strokes.
#
PS2_USE_USART = yes # uses hardware USART engine for PS/2 signal receive(recomened)
#PS2_USE_INT = yes # uses external interrupt for falling edge of PS/2 clock pin
#PS2_USE_BUSYWAIT = yes # uses primitive reference code
ifdef PS2_USE_USART
SRC += protocol/ps2_usart.c
OPT_DEFS += -DPS2_USE_USART
endif
ifdef PS2_USE_INT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_INT
endif
ifdef PS2_USE_BUSYWAIT
SRC += protocol/ps2.c
OPT_DEFS += -DPS2_USE_BUSYWAIT
endif
#---------------- Programming Options --------------------------
PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path
VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/lufa.mk
include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk
-37
View File
@@ -1,37 +0,0 @@
Keyboard converter for IBM terminal keyboard
============================================
It supports PS/2 Scan Code Set 3 and runs on USB AVR chips such like PJRC Teensy.
I tested the converter on ATMega32U4 with 1392595(102keys) and 6110345(122keys).
Source code: https://github.com/tmk/tmk_keyboard
Article: http://geekhack.org/index.php?topic=27272.0
CONNECTION
----------
Keyboard ATMega32U4
----------------------
Data: PD2
Clock: PD5
And VCC and GND, of course. See RESOURCE for keyboard connector pin assign.
BUILD
-----
$ git clone https://github.com/tmk/tmk_keyboard.git
$ cd converter/terminal_usb
$ make
RESOURCE
--------
Soarer's Converter: http://geekhack.org/index.php?topic=17458.0
102keys(1392595): http://geekhack.org/index.php?topic=10737.0
122keys(1390876): http://www.seasip.info/VintagePC/ibm_1390876.html
KbdBabel: http://www.kbdbabel.org/
RJ45 Connector: http://www.kbdbabel.org/conn/kbd_connector_ibmterm.png
DIN Connector: http://www.kbdbabel.org/conn/kbd_connector_ibm3179_318x_319x.png
WinAVR: http://winavr.sourceforge.net/
EOF
-138
View File
@@ -1,138 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6535
#define DEVICE_VER 0x0100
#define MANUFACTURER t.m.k.
#define PRODUCT PS/2(Set3)-USB Keyboard converter(IBM 122keys)
#define DESCRIPTION USB converter for IBM Terminal Keyboard 122keys
/* matrix size */
#define MATRIX_ROWS 17 // keycode bit: 3-0
#define MATRIX_COLS 8 // keycode bit: 6-4
/* legacy keymap support */
#define USE_LEGACY_KEYMAP
/* key combination for command */
#define IS_COMMAND() ( \
(keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) || \
(keyboard_report->mods == (MOD_BIT(KC_RALT) | MOD_BIT(KC_RCTL))) \
)
/*
* PS/2 USART configuration for ATMega32U4
*/
#ifdef PS2_USE_USART
/* XCK for clock line */
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 5
/* RXD for data line */
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 2
/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
/* set DDR of CLOCK as input to be slave */
#define PS2_USART_INIT() do { \
PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \
PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \
UCSR1C = ((1 << UMSEL10) | \
(3 << UPM10) | \
(0 << USBS1) | \
(3 << UCSZ10) | \
(0 << UCPOL1)); \
UCSR1A = 0; \
UBRR1H = 0; \
UBRR1L = 0; \
} while (0)
#define PS2_USART_RX_INT_ON() do { \
UCSR1B = ((1 << RXCIE1) | \
(1 << RXEN1)); \
} while (0)
#define PS2_USART_RX_POLL_ON() do { \
UCSR1B = (1 << RXEN1); \
} while (0)
#define PS2_USART_OFF() do { \
UCSR1C = 0; \
UCSR1B &= ~((1 << RXEN1) | \
(1 << TXEN1)); \
} while (0)
#define PS2_USART_RX_READY (UCSR1A & (1<<RXC1))
#define PS2_USART_RX_DATA UDR1
#define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
#define PS2_USART_RX_VECT USART1_RX_vect
#endif
/*
* PS/2 Interrupt configuration
*/
#ifdef PS2_USE_INT
/* uses INT1 for clock line(ATMega32U4) */
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 1
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 0
#define PS2_INT_INIT() do { \
EICRA |= ((1<<ISC11) | \
(0<<ISC10)); \
} while (0)
#define PS2_INT_ON() do { \
EIMSK |= (1<<INT1); \
} while (0)
#define PS2_INT_OFF() do { \
EIMSK &= ~(1<<INT1); \
} while (0)
#define PS2_INT_VECT INT1_vect
#endif
/*
* PS/2 Busywait configuration
*/
#ifdef PS2_USE_BUSYWAIT
#define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 1
#define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 0
#endif
#endif
-156
View File
@@ -1,156 +0,0 @@
/*
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdint.h>
#include <stdbool.h>
#include <avr/pgmspace.h>
#include "keycode.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "keymap.h"
/*
* IBM Terminal keyboard 6110345(122keys)/1392595(102keys)
* http://geekhack.org/showthread.php?10737-What-Can-I-Do-With-a-Terminal-Model-M
* http://www.seasip.info/VintagePC/ibm_1391406.html
*
* Keymap array:
* 8 bytes
* +---------+
* 0| |
* :| | 0x00-0x87
* ;| |
* 17| |
* +---------+
*/
#define KEYMAP( \
K08,K10,K18,K20,K28,K30,K38,K40,K48,K50,K57,K5F, \
K07,K0F,K17,K1F,K27,K2F,K37,K3F,K47,K4F,K56,K5E, \
\
K05,K06, K0E,K16,K1E,K26,K25,K2E,K36,K3D,K3E,K46,K45,K4E,K55,K5D,K66, K67,K6E,K6F, K76,K77,K7E,K84, \
K04,K0C, K0D,K15,K1D,K24,K2D,K2C,K35,K3C,K43,K44,K4D,K54,K5B, K5C, K64,K65,K6D, K6C,K75,K7D,K7C, \
K03,K0B, K14,K1C,K1B,K23,K2B,K34,K33,K3B,K42,K4B,K4C,K52, K53,K5A, K63, K6B,K73,K74,K7B, \
K83,K0A, K12,K13,K1A,K22,K21,K2A,K32,K31,K3A,K41,K49,K4A, K51,K59, K61,K62,K6A, K69,K72,K7A,K79, \
K01,K09, K11, K19, K29, K39, K58, K60, K68,K70,K71,K78 \
) { \
{ KC_NO, KC_##K01, KC_NO, KC_##K03, KC_##K04, KC_##K05, KC_##K06, KC_##K07 }, \
{ KC_##K08, KC_##K09, KC_##K0A, KC_##K0B, KC_##K0C, KC_##K0D, KC_##K0E, KC_##K0F }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16, KC_##K17 }, \
{ KC_##K18, KC_##K19, KC_##K1A, KC_##K1B, KC_##K1C, KC_##K1D, KC_##K1E, KC_##K1F }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26, KC_##K27 }, \
{ KC_##K28, KC_##K29, KC_##K2A, KC_##K2B, KC_##K2C, KC_##K2D, KC_##K2E, KC_##K2F }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37 }, \
{ KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E, KC_##K3F }, \
{ KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47 }, \
{ KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E, KC_##K4F }, \
{ KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56, KC_##K57 }, \
{ KC_##K58, KC_##K59, KC_##K5A, KC_##K5B, KC_##K5C, KC_##K5D, KC_##K5E, KC_##K5F }, \
{ KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66, KC_##K67 }, \
{ KC_##K68, KC_##K69, KC_##K6A, KC_##K6B, KC_##K6C, KC_##K6D, KC_##K6E, KC_##K6F }, \
{ KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76, KC_##K77 }, \
{ KC_##K78, KC_##K79, KC_##K7A, KC_##K7B, KC_##K7C, KC_##K7D, KC_##K7E, KC_NO }, \
{ KC_NO, KC_NO, KC_NO, KC_##K83, KC_##K84, KC_NO, KC_NO, KC_NO, }, \
}
// Assign Fn key(0-7) to a layer to which switch with the Fn key pressed.
static const uint8_t PROGMEM fn_layer[] = {
0, // Fn0
0, // Fn1
0, // Fn2
0, // Fn3
0, // Fn4
0, // Fn5
0, // Fn6
0 // Fn7
};
// Assign Fn key(0-7) to a keycode sent when release Fn key without use of the layer.
// See layer.c for details.
static const uint8_t PROGMEM fn_keycode[] = {
KC_NO, // Fn0
KC_NO, // Fn1
KC_NO, // Fn2
KC_NO, // Fn3
KC_NO, // Fn4
KC_NO, // Fn5
KC_NO, // Fn6
KC_NO // Fn7
};
static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* 0: default
* ,---. ,---------------. ,---------------. ,---------------. ,-----------.
* |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
* `---' `---------------' `---------------' `---------------' `-----------'
* ,-----------------------------------------------------------. ,-----------. ,---------------.
* | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \|BS | |Ins|Hom|PgU| |NmL| /| *| -|
* |-----------------------------------------------------------| |-----------| |---------------|
* |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| | 7| 8| 9| |
* |-----------------------------------------------------------| `-----------' |-----------| +|
* |CapsLo| A| S| D| F| G| H| J| K| L| ;| '| #|Retu| | 4| 5| 6| |
* |-----------------------------------------------------------| ,---. |---------------|
* |Shif| \| Z| X| C| V| B| N| M| ,| ,| /|Shift | |Up | | 1| 2| 3| |
* |-----------------------------------------------------------| ,-----------. |-----------|Ent|
* |Ctrl| |Alt | Space |Alt | |Ctrl| |Lef|Dow|Rig| | 0| .| |
* `----' `---------------------------------------' `----' `-----------' `---------------'
*/
/*
KEYMAP(
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,
PSCR,ESC, GRV, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, JYEN,BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
SLCK,INT4, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, BSLS, DEL, END, PGDN, P7, P8, P9, PPLS,
PAUS,INT5, CAPS,A, S, D, F, G, H, J, K, L, SCLN,QUOT, NUHS,ENT, UP, P4, P5, P6, PCMM,
APP, INT6, LSFT,NUBS,Z, X, C, V, B, N, M, COMM,DOT, SLSH, RO, RSFT, LEFT,INT2,RGHT, P1, P2, P3, PENT,
RGUI,LGUI, LCTL, LALT, SPC, RALT, RCTL, DOWN, NO, P0, PDOT,NO
),
*/
// pseudo ANSI
KEYMAP(
F13, F14, F15, F16, F17, F18, F19, F20, F21, F22, F23, F24,
F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,
PSCR,ESC, ESC, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS,EQL, NO, BSPC, INS, HOME,PGUP, NLCK,PSLS,PAST,PMNS,
SLCK,INT4, TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC,RBRC, NO, DEL, END, PGDN, P7, P8, P9, PPLS,
PAUS,INT5, LCTL,A, S, D, F, G, H, J, K, L, SCLN,QUOT, BSLS,ENT, UP, P4, P5, P6, PCMM,
APP, INT6, LSFT,LSFT,Z, X, C, V, B, N, M, COMM,DOT, SLSH, NO, RSFT, LEFT,INT2,RGHT, P1, P2, P3, PENT,
RGUI,LGUI, LCTL, LALT, SPC, LGUI, GRV, DOWN, NO, P0, PDOT,NO
),
};
uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col)
{
return pgm_read_byte(&keymaps[(layer)][(row)][(col)]);
}
uint8_t keymap_fn_layer(uint8_t index)
{
return pgm_read_byte(&fn_layer[index]);
}
uint8_t keymap_fn_keycode(uint8_t index)
{
return pgm_read_byte(&fn_keycode[index]);
}
-33
View File
@@ -1,33 +0,0 @@
/*
Copyright 2011 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "stdint.h"
#include "ps2.h"
#include "led.h"
void led_set(uint8_t usb_led)
{
uint8_t ps2_led = 0;
if (usb_led & (1<<USB_LED_SCROLL_LOCK))
ps2_led |= (1<<PS2_LED_SCROLL_LOCK);
if (usb_led & (1<<USB_LED_NUM_LOCK))
ps2_led |= (1<<PS2_LED_NUM_LOCK);
if (usb_led & (1<<USB_LED_CAPS_LOCK))
ps2_led |= (1<<PS2_LED_CAPS_LOCK);
ps2_host_set_led(ps2_led);
}

Some files were not shown because too many files have changed in this diff Show More