From 9cf6a78afa45436632f7edd3a0c8b052d8153368 Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Mon, 20 Mar 2023 19:13:32 +0000 Subject: [PATCH 01/15] Added PocketPad Keyboard --- keyboards/ButterKeebs/PocketPad/PocketPad.c | 1 + keyboards/ButterKeebs/PocketPad/PocketPad.h | 20 ++++++ keyboards/ButterKeebs/PocketPad/config.h | 58 +++++++++++++++ .../PocketPad/keymaps/default/keymap.c | 71 +++++++++++++++++++ keyboards/ButterKeebs/PocketPad/rules.mk | 56 +++++++++++++++ 5 files changed, 206 insertions(+) create mode 100644 keyboards/ButterKeebs/PocketPad/PocketPad.c create mode 100644 keyboards/ButterKeebs/PocketPad/PocketPad.h create mode 100644 keyboards/ButterKeebs/PocketPad/config.h create mode 100644 keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c create mode 100644 keyboards/ButterKeebs/PocketPad/rules.mk diff --git a/keyboards/ButterKeebs/PocketPad/PocketPad.c b/keyboards/ButterKeebs/PocketPad/PocketPad.c new file mode 100644 index 000000000000..d2bf5f08d81a --- /dev/null +++ b/keyboards/ButterKeebs/PocketPad/PocketPad.c @@ -0,0 +1 @@ +#include "PocketPad.h" diff --git a/keyboards/ButterKeebs/PocketPad/PocketPad.h b/keyboards/ButterKeebs/PocketPad/PocketPad.h new file mode 100644 index 000000000000..679389e020ae --- /dev/null +++ b/keyboards/ButterKeebs/PocketPad/PocketPad.h @@ -0,0 +1,20 @@ +#ifndef POCKETPAD_H +#define POCKETPAD_H + +#include "quantum.h" + +#define KEYMAP( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33, \ + K40, K41 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 }, \ + { K40, K41, KC_NO, KC_NO } \ +} + +#endif \ No newline at end of file diff --git a/keyboards/ButterKeebs/PocketPad/config.h b/keyboards/ButterKeebs/PocketPad/config.h new file mode 100644 index 000000000000..14b4634f92ae --- /dev/null +++ b/keyboards/ButterKeebs/PocketPad/config.h @@ -0,0 +1,58 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID MBUK +#define PRODUCT_ID PocketPad +#define DEVICE_VER 1.0.0 +#define MANUFACTURER ButterKeebs +#define PRODUCT PocketPad +#define DESCRIPTION Keyboard + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 4 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { F7, F6, F5, F4, B1 } +#define MATRIX_COL_PINS { F1, C7, D5, B7 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION ROW2COL + +/* number of backlight levels */ + +#ifdef BACKLIGHT_PIN +#define BACKLIGHT_LEVELS 3 +#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/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c new file mode 100644 index 000000000000..bf649e2a4620 --- /dev/null +++ b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c @@ -0,0 +1,71 @@ +#include "PocketPad.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + KEYMAP( + KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, + KC_KP_7, KC_KP_8 , KC_KP_9, KC_KP_PLUS , + KC_KP_4, KC_KP_5 , KC_KP_6, KC_KP_ENTER, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, + MO(1), KC_KP_0), + + KEYMAP( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS) +}; + +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 led_set_user(uint8_t usb_led) { + + if (usb_led & (1 << USB_LED_NUM_LOCK)) { + + } else { + + } + + if (usb_led & (1 << USB_LED_CAPS_LOCK)) { + + } else { + + } + + if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { + + } else { + + } + + if (usb_led & (1 << USB_LED_COMPOSE)) { + + } else { + + } + + if (usb_led & (1 << USB_LED_KANA)) { + + } else { + + } + +} \ No newline at end of file diff --git a/keyboards/ButterKeebs/PocketPad/rules.mk b/keyboards/ButterKeebs/PocketPad/rules.mk new file mode 100644 index 000000000000..1f8e943be7fb --- /dev/null +++ b/keyboards/ButterKeebs/PocketPad/rules.mk @@ -0,0 +1,56 @@ +# 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 \ No newline at end of file From d2cc9de08078e8c90fb13ea21abee0b109312851 Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Wed, 22 Mar 2023 16:47:34 +0000 Subject: [PATCH 02/15] Resolved all issues --- keyboards/ButterKeebs/PocketPad/PocketPad.c | 2 +- keyboards/ButterKeebs/PocketPad/config.h | 58 --------------- .../PocketPad/keymaps/default/keymap.c | 74 ++----------------- keyboards/ButterKeebs/PocketPad/rules.mk | 15 ---- keyboards/butterkeebs/pocketpad/info.json | 69 +++++++++++++++++ 5 files changed, 77 insertions(+), 141 deletions(-) delete mode 100644 keyboards/ButterKeebs/PocketPad/config.h create mode 100644 keyboards/butterkeebs/pocketpad/info.json diff --git a/keyboards/ButterKeebs/PocketPad/PocketPad.c b/keyboards/ButterKeebs/PocketPad/PocketPad.c index d2bf5f08d81a..2708b2318f5f 100644 --- a/keyboards/ButterKeebs/PocketPad/PocketPad.c +++ b/keyboards/ButterKeebs/PocketPad/PocketPad.c @@ -1 +1 @@ -#include "PocketPad.h" +#include "pocketpad.h" diff --git a/keyboards/ButterKeebs/PocketPad/config.h b/keyboards/ButterKeebs/PocketPad/config.h deleted file mode 100644 index 14b4634f92ae..000000000000 --- a/keyboards/ButterKeebs/PocketPad/config.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID MBUK -#define PRODUCT_ID PocketPad -#define DEVICE_VER 1.0.0 -#define MANUFACTURER ButterKeebs -#define PRODUCT PocketPad -#define DESCRIPTION Keyboard - -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 4 - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, F6, F5, F4, B1 } -#define MATRIX_COL_PINS { F1, C7, D5, B7 } -#define UNUSED_PINS - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* number of backlight levels */ - -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 3 -#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/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c index bf649e2a4620..7725cc028855 100644 --- a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c +++ b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c @@ -1,71 +1,11 @@ -#include "PocketPad.h" +#include "pocketpad.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( - KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, - KC_KP_7, KC_KP_8 , KC_KP_9, KC_KP_PLUS , - KC_KP_4, KC_KP_5 , KC_KP_6, KC_KP_ENTER, - KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_ENTER, - MO(1), KC_KP_0), - - KEYMAP( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS) -}; - -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 led_set_user(uint8_t usb_led) { - - if (usb_led & (1 << USB_LED_NUM_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_CAPS_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_SCROLL_LOCK)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_COMPOSE)) { - - } else { - - } - - if (usb_led & (1 << USB_LED_KANA)) { - - } else { - - } - -} \ No newline at end of file + KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, + KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ENTER, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_DOT, + KC_F, KC_KP_0) +}; \ No newline at end of file diff --git a/keyboards/ButterKeebs/PocketPad/rules.mk b/keyboards/ButterKeebs/PocketPad/rules.mk index 1f8e943be7fb..5b3fd4d4534e 100644 --- a/keyboards/ButterKeebs/PocketPad/rules.mk +++ b/keyboards/ButterKeebs/PocketPad/rules.mk @@ -39,18 +39,3 @@ 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 \ No newline at end of file diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json new file mode 100644 index 000000000000..8ef21597d5d8 --- /dev/null +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -0,0 +1,69 @@ +{ + "manufacturer": "ButterKeebs", + "keyboard_name": "PocketPad", + "maintainer": "qmk", + "diode_direction": "ROW2COL", + + "usb": { + "device_version": "1.0.0", + "pid": "0x1475", + "vid": "0xFEED" + }, + + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": false, + "sleep_led": false + }, + "keyboard_folder": "butterkeebs/pocketpad", + "keymaps": {}, + "matrix_pins": { + "cols": ["F1", "C7", "D5", "B7"], + "rows": ["F7", "F6", "F5", "F4", "B1"] + }, + "matrix_size": { + "cols": 4, + "rows": 5 + }, + "mouse_key": { + "enabled": true + }, + + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"x": 0, "y": 0, "matrix": [0,0]}, + {"x": 1, "y": 0, "matrix": [0,1]}, + {"x": 2, "y": 0, "matrix": [0,2]}, + {"x": 3, "y": 0, "matrix": [0,3]}, + + {"x": 0, "y": 1, "matrix": [1,0]}, + {"x": 1, "y": 1, "matrix": [1,1]}, + {"x": 2, "y": 1, "matrix": [1,2]}, + {"x": 3, "y": 1, "matrix": [1,3]}, + + {"x": 0, "y": 2, "matrix": [2,0]}, + {"x": 1, "y": 2, "matrix": [2,1]}, + {"x": 2, "y": 2, "matrix": [2,2]}, + {"x": 3, "y": 2, "matrix": [2,3]}, + + {"x": 0, "y": 3, "matrix": [3,0]}, + {"x": 1, "y": 3, "matrix": [3,1]}, + {"x": 2, "y": 3, "matrix": [3,2]}, + {"x": 3, "y": 3, "matrix": [3,3]}, + + {"x": 0, "y": 4, "matrix": [4,0]}, + {"x": 1, "y": 4, "matrix": [4,1]} + ] + } + } +} \ No newline at end of file From 8077f87f57943ecd8b49ea69dbed5a859df0f140 Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Wed, 22 Mar 2023 17:05:30 +0000 Subject: [PATCH 03/15] Removed "matrix_size" --- keyboards/butterkeebs/pocketpad/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json index 8ef21597d5d8..9f402493a310 100644 --- a/keyboards/butterkeebs/pocketpad/info.json +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -27,10 +27,6 @@ "matrix_pins": { "cols": ["F1", "C7", "D5", "B7"], "rows": ["F7", "F6", "F5", "F4", "B1"] - }, - "matrix_size": { - "cols": 4, - "rows": 5 }, "mouse_key": { "enabled": true From 31341304a02c7218d23cc5cb363ca0ec2cb49afc Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Wed, 22 Mar 2023 17:12:10 +0000 Subject: [PATCH 04/15] Update keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c index 7725cc028855..0bf123fbb9fa 100644 --- a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c +++ b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c @@ -2,7 +2,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - KEYMAP( + LAYOUT( KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ENTER, From b9d3060708fb3be53bcc7568d6b49d593f279786 Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Wed, 22 Mar 2023 17:12:27 +0000 Subject: [PATCH 05/15] Update keyboards/ButterKeebs/PocketPad/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ButterKeebs/PocketPad/rules.mk | 42 +----------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/keyboards/ButterKeebs/PocketPad/rules.mk b/keyboards/ButterKeebs/PocketPad/rules.mk index 5b3fd4d4534e..c628fc7d0fe7 100644 --- a/keyboards/ButterKeebs/PocketPad/rules.mk +++ b/keyboards/ButterKeebs/PocketPad/rules.mk @@ -1,41 +1 @@ -# 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 +# This file intentionally blank From 8703ec133b8dfc4ece6c1addee72699a949cbbbb Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Wed, 22 Mar 2023 17:12:35 +0000 Subject: [PATCH 06/15] Update keyboards/butterkeebs/pocketpad/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/butterkeebs/pocketpad/info.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json index 9f402493a310..4031e6e5ce85 100644 --- a/keyboards/butterkeebs/pocketpad/info.json +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -11,16 +11,12 @@ }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, "extrakey": true, "mousekey": true, - "nkro": true, - "rgblight": false, - "sleep_led": false + "nkro": true }, "keyboard_folder": "butterkeebs/pocketpad", "keymaps": {}, From a8bc2e6aa28bbeb35ac5849ba26d091feae2a270 Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Wed, 22 Mar 2023 17:13:58 +0000 Subject: [PATCH 07/15] Update keyboards/butterkeebs/pocketpad/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/butterkeebs/pocketpad/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json index 4031e6e5ce85..680645785c39 100644 --- a/keyboards/butterkeebs/pocketpad/info.json +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -18,8 +18,6 @@ "mousekey": true, "nkro": true }, - "keyboard_folder": "butterkeebs/pocketpad", - "keymaps": {}, "matrix_pins": { "cols": ["F1", "C7", "D5", "B7"], "rows": ["F7", "F6", "F5", "F4", "B1"] From 639fbdf22b0fbc940413435e4e8bcd18194e1426 Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Wed, 22 Mar 2023 17:15:16 +0000 Subject: [PATCH 08/15] removed pocketpad c and h --- keyboards/ButterKeebs/PocketPad/PocketPad.c | 1 - keyboards/ButterKeebs/PocketPad/PocketPad.h | 20 ------------------- .../PocketPad/keymaps/default/keymap.c | 4 ++-- keyboards/butterkeebs/pocketpad/info.json | 3 --- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 keyboards/ButterKeebs/PocketPad/PocketPad.c delete mode 100644 keyboards/ButterKeebs/PocketPad/PocketPad.h diff --git a/keyboards/ButterKeebs/PocketPad/PocketPad.c b/keyboards/ButterKeebs/PocketPad/PocketPad.c deleted file mode 100644 index 2708b2318f5f..000000000000 --- a/keyboards/ButterKeebs/PocketPad/PocketPad.c +++ /dev/null @@ -1 +0,0 @@ -#include "pocketpad.h" diff --git a/keyboards/ButterKeebs/PocketPad/PocketPad.h b/keyboards/ButterKeebs/PocketPad/PocketPad.h deleted file mode 100644 index 679389e020ae..000000000000 --- a/keyboards/ButterKeebs/PocketPad/PocketPad.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef POCKETPAD_H -#define POCKETPAD_H - -#include "quantum.h" - -#define KEYMAP( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, KC_NO, KC_NO } \ -} - -#endif \ No newline at end of file diff --git a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c index 7725cc028855..686bbe62bcb7 100644 --- a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c +++ b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c @@ -1,8 +1,8 @@ -#include "pocketpad.h" +#include "QMK_KEYBOARD_H" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - KEYMAP( + LAYOUT( KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ENTER, diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json index 9f402493a310..573bd6382edd 100644 --- a/keyboards/butterkeebs/pocketpad/info.json +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -28,9 +28,6 @@ "cols": ["F1", "C7", "D5", "B7"], "rows": ["F7", "F6", "F5", "F4", "B1"] }, - "mouse_key": { - "enabled": true - }, "processor": "atmega32u4", "bootloader": "atmel-dfu", From fe91e9d12d4f253b6c28cfdfce6586aff97b2bd4 Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Wed, 22 Mar 2023 17:31:32 +0000 Subject: [PATCH 09/15] Added GPL 2 License --- keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c index 686bbe62bcb7..15d06580a41a 100644 --- a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c +++ b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c @@ -1,3 +1,5 @@ +// ButterKeebs +// SPDX-License-Identifier: GPL-2.0+ #include "QMK_KEYBOARD_H" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From ecb2f43d4abf311c2e7f31fde518596b4234a73e Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Wed, 22 Mar 2023 18:01:32 +0000 Subject: [PATCH 10/15] Update info.json --- keyboards/butterkeebs/pocketpad/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/butterkeebs/pocketpad/info.json b/keyboards/butterkeebs/pocketpad/info.json index 829e64d6092a..96adda2cee01 100644 --- a/keyboards/butterkeebs/pocketpad/info.json +++ b/keyboards/butterkeebs/pocketpad/info.json @@ -1,5 +1,5 @@ { - "manufacturer": "ButterKeebs", + "manufacturer": "ButterKeebs", "keyboard_name": "PocketPad", "maintainer": "qmk", "diode_direction": "ROW2COL", From 8a7ad6f263bc872d004d4441b6ca7b9f937aba20 Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Wed, 22 Mar 2023 18:21:24 +0000 Subject: [PATCH 11/15] Update keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c index 15d06580a41a..63476f045946 100644 --- a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c +++ b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c @@ -1,6 +1,6 @@ // ButterKeebs // SPDX-License-Identifier: GPL-2.0+ -#include "QMK_KEYBOARD_H" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From fff154300541bd5fd8680d13096347cca1c87b30 Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Wed, 22 Mar 2023 18:29:27 +0000 Subject: [PATCH 12/15] Delete keyboards/ButterKeebs directory --- .../ButterKeebs/PocketPad/keymaps/default/keymap.c | 13 ------------- keyboards/ButterKeebs/PocketPad/rules.mk | 1 - 2 files changed, 14 deletions(-) delete mode 100644 keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c delete mode 100644 keyboards/ButterKeebs/PocketPad/rules.mk diff --git a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c b/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c deleted file mode 100644 index 63476f045946..000000000000 --- a/keyboards/ButterKeebs/PocketPad/keymaps/default/keymap.c +++ /dev/null @@ -1,13 +0,0 @@ -// ButterKeebs -// SPDX-License-Identifier: GPL-2.0+ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - LAYOUT( - KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, - KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, - KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ENTER, - KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_DOT, - KC_F, KC_KP_0) -}; \ No newline at end of file diff --git a/keyboards/ButterKeebs/PocketPad/rules.mk b/keyboards/ButterKeebs/PocketPad/rules.mk deleted file mode 100644 index c628fc7d0fe7..000000000000 --- a/keyboards/ButterKeebs/PocketPad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally blank From b98e11c517b1ca47a69b273cdd0f55191a294542 Mon Sep 17 00:00:00 2001 From: butterkeebs Date: Wed, 22 Mar 2023 18:37:25 +0000 Subject: [PATCH 13/15] readded keymap.c and rules.mk --- .../butterkeebs/pocketpad/keymaps/default/keymap.c | 14 ++++++++++++++ keyboards/butterkeebs/pocketpad/rules.mk | 1 + 2 files changed, 15 insertions(+) create mode 100644 keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c create mode 100644 keyboards/butterkeebs/pocketpad/rules.mk diff --git a/keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c b/keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c new file mode 100644 index 000000000000..0591fde1406c --- /dev/null +++ b/keyboards/butterkeebs/pocketpad/keymaps/default/keymap.c @@ -0,0 +1,14 @@ +// ButterKeebs +// SPDX-License-Identifier: GPL-2.0+ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + LAYOUT( + KC_NUM_LOCK, KC_KP_SLASH, KC_KP_ASTERISK, KC_KP_MINUS, + KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_PLUS, + KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_ENTER, + KC_KP_1, KC_KP_2, KC_KP_3, KC_KP_DOT, + KC_F, KC_KP_0) +}; \ No newline at end of file diff --git a/keyboards/butterkeebs/pocketpad/rules.mk b/keyboards/butterkeebs/pocketpad/rules.mk new file mode 100644 index 000000000000..f886ea2e8ecd --- /dev/null +++ b/keyboards/butterkeebs/pocketpad/rules.mk @@ -0,0 +1 @@ +# This file intentionally blank \ No newline at end of file From 2b027a9050335ff032f2b99418c882720cf7427a Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Thu, 23 Mar 2023 15:37:34 +0000 Subject: [PATCH 14/15] Create readme.md --- keyboards/butterkeebs/pocketpad/readme.md | 28 +++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 keyboards/butterkeebs/pocketpad/readme.md diff --git a/keyboards/butterkeebs/pocketpad/readme.md b/keyboards/butterkeebs/pocketpad/readme.md new file mode 100644 index 000000000000..23bd7ba67041 --- /dev/null +++ b/keyboards/butterkeebs/pocketpad/readme.md @@ -0,0 +1,28 @@ +

PocketPad

+ + +The PocketPad is a small 18 key macropad with a numpad like layout that takes inspiration from the PocketType. + +Keyboard Maintainer: ButterKeebs
+Hardware Supported: ATMega32u4 based Elite-C pin compatible MCUs. 6mm square TH switches (link here soon)
+Hardware Availability: Links to storefront when available

+Make example for this keyboard (after setting up your build environment): + +``` +make butterkeebs/pocketpad:default +``` + +Flashing example for this keyboard: + +``` +make butterkeebs/pocketpad:default:flash +``` + +See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. + +Bootloader
+Enter the bootloader in 3 ways: + +Physical reset button: Briefly press the button on the back of the PCB, if using PCB version 1, then hold a screwdriver to the third pin down on the right side of the MCU. + +Keycode in layout: Press the key mapped to QK_BOOT if it is available From 8df9ec197b5db24ef3c08fe4230d1831f0bcb151 Mon Sep 17 00:00:00 2001 From: butterkeebs <124812866+butterkeebs@users.noreply.github.com> Date: Sat, 25 Mar 2023 14:46:51 +0000 Subject: [PATCH 15/15] Update readme.md --- keyboards/butterkeebs/pocketpad/readme.md | 33 +++++++++++------------ 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/keyboards/butterkeebs/pocketpad/readme.md b/keyboards/butterkeebs/pocketpad/readme.md index 23bd7ba67041..0af8b7a3c6d4 100644 --- a/keyboards/butterkeebs/pocketpad/readme.md +++ b/keyboards/butterkeebs/pocketpad/readme.md @@ -1,28 +1,27 @@ -

PocketPad

+# PocketPad +![PocketPad](https://tinyurl.com/2hffvnvb) -The PocketPad is a small 18 key macropad with a numpad like layout that takes inspiration from the PocketType. +*The PocketPad is a tiny 18 key macropad/numpad using 6mm tactile switches.* -Keyboard Maintainer: ButterKeebs
-Hardware Supported: ATMega32u4 based Elite-C pin compatible MCUs. 6mm square TH switches (link here soon)
-Hardware Availability: Links to storefront when available

-Make example for this keyboard (after setting up your build environment): +* Keyboard Maintainer: [ButterKeebs](https://github.com/butterkeebs) +* Hardware Supported: *Supports current V1.0.0 PocketPad PCB and Elite C / pin compatible MCU boards.* +* Hardware Availability: *Currently not for sale* -``` -make butterkeebs/pocketpad:default -``` +Make example for this keyboard (after setting up your build environment): + + make butterkeebs/pocketpad:default Flashing example for this keyboard: -``` -make butterkeebs/pocketpad:default:flash -``` + make butterkeebs/pocketpad:default:flash -See the build environment setup and the make instructions for more information. Brand new to QMK? Start with our Complete Newbs Guide. +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). -Bootloader
-Enter the bootloader in 3 ways: +## Bootloader -Physical reset button: Briefly press the button on the back of the PCB, if using PCB version 1, then hold a screwdriver to the third pin down on the right side of the MCU. +Enter the bootloader in 3 ways: -Keycode in layout: Press the key mapped to QK_BOOT if it is available +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB. (Not available on Revision 1.0.0 PCB) +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available