From ae0cb488ac6dbb56b29ecb5af1cb489cff3bd873 Mon Sep 17 00:00:00 2001 From: Frooastside Date: Thu, 17 Feb 2022 22:17:03 +0100 Subject: [PATCH 01/24] basic implementation of walnut 69% keyboard --- keyboards/frooastboard/walnut_69/config.h | 52 +++ keyboards/frooastboard/walnut_69/info.json | 416 ++++++++++++++++++ .../walnut_69/keymaps/default/keymap.c | 33 ++ .../walnut_69/keymaps/via/config.h | 30 ++ .../walnut_69/keymaps/via/keymap.c | 33 ++ .../walnut_69/keymaps/via/rules.mk | 2 + keyboards/frooastboard/walnut_69/readme.md | 19 + keyboards/frooastboard/walnut_69/rules.mk | 18 + keyboards/frooastboard/walnut_69/walnut_69.c | 17 + keyboards/frooastboard/walnut_69/walnut_69.h | 37 ++ 10 files changed, 657 insertions(+) create mode 100644 keyboards/frooastboard/walnut_69/config.h create mode 100644 keyboards/frooastboard/walnut_69/info.json create mode 100644 keyboards/frooastboard/walnut_69/keymaps/default/keymap.c create mode 100644 keyboards/frooastboard/walnut_69/keymaps/via/config.h create mode 100644 keyboards/frooastboard/walnut_69/keymaps/via/keymap.c create mode 100644 keyboards/frooastboard/walnut_69/keymaps/via/rules.mk create mode 100644 keyboards/frooastboard/walnut_69/readme.md create mode 100644 keyboards/frooastboard/walnut_69/rules.mk create mode 100644 keyboards/frooastboard/walnut_69/walnut_69.c create mode 100644 keyboards/frooastboard/walnut_69/walnut_69.h diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h new file mode 100644 index 000000000000..df55d7ed9985 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/config.h @@ -0,0 +1,52 @@ +/* Copyright 2022 frooastside + * + * 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" + +/* USB Device descriptor parameter */ +#define MANUFACTURER frooastside +#define PRODUCT Frooastboard Walnut + +/* key matrix size */ +#define MATRIX_ROWS 9 +#define MATRIX_COLS 8 + +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 + +#define RGB_DI_PIN B7 +#define RGBLED_NUM 1 + +#define RGBLIGHT_SLEEP + +#define RGBLIGHT_HUE_STEP 8 +#define RGBLIGHT_SAT_STEP 8 +#define RGBLIGHT_VAL_STEP 8 + +#define RGBLIGHT_DEFAULT_HUE 234 + +#define RGBLIGHT_LIMIT_VAL 255 +#define RGBLIGHT_DEFAULT_VAL 190 + +#define RGBLIGHT_EFFECT_RAINBOW_MOOD +#define RGBLIGHT_EFFECT_RAINBOW_SWIRL +#define RGBLIGHT_EFFECT_TWINKLE +#define RGBLIGHT_EFFECT_BREATHING +#define RGBLIGHT_EFFECT_SNAKE + +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2 diff --git a/keyboards/frooastboard/walnut_69/info.json b/keyboards/frooastboard/walnut_69/info.json new file mode 100644 index 000000000000..96693a40b746 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/info.json @@ -0,0 +1,416 @@ +{ + "keyboard_name": "Frooastboard Walnut", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut_69", + "maintainer": "frooastside", + "debounce": 5, + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + { + "label": "Escape", + "x": 0, + "y": 0 + }, + { + "label": "1", + "x": 1, + "y": 0 + }, + { + "label": "2", + "x": 2, + "y": 0 + }, + { + "label": "3", + "x": 3, + "y": 0 + }, + { + "label": "4", + "x": 4, + "y": 0 + }, + { + "label": "5", + "x": 5, + "y": 0 + }, + { + "label": "6", + "x": 6, + "y": 0 + }, + { + "label": "7", + "x": 7, + "y": 0 + }, + { + "label": "8", + "x": 8, + "y": 0 + }, + { + "label": "9", + "x": 9, + "y": 0 + }, + { + "label": "0", + "x": 10, + "y": 0 + }, + { + "label": "-", + "x": 11, + "y": 0 + }, + { + "label": "=", + "x": 12, + "y": 0 + }, + { + "label": "Backspace", + "x": 13, + "y": 0, + "w": 2 + }, + { + "label": "Insert", + "x": 15.5, + "y": 0 + }, + { + "label": "Home", + "x": 16.5, + "y": 0 + }, + { + "label": "Page Up", + "x": 17.5, + "y": 0 + }, + { + "label": "Tab", + "x": 0, + "y": 1, + "w": 1.5 + }, + { + "label": "Q", + "x": 1.5, + "y": 1 + }, + { + "label": "W", + "x": 2.5, + "y": 1 + }, + { + "label": "E", + "x": 3.5, + "y": 1 + }, + { + "label": "R", + "x": 4.5, + "y": 1 + }, + { + "label": "T", + "x": 5.5, + "y": 1 + }, + { + "label": "Z", + "x": 6.5, + "y": 1 + }, + { + "label": "U", + "x": 7.5, + "y": 1 + }, + { + "label": "I", + "x": 8.5, + "y": 1 + }, + { + "label": "O", + "x": 9.5, + "y": 1 + }, + { + "label": "P", + "x": 10.5, + "y": 1 + }, + { + "label": "[", + "x": 11.5, + "y": 1 + }, + { + "label": "]", + "x": 12.5, + "y": 1 + }, + { + "label": "Enter", + "x": 13.75, + "y": 1, + "w": 1.25, + "h": 2 + }, + { + "label": "Delete", + "x": 15.5, + "y": 1 + }, + { + "label": "End", + "x": 16.5, + "y": 1 + }, + { + "label": "Page Down", + "x": 17.5, + "y": 1 + }, + { + "label": "Caps Lock", + "x": 0, + "y": 2, + "w": 1.75 + }, + { + "label": "A", + "x": 1.75, + "y": 2 + }, + { + "label": "S", + "x": 2.75, + "y": 2 + }, + { + "label": "D", + "x": 3.75, + "y": 2 + }, + { + "label": "F", + "x": 4.75, + "y": 2 + }, + { + "label": "G", + "x": 5.75, + "y": 2 + }, + { + "label": "H", + "x": 6.75, + "y": 2 + }, + { + "label": "J", + "x": 7.75, + "y": 2 + }, + { + "label": "K", + "x": 8.75, + "y": 2 + }, + { + "label": "L", + "x": 9.75, + "y": 2 + }, + { + "label": ";", + "x": 10.75, + "y": 2 + }, + { + "label": "'", + "x": 11.75, + "y": 2 + }, + { + "label": "#", + "x": 12.75, + "y": 2 + }, + { + "label": "Left Shift", + "x": 0, + "y": 3, + "w": 1.25 + }, + { + "label": "\\", + "x": 1.25, + "y": 3 + }, + { + "label": "Y", + "x": 2.25, + "y": 3 + }, + { + "label": "X", + "x": 3.25, + "y": 3 + }, + { + "label": "C", + "x": 4.25, + "y": 3 + }, + { + "label": "V", + "x": 5.25, + "y": 3 + }, + { + "label": "B", + "x": 6.25, + "y": 3 + }, + { + "label": "N", + "x": 7.25, + "y": 3 + }, + { + "label": "M", + "x": 8.25, + "y": 3 + }, + { + "label": ",", + "x": 9.25, + "y": 3 + }, + { + "label": ".", + "x": 10.25, + "y": 3 + }, + { + "label": "/", + "x": 11.25, + "y": 3 + }, + { + "label": "Right Shift", + "x": 12.25, + "y": 3, + "w": 2.75 + }, + { + "label": "Up Arrow", + "x": 16.5, + "y": 3 + }, + { + "label": "Left Control", + "x": 0, + "y": 4, + "w": 1.25 + }, + { + "label": "Left Windows Key", + "x": 1.25, + "y": 4, + "w": 1.25 + }, + { + "label": "Left Alt", + "x": 2.5, + "y": 4, + "w": 1.25 + }, + { + "label": "Space", + "x": 3.75, + "y": 4, + "w": 6.25 + }, + { + "label": "Right Alt", + "x": 10, + "y": 4, + "w": 1.25 + }, + { + "label": "FN", + "x": 11.25, + "y": 4, + "w": 1.25 + }, + { + "label": "Menu", + "x": 12.5, + "y": 4, + "w": 1.25 + }, + { + "label": "Right Control", + "x": 13.75, + "y": 4, + "w": 1.25 + }, + { + "label": "Left Arrow", + "x": 15.5, + "y": 4 + }, + { + "label": "Down Arrow", + "x": 16.5, + "y": 4 + }, + { + "label": "Right Arrow", + "x": 17.5, + "y": 4 + } + ] + } + }, + "matrix_pins": { + "rows": [ + "B4", + "D7", + "D6", + "D4", + "D5", + "D3", + "D2", + "D1", + "D0" + ], + "cols": [ + "B0", + "B1", + "B2", + "B3", + "B5", + "B6", + "C6", + "C7" + ] + }, + "usb": { + "vid": "0x4642", + "pid": "0x776E", + "device_ver": "0x0001" + } +} diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c new file mode 100644 index 000000000000..9ea5ed9a4c69 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2022 frooastside + * + * 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 QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, + KC_LSFT, KC_LABK, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = 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, 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, 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, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/config.h b/keyboards/frooastboard/walnut_69/keymaps/via/config.h new file mode 100644 index 000000000000..da81ea1a3d2e --- /dev/null +++ b/keyboards/frooastboard/walnut_69/keymaps/via/config.h @@ -0,0 +1,30 @@ +/* Copyright 2022 frooastside + * + * 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 + +#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 +#define RGBLIGHT_EFFECT_TWINKLE + +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c new file mode 100644 index 000000000000..9ea5ed9a4c69 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -0,0 +1,33 @@ +/* Copyright 2022 frooastside + * + * 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 QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, + KC_LSFT, KC_LABK, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = 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, 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, 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, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) +}; diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk b/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/frooastboard/walnut_69/readme.md b/keyboards/frooastboard/walnut_69/readme.md new file mode 100644 index 000000000000..9b0e964f7c8c --- /dev/null +++ b/keyboards/frooastboard/walnut_69/readme.md @@ -0,0 +1,19 @@ +# Frooastboard Walnut + +![Frooastboard Walnut]() + +* Keyboard Maintainer: [Frooastside](https://github.com/frooastside) +* Hardware Supported: Frooastboard Walnut +* Hardware Availability: https://github.com/Frooastside/Frooastboard + +**Reset Key:** Hold down the key located at `K00`, commonly programmed as ESCAPE while plugging in the keyboard. + +Make example for this keyboard (after setting up your build environment): + + make frooastboard/walnut_69:default + +Flashing example for this keyboard: + + make frooastboard/walnut_69: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/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk new file mode 100644 index 000000000000..a94afecfe5e3 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/rules.mk @@ -0,0 +1,18 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +BOOTLOADER = atmel-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c new file mode 100644 index 000000000000..3c47274fc040 --- /dev/null +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -0,0 +1,17 @@ +/* Copyright 2022 frooastside + * + * 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 "walnut_69.h" diff --git a/keyboards/frooastboard/walnut_69/walnut_69.h b/keyboards/frooastboard/walnut_69/walnut_69.h new file mode 100644 index 000000000000..3960e592e71c --- /dev/null +++ b/keyboards/frooastboard/walnut_69/walnut_69.h @@ -0,0 +1,37 @@ +/* Copyright 2022 frooastside + * + * 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" + +#define LAYOUT( \ + K00, K01, K02, K03, K04, K05, K06, K07, K10, K11, K12, K13, K14, K15, K55, K56, K57, \ + K20, K21, K22, K23, K24, K25, K26, K27, K30, K31, K32, K33, K34, K35, K75, K76, K77, \ + K40, K41, K42, K43, K44, K45, K46, K47, K50, K51, K52, K53, K54, \ + K60, K61, K62, K63, K64, K65, K66, K67, K70, K71, K72, K73, K74, K36, \ + K80, K81, K82, K83, K84, K85, K86, K87, K16, K37, K17 \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27 }, \ + { K30, K31, K32, K33, K34, K35, K36, K37 }, \ + { K40, K41, K42, K43, K44, K45, K46, K47 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { K70, K71, K72, K73, K74, K75, K76, K77 }, \ + { K80, K81, K82, K83, K84, K85, K86, K87 } \ +} From ea6de7e6edd751c1b02ed7c5969bd09cfe9af0e8 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 19 Mar 2022 22:35:59 +0100 Subject: [PATCH 02/24] Update walnut_69.c --- keyboards/frooastboard/walnut_69/walnut_69.c | 77 ++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index 3c47274fc040..3ee35dc6b04d 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -15,3 +15,80 @@ */ #include "walnut_69.h" + +const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { +/* Refer to IS31 manual for these locations + * driver + * | R location + * | | G location + * | | | B location + * | | | | */ + {0, K_1, J_1, L_1}, + {0, K_2, J_2, L_2}, + {0, K_3, J_3, L_3}, + {0, K_4, J_4, L_4}, + {0, K_5, J_5, L_5}, + {0, K_6, J_6, L_6}, + {0, K_7, J_7, L_7}, + {0, K_8, J_8, L_8}, + {0, K_9, J_9, L_9}, + {0, K_10, J_10, L_10}, + {0, K_11, J_11, L_11}, + {0, K_12, J_12, L_12}, + {0, H_1, G_1, I_1}, + {0, H_2, G_2, I_2}, + {0, H_3, G_3, I_3}, + {0, H_4, G_4, I_4}, + {0, H_5, G_5, I_5}, + {0, H_6, G_6, I_6}, + {0, H_7, G_7, I_7}, + {0, H_8, G_8, I_8}, + {0, H_9, G_9, I_9}, + {0, H_10, G_10, I_10}, + {0, H_11, G_11, I_11}, + {0, H_12, G_12, I_12}, + {0, E_1, D_1, F_1}, + {0, E_2, D_2, F_2}, + {0, E_3, D_3, F_3}, + {0, E_4, D_4, F_4}, + {0, E_5, D_5, F_5}, + {0, E_6, D_6, F_6}, + {0, E_7, D_7, F_7}, + {0, E_8, D_8, F_8}, + {0, E_9, D_9, F_9}, + {0, E_10, D_10, F_10}, + {0, E_11, D_11, F_11}, + {0, E_12, D_12, F_12}, + {0, B_1, A_1, C_1}, + {0, B_2, A_2, C_2}, + {0, B_3, A_3, C_3}, + {0, B_4, A_4, C_4}, + {0, B_5, A_5, C_5}, + {0, B_6, A_6, C_6}, + {0, B_7, A_7, C_7}, + {0, B_8, A_8, C_8}, + {0, B_9, A_9, C_9}, + {0, B_10, A_10, C_10}, + {0, B_11, A_11, C_11}, + {0, B_12, A_12, C_12} +} + +led_config_t g_led_config = { { + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } +}, { + { 0, 62 },{ 0, 50 }, { 0, 38 }, { 0, 26 }, { 0, 14 }, { 0, 2 }, + {12, 2}, {24, 2}, {36, 2}, {48, 2}, {60, 2},{72, 2}, {84, 2}, {96, 2}, {108, 2}, {120, 2},{132, 2}, {144, 2}, {156, 2}, {168, 2}, {180, 2}, {192, 2}, + { 204, 2 },{ 204, 14 },{ 204, 26 }, { 204, 38 }, { 204, 50 }, { 204, 62 }, + {192, 62},{180, 62},{168, 62},{156, 62},{144, 62},{132, 62},{120, 62},{108, 62},{96, 62},{84, 62},{72, 62},{60, 62},{48, 62},{36, 62}, {24, 62},{12, 62}, +}, { + // LED Index to Flag + 1, 4, 4, 4, 4, 1 +} }; From 2585ab392d5d6892a6b931c10cc86c04ced26127 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 19 Mar 2022 22:54:38 +0100 Subject: [PATCH 03/24] basic rgb matrix --- keyboards/frooastboard/walnut_69/config.h | 28 +--- .../walnut_69/keymaps/via/config.h | 11 -- keyboards/frooastboard/walnut_69/rules.mk | 20 +-- keyboards/frooastboard/walnut_69/walnut_69.c | 140 +++++++++++++++++- 4 files changed, 152 insertions(+), 47 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index df55d7ed9985..0f34b2758f0d 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -29,24 +29,10 @@ #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 -#define RGB_DI_PIN B7 -#define RGBLED_NUM 1 - -#define RGBLIGHT_SLEEP - -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 - -#define RGBLIGHT_DEFAULT_HUE 234 - -#define RGBLIGHT_LIMIT_VAL 255 -#define RGBLIGHT_DEFAULT_VAL 190 - -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_SNAKE - -#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD + 2 +#define ISSI_TIMEOUT 100 +#define ISSI_PERSISTENCE 0 +#define ISSI_SWPULLUP PUR_0R +#define ISSI_CSPULLUP PUR_0R +#define DRIVER_COUNT 1 +#define DRIVER_LED_TOTAL 48 +#define DRIVER_ADDR_1 0b1010000 diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/config.h b/keyboards/frooastboard/walnut_69/keymaps/via/config.h index da81ea1a3d2e..52faa5d363ce 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/config.h +++ b/keyboards/frooastboard/walnut_69/keymaps/via/config.h @@ -16,15 +16,4 @@ #pragma once -#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 -#define RGBLIGHT_EFFECT_TWINKLE - #define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk index a94afecfe5e3..7695d184e4f2 100644 --- a/keyboards/frooastboard/walnut_69/rules.mk +++ b/keyboards/frooastboard/walnut_69/rules.mk @@ -7,12 +7,14 @@ BOOTLOADER = atmel-dfu # Build Options # change yes to no to disable # -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = no # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix +RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver +AUDIO_ENABLE = no # Audio output diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index 3ee35dc6b04d..20dec361c6b8 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -84,11 +84,139 @@ led_config_t g_led_config = { { { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } }, { - { 0, 62 },{ 0, 50 }, { 0, 38 }, { 0, 26 }, { 0, 14 }, { 0, 2 }, - {12, 2}, {24, 2}, {36, 2}, {48, 2}, {60, 2},{72, 2}, {84, 2}, {96, 2}, {108, 2}, {120, 2},{132, 2}, {144, 2}, {156, 2}, {168, 2}, {180, 2}, {192, 2}, - { 204, 2 },{ 204, 14 },{ 204, 26 }, { 204, 38 }, { 204, 50 }, { 204, 62 }, - {192, 62},{180, 62},{168, 62},{156, 62},{144, 62},{132, 62},{120, 62},{108, 62},{96, 62},{84, 62},{72, 62},{60, 62},{48, 62},{36, 62}, {24, 62},{12, 62}, + { + 0, + 62 + }, { + 0, + 50 + }, { + 0, + 38 + }, { + 0, + 26 + }, { + 0, + 14 + }, { + 0, + 2 + }, { + 12, + 2 + }, { + 24, + 2 + }, { + 36, + 2 + }, { + 48, + 2 + }, { + 60, + 2 + }, { + 72, + 2 + }, { + 84, + 2 + }, { + 96, + 2 + }, { + 108, + 2 + }, { + 120, + 2 + }, { + 132, + 2 + }, { + 144, + 2 + }, { + 156, + 2 + }, { + 168, + 2 + }, { + 180, + 2 + }, { + 192, + 2 + }, { + 204, + 2 + }, { + 204, + 14 + }, { + 204, + 26 + }, { + 204, + 38 + }, { + 204, + 50 + }, { + 204, + 62 + }, { + 192, + 62 + }, { + 180, + 62 + }, { + 168, + 62 + }, { + 156, + 62 + }, { + 144, + 62 + }, { + 132, + 62 + }, { + 120, + 62 + }, { + 108, + 62 + }, { + 96, + 62 + }, { + 84, + 62 + }, { + 72, + 62 + }, { + 60, + 62 + }, { + 48, + 62 + }, { + 36, + 62 + }, { + 24, + 62 + }, { + 12, + 62 + }, }, { - // LED Index to Flag - 1, 4, 4, 4, 4, 1 + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } }; From 4a85d688477ab0c1c56bcdd602d6e2fa03a61128 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 19 Mar 2022 22:56:36 +0100 Subject: [PATCH 04/24] Update rules.mk --- keyboards/frooastboard/walnut_69/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk index 7695d184e4f2..fd8ac56cda28 100644 --- a/keyboards/frooastboard/walnut_69/rules.mk +++ b/keyboards/frooastboard/walnut_69/rules.mk @@ -15,6 +15,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix +RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver AUDIO_ENABLE = no # Audio output From a531e8aa426d9795007f76b8634ce33130415319 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 20 Mar 2022 00:49:14 +0100 Subject: [PATCH 05/24] Update walnut_69.c --- keyboards/frooastboard/walnut_69/walnut_69.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index 20dec361c6b8..ae6123407f00 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -16,6 +16,7 @@ #include "walnut_69.h" +#ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { /* Refer to IS31 manual for these locations * driver @@ -220,3 +221,5 @@ led_config_t g_led_config = { { }, { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } }; + +#endif From 4c5fac21921186be077ab33d7f5e4af4591e88ec Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 20 Mar 2022 17:45:38 +0100 Subject: [PATCH 06/24] add missing semicollon --- keyboards/frooastboard/walnut_69/rules.mk | 2 +- keyboards/frooastboard/walnut_69/walnut_69.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk index fd8ac56cda28..65c6aba7e3b1 100644 --- a/keyboards/frooastboard/walnut_69/rules.mk +++ b/keyboards/frooastboard/walnut_69/rules.mk @@ -15,6 +15,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver AUDIO_ENABLE = no # Audio output diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index ae6123407f00..edda42b034f5 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -72,7 +72,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { {0, B_10, A_10, C_10}, {0, B_11, A_11, C_11}, {0, B_12, A_12, C_12} -} +}; led_config_t g_led_config = { { { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, From fd68f707ab014948f95d7615db37392c494c4846 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 20 Mar 2022 19:06:49 +0100 Subject: [PATCH 07/24] Update rules.mk --- keyboards/frooastboard/walnut_69/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk index 65c6aba7e3b1..7695d184e4f2 100644 --- a/keyboards/frooastboard/walnut_69/rules.mk +++ b/keyboards/frooastboard/walnut_69/rules.mk @@ -15,6 +15,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver AUDIO_ENABLE = no # Audio output From f903c2c63b6e9033ef659e5eba0633ff74e9e063 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 21 Mar 2022 20:09:07 +0100 Subject: [PATCH 08/24] change default rgb mode --- keyboards/frooastboard/walnut_69/config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index 0f34b2758f0d..bb68c28c3d33 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -36,3 +36,6 @@ #define DRIVER_COUNT 1 #define DRIVER_LED_TOTAL 48 #define DRIVER_ADDR_1 0b1010000 + +#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON From ad8dc6e25972dcd2a0ac8049479f4d681a7dece1 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 16:56:59 +0100 Subject: [PATCH 09/24] fix matrix --- keyboards/frooastboard/walnut_69/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/info.json b/keyboards/frooastboard/walnut_69/info.json index 96693a40b746..3c47b0cac204 100644 --- a/keyboards/frooastboard/walnut_69/info.json +++ b/keyboards/frooastboard/walnut_69/info.json @@ -394,8 +394,8 @@ "D5", "D3", "D2", - "D1", - "D0" + "F1", + "F0" ], "cols": [ "B0", From 29825996d5afb67d11bfebc081512fee4da10205 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 16:57:20 +0100 Subject: [PATCH 10/24] add fn layer --- keyboards/frooastboard/walnut_69/keymaps/default/keymap.c | 4 ++-- keyboards/frooastboard/walnut_69/keymaps/via/keymap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c index 9ea5ed9a4c69..10a17e0108f2 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c @@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = 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, 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_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, + 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, RGB_TOG, 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, 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, KC_TRNS) diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index 9ea5ed9a4c69..10a17e0108f2 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -25,8 +25,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = 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, 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_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, + 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, RGB_TOG, 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, 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, KC_TRNS) From 1f74aa70b3246fca4bb992bcc52952d4ff79c458 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 16:57:46 +0100 Subject: [PATCH 11/24] update lightning for via --- keyboards/frooastboard/walnut_69/config.h | 36 ++++++++++++ .../walnut_69/keymaps/via/config.h | 2 + keyboards/frooastboard/walnut_69/walnut_69.c | 56 ++++++++++++++++++- 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index bb68c28c3d33..15684ff5a8a3 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -37,5 +37,41 @@ #define DRIVER_LED_TOTAL 48 #define DRIVER_ADDR_1 0b1010000 +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 191 + +#define RGB_DISABLE_WHEN_USB_SUSPENDED + +#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_BREATHING +#define ENABLE_RGB_MATRIX_BAND_SAT +#define ENABLE_RGB_MATRIX_BAND_VAL +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#define ENABLE_RGB_MATRIX_CYCLE_ALL +#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN #define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_DUAL_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_BEACON +#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define ENABLE_RGB_MATRIX_HUE_BREATHING +#define ENABLE_RGB_MATRIX_HUE_PENDULUM +#define ENABLE_RGB_MATRIX_HUE_WAVE +#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +#define ENABLE_RGB_MATRIX_PIXEL_FLOW + +#define RGB_MATRIX_LED_FLUSH_LIMIT 16 +#define RGB_MATRIX_STARTUP_HUE 0 +#define RGB_MATRIX_STARTUP_SAT 255 +#define RGB_MATRIX_STARTUP_SPD 191 +#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_MOVING_CHEVRON diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/config.h b/keyboards/frooastboard/walnut_69/keymaps/via/config.h index 52faa5d363ce..1fee616c2c03 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/config.h +++ b/keyboards/frooastboard/walnut_69/keymaps/via/config.h @@ -16,4 +16,6 @@ #pragma once +#define VIA_QMK_RGBLIGHT_ENABLE +#define VIA_CUSTOM_LIGHTING_ENABLE #define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index edda42b034f5..86017c4ff62e 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -222,4 +222,58 @@ led_config_t g_led_config = { { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } }; -#endif +#if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) + +// VIA supports only 4 discrete values for effect speed; map these to some +// useful speed values for RGB Matrix. +enum speed_values { + RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects + RGBLIGHT_SPEED_1 = UINT8_MAX / 4, + RGBLIGHT_SPEED_2 = UINT8_MAX / 2, // matches the default value + RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast +}; + +static uint8_t speed_from_rgblight(uint8_t rgblight_speed) { + switch (rgblight_speed) { + case 0: + return RGBLIGHT_SPEED_0; + case 1: + return RGBLIGHT_SPEED_1; + case 2: + default: + return RGBLIGHT_SPEED_2; + case 3: + return RGBLIGHT_SPEED_3; + } +} + +static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) { + if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) { + return 0; + } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) { + return 1; + } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) { + return 2; + } else { + return 3; + } +} + +void raw_hid_receive_kb(uint8_t *data, uint8_t length) { + switch (data[0]) { + case id_lighting_get_value: + if (data[1] == id_qmk_rgblight_effect_speed) { + data[2] = speed_to_rgblight(rgb_matrix_get_speed()); + } + break; + case id_lighting_set_value: + if (data[1] == id_qmk_rgblight_effect_speed) { + rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2])); + } + break; + } +} + +#endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) + +#endif// defined(RGB_MATRIX_ENABLE) From 3281964a571f21e1ce84fb10ec9fe7c5e06a87db Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 18:07:05 +0100 Subject: [PATCH 12/24] always enable lto --- keyboards/frooastboard/walnut_69/config.h | 2 +- keyboards/frooastboard/walnut_69/keymaps/via/rules.mk | 1 - keyboards/frooastboard/walnut_69/rules.mk | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index 15684ff5a8a3..c88fde2d6144 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -66,8 +66,8 @@ #define ENABLE_RGB_MATRIX_HUE_BREATHING #define ENABLE_RGB_MATRIX_HUE_PENDULUM #define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL #define ENABLE_RGB_MATRIX_PIXEL_FLOW +#define ENABLE_RGB_MATRIX_PIXEL_RAIN #define RGB_MATRIX_LED_FLUSH_LIMIT 16 #define RGB_MATRIX_STARTUP_HUE 0 diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk b/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk index 36b7ba9cbc98..1e5b99807cb7 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk +++ b/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk index 7695d184e4f2..3cb6c25ebfd8 100644 --- a/keyboards/frooastboard/walnut_69/rules.mk +++ b/keyboards/frooastboard/walnut_69/rules.mk @@ -18,3 +18,4 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver AUDIO_ENABLE = no # Audio output +LTO_ENABLE = yes # Enables Link Time Optimization From 53767375f3ee5c721b5b85293aed1d4c6522d0e7 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 19:11:24 +0100 Subject: [PATCH 13/24] via rgb matrix fix --- keyboards/frooastboard/walnut_69/config.h | 2 +- .../walnut_69/keymaps/via/config.h | 2 +- .../walnut_69/keymaps/via/keymap.c | 112 ++++++++++++++++++ keyboards/frooastboard/walnut_69/walnut_69.c | 54 --------- 4 files changed, 114 insertions(+), 56 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index c88fde2d6144..b6ae98fd1060 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -66,8 +66,8 @@ #define ENABLE_RGB_MATRIX_HUE_BREATHING #define ENABLE_RGB_MATRIX_HUE_PENDULUM #define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_FLOW #define ENABLE_RGB_MATRIX_PIXEL_RAIN +#define ENABLE_RGB_MATRIX_PIXEL_FLOW #define RGB_MATRIX_LED_FLUSH_LIMIT 16 #define RGB_MATRIX_STARTUP_HUE 0 diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/config.h b/keyboards/frooastboard/walnut_69/keymaps/via/config.h index 1fee616c2c03..9ccefcc466c9 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/config.h +++ b/keyboards/frooastboard/walnut_69/keymaps/via/config.h @@ -16,6 +16,6 @@ #pragma once -#define VIA_QMK_RGBLIGHT_ENABLE #define VIA_CUSTOM_LIGHTING_ENABLE + #define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index 10a17e0108f2..d5d83d3b2215 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -31,3 +31,115 @@ 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, 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) }; + +#if defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) + +// VIA supports only 4 discrete values for effect speed; map these to some +// useful speed values for RGB Matrix. +enum speed_values { + RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects + RGBLIGHT_SPEED_1 = UINT8_MAX / 4, + RGBLIGHT_SPEED_2 = UINT8_MAX / 2, // matches the default value + RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast +}; + +static uint8_t speed_from_rgblight(uint8_t rgblight_speed) { + switch (rgblight_speed) { + case 0: + return RGBLIGHT_SPEED_0; + case 1: + return RGBLIGHT_SPEED_1; + case 2: + default: + return RGBLIGHT_SPEED_2; + case 3: + return RGBLIGHT_SPEED_3; + } +} + +static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) { + if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) { + return 0; + } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) { + return 1; + } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) { + return 2; + } else { + return 3; + } +} + +void via_qmk_rgblight_get_value(uint8_t *data) { + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + switch (*value_id) { + case id_qmk_rgblight_brightness: { + value_data[0] = rgb_matrix_get_val(); + break; + } + case id_qmk_rgblight_effect: { + value_data[0] = rgb_matrix_is_enabled() ? rgb_matrix_get_mode() : 0; + break; + } + case id_qmk_rgblight_effect_speed: { + value_data[0] = speed_to_rgblight(rgb_matrix_get_speed()); + break; + } + case id_qmk_rgblight_color: { + value_data[0] = rgb_matrix_get_hue(); + value_data[1] = rgb_matrix_get_sat(); + break; + } + } +} + +void via_qmk_rgblight_set_value(uint8_t *data) { + uint8_t *value_id = &(data[0]); + uint8_t *value_data = &(data[1]); + switch (*value_id) { + case id_qmk_rgblight_brightness: { + rgb_matrix_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]); + break; + } + case id_qmk_rgblight_effect: { + if (value_data[0] == 0) { + rgb_matrix_disable_noeeprom(); + } else { + rgb_matrix_enable_noeeprom(); + rgb_matrix_mode_noeeprom(value_data[0]); + } + break; + } + case id_qmk_rgblight_effect_speed: { + rgb_matrix_set_speed_noeeprom(speed_from_rgblight(value_data[0])); + break; + } + case id_qmk_rgblight_color: { + rgb_matrix_sethsv_noeeprom(value_data[0], value_data[1], rgblight_get_val()); + break; + } + } +} + + +void raw_hid_receive_kb(uint8_t *data, uint8_t length) { + uint8_t *command_id = &(data[0]); + uint8_t *command_data = &(data[1]); + switch (*command_id) { + case id_lighting_set_value: + via_qmk_rgblight_set_value(command_data); + break; + case id_lighting_get_value: + via_qmk_rgblight_get_value(command_data); + break; + case id_lighting_save: + eeconfig_update_rgb_matrix(); + break; + default: + // Unhandled message. + *command_id = id_unhandled; + break; + } +} + +#endif // defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index 86017c4ff62e..5c160d181c81 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -222,58 +222,4 @@ led_config_t g_led_config = { { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } }; -#if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) - -// VIA supports only 4 discrete values for effect speed; map these to some -// useful speed values for RGB Matrix. -enum speed_values { - RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects - RGBLIGHT_SPEED_1 = UINT8_MAX / 4, - RGBLIGHT_SPEED_2 = UINT8_MAX / 2, // matches the default value - RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast -}; - -static uint8_t speed_from_rgblight(uint8_t rgblight_speed) { - switch (rgblight_speed) { - case 0: - return RGBLIGHT_SPEED_0; - case 1: - return RGBLIGHT_SPEED_1; - case 2: - default: - return RGBLIGHT_SPEED_2; - case 3: - return RGBLIGHT_SPEED_3; - } -} - -static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) { - if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) { - return 0; - } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) { - return 1; - } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) { - return 2; - } else { - return 3; - } -} - -void raw_hid_receive_kb(uint8_t *data, uint8_t length) { - switch (data[0]) { - case id_lighting_get_value: - if (data[1] == id_qmk_rgblight_effect_speed) { - data[2] = speed_to_rgblight(rgb_matrix_get_speed()); - } - break; - case id_lighting_set_value: - if (data[1] == id_qmk_rgblight_effect_speed) { - rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2])); - } - break; - } -} - -#endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) - #endif// defined(RGB_MATRIX_ENABLE) From d63f0a707d127bb3df18aeaa1b1be19f95b73aa4 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 19:30:06 +0100 Subject: [PATCH 14/24] fix 4 missing corner leds --- keyboards/frooastboard/walnut_69/walnut_69.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index 5c160d181c81..f6d93ba5fae2 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -103,6 +103,9 @@ led_config_t g_led_config = { { }, { 0, 2 + }, { + 0, + 2 }, { 12, 2 @@ -154,6 +157,9 @@ led_config_t g_led_config = { { }, { 204, 2 + }, { + 204, + 2 }, { 204, 14 @@ -169,6 +175,9 @@ led_config_t g_led_config = { { }, { 204, 62 + }, { + 204, + 62 }, { 192, 62 @@ -218,6 +227,10 @@ led_config_t g_led_config = { { 12, 62 }, + { + 0, + 62 + } }, { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } }; From 837f58c7b275a57bc624a7bbaebf12e8104140ab Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 22:18:19 +0100 Subject: [PATCH 15/24] Update config.h --- keyboards/frooastboard/walnut_69/config.h | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index b6ae98fd1060..ee4487008de2 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -31,6 +31,7 @@ #define ISSI_TIMEOUT 100 #define ISSI_PERSISTENCE 0 +#define ISSI_PWM_FREQUENCY 0b010 #define ISSI_SWPULLUP PUR_0R #define ISSI_CSPULLUP PUR_0R #define DRIVER_COUNT 1 From 18a00ada91891e8cfcc59fb728974d4f8b566cc3 Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 23:13:06 +0100 Subject: [PATCH 16/24] code style changes --- keyboards/frooastboard/walnut_69/config.h | 4 +- keyboards/frooastboard/walnut_69/info.json | 23 +-- .../walnut_69/keymaps/default/keymap.c | 6 +- .../walnut_69/keymaps/via/keymap.c | 9 +- keyboards/frooastboard/walnut_69/readme.md | 6 +- keyboards/frooastboard/walnut_69/walnut_69.c | 184 +++--------------- 6 files changed, 36 insertions(+), 196 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut_69/config.h index ee4487008de2..c5c34a1fbc9e 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut_69/config.h @@ -19,8 +19,8 @@ #include "config_common.h" /* USB Device descriptor parameter */ -#define MANUFACTURER frooastside -#define PRODUCT Frooastboard Walnut +#define MANUFACTURER frooastside +#define PRODUCT Frooastboard Walnut /* key matrix size */ #define MATRIX_ROWS 9 diff --git a/keyboards/frooastboard/walnut_69/info.json b/keyboards/frooastboard/walnut_69/info.json index 3c47b0cac204..934c6afd0956 100644 --- a/keyboards/frooastboard/walnut_69/info.json +++ b/keyboards/frooastboard/walnut_69/info.json @@ -386,27 +386,8 @@ } }, "matrix_pins": { - "rows": [ - "B4", - "D7", - "D6", - "D4", - "D5", - "D3", - "D2", - "F1", - "F0" - ], - "cols": [ - "B0", - "B1", - "B2", - "B3", - "B5", - "B6", - "C6", - "C7" - ] + "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"], + "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"] }, "usb": { "vid": "0x4642", diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c index 10a17e0108f2..557d2a361565 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c @@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, - 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, RGB_TOG, 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, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index d5d83d3b2215..ab30c71fe1f0 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -26,10 +26,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, - 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, RGB_TOG, 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, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; #if defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) @@ -121,9 +121,8 @@ void via_qmk_rgblight_set_value(uint8_t *data) { } } - void raw_hid_receive_kb(uint8_t *data, uint8_t length) { - uint8_t *command_id = &(data[0]); + uint8_t *command_id = &(data[0]); uint8_t *command_data = &(data[1]); switch (*command_id) { case id_lighting_set_value: diff --git a/keyboards/frooastboard/walnut_69/readme.md b/keyboards/frooastboard/walnut_69/readme.md index 9b0e964f7c8c..c8fc002bc9b3 100644 --- a/keyboards/frooastboard/walnut_69/readme.md +++ b/keyboards/frooastboard/walnut_69/readme.md @@ -2,9 +2,9 @@ ![Frooastboard Walnut]() -* Keyboard Maintainer: [Frooastside](https://github.com/frooastside) -* Hardware Supported: Frooastboard Walnut -* Hardware Availability: https://github.com/Frooastside/Frooastboard +- Keyboard Maintainer: [Frooastside](https://github.com/frooastside) +- Hardware Supported: Frooastboard Walnut +- Hardware Availability: https://github.com/Frooastside/Frooastboard **Reset Key:** Hold down the key located at `K00`, commonly programmed as ESCAPE while plugging in the keyboard. diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index f6d93ba5fae2..9dc73ba4e64c 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -16,7 +16,8 @@ #include "walnut_69.h" -#ifdef RGB_MATRIX_ENABLE +#if defined(RGB_MATRIX_ENABLE) + const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { /* Refer to IS31 manual for these locations * driver @@ -74,165 +75,24 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { {0, B_12, A_12, C_12} }; -led_config_t g_led_config = { { - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } -}, { - { - 0, - 62 - }, { - 0, - 50 - }, { - 0, - 38 - }, { - 0, - 26 - }, { - 0, - 14 - }, { - 0, - 2 - }, { - 0, - 2 - }, { - 12, - 2 - }, { - 24, - 2 - }, { - 36, - 2 - }, { - 48, - 2 - }, { - 60, - 2 - }, { - 72, - 2 - }, { - 84, - 2 - }, { - 96, - 2 - }, { - 108, - 2 - }, { - 120, - 2 - }, { - 132, - 2 - }, { - 144, - 2 - }, { - 156, - 2 - }, { - 168, - 2 - }, { - 180, - 2 - }, { - 192, - 2 - }, { - 204, - 2 - }, { - 204, - 2 - }, { - 204, - 14 - }, { - 204, - 26 - }, { - 204, - 38 - }, { - 204, - 50 - }, { - 204, - 62 - }, { - 204, - 62 - }, { - 192, - 62 - }, { - 180, - 62 - }, { - 168, - 62 - }, { - 156, - 62 - }, { - 144, - 62 - }, { - 132, - 62 - }, { - 120, - 62 - }, { - 108, - 62 - }, { - 96, - 62 - }, { - 84, - 62 - }, { - 72, - 62 - }, { - 60, - 62 - }, { - 48, - 62 - }, { - 36, - 62 - }, { - 24, - 62 - }, { - 12, - 62 - }, - { - 0, - 62 - } -}, { - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 -} }; +led_config_t g_led_config = {{ + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, + { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } + }, { + {0, 62}, {0, 50}, {0, 38}, {0, 26}, {0, 14}, {0, 2}, + {0, 2}, {12, 2}, {24, 2}, {36, 2}, {48, 2}, {60, 2}, {72, 2}, {84, 2}, {96, 2}, {108, 2}, {120, 2}, {132, 2}, {144, 2}, {156, 2}, {168, 2}, {180, 2}, {192, 2}, {204, 2}, + {204, 2}, {204, 14}, {204, 26}, {204, 38}, {204, 50}, {204, 62}, + {204, 62}, {192, 62}, {180, 62}, {168, 62}, {156, 62}, {144, 62}, {132, 62}, {120, 62}, {108, 62}, {96, 62}, {84, 62}, {72, 62}, {60, 62}, {48, 62}, {36, 62}, {24, 62}, {12, 62}, {0, 62} + }, { + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 + } +}; -#endif// defined(RGB_MATRIX_ENABLE) +#endif // defined(RGB_MATRIX_ENABLE) From b718f22a430d588b300d0cbbceac5275a349e42f Mon Sep 17 00:00:00 2001 From: Simon Date: Wed, 23 Mar 2022 23:53:09 +0100 Subject: [PATCH 17/24] Update walnut_69.c --- keyboards/frooastboard/walnut_69/walnut_69.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index 9dc73ba4e64c..a4da50bf7db8 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -75,7 +75,8 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { {0, B_12, A_12, C_12} }; -led_config_t g_led_config = {{ +led_config_t g_led_config = { + { { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, From 4c114a9a141fd5fa1d3d73ec3a4c14f9cadfd91d Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 24 Mar 2022 00:05:03 +0100 Subject: [PATCH 18/24] fix nubs --- keyboards/frooastboard/walnut_69/keymaps/default/keymap.c | 2 +- keyboards/frooastboard/walnut_69/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c index 557d2a361565..9235928ac4f2 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, - KC_LSFT, KC_LABK, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LSFT, KC_NUBS, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT( diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index ab30c71fe1f0..0b86944d9666 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, - KC_LSFT, KC_LABK, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LSFT, KC_NUBS, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT( From b6f392e4eafcdbf04982e9e8a655a55044eb68ca Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 24 Mar 2022 16:52:29 +0100 Subject: [PATCH 19/24] cleanup --- .../frooastboard/walnut_69/keymaps/via/keymap.c | 2 +- keyboards/frooastboard/walnut_69/walnut_69.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index 0b86944d9666..c044fbe6759a 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, - 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, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI, + 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, RGB_TOG, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut_69/walnut_69.c index a4da50bf7db8..9b94eff4b660 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut_69/walnut_69.c @@ -22,9 +22,9 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { /* Refer to IS31 manual for these locations * driver * | R location - * | | G location - * | | | B location - * | | | | */ + * | | G location + * | | | B location + * | | | | */ {0, K_1, J_1, L_1}, {0, K_2, J_2, L_2}, {0, K_3, J_3, L_3}, @@ -87,10 +87,10 @@ led_config_t g_led_config = { { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }, { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED } }, { - {0, 62}, {0, 50}, {0, 38}, {0, 26}, {0, 14}, {0, 2}, - {0, 2}, {12, 2}, {24, 2}, {36, 2}, {48, 2}, {60, 2}, {72, 2}, {84, 2}, {96, 2}, {108, 2}, {120, 2}, {132, 2}, {144, 2}, {156, 2}, {168, 2}, {180, 2}, {192, 2}, {204, 2}, - {204, 2}, {204, 14}, {204, 26}, {204, 38}, {204, 50}, {204, 62}, - {204, 62}, {192, 62}, {180, 62}, {168, 62}, {156, 62}, {144, 62}, {132, 62}, {120, 62}, {108, 62}, {96, 62}, {84, 62}, {72, 62}, {60, 62}, {48, 62}, {36, 62}, {24, 62}, {12, 62}, {0, 62} + {0, 62}, {0, 50}, {0, 38}, {0, 26}, {0, 14}, {0, 2}, + {0, 2}, {12, 2}, {24, 2}, {36, 2}, {48, 2}, {60, 2}, {72, 2}, {84, 2}, {96, 2}, {108, 2}, {120, 2}, {132, 2}, {144, 2}, {156, 2}, {168, 2}, {180, 2}, {192, 2}, {204, 2}, + {204, 2}, {204, 14}, {204, 26}, {204, 38}, {204, 50}, {204, 62}, + {204, 62}, {192, 62}, {180, 62}, {168, 62}, {156, 62}, {144, 62}, {132, 62}, {120, 62}, {108, 62}, {96, 62}, {84, 62}, {72, 62}, {60, 62}, {48, 62}, {36, 62}, {24, 62}, {12, 62}, {0, 62} }, { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 } From 2f3e748088ff79a01af4291a375c7e1a20dc17fd Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 24 Mar 2022 17:07:36 +0100 Subject: [PATCH 20/24] add gui toggle --- keyboards/frooastboard/walnut_69/keymaps/default/keymap.c | 2 +- keyboards/frooastboard/walnut_69/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c index 9235928ac4f2..cc253d827304 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c @@ -29,5 +29,5 @@ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index c044fbe6759a..f95127993aa1 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -29,7 +29,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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; #if defined(RGB_MATRIX_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE) From 591b2f552d6cc6a156922fe65614a0c625c76476 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 24 Mar 2022 19:01:21 +0100 Subject: [PATCH 21/24] add eeprom clear key --- keyboards/frooastboard/walnut_69/keymaps/default/keymap.c | 2 +- keyboards/frooastboard/walnut_69/keymaps/via/keymap.c | 2 +- keyboards/frooastboard/walnut_69/readme.md | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c index cc253d827304..cf019a65840a 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS, 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, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c index f95127993aa1..0a3614e202b0 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS, 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, RGB_TOG, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, diff --git a/keyboards/frooastboard/walnut_69/readme.md b/keyboards/frooastboard/walnut_69/readme.md index c8fc002bc9b3..89ee3d560739 100644 --- a/keyboards/frooastboard/walnut_69/readme.md +++ b/keyboards/frooastboard/walnut_69/readme.md @@ -1,7 +1,5 @@ # Frooastboard Walnut -![Frooastboard Walnut]() - - Keyboard Maintainer: [Frooastside](https://github.com/frooastside) - Hardware Supported: Frooastboard Walnut - Hardware Availability: https://github.com/Frooastside/Frooastboard From 02ff631f2433c29161d0a697154f0df4a7c9b552 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 28 Mar 2022 13:26:00 +0200 Subject: [PATCH 22/24] rename folder --- .../{walnut_69 => walnut}/config.h | 27 +- keyboards/frooastboard/walnut/info.json | 259 ++++++++++++ .../walnut/keymaps/default/keymap.c | 20 + .../walnut/keymaps/default_ansi/keymap.c | 20 + .../keymaps/default_iso}/keymap.c | 25 +- .../frooastboard/walnut/keymaps/via/config.h | 7 + .../keymaps/via/keymap.c | 31 +- .../keymaps/via/rules.mk | 0 keyboards/frooastboard/walnut/readme.md | 27 ++ keyboards/frooastboard/walnut/rules.mk | 5 + .../walnut_69.c => walnut/walnut.c} | 19 +- keyboards/frooastboard/walnut/walnut.h | 6 + keyboards/frooastboard/walnut_69/info.json | 397 ------------------ .../walnut_69/keymaps/via/config.h | 21 - keyboards/frooastboard/walnut_69/readme.md | 17 - keyboards/frooastboard/walnut_69/rules.mk | 21 - keyboards/frooastboard/walnut_69/walnut_69.h | 37 -- 17 files changed, 364 insertions(+), 575 deletions(-) rename keyboards/frooastboard/{walnut_69 => walnut}/config.h (66%) create mode 100644 keyboards/frooastboard/walnut/info.json create mode 100644 keyboards/frooastboard/walnut/keymaps/default/keymap.c create mode 100644 keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c rename keyboards/frooastboard/{walnut_69/keymaps/default => walnut/keymaps/default_iso}/keymap.c (64%) create mode 100644 keyboards/frooastboard/walnut/keymaps/via/config.h rename keyboards/frooastboard/{walnut_69 => walnut}/keymaps/via/keymap.c (81%) rename keyboards/frooastboard/{walnut_69 => walnut}/keymaps/via/rules.mk (100%) create mode 100644 keyboards/frooastboard/walnut/readme.md create mode 100644 keyboards/frooastboard/walnut/rules.mk rename keyboards/frooastboard/{walnut_69/walnut_69.c => walnut/walnut.c} (82%) create mode 100644 keyboards/frooastboard/walnut/walnut.h delete mode 100644 keyboards/frooastboard/walnut_69/info.json delete mode 100644 keyboards/frooastboard/walnut_69/keymaps/via/config.h delete mode 100644 keyboards/frooastboard/walnut_69/readme.md delete mode 100644 keyboards/frooastboard/walnut_69/rules.mk delete mode 100644 keyboards/frooastboard/walnut_69/walnut_69.h diff --git a/keyboards/frooastboard/walnut_69/config.h b/keyboards/frooastboard/walnut/config.h similarity index 66% rename from keyboards/frooastboard/walnut_69/config.h rename to keyboards/frooastboard/walnut/config.h index c5c34a1fbc9e..081a084d1612 100644 --- a/keyboards/frooastboard/walnut_69/config.h +++ b/keyboards/frooastboard/walnut/config.h @@ -1,31 +1,8 @@ -/* Copyright 2022 frooastside - * - * 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 . - */ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define MANUFACTURER frooastside -#define PRODUCT Frooastboard Walnut - -/* key matrix size */ -#define MATRIX_ROWS 9 -#define MATRIX_COLS 8 - #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/frooastboard/walnut/info.json b/keyboards/frooastboard/walnut/info.json new file mode 100644 index 000000000000..7a8276f3ffe5 --- /dev/null +++ b/keyboards/frooastboard/walnut/info.json @@ -0,0 +1,259 @@ +{ + "keyboard_name": "Frooastboard Walnut", + "manufacturer": "Frooastside", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut", + "maintainer": "Frooastside", + "debounce": 5, + "diode_direction": "COL2ROW", + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": true + }, + "build": { + "lto": true + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"], + "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"] + }, + "usb": { + "vid": "0x4642", + "pid": "0x776E", + "device_version": "1.0.0" + }, + "layouts": { + "LAYOUT_ansi": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [1, 0], "x": 8, "y": 0 }, + { "matrix": [1, 1], "x": 9, "y": 0 }, + { "matrix": [1, 2], "x": 10, "y": 0 }, + { "matrix": [1, 3], "x": 11, "y": 0 }, + { "matrix": [1, 4], "x": 12, "y": 0 }, + { "matrix": [1, 5], "x": 13, "y": 0, "w": 2 }, + { "matrix": [5, 5], "x": 15.5, "y": 0 }, + { "matrix": [5, 6], "x": 16.5, "y": 0 }, + { "matrix": [5, 7], "x": 17.5, "y": 0 }, + { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 1 }, + { "matrix": [2, 2], "x": 2.5, "y": 1 }, + { "matrix": [2, 3], "x": 3.5, "y": 1 }, + { "matrix": [2, 4], "x": 4.5, "y": 1 }, + { "matrix": [2, 5], "x": 5.5, "y": 1 }, + { "matrix": [2, 6], "x": 6.5, "y": 1 }, + { "matrix": [2, 7], "x": 7.5, "y": 1 }, + { "matrix": [3, 0], "x": 8.5, "y": 1 }, + { "matrix": [3, 1], "x": 9.5, "y": 1 }, + { "matrix": [3, 2], "x": 10.5, "y": 1 }, + { "matrix": [3, 3], "x": 11.5, "y": 1 }, + { "matrix": [3, 4], "x": 12.5, "y": 1 }, + { "matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5 }, + { "matrix": [7, 5], "x": 15.5, "y": 1 }, + { "matrix": [7, 6], "x": 16.5, "y": 1 }, + { "matrix": [7, 7], "x": 17.5, "y": 1 }, + { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 }, + { "matrix": [4, 1], "x": 1.75, "y": 2 }, + { "matrix": [4, 2], "x": 2.75, "y": 2 }, + { "matrix": [4, 3], "x": 3.75, "y": 2 }, + { "matrix": [4, 4], "x": 4.75, "y": 2 }, + { "matrix": [4, 5], "x": 5.75, "y": 2 }, + { "matrix": [4, 6], "x": 6.75, "y": 2 }, + { "matrix": [4, 7], "x": 7.75, "y": 2 }, + { "matrix": [5, 0], "x": 8.75, "y": 2 }, + { "matrix": [5, 1], "x": 9.75, "y": 2 }, + { "matrix": [5, 2], "x": 10.75, "y": 2 }, + { "matrix": [5, 3], "x": 11.75, "y": 2 }, + { "matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25 }, + { "matrix": [6, 0], "x": 0, "y": 3, "w": 2.25 }, + { "matrix": [6, 2], "x": 2.25, "y": 3 }, + { "matrix": [6, 3], "x": 3.25, "y": 3 }, + { "matrix": [6, 4], "x": 4.25, "y": 3 }, + { "matrix": [6, 5], "x": 5.25, "y": 3 }, + { "matrix": [6, 6], "x": 6.25, "y": 3 }, + { "matrix": [6, 7], "x": 7.25, "y": 3 }, + { "matrix": [7, 0], "x": 8.25, "y": 3 }, + { "matrix": [7, 1], "x": 9.25, "y": 3 }, + { "matrix": [7, 2], "x": 10.25, "y": 3 }, + { "matrix": [7, 3], "x": 11.25, "y": 3 }, + { "matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75 }, + { "matrix": [3, 6], "x": 16.5, "y": 3 }, + { "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25 }, + { "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25 }, + { "matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25 }, + { "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25 }, + { "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25 }, + { "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25 }, + { "matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25 }, + { "matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25 }, + { "matrix": [1, 6], "x": 15.5, "y": 4 }, + { "matrix": [3, 7], "x": 16.5, "y": 4 }, + { "matrix": [1, 7], "x": 17.5, "y": 4 } + ] + }, + "LAYOUT_iso": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [1, 0], "x": 8, "y": 0 }, + { "matrix": [1, 1], "x": 9, "y": 0 }, + { "matrix": [1, 2], "x": 10, "y": 0 }, + { "matrix": [1, 3], "x": 11, "y": 0 }, + { "matrix": [1, 4], "x": 12, "y": 0 }, + { "matrix": [1, 5], "x": 13, "y": 0, "w": 2 }, + { "matrix": [5, 5], "x": 15.5, "y": 0 }, + { "matrix": [5, 6], "x": 16.5, "y": 0 }, + { "matrix": [5, 7], "x": 17.5, "y": 0 }, + { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 1 }, + { "matrix": [2, 2], "x": 2.5, "y": 1 }, + { "matrix": [2, 3], "x": 3.5, "y": 1 }, + { "matrix": [2, 4], "x": 4.5, "y": 1 }, + { "matrix": [2, 5], "x": 5.5, "y": 1 }, + { "matrix": [2, 6], "x": 6.5, "y": 1 }, + { "matrix": [2, 7], "x": 7.5, "y": 1 }, + { "matrix": [3, 0], "x": 8.5, "y": 1 }, + { "matrix": [3, 1], "x": 9.5, "y": 1 }, + { "matrix": [3, 2], "x": 10.5, "y": 1 }, + { "matrix": [3, 3], "x": 11.5, "y": 1 }, + { "matrix": [3, 4], "x": 12.5, "y": 1 }, + { "matrix": [3, 5], "x": 13.75, "y": 1, "w": 1.25, "h": 2 }, + { "matrix": [7, 5], "x": 15.5, "y": 1 }, + { "matrix": [7, 6], "x": 16.5, "y": 1 }, + { "matrix": [7, 7], "x": 17.5, "y": 1 }, + { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 }, + { "matrix": [4, 1], "x": 1.75, "y": 2 }, + { "matrix": [4, 2], "x": 2.75, "y": 2 }, + { "matrix": [4, 3], "x": 3.75, "y": 2 }, + { "matrix": [4, 4], "x": 4.75, "y": 2 }, + { "matrix": [4, 5], "x": 5.75, "y": 2 }, + { "matrix": [4, 6], "x": 6.75, "y": 2 }, + { "matrix": [4, 7], "x": 7.75, "y": 2 }, + { "matrix": [5, 0], "x": 8.75, "y": 2 }, + { "matrix": [5, 1], "x": 9.75, "y": 2 }, + { "matrix": [5, 2], "x": 10.75, "y": 2 }, + { "matrix": [5, 3], "x": 11.75, "y": 2 }, + { "matrix": [5, 4], "x": 12.75, "y": 2 }, + { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 }, + { "matrix": [6, 1], "x": 1.25, "y": 3 }, + { "matrix": [6, 2], "x": 2.25, "y": 3 }, + { "matrix": [6, 3], "x": 3.25, "y": 3 }, + { "matrix": [6, 4], "x": 4.25, "y": 3 }, + { "matrix": [6, 5], "x": 5.25, "y": 3 }, + { "matrix": [6, 6], "x": 6.25, "y": 3 }, + { "matrix": [6, 7], "x": 7.25, "y": 3 }, + { "matrix": [7, 0], "x": 8.25, "y": 3 }, + { "matrix": [7, 1], "x": 9.25, "y": 3 }, + { "matrix": [7, 2], "x": 10.25, "y": 3 }, + { "matrix": [7, 3], "x": 11.25, "y": 3 }, + { "matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75 }, + { "matrix": [3, 6], "x": 16.5, "y": 3 }, + { "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25 }, + { "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25 }, + { "matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25 }, + { "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25 }, + { "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25 }, + { "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25 }, + { "matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25 }, + { "matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25 }, + { "matrix": [1, 6], "x": 15.5, "y": 4 }, + { "matrix": [3, 7], "x": 16.5, "y": 4 }, + { "matrix": [1, 7], "x": 17.5, "y": 4 } + ] + }, + "LAYOUT_all": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [1, 0], "x": 8, "y": 0 }, + { "matrix": [1, 1], "x": 9, "y": 0 }, + { "matrix": [1, 2], "x": 10, "y": 0 }, + { "matrix": [1, 3], "x": 11, "y": 0 }, + { "matrix": [1, 4], "x": 12, "y": 0 }, + { "matrix": [1, 5], "x": 13, "y": 0, "w": 2 }, + { "matrix": [5, 5], "x": 15.5, "y": 0 }, + { "matrix": [5, 6], "x": 16.5, "y": 0 }, + { "matrix": [5, 7], "x": 17.5, "y": 0 }, + { "matrix": [2, 0], "x": 0, "y": 1, "w": 1.5 }, + { "matrix": [2, 1], "x": 1.5, "y": 1 }, + { "matrix": [2, 2], "x": 2.5, "y": 1 }, + { "matrix": [2, 3], "x": 3.5, "y": 1 }, + { "matrix": [2, 4], "x": 4.5, "y": 1 }, + { "matrix": [2, 5], "x": 5.5, "y": 1 }, + { "matrix": [2, 6], "x": 6.5, "y": 1 }, + { "matrix": [2, 7], "x": 7.5, "y": 1 }, + { "matrix": [3, 0], "x": 8.5, "y": 1 }, + { "matrix": [3, 1], "x": 9.5, "y": 1 }, + { "matrix": [3, 2], "x": 10.5, "y": 1 }, + { "matrix": [3, 3], "x": 11.5, "y": 1 }, + { "matrix": [3, 4], "x": 12.5, "y": 1 }, + { "matrix": [5, 4], "x": 13.5, "y": 1, "w": 1.5 }, + { "matrix": [7, 5], "x": 15.5, "y": 1 }, + { "matrix": [7, 6], "x": 16.5, "y": 1 }, + { "matrix": [7, 7], "x": 17.5, "y": 1 }, + { "matrix": [4, 0], "x": 0, "y": 2, "w": 1.75 }, + { "matrix": [4, 1], "x": 1.75, "y": 2 }, + { "matrix": [4, 2], "x": 2.75, "y": 2 }, + { "matrix": [4, 3], "x": 3.75, "y": 2 }, + { "matrix": [4, 4], "x": 4.75, "y": 2 }, + { "matrix": [4, 5], "x": 5.75, "y": 2 }, + { "matrix": [4, 6], "x": 6.75, "y": 2 }, + { "matrix": [4, 7], "x": 7.75, "y": 2 }, + { "matrix": [5, 0], "x": 8.75, "y": 2 }, + { "matrix": [5, 1], "x": 9.75, "y": 2 }, + { "matrix": [5, 2], "x": 10.75, "y": 2 }, + { "matrix": [5, 3], "x": 11.75, "y": 2 }, + { "matrix": [3, 5], "x": 12.75, "y": 2, "w": 2.25 }, + { "matrix": [6, 0], "x": 0, "y": 3, "w": 1.25 }, + { "matrix": [6, 1], "x": 1.25, "y": 3 }, + { "matrix": [6, 2], "x": 2.25, "y": 3 }, + { "matrix": [6, 3], "x": 3.25, "y": 3 }, + { "matrix": [6, 4], "x": 4.25, "y": 3 }, + { "matrix": [6, 5], "x": 5.25, "y": 3 }, + { "matrix": [6, 6], "x": 6.25, "y": 3 }, + { "matrix": [6, 7], "x": 7.25, "y": 3 }, + { "matrix": [7, 0], "x": 8.25, "y": 3 }, + { "matrix": [7, 1], "x": 9.25, "y": 3 }, + { "matrix": [7, 2], "x": 10.25, "y": 3 }, + { "matrix": [7, 3], "x": 11.25, "y": 3 }, + { "matrix": [7, 4], "x": 12.25, "y": 3, "w": 2.75 }, + { "matrix": [3, 6], "x": 16.5, "y": 3 }, + { "matrix": [8, 0], "x": 0, "y": 4, "w": 1.25 }, + { "matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25 }, + { "matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25 }, + { "matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25 }, + { "matrix": [8, 4], "x": 10, "y": 4, "w": 1.25 }, + { "matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25 }, + { "matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25 }, + { "matrix": [8, 7], "x": 13.75, "y": 4, "w": 1.25 }, + { "matrix": [1, 6], "x": 15.5, "y": 4 }, + { "matrix": [3, 7], "x": 16.5, "y": 4 }, + { "matrix": [1, 7], "x": 17.5, "y": 4 } + ] + } + } +} diff --git a/keyboards/frooastboard/walnut/keymaps/default/keymap.c b/keyboards/frooastboard/walnut/keymaps/default/keymap.c new file mode 100644 index 000000000000..195b3c150bb5 --- /dev/null +++ b/keyboards/frooastboard/walnut/keymaps/default/keymap.c @@ -0,0 +1,20 @@ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_all( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS, + 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, RGB_SAI, RGB_HUI, RGB_SPI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, + 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, RGB_VAI, + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) +}; diff --git a/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c new file mode 100644 index 000000000000..a65dfe3a6e28 --- /dev/null +++ b/keyboards/frooastboard/walnut/keymaps/default_ansi/keymap.c @@ -0,0 +1,20 @@ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_ansi( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS, + 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, RGB_SAI, RGB_HUI, RGB_SPI, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, + KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) +}; diff --git a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c similarity index 64% rename from keyboards/frooastboard/walnut_69/keymaps/default/keymap.c rename to keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c index cf019a65840a..8dd069ba3e0f 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/default/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/default_iso/keymap.c @@ -1,30 +1,17 @@ -/* Copyright 2022 frooastside - * - * 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 . - */ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_iso( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, - KC_LSFT, KC_NUBS, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT( + [1] = LAYOUT_iso( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS, 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, RGB_TOG, RGB_SAI, RGB_HUI, RGB_SPI, 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, diff --git a/keyboards/frooastboard/walnut/keymaps/via/config.h b/keyboards/frooastboard/walnut/keymaps/via/config.h new file mode 100644 index 000000000000..0ef255fb515b --- /dev/null +++ b/keyboards/frooastboard/walnut/keymaps/via/config.h @@ -0,0 +1,7 @@ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#define VIA_CUSTOM_LIGHTING_ENABLE +#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c b/keyboards/frooastboard/walnut/keymaps/via/keymap.c similarity index 81% rename from keyboards/frooastboard/walnut_69/keymaps/via/keymap.c rename to keyboards/frooastboard/walnut/keymaps/via/keymap.c index 0a3614e202b0..84b73e2186b1 100644 --- a/keyboards/frooastboard/walnut_69/keymaps/via/keymap.c +++ b/keyboards/frooastboard/walnut/keymaps/via/keymap.c @@ -1,33 +1,20 @@ -/* Copyright 2022 frooastside - * - * 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 . - */ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Z, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, - KC_LSFT, KC_NUBS, KC_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_MENU, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT( + [1] = LAYOUT_all( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, EE_CLR, KC_PSCR, KC_SCRL, KC_PAUS, - 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, RGB_TOG, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, 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, RGB_VAI, KC_TRNS, GUI_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_RMOD,RGB_VAD, RGB_MOD) }; diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/rules.mk b/keyboards/frooastboard/walnut/keymaps/via/rules.mk similarity index 100% rename from keyboards/frooastboard/walnut_69/keymaps/via/rules.mk rename to keyboards/frooastboard/walnut/keymaps/via/rules.mk diff --git a/keyboards/frooastboard/walnut/readme.md b/keyboards/frooastboard/walnut/readme.md new file mode 100644 index 000000000000..2723e56cfd9c --- /dev/null +++ b/keyboards/frooastboard/walnut/readme.md @@ -0,0 +1,27 @@ +# Frooastboard Walnut + +![frooastboard/walnut](https://i.imgur.com/4erTDZq.jpg) + +This is the Toastboard walnut keyboard. It is made of walnut wood, has 48 underglow LEDs and a solid aluminum base plate. It uses a USB Type-C connector and will likely be available for sale soon. + +* Keyboard Maintainer: [Frooastside](https://github.com/Frooastside) +* Hardware Supported: Frooastboard Walnut +* Hardware Availability: [Frooastboard Github](https://github.com/Frooastside/Frooastboard) + +Make example for this keyboard (after setting up your build environment): + + make frooastboard/walnut:default + +Flashing example for this keyboard: + + make frooastboard/walnut:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **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 - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/frooastboard/walnut/rules.mk b/keyboards/frooastboard/walnut/rules.mk new file mode 100644 index 000000000000..d0bb93e13691 --- /dev/null +++ b/keyboards/frooastboard/walnut/rules.mk @@ -0,0 +1,5 @@ +# Build Options +# change yes to no to disable +# +RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix +RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver diff --git a/keyboards/frooastboard/walnut_69/walnut_69.c b/keyboards/frooastboard/walnut/walnut.c similarity index 82% rename from keyboards/frooastboard/walnut_69/walnut_69.c rename to keyboards/frooastboard/walnut/walnut.c index 9b94eff4b660..0b84d3c5771a 100644 --- a/keyboards/frooastboard/walnut_69/walnut_69.c +++ b/keyboards/frooastboard/walnut/walnut.c @@ -1,20 +1,7 @@ -/* Copyright 2022 frooastside - * - * 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 . - */ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later -#include "walnut_69.h" +#include "walnut.h" #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/frooastboard/walnut/walnut.h b/keyboards/frooastboard/walnut/walnut.h new file mode 100644 index 000000000000..3ceb9bd689da --- /dev/null +++ b/keyboards/frooastboard/walnut/walnut.h @@ -0,0 +1,6 @@ +// Copyright 2022 Simon Benezan (@Frooastside) +// SPDX-License-Identifier: GPL-3.0-or-later + +#pragma once + +#include "quantum.h" diff --git a/keyboards/frooastboard/walnut_69/info.json b/keyboards/frooastboard/walnut_69/info.json deleted file mode 100644 index 934c6afd0956..000000000000 --- a/keyboards/frooastboard/walnut_69/info.json +++ /dev/null @@ -1,397 +0,0 @@ -{ - "keyboard_name": "Frooastboard Walnut", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/frooastboard/walnut_69", - "maintainer": "frooastside", - "debounce": 5, - "diode_direction": "COL2ROW", - "layouts": { - "LAYOUT": { - "layout": [ - { - "label": "Escape", - "x": 0, - "y": 0 - }, - { - "label": "1", - "x": 1, - "y": 0 - }, - { - "label": "2", - "x": 2, - "y": 0 - }, - { - "label": "3", - "x": 3, - "y": 0 - }, - { - "label": "4", - "x": 4, - "y": 0 - }, - { - "label": "5", - "x": 5, - "y": 0 - }, - { - "label": "6", - "x": 6, - "y": 0 - }, - { - "label": "7", - "x": 7, - "y": 0 - }, - { - "label": "8", - "x": 8, - "y": 0 - }, - { - "label": "9", - "x": 9, - "y": 0 - }, - { - "label": "0", - "x": 10, - "y": 0 - }, - { - "label": "-", - "x": 11, - "y": 0 - }, - { - "label": "=", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "Insert", - "x": 15.5, - "y": 0 - }, - { - "label": "Home", - "x": 16.5, - "y": 0 - }, - { - "label": "Page Up", - "x": 17.5, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Z", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "[", - "x": 11.5, - "y": 1 - }, - { - "label": "]", - "x": 12.5, - "y": 1 - }, - { - "label": "Enter", - "x": 13.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "Delete", - "x": 15.5, - "y": 1 - }, - { - "label": "End", - "x": 16.5, - "y": 1 - }, - { - "label": "Page Down", - "x": 17.5, - "y": 1 - }, - { - "label": "Caps Lock", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": ";", - "x": 10.75, - "y": 2 - }, - { - "label": "'", - "x": 11.75, - "y": 2 - }, - { - "label": "#", - "x": 12.75, - "y": 2 - }, - { - "label": "Left Shift", - "x": 0, - "y": 3, - "w": 1.25 - }, - { - "label": "\\", - "x": 1.25, - "y": 3 - }, - { - "label": "Y", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": ",", - "x": 9.25, - "y": 3 - }, - { - "label": ".", - "x": 10.25, - "y": 3 - }, - { - "label": "/", - "x": 11.25, - "y": 3 - }, - { - "label": "Right Shift", - "x": 12.25, - "y": 3, - "w": 2.75 - }, - { - "label": "Up Arrow", - "x": 16.5, - "y": 3 - }, - { - "label": "Left Control", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Left Windows Key", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Left Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "Right Alt", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "FN", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Menu", - "x": 12.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Right Control", - "x": 13.75, - "y": 4, - "w": 1.25 - }, - { - "label": "Left Arrow", - "x": 15.5, - "y": 4 - }, - { - "label": "Down Arrow", - "x": 16.5, - "y": 4 - }, - { - "label": "Right Arrow", - "x": 17.5, - "y": 4 - } - ] - } - }, - "matrix_pins": { - "rows": ["B4", "D7", "D6", "D4", "D5", "D3", "D2", "F1", "F0"], - "cols": ["B0", "B1", "B2", "B3", "B5", "B6", "C6", "C7"] - }, - "usb": { - "vid": "0x4642", - "pid": "0x776E", - "device_ver": "0x0001" - } -} diff --git a/keyboards/frooastboard/walnut_69/keymaps/via/config.h b/keyboards/frooastboard/walnut_69/keymaps/via/config.h deleted file mode 100644 index 9ccefcc466c9..000000000000 --- a/keyboards/frooastboard/walnut_69/keymaps/via/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2022 frooastside - * - * 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 - -#define VIA_CUSTOM_LIGHTING_ENABLE - -#define DYNAMIC_KEYMAP_LAYER_COUNT 2 diff --git a/keyboards/frooastboard/walnut_69/readme.md b/keyboards/frooastboard/walnut_69/readme.md deleted file mode 100644 index 89ee3d560739..000000000000 --- a/keyboards/frooastboard/walnut_69/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# Frooastboard Walnut - -- Keyboard Maintainer: [Frooastside](https://github.com/frooastside) -- Hardware Supported: Frooastboard Walnut -- Hardware Availability: https://github.com/Frooastside/Frooastboard - -**Reset Key:** Hold down the key located at `K00`, commonly programmed as ESCAPE while plugging in the keyboard. - -Make example for this keyboard (after setting up your build environment): - - make frooastboard/walnut_69:default - -Flashing example for this keyboard: - - make frooastboard/walnut_69: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/frooastboard/walnut_69/rules.mk b/keyboards/frooastboard/walnut_69/rules.mk deleted file mode 100644 index 3cb6c25ebfd8..000000000000 --- a/keyboards/frooastboard/walnut_69/rules.mk +++ /dev/null @@ -1,21 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = no # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix -RGB_MATRIX_DRIVER = IS31FL3737 # Select RGB matrix driver -AUDIO_ENABLE = no # Audio output -LTO_ENABLE = yes # Enables Link Time Optimization diff --git a/keyboards/frooastboard/walnut_69/walnut_69.h b/keyboards/frooastboard/walnut_69/walnut_69.h deleted file mode 100644 index 3960e592e71c..000000000000 --- a/keyboards/frooastboard/walnut_69/walnut_69.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2022 frooastside - * - * 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" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K10, K11, K12, K13, K14, K15, K55, K56, K57, \ - K20, K21, K22, K23, K24, K25, K26, K27, K30, K31, K32, K33, K34, K35, K75, K76, K77, \ - K40, K41, K42, K43, K44, K45, K46, K47, K50, K51, K52, K53, K54, \ - K60, K61, K62, K63, K64, K65, K66, K67, K70, K71, K72, K73, K74, K36, \ - K80, K81, K82, K83, K84, K85, K86, K87, K16, K37, K17 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87 } \ -} From 063cc7b91136c3e246a122a8e816ad3adb7430a6 Mon Sep 17 00:00:00 2001 From: Simon <47527944+Frooastside@users.noreply.github.com> Date: Tue, 29 Mar 2022 17:16:07 +0200 Subject: [PATCH 23/24] Update readme.md --- keyboards/frooastboard/walnut/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/frooastboard/walnut/readme.md b/keyboards/frooastboard/walnut/readme.md index 2723e56cfd9c..a1c339d7bfd8 100644 --- a/keyboards/frooastboard/walnut/readme.md +++ b/keyboards/frooastboard/walnut/readme.md @@ -2,7 +2,7 @@ ![frooastboard/walnut](https://i.imgur.com/4erTDZq.jpg) -This is the Toastboard walnut keyboard. It is made of walnut wood, has 48 underglow LEDs and a solid aluminum base plate. It uses a USB Type-C connector and will likely be available for sale soon. +This is the Frooastboard Walnut keyboard. It is made of walnut wood, has 48 underglow LEDs and a solid aluminum base plate. It uses a USB Type-C connector and will likely be available for sale soon. * Keyboard Maintainer: [Frooastside](https://github.com/Frooastside) * Hardware Supported: Frooastboard Walnut From 00d39216d7c37701be9b59362e1cac47e6c8448e Mon Sep 17 00:00:00 2001 From: Simon <47527944+Frooastside@users.noreply.github.com> Date: Tue, 5 Apr 2022 15:29:40 +0200 Subject: [PATCH 24/24] Update keyboards/frooastboard/walnut/readme.md Co-authored-by: Ryan --- keyboards/frooastboard/walnut/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/frooastboard/walnut/readme.md b/keyboards/frooastboard/walnut/readme.md index a1c339d7bfd8..c4baa40ce44f 100644 --- a/keyboards/frooastboard/walnut/readme.md +++ b/keyboards/frooastboard/walnut/readme.md @@ -1,6 +1,6 @@ # Frooastboard Walnut -![frooastboard/walnut](https://i.imgur.com/4erTDZq.jpg) +![frooastboard/walnut](https://i.imgur.com/4erTDZqh.jpg) This is the Frooastboard Walnut keyboard. It is made of walnut wood, has 48 underglow LEDs and a solid aluminum base plate. It uses a USB Type-C connector and will likely be available for sale soon.