summaryrefslogtreecommitdiff
path: root/keyboards/s60_x
AgeCommit message (Collapse)Author
2018-07-04S60-X refactor and Configurator support (#3304)noroadsleft
* Matrix refactor * Keymap refactor * Configurator update * Rules: added layouts 60_ansi, 60_ansi_split_bs_rshift and 60_iso
2018-05-04QMK Configurator support for Sentraq S60-x (#2889)MechMerlin
* change to QMK_KEYBOARD_H * add info.json for QMK Configurator Support
2018-04-07More Configurator Warning Fixes (#2716)MechMerlin
* 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-04convert to unix line-endings [skip ci]QMK Bot
2018-04-04Fix readme to explicitly call out that there are two different versions of ↵mechmerlin
this board and how to compile them
2018-03-16Fixed various keymaps and the allocation of "key_combos" (#2526)Brian Choromanski
* 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-01Fixed dead links (#2451)Brian Choromanski
* Fixed typo of 'confid.h' to 'config.h' * Fixed broken links in docs * Fixed a lot of dead links
2018-02-28Merge of e6v2 stuff as well as my personal keymaps (#2434)Jason Gorman
* 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-01-05Added RGB and in-switch LED controls (#2227)Hannes Egler
* 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
2017-10-14Make arguments redo, subproject elimination (#1784)Jack Humbert
* 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-09-27remove all makefiles from keyboard directoriesJack Humbert
2017-09-08Remove all Makefiles from the keyboards directory. (#1660)skullydazed
* 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-08-23Creates a layouts/ folder for keymaps shared between keyboards (#1609)Jack Humbert
* 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-20Update s60_x/default/rule.mk for original Sentraq S60-XDaniel Khodabakhsh
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-16Make the bulk of our keyboards match the readme.md standardskullY
2017-06-30Update keyboards' rules.mk/Makefiles (#1442)Jack Humbert
this may change some of the keyboards' default settings - if you experience anything odd, please check back to this commit
2017-06-12Merge pull request #1387 from antelaurijssen/masterJack Humbert
Submitting my own custom layout for S60X keyboard
2017-06-12Properly formatted unordered lists in readme.mdAnte Laurijssen
2017-06-12Mods to readme.mdAnte Laurijssen
2017-06-12Modifications to readme.md and deletion of keyboard layout imagesAnte Laurijssen
2017-06-11remove .hex, .PNG, .jpgJack Humbert
2017-06-11remove the rest of the .pngsJack Humbert
2017-06-11-MIDI Chords now using process_record_user instead of F(n) keysAnte Laurijssen
-Morse Code shift keys implemented
2017-06-07Created special shift keys for Morse layer that change variable value, ↵Ante Laurijssen
enabling to send “shifted” special morse code characters.
2017-06-07Working on Morse Code MacrosAnte Laurijssen
2017-06-05Added a couple of custom keys and updated layer imageAnte Laurijssen
2017-06-02Improvements and corrections to morse code macros layerAnte Laurijssen
2017-05-30Improvements to Midi and keymapAnte Laurijssen
2017-05-29Another typo...Ante Laurijssen
2017-05-29Corrected typo in readme.mdAnte Laurijssen
2017-05-29Added a few imagesAnte Laurijssen
2017-05-29Added MIDI_CHORD layer and other little fixes.Ante Laurijssen
Updated readme.md
2017-05-28Midi Chord Function is now working! But some chords lag...Ante Laurijssen
2017-05-26Still working on these MIDI CHORDS!Ante Laurijssen
2017-05-25More changes to keymap.c to try and get midi chords to workAnte Laurijssen
2017-05-24More updates to keymap.c - still errors with midi when trying to compileAnte Laurijssen
2017-05-22More work on my keymap.c and added .png images of my different layers.Ante Laurijssen
2017-05-21More work on keymap.c and config.hAnte Laurijssen
2017-05-21Continuing work on keymap.cAnte Laurijssen
2017-05-16Added Space Cadet Rollover Disable to config.hAnte Laurijssen
2017-05-15Working on keymap.c file...Ante Laurijssen
2017-05-14Started working on custom midi chord functionAnte Laurijssen
2017-05-14Initial push of my keymapAnte Laurijssen
2017-04-30fixes s60_x keyboardJack Humbert