Merge upstream master

2 files changed, 127 insertions, 0 deletions

diff --git a/keyboards/clueboard/17/info.json b/keyboards/clueboard/17/info.json
new file mode 100644
index 0000000000..33b888b059
--- /dev/null
+++ b/keyboards/clueboard/17/info.json
@@ -0,0 +1,75 @@
+{
+  "manufacturer": "Clueboard",
+  "keyboard_name": "Clueboard 17% (Cluepad)",
+  "maintainer": "skullydazed",
+  "diode_direction": "COL2ROW",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "features": {
+    "backlight": true,
+    "bootmagic": false,
+    "command": false,
+    "console": true,
+    "extrakey": true,
+    "midi": false,
+    "mousekey": true,
+    "nkro": true,
+    "rgblight": true,
+    "unicode": false
+  },
+  "matrix_pins": {
+    "cols": ["F4", "E6", "B1", "D2"],
+    "rows": ["B0", "D3", "D5", "D4", "D6"]
+  },
+  "rgblight": {
+    "animations": {
+      "alternating": true,
+      "breathing": true,
+      "christmas": true,
+      "knight": true,
+      "rainbow_mood": true,
+      "rainbow_swirl": true,
+      "rgb_test": true,
+      "snake": true,
+      "static_gradient": true,
+      "twinkle": true
+    },
+    "brightness_steps": 17,
+    "hue_steps": 10,
+    "led_count": 4,
+    "pin": "F6",
+    "saturation_steps": 17
+  },
+  "url": "",
+  "usb": {
+    "device_version": "0.0.1",
+    "pid": "0x2312",
+    "vid": "0xC1ED"
+  },
+  "layout_aliases": {
+    "LAYOUT": "LAYOUT_numpad_5x4"
+  },
+  "layouts": {
+    "LAYOUT_numpad_5x4": {
+      "layout": [
+        { "label": "Num Lock", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
+        { "label": "/", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
+        { "label": "*", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
+        { "label": "-", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
+        { "label": "7", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 },
+        { "label": "8", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 },
+        { "label": "9", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 },
+        { "label": "4", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 },
+        { "label": "5", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 },
+        { "label": "6", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 },
+        { "h": 2, "label": "+", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 },
+        { "label": "1", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 },
+        { "label": "2", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 },
+        { "label": "3", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 },
+        { "label": "0", "matrix": [4, 0], "w": 2, "x": 0, "y": 4 },
+        { "label": ".", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 },
+        { "h": 2, "label": "Enter", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a0223bce13
--- /dev/null
+++ b/keyboards/clueboard/17/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _BL 0
+#define _FL 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: (Base Layer) Default Layer
+   * .-------------------.
+   * |NL F|   /|   *|   -|
+   * |-------------------|
+   * |   7|   8|   9|    |
+   * |--------------|    |
+   * |   4|   5|   6|   +|
+   * |-------------------|
+   * |   1|   2|   3|    |
+   * |--------------|    |
+   * |        0|   .| Ent|
+   * '-------------------'
+   */
+  [_BL] = LAYOUT_numpad_5x4(
+    LT(_FL, KC_NUM),  KC_PSLS, KC_PAST, KC_PMNS,
+    KC_P7,            KC_P8,   KC_P9,
+    KC_P4,            KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,            KC_P2,   KC_P3,
+    KC_P0,                     KC_PDOT, KC_PENT
+  ),
+
+  /* Keymap _FL: Function Layer
+   * .-------------------.
+   * |NL F|    |    | Fn0|
+   * |-------------------|
+   * |    | Fn4|    |    |
+   * |--------------|    |
+   * | Fn3|BL_S| Fn2| Fn6|
+   * |-------------------|
+   * |    | Fn5|    |    |
+   * |--------------|    |
+   * |      Fn1|    | Fn7|
+   * '-------------------'
+   */
+  [_FL] = LAYOUT_numpad_5x4(
+    LT(_FL, KC_NUM),  _______, _______, RGB_TOG,
+    _______,          RGB_SAI, _______,
+    RGB_HUD,          BL_STEP, RGB_HUI, RGB_VAI,
+    _______,          RGB_SAD, _______,
+    RGB_MOD,                   _______, RGB_VAD
+  )
+};