From d6466356cddbd864edd40b9eb083fd8c090c2f29 Mon Sep 17 00:00:00 2001 From: Thomas Holt Date: Fri, 25 Sep 2020 10:50:25 -0400 Subject: [PATCH 01/32] Add soy20 PCB adds default and VIA Keymaps for soy20 pcb by DrewKeys --- keyboards/soy20/config.h | 60 ++++++++++++++++++ keyboards/soy20/info.json | 34 +++++++++++ keyboards/soy20/keymaps/default/keymap.c | 77 ++++++++++++++++++++++++ keyboards/soy20/keymaps/via/keymap.c | 77 ++++++++++++++++++++++++ keyboards/soy20/keymaps/via/rules.mk | 2 + keyboards/soy20/readme.md | 13 ++++ keyboards/soy20/rules.mk | 60 ++++++++++++++++++ keyboards/soy20/soy20.c | 1 + keyboards/soy20/soy20.h | 22 +++++++ 9 files changed, 346 insertions(+) create mode 100644 keyboards/soy20/config.h create mode 100644 keyboards/soy20/info.json create mode 100644 keyboards/soy20/keymaps/default/keymap.c create mode 100644 keyboards/soy20/keymaps/via/keymap.c create mode 100644 keyboards/soy20/keymaps/via/rules.mk create mode 100644 keyboards/soy20/readme.md create mode 100644 keyboards/soy20/rules.mk create mode 100644 keyboards/soy20/soy20.c create mode 100644 keyboards/soy20/soy20.h diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h new file mode 100644 index 000000000000..ef5123e498c5 --- /dev/null +++ b/keyboards/soy20/config.h @@ -0,0 +1,60 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4452 // "DR" short for DrewKeys +#define PRODUCT_ID 0x534f // "SO" short for Soy +#define DEVICE_VER 0x0001 +#define MANUFACTURER drewkeys +#define PRODUCT soy20 +#define DESCRIPTION soy20 4x5 numpad + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 4 + +/* key matrix pins */ +#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } +#define MATRIX_COL_PINS { B5, B6, B7, C7 } +#define UNUSED_PINS + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* 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 diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json new file mode 100644 index 000000000000..548bc451357b --- /dev/null +++ b/keyboards/soy20/info.json @@ -0,0 +1,34 @@ +{ + "keyboard_name": "Soy20", + "url": "", + "maintainer": "twholt", + "width": 4, + "height": 5, + "layouts": { + "LAYOUT": { + "key_count": 20, + "layout": [ + {"label":"K00 (B0,B5)", "x":0, "y":0}, + {"label":"K01 (B0,B6)", "x":1, "y":0}, + {"label":"K02 (B0,B7)", "x":2, "y":0}, + {"label":"K03 (B0,C7)", "x":3, "y":0}, + {"label":"K10 (B1,B5)", "x":0, "y":1}, + {"label":"K11 (B1,B6)", "x":1, "y":1}, + {"label":"K12 (B1,B7)", "x":2, "y":1}, + {"label":"K13 (B1,C7)", "x":3, "y":1}, + {"label":"K20 (B2,B5)", "x":0, "y":2}, + {"label":"K21 (B2,B6)", "x":1, "y":2}, + {"label":"K22 (B2,B7)", "x":2, "y":2}, + {"label":"K23 (B2,C7)", "x":3, "y":2}, + {"label":"K30 (B3,B5)", "x":0, "y":3}, + {"label":"K31 (B3,B6)", "x":1, "y":3}, + {"label":"K32 (B3,B7)", "x":2, "y":3}, + {"label":"K33 (B3,C7)", "x":3, "y":3}, + {"label":"K40 (B4,B5)", "x":0, "y":4}, + {"label":"K41 (B4,B6)", "x":1, "y":4}, + {"label":"K42 (B4,B7)", "x":2, "y":4}, + {"label":"K43 (B4,C7)", "x":3, "y":4} + ] + } + } +} diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c new file mode 100644 index 000000000000..2a0fdbcf5e12 --- /dev/null +++ b/keyboards/soy20/keymaps/default/keymap.c @@ -0,0 +1,77 @@ +#include "soy20.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_PMNS, KC_PAST, KC_PSLS, MO(1), + KC_PPLS, KC_P9, KC_P8, KC_P7, + KC_TAB, KC_P5, KC_P6, KC_P4, + KC_PENT, KC_P3, KC_P2, KC_P1, + KC_DEL, KC_SCLN, KC_PDOT, KC_P0), + + [1] = LAYOUT( + KC_NLCK, KC_PSCR, 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, RESET), + + [2] = LAYOUT( + 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, KC_TRNS, KC_TRNS), + + [3] = LAYOUT( + 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, KC_TRNS, KC_TRNS), + +}; + +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 { + + } + +} diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c new file mode 100644 index 000000000000..2a0fdbcf5e12 --- /dev/null +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -0,0 +1,77 @@ +#include "soy20.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_PMNS, KC_PAST, KC_PSLS, MO(1), + KC_PPLS, KC_P9, KC_P8, KC_P7, + KC_TAB, KC_P5, KC_P6, KC_P4, + KC_PENT, KC_P3, KC_P2, KC_P1, + KC_DEL, KC_SCLN, KC_PDOT, KC_P0), + + [1] = LAYOUT( + KC_NLCK, KC_PSCR, 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, RESET), + + [2] = LAYOUT( + 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, KC_TRNS, KC_TRNS), + + [3] = LAYOUT( + 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, KC_TRNS, KC_TRNS), + +}; + +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 { + + } + +} diff --git a/keyboards/soy20/keymaps/via/rules.mk b/keyboards/soy20/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/soy20/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/soy20/readme.md b/keyboards/soy20/readme.md new file mode 100644 index 000000000000..6ce4552b2ccd --- /dev/null +++ b/keyboards/soy20/readme.md @@ -0,0 +1,13 @@ +# Soy20 + +A 4x5 keypad created by drewkeys + +Keyboard Maintainer: [Friend-Or-F0H](https://github.com/Friend-Or-F0H) +Hardware Supported: drewkeys Soy20 PCB +Hardware Availability: Limited GB + +Make example for this keyboard (after setting up your build environment): + + make soy20: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/soy20/rules.mk b/keyboards/soy20/rules.mk new file mode 100644 index 000000000000..239bc6826e1a --- /dev/null +++ b/keyboards/soy20/rules.mk @@ -0,0 +1,60 @@ +# MCU name +MCU = atmega32u2 + +# 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 = yes # 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 # Audio output on port C6 +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +MIDI_ENABLE = no # MIDI support +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches diff --git a/keyboards/soy20/soy20.c b/keyboards/soy20/soy20.c new file mode 100644 index 000000000000..0976d52238c2 --- /dev/null +++ b/keyboards/soy20/soy20.c @@ -0,0 +1 @@ +#include "soy20.h" diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h new file mode 100644 index 000000000000..e39cac26c8c3 --- /dev/null +++ b/keyboards/soy20/soy20.h @@ -0,0 +1,22 @@ +#ifndef SOY20_H +#define SOY20_H + +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + K00, K01, K02, K03, \ + K10, K11, K12, K13, \ + K20, K21, K22, K23, \ + K30, K31, K32, K33, \ + K40, K41, K42, K43 \ +) { \ + { K00, K01, K02, K03 }, \ + { K10, K11, K12, K13 }, \ + { K20, K21, K22, K23 }, \ + { K30, K31, K32, K33 }, \ + { K40, K41, K42, K43 } \ +} + +#endif From 1b100aaae48a359ec6b234e3ec9b701dc7647b25 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:31:25 -0400 Subject: [PATCH 02/32] Update keyboards/soy20/config.h Co-authored-by: ridingqwerty --- keyboards/soy20/config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index ef5123e498c5..daa32ff6bc90 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -32,7 +32,7 @@ #endif /* Set 0 if debouncing isn't needed */ -#define DEBOUNCING_DELAY 5 +#define DEBOUNCE 5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE From 0fb69b7d78b9ef9f7fe2a4c300de87189f42bd08 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:31:48 -0400 Subject: [PATCH 03/32] Update keyboards/soy20/config.h Co-authored-by: ridingqwerty --- keyboards/soy20/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index daa32ff6bc90..9c4b1fd6eabd 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -56,5 +56,3 @@ #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #endif - -#endif From 660bb38fa8aa0ba2780b0bdcbc3f6cdf3ddabf3f Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:32:11 -0400 Subject: [PATCH 04/32] Update keyboards/soy20/rules.mk Co-authored-by: ridingqwerty --- keyboards/soy20/rules.mk | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk index 239bc6826e1a..8d801749f153 100644 --- a/keyboards/soy20/rules.mk +++ b/keyboards/soy20/rules.mk @@ -44,17 +44,15 @@ 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) +BOOTMAGIC_ENABLE = yes # 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 = yes # 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 +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 # Audio output on port C6 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -MIDI_ENABLE = no # MIDI support -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches +AUDIO_ENABLE = no # Audio output on port C6 +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID From 20891c3b14fcb7f7cdf5097d73549332aaa72eb1 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:33:04 -0400 Subject: [PATCH 05/32] Update keyboards/soy20/soy20.h Co-authored-by: ridingqwerty --- keyboards/soy20/soy20.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h index e39cac26c8c3..cd420ebed7e7 100644 --- a/keyboards/soy20/soy20.h +++ b/keyboards/soy20/soy20.h @@ -1,6 +1,3 @@ -#ifndef SOY20_H -#define SOY20_H - #pragma once #include "quantum.h" @@ -18,5 +15,3 @@ { K30, K31, K32, K33 }, \ { K40, K41, K42, K43 } \ } - -#endif From 9ff8534185e7821b25cd6d88a88a74b825e0597b Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:33:30 -0400 Subject: [PATCH 06/32] Update keyboards/soy20/keymaps/via/keymap.c Co-authored-by: ridingqwerty --- keyboards/soy20/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c index 2a0fdbcf5e12..e15af1a22973 100644 --- a/keyboards/soy20/keymaps/via/keymap.c +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -#include "soy20.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 833a8e4dfad7904648306756772aebdc7b303e0c Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:34:24 -0400 Subject: [PATCH 07/32] Update keyboards/soy20/keymaps/via/keymap.c Agreed. It was left over from the original file provided by the board makers original configurator file. Co-authored-by: ridingqwerty --- keyboards/soy20/keymaps/via/keymap.c | 44 ---------------------------- 1 file changed, 44 deletions(-) diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c index e15af1a22973..fb13950a4cba 100644 --- a/keyboards/soy20/keymaps/via/keymap.c +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -31,47 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -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 { - - } - -} From 242c67d6edb7241e062d838f7e4f2f005d9e549e Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:34:59 -0400 Subject: [PATCH 08/32] Update keyboards/soy20/rules.mk Co-authored-by: ridingqwerty --- keyboards/soy20/rules.mk | 48 ++++++++-------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk index 8d801749f153..6234b542c7e4 100644 --- a/keyboards/soy20/rules.mk +++ b/keyboards/soy20/rules.mk @@ -1,45 +1,15 @@ # MCU name MCU = atmega32u2 -# 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 - +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu # Build Options # comment out to disable the options. From 274133fcbb006a9c3e7389b9dd10cb918790f63d Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:35:21 -0400 Subject: [PATCH 09/32] Update keyboards/soy20/config.h Co-authored-by: ridingqwerty --- keyboards/soy20/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 9c4b1fd6eabd..3766cd59d47d 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -1,6 +1,3 @@ -#ifndef CONFIG_H -#define CONFIG_H - #pragma once #include "config_common.h" From 8236bb28a545b5b876bd8dc63163a4ace2ace806 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:35:34 -0400 Subject: [PATCH 10/32] Update keyboards/soy20/config.h Co-authored-by: ridingqwerty --- keyboards/soy20/config.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 3766cd59d47d..d1c5286a2bf2 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -37,15 +37,6 @@ /* 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 From ee843bfc3cd67191101053ea09ca735f04087481 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Fri, 25 Sep 2020 15:35:50 -0400 Subject: [PATCH 11/32] Update keyboards/soy20/config.h Co-authored-by: ridingqwerty --- keyboards/soy20/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index d1c5286a2bf2..4da8d784ef59 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -8,7 +8,6 @@ #define DEVICE_VER 0x0001 #define MANUFACTURER drewkeys #define PRODUCT soy20 -#define DESCRIPTION soy20 4x5 numpad /* key matrix size */ #define MATRIX_ROWS 5 From c6e9ef7cb85c55d578d9266fc024e0764ac085d3 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Mon, 28 Sep 2020 09:37:46 -0400 Subject: [PATCH 12/32] Update keyboards/soy20/keymaps/default/keymap.c Co-authored-by: ridingqwerty --- keyboards/soy20/keymaps/default/keymap.c | 44 ------------------------ 1 file changed, 44 deletions(-) diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c index 2a0fdbcf5e12..3c00b06af4ea 100644 --- a/keyboards/soy20/keymaps/default/keymap.c +++ b/keyboards/soy20/keymaps/default/keymap.c @@ -31,47 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -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 { - - } - -} From 4fa872a8833269289b8746ae2be527728f86b694 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Mon, 28 Sep 2020 09:38:08 -0400 Subject: [PATCH 13/32] Update keyboards/soy20/keymaps/default/keymap.c Co-authored-by: ridingqwerty --- keyboards/soy20/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c index 3c00b06af4ea..fb13950a4cba 100644 --- a/keyboards/soy20/keymaps/default/keymap.c +++ b/keyboards/soy20/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include "soy20.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 8f15137a41c581428b0d7b05c151d8c94000b8eb Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:46:08 -0400 Subject: [PATCH 14/32] Update keyboards/soy20/info.json Co-authored-by: Ryan --- keyboards/soy20/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json index 548bc451357b..0727a45fa88f 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/info.json @@ -6,7 +6,6 @@ "height": 5, "layouts": { "LAYOUT": { - "key_count": 20, "layout": [ {"label":"K00 (B0,B5)", "x":0, "y":0}, {"label":"K01 (B0,B6)", "x":1, "y":0}, From 9355539bcdc3743b057a9f090f8d12d81786b9f0 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:47:14 -0400 Subject: [PATCH 15/32] Update keyboards/soy20/readme.md Co-authored-by: Ryan --- keyboards/soy20/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/soy20/readme.md b/keyboards/soy20/readme.md index 6ce4552b2ccd..1ac310f79940 100644 --- a/keyboards/soy20/readme.md +++ b/keyboards/soy20/readme.md @@ -2,9 +2,9 @@ A 4x5 keypad created by drewkeys -Keyboard Maintainer: [Friend-Or-F0H](https://github.com/Friend-Or-F0H) -Hardware Supported: drewkeys Soy20 PCB -Hardware Availability: Limited GB +* Keyboard Maintainer: [Friend-Or-F0H](https://github.com/Friend-Or-F0H) +* Hardware Supported: drewkeys Soy20 PCB +* Hardware Availability: Limited GB Make example for this keyboard (after setting up your build environment): From b0c3d7e85f23ea07ef4bfe118533d11b9a39891c Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:47:58 -0400 Subject: [PATCH 16/32] Update keyboards/soy20/rules.mk Co-authored-by: Ryan --- keyboards/soy20/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk index 6234b542c7e4..e20cb085ee86 100644 --- a/keyboards/soy20/rules.mk +++ b/keyboards/soy20/rules.mk @@ -12,7 +12,7 @@ MCU = atmega32u2 BOOTLOADER = atmel-dfu # Build Options -# comment out to disable the options. +# change yes to no to disable # BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys From afbe9725ead2a58427fc42326fdfe495f6a70125 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:51:32 -0400 Subject: [PATCH 17/32] Update keyboards/soy20/rules.mk Co-authored-by: Ryan --- keyboards/soy20/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk index e20cb085ee86..9607bca64296 100644 --- a/keyboards/soy20/rules.mk +++ b/keyboards/soy20/rules.mk @@ -2,13 +2,6 @@ MCU = atmega32u2 # Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp BOOTLOADER = atmel-dfu # Build Options From d635d62f601ca0eca9d2bb17edee42e04715330c Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:52:19 -0400 Subject: [PATCH 18/32] Update keyboards/soy20/rules.mk Co-authored-by: Ryan --- keyboards/soy20/rules.mk | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/keyboards/soy20/rules.mk b/keyboards/soy20/rules.mk index 9607bca64296..06f81dad8c19 100644 --- a/keyboards/soy20/rules.mk +++ b/keyboards/soy20/rules.mk @@ -7,15 +7,18 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # 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 = yes # 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 # Audio output on port C6 -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -UNICODE_ENABLE = no # Unicode -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +BOOTMAGIC_ENABLE = full # 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 = yes # 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 = 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 + +LAYOUTS = ortho_5x4 From 8e1b86f72f4fbc3ecfd61859250cfa5b7f619372 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:52:31 -0400 Subject: [PATCH 19/32] Update keyboards/soy20/soy20.h Co-authored-by: Ryan --- keyboards/soy20/soy20.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h index cd420ebed7e7..6c741757cb99 100644 --- a/keyboards/soy20/soy20.h +++ b/keyboards/soy20/soy20.h @@ -2,7 +2,7 @@ #include "quantum.h" -#define LAYOUT( \ +#define LAYOUT_ortho_5x4( \ K00, K01, K02, K03, \ K10, K11, K12, K13, \ K20, K21, K22, K23, \ From 0df38681f65719bd036ef31a9b2f7f7e4c9be895 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:52:42 -0400 Subject: [PATCH 20/32] Update keyboards/soy20/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c index fb13950a4cba..d530737e1cb6 100644 --- a/keyboards/soy20/keymaps/default/keymap.c +++ b/keyboards/soy20/keymaps/default/keymap.c @@ -2,7 +2,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_5x4( KC_PMNS, KC_PAST, KC_PSLS, MO(1), KC_PPLS, KC_P9, KC_P8, KC_P7, KC_TAB, KC_P5, KC_P6, KC_P4, From 81760c31b4b2f47fd2aef1795008368dd9ddc5b5 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:52:51 -0400 Subject: [PATCH 21/32] Update keyboards/soy20/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c index d530737e1cb6..a6246b6b2ef6 100644 --- a/keyboards/soy20/keymaps/default/keymap.c +++ b/keyboards/soy20/keymaps/default/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PENT, KC_P3, KC_P2, KC_P1, KC_DEL, KC_SCLN, KC_PDOT, KC_P0), - [1] = LAYOUT( + [1] = LAYOUT_ortho_5x4( KC_NLCK, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 7604d20656b09ba02d8b5c2c15d928ec28d6adab Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:53:34 -0400 Subject: [PATCH 22/32] Update keyboards/soy20/keymaps/default/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/default/keymap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/soy20/keymaps/default/keymap.c b/keyboards/soy20/keymaps/default/keymap.c index a6246b6b2ef6..0ab505eeb8cb 100644 --- a/keyboards/soy20/keymaps/default/keymap.c +++ b/keyboards/soy20/keymaps/default/keymap.c @@ -16,18 +16,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET), - [2] = LAYOUT( - 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, KC_TRNS, KC_TRNS), - - [3] = LAYOUT( - 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, KC_TRNS, KC_TRNS), - }; From 5c264e819b8bd4151ad456646b014930d59f5926 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:53:41 -0400 Subject: [PATCH 23/32] Update keyboards/soy20/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c index fb13950a4cba..fdc8f86ce1fc 100644 --- a/keyboards/soy20/keymaps/via/keymap.c +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_PENT, KC_P3, KC_P2, KC_P1, KC_DEL, KC_SCLN, KC_PDOT, KC_P0), - [1] = LAYOUT( + [1] = LAYOUT_ortho_5x4( KC_NLCK, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From da2dbfb9cf579f90b04d5a9e29aab4a4bcf807e0 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:54:22 -0400 Subject: [PATCH 24/32] Update keyboards/soy20/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c index fdc8f86ce1fc..ae6469cfbd3f 100644 --- a/keyboards/soy20/keymaps/via/keymap.c +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET), - [2] = LAYOUT( + [2] = LAYOUT_ortho_5x4( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From d6586dfb1f68853b47812796ed40fdca96c28d3c Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:54:28 -0400 Subject: [PATCH 25/32] Update keyboards/soy20/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c index ae6469cfbd3f..8ce724b80378 100644 --- a/keyboards/soy20/keymaps/via/keymap.c +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [3] = LAYOUT( + [3] = LAYOUT_ortho_5x4( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 7ed9a0ee5b5346303ae8aea409e86d612ff6401d Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:54:44 -0400 Subject: [PATCH 26/32] Update keyboards/soy20/keymaps/via/keymap.c Co-authored-by: Ryan --- keyboards/soy20/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/keymaps/via/keymap.c b/keyboards/soy20/keymaps/via/keymap.c index 8ce724b80378..fde63da13aa8 100644 --- a/keyboards/soy20/keymaps/via/keymap.c +++ b/keyboards/soy20/keymaps/via/keymap.c @@ -2,7 +2,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_5x4( KC_PMNS, KC_PAST, KC_PSLS, MO(1), KC_PPLS, KC_P9, KC_P8, KC_P7, KC_TAB, KC_P5, KC_P6, KC_P4, From b29673edf6e75631f467bd6bb8282d6f4649c940 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 14:54:54 -0400 Subject: [PATCH 27/32] Update keyboards/soy20/info.json Co-authored-by: Ryan --- keyboards/soy20/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/soy20/info.json b/keyboards/soy20/info.json index 0727a45fa88f..ea1ab2e7f9ef 100644 --- a/keyboards/soy20/info.json +++ b/keyboards/soy20/info.json @@ -5,7 +5,7 @@ "width": 4, "height": 5, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_5x4": { "layout": [ {"label":"K00 (B0,B5)", "x":0, "y":0}, {"label":"K01 (B0,B6)", "x":1, "y":0}, From 46dd62009df2ec361fb3a285e2a09b972f67559e Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 19:16:56 -0400 Subject: [PATCH 28/32] Update keyboards/soy20/config.h Co-authored-by: Joel Challis --- keyboards/soy20/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 4da8d784ef59..d971c4f3ca4c 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -21,12 +21,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* number of backlight levels */ - -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_LEVELS 3 -#endif - /* Set 0 if debouncing isn't needed */ #define DEBOUNCE 5 From 82c64e3969acbba9a7b274018d42e064993e9d24 Mon Sep 17 00:00:00 2001 From: Thomas Holt Date: Thu, 1 Oct 2020 19:22:56 -0400 Subject: [PATCH 29/32] Updating *.c & *.h files with GPL3 license --- keyboards/soy20/config.h | 16 +++++ .../soy20/keymaps/Friend_Or_F0H/keymap.c | 69 +++++++++++++++++++ .../soy20/keymaps/Friend_Or_F0H/rules.mk | 2 + keyboards/soy20/soy20.c | 17 +++++ keyboards/soy20/soy20.h | 16 +++++ 5 files changed, 120 insertions(+) create mode 100644 keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c create mode 100644 keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index d971c4f3ca4c..1e73a40edad2 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -1,3 +1,19 @@ +{{ Soy20 PCB}} +Copyright (C) {{ 2020 }} {{ Drewkeys }} + +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 3 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" diff --git a/keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c b/keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c new file mode 100644 index 000000000000..364a2b314401 --- /dev/null +++ b/keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c @@ -0,0 +1,69 @@ +#include "soy20.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT( + KC_PMNS, KC_PAST, KC_PSLS, TG(1), + KC_PPLS, KC_P9, KC_P8, KC_P7, + KC_PPLS, KC_P6, KC_P5, KC_P4, + KC_PENT, KC_P3, KC_P2, KC_P1, + KC_PENT, KC_PDOT, KC_P0, KC_P0), + + [1] = LAYOUT( + KC_TRNS, KC_CALC, KC_PSCR, MO(2), + KC_TRNS, KC_PGUP, KC_UP, KC_HOME, + KC_TRNS, KC_RGHT, KC_NO, KC_LEFT, + KC_TRNS, KC_PGDN, KC_DOWN, KC_END, + KC_TRNS, KC_DEL, KC_INS, KC_INS), + + [2] = LAYOUT( + RESET, 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, KC_TRNS), + + [3] = LAYOUT( + 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, KC_TRNS, KC_TRNS), + +}; + + +void led_set_user(uint8_t usb_led) { + + if (usb_led & (1 << USB_LED_NUM_LOCK)) { + register_code(KC_NUMLOCK); + unregister_code(KC_NUMLOCK); + } 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 { + + } + +} diff --git a/keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk b/keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk new file mode 100644 index 000000000000..43061db1dd46 --- /dev/null +++ b/keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/soy20/soy20.c b/keyboards/soy20/soy20.c index 0976d52238c2..74698b3988ad 100644 --- a/keyboards/soy20/soy20.c +++ b/keyboards/soy20/soy20.c @@ -1 +1,18 @@ +{{ Soy20 PCB}} +Copyright (C) {{ 2020 }} {{ Drewkeys }} + +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 3 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 "soy20.h" diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h index 6c741757cb99..b8e5b3d7fbcb 100644 --- a/keyboards/soy20/soy20.h +++ b/keyboards/soy20/soy20.h @@ -1,3 +1,19 @@ +{{ Soy20 PCB}} +Copyright (C) {{ 2020 }} {{ Drewkeys }} + +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 3 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" From a1e3f3e7f594506352142009e25f4102ad36e244 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 19:26:08 -0400 Subject: [PATCH 30/32] Delete rules.mk --- keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk diff --git a/keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk b/keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk deleted file mode 100644 index 43061db1dd46..000000000000 --- a/keyboards/soy20/keymaps/Friend_Or_F0H/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file From e0d9bb71726c24040c861512211f8f40522cc027 Mon Sep 17 00:00:00 2001 From: Thomas Holt-Ronczy Date: Thu, 1 Oct 2020 19:26:16 -0400 Subject: [PATCH 31/32] Delete keymap.c --- .../soy20/keymaps/Friend_Or_F0H/keymap.c | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c diff --git a/keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c b/keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c deleted file mode 100644 index 364a2b314401..000000000000 --- a/keyboards/soy20/keymaps/Friend_Or_F0H/keymap.c +++ /dev/null @@ -1,69 +0,0 @@ -#include "soy20.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - KC_PMNS, KC_PAST, KC_PSLS, TG(1), - KC_PPLS, KC_P9, KC_P8, KC_P7, - KC_PPLS, KC_P6, KC_P5, KC_P4, - KC_PENT, KC_P3, KC_P2, KC_P1, - KC_PENT, KC_PDOT, KC_P0, KC_P0), - - [1] = LAYOUT( - KC_TRNS, KC_CALC, KC_PSCR, MO(2), - KC_TRNS, KC_PGUP, KC_UP, KC_HOME, - KC_TRNS, KC_RGHT, KC_NO, KC_LEFT, - KC_TRNS, KC_PGDN, KC_DOWN, KC_END, - KC_TRNS, KC_DEL, KC_INS, KC_INS), - - [2] = LAYOUT( - RESET, 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, KC_TRNS), - - [3] = LAYOUT( - 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, KC_TRNS, KC_TRNS), - -}; - - -void led_set_user(uint8_t usb_led) { - - if (usb_led & (1 << USB_LED_NUM_LOCK)) { - register_code(KC_NUMLOCK); - unregister_code(KC_NUMLOCK); - } 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 { - - } - -} From 4de0158e0665d4ecb86471feb5e7b0f6491304c4 Mon Sep 17 00:00:00 2001 From: Thomas Holt Date: Fri, 2 Oct 2020 11:37:30 -0400 Subject: [PATCH 32/32] Corrected Header Comments --- keyboards/soy20/config.h | 4 ++-- keyboards/soy20/soy20.c | 4 ++-- keyboards/soy20/soy20.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/soy20/config.h b/keyboards/soy20/config.h index 1e73a40edad2..932b129f8422 100644 --- a/keyboards/soy20/config.h +++ b/keyboards/soy20/config.h @@ -1,4 +1,4 @@ -{{ Soy20 PCB}} +/* Soy20 PCB}} Copyright (C) {{ 2020 }} {{ Drewkeys }} This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ 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 . +along with this program. If not, see .*/ #pragma once diff --git a/keyboards/soy20/soy20.c b/keyboards/soy20/soy20.c index 74698b3988ad..1b259e8d887f 100644 --- a/keyboards/soy20/soy20.c +++ b/keyboards/soy20/soy20.c @@ -1,4 +1,4 @@ -{{ Soy20 PCB}} +/* Soy20 PCB}} Copyright (C) {{ 2020 }} {{ Drewkeys }} This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ 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 . +along with this program. If not, see .*/ #include "soy20.h" diff --git a/keyboards/soy20/soy20.h b/keyboards/soy20/soy20.h index b8e5b3d7fbcb..c29b04f93d07 100644 --- a/keyboards/soy20/soy20.h +++ b/keyboards/soy20/soy20.h @@ -1,4 +1,4 @@ -{{ Soy20 PCB}} +/* Soy20 PCB}} Copyright (C) {{ 2020 }} {{ Drewkeys }} This program is free software: you can redistribute it and/or modify @@ -12,7 +12,7 @@ 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 . +along with this program. If not, see .*/ #pragma once