aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/mappings/keyboard_aliases.hjson6
-rw-r--r--keyboards/40percentclub/gherkin/info.json62
-rw-r--r--keyboards/40percentclub/gherkin/kb2040/keyboard.json12
-rw-r--r--keyboards/40percentclub/gherkin/kb2040/readme.md22
-rw-r--r--keyboards/40percentclub/gherkin/keyboard.json74
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/default/keymap.c52
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/default/keymap.json37
-rw-r--r--keyboards/40percentclub/gherkin/pro_micro/keyboard.json16
-rw-r--r--keyboards/40percentclub/gherkin/readme.md22
9 files changed, 131 insertions, 172 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 4f63c5f15f..c958cecbc9 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1647,6 +1647,12 @@
"25keys/zinc": {
"target": "25keys/zinc/rev1"
},
+ "40percentclub/gherkin/kb2040": {
+ "target": "40percentclub/gherkin"
+ },
+ "40percentclub/gherkin/pro_micro": {
+ "target": "40percentclub/gherkin"
+ },
"40percentclub/i75": {
"target": "40percentclub/i75/promicro"
},
diff --git a/keyboards/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
deleted file mode 100644
index 644001bc05..0000000000
--- a/keyboards/40percentclub/gherkin/info.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "keyboard_name": "Gherkin",
- "manufacturer": "40 Percent Club",
- "maintainer": "qmk",
- "usb": {
- "vid": "0x4025",
- "pid": "0x6060",
- "device_version": "0.0.1"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "nkro": true,
- "backlight": true
- },
- "qmk": {
- "locking": {
- "enabled": true,
- "resync": true
- }
- },
- "community_layouts": ["ortho_3x10"],
- "layouts": {
- "LAYOUT_ortho_3x10": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [1, 0], "x": 6, "y": 0},
- {"matrix": [1, 1], "x": 7, "y": 0},
- {"matrix": [1, 2], "x": 8, "y": 0},
- {"matrix": [1, 3], "x": 9, "y": 0},
-
- {"matrix": [1, 4], "x": 0, "y": 1},
- {"matrix": [1, 5], "x": 1, "y": 1},
- {"matrix": [2, 0], "x": 2, "y": 1},
- {"matrix": [2, 1], "x": 3, "y": 1},
- {"matrix": [2, 2], "x": 4, "y": 1},
- {"matrix": [2, 3], "x": 5, "y": 1},
- {"matrix": [2, 4], "x": 6, "y": 1},
- {"matrix": [2, 5], "x": 7, "y": 1},
- {"matrix": [3, 0], "x": 8, "y": 1},
- {"matrix": [3, 1], "x": 9, "y": 1},
-
- {"matrix": [3, 2], "x": 0, "y": 2},
- {"matrix": [3, 3], "x": 1, "y": 2},
- {"matrix": [3, 4], "x": 2, "y": 2},
- {"matrix": [3, 5], "x": 3, "y": 2},
- {"matrix": [4, 0], "x": 4, "y": 2},
- {"matrix": [4, 1], "x": 5, "y": 2},
- {"matrix": [4, 2], "x": 6, "y": 2},
- {"matrix": [4, 3], "x": 7, "y": 2},
- {"matrix": [4, 4], "x": 8, "y": 2},
- {"matrix": [4, 5], "x": 9, "y": 2}
- ]
- }
- }
-}
diff --git a/keyboards/40percentclub/gherkin/kb2040/keyboard.json b/keyboards/40percentclub/gherkin/kb2040/keyboard.json
deleted file mode 100644
index 431ac371ee..0000000000
--- a/keyboards/40percentclub/gherkin/kb2040/keyboard.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "development_board": "kb2040",
- "matrix_pins": {
- "cols": ["GP8", "GP7", "GP6", "GP5", "GP4", "GP3"],
- "rows": ["GP26", "GP18", "GP20", "GP19", "GP10"]
- },
- "diode_direction": "COL2ROW",
- "backlight": {
- "pin": "GP9",
- "driver": "software"
- }
-}
diff --git a/keyboards/40percentclub/gherkin/kb2040/readme.md b/keyboards/40percentclub/gherkin/kb2040/readme.md
deleted file mode 100644
index 1fc9e8b18e..0000000000
--- a/keyboards/40percentclub/gherkin/kb2040/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-# Gherkin
-
-![Gherkin](https://i.imgur.com/XrqqtTq.jpg)
-![KB2040](https://cdn-shop.adafruit.com/640x480/5302-12.jpg)
-
-===
-
-A 30 key keyboard with Adafruit's KB2040 as microcontroller.
-
-* [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/gherkin)
-
-Keyboard Maintainer: QMK Community
-Hardware Supported: Gherkin PCB & Adafruit KB2040
-Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.club/2016/11/gherkin.html) and [Adafruit KB2040](https://www.adafruit.com/product/5302)
-
-Make example for this keyboard (after setting up your build environment):
-
- make 40percentclub/gherkin/kb2040:default
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-
-Use the KB2040 microcontroller as a drop-in replacement for the Pro Micro in this cute 30% keyboard.
diff --git a/keyboards/40percentclub/gherkin/keyboard.json b/keyboards/40percentclub/gherkin/keyboard.json
new file mode 100644
index 0000000000..1416997b47
--- /dev/null
+++ b/keyboards/40percentclub/gherkin/keyboard.json
@@ -0,0 +1,74 @@
+{
+ "manufacturer": "40 Percent Club",
+ "keyboard_name": "Gherkin",
+ "maintainer": "qmk",
+ "backlight": {
+ "pin": "B5"
+ },
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "indicators": {
+ "caps_lock": "B0",
+ "num_lock": "D5",
+ "on_state": 0
+ },
+ "matrix_pins": {
+ "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
+ "rows": ["F7", "B1", "B3", "B2", "B6"]
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x6060",
+ "vid": "0x4025"
+ },
+ "community_layouts": ["ortho_3x10"],
+ "layouts": {
+ "LAYOUT_ortho_3x10": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [1, 0], "x": 6, "y": 0},
+ {"matrix": [1, 1], "x": 7, "y": 0},
+ {"matrix": [1, 2], "x": 8, "y": 0},
+ {"matrix": [1, 3], "x": 9, "y": 0},
+ {"matrix": [1, 4], "x": 0, "y": 1},
+ {"matrix": [1, 5], "x": 1, "y": 1},
+ {"matrix": [2, 0], "x": 2, "y": 1},
+ {"matrix": [2, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+ {"matrix": [2, 3], "x": 5, "y": 1},
+ {"matrix": [2, 4], "x": 6, "y": 1},
+ {"matrix": [2, 5], "x": 7, "y": 1},
+ {"matrix": [3, 0], "x": 8, "y": 1},
+ {"matrix": [3, 1], "x": 9, "y": 1},
+ {"matrix": [3, 2], "x": 0, "y": 2},
+ {"matrix": [3, 3], "x": 1, "y": 2},
+ {"matrix": [3, 4], "x": 2, "y": 2},
+ {"matrix": [3, 5], "x": 3, "y": 2},
+ {"matrix": [4, 0], "x": 4, "y": 2},
+ {"matrix": [4, 1], "x": 5, "y": 2},
+ {"matrix": [4, 2], "x": 6, "y": 2},
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [4, 4], "x": 8, "y": 2},
+ {"matrix": [4, 5], "x": 9, "y": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
deleted file mode 100644
index 8c28b68afa..0000000000
--- a/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
+++ /dev/null
@@ -1,52 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#define FN1_SPC LT(1, KC_SPC)
-#define FN2_BSPC LT(2, KC_BSPC)
-#define FN3_C LT(3, KC_C)
-#define FN4_V LT(4, KC_V)
-#define FN5_B LT(5, KC_B)
-#define CTL_Z CTL_T(KC_Z)
-#define ALT_X ALT_T(KC_X)
-#define ALT_N ALGR_T(KC_N)
-#define CTL_M RCTL_T(KC_M)
-#define SFT_ENT RSFT_T(KC_ENT)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_ortho_3x10(
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ESC,
- CTL_Z, ALT_X, FN3_C, FN4_V, FN2_BSPC,FN1_SPC, FN5_B, ALT_N, CTL_M, SFT_ENT
- ),
-
- [1] = LAYOUT_ortho_3x10(
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
- _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______, _______
- ),
-
- [2] = LAYOUT_ortho_3x10(
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, KC_GRV,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-
- [3] = LAYOUT_ortho_3x10(
- _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_TAB, _______, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_SCLN, KC_QUOT,
- _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- [4] = LAYOUT_ortho_3x10(
- _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- KC_TAB, _______, _______, _______, _______, KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
- _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END
- ),
-
- [5] = LAYOUT_ortho_3x10(
- KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR,
- _______, _______, _______, _______, _______, _______, _______, _______, BL_DOWN, BL_UP,
- _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______
- )
-
-};
diff --git a/keyboards/40percentclub/gherkin/keymaps/default/keymap.json b/keyboards/40percentclub/gherkin/keymaps/default/keymap.json
new file mode 100644
index 0000000000..e81a6fd8f5
--- /dev/null
+++ b/keyboards/40percentclub/gherkin/keymaps/default/keymap.json
@@ -0,0 +1,37 @@
+{
+ "keyboard": "40percentclub/gherkin",
+ "keymap": "default",
+ "layout": "LAYOUT_ortho_3x10",
+ "layers": [
+ [
+ "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P",
+ "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_ESC",
+ "CTL_T(KC_Z)", "ALT_T(KC_X)", "LT(3, KC_C)", "LT(4, KC_V)", "LT(2, KC_BSPC)", "LT(1, KC_SPC)", "LT(5, KC_B)", "ALGR_T(KC_N)", "RCTL_T(KC_M)", "RSFT_T(KC_ENT)"
+ ],
+ [
+ "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0",
+ "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10",
+ "_______", "_______", "_______", "_______", "KC_DEL", "_______", "_______", "_______", "_______", "_______"
+ ],
+ [
+ "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN",
+ "KC_F11", "KC_F12", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_GRV",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "KC_MINS", "KC_EQL", "KC_LBRC", "KC_RBRC", "KC_BSLS",
+ "KC_TAB", "_______", "_______", "_______", "_______", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_SCLN", "KC_QUOT",
+ "_______", "_______", "_______", "_______", "_______", "_______", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "KC_UNDS", "KC_PLUS", "KC_LCBR", "KC_RCBR", "KC_PIPE",
+ "KC_TAB", "_______", "_______", "_______", "_______", "KC_LABK", "KC_RABK", "KC_QUES", "KC_COLN", "KC_DQUO",
+ "_______", "_______", "_______", "_______", "_______", "_______", "KC_HOME", "KC_PGDN", "KC_PGUP", "KC_END"
+ ],
+ [
+ "KC_CALC", "KC_WHOM", "KC_MAIL", "KC_MYCM", "_______", "_______", "_______", "_______", "_______", "KC_PSCR",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "BL_DOWN", "BL_UP",
+ "_______", "_______", "_______", "_______", "QK_BOOT", "_______", "_______", "_______", "_______", "_______"
+ ]
+ ]
+}
diff --git a/keyboards/40percentclub/gherkin/pro_micro/keyboard.json b/keyboards/40percentclub/gherkin/pro_micro/keyboard.json
deleted file mode 100644
index 882ea8f72b..0000000000
--- a/keyboards/40percentclub/gherkin/pro_micro/keyboard.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "development_board": "promicro",
- "matrix_pins": {
- "cols": ["B4", "E6", "D7", "C6", "D4", "D0"],
- "rows": ["F7", "B1", "B3", "B2", "B6"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "num_lock": "D5",
- "caps_lock": "B0",
- "on_state": 0
- },
- "backlight": {
- "pin": "B5"
- }
-}
diff --git a/keyboards/40percentclub/gherkin/readme.md b/keyboards/40percentclub/gherkin/readme.md
index 7404f19819..5ce4d173ca 100644
--- a/keyboards/40percentclub/gherkin/readme.md
+++ b/keyboards/40percentclub/gherkin/readme.md
@@ -1,21 +1,27 @@
# Gherkin
![Gherkin](https://i.imgur.com/XrqqtTq.jpg)
-===
A 30 key keyboard.
-* [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/gherkin)
-
-Keyboard Maintainer: QMK Community
-Hardware Supported: Gherkin PCB
-Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.club/2016/11/gherkin.html)
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: Gherkin PCB w/ Pro Micro compatible development board
+* Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.club/2016/11/gherkin.html)
Make example for this keyboard (after setting up your build environment):
make 40percentclub/gherkin:default
+Flashing example for this keyboard:
+
+ make 40percentclub/gherkin:default:flash
+
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-First pass at adding support for the gherkin keyboard. Compiles but completely
-untested. Intended to kick-start development.
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Physical reset**: Short the Ground and Reset pins on the microcontroller
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available