Commit Graph
65 Commits
Author SHA1 Message Date
MechMerlin b5da3b53b3 enable RGB underglow in rules (#3101) 2018-06-01 12:08:12 -07:00
MechMerlin 74d86832c3 Put CA66 and PK60 under a playkbtw directory (#3102)
* Add playkbtw directory to put ca66 and pk60 in

* delete old references

* edit readmes for links
2018-06-01 08:58:30 -07:00
MechMerlin b2398ecbe7 CA66 Backlighting FIx (#3089)
* Enable backlighting using pin F0 and changing it in the rules.mk file as well

* Change KB_H to CA66_H
2018-05-30 19:44:52 -07:00
MechMerlin 910c50bca1 Add some generic/sparse readmes to get rid of errors (#3048) 2018-05-25 08:39:39 -07:00
MechMerlin 9b08fb7328 Fix info.json for kbd66 (#3045)
* Change LAYOUT to LAYOUT_all
Fix info.json file

* edit the CORRECT info.json this time

* revert my errors
2018-05-25 08:39:08 -07:00
MechMerlin dc4298408b fix LAYOUT_all in info.json (#3046) 2018-05-24 23:34:19 -07:00
MechMerlin 3e0ec8b171 Kira 75 QMK Support (#3003)
* preliminary check in of Kira75

* Layout done

* make an appropriate keymap and fix layout commas

* formatting changes and housekeeping

* add info.json contents for QMK Configurator support

* add RGB underglow support

* add support for caps and num lock leds
2018-05-20 10:25:34 -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 c9102f9e35 Renamed jd40's LAYOUT to LAYOUT_kc (#3000)
Made a new LAYOUT without all the KC_##
2018-05-18 21:00:48 -07:00
MechMerlin d5f44feb75 checking in xxinophobia's changes to get ISO enter working correctly (#2999) 2018-05-18 21:00:13 -07:00
MechMerlin 2411652a33 remove a KC-NO in row 1 (#2994) 2018-05-18 07:45:06 -07:00
MechMerlin effc3e380f Add QMK Configurator support and remove Layouts definitions (#2977)
* Add QMK Configurator support and remove userspace definitions

* fix that build breakage

* Unsupport community layouts but use standard layouts
2018-05-17 15:21:06 -07:00
MechMerlin e41147da92 Help Barry get pk60 Configurator files fixed (#2971) 2018-05-14 11:50:43 -07:00
MechMerlin 70e60b0a0c update template copyrights to 2018 (#2962) 2018-05-13 21:01:13 -07:00
MechMerlin c3c5799909 Add standard layout 60% support for QMK Configurator and user space (#2950) 2018-05-12 23:02:06 -07:00
MechMerlin 48a68dcf10 edit readmes for layout for 60_ansi (#2944) 2018-05-12 08:58:17 -07:00
MechMerlin 69ec54f3a4 FaceW Keyboard Support (#2939)
* preliminary checkin for facew keyboard

* Update readme file

* put the standard 60 ansi layout in

* update rules to have LAYOUT_60_ansi to use my userspace layouts
2018-05-12 08:45:19 -07:00
MechMerlin c5264d6d89 Move ckeys workshop to its own directory (#2928)
* move obelus and nakey to ckeys directory

* delete the originals

* short readme about ckeys

* edit readmes to reflect new changes

* add build guide info..and here's me trying to retrigger the build job
2018-05-10 00:37:04 -04:00
MechMerlin 5346cb2d20 Support both AVR and ps2avrGB targets for new_project script (#2811)
* Stopping point at creating targets for new_project script

* Add second argument for target

* Add the ps2avrgb target

* consider the case where the firmware type target is not valid

* fix template files to be more generic

* Code cleanup

* Change variable name to be more descriptive

* make avr the default

* forgot to put the template files in

* Take out useless comments

* add usage info
2018-05-10 00:36:40 -04:00
MechMerlin 749916e6e2 Add standard layout to XD60 (#2925)
* add new layout and fix formatting

* Add 60_ansi layout so I can use my user space defined layouts

* Make QMK_KEYBOARD_H and LAYOUT renames

* update info.json file
2018-05-09 07:52:35 -07:00
MechMerlin 6ba2c74058 QMK Configurator Support for Paladin64 PCB (#2926) 2018-05-09 07:51:43 -07:00
MechMerlin 23df5fb89a Alf X2 Layout Fixes (#2923)
* Move the microswitches to the top of the keyboard like how it is
physically

Format change to make things pretty

* Fix keymap to match the new layouts

* stopping point at new info.json file

* Update readme

* Finish up QMK Configurator fixes for info.json
2018-05-08 19:43:48 -07:00
MechMerlin ff758496b3 QMK Configurator Support for bananasplit (#2882)
* Change KEYMAP to LAYOUT refactor

* Add info.json for QMK Configurator Support

* Change LAYOUT_ansi to LAYOUT_60_ansi

* removed talljoe's placeholder keymaps

* change LAYOUT to LAYOUT_base
2018-05-08 16:00:19 -07:00
MechMerlin 1b4ad6b4ae KBD8X QMK Support (#2915)
* initial commit

* add row/column and pin info

* Add first part of switch matrix

* documentation and additional config items

* map out the non confusing part of the matrix

* map out the top row

* ok I think I got it

* fix some stupid compile errors

* put in a default keymap

* rename LAYOUT to LAYOUT_all

* add a standard layout and info.json file

* Fix up readme for default keymap

* Add toggle key LED functionality

* changes based on review feedback
2018-05-08 11:38:11 -07:00
MechMerlin 280c10cb09 Thanks to talljoe, 1up60 actually only has 16, not 20 RGB LEDs (#2906) 2018-05-07 08:38:09 -07:00
MechMerlin 5170398479 QMK Configurator support for Sentraq S60-x (#2889)
* change to QMK_KEYBOARD_H

* add info.json for QMK Configurator Support
2018-05-04 18:30:56 -07:00
MechMerlin 9b8fc6f1c0 QMK Configurator Support for NIU Mini (#2874)
* QMK Configurator support for niu mini

* Fix naming

* looks like I messed up the include
2018-05-02 08:07:08 -07:00
MechMerlin 7a57446f5e new layout for iso and arrows (#2865) 2018-05-01 08:31:41 -07:00
MechMerlin 0d98822144 QMK Configurator Support (#2821)
- Change all KEYMAP to LAYOUT
- Add info.json
- Add QMK_KEYBOARD_H
2018-04-27 15:17:39 -07:00
MechMerlin 33671e5cd1 New Numpad Support: naKey from ckeys.org (#2828)
* Add naKey on behalf of ckeys

* Update James's code to more modern QMK standards

* Add info.json for QMK Configurator support

* Fix that build breakage

* Rename naKey.c to nakey.c

* Rename naKey.h to nakey.h
2018-04-27 15:13:03 -07:00
MechMerlin 642bf00baf FC660C Configurator Support (#2817)
* Change KEYMAP to LAYOUT

* Add info.json for configurator support
2018-04-26 20:31:05 -07:00
MechMerlin 6b45e8aec1 QMK Configurator Support MF68 (#2815)
* Add QMK Configurator support for MF68

* Add QMK Configurator support for MF68 BLE

* change to QMK_KEYBOARD_H in keymaps
2018-04-26 20:28:22 -07:00
MechMerlin 8d65d69b8d More QMK Configurator Support for Pearl (#2814)
* Rename LAYOUT to LAYOUT_all
Add additional layouts for the pearl with all splits
and the pearl with splits but a 6.25u spacebar.

* add new layouts to info.json
2018-04-26 17:19:42 -07:00
MechMerlin 1c6b9323b2 Fix QMK Configurator bug with rendering the Eagle layout (#2806) 2018-04-25 07:44:37 -07:00
MechMerlin a0a4c9102c Add Generic Keymap for my boards (#2795)
* add mechmerlin 60 ansi layout

* put meaningful #defines

* missed the backslash

* add merlin split layout

* rename to have a -ansi

* Add appropriate readme files

* rename KEYMAP to LAYOUT

* support for default layout

* support for the community keymaps

* make sure I don't break the configurator

* Don't break the configurator Merlin
2018-04-24 09:01:40 -07:00
MechMerlin fda23af281 Support for new keyboard: Meme (#2797)
* initial commit for meme keyboard

* Fix that row by column

* Fix those dimensions

* work in progress commit

* got that switch matrix to work

* add all supported layouts

* add info.json for QMK configurator support

* let my name be known
2018-04-24 09:00:22 -07:00
MechMerlin 5d5b161d80 ALF X2 QMK Configurator Support (#2788)
* Add microswitch information for visiblity in QMK Configurator

* Add info.json with layouts for ALF X2

* Add new LAYOUTs

* remove that extra comma
2018-04-21 17:00:46 -07:00
MechMerlin 14b2a35571 Use QMK_KEYBOARD_H instead of the mykeyboard.h (#2780) 2018-04-21 00:22:30 -07:00
MechMerlin 3cab04dfa3 QMK Configurator support for alps64 pcb (#2774)
* Change KEYMAP to LAYOUT

* add layouts that match the layouts hasu has defined for alps64

* add layouts in info.json for aek, standard, and infinity

* Add LAYOUT_iso and LAYOUT_all along with respective info.json LAYOUTs
2018-04-20 08:52:56 -07:00
MechMerlin eaa0b24335 ScrabblePad Support (#2760)
* Initial commit for donutcat's 15x15 monstrosity

* modify readmes to be more descriptive

* Add info.json to support QMK Configurator

* Update copyright and change REPLACE_WITH_YOUR_NAME to MechMerlin

* update naming convention for ScrabblePad

* remove .vscode directory as per Jack's comments
2018-04-19 11:31:50 -04:00
MechMerlin 5319667c55 Support upcoming caps_unlocked boards in QMK Configurator (#2738)
* Change KEYMAP macro to LAYOUT macro

* Add CU24 QMK Configurator Support

- Change KEYMAP macro to LAYOUT macro
- Add new LAYOUTS to support a default numpad

* QMK Configurator Support for CU75

Add LAYOUT_all to support all layouts
Add corresponding info.json
2018-04-12 13:03:50 -04:00
MechMerlin 4cfd1e30fc More QMK Configurator Warning/Error Fixes (#2720)
* Add readme with brief description
Change KEYMAP to LAYOUT

* Add readme.md with brief description
Use LAYOUT macro

* add a readme.md file

* Add readme.md with brief description
Use LAYOUT macro

* Add readme.md with brief description
Use LAYOUT macro

* Fix "Warning: contra: Missing layout pp macro for ['planck_mit', 'planck_grid']",

* Use LAYOUT macro
2018-04-11 18:10:55 -04:00
MechMerlin 885f06c6cf Add readme for "major" keyboards to eliminate more QMK Configurator errors (#2718)
* add readme to ktype keyboard

* add readme to m10a

* add readme to mini1800

* add readme to parent directory
2018-04-08 22:10:14 -04: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
MechMerlin 5f4c2dfd84 Fix some Configurator Warnings regarding LAYOUT vs KEYMAP (#2708)
* change diverge 3 KC_KEYMAP to LAYOUT

* Change KEYMAP to LAYOUT for handwired arrow pad

* change M10A to LAYOUT for m10-a

* Change KC_KEYMAP to LAYOUT_kc and KEYMAP to LAYOUT for mf68

* change KC_KEYMAP to LAYOUT for nano

* Refactor to LAYOUT

* refactor to LAYOUT-ansi and LAYOUT_iso for s65

* LAYOUT conversions for lfkkeyboards

* missed a few renames

* mini1800 for lfkeyobards support of LAYOUT
2018-04-07 15:14:53 -04:00
MechMerlin a859a2ee96 Fix KC60 info.json file (#2707)
* change KEYMAP to LAYOUT in all the KC60 files

* Redo the info.json file
2018-04-07 13:04:36 -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
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
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
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
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
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
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
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
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
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
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
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
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
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