diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 11:36:28 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 11:36:28 +1100 |
| commit | d977daa8dc9136746425f9e1414e1f93cb161877 (patch) | |
| tree | 209ab8082580e5fdf37f1a8b7c1169250b7548c0 /keyboards/satan/keymaps/admiralStrokers | |
| parent | 47c91fc7f75ae0a477e55b687aa0fc30da0a283c (diff) | |
| parent | 0306e487e2cd6a77ad840d0a441b478747b7ccd0 (diff) | |
| download | firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.gz firmware-d977daa8dc9136746425f9e1414e1f93cb161877.tar.bz2 firmware-d977daa8dc9136746425f9e1414e1f93cb161877.zip | |
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/satan/keymaps/admiralStrokers')
| -rw-r--r-- | keyboards/satan/keymaps/admiralStrokers/keymap.c | 7 | ||||
| -rw-r--r-- | keyboards/satan/keymaps/admiralStrokers/rules.mk | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c index a728f5a53..a3626dff8 100644 --- a/keyboards/satan/keymaps/admiralStrokers/keymap.c +++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c @@ -187,10 +187,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { if (record->event.pressed) { } else { }; break; } return MACRO_NONE; }; -/* - Later use: - void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { } - enum function_id { }; - const uint16_t PROGMEM fn_actions[] = { }; - -*/ diff --git a/keyboards/satan/keymaps/admiralStrokers/rules.mk b/keyboards/satan/keymaps/admiralStrokers/rules.mk index 22908296c..7c3f5bd90 100644 --- a/keyboards/satan/keymaps/admiralStrokers/rules.mk +++ b/keyboards/satan/keymaps/admiralStrokers/rules.mk @@ -19,6 +19,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SLEEP_LED_ENABLE = no# Breathing sleep LED during USB suspend API_SYSEX_ENABLE = no # This enables using the Quantum SYSEX API to send strings -ifndef QUANTUM_DIR - include ../../../../Makefile -endif + |