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

46 files changed, 1442 insertions, 11 deletions

diff --git a/keyboards/bigseries/bigseries.c b/keyboards/bigseries/1key/1key.c
index 0ef84478b3..6036bd9991 100755
--- a/keyboards/bigseries/bigseries.c
+++ b/keyboards/bigseries/1key/1key.c
@@ -14,7 +14,7 @@ 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 "bigseries.h"
+#include "1key.h"
 
 void matrix_scan_kb(void) {
   // Looping keyboard code goes here
diff --git a/keyboards/bigseries/bigseries.h b/keyboards/bigseries/1key/1key.h
index 3441407798..3441407798 100755
--- a/keyboards/bigseries/bigseries.h
+++ b/keyboards/bigseries/1key/1key.h
diff --git a/keyboards/bigseries/config.h b/keyboards/bigseries/1key/config.h
index 3c401f563b..966f2062c4 100755
--- a/keyboards/bigseries/config.h
+++ b/keyboards/bigseries/1key/config.h
@@ -47,13 +47,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     false \
 )
 
-/* prevent stuck modifiers */
-#define PREVENT_STUCK_MODIFIERS
-
 #ifdef RGBLIGHT_ENABLE
 #define RGB_DI_PIN D3
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 5
+#ifdef RGBLIGHT_LIMIT_VAL
+#undef RGBLIGHT_LIMIT_VAL
+#endif
+#define RGBLIGHT_LIMIT_VAL 128
 #endif
 
 #endif
diff --git a/keyboards/bigseries/info.json b/keyboards/bigseries/1key/info.json
index ff2fd54c57..ff2fd54c57 100644
--- a/keyboards/bigseries/info.json
+++ b/keyboards/bigseries/1key/info.json
diff --git a/keyboards/bigseries/keymaps/8ball/keymap.c b/keyboards/bigseries/1key/keymaps/8ball/keymap.c
index 1097eb94af..1097eb94af 100755
--- a/keyboards/bigseries/keymaps/8ball/keymap.c
+++ b/keyboards/bigseries/1key/keymaps/8ball/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c b/keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
new file mode 100755
index 0000000000..eb2d236827
--- /dev/null
+++ b/keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
@@ -0,0 +1,91 @@
+/*
+Copyright 2018 Cole Markham
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+LAYOUT(
+    LCTL(LALT(KC_DEL))
+    ),
+
+
+};
+
+
+bool initialized = 0;
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  return MACRO_NONE ;
+}
+
+void matrix_init_user(void) {
+  if (!initialized){
+      dprintf("Initializing in matrix_scan_user");
+      // Disable to set a known state
+      rgblight_disable();
+      rgblight_init();
+      // None of the subsequent operations take effect if not enabled
+      rgblight_enable();
+      rgblight_sethsv(0,0,255);
+      rgblight_mode(7);
+      initialized = 1;
+    }
+}
+
+void matrix_scan_user(void) {
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+  }
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_COMPOSE)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_KANA)) {
+
+  } else {
+
+  }
+
+}
diff --git a/keyboards/bigseries/keymaps/default/keymap.c b/keyboards/bigseries/1key/keymaps/default/keymap.c
index 7ce837357f..7ce837357f 100755
--- a/keyboards/bigseries/keymaps/default/keymap.c
+++ b/keyboards/bigseries/1key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/keymaps/dudeofawesome/README.md b/keyboards/bigseries/1key/keymaps/dudeofawesome/README.md
index 86b79b4621..86b79b4621 100644
--- a/keyboards/bigseries/keymaps/dudeofawesome/README.md
+++ b/keyboards/bigseries/1key/keymaps/dudeofawesome/README.md
diff --git a/keyboards/bigseries/keymaps/dudeofawesome/config.h b/keyboards/bigseries/1key/keymaps/dudeofawesome/config.h
index 30b86224c6..30b86224c6 100644
--- a/keyboards/bigseries/keymaps/dudeofawesome/config.h
+++ b/keyboards/bigseries/1key/keymaps/dudeofawesome/config.h
diff --git a/keyboards/bigseries/keymaps/dudeofawesome/keymap.c b/keyboards/bigseries/1key/keymaps/dudeofawesome/keymap.c
index 4c3739bbeb..4c3739bbeb 100755
--- a/keyboards/bigseries/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/bigseries/1key/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/bigseries/keymaps/dudeofawesome/rules.mk b/keyboards/bigseries/1key/keymaps/dudeofawesome/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/bigseries/keymaps/dudeofawesome/rules.mk
+++ b/keyboards/bigseries/1key/keymaps/dudeofawesome/rules.mk
diff --git a/keyboards/bigseries/keymaps/leddance/config.h b/keyboards/bigseries/1key/keymaps/leddance/config.h
index 57398fb996..57398fb996 100644
--- a/keyboards/bigseries/keymaps/leddance/config.h
+++ b/keyboards/bigseries/1key/keymaps/leddance/config.h
diff --git a/keyboards/bigseries/keymaps/leddance/keymap.c b/keyboards/bigseries/1key/keymaps/leddance/keymap.c
index 3cd8f1db7f..3cd8f1db7f 100755
--- a/keyboards/bigseries/keymaps/leddance/keymap.c
+++ b/keyboards/bigseries/1key/keymaps/leddance/keymap.c
diff --git a/keyboards/bigseries/keymaps/leddance/rules.mk b/keyboards/bigseries/1key/keymaps/leddance/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/bigseries/keymaps/leddance/rules.mk
+++ b/keyboards/bigseries/1key/keymaps/leddance/rules.mk
diff --git a/keyboards/bigseries/1key/keymaps/lock/keymap.c b/keyboards/bigseries/1key/keymaps/lock/keymap.c
new file mode 100755
index 0000000000..3d3b002b02
--- /dev/null
+++ b/keyboards/bigseries/1key/keymaps/lock/keymap.c
@@ -0,0 +1,88 @@
+/*
+Copyright 2018 Cole Markham
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+LAYOUT(
+    LGUI(KC_L)),
+
+
+};
+
+
+bool initialized = 0;
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  return MACRO_NONE ;
+}
+
+void matrix_init_user(void) {
+  if (!initialized){
+      dprintf("Initializing in matrix_scan_user");
+      // Disable to set a known state
+      rgblight_disable();
+      rgblight_init();
+      // None of the subsequent operations take effect if not enabled
+      rgblight_enable();
+      rgblight_sethsv(0,0,255);
+      rgblight_mode(7);
+      initialized = 1;
+    }
+}
+
+void matrix_scan_user(void) {
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_COMPOSE)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_KANA)) {
+
+  } else {
+
+  }
+
+}
diff --git a/keyboards/bigseries/1key/keymaps/tester/keymap.c b/keyboards/bigseries/1key/keymaps/tester/keymap.c
new file mode 100755
index 0000000000..31553cef79
--- /dev/null
+++ b/keyboards/bigseries/1key/keymaps/tester/keymap.c
@@ -0,0 +1,96 @@
+/*
+Copyright 2018 Cole Markham
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+LAYOUT(
+    KC_A),
+
+
+};
+
+
+bool initialized = 0;
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  return MACRO_NONE ;
+}
+
+void matrix_init_user(void) {
+  if (!initialized){
+      dprintf("Initializing in matrix_scan_user");
+      // Disable to set a known state
+      rgblight_disable();
+      rgblight_init();
+      // None of the subsequent operations take effect if not enabled
+      rgblight_enable();
+      rgblight_sethsv(0,0,255);
+      rgblight_mode(35);
+      initialized = 1;
+    }
+}
+
+void matrix_scan_user(void) {
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+  case KC_A:
+    if (record->event.pressed) {
+      SEND_STRING("Howdy!!\n");
+      rgblight_step();
+      return false;
+    }
+  }
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_COMPOSE)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_KANA)) {
+
+  } else {
+
+  }
+
+}
diff --git a/keyboards/bigseries/1key/readme.md b/keyboards/bigseries/1key/readme.md
new file mode 100644
index 0000000000..ad3ee28b14
--- /dev/null
+++ b/keyboards/bigseries/1key/readme.md
@@ -0,0 +1,15 @@
+# Big Series Keyboard
+
+![Big Series 1-Key](https://woodkeys.click/wp-content/uploads/2017/12/woodkeys_419.jpg)
+
+A PCB for the Big Series Switch by [NovelKeys](https://novelkeys.xyz). Available in 1, 2, 3, and 4 switch versions from [Woodkeys.click](https://woodkeys.click/product-category/big-series/).
+
+Keyboard Maintainer: [Cole Markham](https://github.com/colemarkham) / [Woodkeys.click](https://woodkeys.click)  
+Hardware Supported: Big Series PCBs  
+Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](https://novelkeys.xyz)  
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bigseries/1key:default
+
+See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/1key/rules.mk b/keyboards/bigseries/1key/rules.mk
new file mode 100755
index 0000000000..772d56beb6
--- /dev/null
+++ b/keyboards/bigseries/1key/rules.mk
@@ -0,0 +1 @@
+# Dummy file to make the QMK build system happy
\ No newline at end of file
diff --git a/keyboards/bigseries/2key/2key.c b/keyboards/bigseries/2key/2key.c
new file mode 100755
index 0000000000..cffb71907e
--- /dev/null
+++ b/keyboards/bigseries/2key/2key.c
@@ -0,0 +1,26 @@
+/*
+Copyright 2018 Cole Markham
+
+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 "2key.h"
+
+void matrix_scan_kb(void) {
+  // Looping keyboard code goes here
+  // This runs every cycle (a lot)
+  matrix_scan_user();
+#ifdef BACKLIGHT_ENABLE
+  backlight_task();
+#endif
+};
diff --git a/keyboards/bigseries/2key/2key.h b/keyboards/bigseries/2key/2key.h
new file mode 100755
index 0000000000..dcbf2f764c
--- /dev/null
+++ b/keyboards/bigseries/2key/2key.h
@@ -0,0 +1,28 @@
+/*
+Copyright 2018 Cole Markham
+
+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/>.
+*/
+#ifndef BIGSWITCH_H
+#define BIGSWITCH_H
+
+#include "quantum.h"
+
+#define LAYOUT( \
+  K00, K01  \
+) { \
+  { K00, K01 }  \
+}
+
+#endif
diff --git a/keyboards/bigseries/2key/config.h b/keyboards/bigseries/2key/config.h
new file mode 100755
index 0000000000..79b9ed3786
--- /dev/null
+++ b/keyboards/bigseries/2key/config.h
@@ -0,0 +1,60 @@
+/*
+Copyright 2018 Cole Markham
+
+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/>.
+*/
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6071
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    WoodKeys.click
+#define PRODUCT         BigSeries Single Keyboard
+#define DESCRIPTION     Single key board for Novelkeys Big Series Switch
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 2
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B0 }
+#define MATRIX_COL_PINS { B4, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCING_DELAY 50
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    false \
+)
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN D3
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 8
+#ifdef RGBLIGHT_LIMIT_VAL
+#undef RGBLIGHT_LIMIT_VAL
+#endif
+#define RGBLIGHT_LIMIT_VAL 128
+#endif
+
+#endif
diff --git a/keyboards/bigseries/2key/info.json b/keyboards/bigseries/2key/info.json
new file mode 100644
index 0000000000..2aea4d2005
--- /dev/null
+++ b/keyboards/bigseries/2key/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Big Series 2-Key",
+  "url": "",
+  "maintainer": "qmk",
+  "width": 8,
+  "height": 4,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0, "w":4, "h":4}, {"x":4, "y":0, "w":4, "h":4}]
+    }
+  }
+}
diff --git a/keyboards/bigseries/2key/keymaps/default/keymap.c b/keyboards/bigseries/2key/keymaps/default/keymap.c
new file mode 100755
index 0000000000..704649632b
--- /dev/null
+++ b/keyboards/bigseries/2key/keymaps/default/keymap.c
@@ -0,0 +1,87 @@
+/*
+Copyright 2018 Cole Markham
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+LAYOUT(
+    KC_Z, KC_X),
+
+
+};
+
+
+bool initialized = 0;
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  return MACRO_NONE ;
+}
+
+void matrix_init_user(void) {
+  if (!initialized){
+    // Disable to set a known state
+    rgblight_disable();
+    rgblight_init();
+    // None of the subsequent operations take effect if not enabled
+    rgblight_enable();
+    rgblight_sethsv(0,0,255);
+    rgblight_mode(35);
+    initialized = 1;
+  }
+}
+
+void matrix_scan_user(void) {
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+  if (usb_led & (1 << USB_LED_NUM_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_COMPOSE)) {
+
+  } else {
+
+  }
+
+  if (usb_led & (1 << USB_LED_KANA)) {
+
+  } else {
+
+  }
+
+}
diff --git a/keyboards/bigseries/2key/keymaps/lock/keymap.c b/keyboards/bigseries/2key/keymaps/lock/keymap.c
new file mode 100755
index 0000000000..55a9240f32
--- /dev/null
+++ b/keyboards/bigseries/2key/keymaps/lock/keymap.c
@@ -0,0 +1,89 @@
+/*
+Copyright 2018 Cole Markham
+
+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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+