summaryrefslogtreecommitdiffstats
path: root/keyboards/satan
Commit message (Collapse)AuthorAgeFilesLines
* Fixed a layout comment to match layout arrayGareth Pye2017-08-061-3/+3
|
* Update keyboards' rules.mk/Makefiles (#1442)Jack Humbert2017-06-302-24/+24
| | | this may change some of the keyboards' default settings - if you experience anything odd, please check back to this commit
* remove .hex, .PNG, .jpgJack Humbert2017-06-115-1/+4
|
* remove the rest of the .pngsJack Humbert2017-06-112-1/+1
|
* Merge pull request #1297 from khogeland/satan-colemakJack Humbert2017-05-123-0/+120
|\ | | | | Colemak layout for GH60 Satan
| * Colemak layout GH60 SatanKevin Hogeland2017-05-123-0/+120
| |
* | Fix spelling of "persistent"Nikolaus Wittenstein2017-05-111-4/+4
|/ | | | Fixes #1201.
* typo removed {3 ...Ole Anders2017-03-281-3/+2
|
* fixed capitalization issue (checkTime => checktime)Ole Anders2017-03-281-2/+4
|
* moved checktime out of functionOle Anders2017-03-281-6/+3
|
* declaring checktime before the function it is used in.Ole Anders2017-03-281-0/+1
|
* fixed function to not accept any arguments.Ole Anders2017-03-281-1/+1
| | | | | | | | | 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.
* removed varable trace option from makefileOle Anders2017-03-281-1/+0
|
* slight cleanup as per recommendationOle Anders2017-03-281-1/+2
|
* Moved key_timer out of function.Ole Anders2017-03-281-3/+4
|
* removed a carriage returnOle Anders2017-03-281-19/+18
|
* Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders2017-03-2810-0/+451
|\
| * Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert2017-03-284-0/+128
| |\ | | | | | | Flesh out MIDI support
| | * Update size estimates in the MakefileGabriel Young2017-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Update existing keymapsGabriel Young2017-02-251-0/+3
| | | | | | | | | | | | | | | | | | 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)
| | * Add basic layer to sample MIDI keycapGabriel Young2017-02-251-1/+22
| | |
| | * Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCEDGabriel Young2017-02-252-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * fix typos in keymapGabriel Young2017-02-191-8/+2
| | |
| | * Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)Gabriel Young2017-02-193-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Allow customization of the number of tone keycodes and add example keymapGabriel Young2017-02-194-0/+93
| | |
| * | Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC.Stephen Tudor2017-03-201-43/+12
| | |
| * | Remove tap-dance. Raise will be accessed via holding shift while lower is activeStephen Tudor2017-03-202-22/+11
| | |
| * | Use normal backtick in ESC spot - I've mapped ESC to caps lockStephen Tudor2017-03-201-4/+4
| | |
| * | Fix shift tap-dance (can't use one-shot layer)Stephen Tudor2017-03-202-34/+12
| | |
| * | Forsake spacefn in favor of left shift tapdance. Move media controls.Stephen Tudor2017-03-101-24/+25
| | |
| * | Add smt keymap for Satan 'GH60'Stephen Tudor2017-03-093-0/+226
| | |
| * | gh60 satan spacefnEric Dodd2017-03-013-0/+160
| |/
* | fixed #1139 issuesOle Anders2017-03-281-18/+18
| | | | | | | | A fix described by jackhumbert has been sorted out now.
* | changed definitions on keymap.c in admiral strokersOle Anders2017-03-071-104/+109
| | | | | | | | Made a few changes to my own keymaps. (organisation)
* | Added new keymap to the Satan GH60 keyboard.Ole Anders2017-02-064-0/+324
|/ | | | | | | 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.
* - Updated dbroqua layout for Satan keyboarddbroqua2016-12-241-19/+17
|
* - Fixed bug in dbroqua layout for Satan keyboarddbroqua2016-12-222-40/+24
|
* - Rewrote dbroqua layout for Satan keyboard and adding RGB lightdbroqua2016-12-214-110/+170
|
* merging lets_splitJack Humbert2016-11-213-7/+126
|\
| * Merge pull request #877 from sethbc/update_sethbc_satan_keymapJack Humbert2016-11-161-7/+7
| |\ | | | | | | update sethbc keymap
| | * oops, fixed inverted if statementSeth Chandler2016-11-131-6/+6
| | |
| | * update sethbc keymapSeth Chandler2016-11-121-1/+1
| | |
| * | - Added dbroqua_hhkb layout for Satan PCBdbroqua2016-11-122-0/+119
| |/
* / rgb light through midiJack Humbert2016-11-171-1/+1
|/
* Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-202-69/+68
|
* made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni2016-08-185-59/+86
| | | | | fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI whitespace prettyfying
* cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni2016-08-181-17/+20
|
* corrected the split rshift key to realityToni2016-08-182-9/+11
| | | | fixed my keymap in the process to adjust to that
* wring keypress for german iso fixed. prettifiedToni2016-08-171-6/+6
|
* no more warning thanks to iFreilicht's tip with undefToni2016-08-161-0/+1
|