Merge pull request #38 from qmk/master

update
qmk · Jun 18, 2020 · 818bab2 · 818bab2
2 parents 99e2862 + 30fd698
commit 818bab2
Show file tree

Hide file tree

Showing 58 changed files with 3,751 additions and 635 deletions.
diff --git a/keyboards/jian/config.h b/keyboards/jian/config.h
@@ -0,0 +1,21 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
diff --git a/keyboards/jian/handwired/config.h b/keyboards/jian/handwired/config.h
@@ -0,0 +1,41 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xC0DE
+#define PRODUCT_ID      0x1337
+#define DEVICE_VER      0x0010
+#define MANUFACTURER    KgOfHedgehogs
+#define PRODUCT         Huma
+#define DESCRIPTION     An ergo handwired keyboard
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+#define DIODE_DIRECTION COL2ROW
+
+// wiring of each half
+#define MATRIX_ROW_PINS { D3, D2, B5, B6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
diff --git a/keyboards/jian/handwired/handwired.c b/keyboards/jian/handwired/handwired.c
@@ -0,0 +1,8 @@
+#include "handwired.h"
+
+const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+  {{13, 0}, {12, 0}, {11, 0}, {10, 0}, {9, 0}, {8, 0}, {7, 0}, {6, 0}, {5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+  {{13, 1}, {12, 1}, {11, 1}, {10, 1}, {9, 1}, {8, 1}, {7, 1}, {6, 1}, {5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+  {{13, 2}, {12, 2}, {11, 2}, {10, 2}, {9, 2}, {8, 2}, {7, 2}, {6, 2}, {5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+  {{13, 3}, {12, 3}, {11, 3}, {10, 3}, {9, 3}, {8, 3}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+};
diff --git a/keyboards/jian/handwired/handwired.h b/keyboards/jian/handwired/handwired.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "jian.h"
+
+#define XXX KC_NO
+#define LAYOUT( \
+  L00, L01, L02, L03, L04, L05, L06,    R06, R05, R04, R03, R02, R01, R00, \
+       L11, L12, L13, L14, L15, L16,    R16, R15, R14, R13, R12, R11, \
+       L21, L22, L23, L24, L25, L26,    R26, R25, R24, R23, R22, R21, \
+                      L34, L35, L36,    R36, R35, R34 \
+) \
+{ \
+  {L00, L01, L02, L03, L04, L05, L06,   R06, R05, R04, R03, R02, R01, R00}, \
+  {XXX, L11, L12, L13, L14, L15, L16,   R16, R15, R14, R13, R12, R11, XXX}, \
+  {XXX, L21, L22, L23, L24, L25, L26,   R26, R25, R24, R23, R22, R21, XXX}, \
+  {XXX, XXX, XXX, XXX, L34, L35, L36,   R36, R35, R34, XXX, XXX, XXX, XXX} \
+}
+
+#define LAYOUT_symmetric( \
+  K00, K01, K02, K03, K04, K05, K06, \
+       K11, K12, K13, K14, K15, K16, \
+       K21, K22, K23, K24, K25, K26, \
+                      K34, K35, K36 \
+) \
+{ \
+  {K00, K01, K02, K03, K04, K05, K06,   K06, K05, K04, K03, K02, K01, K00}, \
+  {XXX, K11, K12, K13, K14, K15, K16,   K16, K15, K14, K13, K12, K11, XXX}, \
+  {XXX, K21, K22, K23, K24, K25, K26,   K26, K25, K24, K23, K22, K21, XXX}, \
+  {XXX, XXX, XXX, XXX, K34, K35, K36,   K36, K35, K34, XXX, XXX, XXX, XXX} \
+}
diff --git a/keyboards/jian/handwired/rules.mk b/keyboards/jian/handwired/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+SPLIT_KEYBOARD = no
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = no
diff --git a/keyboards/jian/info.json b/keyboards/jian/info.json
@@ -0,0 +1,67 @@
+{
+    "keyboard_name": "jian",
+    "url": "t.me/s/kgofhedgehogs",
+    "maintainer": "KGOH",
+    "width": 17,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Super", "x": 0,  "y": 1.5   },
+                { "label": "~",     "x": 1,  "y": 0.75  },
+                { "label": "Q",     "x": 2,  "y": 0.625 },
+                { "label": "W",     "x": 3,  "y": 0.25  },
+                { "label": "E",     "x": 4,  "y": 0     },
+                { "label": "R",     "x": 5,  "y": 0.25  },
+                { "label": "T",     "x": 6,  "y": 0.375 },
+
+                { "label": "Y",     "x": 10, "y": 0.375 },
+                { "label": "U",     "x": 11, "y": 0.25  },
+                { "label": "I",     "x": 12, "y": 0     },
+                { "label": "O",     "x": 13, "y": 0.25  },
+                { "label": "P",     "x": 14, "y": 0.625 },
+                { "label": "{[",    "x": 15, "y": 0.75  },
+                { "label": "}]",    "x": 16, "y": 1.5   },
+
+
+                { "label": "Ctrl",  "x": 1,  "y": 1.75  },
+                { "label": "A",     "x": 2,  "y": 1.625 },
+                { "label": "S",     "x": 3,  "y": 1.25  },
+                { "label": "D",     "x": 4,  "y": 1     },
+                { "label": "F",     "x": 5,  "y": 1.25  },
+                { "label": "G",     "x": 6,  "y": 1.375 },
+
+                { "label": "H",     "x": 10, "y": 1.375 },
+                { "label": "J",     "x": 11, "y": 1.25  },
+                { "label": "K",     "x": 12, "y": 1     },
+                { "label": "L",     "x": 13, "y": 1.25  },
+                { "label": ":;",    "x": 14, "y": 1.625 },
+                { "label": "\"'",   "x": 15, "y": 1.75  },
+
+
+                { "label": "Alt",   "x": 1,  "y": 2.75  },
+                { "label": "Z",     "x": 2,  "y": 2.625 },
+                { "label": "X",     "x": 3,  "y": 2.25  },
+                { "label": "C",     "x": 4,  "y": 2     },
+                { "label": "V",     "x": 5,  "y": 2.25  },
+                { "label": "B",     "x": 6,  "y": 2.375 },
+
+                { "label": "N",     "x": 10, "y": 2.375 },
+                { "label": "M",     "x": 11, "y": 2.25  },
+                { "label": "<,",    "x": 12, "y": 2     },
+                { "label": ">.",    "x": 13, "y": 2.25  },
+                { "label": "?/",    "x": 14, "y": 2.625 },
+                { "label": "|\\",   "x": 15, "y": 2.75  },
+
+
+                { "label": "Tab",   "x": 5,  "y": 3.25  },
+                { "label": "Spc",   "x": 6,  "y": 3.375 },
+                { "label": "Enter", "x": 7,  "y": 3.5   },
+
+                { "label": "Esc",   "x": 9,  "y": 3.5   },
+                { "label": "Bscp",  "x": 10, "y": 3.375 },
+                { "label": "Del",   "x": 11, "y": 3.25  }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jian/jian.c b/keyboards/jian/jian.c
@@ -0,0 +1 @@
+#include "jian.h"
diff --git a/keyboards/jian/jian.h b/keyboards/jian/jian.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "quantum.h"
+
+#ifdef KEYBOARD_jian_handwired
+  #include "handwired.h"
+#endif
+
+#ifdef KEYBOARD_jian_rev1
+  #include "rev1.h"
+#endif
+
+#ifdef KEYBOARD_jian_rev2
+#include "rev2.h"
+#endif
+
+#ifdef KEYBOARD_jian_nsrev2
+  #include "nsrev2.h"
+#endif
diff --git a/keyboards/jian/keymaps/advanced/config.h b/keyboards/jian/keymaps/advanced/config.h
@@ -0,0 +1,27 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+#pragma once
+
+//#define AUTO_SHIFT_TIMEOUT 150
+//#define NO_AUTO_SHIFT_NUMERIC
+//#define AUTO_SHIFT_MODIFIERS
+#define IGNORE_MOD_TAP_INTERRUPT
+#define ALT_LAYOUTS_ENABLE
+//#define TRAINING_HALFES_LOCK