diff options
| author | Stick <nstickney@gmail.com> | 2017-06-22 20:06:30 +0200 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-22 20:06:30 +0200 |
| commit | fa96d64f3761e6cd0661c63a3fc257b58c669be0 (patch) | |
| tree | 85a7b88c4b1f3898c606af013a478db39dc392b5 /keyboards/satan | |
| parent | 4b50ab029d49830cf0efd0e5e0606cb39c8dabae (diff) | |
| parent | 2b98ec67f3c2e0e408275ea6b2c90be2dbeada23 (diff) | |
| download | qmk_firmware-fa96d64f3761e6cd0661c63a3fc257b58c669be0.tar.gz qmk_firmware-fa96d64f3761e6cd0661c63a3fc257b58c669be0.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'keyboards/satan')
| -rw-r--r-- | keyboards/satan/controller.jpg | bin | 140199 -> 0 bytes | |||
| -rw-r--r-- | keyboards/satan/keymaps/denolfe/README.md | 2 | ||||
| -rw-r--r-- | keyboards/satan/keymaps/denolfe/keyboard-layout.png | bin | 31762 -> 0 bytes | |||
| -rw-r--r-- | keyboards/satan/keymaps/iso_split_rshift/LEDpinSatan.jpg | bin | 793980 -> 0 bytes | |||
| -rw-r--r-- | keyboards/satan/keymaps/iso_split_rshift/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/satan/power.jpg | bin | 433947 -> 0 bytes | |||
| -rw-r--r-- | keyboards/satan/readme.md | 3 |
7 files changed, 5 insertions, 2 deletions
diff --git a/keyboards/satan/controller.jpg b/keyboards/satan/controller.jpg Binary files differdeleted file mode 100644 index 76ffa4500..000000000 --- a/keyboards/satan/controller.jpg +++ /dev/null diff --git a/keyboards/satan/keymaps/denolfe/README.md b/keyboards/satan/keymaps/denolfe/README.md index 30b94fcdd..147ea4288 100644 --- a/keyboards/satan/keymaps/denolfe/README.md +++ b/keyboards/satan/keymaps/denolfe/README.md @@ -1,7 +1,7 @@ # denolfe's Layout Customized Satan keymap - + ## Programming Instructions: `cd` into keymap directory, `make dfu` diff --git a/keyboards/satan/keymaps/denolfe/keyboard-layout.png b/keyboards/satan/keymaps/denolfe/keyboard-layout.png Binary files differdeleted file mode 100644 index d6d6ad57f..000000000 --- a/keyboards/satan/keymaps/denolfe/keyboard-layout.png +++ /dev/null diff --git a/keyboards/satan/keymaps/iso_split_rshift/LEDpinSatan.jpg b/keyboards/satan/keymaps/iso_split_rshift/LEDpinSatan.jpg Binary files differdeleted file mode 100644 index 7616693f9..000000000 --- a/keyboards/satan/keymaps/iso_split_rshift/LEDpinSatan.jpg +++ /dev/null diff --git a/keyboards/satan/keymaps/iso_split_rshift/readme.md b/keyboards/satan/keymaps/iso_split_rshift/readme.md index ec6123d8a..480491f5a 100644 --- a/keyboards/satan/keymaps/iso_split_rshift/readme.md +++ b/keyboards/satan/keymaps/iso_split_rshift/readme.md @@ -31,6 +31,6 @@ in the default qwertz layout * Keymap has been based on TerryMathews' fork of Aqoush's fork of qmk-satan-rgb. [here](https://github.com/TerryMathews/qmk-satan-rgb/tree/master/keyboard/satan) * nice visualization of the layers [here](http://www.keyboard-layout-editor.com/#/gists/aba4e4396459ede85bc66a22cee88e48) * no-need-to-solder-on-chip picture: - + * special thanks to /u/TerryMathews who suggested the pin PB2, so soldering directly on the atmega is not needed anymore. Happened on [reddit](https://www.reddit.com/r/MechanicalKeyboards/comments/4ghq9z/photos_satan_rgb60_w1976/d2k5tra) diff --git a/keyboards/satan/power.jpg b/keyboards/satan/power.jpg Binary files differdeleted file mode 100644 index 0514eef5c..000000000 --- a/keyboards/satan/power.jpg +++ /dev/null diff --git a/keyboards/satan/readme.md b/keyboards/satan/readme.md index aaf189746..1fd388935 100644 --- a/keyboards/satan/readme.md +++ b/keyboards/satan/readme.md @@ -2,3 +2,6 @@ Satan GH60 keyboard firmware ====================== TODO: to be updated. + + +
\ No newline at end of file |
