Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Keyboard "KiwiKeebs MacroBoard v1.0" #10080

Merged
merged 25 commits into from
Aug 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fa635c4
KiwiKeebs v.10 QMK
ashkwil Aug 18, 2020
b201e08
Merge remote-tracking branch 'upstream'
ashkwil Aug 18, 2020
d686ff5
Rename files and folder structure for QMK pull request
ashkwil Aug 18, 2020
f5d2e72
Merge branch 'master' of https://github.com/AKiwi92/qmk_firmware
ashkwil Aug 18, 2020
d395a33
Deleted unused files
ashkwil Aug 18, 2020
0f3bb7e
Added starter keymap
ashkwil Aug 18, 2020
e518c54
Changes to make pull request compliant
ashkwil Aug 18, 2020
266a8b1
Removed lines for PR error
ashkwil Aug 18, 2020
9a1ceb8
Error fix in json for PR
ashkwil Aug 18, 2020
e20b8e1
Update keyboards/kiwikeebsmacro/kiwikeebsmacro.h
AKiwi92 Aug 19, 2020
1562b90
Update keyboards/kiwikeebsmacro/readme.md
AKiwi92 Aug 19, 2020
7b9420b
Update keyboards/kiwikeebsmacro/keymaps/default/readme.md
AKiwi92 Aug 19, 2020
acf3f58
Update keyboards/kiwikeebsmacro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
66486ea
Update keyboards/kiwikeebsmacro/info.json
AKiwi92 Aug 19, 2020
34ddbac
Update keyboards/kiwikeebsmacro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
a50d283
Update keyboards/kiwikeebsmacro/config.h
AKiwi92 Aug 19, 2020
8dd6be2
Changed structure to allow for future boards
ashkwil Aug 19, 2020
25a18f7
Update keyboards/kiwikeebs/macro/config.h
AKiwi92 Aug 19, 2020
9106d0a
Update keyboards/kiwikeebs/macro/info.json
AKiwi92 Aug 19, 2020
84ede3e
Update keyboards/kiwikeebs/macro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
1c5b47d
Update keyboards/kiwikeebs/macro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
4df87ad
Amended rotarty to use kb instead of user
ashkwil Aug 20, 2020
b7f2be2
Updated structure after pull request commits
ashkwil Aug 20, 2020
b4945a8
Update keyboards/kiwikeebs/macro/config.h
AKiwi92 Aug 24, 2020
739d1ee
Update keyboards/kiwikeebs/macro/info.json
AKiwi92 Aug 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 108 additions & 0 deletions keyboards/kiwikeebs/macro/config.h
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#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
21 changes: 21 additions & 0 deletions keyboards/kiwikeebs/macro/info.json
Original file line number Diff line number Diff line change
@@ -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 }
]
}
}
}
34 changes: 34 additions & 0 deletions keyboards/kiwikeebs/macro/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/
#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(
KC_1, KC_UP, _______,
KC_LEFT, KC_DOWN, KC_RGHT, _______
)
};
27 changes: 27 additions & 0 deletions keyboards/kiwikeebs/macro/macro.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#include "macro.h"

void encoder_update_kb(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);
}
}
}
35 changes: 35 additions & 0 deletions keyboards/kiwikeebs/macro/macro.h
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#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 } \
}
21 changes: 21 additions & 0 deletions keyboards/kiwikeebs/macro/rules.mk
Original file line number Diff line number Diff line change
@@ -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 = 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
19 changes: 19 additions & 0 deletions keyboards/kiwikeebs/readme.md
Original file line number Diff line number Diff line change
@@ -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).