Commit Graph

4 Commits (66a35aded1bdab44fd4d79290899059ba3b97645)

Author SHA1 Message Date
Jason 96546c79c0 Adding SX60 work by amnobis and configurator settings (#3122)
* Add SX60

* Add config maps and layouts as well as readmes.

* cleanup and fixes

* correct readme

* add missing closing commenty tag

* Changing includes to QMK_KEYBOARD_H

* Update settings.json

Remove config change that was added automatically by vscode.

* Update readme.md

fix readme formatting
2018-06-05 12:43:20 -07:00
MechMerlin 0b591fd843 Merlin community layouts (#3004)
* community layout support for eagle_viper v2 and remove mechmerlin keymap dir

* community layout support for eagle_viper v2 and remove mechmerlin keymap dir

* Change to QMK_KEYBOARD_H and remove merlin keymap in favor of cmmunity layouts

* community layout support 60_ansi

* community layout support for 60_ansi
2018-05-20 09:59:02 -07:00
MechMerlin 1f77868427 More Configurator Warning Fixes (#2716)
* mf68_ble did not have the correct .c and .h files

* Fix JC65 KEYMAP to LAYOUT

* Change KEYMAP to LAYOUT for s60_x

* Convert KEYMAP to LAYOUT for lets_split boards

* Convert KEYMAP to LAYOUT

* more fixes to keymap for iris

* convert KEYMAP to LAYOUT for levinson keyboard

* change losinggeneration's KEYMAP to LAYOUT

* convert KEYMAP to LAYOUT

* convert KEYMAP to LAYOUT for nyquist

* convert KEYMAP to LAYOUT

* convert KEYMAP to LAYOUT for viterbi

* convert KEYMAP to LAYOUT

* convert KEYMAP and its subsidiries to the LAYOUT standard

* convert KEYMAP and its subsidiries to the new LAYOUT standard
2018-04-07 23:32:14 -07: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