From 25eac95348548b41f4bf4e8a02fc8bace270bd35 Mon Sep 17 00:00:00 2001 From: kb-elmo Date: Tue, 12 Oct 2021 04:25:28 +0200 Subject: [PATCH] [Keyboard] Add ISOlation and some kb-elmo keyboard updates (#14656) Co-authored-by: Drashna Jaelre --- keyboards/kb_elmo/isolation/config.h | 62 +++++++++++++++++++ keyboards/kb_elmo/isolation/info.json | 12 ++++ keyboards/kb_elmo/isolation/isolation.c | 17 +++++ keyboards/kb_elmo/isolation/isolation.h | 25 ++++++++ .../isolation/keymaps/default/keymap.c | 22 +++++++ keyboards/kb_elmo/isolation/readme.md | 24 +++++++ keyboards/kb_elmo/isolation/rules.mk | 24 +++++++ keyboards/kb_elmo/qez/qez.h | 2 +- keyboards/kb_elmo/sesame/readme.md | 15 ++++- keyboards/kb_elmo/twelvekey/readme.md | 7 ++- 10 files changed, 205 insertions(+), 5 deletions(-) create mode 100644 keyboards/kb_elmo/isolation/config.h create mode 100644 keyboards/kb_elmo/isolation/info.json create mode 100644 keyboards/kb_elmo/isolation/isolation.c create mode 100644 keyboards/kb_elmo/isolation/isolation.h create mode 100644 keyboards/kb_elmo/isolation/keymaps/default/keymap.c create mode 100644 keyboards/kb_elmo/isolation/readme.md create mode 100644 keyboards/kb_elmo/isolation/rules.mk diff --git a/keyboards/kb_elmo/isolation/config.h b/keyboards/kb_elmo/isolation/config.h new file mode 100644 index 00000000000..3d32efbcb45 --- /dev/null +++ b/keyboards/kb_elmo/isolation/config.h @@ -0,0 +1,62 @@ +/* +Copyright 2021 kb-elmo + +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 . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xA68C +#define PRODUCT_ID 0x4EE6 +#define DEVICE_VER 0x0001 +#define MANUFACTURER kb-elmo +#define PRODUCT ISOlation + +/* key matrix size */ +#define MATRIX_ROWS 1 +#define MATRIX_COLS 1 + +/* direct key pin */ +#define DIRECT_PINS {{ B0 }} +#define UNUSED_PINS + +/* RGB backlight */ +#define RGB_DI_PIN B2 +#ifdef RGB_DI_PIN +# define RGBLED_NUM 3 +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +# define RGBLIGHT_EFFECT_TWINKLE +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/info.json new file mode 100644 index 00000000000..1cca4610d7f --- /dev/null +++ b/keyboards/kb_elmo/isolation/info.json @@ -0,0 +1,12 @@ +{ + "keyboard_name": "isolation", + "url": "", + "maintainer": "kb-elmo", + "layouts": { + "LAYOUT": { + "layout": [ + {"x":0.25, "y":0, "w":1.25, "h":2} + ] + } + } +} diff --git a/keyboards/kb_elmo/isolation/isolation.c b/keyboards/kb_elmo/isolation/isolation.c new file mode 100644 index 00000000000..09b8c95541b --- /dev/null +++ b/keyboards/kb_elmo/isolation/isolation.c @@ -0,0 +1,17 @@ +/* Copyright 2021 kb-elmo + * + * 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 . + */ + +#include "isolation.h" diff --git a/keyboards/kb_elmo/isolation/isolation.h b/keyboards/kb_elmo/isolation/isolation.h new file mode 100644 index 00000000000..580189ea25f --- /dev/null +++ b/keyboards/kb_elmo/isolation/isolation.h @@ -0,0 +1,25 @@ +/* Copyright 2021 kb-elmo + * + * 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 . + */ + +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + k00 \ +) { \ + { k00 } \ +} diff --git a/keyboards/kb_elmo/isolation/keymaps/default/keymap.c b/keyboards/kb_elmo/isolation/keymaps/default/keymap.c new file mode 100644 index 00000000000..9cfa21e9a4d --- /dev/null +++ b/keyboards/kb_elmo/isolation/keymaps/default/keymap.c @@ -0,0 +1,22 @@ +/* Copyright 2021 kb-elmo + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ENT + ) +}; diff --git a/keyboards/kb_elmo/isolation/readme.md b/keyboards/kb_elmo/isolation/readme.md new file mode 100644 index 00000000000..610c26a5906 --- /dev/null +++ b/keyboards/kb_elmo/isolation/readme.md @@ -0,0 +1,24 @@ +# ISOlation + +![isolation](https://i.imgur.com/Pe1tWzJl.jpg) + +A seamless ISO single-key "macropad" + +* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo) +* Hardware Supported: ISOlation RGB PCB +* Hardware Availability: [Open source project](https://github.com/kb-elmo/ISOlation) + +Make example for this keyboard (after setting up your build environment): + + make kb_elmo/isolation:default + +Flashing example for this keyboard: + + make kb_elmo/isolation: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). + +## Bootloader + +* **Bootmagic reset**: Hold down the enter key and plug in the keyboard +* **Bootloader pins**: Short the two pins labeled "BOOT" while plugging the board \ No newline at end of file diff --git a/keyboards/kb_elmo/isolation/rules.mk b/keyboards/kb_elmo/isolation/rules.mk new file mode 100644 index 00000000000..9602f01bcce --- /dev/null +++ b/keyboards/kb_elmo/isolation/rules.mk @@ -0,0 +1,24 @@ +# MCU name +MCU = atmega328p + +# Processor frequency +F_CPU = 16000000 + +# Bootloader selection +BOOTLOADER = usbasploader + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = no # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/kb_elmo/qez/qez.h b/keyboards/kb_elmo/qez/qez.h index 1bf9cde2488..0a3e2c0a7ec 100644 --- a/keyboards/kb_elmo/qez/qez.h +++ b/keyboards/kb_elmo/qez/qez.h @@ -53,5 +53,5 @@ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { ___, k31, k32, ___, ___, k35, ___, k37, k38, k39 } \ + { ___, k31, ___, ___, ___, k35, ___, ___, k38, k39 } \ } diff --git a/keyboards/kb_elmo/sesame/readme.md b/keyboards/kb_elmo/sesame/readme.md index 9fa7f3541c7..c0211cfde4c 100644 --- a/keyboards/kb_elmo/sesame/readme.md +++ b/keyboards/kb_elmo/sesame/readme.md @@ -1,15 +1,24 @@ # Sesame -![sesame](https://i.imgur.com/IdudbWjl.jpg) +![sesame](https://i.imgur.com/DNQMl8hl.jpg) Alice layout THT keyboard * Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo) -* Hardware Supported: Sesame -* Hardware Availability: [Project is open source](https://github.com/kb-elmo/sesame) +* Hardware Supported: Sesame PCB rev.1 and rev.2 +* Hardware Availability: [Open source project](https://github.com/kb-elmo/sesame) Make example for this keyboard (after setting up your build environment): make kb_elmo/sesame:default +Flashing example for this keyboard: + + make kb_elmo/sesame: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). + +## Bootloader + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB \ No newline at end of file diff --git a/keyboards/kb_elmo/twelvekey/readme.md b/keyboards/kb_elmo/twelvekey/readme.md index db240637837..ab256d04703 100644 --- a/keyboards/kb_elmo/twelvekey/readme.md +++ b/keyboards/kb_elmo/twelvekey/readme.md @@ -1,6 +1,6 @@ # Twelvekey -![twelvekey](https://i.imgur.com/xBQIvpml.png) +![twelvekey](https://i.imgur.com/59sSO8kl.jpg) Simple 12-key macropad @@ -17,3 +17,8 @@ Flashing example for this keyboard: make kb_elmo/twelvekey: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). + +## Bootloader + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset button**: Hold down the button labeled "BOOT" and briefly press the button labeled "RESET" on the back of the PCB