From fa635c460839976be08b07481f0cbcac51ce39bc Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 14:22:29 +0100 Subject: [PATCH 01/37] KiwiKeebs v.10 QMK --- keyboards/Kiwi/Kiwi.c | 27 ++++ keyboards/Kiwi/Kiwi.h | 36 +++++ keyboards/Kiwi/config.h | 151 +++++++++++++++++++ keyboards/Kiwi/info.json | 21 +++ keyboards/Kiwi/keymaps/default/keymap.c | 36 +++++ keyboards/Kiwi/keymaps/default/readme.md | 15 ++ keyboards/Kiwi/readme.md | 19 +++ keyboards/Kiwi/rules.mk | 23 +++ keyboards/kiwikeebs/config.h | 61 ++++++++ keyboards/kiwikeebs/kb.c | 1 + keyboards/kiwikeebs/kb.h | 14 ++ keyboards/kiwikeebs/keymaps/default/keymap.c | 38 +++++ keyboards/kiwikeebs/rules.mk | 57 +++++++ 13 files changed, 499 insertions(+) create mode 100644 keyboards/Kiwi/Kiwi.c create mode 100644 keyboards/Kiwi/Kiwi.h create mode 100644 keyboards/Kiwi/config.h create mode 100644 keyboards/Kiwi/info.json create mode 100644 keyboards/Kiwi/keymaps/default/keymap.c create mode 100644 keyboards/Kiwi/keymaps/default/readme.md create mode 100644 keyboards/Kiwi/readme.md create mode 100644 keyboards/Kiwi/rules.mk create mode 100644 keyboards/kiwikeebs/config.h create mode 100644 keyboards/kiwikeebs/kb.c create mode 100644 keyboards/kiwikeebs/kb.h create mode 100644 keyboards/kiwikeebs/keymaps/default/keymap.c create mode 100644 keyboards/kiwikeebs/rules.mk diff --git a/keyboards/Kiwi/Kiwi.c b/keyboards/Kiwi/Kiwi.c new file mode 100644 index 000000000000..77055bd09a5f --- /dev/null +++ b/keyboards/Kiwi/Kiwi.c @@ -0,0 +1,27 @@ +/* Copyright 2020 AKiwiKeebs92 + * + * 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 "KiwiKeebs.h" + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_AUDIO_VOL_UP); + } else { + tap_code(KC_AUDIO_VOL_DOWN); + } + } +} \ No newline at end of file diff --git a/keyboards/Kiwi/Kiwi.h b/keyboards/Kiwi/Kiwi.h new file mode 100644 index 000000000000..dacf80038e7a --- /dev/null +++ b/keyboards/Kiwi/Kiwi.h @@ -0,0 +1,36 @@ +/* Copyright 2020 AKiwiKeebs92 + * + * 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" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, \ + k03, k04, k05, k06 \ +) { \ + { k00, k01, k02 }, \ + { k03, k04, k05, k06 } \ +} + diff --git a/keyboards/Kiwi/config.h b/keyboards/Kiwi/config.h new file mode 100644 index 000000000000..e831ba668464 --- /dev/null +++ b/keyboards/Kiwi/config.h @@ -0,0 +1,151 @@ +/* +Copyright 2020 AKiwiKeebs92 + +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 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER AKiwiKeebs92 +#define PRODUCT KiwiKeebsKeebs MacroBoard v.1.0 + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 4 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { E6, D7 } +#define MATRIX_COL_PINS { F7, B1, B3, B2 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define ENCODERS_PAD_A { D0 } +#define ENCODERS_PAD_B { D1 } + +#define ENCODER_DIRECTION_FLIP + +/* + * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. + */ +//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 + +//#define BACKLIGHT_PIN B7 +//#define BACKLIGHT_LEVELS 3 +//#define BACKLIGHT_BREATHING + +//#define RGB_DI_PIN E2 +//#ifdef RGB_DI_PIN +//# define RGBLED_NUM 16 +//# 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 */ +/*== all animations enable ==*/ +//# define RGBLIGHT_ANIMATIONS +/*== or choose animations ==*/ +//# define RGBLIGHT_EFFECT_BREATHING +//# define RGBLIGHT_EFFECT_RAINBOW_MOOD +//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +//# define RGBLIGHT_EFFECT_SNAKE +//# define RGBLIGHT_EFFECT_KNIGHT +//# define RGBLIGHT_EFFECT_CHRISTMAS +//# define RGBLIGHT_EFFECT_STATIC_GRADIENT +//# define RGBLIGHT_EFFECT_RGB_TEST +//# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +//#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + +/* Bootmagic Lite key configuration */ +//#define BOOTMAGIC_LITE_ROW 0 +//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/Kiwi/info.json b/keyboards/Kiwi/info.json new file mode 100644 index 000000000000..ff763c6d8b11 --- /dev/null +++ b/keyboards/Kiwi/info.json @@ -0,0 +1,21 @@ +{ + "keyboard_name": "KiwiKeebs", + "url": "", + "maintainer": "AKiwiKeebs92", + "width": 4, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "x": 0, "y": 0}, + {"label": "k01", "x": 1, "y": 0}, + {"label": "k02", "x": 2, "y": 0}, + {"label": "k03", "x": 3, "y": 0}, + + {"label": "k10", "x": 0, "y": 1,}, + {"label": "k12", "x": 1, "y": 1,} + {"label": "k13", "x": 2, "y": 1,} + ] + } + } +} diff --git a/keyboards/Kiwi/keymaps/default/keymap.c b/keyboards/Kiwi/keymaps/default/keymap.c new file mode 100644 index 000000000000..bd3db95756d8 --- /dev/null +++ b/keyboards/Kiwi/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2020 AKiwiKeebs92 + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_TAB, KC_SPC, KC_SPC,\ + KC_A, KC_1, MO(_FN), KC_AUDIO_MUTE\ + ), + [_FN] = LAYOUT( + KC_5, KC_6, KC_7,\ + KC_B, KC_2, KC_3, KC_4\ + ) +}; + + diff --git a/keyboards/Kiwi/keymaps/default/readme.md b/keyboards/Kiwi/keymaps/default/readme.md new file mode 100644 index 000000000000..972557e683cf --- /dev/null +++ b/keyboards/Kiwi/keymaps/default/readme.md @@ -0,0 +1,15 @@ +# KiwiKeebs MacroBoard V1.0 + +![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) + +A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. + +Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) +Hardware Supported: KiwiKeebs MacroBoard V1.0 +Hardware Availability: [1upkeyboards.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) + +Make example for this keyboard (after setting up your build environment): + + make kiwikeebs: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). diff --git a/keyboards/Kiwi/readme.md b/keyboards/Kiwi/readme.md new file mode 100644 index 000000000000..9080b1217fa5 --- /dev/null +++ b/keyboards/Kiwi/readme.md @@ -0,0 +1,19 @@ +# KiwiKeebsKeebs + +![KiwiKeebs](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [AKiwiKeebs](https://github.com/akiwi92) +* Hardware Supported: *KiwiKeebs MacroBoard v1.0* + + +Make example for this keyboard (after setting up your build environment): + + make KiwiKeebs:default + +Flashing example for this keyboard: + + make KiwiKeebs: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). diff --git a/keyboards/Kiwi/rules.mk b/keyboards/Kiwi/rules.mk new file mode 100644 index 000000000000..ff1f450df5b0 --- /dev/null +++ b/keyboards/Kiwi/rules.mk @@ -0,0 +1,23 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # 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 = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/kiwikeebs/config.h b/keyboards/kiwikeebs/config.h new file mode 100644 index 000000000000..deda9f4e14db --- /dev/null +++ b/keyboards/kiwikeebs/config.h @@ -0,0 +1,61 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6060 +#define DEVICE_VER 0x0001 +#define MANUFACTURER qmkbuilder +#define PRODUCT keyboard +#define DESCRIPTION Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 4 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { E6, D7 } +#define MATRIX_COL_PINS { F7, B1, B3, B2 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define ENCODERS_PAD_A { D0 } +#define ENCODERS_PAD_B { D1 } + +/* number of backlight levels */ + +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 0 +#endif + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCING_DELAY 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE + +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* key combination for command */ +#define IS_COMMAND() ( \ + keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ +) + +/* prevent stuck modifiers */ +#define PREVENT_STUCK_MODIFIERS + + +#ifdef RGB_DI_PIN +#define RGBLIGHT_ANIMATIONS +#define RGBLED_NUM 0 +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 +#endif + +#endif \ No newline at end of file diff --git a/keyboards/kiwikeebs/kb.c b/keyboards/kiwikeebs/kb.c new file mode 100644 index 000000000000..e5e00a329624 --- /dev/null +++ b/keyboards/kiwikeebs/kb.c @@ -0,0 +1 @@ +#include "kb.h" diff --git a/keyboards/kiwikeebs/kb.h b/keyboards/kiwikeebs/kb.h new file mode 100644 index 000000000000..34efce8bfaf8 --- /dev/null +++ b/keyboards/kiwikeebs/kb.h @@ -0,0 +1,14 @@ +#ifndef KB_H +#define KB_H + +#include "quantum.h" + +#define KEYMAP( \ + K00, K01, K02, \ + K10, K11, K12, K13 \ +) { \ + { K00, K01, K02, KC_NO }, \ + { K10, K11, K12, K13 } \ +} + +#endif \ No newline at end of file diff --git a/keyboards/kiwikeebs/keymaps/default/keymap.c b/keyboards/kiwikeebs/keymaps/default/keymap.c new file mode 100644 index 000000000000..1edecc298bd2 --- /dev/null +++ b/keyboards/kiwikeebs/keymaps/default/keymap.c @@ -0,0 +1,38 @@ +#include "kb.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + KEYMAP( + RESET, KC_2, KC_3, + KC_5, KC_6, KC_7, KC_MUTE) + +}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { + keyevent_t event = record->event; + + switch (id) { + + } + return MACRO_NONE; +} + +void matrix_init_user(void) { +} + +void matrix_scan_user(void) { +} + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + return true; +} + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC__VOLUP); + } else { + tap_code(KC__VOLDOWN); + } + } +} \ No newline at end of file diff --git a/keyboards/kiwikeebs/rules.mk b/keyboards/kiwikeebs/rules.mk new file mode 100644 index 000000000000..f43d65da8951 --- /dev/null +++ b/keyboards/kiwikeebs/rules.mk @@ -0,0 +1,57 @@ +# MCU name +MCU = atmega32u4 + +# Processor frequency. +# This will define a symbol, F_CPU, in all source code files equal to the +# processor frequency in Hz. You can then use this symbol in your source code to +# calculate timings. Do NOT tack on a 'UL' at the end, this will be done +# automatically to create a 32-bit value in your source code. +# +# This will be an integer division of F_USB below, as it is sourced by +# F_USB after it has run through any CPU prescalers. Note that this value +# does not *change* the processor frequency - it should merely be updated to +# reflect the processor speed set externally so that the code can use accurate +# software delays. +F_CPU = 16000000 + +# +# LUFA specific +# +# Target architecture (see library "Board Types" documentation). +ARCH = AVR8 + +# Input clock frequency. +# This will define a symbol, F_USB, in all source code files equal to the +# input clock frequency (before any prescaling is performed) in Hz. This value may +# differ from F_CPU if prescaling is used on the latter, and is required as the +# raw input clock is fed directly to the PLL sections of the AVR for high speed +# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' +# at the end, this will be done automatically to create a 32-bit value in your +# source code. +# +# If no clock division is performed on the input clock inside the AVR (via the +# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. +F_USB = $(F_CPU) + +# Interrupt driven control endpoint task(+60) +OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT + + +# Boot Section Size in *bytes* +OPT_DEFS += -DBOOTLOADER_SIZE=4096 + + +# Build Options +# comment out to disable the options. +# +BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) +MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) +EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) +CONSOLE_ENABLE ?= no # Console for debug(+400) +COMMAND_ENABLE ?= no # Commands for debug and configuration +SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend +NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality +AUDIO_ENABLE ?= no +RGBLIGHT_ENABLE ?= no +ENCODER_ENABLE = yes \ No newline at end of file From d686ff5b08e0d70146ee119ac4f3e8af74ba0220 Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 15:09:44 +0100 Subject: [PATCH 02/37] Rename files and folder structure for QMK pull request --- keyboards/Kiwi/readme.md | 19 ------ keyboards/kiwikeebs/config.h | 61 ------------------- keyboards/kiwikeebs/kb.c | 1 - keyboards/kiwikeebs/kb.h | 14 ----- keyboards/kiwikeebs/keymaps/default/keymap.c | 38 ------------ keyboards/kiwikeebs/rules.mk | 57 ----------------- keyboards/{Kiwi => kiwikeebsmacro}/Kiwi.c | 4 +- keyboards/{Kiwi => kiwikeebsmacro}/Kiwi.h | 2 +- keyboards/{Kiwi => kiwikeebsmacro}/config.h | 6 +- keyboards/{Kiwi => kiwikeebsmacro}/info.json | 4 +- .../keymaps/default/keymap.c | 2 +- .../keymaps/default/readme.md | 4 +- keyboards/kiwikeebsmacro/kiwikeebsmacro.c | 27 ++++++++ keyboards/kiwikeebsmacro/kiwikeebsmacro.h | 36 +++++++++++ keyboards/kiwikeebsmacro/readme.md | 15 +++++ keyboards/{Kiwi => kiwikeebsmacro}/rules.mk | 0 16 files changed, 89 insertions(+), 201 deletions(-) delete mode 100644 keyboards/Kiwi/readme.md delete mode 100644 keyboards/kiwikeebs/config.h delete mode 100644 keyboards/kiwikeebs/kb.c delete mode 100644 keyboards/kiwikeebs/kb.h delete mode 100644 keyboards/kiwikeebs/keymaps/default/keymap.c delete mode 100644 keyboards/kiwikeebs/rules.mk rename keyboards/{Kiwi => kiwikeebsmacro}/Kiwi.c (94%) rename keyboards/{Kiwi => kiwikeebsmacro}/Kiwi.h (97%) rename keyboards/{Kiwi => kiwikeebsmacro}/config.h (97%) rename keyboards/{Kiwi => kiwikeebsmacro}/info.json (85%) rename keyboards/{Kiwi => kiwikeebsmacro}/keymaps/default/keymap.c (97%) rename keyboards/{Kiwi => kiwikeebsmacro}/keymaps/default/readme.md (78%) create mode 100644 keyboards/kiwikeebsmacro/kiwikeebsmacro.c create mode 100644 keyboards/kiwikeebsmacro/kiwikeebsmacro.h create mode 100644 keyboards/kiwikeebsmacro/readme.md rename keyboards/{Kiwi => kiwikeebsmacro}/rules.mk (100%) diff --git a/keyboards/Kiwi/readme.md b/keyboards/Kiwi/readme.md deleted file mode 100644 index 9080b1217fa5..000000000000 --- a/keyboards/Kiwi/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# KiwiKeebsKeebs - -![KiwiKeebs](imgur.com image replace me!) - -*A short description of the keyboard/project* - -* Keyboard Maintainer: [AKiwiKeebs](https://github.com/akiwi92) -* Hardware Supported: *KiwiKeebs MacroBoard v1.0* - - -Make example for this keyboard (after setting up your build environment): - - make KiwiKeebs:default - -Flashing example for this keyboard: - - make KiwiKeebs: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). diff --git a/keyboards/kiwikeebs/config.h b/keyboards/kiwikeebs/config.h deleted file mode 100644 index deda9f4e14db..000000000000 --- a/keyboards/kiwikeebs/config.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 -#define DEVICE_VER 0x0001 -#define MANUFACTURER qmkbuilder -#define PRODUCT keyboard -#define DESCRIPTION Keyboard - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, D7 } -#define MATRIX_COL_PINS { F7, B1, B3, B2 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { D0 } -#define ENCODERS_PAD_B { D1 } - -/* number of backlight levels */ - -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 0 -#endif - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* key combination for command */ -#define IS_COMMAND() ( \ - keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \ -) - -/* prevent stuck modifiers */ -#define PREVENT_STUCK_MODIFIERS - - -#ifdef RGB_DI_PIN -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif - -#endif \ No newline at end of file diff --git a/keyboards/kiwikeebs/kb.c b/keyboards/kiwikeebs/kb.c deleted file mode 100644 index e5e00a329624..000000000000 --- a/keyboards/kiwikeebs/kb.c +++ /dev/null @@ -1 +0,0 @@ -#include "kb.h" diff --git a/keyboards/kiwikeebs/kb.h b/keyboards/kiwikeebs/kb.h deleted file mode 100644 index 34efce8bfaf8..000000000000 --- a/keyboards/kiwikeebs/kb.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef KB_H -#define KB_H - -#include "quantum.h" - -#define KEYMAP( \ - K00, K01, K02, \ - K10, K11, K12, K13 \ -) { \ - { K00, K01, K02, KC_NO }, \ - { K10, K11, K12, K13 } \ -} - -#endif \ No newline at end of file diff --git a/keyboards/kiwikeebs/keymaps/default/keymap.c b/keyboards/kiwikeebs/keymaps/default/keymap.c deleted file mode 100644 index 1edecc298bd2..000000000000 --- a/keyboards/kiwikeebs/keymaps/default/keymap.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "kb.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - KEYMAP( - RESET, KC_2, KC_3, - KC_5, KC_6, KC_7, KC_MUTE) - -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { - keyevent_t event = record->event; - - switch (id) { - - } - return MACRO_NONE; -} - -void matrix_init_user(void) { -} - -void matrix_scan_user(void) { -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -} - -void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC__VOLUP); - } else { - tap_code(KC__VOLDOWN); - } - } -} \ No newline at end of file diff --git a/keyboards/kiwikeebs/rules.mk b/keyboards/kiwikeebs/rules.mk deleted file mode 100644 index f43d65da8951..000000000000 --- a/keyboards/kiwikeebs/rules.mk +++ /dev/null @@ -1,57 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Processor frequency. -# This will define a symbol, F_CPU, in all source code files equal to the -# processor frequency in Hz. You can then use this symbol in your source code to -# calculate timings. Do NOT tack on a 'UL' at the end, this will be done -# automatically to create a 32-bit value in your source code. -# -# This will be an integer division of F_USB below, as it is sourced by -# F_USB after it has run through any CPU prescalers. Note that this value -# does not *change* the processor frequency - it should merely be updated to -# reflect the processor speed set externally so that the code can use accurate -# software delays. -F_CPU = 16000000 - -# -# LUFA specific -# -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -# This will define a symbol, F_USB, in all source code files equal to the -# input clock frequency (before any prescaling is performed) in Hz. This value may -# differ from F_CPU if prescaling is used on the latter, and is required as the -# raw input clock is fed directly to the PLL sections of the AVR for high speed -# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' -# at the end, this will be done automatically to create a 32-bit value in your -# source code. -# -# If no clock division is performed on the input clock inside the AVR (via the -# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. -F_USB = $(F_CPU) - -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT - - -# Boot Section Size in *bytes* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE ?= yes # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700) -EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450) -CONSOLE_ENABLE ?= no # Console for debug(+400) -COMMAND_ENABLE ?= no # Commands for debug and configuration -SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend -NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality -AUDIO_ENABLE ?= no -RGBLIGHT_ENABLE ?= no -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/Kiwi/Kiwi.c b/keyboards/kiwikeebsmacro/Kiwi.c similarity index 94% rename from keyboards/Kiwi/Kiwi.c rename to keyboards/kiwikeebsmacro/Kiwi.c index 77055bd09a5f..e22b626b10e9 100644 --- a/keyboards/Kiwi/Kiwi.c +++ b/keyboards/kiwikeebsmacro/Kiwi.c @@ -1,4 +1,4 @@ -/* Copyright 2020 AKiwiKeebs92 +/* Copyright 2020 KiwiKeebs * * 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 @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "KiwiKeebs.h" +#include "kiwi.h" void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ diff --git a/keyboards/Kiwi/Kiwi.h b/keyboards/kiwikeebsmacro/Kiwi.h similarity index 97% rename from keyboards/Kiwi/Kiwi.h rename to keyboards/kiwikeebsmacro/Kiwi.h index dacf80038e7a..d770d8e42099 100644 --- a/keyboards/Kiwi/Kiwi.h +++ b/keyboards/kiwikeebsmacro/Kiwi.h @@ -1,4 +1,4 @@ -/* Copyright 2020 AKiwiKeebs92 +/* Copyright 2020 KiwiKeebs * * 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 diff --git a/keyboards/Kiwi/config.h b/keyboards/kiwikeebsmacro/config.h similarity index 97% rename from keyboards/Kiwi/config.h rename to keyboards/kiwikeebsmacro/config.h index e831ba668464..7e954b3c73eb 100644 --- a/keyboards/Kiwi/config.h +++ b/keyboards/kiwikeebsmacro/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 AKiwiKeebs92 +Copyright 2020 KiwiKeebs 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 @@ -23,8 +23,8 @@ along with this program. If not, see . #define VENDOR_ID 0xFEED #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 -#define MANUFACTURER AKiwiKeebs92 -#define PRODUCT KiwiKeebsKeebs MacroBoard v.1.0 +#define MANUFACTURER KiwiKeebs +#define PRODUCT KiwiKeebs MacroBoard v.1.0 /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/Kiwi/info.json b/keyboards/kiwikeebsmacro/info.json similarity index 85% rename from keyboards/Kiwi/info.json rename to keyboards/kiwikeebsmacro/info.json index ff763c6d8b11..d1e323dec013 100644 --- a/keyboards/Kiwi/info.json +++ b/keyboards/kiwikeebsmacro/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "KiwiKeebs", + "keyboard_name": "KiwiKeebs MacroBoard v.10", "url": "", - "maintainer": "AKiwiKeebs92", + "maintainer": "KiwiKeebs", "width": 4, "height": 2, "layouts": { diff --git a/keyboards/Kiwi/keymaps/default/keymap.c b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c similarity index 97% rename from keyboards/Kiwi/keymaps/default/keymap.c rename to keyboards/kiwikeebsmacro/keymaps/default/keymap.c index bd3db95756d8..6413bbe763e3 100644 --- a/keyboards/Kiwi/keymaps/default/keymap.c +++ b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 AKiwiKeebs92 +/* Copyright 2020 KiwiKeebs * * 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 diff --git a/keyboards/Kiwi/keymaps/default/readme.md b/keyboards/kiwikeebsmacro/keymaps/default/readme.md similarity index 78% rename from keyboards/Kiwi/keymaps/default/readme.md rename to keyboards/kiwikeebsmacro/keymaps/default/readme.md index 972557e683cf..570ff632568a 100644 --- a/keyboards/Kiwi/keymaps/default/readme.md +++ b/keyboards/kiwikeebsmacro/keymaps/default/readme.md @@ -6,10 +6,10 @@ A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) Hardware Supported: KiwiKeebs MacroBoard V1.0 -Hardware Availability: [1upkeyboards.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) +Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) Make example for this keyboard (after setting up your build environment): - make kiwikeebs:default + make kiwikeebsmacro: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). diff --git a/keyboards/kiwikeebsmacro/kiwikeebsmacro.c b/keyboards/kiwikeebsmacro/kiwikeebsmacro.c new file mode 100644 index 000000000000..e612ae2685b5 --- /dev/null +++ b/keyboards/kiwikeebsmacro/kiwikeebsmacro.c @@ -0,0 +1,27 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 "kiwikeebsmacro.h" + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_AUDIO_VOL_UP); + } else { + tap_code(KC_AUDIO_VOL_DOWN); + } + } +} \ No newline at end of file diff --git a/keyboards/kiwikeebsmacro/kiwikeebsmacro.h b/keyboards/kiwikeebsmacro/kiwikeebsmacro.h new file mode 100644 index 000000000000..d770d8e42099 --- /dev/null +++ b/keyboards/kiwikeebsmacro/kiwikeebsmacro.h @@ -0,0 +1,36 @@ +/* Copyright 2020 KiwiKeebs + * + * 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" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, \ + k03, k04, k05, k06 \ +) { \ + { k00, k01, k02 }, \ + { k03, k04, k05, k06 } \ +} + diff --git a/keyboards/kiwikeebsmacro/readme.md b/keyboards/kiwikeebsmacro/readme.md new file mode 100644 index 000000000000..570ff632568a --- /dev/null +++ b/keyboards/kiwikeebsmacro/readme.md @@ -0,0 +1,15 @@ +# KiwiKeebs MacroBoard V1.0 + +![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) + +A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. + +Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) +Hardware Supported: KiwiKeebs MacroBoard V1.0 +Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) + +Make example for this keyboard (after setting up your build environment): + + make kiwikeebsmacro: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). diff --git a/keyboards/Kiwi/rules.mk b/keyboards/kiwikeebsmacro/rules.mk similarity index 100% rename from keyboards/Kiwi/rules.mk rename to keyboards/kiwikeebsmacro/rules.mk From d395a3372b43a06b25960281201247c6b86b459d Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 15:11:25 +0100 Subject: [PATCH 03/37] Deleted unused files --- keyboards/kiwikeebsmacro/Kiwi.c | 27 ------------------------- keyboards/kiwikeebsmacro/Kiwi.h | 36 --------------------------------- 2 files changed, 63 deletions(-) delete mode 100644 keyboards/kiwikeebsmacro/Kiwi.c delete mode 100644 keyboards/kiwikeebsmacro/Kiwi.h diff --git a/keyboards/kiwikeebsmacro/Kiwi.c b/keyboards/kiwikeebsmacro/Kiwi.c deleted file mode 100644 index e22b626b10e9..000000000000 --- a/keyboards/kiwikeebsmacro/Kiwi.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * 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 "kiwi.h" - -void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_AUDIO_VOL_UP); - } else { - tap_code(KC_AUDIO_VOL_DOWN); - } - } -} \ No newline at end of file diff --git a/keyboards/kiwikeebsmacro/Kiwi.h b/keyboards/kiwikeebsmacro/Kiwi.h deleted file mode 100644 index d770d8e42099..000000000000 --- a/keyboards/kiwikeebsmacro/Kiwi.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, \ - k03, k04, k05, k06 \ -) { \ - { k00, k01, k02 }, \ - { k03, k04, k05, k06 } \ -} - From 0f3bb7ebeb2dec140487879c084a92ca5ed4e7ba Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 15:21:36 +0100 Subject: [PATCH 04/37] Added starter keymap --- keyboards/kiwikeebsmacro/keymaps/default/keymap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c index 6413bbe763e3..3d9383e736f4 100644 --- a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c @@ -24,12 +24,12 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - KC_TAB, KC_SPC, KC_SPC,\ - KC_A, KC_1, MO(_FN), KC_AUDIO_MUTE\ + KC_DELETE, KC_HOME, LT(_FN,KC_END),\ + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE\ ), [_FN] = LAYOUT( - KC_5, KC_6, KC_7,\ - KC_B, KC_2, KC_3, KC_4\ + KC_1, KC_UP, ,\ + KC_LEFT, KC_DOWN, KC_RIGHT, KC_AUDIO_MUTE\ ) }; From e518c5466a2e1a75e063d963daa4c1b7b34a5299 Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 15:33:46 +0100 Subject: [PATCH 05/37] Changes to make pull request compliant --- keyboards/kiwikeebsmacro/config.h | 43 +------------------ keyboards/kiwikeebsmacro/info.json | 2 +- .../kiwikeebsmacro/keymaps/default/keymap.c | 8 ++-- .../kiwikeebsmacro/keymaps/default/readme.md | 2 +- keyboards/kiwikeebsmacro/readme.md | 2 +- 5 files changed, 8 insertions(+), 49 deletions(-) diff --git a/keyboards/kiwikeebsmacro/config.h b/keyboards/kiwikeebsmacro/config.h index 7e954b3c73eb..5e0fbd8d79f5 100644 --- a/keyboards/kiwikeebsmacro/config.h +++ b/keyboards/kiwikeebsmacro/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . #define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs -#define PRODUCT KiwiKeebs MacroBoard v.1.0 +#define PRODUCT MacroBoard v.1.0 /* key matrix size */ #define MATRIX_ROWS 2 @@ -52,43 +52,6 @@ along with this program. If not, see . #define ENCODER_DIRECTION_FLIP -/* - * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. - */ -//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6 - -//#define BACKLIGHT_PIN B7 -//#define BACKLIGHT_LEVELS 3 -//#define BACKLIGHT_BREATHING - -//#define RGB_DI_PIN E2 -//#ifdef RGB_DI_PIN -//# define RGBLED_NUM 16 -//# 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 */ -/*== all animations enable ==*/ -//# define RGBLIGHT_ANIMATIONS -/*== or choose animations ==*/ -//# define RGBLIGHT_EFFECT_BREATHING -//# define RGBLIGHT_EFFECT_RAINBOW_MOOD -//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -//# define RGBLIGHT_EFFECT_SNAKE -//# define RGBLIGHT_EFFECT_KNIGHT -//# define RGBLIGHT_EFFECT_CHRISTMAS -//# define RGBLIGHT_EFFECT_STATIC_GRADIENT -//# define RGBLIGHT_EFFECT_RGB_TEST -//# define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 -//#endif - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 @@ -145,7 +108,3 @@ along with this program. If not, see . /* disable these deprecated features by default */ #define NO_ACTION_MACRO #define NO_ACTION_FUNCTION - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/kiwikeebsmacro/info.json b/keyboards/kiwikeebsmacro/info.json index d1e323dec013..d8569f5e28c0 100644 --- a/keyboards/kiwikeebsmacro/info.json +++ b/keyboards/kiwikeebsmacro/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "KiwiKeebs MacroBoard v.10", - "url": "", + "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", "width": 4, "height": 2, diff --git a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c index 3d9383e736f4..3df365f42fb7 100644 --- a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c @@ -24,12 +24,12 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - KC_DELETE, KC_HOME, LT(_FN,KC_END),\ - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE\ + KC_DELETE, KC_HOME, LT(_FN,KC_END), + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE ), [_FN] = LAYOUT( - KC_1, KC_UP, ,\ - KC_LEFT, KC_DOWN, KC_RIGHT, KC_AUDIO_MUTE\ + KC_1, KC_UP, , + KC_LEFT, KC_DOWN, KC_RIGHT, KC_AUDIO_MUTE ) }; diff --git a/keyboards/kiwikeebsmacro/keymaps/default/readme.md b/keyboards/kiwikeebsmacro/keymaps/default/readme.md index 570ff632568a..2f32fa11132c 100644 --- a/keyboards/kiwikeebsmacro/keymaps/default/readme.md +++ b/keyboards/kiwikeebsmacro/keymaps/default/readme.md @@ -10,6 +10,6 @@ Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments Make example for this keyboard (after setting up your build environment): - make kiwikeebsmacro:default + make kiwikeebsmacro: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). diff --git a/keyboards/kiwikeebsmacro/readme.md b/keyboards/kiwikeebsmacro/readme.md index 570ff632568a..2f32fa11132c 100644 --- a/keyboards/kiwikeebsmacro/readme.md +++ b/keyboards/kiwikeebsmacro/readme.md @@ -10,6 +10,6 @@ Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments Make example for this keyboard (after setting up your build environment): - make kiwikeebsmacro:default + make kiwikeebsmacro: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). From 266a8b15dc156bd0c9e2630fb314519e19149ed5 Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 15:42:34 +0100 Subject: [PATCH 06/37] Removed lines for PR error --- keyboards/kiwikeebsmacro/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/kiwikeebsmacro/rules.mk b/keyboards/kiwikeebsmacro/rules.mk index ff1f450df5b0..0c3a849c4f1e 100644 --- a/keyboards/kiwikeebsmacro/rules.mk +++ b/keyboards/kiwikeebsmacro/rules.mk @@ -12,9 +12,7 @@ MOUSEKEY_ENABLE = yes # 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 = no # Enable keyboard RGB underglow From 9a1ceb809c45c0192ef74bc8b6ed549506528447 Mon Sep 17 00:00:00 2001 From: Ash Date: Tue, 18 Aug 2020 15:50:10 +0100 Subject: [PATCH 07/37] Error fix in json for PR --- keyboards/kiwikeebsmacro/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/keyboards/kiwikeebsmacro/info.json b/keyboards/kiwikeebsmacro/info.json index d8569f5e28c0..f308c9471f75 100644 --- a/keyboards/kiwikeebsmacro/info.json +++ b/keyboards/kiwikeebsmacro/info.json @@ -7,14 +7,14 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0}, + { "label": "k00", "x": 0, "y": 0 }, + { "label": "k01", "x": 1, "y": 0 }, + { "label": "k02", "x": 2, "y": 0 }, + { "label": "k03", "x": 3, "y": 0 }, - {"label": "k10", "x": 0, "y": 1,}, - {"label": "k12", "x": 1, "y": 1,} - {"label": "k13", "x": 2, "y": 1,} + { "label": "k10", "x": 0, "y": 1 }, + { "label": "k12", "x": 1, "y": 1 }, + { "label": "k13", "x": 2, "y": 1 } ] } } From e20b8e1da2736dca9c5c1c063a2f02d990ebc923 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:03:08 +0100 Subject: [PATCH 08/37] Update keyboards/kiwikeebsmacro/kiwikeebsmacro.h Co-authored-by: Joel Challis --- keyboards/kiwikeebsmacro/kiwikeebsmacro.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/kiwikeebsmacro/kiwikeebsmacro.h b/keyboards/kiwikeebsmacro/kiwikeebsmacro.h index d770d8e42099..ee7c6bd47d95 100644 --- a/keyboards/kiwikeebsmacro/kiwikeebsmacro.h +++ b/keyboards/kiwikeebsmacro/kiwikeebsmacro.h @@ -30,7 +30,6 @@ k00, k01, k02, \ k03, k04, k05, k06 \ ) { \ - { k00, k01, k02 }, \ + { k00, k01, k02, KC_NO }, \ { k03, k04, k05, k06 } \ } - From 1562b902b475ab7e60e1436cdfed88652e6ee27c Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:03:17 +0100 Subject: [PATCH 09/37] Update keyboards/kiwikeebsmacro/readme.md Co-authored-by: Joel Challis --- keyboards/kiwikeebsmacro/readme.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/keyboards/kiwikeebsmacro/readme.md b/keyboards/kiwikeebsmacro/readme.md index 2f32fa11132c..61a1441bd759 100644 --- a/keyboards/kiwikeebsmacro/readme.md +++ b/keyboards/kiwikeebsmacro/readme.md @@ -4,12 +4,16 @@ A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. -Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) -Hardware Supported: KiwiKeebs MacroBoard V1.0 -Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) +* Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) +* Hardware Supported: KiwiKeebs MacroBoard V1.0 +* Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) Make example for this keyboard (after setting up your build environment): + make kiwikeebsmacro:default + +Flashing example for this keyboard: + make kiwikeebsmacro: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). From 7b9420bedaa9968a5697a69537fe1490f5b8445c Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:03:30 +0100 Subject: [PATCH 10/37] Update keyboards/kiwikeebsmacro/keymaps/default/readme.md Co-authored-by: Joel Challis --- .../kiwikeebsmacro/keymaps/default/readme.md | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/keyboards/kiwikeebsmacro/keymaps/default/readme.md b/keyboards/kiwikeebsmacro/keymaps/default/readme.md index 2f32fa11132c..9922a4f1a07f 100644 --- a/keyboards/kiwikeebsmacro/keymaps/default/readme.md +++ b/keyboards/kiwikeebsmacro/keymaps/default/readme.md @@ -1,15 +1 @@ -# KiwiKeebs MacroBoard V1.0 - -![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) - -A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. - -Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) -Hardware Supported: KiwiKeebs MacroBoard V1.0 -Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) - -Make example for this keyboard (after setting up your build environment): - - make kiwikeebsmacro: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). +# The default keymap for KiwiKeebs MacroBoard From acf3f58be1b49c678d9d9d3b5f0094b282aa7040 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:04:26 +0100 Subject: [PATCH 11/37] Update keyboards/kiwikeebsmacro/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/kiwikeebsmacro/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c index 3df365f42fb7..71d7018c441c 100644 --- a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c @@ -29,8 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FN] = LAYOUT( KC_1, KC_UP, , - KC_LEFT, KC_DOWN, KC_RIGHT, KC_AUDIO_MUTE + KC_LEFT, KC_DOWN, KC_RIGHT, _______ ) }; - From 66486ea7e976d2efe794c4385dee8d516ab9a476 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:04:34 +0100 Subject: [PATCH 12/37] Update keyboards/kiwikeebsmacro/info.json Co-authored-by: Joel Challis --- keyboards/kiwikeebsmacro/info.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kiwikeebsmacro/info.json b/keyboards/kiwikeebsmacro/info.json index f308c9471f75..6b6e6eae8b5c 100644 --- a/keyboards/kiwikeebsmacro/info.json +++ b/keyboards/kiwikeebsmacro/info.json @@ -10,11 +10,11 @@ { "label": "k00", "x": 0, "y": 0 }, { "label": "k01", "x": 1, "y": 0 }, { "label": "k02", "x": 2, "y": 0 }, - { "label": "k03", "x": 3, "y": 0 }, - { "label": "k10", "x": 0, "y": 1 }, - { "label": "k12", "x": 1, "y": 1 }, - { "label": "k13", "x": 2, "y": 1 } + { "label": "k03", "x": 0, "y": 1 }, + { "label": "k04", "x": 1, "y": 1 }, + { "label": "k05", "x": 2, "y": 1 }, + { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 } ] } } From 34ddbacf378882d458156f665bf7cb6f6f383c9d Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:05:17 +0100 Subject: [PATCH 13/37] Update keyboards/kiwikeebsmacro/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/kiwikeebsmacro/keymaps/default/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c index 71d7018c441c..eef211048ca0 100644 --- a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebsmacro/keymaps/default/keymap.c @@ -28,8 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE ), [_FN] = LAYOUT( - KC_1, KC_UP, , + KC_1, KC_UP, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______ ) }; - From a50d283d62349aed3d45630c2f6370730b61dabd Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 10:08:30 +0100 Subject: [PATCH 14/37] Update keyboards/kiwikeebsmacro/config.h Co-authored-by: Joel Challis --- keyboards/kiwikeebsmacro/config.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/kiwikeebsmacro/config.h b/keyboards/kiwikeebsmacro/config.h index 5e0fbd8d79f5..3506ab74229c 100644 --- a/keyboards/kiwikeebsmacro/config.h +++ b/keyboards/kiwikeebsmacro/config.h @@ -47,10 +47,8 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define ENCODERS_PAD_A { D0 } -#define ENCODERS_PAD_B { D1 } - -#define ENCODER_DIRECTION_FLIP +#define ENCODERS_PAD_A { D1 } +#define ENCODERS_PAD_B { D0 } /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 From 8dd6be2c47a11c03aa37b1591c06b8e664aa811b Mon Sep 17 00:00:00 2001 From: Ash Date: Wed, 19 Aug 2020 10:13:14 +0100 Subject: [PATCH 15/37] Changed structure to allow for future boards --- keyboards/{kiwikeebsmacro => kiwikeebs/macro}/config.h | 0 keyboards/{kiwikeebsmacro => kiwikeebs/macro}/info.json | 0 .../macro}/keymaps/default/keymap.c | 0 .../macro}/keymaps/default/readme.md | 0 .../kiwikeebsmacro.c => kiwikeebs/macro/macro.c} | 2 +- .../kiwikeebsmacro.h => kiwikeebs/macro/macro.h} | 0 keyboards/{kiwikeebsmacro => kiwikeebs/macro}/readme.md | 0 keyboards/{kiwikeebsmacro => kiwikeebs/macro}/rules.mk | 0 8 files changed, 1 insertion(+), 1 deletion(-) rename keyboards/{kiwikeebsmacro => kiwikeebs/macro}/config.h (100%) rename keyboards/{kiwikeebsmacro => kiwikeebs/macro}/info.json (100%) rename keyboards/{kiwikeebsmacro => kiwikeebs/macro}/keymaps/default/keymap.c (100%) rename keyboards/{kiwikeebsmacro => kiwikeebs/macro}/keymaps/default/readme.md (100%) rename keyboards/{kiwikeebsmacro/kiwikeebsmacro.c => kiwikeebs/macro/macro.c} (97%) rename keyboards/{kiwikeebsmacro/kiwikeebsmacro.h => kiwikeebs/macro/macro.h} (100%) rename keyboards/{kiwikeebsmacro => kiwikeebs/macro}/readme.md (100%) rename keyboards/{kiwikeebsmacro => kiwikeebs/macro}/rules.mk (100%) diff --git a/keyboards/kiwikeebsmacro/config.h b/keyboards/kiwikeebs/macro/config.h similarity index 100% rename from keyboards/kiwikeebsmacro/config.h rename to keyboards/kiwikeebs/macro/config.h diff --git a/keyboards/kiwikeebsmacro/info.json b/keyboards/kiwikeebs/macro/info.json similarity index 100% rename from keyboards/kiwikeebsmacro/info.json rename to keyboards/kiwikeebs/macro/info.json diff --git a/keyboards/kiwikeebsmacro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c similarity index 100% rename from keyboards/kiwikeebsmacro/keymaps/default/keymap.c rename to keyboards/kiwikeebs/macro/keymaps/default/keymap.c diff --git a/keyboards/kiwikeebsmacro/keymaps/default/readme.md b/keyboards/kiwikeebs/macro/keymaps/default/readme.md similarity index 100% rename from keyboards/kiwikeebsmacro/keymaps/default/readme.md rename to keyboards/kiwikeebs/macro/keymaps/default/readme.md diff --git a/keyboards/kiwikeebsmacro/kiwikeebsmacro.c b/keyboards/kiwikeebs/macro/macro.c similarity index 97% rename from keyboards/kiwikeebsmacro/kiwikeebsmacro.c rename to keyboards/kiwikeebs/macro/macro.c index e612ae2685b5..2e7fe939c4e3 100644 --- a/keyboards/kiwikeebsmacro/kiwikeebsmacro.c +++ b/keyboards/kiwikeebs/macro/macro.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "kiwikeebsmacro.h" +#include "macro.h" void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ diff --git a/keyboards/kiwikeebsmacro/kiwikeebsmacro.h b/keyboards/kiwikeebs/macro/macro.h similarity index 100% rename from keyboards/kiwikeebsmacro/kiwikeebsmacro.h rename to keyboards/kiwikeebs/macro/macro.h diff --git a/keyboards/kiwikeebsmacro/readme.md b/keyboards/kiwikeebs/macro/readme.md similarity index 100% rename from keyboards/kiwikeebsmacro/readme.md rename to keyboards/kiwikeebs/macro/readme.md diff --git a/keyboards/kiwikeebsmacro/rules.mk b/keyboards/kiwikeebs/macro/rules.mk similarity index 100% rename from keyboards/kiwikeebsmacro/rules.mk rename to keyboards/kiwikeebs/macro/rules.mk From 25a18f7918ee669a0be478e486884106ed8f3a80 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 18:39:16 +0100 Subject: [PATCH 16/37] Update keyboards/kiwikeebs/macro/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kiwikeebs/macro/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index 3506ab74229c..5753b52a0bff 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define PRODUCT_ID 0x4712 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs #define PRODUCT MacroBoard v.1.0 From 9106d0a296f46b76b876a6e986657350886ca4a6 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 18:39:35 +0100 Subject: [PATCH 17/37] Update keyboards/kiwikeebs/macro/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kiwikeebs/macro/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 6b6e6eae8b5c..00726a02f4cf 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -2,7 +2,7 @@ "keyboard_name": "KiwiKeebs MacroBoard v.10", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", - "width": 4, + "width": 5, "height": 2, "layouts": { "LAYOUT": { From 84ede3ea900c5e4f03279a85c89e24bb9976d3e3 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 18:39:42 +0100 Subject: [PATCH 18/37] Update keyboards/kiwikeebs/macro/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kiwikeebs/macro/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c index eef211048ca0..3590c984abe5 100644 --- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c @@ -24,8 +24,8 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - KC_DELETE, KC_HOME, LT(_FN,KC_END), - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE + KC_DEL, KC_HOME, LT(_FN,KC_END), + KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE ), [_FN] = LAYOUT( KC_1, KC_UP, _______, From 1c5b47de837e1f56ad297c62bdc95892ee0163f9 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Wed, 19 Aug 2020 18:39:50 +0100 Subject: [PATCH 19/37] Update keyboards/kiwikeebs/macro/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kiwikeebs/macro/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c index 3590c984abe5..7d1acce308fd 100644 --- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE ), [_FN] = LAYOUT( - KC_1, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RIGHT, _______ + KC_1, KC_UP, _______, + KC_LEFT, KC_DOWN, KC_RGHT, _______ ) }; From 4df87adb917098532243bded73abd49d36557aee Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 20 Aug 2020 09:45:38 +0100 Subject: [PATCH 20/37] Amended rotarty to use kb instead of user --- keyboards/kiwikeebs/config.h | 108 ++++++++++++++++++ keyboards/kiwikeebs/info.json | 21 ++++ keyboards/kiwikeebs/keymaps/default/keymap.c | 34 ++++++ .../{macro => }/keymaps/default/readme.md | 0 .../{macro/macro.c => kiwikeebsmacro.c} | 2 +- .../{macro/macro.h => kiwikeebsmacro.h} | 0 keyboards/kiwikeebs/{macro => }/readme.md | 0 keyboards/kiwikeebs/{macro => }/rules.mk | 0 8 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 keyboards/kiwikeebs/config.h create mode 100644 keyboards/kiwikeebs/info.json create mode 100644 keyboards/kiwikeebs/keymaps/default/keymap.c rename keyboards/kiwikeebs/{macro => }/keymaps/default/readme.md (100%) rename keyboards/kiwikeebs/{macro/macro.c => kiwikeebsmacro.c} (93%) rename keyboards/kiwikeebs/{macro/macro.h => kiwikeebsmacro.h} (100%) rename keyboards/kiwikeebs/{macro => }/readme.md (100%) rename keyboards/kiwikeebs/{macro => }/rules.mk (100%) diff --git a/keyboards/kiwikeebs/config.h b/keyboards/kiwikeebs/config.h new file mode 100644 index 000000000000..3506ab74229c --- /dev/null +++ b/keyboards/kiwikeebs/config.h @@ -0,0 +1,108 @@ +/* +Copyright 2020 KiwiKeebs + +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 0xFEED +#define PRODUCT_ID 0x0000 +#define DEVICE_VER 0x0001 +#define MANUFACTURER KiwiKeebs +#define PRODUCT MacroBoard v.1.0 + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 4 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { E6, D7 } +#define MATRIX_COL_PINS { F7, B1, B3, B2 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define ENCODERS_PAD_A { D1 } +#define ENCODERS_PAD_B { D0 } + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION diff --git a/keyboards/kiwikeebs/info.json b/keyboards/kiwikeebs/info.json new file mode 100644 index 000000000000..6b6e6eae8b5c --- /dev/null +++ b/keyboards/kiwikeebs/info.json @@ -0,0 +1,21 @@ +{ + "keyboard_name": "KiwiKeebs MacroBoard v.10", + "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", + "maintainer": "KiwiKeebs", + "width": 4, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "k00", "x": 0, "y": 0 }, + { "label": "k01", "x": 1, "y": 0 }, + { "label": "k02", "x": 2, "y": 0 }, + + { "label": "k03", "x": 0, "y": 1 }, + { "label": "k04", "x": 1, "y": 1 }, + { "label": "k05", "x": 2, "y": 1 }, + { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 } + ] + } + } +} diff --git a/keyboards/kiwikeebs/keymaps/default/keymap.c b/keyboards/kiwikeebs/keymaps/default/keymap.c new file mode 100644 index 000000000000..eef211048ca0 --- /dev/null +++ b/keyboards/kiwikeebs/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_DELETE, KC_HOME, LT(_FN,KC_END), + KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE + ), + [_FN] = LAYOUT( + KC_1, KC_UP, _______, + KC_LEFT, KC_DOWN, KC_RIGHT, _______ + ) +}; diff --git a/keyboards/kiwikeebs/macro/keymaps/default/readme.md b/keyboards/kiwikeebs/keymaps/default/readme.md similarity index 100% rename from keyboards/kiwikeebs/macro/keymaps/default/readme.md rename to keyboards/kiwikeebs/keymaps/default/readme.md diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/kiwikeebsmacro.c similarity index 93% rename from keyboards/kiwikeebs/macro/macro.c rename to keyboards/kiwikeebs/kiwikeebsmacro.c index 2e7fe939c4e3..3d5ab1661701 100644 --- a/keyboards/kiwikeebs/macro/macro.c +++ b/keyboards/kiwikeebs/kiwikeebsmacro.c @@ -16,7 +16,7 @@ #include "macro.h" -void encoder_update_user(uint8_t index, bool clockwise) { +void encoder_update_kb(uint8_t index, bool clockwise) { if (index == 0) { /* First encoder */ if (clockwise) { tap_code(KC_AUDIO_VOL_UP); diff --git a/keyboards/kiwikeebs/macro/macro.h b/keyboards/kiwikeebs/kiwikeebsmacro.h similarity index 100% rename from keyboards/kiwikeebs/macro/macro.h rename to keyboards/kiwikeebs/kiwikeebsmacro.h diff --git a/keyboards/kiwikeebs/macro/readme.md b/keyboards/kiwikeebs/readme.md similarity index 100% rename from keyboards/kiwikeebs/macro/readme.md rename to keyboards/kiwikeebs/readme.md diff --git a/keyboards/kiwikeebs/macro/rules.mk b/keyboards/kiwikeebs/rules.mk similarity index 100% rename from keyboards/kiwikeebs/macro/rules.mk rename to keyboards/kiwikeebs/rules.mk From b7f2be2ce33ff595a5ede6e1bb2bfff5d0105d2a Mon Sep 17 00:00:00 2001 From: Ash Date: Thu, 20 Aug 2020 09:55:51 +0100 Subject: [PATCH 21/37] Updated structure after pull request commits --- keyboards/kiwikeebs/config.h | 108 ------------------ keyboards/kiwikeebs/info.json | 21 ---- keyboards/kiwikeebs/keymaps/default/keymap.c | 34 ------ keyboards/kiwikeebs/keymaps/default/readme.md | 1 - keyboards/kiwikeebs/macro/config.h | 2 +- keyboards/kiwikeebs/macro/info.json | 2 +- .../{kiwikeebsmacro.c => macro/macro.c} | 0 .../{kiwikeebsmacro.h => macro/macro.h} | 0 keyboards/kiwikeebs/{ => macro}/rules.mk | 0 9 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 keyboards/kiwikeebs/config.h delete mode 100644 keyboards/kiwikeebs/info.json delete mode 100644 keyboards/kiwikeebs/keymaps/default/keymap.c delete mode 100644 keyboards/kiwikeebs/keymaps/default/readme.md rename keyboards/kiwikeebs/{kiwikeebsmacro.c => macro/macro.c} (100%) rename keyboards/kiwikeebs/{kiwikeebsmacro.h => macro/macro.h} (100%) rename keyboards/kiwikeebs/{ => macro}/rules.mk (100%) diff --git a/keyboards/kiwikeebs/config.h b/keyboards/kiwikeebs/config.h deleted file mode 100644 index 3506ab74229c..000000000000 --- a/keyboards/kiwikeebs/config.h +++ /dev/null @@ -1,108 +0,0 @@ -/* -Copyright 2020 KiwiKeebs - -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 0xFEED -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKeebs -#define PRODUCT MacroBoard v.1.0 - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 4 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { E6, D7 } -#define MATRIX_COL_PINS { F7, B1, B3, B2 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { D1 } -#define ENCODERS_PAD_B { D0 } - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is useful for the Windows task manager shortcut (ctrl+shift+esc). - */ -//#define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - -/* disable these deprecated features by default */ -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION diff --git a/keyboards/kiwikeebs/info.json b/keyboards/kiwikeebs/info.json deleted file mode 100644 index 6b6e6eae8b5c..000000000000 --- a/keyboards/kiwikeebs/info.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "keyboard_name": "KiwiKeebs MacroBoard v.10", - "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", - "maintainer": "KiwiKeebs", - "width": 4, - "height": 2, - "layouts": { - "LAYOUT": { - "layout": [ - { "label": "k00", "x": 0, "y": 0 }, - { "label": "k01", "x": 1, "y": 0 }, - { "label": "k02", "x": 2, "y": 0 }, - - { "label": "k03", "x": 0, "y": 1 }, - { "label": "k04", "x": 1, "y": 1 }, - { "label": "k05", "x": 2, "y": 1 }, - { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 } - ] - } - } -} diff --git a/keyboards/kiwikeebs/keymaps/default/keymap.c b/keyboards/kiwikeebs/keymaps/default/keymap.c deleted file mode 100644 index eef211048ca0..000000000000 --- a/keyboards/kiwikeebs/keymaps/default/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * 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 - -// Defines names for use in layer keycodes and the keymap -enum layer_names { - _BASE, - _FN -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* Base */ - [_BASE] = LAYOUT( - KC_DELETE, KC_HOME, LT(_FN,KC_END), - KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE - ), - [_FN] = LAYOUT( - KC_1, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RIGHT, _______ - ) -}; diff --git a/keyboards/kiwikeebs/keymaps/default/readme.md b/keyboards/kiwikeebs/keymaps/default/readme.md deleted file mode 100644 index 9922a4f1a07f..000000000000 --- a/keyboards/kiwikeebs/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for KiwiKeebs MacroBoard diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index 5753b52a0bff..3506ab74229c 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x4712 +#define PRODUCT_ID 0x0000 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs #define PRODUCT MacroBoard v.1.0 diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 00726a02f4cf..6b6e6eae8b5c 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -2,7 +2,7 @@ "keyboard_name": "KiwiKeebs MacroBoard v.10", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", - "width": 5, + "width": 4, "height": 2, "layouts": { "LAYOUT": { diff --git a/keyboards/kiwikeebs/kiwikeebsmacro.c b/keyboards/kiwikeebs/macro/macro.c similarity index 100% rename from keyboards/kiwikeebs/kiwikeebsmacro.c rename to keyboards/kiwikeebs/macro/macro.c diff --git a/keyboards/kiwikeebs/kiwikeebsmacro.h b/keyboards/kiwikeebs/macro/macro.h similarity index 100% rename from keyboards/kiwikeebs/kiwikeebsmacro.h rename to keyboards/kiwikeebs/macro/macro.h diff --git a/keyboards/kiwikeebs/rules.mk b/keyboards/kiwikeebs/macro/rules.mk similarity index 100% rename from keyboards/kiwikeebs/rules.mk rename to keyboards/kiwikeebs/macro/rules.mk From b4945a88c672aab4568f8ded110603d26655ff2c Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Mon, 24 Aug 2020 19:06:07 +0100 Subject: [PATCH 22/37] Update keyboards/kiwikeebs/macro/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kiwikeebs/macro/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index 3506ab74229c..5753b52a0bff 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/config.h @@ -21,7 +21,7 @@ along with this program. If not, see . /* USB Device descriptor parameter */ #define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x0000 +#define PRODUCT_ID 0x4712 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs #define PRODUCT MacroBoard v.1.0 From 739d1eee90b59c406ceb9260241568d5d59c65e3 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Mon, 24 Aug 2020 19:06:19 +0100 Subject: [PATCH 23/37] Update keyboards/kiwikeebs/macro/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> --- keyboards/kiwikeebs/macro/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 6b6e6eae8b5c..00726a02f4cf 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -2,7 +2,7 @@ "keyboard_name": "KiwiKeebs MacroBoard v.10", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", - "width": 4, + "width": 5, "height": 2, "layouts": { "LAYOUT": { From abb406dc5e77e951ac670d51a12aaeb7b0cb6b68 Mon Sep 17 00:00:00 2001 From: KiwiKeebs Date: Thu, 8 Jul 2021 22:22:39 +0100 Subject: [PATCH 24/37] Updated KiwiKeebs macro V1 for VIA support. Also Included new KiwiKeebs V2 QMK and VIA --- keyboards/kiwikeebs/macro-v2/config.h | 108 ++++++++++++++++++ keyboards/kiwikeebs/macro-v2/info.json | 21 ++++ .../macro-v2/keymaps/default/keymap.c | 34 ++++++ .../kiwikeebs/macro-v2/keymaps/via/keymap.c | 34 ++++++ .../kiwikeebs/macro-v2/keymaps/via/rules.mk | 1 + keyboards/kiwikeebs/macro-v2/macro.c | 29 +++++ keyboards/kiwikeebs/macro-v2/macro.h | 35 ++++++ keyboards/kiwikeebs/macro-v2/macro2.0.c | 29 +++++ keyboards/kiwikeebs/macro-v2/macro2.0.h | 35 ++++++ keyboards/kiwikeebs/macro-v2/rules.mk | 21 ++++ keyboards/kiwikeebs/macro/config.h | 2 +- keyboards/kiwikeebs/macro/info.json | 2 +- .../kiwikeebs/macro/keymaps/default/keymap.c | 4 +- .../kiwikeebs/macro/keymaps/via/keymap.c | 34 ++++++ .../kiwikeebs/macro/keymaps/via/rules.mk | 1 + keyboards/kiwikeebs/macro/macro.c | 6 +- keyboards/kiwikeebs/macro/rules.mk | 2 +- 17 files changed, 391 insertions(+), 7 deletions(-) create mode 100644 keyboards/kiwikeebs/macro-v2/config.h create mode 100644 keyboards/kiwikeebs/macro-v2/info.json create mode 100644 keyboards/kiwikeebs/macro-v2/keymaps/default/keymap.c create mode 100644 keyboards/kiwikeebs/macro-v2/keymaps/via/keymap.c create mode 100644 keyboards/kiwikeebs/macro-v2/keymaps/via/rules.mk create mode 100644 keyboards/kiwikeebs/macro-v2/macro.c create mode 100644 keyboards/kiwikeebs/macro-v2/macro.h create mode 100644 keyboards/kiwikeebs/macro-v2/macro2.0.c create mode 100644 keyboards/kiwikeebs/macro-v2/macro2.0.h create mode 100644 keyboards/kiwikeebs/macro-v2/rules.mk create mode 100644 keyboards/kiwikeebs/macro/keymaps/via/keymap.c create mode 100644 keyboards/kiwikeebs/macro/keymaps/via/rules.mk diff --git a/keyboards/kiwikeebs/macro-v2/config.h b/keyboards/kiwikeebs/macro-v2/config.h new file mode 100644 index 000000000000..a6859d1b679e --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/config.h @@ -0,0 +1,108 @@ +/* +Copyright 2020 KiwiKeebs + +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 0x4b51 +#define PRODUCT_ID 0x4712 +#define DEVICE_VER 0x0001 +#define MANUFACTURER KiwiKeebs +#define PRODUCT MacroBoard v.1.0 + +/* key matrix size */ +#define MATRIX_ROWS 2 +#define MATRIX_COLS 4 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { E6, D7 } +#define MATRIX_COL_PINS { F7, B1, B3, B2 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define ENCODERS_PAD_A { D1 } +#define ENCODERS_PAD_B { D0 } + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 + +/* define if matrix has ghost (lacks anti-ghosting diodes) */ +//#define MATRIX_HAS_GHOST + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. + * This is useful for the Windows task manager shortcut (ctrl+shift+esc). + */ +//#define GRAVE_ESC_CTRL_OVERRIDE + +/* + * Force NKRO + * + * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved + * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the + * makefile for this to work.) + * + * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) + * until the next keyboard reset. + * + * NKRO may prevent your keystrokes from being detected in the BIOS, but it is + * fully operational during normal computer usage. + * + * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) + * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by + * bootmagic, NKRO mode will always be enabled until it is toggled again during a + * power-up. + * + */ +//#define FORCE_NKRO + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + +/* disable these deprecated features by default */ +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION diff --git a/keyboards/kiwikeebs/macro-v2/info.json b/keyboards/kiwikeebs/macro-v2/info.json new file mode 100644 index 000000000000..00726a02f4cf --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/info.json @@ -0,0 +1,21 @@ +{ + "keyboard_name": "KiwiKeebs MacroBoard v.10", + "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", + "maintainer": "KiwiKeebs", + "width": 5, + "height": 2, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "k00", "x": 0, "y": 0 }, + { "label": "k01", "x": 1, "y": 0 }, + { "label": "k02", "x": 2, "y": 0 }, + + { "label": "k03", "x": 0, "y": 1 }, + { "label": "k04", "x": 1, "y": 1 }, + { "label": "k05", "x": 2, "y": 1 }, + { "label": "k06", "x": 3, "y": 0, "h":2, "w":2 } + ] + } + } +} diff --git a/keyboards/kiwikeebs/macro-v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro-v2/keymaps/default/keymap.c new file mode 100644 index 000000000000..56dffdbd93a7 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_DEL, KC_HOME, LT(_FN,KC_END), + KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE + ), + [_FN] = LAYOUT( + RESET, KC_UP, _______, + KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + ) +}; diff --git a/keyboards/kiwikeebs/macro-v2/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro-v2/keymaps/via/keymap.c new file mode 100644 index 000000000000..56dffdbd93a7 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_DEL, KC_HOME, LT(_FN,KC_END), + KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE + ), + [_FN] = LAYOUT( + RESET, KC_UP, _______, + KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + ) +}; diff --git a/keyboards/kiwikeebs/macro-v2/keymaps/via/rules.mk b/keyboards/kiwikeebs/macro-v2/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/kiwikeebs/macro-v2/macro.c b/keyboards/kiwikeebs/macro-v2/macro.c new file mode 100644 index 000000000000..5eb03509e5b7 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/macro.c @@ -0,0 +1,29 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 "macro.h" + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) return false; + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_AUDIO_VOL_UP); + } else { + tap_code(KC_AUDIO_VOL_DOWN); + } + } + return true; +} diff --git a/keyboards/kiwikeebs/macro-v2/macro.h b/keyboards/kiwikeebs/macro-v2/macro.h new file mode 100644 index 000000000000..ee7c6bd47d95 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/macro.h @@ -0,0 +1,35 @@ +/* Copyright 2020 KiwiKeebs + * + * 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" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, \ + k03, k04, k05, k06 \ +) { \ + { k00, k01, k02, KC_NO }, \ + { k03, k04, k05, k06 } \ +} diff --git a/keyboards/kiwikeebs/macro-v2/macro2.0.c b/keyboards/kiwikeebs/macro-v2/macro2.0.c new file mode 100644 index 000000000000..1da5734cb7be --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/macro2.0.c @@ -0,0 +1,29 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 "macro2.0.h" + +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) return false; + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code(KC_AUDIO_VOL_UP); + } else { + tap_code(KC_AUDIO_VOL_DOWN); + } + } + return true; +} \ No newline at end of file diff --git a/keyboards/kiwikeebs/macro-v2/macro2.0.h b/keyboards/kiwikeebs/macro-v2/macro2.0.h new file mode 100644 index 000000000000..ee7c6bd47d95 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/macro2.0.h @@ -0,0 +1,35 @@ +/* Copyright 2020 KiwiKeebs + * + * 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" + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT( \ + k00, k01, k02, \ + k03, k04, k05, k06 \ +) { \ + { k00, k01, k02, KC_NO }, \ + { k03, k04, k05, k06 } \ +} diff --git a/keyboards/kiwikeebs/macro-v2/rules.mk b/keyboards/kiwikeebs/macro-v2/rules.mk new file mode 100644 index 000000000000..c1524daac2b2 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +BLUETOOTH_ENABLE = no # Enable Bluetooth +AUDIO_ENABLE = no # Audio output +ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index 5753b52a0bff..a6859d1b679e 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED +#define VENDOR_ID 0x4b51 #define PRODUCT_ID 0x4712 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 00726a02f4cf..723eb1908a64 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "KiwiKeebs MacroBoard v.10", + "keyboard_name": "KiwiKeebs MacroBoard v1.0", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", "width": 5, diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c index 7d1acce308fd..56dffdbd93a7 100644 --- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE ), [_FN] = LAYOUT( - KC_1, KC_UP, _______, - KC_LEFT, KC_DOWN, KC_RGHT, _______ + RESET, KC_UP, _______, + KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO ) }; diff --git a/keyboards/kiwikeebs/macro/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c new file mode 100644 index 000000000000..56dffdbd93a7 --- /dev/null +++ b/keyboards/kiwikeebs/macro/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2020 KiwiKeebs + * + * 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 + +// Defines names for use in layer keycodes and the keymap +enum layer_names { + _BASE, + _FN +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* Base */ + [_BASE] = LAYOUT( + KC_DEL, KC_HOME, LT(_FN,KC_END), + KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE + ), + [_FN] = LAYOUT( + RESET, KC_UP, _______, + KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + ) +}; diff --git a/keyboards/kiwikeebs/macro/keymaps/via/rules.mk b/keyboards/kiwikeebs/macro/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/kiwikeebs/macro/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/kiwikeebs/macro/macro.c b/keyboards/kiwikeebs/macro/macro.c index 3d5ab1661701..5eb03509e5b7 100644 --- a/keyboards/kiwikeebs/macro/macro.c +++ b/keyboards/kiwikeebs/macro/macro.c @@ -16,7 +16,8 @@ #include "macro.h" -void encoder_update_kb(uint8_t index, bool clockwise) { +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) return false; if (index == 0) { /* First encoder */ if (clockwise) { tap_code(KC_AUDIO_VOL_UP); @@ -24,4 +25,5 @@ void encoder_update_kb(uint8_t index, bool clockwise) { tap_code(KC_AUDIO_VOL_DOWN); } } -} \ No newline at end of file + return true; +} diff --git a/keyboards/kiwikeebs/macro/rules.mk b/keyboards/kiwikeebs/macro/rules.mk index 0c3a849c4f1e..c1524daac2b2 100644 --- a/keyboards/kiwikeebs/macro/rules.mk +++ b/keyboards/kiwikeebs/macro/rules.mk @@ -13,7 +13,7 @@ EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = no # USB Nkey Rollover +NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth From cdf9652d3e95b08106c042d46aad3fc001e7cb6c Mon Sep 17 00:00:00 2001 From: KiwiKeebs Date: Tue, 13 Jul 2021 15:05:39 +0100 Subject: [PATCH 25/37] Added readmes --- keyboards/kiwikeebs/macro-v2/readme.md | 19 +++++++++++++++++++ keyboards/kiwikeebs/macro/readme.md | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 keyboards/kiwikeebs/macro-v2/readme.md create mode 100644 keyboards/kiwikeebs/macro/readme.md diff --git a/keyboards/kiwikeebs/macro-v2/readme.md b/keyboards/kiwikeebs/macro-v2/readme.md new file mode 100644 index 000000000000..61a1441bd759 --- /dev/null +++ b/keyboards/kiwikeebs/macro-v2/readme.md @@ -0,0 +1,19 @@ +# KiwiKeebs MacroBoard V1.0 + +![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) + +A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. + +* Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) +* Hardware Supported: KiwiKeebs MacroBoard V1.0 +* Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) + +Make example for this keyboard (after setting up your build environment): + + make kiwikeebsmacro:default + +Flashing example for this keyboard: + + make kiwikeebsmacro: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). diff --git a/keyboards/kiwikeebs/macro/readme.md b/keyboards/kiwikeebs/macro/readme.md new file mode 100644 index 000000000000..61a1441bd759 --- /dev/null +++ b/keyboards/kiwikeebs/macro/readme.md @@ -0,0 +1,19 @@ +# KiwiKeebs MacroBoard V1.0 + +![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) + +A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. + +* Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) +* Hardware Supported: KiwiKeebs MacroBoard V1.0 +* Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) + +Make example for this keyboard (after setting up your build environment): + + make kiwikeebsmacro:default + +Flashing example for this keyboard: + + make kiwikeebsmacro: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). From c449d1db3db4334d01167989233188dc67f6f43c Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Tue, 13 Jul 2021 17:10:07 +0100 Subject: [PATCH 26/37] Update keyboards/kiwikeebs/macro-v2/config.h Co-authored-by: Drashna Jaelre --- keyboards/kiwikeebs/macro-v2/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro-v2/config.h b/keyboards/kiwikeebs/macro-v2/config.h index a6859d1b679e..d9dcc3ba60ec 100644 --- a/keyboards/kiwikeebs/macro-v2/config.h +++ b/keyboards/kiwikeebs/macro-v2/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x4b51 +#define VENDOR_ID 0x4B51 #define PRODUCT_ID 0x4712 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs From 8617b38ca6e9cedd3ca473cb9d0447505a105263 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Tue, 13 Jul 2021 17:17:22 +0100 Subject: [PATCH 27/37] Update keyboards/kiwikeebs/macro/config.h Co-authored-by: Drashna Jaelre --- keyboards/kiwikeebs/macro/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index a6859d1b679e..d9dcc3ba60ec 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/config.h @@ -20,7 +20,7 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x4b51 +#define VENDOR_ID 0x4B51 #define PRODUCT_ID 0x4712 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs From 6bb08779cf23f33e928e5cc3598c00f192f95bba Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Tue, 13 Jul 2021 17:17:37 +0100 Subject: [PATCH 28/37] Update keyboards/kiwikeebs/macro/info.json Co-authored-by: Drashna Jaelre --- keyboards/kiwikeebs/macro/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index 2d014323a550..723eb1908a64 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -1,3 +1,4 @@ +{ "keyboard_name": "KiwiKeebs MacroBoard v1.0", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", From 3bfabf756b982d01363b81a6f6472ee1179acbc7 Mon Sep 17 00:00:00 2001 From: KiwiKeebs Date: Tue, 13 Jul 2021 17:28:31 +0100 Subject: [PATCH 29/37] Updated read me files --- keyboards/kiwikeebs/macro/readme.md | 2 +- keyboards/kiwikeebs/readme.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/kiwikeebs/macro/readme.md b/keyboards/kiwikeebs/macro/readme.md index 61a1441bd759..70a559e44816 100644 --- a/keyboards/kiwikeebs/macro/readme.md +++ b/keyboards/kiwikeebs/macro/readme.md @@ -1,6 +1,6 @@ # KiwiKeebs MacroBoard V1.0 -![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) +![KiwiKeebs](https://kiwikeebs.co.uk/wp-content/themes/storefront-child-theme-master/images/kiwikeebs-logo.svg) A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. diff --git a/keyboards/kiwikeebs/readme.md b/keyboards/kiwikeebs/readme.md index 61a1441bd759..96bede389702 100644 --- a/keyboards/kiwikeebs/readme.md +++ b/keyboards/kiwikeebs/readme.md @@ -1,19 +1,19 @@ # KiwiKeebs MacroBoard V1.0 -![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) +![KiwiKeebs](https://kiwikeebs.co.uk/wp-content/themes/storefront-child-theme-master/images/kiwikeebs-logo.svg) -A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. +A 6 Key Hotswap PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. * Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) -* Hardware Supported: KiwiKeebs MacroBoard V1.0 -* Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/) +* Hardware Supported: KiwiKeebs MacroBoard V2 +* Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/o0ovyj/ic_kiwikeebs_macroboard_v2_kit_hotswap_usbc_new/) Make example for this keyboard (after setting up your build environment): - make kiwikeebsmacro:default + make kiwikeebsmacro-v2:default -Flashing example for this keyboard: +To flash this macro you will need to hit the physical reset button on the PCB to put it into DFU mode. You can then flash using command line or QMK Toolbox using the right .hex fine generated by QMK Configurator. - make kiwikeebsmacro:default:flash + make kiwikeebsmacro-v2: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). From 7e466d826f483423a6a0296f709c9e8a1994ef21 Mon Sep 17 00:00:00 2001 From: KiwiKeebs Date: Tue, 13 Jul 2021 17:45:30 +0100 Subject: [PATCH 30/37] Updated read me files - make command --- keyboards/kiwikeebs/macro/readme.md | 4 ++-- keyboards/kiwikeebs/readme.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kiwikeebs/macro/readme.md b/keyboards/kiwikeebs/macro/readme.md index 70a559e44816..ce9d4ea8cc0b 100644 --- a/keyboards/kiwikeebs/macro/readme.md +++ b/keyboards/kiwikeebs/macro/readme.md @@ -10,10 +10,10 @@ A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. Make example for this keyboard (after setting up your build environment): - make kiwikeebsmacro:default + make kiwikeebs/macro:default Flashing example for this keyboard: - make kiwikeebsmacro:default:flash + make kiwikeebs/macro: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). diff --git a/keyboards/kiwikeebs/readme.md b/keyboards/kiwikeebs/readme.md index 96bede389702..9e8f69cd9efb 100644 --- a/keyboards/kiwikeebs/readme.md +++ b/keyboards/kiwikeebs/readme.md @@ -10,10 +10,10 @@ A 6 Key Hotswap PCB with Rotary Encoder Knob + Button made from solid CNC alumin Make example for this keyboard (after setting up your build environment): - make kiwikeebsmacro-v2:default + make kiwikeebs/macro-v2:default To flash this macro you will need to hit the physical reset button on the PCB to put it into DFU mode. You can then flash using command line or QMK Toolbox using the right .hex fine generated by QMK Configurator. - make kiwikeebsmacro-v2:default:flash + make kiwikeebs/macro-v2: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). From ae9897e32a7354f8d5ac25426cbcc7c9336eb4b1 Mon Sep 17 00:00:00 2001 From: Ash Date: Fri, 23 Jul 2021 10:28:07 +0100 Subject: [PATCH 31/37] Renamed files/folders to remove - and . --- keyboards/kiwikeebs/{macro-v2 => macro_v2}/config.h | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/info.json | 0 .../kiwikeebs/{macro-v2 => macro_v2}/keymaps/default/keymap.c | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/keymaps/via/keymap.c | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/keymaps/via/rules.mk | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro.c | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro.h | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro2.0.c | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro2.0.h | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/readme.md | 0 keyboards/kiwikeebs/{macro-v2 => macro_v2}/rules.mk | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/config.h (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/info.json (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/keymaps/default/keymap.c (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/keymaps/via/keymap.c (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/keymaps/via/rules.mk (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro.c (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro.h (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro2.0.c (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/macro2.0.h (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/readme.md (100%) rename keyboards/kiwikeebs/{macro-v2 => macro_v2}/rules.mk (100%) diff --git a/keyboards/kiwikeebs/macro-v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h similarity index 100% rename from keyboards/kiwikeebs/macro-v2/config.h rename to keyboards/kiwikeebs/macro_v2/config.h diff --git a/keyboards/kiwikeebs/macro-v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json similarity index 100% rename from keyboards/kiwikeebs/macro-v2/info.json rename to keyboards/kiwikeebs/macro_v2/info.json diff --git a/keyboards/kiwikeebs/macro-v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c similarity index 100% rename from keyboards/kiwikeebs/macro-v2/keymaps/default/keymap.c rename to keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c diff --git a/keyboards/kiwikeebs/macro-v2/keymaps/via/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c similarity index 100% rename from keyboards/kiwikeebs/macro-v2/keymaps/via/keymap.c rename to keyboards/kiwikeebs/macro_v2/keymaps/via/keymap.c diff --git a/keyboards/kiwikeebs/macro-v2/keymaps/via/rules.mk b/keyboards/kiwikeebs/macro_v2/keymaps/via/rules.mk similarity index 100% rename from keyboards/kiwikeebs/macro-v2/keymaps/via/rules.mk rename to keyboards/kiwikeebs/macro_v2/keymaps/via/rules.mk diff --git a/keyboards/kiwikeebs/macro-v2/macro.c b/keyboards/kiwikeebs/macro_v2/macro.c similarity index 100% rename from keyboards/kiwikeebs/macro-v2/macro.c rename to keyboards/kiwikeebs/macro_v2/macro.c diff --git a/keyboards/kiwikeebs/macro-v2/macro.h b/keyboards/kiwikeebs/macro_v2/macro.h similarity index 100% rename from keyboards/kiwikeebs/macro-v2/macro.h rename to keyboards/kiwikeebs/macro_v2/macro.h diff --git a/keyboards/kiwikeebs/macro-v2/macro2.0.c b/keyboards/kiwikeebs/macro_v2/macro2.0.c similarity index 100% rename from keyboards/kiwikeebs/macro-v2/macro2.0.c rename to keyboards/kiwikeebs/macro_v2/macro2.0.c diff --git a/keyboards/kiwikeebs/macro-v2/macro2.0.h b/keyboards/kiwikeebs/macro_v2/macro2.0.h similarity index 100% rename from keyboards/kiwikeebs/macro-v2/macro2.0.h rename to keyboards/kiwikeebs/macro_v2/macro2.0.h diff --git a/keyboards/kiwikeebs/macro-v2/readme.md b/keyboards/kiwikeebs/macro_v2/readme.md similarity index 100% rename from keyboards/kiwikeebs/macro-v2/readme.md rename to keyboards/kiwikeebs/macro_v2/readme.md diff --git a/keyboards/kiwikeebs/macro-v2/rules.mk b/keyboards/kiwikeebs/macro_v2/rules.mk similarity index 100% rename from keyboards/kiwikeebs/macro-v2/rules.mk rename to keyboards/kiwikeebs/macro_v2/rules.mk From 9b4bd459bdcde2fdf694b3bb18d3ea33dfcc37da Mon Sep 17 00:00:00 2001 From: kiwikeebs Date: Fri, 30 Jul 2021 16:56:20 +0100 Subject: [PATCH 32/37] fauxpark changes --- keyboards/kiwikeebs/macro_v2/config.h | 2 +- keyboards/kiwikeebs/macro_v2/info.json | 2 +- keyboards/kiwikeebs/macro_v2/macro.c | 29 --------------- keyboards/kiwikeebs/macro_v2/macro2.0.h | 35 ------------------- .../macro_v2/{macro2.0.c => macro_v2.c} | 0 .../macro_v2/{macro.h => macro_v2.h} | 0 keyboards/kiwikeebs/macro_v2/readme.md | 6 ++-- keyboards/kiwikeebs/readme.md | 19 ---------- 8 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 keyboards/kiwikeebs/macro_v2/macro.c delete mode 100644 keyboards/kiwikeebs/macro_v2/macro2.0.h rename keyboards/kiwikeebs/macro_v2/{macro2.0.c => macro_v2.c} (100%) rename keyboards/kiwikeebs/macro_v2/{macro.h => macro_v2.h} (100%) delete mode 100644 keyboards/kiwikeebs/readme.md diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h index d9dcc3ba60ec..ab486fe54db9 100644 --- a/keyboards/kiwikeebs/macro_v2/config.h +++ b/keyboards/kiwikeebs/macro_v2/config.h @@ -24,7 +24,7 @@ along with this program. If not, see . #define PRODUCT_ID 0x4712 #define DEVICE_VER 0x0001 #define MANUFACTURER KiwiKeebs -#define PRODUCT MacroBoard v.1.0 +#define PRODUCT MacroBoard v.2.0 /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json index 00726a02f4cf..8dd0d196d195 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "KiwiKeebs MacroBoard v.10", + "keyboard_name": "KiwiKeebs MacroBoard v.2.0", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", "width": 5, diff --git a/keyboards/kiwikeebs/macro_v2/macro.c b/keyboards/kiwikeebs/macro_v2/macro.c deleted file mode 100644 index 5eb03509e5b7..000000000000 --- a/keyboards/kiwikeebs/macro_v2/macro.c +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * 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 "macro.h" - -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) return false; - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code(KC_AUDIO_VOL_UP); - } else { - tap_code(KC_AUDIO_VOL_DOWN); - } - } - return true; -} diff --git a/keyboards/kiwikeebs/macro_v2/macro2.0.h b/keyboards/kiwikeebs/macro_v2/macro2.0.h deleted file mode 100644 index ee7c6bd47d95..000000000000 --- a/keyboards/kiwikeebs/macro_v2/macro2.0.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 KiwiKeebs - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, \ - k03, k04, k05, k06 \ -) { \ - { k00, k01, k02, KC_NO }, \ - { k03, k04, k05, k06 } \ -} diff --git a/keyboards/kiwikeebs/macro_v2/macro2.0.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c similarity index 100% rename from keyboards/kiwikeebs/macro_v2/macro2.0.c rename to keyboards/kiwikeebs/macro_v2/macro_v2.c diff --git a/keyboards/kiwikeebs/macro_v2/macro.h b/keyboards/kiwikeebs/macro_v2/macro_v2.h similarity index 100% rename from keyboards/kiwikeebs/macro_v2/macro.h rename to keyboards/kiwikeebs/macro_v2/macro_v2.h diff --git a/keyboards/kiwikeebs/macro_v2/readme.md b/keyboards/kiwikeebs/macro_v2/readme.md index 61a1441bd759..a581f9cbcef3 100644 --- a/keyboards/kiwikeebs/macro_v2/readme.md +++ b/keyboards/kiwikeebs/macro_v2/readme.md @@ -1,4 +1,4 @@ -# KiwiKeebs MacroBoard V1.0 +# KiwiKeebs MacroBoard V2.0 ![KiwiKeebs](https://i.imgur.com/h5i9jBl.png) @@ -10,10 +10,10 @@ A 6 Key PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. Make example for this keyboard (after setting up your build environment): - make kiwikeebsmacro:default + make kiwikeebs/macro_v2:default Flashing example for this keyboard: - make kiwikeebsmacro:default:flash + make kiwikeebs/macro_v2: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). diff --git a/keyboards/kiwikeebs/readme.md b/keyboards/kiwikeebs/readme.md deleted file mode 100644 index 9e8f69cd9efb..000000000000 --- a/keyboards/kiwikeebs/readme.md +++ /dev/null @@ -1,19 +0,0 @@ -# KiwiKeebs MacroBoard V1.0 - -![KiwiKeebs](https://kiwikeebs.co.uk/wp-content/themes/storefront-child-theme-master/images/kiwikeebs-logo.svg) - -A 6 Key Hotswap PCB with Rotary Encoder Knob + Button made from solid CNC aluminium. - -* Keyboard Maintainer: [AKiwi92](https://github.com/akiwi92) -* Hardware Supported: KiwiKeebs MacroBoard V2 -* Hardware Availability: [reddit.com](https://www.reddit.com/r/mechmarket/comments/o0ovyj/ic_kiwikeebs_macroboard_v2_kit_hotswap_usbc_new/) - -Make example for this keyboard (after setting up your build environment): - - make kiwikeebs/macro-v2:default - -To flash this macro you will need to hit the physical reset button on the PCB to put it into DFU mode. You can then flash using command line or QMK Toolbox using the right .hex fine generated by QMK Configurator. - - make kiwikeebs/macro-v2: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). From 787ba5daf5087b5cbb22b3aa0df481e40fe07bfb Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Tue, 10 Aug 2021 22:58:09 +0100 Subject: [PATCH 33/37] Update keyboards/kiwikeebs/macro_v2/macro_v2.c Co-authored-by: Ryan --- keyboards/kiwikeebs/macro_v2/macro_v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/kiwikeebs/macro_v2/macro_v2.c b/keyboards/kiwikeebs/macro_v2/macro_v2.c index 1da5734cb7be..795da21cc981 100644 --- a/keyboards/kiwikeebs/macro_v2/macro_v2.c +++ b/keyboards/kiwikeebs/macro_v2/macro_v2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "macro2.0.h" +#include "macro_v2.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) return false; @@ -26,4 +26,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { } } return true; -} \ No newline at end of file +} From 9aed5ef86159443bf8c183b3a5745d33f15ca801 Mon Sep 17 00:00:00 2001 From: KiwiKeebs Date: Sat, 28 Aug 2021 15:06:29 +0100 Subject: [PATCH 34/37] Added empty layers to keymap --- .../kiwikeebs/macro/keymaps/default/keymap.c | 16 +++++++++++++--- .../macro_v2/keymaps/default/keymap.c | 18 ++++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c index 56dffdbd93a7..caa6b4aafcc0 100644 --- a/keyboards/kiwikeebs/macro/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro/keymaps/default/keymap.c @@ -18,17 +18,27 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN + _FN1, + _FN2, + _FN3 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - KC_DEL, KC_HOME, LT(_FN,KC_END), + KC_DEL, KC_HOME, LT(_FN1,KC_END), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE ), - [_FN] = LAYOUT( + [_FN1] = LAYOUT( RESET, KC_UP, _______, KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + ), + [_FN2] = LAYOUT( + _______, _______, _______, + _______, _______, _______, _______ + ), + [_FN3] = LAYOUT( + _______, _______, _______, + _______, _______, _______, _______ ) }; diff --git a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c index 56dffdbd93a7..dd0def64b6b8 100644 --- a/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c +++ b/keyboards/kiwikeebs/macro_v2/keymaps/default/keymap.c @@ -18,17 +18,27 @@ // Defines names for use in layer keycodes and the keymap enum layer_names { _BASE, - _FN + _FN1, + _FN2, + _FN3 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT( - KC_DEL, KC_HOME, LT(_FN,KC_END), + KC_DEL, KC_HOME, LT(_FN1,KC_END), KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE ), - [_FN] = LAYOUT( + [_FN1] = LAYOUT( RESET, KC_UP, _______, KC_LEFT, KC_DOWN, KC_RGHT, MAGIC_TOGGLE_NKRO + ), + [_FN2] = LAYOUT( + _______, _______, _______, + _______, _______, _______, _______ + ), + [_FN3] = LAYOUT( + _______, _______, _______, + _______, _______, _______, _______ ) -}; +}; \ No newline at end of file From 5ff3c7ae32b38bb67e5fdb2b192b80ca572bf47b Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Mon, 6 Sep 2021 00:15:55 +0100 Subject: [PATCH 35/37] Update keyboards/kiwikeebs/macro_v2/info.json Co-authored-by: Ryan --- keyboards/kiwikeebs/macro_v2/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json index 8dd0d196d195..524e259463db 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/info.json @@ -2,8 +2,6 @@ "keyboard_name": "KiwiKeebs MacroBoard v.2.0", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", - "width": 5, - "height": 2, "layouts": { "LAYOUT": { "layout": [ From c4444fbcbc00856a1d9aeb18712000f0f59312ae Mon Sep 17 00:00:00 2001 From: AKiwi92 Date: Fri, 15 Oct 2021 00:17:19 +0100 Subject: [PATCH 36/37] Amended pin numbers for macro v2 --- keyboards/kiwikeebs/macro_v2/config.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h index ab486fe54db9..9ecc4d6686b6 100644 --- a/keyboards/kiwikeebs/macro_v2/config.h +++ b/keyboards/kiwikeebs/macro_v2/config.h @@ -40,15 +40,15 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -#define MATRIX_ROW_PINS { E6, D7 } -#define MATRIX_COL_PINS { F7, B1, B3, B2 } +#define MATRIX_ROW_PINS { B5, B4 } +#define MATRIX_COL_PINS { B6, C6, C7, D4 } #define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define ENCODERS_PAD_A { D1 } -#define ENCODERS_PAD_B { D0 } +#define ENCODERS_PAD_A { D7 } +#define ENCODERS_PAD_B { D6 } /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 From 8bbaa72e401473019078092bdc4fe1911e15f856 Mon Sep 17 00:00:00 2001 From: AKiwi92 <69772382+AKiwi92@users.noreply.github.com> Date: Fri, 15 Oct 2021 10:30:25 +0100 Subject: [PATCH 37/37] Update keyboards/kiwikeebs/macro_v2/rules.mk Co-authored-by: Drashna Jaelre --- keyboards/kiwikeebs/macro_v2/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/kiwikeebs/macro_v2/rules.mk b/keyboards/kiwikeebs/macro_v2/rules.mk index 004a125549a5..41aae09aab9b 100644 --- a/keyboards/kiwikeebs/macro_v2/rules.mk +++ b/keyboards/kiwikeebs/macro_v2/rules.mk @@ -16,6 +16,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend NKRO_ENABLE = yes # USB Nkey Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes