aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/s60_x
Commit message (Collapse)AuthorAgeFilesLines
* More Configurator Warning Fixes (#2716)MechMerlin2018-04-0719-118/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* convert to unix line-endings [skip ci]QMK Bot2018-04-041-1/+1
|
* Fix readme to explicitly call out that there are two different versions of ↵mechmerlin2018-04-041-0/+6
| | | | this board and how to compile them
* Fixed various keymaps and the allocation of "key_combos" (#2526)Brian Choromanski2018-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | * 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
* Fixed dead links (#2451)Brian Choromanski2018-03-018-11/+11
| | | | | | | | * Fixed typo of 'confid.h' to 'config.h' * Fixed broken links in docs * Fixed a lot of dead links
* Merge of e6v2 stuff as well as my personal keymaps (#2434)Jason Gorman2018-02-282-0/+108
| | | | | | | | | | | | * 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
* Added RGB and in-switch LED controls (#2227)Hannes Egler2018-01-054-0/+154
| | | | | | | | | | | | | | * 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
* Make arguments redo, subproject elimination (#1784)Jack Humbert2017-10-148-35/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* remove all makefiles from keyboard directoriesJack Humbert2017-09-275-50/+0
|
* Remove all Makefiles from the keyboards directory. (#1660)skullydazed2017-09-083-0/+40
| | | | | | | | | | | | | | | | | | | | | | * 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
* Creates a layouts/ folder for keymaps shared between keyboards (#1609)Jack Humbert2017-08-232-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Update s60_x/default/rule.mk for original Sentraq S60-XDaniel Khodabakhsh2017-08-201-2/+2
| | | | 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.
* Make the bulk of our keyboards match the readme.md standardskullY2017-08-161-250/+8
|
* Update keyboards' rules.mk/Makefiles (#1442)Jack Humbert2017-06-303-18/+18
| | | this may change some of the keyboards' default settings - if you experience anything odd, please check back to this commit
* Merge pull request #1387 from antelaurijssen/masterJack Humbert2017-06-124-0/+908
|\ | | | | Submitting my own custom layout for S60X keyboard
| * Properly formatted unordered lists in readme.mdAnte Laurijssen2017-06-121-29/+29
| |
| * Mods to readme.mdAnte Laurijssen2017-06-121-1/+1
| |
| * Modifications to readme.md and deletion of keyboard layout imagesAnte Laurijssen2017-06-128-5214/+16
| |
| * -MIDI Chords now using process_record_user instead of F(n) keysAnte Laurijssen2017-06-111-328/+164
| | | | | | | | -Morse Code shift keys implemented
| * Created special shift keys for Morse layer that change variable value, ↵Ante Laurijssen2017-06-071-143/+29
| | | | | | | | enabling to send “shifted” special morse code characters.
| * Working on Morse Code MacrosAnte Laurijssen2017-06-071-9/+24
| |
| * Added a couple of custom keys and updated layer imageAnte Laurijssen2017-06-052-7/+36
| |
| * Improvements and corrections to morse code macros layerAnte Laurijssen2017-06-021-44/+44
| |
| * Improvements to Midi and keymapAnte Laurijssen2017-05-301-57/+57
| |
| * Another typo...Ante Laurijssen2017-05-291-1/+1
| |
| * Corrected typo in readme.mdAnte Laurijssen2017-05-291-2/+2
| |
| * Added a few imagesAnte Laurijssen2017-05-293-0/+5190
| |
| * Added MIDI_CHORD layer and other little fixes.Ante Laurijssen2017-05-295-29/+226
| | | | | | | | Updated readme.md
| * Midi Chord Function is now working! But some chords lag...Ante Laurijssen2017-05-282-46/+124
| |
| * Still working on these MIDI CHORDS!Ante Laurijssen2017-05-262-26/+11
| |
| * More changes to keymap.c to try and get midi chords to workAnte Laurijssen2017-05-251-74/+86
| |
| * More updates to keymap.c - still errors with midi when trying to compileAnte Laurijssen2017-05-241-71/+61
| |
| * More work on my keymap.c and added .png images of my different layers.Ante Laurijssen2017-05-226-99/+120
| |
| * More work on keymap.c and config.hAnte Laurijssen2017-05-212-104/+197
| |
| * Continuing work on keymap.cAnte Laurijssen2017-05-211-34/+416
| |
| * Added Space Cadet Rollover Disable to config.hAnte Laurijssen2017-05-161-0/+3
| |
| * Working on keymap.c file...Ante Laurijssen2017-05-151-4/+6
| |
| * Started working on custom midi chord functionAnte Laurijssen2017-05-141-0/+68
| |
| * Initial push of my keymapAnte Laurijssen2017-05-144-0/+319
| |
* | remove .hex, .PNG, .jpgJack Humbert2017-06-114-3/+3
| |
* | remove the rest of the .pngsJack Humbert2017-06-113-2/+2
|/
* fixes s60_x keyboardJack Humbert2017-04-3051-0/+5450
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 02:06:45 +0000