Merge branch 'master' of https://github.com/qmk/qmk_firmware

2 files changed, 74 insertions, 0 deletions

diff --git a/keyboards/sixshooter/keymaps/default/keymap.c b/keyboards/sixshooter/keymaps/default/keymap.c
new file mode 100644
index 0000000000..51f115d935
--- /dev/null
+++ b/keyboards/sixshooter/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/* Copyright 2018 QMK Community
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+#define _BL 0
+#define _FN 1
+
+// Define keyboard specific keycodes for controlling on/off for all LEDs as they
+// are all on different pins with this PCB, rather than a single backlight pin
+enum custom_keycodes {
+    SS_LON = SAFE_RANGE,
+    SS_LOFF
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base Layer: Media Keys
+     * ,-----------.
+     * |FN | V-| V+|
+     * |---+---+---|
+     * |Prv|Ply|Nxt|
+     * `-----------'
+     */
+  [_BL] = LAYOUT( /* Base */
+    MO(_FN), KC_VOLD, KC_VOLU, \
+    KC_MPRV, KC_MPLY, KC_MNXT  \
+  ),
+    /* FN Layer: LED control
+     * ,-----------.
+     * |FN | V-| V+|
+     * |---+---+---|
+     * |Prv|Ply|Nxt|
+     * `-----------'
+     */
+  [_FN] = LAYOUT(
+    KC_TRNS, SS_LON, SS_LOFF, \
+    KC_NO,   KC_NO,  KC_NO
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	// Put your per-action keyboard code here.
+	// Runs for every action, just before processing by the firmware.
+  if (record->event.pressed) {
+
+    // Check for custom keycodes for turning on and off LEDs
+    switch(keycode) {
+      case SS_LON:
+        sixshooter_led_all_on();
+        return false;
+      case SS_LOFF:
+        sixshooter_led_all_off();
+        return false;
+    }
+  }
+  return true;
+};
+
+void matrix_init_user(void) {
+  // Default all LEDs to on
+  sixshooter_led_all_on();
+}
diff --git a/keyboards/sixshooter/keymaps/default/readme.md b/keyboards/sixshooter/keymaps/default/readme.md
new file mode 100644
index 0000000000..050a6f2341
--- /dev/null
+++ b/keyboards/sixshooter/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for sixshooter