From 97b54cb55907ec55dde94d31060e631736f01f2b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 23 May 2023 19:34:00 -0400 Subject: [PATCH 01/24] 1uposu5k --- keyboards/1upkeyboards/1uposu5k/config.h | 73 ++++++++++++++ keyboards/1upkeyboards/1uposu5k/info.json | 97 +++++++++++++++++++ .../1uposu5k/keymaps/default/keymap.c | 74 ++++++++++++++ .../1uposu5k/keymaps/default/rules.mk | 1 + .../1uposu5k/keymaps/via/keymap.c | 74 ++++++++++++++ .../1uposu5k/keymaps/via/rules.mk | 4 + keyboards/1upkeyboards/1uposu5k/readme.md | 22 +++++ keyboards/1upkeyboards/1uposu5k/rules.mk | 1 + 8 files changed, 346 insertions(+) create mode 100644 keyboards/1upkeyboards/1uposu5k/config.h create mode 100644 keyboards/1upkeyboards/1uposu5k/info.json create mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk create mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/1uposu5k/readme.md create mode 100644 keyboards/1upkeyboards/1uposu5k/rules.mk diff --git a/keyboards/1upkeyboards/1uposu5k/config.h b/keyboards/1upkeyboards/1uposu5k/config.h new file mode 100644 index 000000000000..4da00a1312e2 --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/config.h @@ -0,0 +1,73 @@ +/* Copyright 2023 Ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define RGB_DI_PIN GP24 +#define RGB_MATRIX_LED_COUNT 32 +#define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#define RGBLIGHT_LIMIT_VAL 255 + +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +// # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # 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_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH diff --git a/keyboards/1upkeyboards/1uposu5k/info.json b/keyboards/1upkeyboards/1uposu5k/info.json new file mode 100644 index 000000000000..e352cb2f077c --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/info.json @@ -0,0 +1,97 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "1uposu5k", + "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "device_version": "1.0.0", + "pid": "0x5607", + "vid": "0x6F75" + }, + "dynamic_keymap": { + "layer_count": 10 + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": false, + "rgb_matrix": true, + "rgblight": false + }, + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP25", "pin_b": "GP26" + } + ] + }, + "matrix_pins": { + "direct": [ + ["GP28", "GP29", "GP27", "GP1", "GP2"] + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 }, + { "flags": 4, "matrix": [0, 1], "x": 62, "y": 26 }, + { "flags": 4, "matrix": [0, 2], "x": 112, "y": 34 }, + { "flags": 4, "matrix": [0, 3], "x": 161, "y": 26 }, + { "flags": 4, "matrix": [0, 4], "x": 200, "y": 26 }, + + { "flags": 2, "x": 133, "y": 3 }, + { "flags": 2, "x": 154, "y": 3 }, + { "flags": 2, "x": 174, "y": 3 }, + { "flags": 2, "x": 194, "y": 3 }, + { "flags": 2, "x": 218, "y": 5 }, + + { "flags": 2, "x": 221, "y": 19 }, + { "flags": 2, "x": 221, "y": 31 }, + { "flags": 2, "x": 221, "y": 44 }, + { "flags": 2, "x": 217, "y": 58 }, + { "flags": 2, "x": 195, "y": 61 }, + + { "flags": 2, "x": 174, "y": 61 }, + { "flags": 2, "x": 154, "y": 61 }, + { "flags": 2, "x": 133, "y": 61 }, + { "flags": 2, "x": 112, "y": 61 }, + { "flags": 2, "x": 91, "y": 61 }, + + { "flags": 2, "x": 70, "y": 61 }, + { "flags": 2, "x": 49, "y": 61 }, + { "flags": 2, "x": 28, "y": 61 }, + { "flags": 2, "x": 5, "y": 58 }, + { "flags": 2, "x": 2, "y": 44 }, + + { "flags": 2, "x": 2, "y": 31 }, + { "flags": 2, "x": 2, "y": 19 }, + { "flags": 2, "x": 5, "y": 5 }, + { "flags": 2, "x": 28, "y": 3 }, + { "flags": 2, "x": 49, "y": 3 }, + + { "flags": 2, "x": 70, "y": 3 }, + { "flags": 2, "x": 91, "y": 3 } + ] + }, + "layouts": { + "LAYOUT_1x5": { + "layout": [ + { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 } + ] + } + } +} diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c new file mode 100644 index 000000000000..6f5ab8d61a5a --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c @@ -0,0 +1,74 @@ +/* Copyright 2023 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1x5( + KC_Z, KC_X, LT(1, KC_ESC), KC_C, KC_V + ), + + [1] = LAYOUT_1x5( + RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI + ), + + [2] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} +}; +#endif diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk b/keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c new file mode 100644 index 000000000000..6f5ab8d61a5a --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c @@ -0,0 +1,74 @@ +/* Copyright 2023 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1x5( + KC_Z, KC_X, LT(1, KC_ESC), KC_C, KC_V + ), + + [1] = LAYOUT_1x5( + RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI + ), + + [2] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_1x5( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} +}; +#endif diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk b/keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk new file mode 100644 index 000000000000..bf70b1f3e09f --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/1uposu5k/readme.md b/keyboards/1upkeyboards/1uposu5k/readme.md new file mode 100644 index 000000000000..0d45597ab678 --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/readme.md @@ -0,0 +1,22 @@ +# 1uposu5k + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) + +Make example for this keyboard (after setting up your build environment): + + make 1uposu5k:default + +Flashing example for this keyboard: + + make 1uposu5k: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 2 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**: Hold the button on the back of the PCB and plug in the keyboard diff --git a/keyboards/1upkeyboards/1uposu5k/rules.mk b/keyboards/1upkeyboards/1uposu5k/rules.mk new file mode 100644 index 000000000000..8e853e0af70b --- /dev/null +++ b/keyboards/1upkeyboards/1uposu5k/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor \ No newline at end of file From 49cd5a29c9507d7c9179d4456e3d41cb406aac4b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 13:27:24 -0400 Subject: [PATCH 02/24] slider8 --- keyboards/1upkeyboards/slider8/config.h | 91 ++++ keyboards/1upkeyboards/slider8/halconf.h | 8 + keyboards/1upkeyboards/slider8/info.json | 76 ++++ .../slider8/keymaps/default/keymap.c | 108 +++++ .../slider8/keymaps/default/rules.mk | 1 + .../1upkeyboards/slider8/keymaps/via/keymap.c | 109 +++++ .../1upkeyboards/slider8/keymaps/via/rules.mk | 3 + keyboards/1upkeyboards/slider8/lib/glcdfont.c | 231 +++++++++++ keyboards/1upkeyboards/slider8/mcuconf.h | 12 + keyboards/1upkeyboards/slider8/readme.md | 27 ++ keyboards/1upkeyboards/slider8/rules.mk | 3 + keyboards/1upkeyboards/slider8/slider8.c | 392 ++++++++++++++++++ 12 files changed, 1061 insertions(+) create mode 100644 keyboards/1upkeyboards/slider8/config.h create mode 100644 keyboards/1upkeyboards/slider8/halconf.h create mode 100644 keyboards/1upkeyboards/slider8/info.json create mode 100644 keyboards/1upkeyboards/slider8/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/slider8/keymaps/default/rules.mk create mode 100644 keyboards/1upkeyboards/slider8/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/slider8/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/slider8/lib/glcdfont.c create mode 100644 keyboards/1upkeyboards/slider8/mcuconf.h create mode 100644 keyboards/1upkeyboards/slider8/readme.md create mode 100644 keyboards/1upkeyboards/slider8/rules.mk create mode 100644 keyboards/1upkeyboards/slider8/slider8.c diff --git a/keyboards/1upkeyboards/slider8/config.h b/keyboards/1upkeyboards/slider8/config.h new file mode 100644 index 000000000000..870654c78d9f --- /dev/null +++ b/keyboards/1upkeyboards/slider8/config.h @@ -0,0 +1,91 @@ +/* Copyright 2022 Ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#ifdef OLED_ENABLE +# define OLED_DISPLAY_128X32 +#define I2C1_SCL_PIN GP11 +#define I2C1_SDA_PIN GP10 +#define I2C_DRIVER I2CD1 +#define OLED_BRIGHTNESS 128 +#define OLED_FONT_H "keyboards/1upkeyboards/slider8/lib/glcdfont.c" +#endif + +#define SLIDER_PIN GP28 +#define MIDI_ADVANCED + +#define RGB_DI_PIN GP26 +#define RGB_MATRIX_LED_COUNT 8 +#ifdef RGB_DI_PIN +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +# define RGBLIGHT_LIMIT_VAL 200 +#endif +#ifdef RGB_MATRIX_ENABLE +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +// # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # 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_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +// # define ENABLE_RGB_MATRIX_SPLASH +// # define ENABLE_RGB_MATRIX_MULTISPLASH +// # define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif + +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/halconf.h b/keyboards/1upkeyboards/slider8/halconf.h new file mode 100644 index 000000000000..a4b1751d8e47 --- /dev/null +++ b/keyboards/1upkeyboards/slider8/halconf.h @@ -0,0 +1,8 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#define HAL_USE_I2C TRUE +#define HAL_USE_ADC TRUE + +#include_next \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/info.json b/keyboards/1upkeyboards/slider8/info.json new file mode 100644 index 000000000000..7e95c99d381c --- /dev/null +++ b/keyboards/1upkeyboards/slider8/info.json @@ -0,0 +1,76 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "slider8", + "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "device_version": "1.0.0", + "pid": "0x5607", + "vid": "0x6F75" + }, + "debounce": 5, + "dynamic_keymap": { + "layer_count": 10 + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "oled": true, + "midi":true, + "rgb_matrix": true, + "rgblight": false + }, + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP21", + "pin_b": "GP22" + } + ] + }, + "keyboard_folder": "1upkeyboards/slider8", + "keymaps": {}, + "matrix_pins": { + "direct": [ + ["GP27", "GP17", "GP18", "GP19", "GP20", "GP15", "GP14", "GP13", "GP16"] + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [0, 1], "x": 28, "y": 16 }, + { "flags": 4, "matrix": [0, 2], "x": 84, "y": 16 }, + { "flags": 4, "matrix": [0, 3], "x": 140, "y": 16 }, + { "flags": 4, "matrix": [0, 4], "x": 196, "y": 16 }, + { "flags": 4, "matrix": [0, 5], "x": 28, "y": 48 }, + { "flags": 4, "matrix": [0, 6], "x": 84, "y": 48 }, + { "flags": 4, "matrix": [0, 7], "x": 140, "y": 48 }, + { "flags": 4, "matrix": [0, 8], "x": 196, "y": 48 } + ] + }, + "layouts": { + "LAYOUT_2x4": { + "layout": [ + { "label": "enc", "matrix": [0, 0], "w": 1, "x": 3, "y": 0 }, + + { "label": "1", "matrix": [0, 1], "w": 1, "x": 0, "y": 1 }, + { "label": "2", "matrix": [0, 2], "w": 1, "x": 1, "y": 1 }, + { "label": "3", "matrix": [0, 3], "w": 1, "x": 2, "y": 1 }, + { "label": "4", "matrix": [0, 4], "w": 1, "x": 3, "y": 1 }, + { "label": "5", "matrix": [0, 5], "w": 1, "x": 0, "y": 2 }, + { "label": "6", "matrix": [0, 6], "w": 1, "x": 1, "y": 2 }, + { "label": "7", "matrix": [0, 7], "w": 1, "x": 2, "y": 2 }, + { "label": "8", "matrix": [0, 8], "w": 1, "x": 3, "y": 2 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/slider8/keymaps/default/keymap.c new file mode 100644 index 000000000000..a5f7a02ace44 --- /dev/null +++ b/keyboards/1upkeyboards/slider8/keymaps/default/keymap.c @@ -0,0 +1,108 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "analog.h" +#include "qmk_midi.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_2x4( + RGB_TOG, + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8 + ), + + [1] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} +}; +#endif + +uint8_t divisor = 0; +void slider(void){ + if (divisor++) { // only run the slider function 1/256 times it's called + return; + } + midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3)); +} + +void matrix_scan_user(void) { + slider(); +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/keymaps/default/rules.mk b/keyboards/1upkeyboards/slider8/keymaps/default/rules.mk new file mode 100644 index 000000000000..a40474b4d5c7 --- /dev/null +++ b/keyboards/1upkeyboards/slider8/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/slider8/keymaps/via/keymap.c new file mode 100644 index 000000000000..9e0a6b324aeb --- /dev/null +++ b/keyboards/1upkeyboards/slider8/keymaps/via/keymap.c @@ -0,0 +1,109 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H +#include "analog.h" +#include "qmk_midi.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_2x4( + QK_BOOT, + KC_1, KC_2, KC_3, KC_4, + KC_5, KC_6, KC_7, KC_8 + ), + + [1] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_2x4( + KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} +}; +#endif + +uint8_t divisor = 0; +void slider(void){ + if (divisor++) { // only run the slider function 1/256 times it's called + return; + } + midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3)); + uprintf("%d string", analogReadPin(SLIDER_PIN) ); +} + +void matrix_scan_user(void) { + slider(); +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/keymaps/via/rules.mk b/keyboards/1upkeyboards/slider8/keymaps/via/rules.mk new file mode 100644 index 000000000000..15a5eaf11a11 --- /dev/null +++ b/keyboards/1upkeyboards/slider8/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes + +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/lib/glcdfont.c b/keyboards/1upkeyboards/slider8/lib/glcdfont.c new file mode 100644 index 000000000000..4b354756b609 --- /dev/null +++ b/keyboards/1upkeyboards/slider8/lib/glcdfont.c @@ -0,0 +1,231 @@ +// Copyright 2022 @filterpaper +// SPDX-License-Identifier: GPL-2.0+ + +#include "progmem.h" + +static const unsigned char PROGMEM font[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, + 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, + 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, + 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, + 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, + 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, + 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, + 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, + 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, + 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, + 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, + 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, + 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, + 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, + 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, + 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, + 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, + 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, + 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, + 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, + 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, + 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, + 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, + 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, + 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, + 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, + 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, + 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, + 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, + 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, + 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, + 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, + 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, + 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, + 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, + 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, + 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, + 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, + 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, + 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, + 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, + 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, + 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, + 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, + 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, + 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, + 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, + 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, + 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, + 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, + 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, + 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, + 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, + 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, + 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, + 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, + 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, + 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, + 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, + 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, + 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, + 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, + 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, + 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, + 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, + 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, + 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, + 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, + 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, + 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, + 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, + 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, + 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, + 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, + 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, + 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, + 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, + 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, + 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, + 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, + 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, + 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, + 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, + 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, + 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, + 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, + 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, + 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, + 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, + 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, + 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, + 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, + 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, + 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, + 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, + 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, + 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, + 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, + 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, + 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, + 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, + 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, + 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, + 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, + 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, + 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, + 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, + 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, + 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, + 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, + 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, + 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, + 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, + 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, + 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, + 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, + 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, + 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, + 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, + 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, + 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, + 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xE0, 0x18, 0x02, + 0x00, 0x3C, 0x1E, 0x06, 0x0E, 0x0A, + 0x1A, 0x0E, 0x26, 0xFF, 0xBF, 0x0D, + 0x00, 0x80, 0x80, 0x81, 0xFF, 0xFE, + 0xF8, 0x01, 0x01, 0x03, 0x03, 0x03, + 0x03, 0x05, 0x05, 0x02, 0x02, 0x0A, + 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, + 0x0C, 0x04, 0x10, 0x18, 0x20, 0xC0, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xD0, 0x58, 0x78, + 0x68, 0x2C, 0x24, 0x34, 0xF4, 0xF4, + 0x3C, 0x3C, 0xFC, 0xF8, 0xF8, 0x70, + 0xF0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xC0, 0x7C, 0x07, 0x80, 0xE0, + 0x60, 0x64, 0xE2, 0x60, 0x10, 0x10, + 0x20, 0x22, 0x12, 0x17, 0x3F, 0x0B, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, + 0x6F, 0xFC, 0xE0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, + 0x60, 0x60, 0x70, 0x70, 0xF0, 0xF0, + 0xD0, 0xD0, 0xD0, 0xD0, 0x50, 0x50, + 0x50, 0x70, 0x78, 0x78, 0x78, 0x7C, + 0x7F, 0x7D, 0x7C, 0x5E, 0x4F, 0x44, + 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x38, 0x30, 0x30, 0x30, 0x30, + 0x30, 0x30, 0x58, 0x46, 0x47, 0x41, + 0x41, 0x01, 0x01, 0x03, 0x03, 0x42, + 0x42, 0x42, 0x46, 0x46, 0x46, 0x46, + 0x42, 0x43, 0x43, 0x73, 0x77, 0x72, + 0x70, 0x60, 0x60, 0x60, 0x60, 0x60, + 0x60, 0x61, 0x67, 0x6F, 0x7E, 0x78, + 0x78, 0x70, 0x70, 0x70, 0x70, 0x70, + 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, + 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, + 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, + 0x40, 0x40, 0x40, 0x48, 0x58, 0x58, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +}; diff --git a/keyboards/1upkeyboards/slider8/mcuconf.h b/keyboards/1upkeyboards/slider8/mcuconf.h new file mode 100644 index 000000000000..893aaa30536c --- /dev/null +++ b/keyboards/1upkeyboards/slider8/mcuconf.h @@ -0,0 +1,12 @@ +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include_next + +#undef RP_I2C_USE_I2C0 +#undef RP_I2C_USE_I2C1 +#undef RP_ADC_USE_ADC1 +#define RP_I2C_USE_I2C0 FALSE +#define RP_I2C_USE_I2C1 TRUE +#define RP_ADC_USE_ADC1 TRUE \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/readme.md b/keyboards/1upkeyboards/slider8/readme.md new file mode 100644 index 000000000000..8ca0ff84037f --- /dev/null +++ b/keyboards/1upkeyboards/slider8/readme.md @@ -0,0 +1,27 @@ +# osu + +![osu](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make osu:default + +Flashing example for this keyboard: + + make osu: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/1upkeyboards/slider8/rules.mk b/keyboards/1upkeyboards/slider8/rules.mk new file mode 100644 index 000000000000..cbef0b65cf45 --- /dev/null +++ b/keyboards/1upkeyboards/slider8/rules.mk @@ -0,0 +1,3 @@ +WS2812_DRIVER = vendor +OLED_DRIVER = SSD1306 +SRC += analog.c \ No newline at end of file diff --git a/keyboards/1upkeyboards/slider8/slider8.c b/keyboards/1upkeyboards/slider8/slider8.c new file mode 100644 index 000000000000..c3c4ea9de86d --- /dev/null +++ b/keyboards/1upkeyboards/slider8/slider8.c @@ -0,0 +1,392 @@ +/* Copyright 2023 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" +#include "quantum/midi/midi.h" +#include "quantum/midi/midi_device.h" + +#ifdef OLED_ENABLE + +static uint32_t oled_logo_timer = 0; +static bool clear_logo = true; +static const char PROGMEM my_logo[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, + 0xE0, 0xF0, 0x70, 0x70, 0x70, 0x70, + 0xF0, 0xE0, 0xC0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x63, 0xE7, 0xE7, 0xCE, 0xCE, + 0xCE, 0xCE, 0xFC, 0xFC, 0x78, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xC0, 0xC0, 0xC1, + 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, + 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, + 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x1F, 0x1F, 0x1F, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFC, 0xFC, 0xFC, 0x1C, 0x1C, 0x1C, + 0x1C, 0x3C, 0xF8, 0xF8, 0xE0, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x7F, 0x7F, 0x7F, 0x70, + 0x70, 0x70, 0x70, 0x78, 0x3F, 0x3F, + 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, + 0xF0, 0xF0, 0x70, 0x70, 0x70, 0x70, + 0x70, 0x70, 0x70, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFF, 0xFF, 0xFF, 0xCE, 0xCE, + 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xC0, 0xC1, 0xC1, 0xC1, + 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x81, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, + 0xFF, 0x39, 0x39, 0x79, 0xF9, 0xF9, + 0xDF, 0x9F, 0x0F, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x03, 0x07, 0x07, 0x06, 0x04, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x1C, 0xBE, + 0xFF, 0x63, 0x63, 0xFF, 0xBE, 0x1C, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x07, 0x0F, 0x1F, 0x18, 0x18, 0x1F, + 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +oled_rotation_t oled_init_user(oled_rotation_t rotation) { + return OLED_ROTATION_270; +} + + +static const char PROGMEM ou_logo[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xFC, 0xFC, 0xCF, 0xCF, + 0x03, 0x03, 0x03, 0x03, 0xFF, 0xFF, + 0x03, 0x03, 0xFF, 0xFF, 0x03, 0x03, + 0x03, 0x03, 0xFF, 0xFF, 0x03, 0x03, + 0x03, 0x03, 0xF3, 0xF3, 0x03, 0x03, + 0x0C, 0x0C, 0xFC, 0xFC, 0x00, 0x00, + 0xFF, 0xFF, 0xC0, 0xC0, 0xC0, 0xC0, + 0xFF, 0xFF, 0xF0, 0xF0, 0xC3, 0xC3, + 0xC0, 0xC0, 0xF0, 0xF0, 0xFF, 0xFF, + 0xC0, 0xC0, 0xC0, 0xC0, 0xFC, 0xFC, + 0x0C, 0x0C, 0x0F, 0x0F, 0x03, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + + +static char PROGMEM caps_on[] = { + 0x00, 0x00, 0x00, 0xF8, 0x04, 0x04, + 0x04, 0x88, 0x00, 0x00, 0xE0, 0x58, + 0x44, 0x58, 0xE0, 0x00, 0x00, 0xFC, + 0x24, 0x24, 0x24, 0x18, 0x00, 0x00, + 0x98, 0x24, 0x24, 0x24, 0xC8, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x81, + 0xC0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF1, + 0xF0, 0xF1, 0xF0, 0xF0, 0xE0, 0xC0, + 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F, + 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +static char PROGMEM caps_off[] = { + 0x00, 0x00, 0x00, 0xF8, 0x04, 0x04, + 0x04, 0x88, 0x00, 0x00, 0xE0, 0x58, + 0x44, 0x58, 0xE0, 0x00, 0x00, 0xFC, + 0x24, 0x24, 0x24, 0x18, 0x00, 0x00, + 0x98, 0x24, 0x24, 0x24, 0xC8, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x81, + 0xC0, 0xE0, 0xF0, 0x70, 0x30, 0x31, + 0x30, 0x31, 0x70, 0xF0, 0xE0, 0xC0, + 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E, + 0x3C, 0x38, 0x30, 0x30, 0x30, 0x30, + 0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +static const char PROGMEM num_on[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, + 0x18, 0x20, 0xC0, 0xFC, 0x00, 0x00, + 0x00, 0xFC, 0x00, 0x00, 0x00, 0xFC, + 0x00, 0x00, 0xFC, 0x18, 0x60, 0x80, + 0x60, 0x18, 0xFC, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x81, + 0xC0, 0xE0, 0xF0, 0xF0, 0xF1, 0xF1, + 0xF1, 0xF0, 0xF0, 0xF0, 0xE1, 0xC0, + 0x80, 0x01, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F, + 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +static const char PROGMEM num_off[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, + 0x18, 0x20, 0xC0, 0xFC, 0x00, 0x00, + 0x00, 0xFC, 0x00, 0x00, 0x00, 0xFC, + 0x00, 0x00, 0xFC, 0x18, 0x60, 0x80, + 0x60, 0x18, 0xFC, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x81, + 0xC0, 0xE0, 0xF0, 0x70, 0x31, 0x31, + 0x31, 0x30, 0x70, 0xF0, 0xE1, 0xC0, + 0x80, 0x01, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E, + 0x3C, 0x38, 0x30, 0x30, 0x30, 0x30, + 0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +static const char PROGMEM scrl_on[] = { + 0x00, 0x00, 0x00, 0x98, 0x24, 0x24, + 0x24, 0xC8, 0x00, 0x00, 0xF8, 0x04, + 0x04, 0x04, 0x88, 0x00, 0x00, 0xFC, + 0x24, 0x24, 0xE4, 0x18, 0x00, 0x00, + 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x80, + 0xC0, 0xE1, 0xF1, 0xF1, 0xF0, 0xF0, + 0xF0, 0xF1, 0xF0, 0xF0, 0xE0, 0xC1, + 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F, + 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +static const char PROGMEM scrl_off[] = { + 0x00, 0x00, 0x00, 0x98, 0x24, 0x24, + 0x24, 0xC8, 0x00, 0x00, 0xF8, 0x04, + 0x04, 0x04, 0x88, 0x00, 0x00, 0xFC, + 0x24, 0x24, 0xE4, 0x18, 0x00, 0x00, + 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x01, 0x00, 0x00, 0x80, + 0xC0, 0xE1, 0xF1, 0x71, 0x30, 0x30, + 0x30, 0x31, 0x70, 0xF0, 0xE0, 0xC1, + 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E, + 0x3C, 0x38, 0x30, 0x30, 0x30, 0x30, + 0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00 + }; + +static void render_oled(void) { + const int combined_size = sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off) + sizeof(scrl_off); + char combined[combined_size]; + led_t led_state = host_keyboard_led_state(); + + memcpy_P(combined, ou_logo, sizeof(ou_logo)); + + if (led_state.caps_lock) { + memcpy_P(combined + sizeof(ou_logo), caps_on, sizeof(caps_off)); + } + else { + memcpy_P(combined + sizeof(ou_logo), caps_off, sizeof(caps_off)); + } + + if (led_state.num_lock) { + memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off), num_on, sizeof(num_off)); + } + else { + memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off), num_off, sizeof(num_off)); + } + + if (led_state.scroll_lock) { + memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off), scrl_on, sizeof(scrl_off)); + } + else { + memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off), scrl_off, sizeof(scrl_off)); + } + + oled_write_raw_P(combined, sizeof(combined)); +} + +void render_logo(void) { + oled_write_raw_P(my_logo, sizeof(my_logo)); +} + +void clear_screen(void) { + if (clear_logo){ + for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) { + for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) { + oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j); + } + } + clear_logo = false; + } +} + +#define MIDI_CONTROL_CHANGE 0xB0 + +MidiDevice _midi_device; + +void midi_callback(uint8_t cable, uint8_t *midi_data, uint16_t length) { + // Check if this is a MIDI CC message on channel 2 + if ((midi_data[0] & 0xF0) == MIDI_CONTROL_CHANGE && midi_data[0] & (0x0F == 1)) { + uprintf("%s string", midi_data ); + // ... + } +} + +void slider8_cc_callback(struct _midi_device *dev, uint8_t cable, uint8_t code_index, uint8_t value) { + midi_callback(MIDI_CONTROL_CHANGE, &value, 1); +} + +void init_timer(void){ + oled_logo_timer = timer_read32(); +}; + +void keyboard_post_init_kb(void) { + init_timer(); + + keyboard_post_init_user(); +} + +void keyboard_post_init_user(void) { + // Customise these values to desired behaviour + debug_enable=true; + debug_matrix=true; + //debug_keyboard=true; + //debug_mouse=true; +} + +void matrix_init_user(void) { + midi_register_cc_callback(&_midi_device, slider8_cc_callback); +} + +# define SHOW_LOGO 5000 +bool oled_task_kb(void) { + if (!oled_task_user()) { return false; } + if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){ + render_logo(); + }else{ + clear_screen(); + render_oled(); + } + return false; +} + + +#endif \ No newline at end of file From 3d88a79da82c1db60106f85f9debdaead51cb090 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 13:28:23 -0400 Subject: [PATCH 03/24] change folder name --- keyboards/1upkeyboards/{slider8 => 1upslider8}/config.h | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/halconf.h | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/info.json | 0 .../1upkeyboards/{slider8 => 1upslider8}/keymaps/default/keymap.c | 0 .../1upkeyboards/{slider8 => 1upslider8}/keymaps/default/rules.mk | 0 .../1upkeyboards/{slider8 => 1upslider8}/keymaps/via/keymap.c | 0 .../1upkeyboards/{slider8 => 1upslider8}/keymaps/via/rules.mk | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/lib/glcdfont.c | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/mcuconf.h | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/readme.md | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/rules.mk | 0 keyboards/1upkeyboards/{slider8 => 1upslider8}/slider8.c | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/config.h (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/halconf.h (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/info.json (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/keymaps/default/keymap.c (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/keymaps/default/rules.mk (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/keymaps/via/keymap.c (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/keymaps/via/rules.mk (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/lib/glcdfont.c (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/mcuconf.h (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/readme.md (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/rules.mk (100%) rename keyboards/1upkeyboards/{slider8 => 1upslider8}/slider8.c (100%) diff --git a/keyboards/1upkeyboards/slider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h similarity index 100% rename from keyboards/1upkeyboards/slider8/config.h rename to keyboards/1upkeyboards/1upslider8/config.h diff --git a/keyboards/1upkeyboards/slider8/halconf.h b/keyboards/1upkeyboards/1upslider8/halconf.h similarity index 100% rename from keyboards/1upkeyboards/slider8/halconf.h rename to keyboards/1upkeyboards/1upslider8/halconf.h diff --git a/keyboards/1upkeyboards/slider8/info.json b/keyboards/1upkeyboards/1upslider8/info.json similarity index 100% rename from keyboards/1upkeyboards/slider8/info.json rename to keyboards/1upkeyboards/1upslider8/info.json diff --git a/keyboards/1upkeyboards/slider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c similarity index 100% rename from keyboards/1upkeyboards/slider8/keymaps/default/keymap.c rename to keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c diff --git a/keyboards/1upkeyboards/slider8/keymaps/default/rules.mk b/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk similarity index 100% rename from keyboards/1upkeyboards/slider8/keymaps/default/rules.mk rename to keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk diff --git a/keyboards/1upkeyboards/slider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c similarity index 100% rename from keyboards/1upkeyboards/slider8/keymaps/via/keymap.c rename to keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c diff --git a/keyboards/1upkeyboards/slider8/keymaps/via/rules.mk b/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk similarity index 100% rename from keyboards/1upkeyboards/slider8/keymaps/via/rules.mk rename to keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk diff --git a/keyboards/1upkeyboards/slider8/lib/glcdfont.c b/keyboards/1upkeyboards/1upslider8/lib/glcdfont.c similarity index 100% rename from keyboards/1upkeyboards/slider8/lib/glcdfont.c rename to keyboards/1upkeyboards/1upslider8/lib/glcdfont.c diff --git a/keyboards/1upkeyboards/slider8/mcuconf.h b/keyboards/1upkeyboards/1upslider8/mcuconf.h similarity index 100% rename from keyboards/1upkeyboards/slider8/mcuconf.h rename to keyboards/1upkeyboards/1upslider8/mcuconf.h diff --git a/keyboards/1upkeyboards/slider8/readme.md b/keyboards/1upkeyboards/1upslider8/readme.md similarity index 100% rename from keyboards/1upkeyboards/slider8/readme.md rename to keyboards/1upkeyboards/1upslider8/readme.md diff --git a/keyboards/1upkeyboards/slider8/rules.mk b/keyboards/1upkeyboards/1upslider8/rules.mk similarity index 100% rename from keyboards/1upkeyboards/slider8/rules.mk rename to keyboards/1upkeyboards/1upslider8/rules.mk diff --git a/keyboards/1upkeyboards/slider8/slider8.c b/keyboards/1upkeyboards/1upslider8/slider8.c similarity index 100% rename from keyboards/1upkeyboards/slider8/slider8.c rename to keyboards/1upkeyboards/1upslider8/slider8.c From 77217cc334b9326c658304e6b1264ed5c3001a11 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 14:50:04 -0400 Subject: [PATCH 04/24] slider8 --- keyboards/1upkeyboards/1upslider8/config.h | 79 +++++++++---------- keyboards/1upkeyboards/1upslider8/halconf.h | 4 +- keyboards/1upkeyboards/1upslider8/info.json | 5 +- .../1upslider8/keymaps/via/keymap.c | 4 +- keyboards/1upkeyboards/1upslider8/mcuconf.h | 4 +- keyboards/1upkeyboards/1upslider8/readme.md | 17 ++-- 6 files changed, 48 insertions(+), 65 deletions(-) diff --git a/keyboards/1upkeyboards/1upslider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h index 870654c78d9f..b18646810671 100644 --- a/keyboards/1upkeyboards/1upslider8/config.h +++ b/keyboards/1upkeyboards/1upslider8/config.h @@ -1,4 +1,4 @@ -/* Copyright 2022 Ziptyze +/* Copyright 2023 Ziptyze * * 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 @@ -16,65 +16,61 @@ #pragma once -#ifdef OLED_ENABLE -# define OLED_DISPLAY_128X32 +#define OLED_DISPLAY_128X32 #define I2C1_SCL_PIN GP11 #define I2C1_SDA_PIN GP10 #define I2C_DRIVER I2CD1 #define OLED_BRIGHTNESS 128 -#define OLED_FONT_H "keyboards/1upkeyboards/slider8/lib/glcdfont.c" -#endif +#define OLED_FONT_H "keyboards/1upkeyboards/1upslider8/lib/glcdfont.c" + #define SLIDER_PIN GP28 #define MIDI_ADVANCED #define RGB_DI_PIN GP26 #define RGB_MATRIX_LED_COUNT 8 -#ifdef RGB_DI_PIN -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -# define RGBLIGHT_LIMIT_VAL 200 -#endif -#ifdef RGB_MATRIX_ENABLE -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 +#define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#define RGBLIGHT_LIMIT_VAL 255 +#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects // # define ENABLE_RGB_MATRIX_ALPHAS_MODS // # 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_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_RAIN // # define ENABLE_RGB_MATRIX_PIXEL_FLOW // # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP // # define ENABLE_RGB_MATRIX_DIGITAL_RAIN // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE // # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS @@ -84,8 +80,7 @@ // # define ENABLE_RGB_MATRIX_SPLASH // # define ENABLE_RGB_MATRIX_MULTISPLASH // # define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH #define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 \ No newline at end of file +#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/1upkeyboards/1upslider8/halconf.h b/keyboards/1upkeyboards/1upslider8/halconf.h index a4b1751d8e47..eb2d5d462e0c 100644 --- a/keyboards/1upkeyboards/1upslider8/halconf.h +++ b/keyboards/1upkeyboards/1upslider8/halconf.h @@ -1,8 +1,6 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #define HAL_USE_I2C TRUE #define HAL_USE_ADC TRUE -#include_next \ No newline at end of file +#include_next diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/info.json index 7e95c99d381c..b407f57c5386 100644 --- a/keyboards/1upkeyboards/1upslider8/info.json +++ b/keyboards/1upkeyboards/1upslider8/info.json @@ -10,7 +10,6 @@ "pid": "0x5607", "vid": "0x6F75" }, - "debounce": 5, "dynamic_keymap": { "layer_count": 10 }, @@ -37,8 +36,6 @@ } ] }, - "keyboard_folder": "1upkeyboards/slider8", - "keymaps": {}, "matrix_pins": { "direct": [ ["GP27", "GP17", "GP18", "GP19", "GP20", "GP15", "GP14", "GP13", "GP16"] @@ -73,4 +70,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c index 9e0a6b324aeb..d40bf387e0c5 100644 --- a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2022 ziptyze +/* Copyright 2023 ziptyze * * 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 @@ -106,4 +106,4 @@ void slider(void){ void matrix_scan_user(void) { slider(); -} \ No newline at end of file +} diff --git a/keyboards/1upkeyboards/1upslider8/mcuconf.h b/keyboards/1upkeyboards/1upslider8/mcuconf.h index 893aaa30536c..1ca25516aa3e 100644 --- a/keyboards/1upkeyboards/1upslider8/mcuconf.h +++ b/keyboards/1upkeyboards/1upslider8/mcuconf.h @@ -1,5 +1,3 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later #pragma once #include_next @@ -9,4 +7,4 @@ #undef RP_ADC_USE_ADC1 #define RP_I2C_USE_I2C0 FALSE #define RP_I2C_USE_I2C1 TRUE -#define RP_ADC_USE_ADC1 TRUE \ No newline at end of file +#define RP_ADC_USE_ADC1 TRUE diff --git a/keyboards/1upkeyboards/1upslider8/readme.md b/keyboards/1upkeyboards/1upslider8/readme.md index 8ca0ff84037f..c4a79008fbcd 100644 --- a/keyboards/1upkeyboards/1upslider8/readme.md +++ b/keyboards/1upkeyboards/1upslider8/readme.md @@ -1,20 +1,16 @@ -# osu +This keyboard is the slider8 from 1upkeyboards.com, a small macropad with an oled, slide potentiometer, rotary encoder, and 8 switches in a 2x4 ortholinear arrangement with per-key in-switch rgb leds. -![osu](imgur.com image replace me!) - -*A short description of the keyboard/project* +The slide potentiometer presents to the computer as a midi device and will need a seperate program to map to device control. * Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* Make example for this keyboard (after setting up your build environment): - make osu:default + make 1upslider8:default Flashing example for this keyboard: - make osu:default:flash + make 1upslider8: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). @@ -22,6 +18,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to 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 +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard +* **Physical reset button**: Hold down the button on the pi pico and plug in the keyboard From 2c4711dc0a163804381f0c10b535c498acd9ae64 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 15:10:45 -0400 Subject: [PATCH 05/24] slider8_update --- keyboards/1upkeyboards/1upslider8/halconf.h | 3 +++ keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c | 2 +- keyboards/1upkeyboards/1upslider8/mcuconf.h | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/1upslider8/halconf.h b/keyboards/1upkeyboards/1upslider8/halconf.h index eb2d5d462e0c..bc09e4db56dc 100644 --- a/keyboards/1upkeyboards/1upslider8/halconf.h +++ b/keyboards/1upkeyboards/1upslider8/halconf.h @@ -1,3 +1,6 @@ +// Copyright 2023 ziptyze +// SPDX-License-Identifier: GPL-2.0-or-later#pragma once + #pragma once #define HAL_USE_I2C TRUE diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c index d40bf387e0c5..568eccab2825 100644 --- a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_2x4( - QK_BOOT, + RGB_TOG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8 ), diff --git a/keyboards/1upkeyboards/1upslider8/mcuconf.h b/keyboards/1upkeyboards/1upslider8/mcuconf.h index 1ca25516aa3e..d401986c6d16 100644 --- a/keyboards/1upkeyboards/1upslider8/mcuconf.h +++ b/keyboards/1upkeyboards/1upslider8/mcuconf.h @@ -1,3 +1,6 @@ +// Copyright 2023 ziptyze +// SPDX-License-Identifier: GPL-2.0-or-later#pragma once + #pragma once #include_next From a71cd5cb46e8bce964e08da5e8fd1cf5f2f7475d Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:02:53 -0400 Subject: [PATCH 06/24] Update keyboards/1upkeyboards/1uposu5k/config.h Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1uposu5k/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/1uposu5k/config.h b/keyboards/1upkeyboards/1uposu5k/config.h index 4da00a1312e2..3a06807538a6 100644 --- a/keyboards/1upkeyboards/1uposu5k/config.h +++ b/keyboards/1upkeyboards/1uposu5k/config.h @@ -19,7 +19,6 @@ #define RGB_DI_PIN GP24 #define RGB_MATRIX_LED_COUNT 32 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGBLIGHT_LIMIT_VAL 255 # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 From 3d212d57567e1ddb4ebb020074ebb24039470688 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:03:03 -0400 Subject: [PATCH 07/24] Update keyboards/1upkeyboards/1uposu5k/config.h Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1uposu5k/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/1uposu5k/config.h b/keyboards/1upkeyboards/1uposu5k/config.h index 3a06807538a6..06f868bb2da8 100644 --- a/keyboards/1upkeyboards/1uposu5k/config.h +++ b/keyboards/1upkeyboards/1uposu5k/config.h @@ -21,7 +21,6 @@ #define RGB_MATRIX_KEYPRESSES // reacts to keypresses # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects From c1ebfea6a7c4bf09c80c3d83f208429e124ea239 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:03:16 -0400 Subject: [PATCH 08/24] Update keyboards/1upkeyboards/1uposu5k/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1uposu5k/info.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/info.json b/keyboards/1upkeyboards/1uposu5k/info.json index e352cb2f077c..92a670725f54 100644 --- a/keyboards/1upkeyboards/1uposu5k/info.json +++ b/keyboards/1upkeyboards/1uposu5k/info.json @@ -14,8 +14,6 @@ "layer_count": 10 }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": false, @@ -23,9 +21,7 @@ "extrakey": true, "mousekey": true, "nkro": false, - "oled": false, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "encoder": { "enabled": true, From cbd76deb79cc9c987842844ff7271780b99af2e7 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:03:28 -0400 Subject: [PATCH 09/24] Update keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../1uposu5k/keymaps/default/keymap.c | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c index 6f5ab8d61a5a..813b250fc2ae 100644 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c @@ -23,38 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_1x5( RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI - ), - - [2] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [4] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [5] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [6] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [7] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [8] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [9] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; From 8dae85e61c84b2d7d40f2e624610b0539607e49c Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:03:49 -0400 Subject: [PATCH 10/24] Update keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c Co-authored-by: Joel Challis --- .../1uposu5k/keymaps/via/keymap.c | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c index 6f5ab8d61a5a..813b250fc2ae 100644 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c @@ -23,38 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_1x5( RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI - ), - - [2] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [4] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [5] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [6] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [7] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [8] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [9] = LAYOUT_1x5( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; From 9eb9e25b74152a80d6fc4097d14be5e0b9df0e68 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:04:07 -0400 Subject: [PATCH 11/24] Update keyboards/1upkeyboards/1uposu5k/readme.md Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1uposu5k/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/readme.md b/keyboards/1upkeyboards/1uposu5k/readme.md index 0d45597ab678..d54c44f07b0f 100644 --- a/keyboards/1upkeyboards/1uposu5k/readme.md +++ b/keyboards/1upkeyboards/1uposu5k/readme.md @@ -6,11 +6,11 @@ Make example for this keyboard (after setting up your build environment): - make 1uposu5k:default + make 1upkeyboards/1uposu5k:default Flashing example for this keyboard: - make 1uposu5k:default:flash + make 1upkeyboards/1uposu5k:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 8b31e750df430dae930ca9e604627a155a2d8480 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:04:19 -0400 Subject: [PATCH 12/24] Update keyboards/1upkeyboards/1upslider8/config.h Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1upslider8/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/1upslider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h index b18646810671..1ed7c69bae89 100644 --- a/keyboards/1upkeyboards/1upslider8/config.h +++ b/keyboards/1upkeyboards/1upslider8/config.h @@ -30,7 +30,6 @@ #define RGB_DI_PIN GP26 #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGBLIGHT_LIMIT_VAL 255 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // RGB Matrix Animation modes. Explicitly enabled From 08e474ff64bc4913b162f391dc076137817c2649 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:04:28 -0400 Subject: [PATCH 13/24] Update keyboards/1upkeyboards/1upslider8/config.h Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1upslider8/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/1upslider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h index 1ed7c69bae89..bd09c49bc171 100644 --- a/keyboards/1upkeyboards/1upslider8/config.h +++ b/keyboards/1upkeyboards/1upslider8/config.h @@ -31,7 +31,6 @@ #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects From 19e667064398d58595f81d1fee738137b6d7d503 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:04:41 -0400 Subject: [PATCH 14/24] Update keyboards/1upkeyboards/1upslider8/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1upslider8/info.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/info.json index b407f57c5386..2e9995440f5f 100644 --- a/keyboards/1upkeyboards/1upslider8/info.json +++ b/keyboards/1upkeyboards/1upslider8/info.json @@ -14,8 +14,6 @@ "layer_count": 10 }, "features": { - "audio": false, - "backlight": false, "bootmagic": true, "command": false, "console": true, @@ -24,8 +22,7 @@ "nkro": false, "oled": true, "midi":true, - "rgb_matrix": true, - "rgblight": false + "rgb_matrix": true }, "encoder": { "enabled": true, From 37deaf52d0efd2ddc9e3fed69a1d97a8ec79a22f Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:05:00 -0400 Subject: [PATCH 15/24] Update keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../1upkeyboards/1uposu5k/keymaps/default/keymap.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c index 813b250fc2ae..cfc478ca3c23 100644 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c @@ -29,14 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} }; #endif From 4a9dc78765cff6571cdf7f9189fae65db825eb89 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:06:28 -0400 Subject: [PATCH 16/24] Update keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c index 813b250fc2ae..a668a6ec9d3a 100644 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c @@ -30,13 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} }; #endif From 8ebc263e7d83ea6e420ef2081c9e9b3bb9eb8435 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:06:48 -0400 Subject: [PATCH 17/24] Update keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../1upslider8/keymaps/default/keymap.c | 54 ------------------- 1 file changed, 54 deletions(-) diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c index a5f7a02ace44..bede0714b086 100644 --- a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c @@ -23,60 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8 - ), - - [1] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [4] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [5] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [6] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [7] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [8] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [9] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; From b06568030b2ceb674e8ea6cdf7e4b099e26d2c76 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:07:12 -0400 Subject: [PATCH 18/24] Update keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../1upkeyboards/1upslider8/keymaps/default/keymap.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c index bede0714b086..f2912e7ccdb7 100644 --- a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c @@ -28,16 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} + [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)} }; #endif From 84d1e532bb06592a84175561b13efb7c2eefa240 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:08:39 -0400 Subject: [PATCH 19/24] Apply suggestions from code review Co-authored-by: Joel Challis --- .../1upslider8/keymaps/via/keymap.c | 65 +------------------ keyboards/1upkeyboards/1upslider8/readme.md | 6 +- keyboards/1upkeyboards/1upslider8/slider8.c | 8 --- 3 files changed, 5 insertions(+), 74 deletions(-) diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c index 568eccab2825..696633495908 100644 --- a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c @@ -23,75 +23,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8 - ), - - [1] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [4] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [5] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [6] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [7] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [8] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [9] = LAYOUT_2x4( - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} + [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)} }; #endif diff --git a/keyboards/1upkeyboards/1upslider8/readme.md b/keyboards/1upkeyboards/1upslider8/readme.md index c4a79008fbcd..d708a1371149 100644 --- a/keyboards/1upkeyboards/1upslider8/readme.md +++ b/keyboards/1upkeyboards/1upslider8/readme.md @@ -1,3 +1,5 @@ +# slider8 + This keyboard is the slider8 from 1upkeyboards.com, a small macropad with an oled, slide potentiometer, rotary encoder, and 8 switches in a 2x4 ortholinear arrangement with per-key in-switch rgb leds. The slide potentiometer presents to the computer as a midi device and will need a seperate program to map to device control. @@ -6,11 +8,11 @@ The slide potentiometer presents to the computer as a midi device and will need Make example for this keyboard (after setting up your build environment): - make 1upslider8:default + make 1upkeyboards/1upslider8:default Flashing example for this keyboard: - make 1upslider8:default:flash + make 1upkeyboards/1upslider8: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/1upkeyboards/1upslider8/slider8.c b/keyboards/1upkeyboards/1upslider8/slider8.c index c3c4ea9de86d..944835288e32 100644 --- a/keyboards/1upkeyboards/1upslider8/slider8.c +++ b/keyboards/1upkeyboards/1upslider8/slider8.c @@ -364,14 +364,6 @@ void keyboard_post_init_kb(void) { keyboard_post_init_user(); } -void keyboard_post_init_user(void) { - // Customise these values to desired behaviour - debug_enable=true; - debug_matrix=true; - //debug_keyboard=true; - //debug_mouse=true; -} - void matrix_init_user(void) { midi_register_cc_callback(&_midi_device, slider8_cc_callback); } From 51fa3f9fc9aad41fb96a71868c8d8ea399038588 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 24 May 2023 22:19:31 -0400 Subject: [PATCH 20/24] Update keymap.c --- keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c index a668a6ec9d3a..cfc478ca3c23 100644 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c @@ -29,7 +29,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} }; #endif From 46582926d6b8d5084d2f53b150b5589fe13b0c9c Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 31 May 2023 12:09:27 -0400 Subject: [PATCH 21/24] change osu5k to ocarina and requested changes for pr --- keyboards/1upkeyboards/1upocarina/config.h | 70 ++++++++++++++ keyboards/1upkeyboards/1upocarina/info.json | 96 +++++++++++++++++++ .../1upocarina/keymaps/default/keymap.c | 34 +++++++ .../1upocarina/keymaps/default/rules.mk | 1 + .../1upocarina/keymaps/via/keymap.c | 34 +++++++ .../1upocarina/keymaps/via/rules.mk | 4 + keyboards/1upkeyboards/1upocarina/readme.md | 22 +++++ keyboards/1upkeyboards/1upocarina/rules.mk | 1 + 8 files changed, 262 insertions(+) create mode 100644 keyboards/1upkeyboards/1upocarina/config.h create mode 100644 keyboards/1upkeyboards/1upocarina/info.json create mode 100644 keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/1upocarina/keymaps/default/rules.mk create mode 100644 keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/1upocarina/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/1upocarina/readme.md create mode 100644 keyboards/1upkeyboards/1upocarina/rules.mk diff --git a/keyboards/1upkeyboards/1upocarina/config.h b/keyboards/1upkeyboards/1upocarina/config.h new file mode 100644 index 000000000000..4431ef6bdbcf --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/config.h @@ -0,0 +1,70 @@ +/* Copyright 2023 Ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define RGB_MATRIX_LED_COUNT 32 +#define RGB_MATRIX_KEYPRESSES // reacts to keypresses + +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +// # define ENABLE_RGB_MATRIX_ALPHAS_MODS +// # 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_RAIN +// # define ENABLE_RGB_MATRIX_PIXEL_FLOW +// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH diff --git a/keyboards/1upkeyboards/1upocarina/info.json b/keyboards/1upkeyboards/1upocarina/info.json new file mode 100644 index 000000000000..6b37eef2b5e1 --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/info.json @@ -0,0 +1,96 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "1upocarina", + "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "device_version": "1.0.0", + "pid": "0x5607", + "vid": "0x6F75" + }, + "dynamic_keymap": { + "layer_count": 10 + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true + }, + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP25", "pin_b": "GP26" + } + ] + }, + "matrix_pins": { + "direct": [ + ["GP28", "GP29", "GP27", "GP1", "GP2"] + ] + }, + "ws2812": { + "pin": "GP24" + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 }, + { "flags": 4, "matrix": [0, 1], "x": 62, "y": 26 }, + { "flags": 4, "matrix": [0, 2], "x": 112, "y": 34 }, + { "flags": 4, "matrix": [0, 3], "x": 161, "y": 26 }, + { "flags": 4, "matrix": [0, 4], "x": 200, "y": 26 }, + + { "flags": 2, "x": 133, "y": 3 }, + { "flags": 2, "x": 154, "y": 3 }, + { "flags": 2, "x": 174, "y": 3 }, + { "flags": 2, "x": 194, "y": 3 }, + { "flags": 2, "x": 218, "y": 5 }, + + { "flags": 2, "x": 221, "y": 19 }, + { "flags": 2, "x": 221, "y": 31 }, + { "flags": 2, "x": 221, "y": 44 }, + { "flags": 2, "x": 217, "y": 58 }, + { "flags": 2, "x": 195, "y": 61 }, + + { "flags": 2, "x": 174, "y": 61 }, + { "flags": 2, "x": 154, "y": 61 }, + { "flags": 2, "x": 133, "y": 61 }, + { "flags": 2, "x": 112, "y": 61 }, + { "flags": 2, "x": 91, "y": 61 }, + + { "flags": 2, "x": 70, "y": 61 }, + { "flags": 2, "x": 49, "y": 61 }, + { "flags": 2, "x": 28, "y": 61 }, + { "flags": 2, "x": 5, "y": 58 }, + { "flags": 2, "x": 2, "y": 44 }, + + { "flags": 2, "x": 2, "y": 31 }, + { "flags": 2, "x": 2, "y": 19 }, + { "flags": 2, "x": 5, "y": 5 }, + { "flags": 2, "x": 28, "y": 3 }, + { "flags": 2, "x": 49, "y": 3 }, + + { "flags": 2, "x": 70, "y": 3 }, + { "flags": 2, "x": 91, "y": 3 } + ] + }, + "layouts": { + "LAYOUT_1x5": { + "layout": [ + { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 } + ] + } + } +} diff --git a/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c new file mode 100644 index 000000000000..86e3f440feee --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2023 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1x5( + KC_Z, KC_X, LT(1, KC_ESC), KC_C, KC_V + ), + + [1] = LAYOUT_1x5( + RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} +}; +#endif diff --git a/keyboards/1upkeyboards/1upocarina/keymaps/default/rules.mk b/keyboards/1upkeyboards/1upocarina/keymaps/default/rules.mk new file mode 100644 index 000000000000..ee325681483f --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c new file mode 100644 index 000000000000..cfc478ca3c23 --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2023 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_1x5( + KC_Z, KC_X, LT(1, KC_ESC), KC_C, KC_V + ), + + [1] = LAYOUT_1x5( + RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} +}; +#endif diff --git a/keyboards/1upkeyboards/1upocarina/keymaps/via/rules.mk b/keyboards/1upkeyboards/1upocarina/keymaps/via/rules.mk new file mode 100644 index 000000000000..bf70b1f3e09f --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/keymaps/via/rules.mk @@ -0,0 +1,4 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes + +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/1upocarina/readme.md b/keyboards/1upkeyboards/1upocarina/readme.md new file mode 100644 index 000000000000..280c9f01d6df --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/readme.md @@ -0,0 +1,22 @@ +# 1upocarina + +This keyboard is the Ocarina from 1upkeyboards. It is a five button keypad designed for osu. There is an option to add an encoder to the center position, and the keypad features in-switch per-key addressable RGB leds, as well as 27 right angle underglow RGB leds for very bright and smooth lighting effects. + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/1upocarina:default + +Flashing example for this keyboard: + + make 1upkeyboards/1upocarina: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 2 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**: Hold the button on the back of the PCB and plug in the keyboard diff --git a/keyboards/1upkeyboards/1upocarina/rules.mk b/keyboards/1upkeyboards/1upocarina/rules.mk new file mode 100644 index 000000000000..8e853e0af70b --- /dev/null +++ b/keyboards/1upkeyboards/1upocarina/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor \ No newline at end of file From 2aa58d3b2df42c65cfb369055baba9719d9cafb7 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Thu, 1 Jun 2023 15:26:58 -0400 Subject: [PATCH 22/24] remove slider8 from this branch --- .../1upocarina/keymaps/via/keymap.c | 2 +- keyboards/1upkeyboards/1uposu5k/info.json | 93 ----- .../1uposu5k/keymaps/default/keymap.c | 34 -- .../1uposu5k/keymaps/default/rules.mk | 1 - .../1uposu5k/keymaps/via/keymap.c | 34 -- keyboards/1upkeyboards/1uposu5k/readme.md | 22 - keyboards/1upkeyboards/1uposu5k/rules.mk | 1 - keyboards/1upkeyboards/1upslider8/config.h | 84 ---- keyboards/1upkeyboards/1upslider8/halconf.h | 9 - keyboards/1upkeyboards/1upslider8/info.json | 70 ---- .../1upslider8/keymaps/default/keymap.c | 45 -- .../1upslider8/keymaps/via/keymap.c | 46 --- .../1upslider8/keymaps/via/rules.mk | 3 - .../1upkeyboards/1upslider8/lib/glcdfont.c | 231 ----------- keyboards/1upkeyboards/1upslider8/mcuconf.h | 13 - keyboards/1upkeyboards/1upslider8/readme.md | 24 -- keyboards/1upkeyboards/1upslider8/rules.mk | 3 - keyboards/1upkeyboards/1upslider8/slider8.c | 384 ------------------ keyboards/1upkeyboards/super16v2/config.h | 15 +- keyboards/1upkeyboards/super16v2/info.json | 315 ++++++++++++-- .../super16v2/keymaps/default/keymap.c | 86 +++- .../keymaps/default/rules.mk | 0 .../super16v2/keymaps/via/keymap.c | 56 +++ .../super16v2/keymaps/via/rules.mk | 1 + keyboards/1upkeyboards/super16v2/rules.mk | 14 - .../{1uposu5k => super16v2_old}/config.h | 65 ++- .../1upkeyboards/super16v2_old/info.json | 55 +++ .../super16v2_old/keymaps/default/keymap.c | 50 +++ .../super16v2_old/keymaps/default/readme.md | 1 + .../super16v2_old/keymaps/mouse/keymap.c | 50 +++ .../super16v2_old/keymaps/mouse/readme.md | 1 + .../super16v2_old/keymaps/via/keymap.c | 48 +++ .../super16v2_old/keymaps/via/readme.md | 1 + .../keymaps/via/rules.mk | 2 - .../1upkeyboards/super16v2_old/readme.md | 25 ++ keyboards/1upkeyboards/super16v2_old/rules.mk | 14 + .../{super16v2 => super16v2_old}/super16v2.c | 0 37 files changed, 699 insertions(+), 1199 deletions(-) delete mode 100644 keyboards/1upkeyboards/1uposu5k/info.json delete mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c delete mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk delete mode 100644 keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c delete mode 100644 keyboards/1upkeyboards/1uposu5k/readme.md delete mode 100644 keyboards/1upkeyboards/1uposu5k/rules.mk delete mode 100644 keyboards/1upkeyboards/1upslider8/config.h delete mode 100644 keyboards/1upkeyboards/1upslider8/halconf.h delete mode 100644 keyboards/1upkeyboards/1upslider8/info.json delete mode 100644 keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c delete mode 100644 keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c delete mode 100644 keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk delete mode 100644 keyboards/1upkeyboards/1upslider8/lib/glcdfont.c delete mode 100644 keyboards/1upkeyboards/1upslider8/mcuconf.h delete mode 100644 keyboards/1upkeyboards/1upslider8/readme.md delete mode 100644 keyboards/1upkeyboards/1upslider8/rules.mk delete mode 100644 keyboards/1upkeyboards/1upslider8/slider8.c rename keyboards/1upkeyboards/{1upslider8 => super16v2}/keymaps/default/rules.mk (100%) rename keyboards/1upkeyboards/{1uposu5k => super16v2_old}/config.h (60%) create mode 100644 keyboards/1upkeyboards/super16v2_old/info.json create mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md create mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c create mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md create mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/via/readme.md rename keyboards/1upkeyboards/{1uposu5k => super16v2_old}/keymaps/via/rules.mk (57%) create mode 100644 keyboards/1upkeyboards/super16v2_old/readme.md create mode 100644 keyboards/1upkeyboards/super16v2_old/rules.mk rename keyboards/1upkeyboards/{super16v2 => super16v2_old}/super16v2.c (100%) diff --git a/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c index cfc478ca3c23..86e3f440feee 100644 --- a/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/1upocarina/keymaps/via/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} }; diff --git a/keyboards/1upkeyboards/1uposu5k/info.json b/keyboards/1upkeyboards/1uposu5k/info.json deleted file mode 100644 index 92a670725f54..000000000000 --- a/keyboards/1upkeyboards/1uposu5k/info.json +++ /dev/null @@ -1,93 +0,0 @@ -{ - "manufacturer": "1upkeyboards", - "keyboard_name": "1uposu5k", - "maintainer": "ziptyze", - "processor": "RP2040", - "bootloader": "rp2040", - "board": "GENERIC_RP_RP2040", - "usb": { - "device_version": "1.0.0", - "pid": "0x5607", - "vid": "0x6F75" - }, - "dynamic_keymap": { - "layer_count": 10 - }, - "features": { - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": false, - "rgb_matrix": true - }, - "encoder": { - "enabled": true, - "rotary": [ - { - "pin_a": "GP25", "pin_b": "GP26" - } - ] - }, - "matrix_pins": { - "direct": [ - ["GP28", "GP29", "GP27", "GP1", "GP2"] - ] - }, - "rgb_matrix": { - "driver": "WS2812", - "layout": [ - { "flags": 4, "matrix": [0, 0], "x": 23, "y": 26 }, - { "flags": 4, "matrix": [0, 1], "x": 62, "y": 26 }, - { "flags": 4, "matrix": [0, 2], "x": 112, "y": 34 }, - { "flags": 4, "matrix": [0, 3], "x": 161, "y": 26 }, - { "flags": 4, "matrix": [0, 4], "x": 200, "y": 26 }, - - { "flags": 2, "x": 133, "y": 3 }, - { "flags": 2, "x": 154, "y": 3 }, - { "flags": 2, "x": 174, "y": 3 }, - { "flags": 2, "x": 194, "y": 3 }, - { "flags": 2, "x": 218, "y": 5 }, - - { "flags": 2, "x": 221, "y": 19 }, - { "flags": 2, "x": 221, "y": 31 }, - { "flags": 2, "x": 221, "y": 44 }, - { "flags": 2, "x": 217, "y": 58 }, - { "flags": 2, "x": 195, "y": 61 }, - - { "flags": 2, "x": 174, "y": 61 }, - { "flags": 2, "x": 154, "y": 61 }, - { "flags": 2, "x": 133, "y": 61 }, - { "flags": 2, "x": 112, "y": 61 }, - { "flags": 2, "x": 91, "y": 61 }, - - { "flags": 2, "x": 70, "y": 61 }, - { "flags": 2, "x": 49, "y": 61 }, - { "flags": 2, "x": 28, "y": 61 }, - { "flags": 2, "x": 5, "y": 58 }, - { "flags": 2, "x": 2, "y": 44 }, - - { "flags": 2, "x": 2, "y": 31 }, - { "flags": 2, "x": 2, "y": 19 }, - { "flags": 2, "x": 5, "y": 5 }, - { "flags": 2, "x": 28, "y": 3 }, - { "flags": 2, "x": 49, "y": 3 }, - - { "flags": 2, "x": 70, "y": 3 }, - { "flags": 2, "x": 91, "y": 3 } - ] - }, - "layouts": { - "LAYOUT_1x5": { - "layout": [ - { "label": "z", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "x", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "esc", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "c", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "v", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 } - ] - } - } -} diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c deleted file mode 100644 index cfc478ca3c23..000000000000 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2023 ziptyze - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_1x5( - KC_Z, KC_X, LT(1, KC_ESC), KC_C, KC_V - ), - - [1] = LAYOUT_1x5( - RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} -}; -#endif diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk b/keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk deleted file mode 100644 index ee325681483f..000000000000 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c b/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c deleted file mode 100644 index cfc478ca3c23..000000000000 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2023 ziptyze - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_1x5( - KC_Z, KC_X, LT(1, KC_ESC), KC_C, KC_V - ), - - [1] = LAYOUT_1x5( - RGB_TOG, RGB_MOD, KC_TRNS, RGB_VAD, RGB_VAI - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)} -}; -#endif diff --git a/keyboards/1upkeyboards/1uposu5k/readme.md b/keyboards/1upkeyboards/1uposu5k/readme.md deleted file mode 100644 index d54c44f07b0f..000000000000 --- a/keyboards/1upkeyboards/1uposu5k/readme.md +++ /dev/null @@ -1,22 +0,0 @@ -# 1uposu5k - -*A short description of the keyboard/project* - -* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) - -Make example for this keyboard (after setting up your build environment): - - make 1upkeyboards/1uposu5k:default - -Flashing example for this keyboard: - - make 1upkeyboards/1uposu5k: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 2 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**: Hold the button on the back of the PCB and plug in the keyboard diff --git a/keyboards/1upkeyboards/1uposu5k/rules.mk b/keyboards/1upkeyboards/1uposu5k/rules.mk deleted file mode 100644 index 8e853e0af70b..000000000000 --- a/keyboards/1upkeyboards/1uposu5k/rules.mk +++ /dev/null @@ -1 +0,0 @@ -WS2812_DRIVER = vendor \ No newline at end of file diff --git a/keyboards/1upkeyboards/1upslider8/config.h b/keyboards/1upkeyboards/1upslider8/config.h deleted file mode 100644 index bd09c49bc171..000000000000 --- a/keyboards/1upkeyboards/1upslider8/config.h +++ /dev/null @@ -1,84 +0,0 @@ -/* Copyright 2023 Ziptyze - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#define OLED_DISPLAY_128X32 -#define I2C1_SCL_PIN GP11 -#define I2C1_SDA_PIN GP10 -#define I2C_DRIVER I2CD1 -#define OLED_BRIGHTNESS 128 -#define OLED_FONT_H "keyboards/1upkeyboards/1upslider8/lib/glcdfont.c" - - -#define SLIDER_PIN GP28 -#define MIDI_ADVANCED - -#define RGB_DI_PIN GP26 -#define RGB_MATRIX_LED_COUNT 8 -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -// # define ENABLE_RGB_MATRIX_ALPHAS_MODS -// # 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_RAIN -// # define ENABLE_RGB_MATRIX_PIXEL_FLOW -// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -// # define ENABLE_RGB_MATRIX_SPLASH -// # define ENABLE_RGB_MATRIX_MULTISPLASH -// # define ENABLE_RGB_MATRIX_SOLID_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keyboards/1upkeyboards/1upslider8/halconf.h b/keyboards/1upkeyboards/1upslider8/halconf.h deleted file mode 100644 index bc09e4db56dc..000000000000 --- a/keyboards/1upkeyboards/1upslider8/halconf.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2023 ziptyze -// SPDX-License-Identifier: GPL-2.0-or-later#pragma once - -#pragma once - -#define HAL_USE_I2C TRUE -#define HAL_USE_ADC TRUE - -#include_next diff --git a/keyboards/1upkeyboards/1upslider8/info.json b/keyboards/1upkeyboards/1upslider8/info.json deleted file mode 100644 index 2e9995440f5f..000000000000 --- a/keyboards/1upkeyboards/1upslider8/info.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "manufacturer": "1upkeyboards", - "keyboard_name": "slider8", - "maintainer": "ziptyze", - "processor": "RP2040", - "bootloader": "rp2040", - "board": "GENERIC_RP_RP2040", - "usb": { - "device_version": "1.0.0", - "pid": "0x5607", - "vid": "0x6F75" - }, - "dynamic_keymap": { - "layer_count": 10 - }, - "features": { - "bootmagic": true, - "command": false, - "console": true, - "extrakey": true, - "mousekey": true, - "nkro": false, - "oled": true, - "midi":true, - "rgb_matrix": true - }, - "encoder": { - "enabled": true, - "rotary": [ - { - "pin_a": "GP21", - "pin_b": "GP22" - } - ] - }, - "matrix_pins": { - "direct": [ - ["GP27", "GP17", "GP18", "GP19", "GP20", "GP15", "GP14", "GP13", "GP16"] - ] - }, - "rgb_matrix": { - "driver": "WS2812", - "layout": [ - { "flags": 4, "matrix": [0, 1], "x": 28, "y": 16 }, - { "flags": 4, "matrix": [0, 2], "x": 84, "y": 16 }, - { "flags": 4, "matrix": [0, 3], "x": 140, "y": 16 }, - { "flags": 4, "matrix": [0, 4], "x": 196, "y": 16 }, - { "flags": 4, "matrix": [0, 5], "x": 28, "y": 48 }, - { "flags": 4, "matrix": [0, 6], "x": 84, "y": 48 }, - { "flags": 4, "matrix": [0, 7], "x": 140, "y": 48 }, - { "flags": 4, "matrix": [0, 8], "x": 196, "y": 48 } - ] - }, - "layouts": { - "LAYOUT_2x4": { - "layout": [ - { "label": "enc", "matrix": [0, 0], "w": 1, "x": 3, "y": 0 }, - - { "label": "1", "matrix": [0, 1], "w": 1, "x": 0, "y": 1 }, - { "label": "2", "matrix": [0, 2], "w": 1, "x": 1, "y": 1 }, - { "label": "3", "matrix": [0, 3], "w": 1, "x": 2, "y": 1 }, - { "label": "4", "matrix": [0, 4], "w": 1, "x": 3, "y": 1 }, - { "label": "5", "matrix": [0, 5], "w": 1, "x": 0, "y": 2 }, - { "label": "6", "matrix": [0, 6], "w": 1, "x": 1, "y": 2 }, - { "label": "7", "matrix": [0, 7], "w": 1, "x": 2, "y": 2 }, - { "label": "8", "matrix": [0, 8], "w": 1, "x": 3, "y": 2 } - ] - } - } -} diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c deleted file mode 100644 index f2912e7ccdb7..000000000000 --- a/keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2022 ziptyze - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H -#include "analog.h" -#include "qmk_midi.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_2x4( - RGB_TOG, - KC_1, KC_2, KC_3, KC_4, - KC_5, KC_6, KC_7, KC_8 - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)} -}; -#endif - -uint8_t divisor = 0; -void slider(void){ - if (divisor++) { // only run the slider function 1/256 times it's called - return; - } - midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3)); -} - -void matrix_scan_user(void) { - slider(); -} \ No newline at end of file diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c b/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c deleted file mode 100644 index 696633495908..000000000000 --- a/keyboards/1upkeyboards/1upslider8/keymaps/via/keymap.c +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2023 ziptyze - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H -#include "analog.h" -#include "qmk_midi.h" - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_2x4( - RGB_TOG, - KC_1, KC_2, KC_3, KC_4, - KC_5, KC_6, KC_7, KC_8 - ) -}; - -#if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)} -}; -#endif - -uint8_t divisor = 0; -void slider(void){ - if (divisor++) { // only run the slider function 1/256 times it's called - return; - } - midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3)); - uprintf("%d string", analogReadPin(SLIDER_PIN) ); -} - -void matrix_scan_user(void) { - slider(); -} diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk b/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk deleted file mode 100644 index 15a5eaf11a11..000000000000 --- a/keyboards/1upkeyboards/1upslider8/keymaps/via/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -VIA_ENABLE = yes - -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/1upslider8/lib/glcdfont.c b/keyboards/1upkeyboards/1upslider8/lib/glcdfont.c deleted file mode 100644 index 4b354756b609..000000000000 --- a/keyboards/1upkeyboards/1upslider8/lib/glcdfont.c +++ /dev/null @@ -1,231 +0,0 @@ -// Copyright 2022 @filterpaper -// SPDX-License-Identifier: GPL-2.0+ - -#include "progmem.h" - -static const unsigned char PROGMEM font[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, - 0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, - 0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, - 0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, - 0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, - 0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, - 0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, - 0x00, 0x18, 0x24, 0x18, 0x00, 0x00, - 0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, - 0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, - 0x26, 0x29, 0x79, 0x29, 0x26, 0x00, - 0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, - 0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, - 0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, - 0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, - 0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, - 0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, - 0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, - 0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, - 0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, - 0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, - 0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, - 0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, - 0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, - 0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, - 0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, - 0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, - 0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x5F, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, - 0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, - 0x24, 0x2A, 0x7F, 0x2A, 0x12, 0x00, - 0x23, 0x13, 0x08, 0x64, 0x62, 0x00, - 0x36, 0x49, 0x56, 0x20, 0x50, 0x00, - 0x00, 0x08, 0x07, 0x03, 0x00, 0x00, - 0x00, 0x1C, 0x22, 0x41, 0x00, 0x00, - 0x00, 0x41, 0x22, 0x1C, 0x00, 0x00, - 0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, - 0x08, 0x08, 0x3E, 0x08, 0x08, 0x00, - 0x00, 0x80, 0x70, 0x30, 0x00, 0x00, - 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, - 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, - 0x20, 0x10, 0x08, 0x04, 0x02, 0x00, - 0x3E, 0x51, 0x49, 0x45, 0x3E, 0x00, - 0x00, 0x42, 0x7F, 0x40, 0x00, 0x00, - 0x72, 0x49, 0x49, 0x49, 0x46, 0x00, - 0x21, 0x41, 0x49, 0x4D, 0x33, 0x00, - 0x18, 0x14, 0x12, 0x7F, 0x10, 0x00, - 0x27, 0x45, 0x45, 0x45, 0x39, 0x00, - 0x3C, 0x4A, 0x49, 0x49, 0x31, 0x00, - 0x41, 0x21, 0x11, 0x09, 0x07, 0x00, - 0x36, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x46, 0x49, 0x49, 0x29, 0x1E, 0x00, - 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, - 0x00, 0x40, 0x34, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x14, 0x14, 0x14, 0x14, 0x14, 0x00, - 0x00, 0x41, 0x22, 0x14, 0x08, 0x00, - 0x02, 0x01, 0x59, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x5D, 0x59, 0x4E, 0x00, - 0x7C, 0x12, 0x11, 0x12, 0x7C, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x36, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x22, 0x00, - 0x7F, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x49, 0x49, 0x49, 0x41, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x01, 0x00, - 0x3E, 0x41, 0x41, 0x51, 0x73, 0x00, - 0x7F, 0x08, 0x08, 0x08, 0x7F, 0x00, - 0x00, 0x41, 0x7F, 0x41, 0x00, 0x00, - 0x20, 0x40, 0x41, 0x3F, 0x01, 0x00, - 0x7F, 0x08, 0x14, 0x22, 0x41, 0x00, - 0x7F, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x7F, 0x02, 0x1C, 0x02, 0x7F, 0x00, - 0x7F, 0x04, 0x08, 0x10, 0x7F, 0x00, - 0x3E, 0x41, 0x41, 0x41, 0x3E, 0x00, - 0x7F, 0x09, 0x09, 0x09, 0x06, 0x00, - 0x3E, 0x41, 0x51, 0x21, 0x5E, 0x00, - 0x7F, 0x09, 0x19, 0x29, 0x46, 0x00, - 0x26, 0x49, 0x49, 0x49, 0x32, 0x00, - 0x03, 0x01, 0x7F, 0x01, 0x03, 0x00, - 0x3F, 0x40, 0x40, 0x40, 0x3F, 0x00, - 0x1F, 0x20, 0x40, 0x20, 0x1F, 0x00, - 0x3F, 0x40, 0x38, 0x40, 0x3F, 0x00, - 0x63, 0x14, 0x08, 0x14, 0x63, 0x00, - 0x03, 0x04, 0x78, 0x04, 0x03, 0x00, - 0x61, 0x59, 0x49, 0x4D, 0x43, 0x00, - 0x00, 0x7F, 0x41, 0x41, 0x41, 0x00, - 0x02, 0x04, 0x08, 0x10, 0x20, 0x00, - 0x00, 0x41, 0x41, 0x41, 0x7F, 0x00, - 0x04, 0x02, 0x01, 0x02, 0x04, 0x00, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, - 0x00, 0x03, 0x07, 0x08, 0x00, 0x00, - 0x20, 0x54, 0x54, 0x78, 0x40, 0x00, - 0x7F, 0x28, 0x44, 0x44, 0x38, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x28, 0x00, - 0x38, 0x44, 0x44, 0x28, 0x7F, 0x00, - 0x38, 0x54, 0x54, 0x54, 0x18, 0x00, - 0x00, 0x08, 0x7E, 0x09, 0x02, 0x00, - 0x18, 0x24, 0x24, 0x1C, 0x78, 0x00, - 0x7F, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x00, 0x44, 0x7D, 0x40, 0x00, 0x00, - 0x20, 0x40, 0x40, 0x3D, 0x00, 0x00, - 0x7F, 0x10, 0x28, 0x44, 0x00, 0x00, - 0x00, 0x41, 0x7F, 0x40, 0x00, 0x00, - 0x7C, 0x04, 0x78, 0x04, 0x78, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x78, 0x00, - 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, - 0x7C, 0x18, 0x24, 0x24, 0x18, 0x00, - 0x18, 0x24, 0x24, 0x18, 0x7C, 0x00, - 0x7C, 0x08, 0x04, 0x04, 0x08, 0x00, - 0x48, 0x54, 0x54, 0x54, 0x24, 0x00, - 0x04, 0x04, 0x3F, 0x44, 0x24, 0x00, - 0x3C, 0x40, 0x40, 0x20, 0x7C, 0x00, - 0x1C, 0x20, 0x40, 0x20, 0x1C, 0x00, - 0x3C, 0x40, 0x30, 0x40, 0x3C, 0x00, - 0x44, 0x28, 0x10, 0x28, 0x44, 0x00, - 0x4C, 0x90, 0x90, 0x90, 0x7C, 0x00, - 0x44, 0x64, 0x54, 0x4C, 0x44, 0x00, - 0x00, 0x08, 0x36, 0x41, 0x00, 0x00, - 0x00, 0x00, 0x77, 0x00, 0x00, 0x00, - 0x00, 0x41, 0x36, 0x08, 0x00, 0x00, - 0x02, 0x01, 0x02, 0x04, 0x02, 0x00, - 0x3C, 0x26, 0x23, 0x26, 0x3C, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xE0, 0x18, 0x02, - 0x00, 0x3C, 0x1E, 0x06, 0x0E, 0x0A, - 0x1A, 0x0E, 0x26, 0xFF, 0xBF, 0x0D, - 0x00, 0x80, 0x80, 0x81, 0xFF, 0xFE, - 0xF8, 0x01, 0x01, 0x03, 0x03, 0x03, - 0x03, 0x05, 0x05, 0x02, 0x02, 0x0A, - 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, - 0x0C, 0x04, 0x10, 0x18, 0x20, 0xC0, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xD0, 0x58, 0x78, - 0x68, 0x2C, 0x24, 0x34, 0xF4, 0xF4, - 0x3C, 0x3C, 0xFC, 0xF8, 0xF8, 0x70, - 0xF0, 0xE0, 0xE0, 0xC0, 0xC0, 0x80, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xC0, 0x7C, 0x07, 0x80, 0xE0, - 0x60, 0x64, 0xE2, 0x60, 0x10, 0x10, - 0x20, 0x22, 0x12, 0x17, 0x3F, 0x0B, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x21, - 0x6F, 0xFC, 0xE0, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, - 0x60, 0x60, 0x70, 0x70, 0xF0, 0xF0, - 0xD0, 0xD0, 0xD0, 0xD0, 0x50, 0x50, - 0x50, 0x70, 0x78, 0x78, 0x78, 0x7C, - 0x7F, 0x7D, 0x7C, 0x5E, 0x4F, 0x44, - 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x38, 0x30, 0x30, 0x30, 0x30, - 0x30, 0x30, 0x58, 0x46, 0x47, 0x41, - 0x41, 0x01, 0x01, 0x03, 0x03, 0x42, - 0x42, 0x42, 0x46, 0x46, 0x46, 0x46, - 0x42, 0x43, 0x43, 0x73, 0x77, 0x72, - 0x70, 0x60, 0x60, 0x60, 0x60, 0x60, - 0x60, 0x61, 0x67, 0x6F, 0x7E, 0x78, - 0x78, 0x70, 0x70, 0x70, 0x70, 0x70, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, - 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, - 0x40, 0x40, 0x40, 0x48, 0x58, 0x58, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; diff --git a/keyboards/1upkeyboards/1upslider8/mcuconf.h b/keyboards/1upkeyboards/1upslider8/mcuconf.h deleted file mode 100644 index d401986c6d16..000000000000 --- a/keyboards/1upkeyboards/1upslider8/mcuconf.h +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2023 ziptyze -// SPDX-License-Identifier: GPL-2.0-or-later#pragma once - -#pragma once - -#include_next - -#undef RP_I2C_USE_I2C0 -#undef RP_I2C_USE_I2C1 -#undef RP_ADC_USE_ADC1 -#define RP_I2C_USE_I2C0 FALSE -#define RP_I2C_USE_I2C1 TRUE -#define RP_ADC_USE_ADC1 TRUE diff --git a/keyboards/1upkeyboards/1upslider8/readme.md b/keyboards/1upkeyboards/1upslider8/readme.md deleted file mode 100644 index d708a1371149..000000000000 --- a/keyboards/1upkeyboards/1upslider8/readme.md +++ /dev/null @@ -1,24 +0,0 @@ -# slider8 - -This keyboard is the slider8 from 1upkeyboards.com, a small macropad with an oled, slide potentiometer, rotary encoder, and 8 switches in a 2x4 ortholinear arrangement with per-key in-switch rgb leds. - -The slide potentiometer presents to the computer as a midi device and will need a seperate program to map to device control. - -* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) - -Make example for this keyboard (after setting up your build environment): - - make 1upkeyboards/1upslider8:default - -Flashing example for this keyboard: - - make 1upkeyboards/1upslider8: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 top left key and plug in the keyboard -* **Physical reset button**: Hold down the button on the pi pico and plug in the keyboard diff --git a/keyboards/1upkeyboards/1upslider8/rules.mk b/keyboards/1upkeyboards/1upslider8/rules.mk deleted file mode 100644 index cbef0b65cf45..000000000000 --- a/keyboards/1upkeyboards/1upslider8/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -WS2812_DRIVER = vendor -OLED_DRIVER = SSD1306 -SRC += analog.c \ No newline at end of file diff --git a/keyboards/1upkeyboards/1upslider8/slider8.c b/keyboards/1upkeyboards/1upslider8/slider8.c deleted file mode 100644 index 944835288e32..000000000000 --- a/keyboards/1upkeyboards/1upslider8/slider8.c +++ /dev/null @@ -1,384 +0,0 @@ -/* Copyright 2023 ziptyze - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" -#include "quantum/midi/midi.h" -#include "quantum/midi/midi_device.h" - -#ifdef OLED_ENABLE - -static uint32_t oled_logo_timer = 0; -static bool clear_logo = true; -static const char PROGMEM my_logo[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, - 0xE0, 0xF0, 0x70, 0x70, 0x70, 0x70, - 0xF0, 0xE0, 0xC0, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x63, 0xE7, 0xE7, 0xCE, 0xCE, - 0xCE, 0xCE, 0xFC, 0xFC, 0x78, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xC0, 0xC0, 0xC1, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, - 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x07, 0x07, 0x07, 0x07, 0x07, - 0x07, 0x07, 0x07, 0x07, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x1F, 0x1F, 0x1F, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFC, 0xFC, 0xFC, 0x1C, 0x1C, 0x1C, - 0x1C, 0x3C, 0xF8, 0xF8, 0xE0, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x7F, 0x7F, 0x7F, 0x70, - 0x70, 0x70, 0x70, 0x78, 0x3F, 0x3F, - 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, - 0xF0, 0xF0, 0x70, 0x70, 0x70, 0x70, - 0x70, 0x70, 0x70, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xFF, 0xFF, 0xFF, 0xCE, 0xCE, - 0xCE, 0xCE, 0xCE, 0xCE, 0xCE, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xC0, 0xC1, 0xC1, 0xC1, - 0xC1, 0xC1, 0xC1, 0xC1, 0xC1, 0x81, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, - 0xFF, 0x39, 0x39, 0x79, 0xF9, 0xF9, - 0xDF, 0x9F, 0x0F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x07, 0x07, 0x07, 0x00, 0x00, 0x00, - 0x00, 0x03, 0x07, 0x07, 0x06, 0x04, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x1C, 0xBE, - 0xFF, 0x63, 0x63, 0xFF, 0xBE, 0x1C, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x07, 0x0F, 0x1F, 0x18, 0x18, 0x1F, - 0x0F, 0x07, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; -} - - -static const char PROGMEM ou_logo[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xFC, 0xFC, 0xCF, 0xCF, - 0x03, 0x03, 0x03, 0x03, 0xFF, 0xFF, - 0x03, 0x03, 0xFF, 0xFF, 0x03, 0x03, - 0x03, 0x03, 0xFF, 0xFF, 0x03, 0x03, - 0x03, 0x03, 0xF3, 0xF3, 0x03, 0x03, - 0x0C, 0x0C, 0xFC, 0xFC, 0x00, 0x00, - 0xFF, 0xFF, 0xC0, 0xC0, 0xC0, 0xC0, - 0xFF, 0xFF, 0xF0, 0xF0, 0xC3, 0xC3, - 0xC0, 0xC0, 0xF0, 0xF0, 0xFF, 0xFF, - 0xC0, 0xC0, 0xC0, 0xC0, 0xFC, 0xFC, - 0x0C, 0x0C, 0x0F, 0x0F, 0x03, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - - -static char PROGMEM caps_on[] = { - 0x00, 0x00, 0x00, 0xF8, 0x04, 0x04, - 0x04, 0x88, 0x00, 0x00, 0xE0, 0x58, - 0x44, 0x58, 0xE0, 0x00, 0x00, 0xFC, - 0x24, 0x24, 0x24, 0x18, 0x00, 0x00, - 0x98, 0x24, 0x24, 0x24, 0xC8, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x81, - 0xC0, 0xE0, 0xF0, 0xF0, 0xF0, 0xF1, - 0xF0, 0xF1, 0xF0, 0xF0, 0xE0, 0xC0, - 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F, - 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, - 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -static char PROGMEM caps_off[] = { - 0x00, 0x00, 0x00, 0xF8, 0x04, 0x04, - 0x04, 0x88, 0x00, 0x00, 0xE0, 0x58, - 0x44, 0x58, 0xE0, 0x00, 0x00, 0xFC, - 0x24, 0x24, 0x24, 0x18, 0x00, 0x00, - 0x98, 0x24, 0x24, 0x24, 0xC8, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x81, - 0xC0, 0xE0, 0xF0, 0x70, 0x30, 0x31, - 0x30, 0x31, 0x70, 0xF0, 0xE0, 0xC0, - 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E, - 0x3C, 0x38, 0x30, 0x30, 0x30, 0x30, - 0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -static const char PROGMEM num_on[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, - 0x18, 0x20, 0xC0, 0xFC, 0x00, 0x00, - 0x00, 0xFC, 0x00, 0x00, 0x00, 0xFC, - 0x00, 0x00, 0xFC, 0x18, 0x60, 0x80, - 0x60, 0x18, 0xFC, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x81, - 0xC0, 0xE0, 0xF0, 0xF0, 0xF1, 0xF1, - 0xF1, 0xF0, 0xF0, 0xF0, 0xE1, 0xC0, - 0x80, 0x01, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F, - 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, - 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -static const char PROGMEM num_off[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0xFC, - 0x18, 0x20, 0xC0, 0xFC, 0x00, 0x00, - 0x00, 0xFC, 0x00, 0x00, 0x00, 0xFC, - 0x00, 0x00, 0xFC, 0x18, 0x60, 0x80, - 0x60, 0x18, 0xFC, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x01, 0x00, 0x00, 0x00, 0x81, - 0xC0, 0xE0, 0xF0, 0x70, 0x31, 0x31, - 0x31, 0x30, 0x70, 0xF0, 0xE1, 0xC0, - 0x80, 0x01, 0x00, 0x00, 0x01, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E, - 0x3C, 0x38, 0x30, 0x30, 0x30, 0x30, - 0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -static const char PROGMEM scrl_on[] = { - 0x00, 0x00, 0x00, 0x98, 0x24, 0x24, - 0x24, 0xC8, 0x00, 0x00, 0xF8, 0x04, - 0x04, 0x04, 0x88, 0x00, 0x00, 0xFC, - 0x24, 0x24, 0xE4, 0x18, 0x00, 0x00, - 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x80, - 0xC0, 0xE1, 0xF1, 0xF1, 0xF0, 0xF0, - 0xF0, 0xF1, 0xF0, 0xF0, 0xE0, 0xC1, - 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1F, - 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, - 0x3F, 0x3F, 0x1F, 0x0F, 0x07, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -static const char PROGMEM scrl_off[] = { - 0x00, 0x00, 0x00, 0x98, 0x24, 0x24, - 0x24, 0xC8, 0x00, 0x00, 0xF8, 0x04, - 0x04, 0x04, 0x88, 0x00, 0x00, 0xFC, - 0x24, 0x24, 0xE4, 0x18, 0x00, 0x00, - 0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x01, 0x00, 0x00, 0x80, - 0xC0, 0xE1, 0xF1, 0x71, 0x30, 0x30, - 0x30, 0x31, 0x70, 0xF0, 0xE0, 0xC1, - 0x80, 0x00, 0x00, 0x01, 0x01, 0x01, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xFF, 0xFF, 0x03, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x03, 0xFF, 0xFF, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x03, 0x07, 0x0F, 0x1E, - 0x3C, 0x38, 0x30, 0x30, 0x30, 0x30, - 0x38, 0x3C, 0x1E, 0x0F, 0x07, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00 - }; - -static void render_oled(void) { - const int combined_size = sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off) + sizeof(scrl_off); - char combined[combined_size]; - led_t led_state = host_keyboard_led_state(); - - memcpy_P(combined, ou_logo, sizeof(ou_logo)); - - if (led_state.caps_lock) { - memcpy_P(combined + sizeof(ou_logo), caps_on, sizeof(caps_off)); - } - else { - memcpy_P(combined + sizeof(ou_logo), caps_off, sizeof(caps_off)); - } - - if (led_state.num_lock) { - memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off), num_on, sizeof(num_off)); - } - else { - memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off), num_off, sizeof(num_off)); - } - - if (led_state.scroll_lock) { - memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off), scrl_on, sizeof(scrl_off)); - } - else { - memcpy_P(combined + sizeof(ou_logo) + sizeof(caps_off) + sizeof(num_off), scrl_off, sizeof(scrl_off)); - } - - oled_write_raw_P(combined, sizeof(combined)); -} - -void render_logo(void) { - oled_write_raw_P(my_logo, sizeof(my_logo)); -} - -void clear_screen(void) { - if (clear_logo){ - for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) { - for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) { - oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j); - } - } - clear_logo = false; - } -} - -#define MIDI_CONTROL_CHANGE 0xB0 - -MidiDevice _midi_device; - -void midi_callback(uint8_t cable, uint8_t *midi_data, uint16_t length) { - // Check if this is a MIDI CC message on channel 2 - if ((midi_data[0] & 0xF0) == MIDI_CONTROL_CHANGE && midi_data[0] & (0x0F == 1)) { - uprintf("%s string", midi_data ); - // ... - } -} - -void slider8_cc_callback(struct _midi_device *dev, uint8_t cable, uint8_t code_index, uint8_t value) { - midi_callback(MIDI_CONTROL_CHANGE, &value, 1); -} - -void init_timer(void){ - oled_logo_timer = timer_read32(); -}; - -void keyboard_post_init_kb(void) { - init_timer(); - - keyboard_post_init_user(); -} - -void matrix_init_user(void) { - midi_register_cc_callback(&_midi_device, slider8_cc_callback); -} - -# define SHOW_LOGO 5000 -bool oled_task_kb(void) { - if (!oled_task_user()) { return false; } - if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){ - render_logo(); - }else{ - clear_screen(); - render_oled(); - } - return false; -} - - -#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h index 73d8badc5e5d..e57845dc3590 100644 --- a/keyboards/1upkeyboards/super16v2/config.h +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -17,17 +17,16 @@ #pragma once -#define MOUSEKEY_MOVE_DELTA 25 - #define RGB_MATRIX_LED_COUNT 20 -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +//# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +# define RGBLIGHT_LIMIT_VAL 255 #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define ENABLE_RGB_MATRIX_ALPHAS_MODS +//# define ENABLE_RGB_MATRIX_ALPHAS_MODS # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN # define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT # define ENABLE_RGB_MATRIX_BREATHING @@ -55,20 +54,20 @@ # define ENABLE_RGB_MATRIX_HUE_WAVE # define ENABLE_RGB_MATRIX_PIXEL_RAIN # define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined //# define ENABLE_RGB_MATRIX_TYPING_HEATMAP //# define ENABLE_RGB_MATRIX_DIGITAL_RAIN // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE //# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE //# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE //# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS //# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS //# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS //# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH +//# define ENABLE_RGB_MATRIX_SPLASH //# define ENABLE_RGB_MATRIX_MULTISPLASH //# define ENABLE_RGB_MATRIX_SOLID_SPLASH //# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json index 39a8eefcc416..641584cca98f 100644 --- a/keyboards/1upkeyboards/super16v2/info.json +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -1,55 +1,288 @@ { - "keyboard_name": "super16v2", "manufacturer": "1upkeyboards", - "url": "", + "keyboard_name": "super16v2", "maintainer": "qmk", + "processor": "atmega32u2", + "bootloader": "atmel-dfu", "usb": { - "vid": "0x6F75", - "pid": "0x5517", - "device_version": "0.0.1" + "device_version": "0.0.1", + "pid": "0x5517", + "vid": "0x6F75" }, - "ws2812": { - "pin": "B5" + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 }, - "rgb_matrix": { - "driver": "WS2812" + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true, + "rgblight": false }, "matrix_pins": { - "cols": ["D5", "D6", "C2", "D0"], - "rows": ["D1", "D2", "D3", "D4"] + "cols": [ "D5", "D6", "C2", "D0" ], + "rows": [ "D1", "D2", "D3", "D4" ] }, - "diode_direction": "COL2ROW", "encoder": { - "rotary": [ - {"pin_a": "B1", "pin_b": "B2"}, - {"pin_a": "B3", "pin_b": "B4"} - ] + "enabled": true, + "rotary": [ + { + "pin_a": "B1", + "pin_b": "B2" + }, + { + "pin_a": "B3", + "pin_b": "B4" + } + ] }, - "processor": "atmega32u2", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_ortho_4x4": { + "ws2812": { + "pin": "B5" + }, + "rgb_matrix": { + "driver": "WS2812", "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": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3} + { + "flags": 4, + "matrix": [ 0, 3 ], + "x": 28, + "y": 12 + }, + { + "flags": 4, + "matrix": [ 0, 2 ], + "x": 84, + "y": 12 + }, + { + "flags": 4, + "matrix": [ 0, 1 ], + "x": 140, + "y": 12 + }, + { + "flags": 4, + "matrix": [ 0, 0 ], + "x": 196, + "y": 12 + }, + { + "flags": 4, + "matrix": [ 1, 3 ], + "x": 28, + "y": 28 + }, + { + "flags": 4, + "matrix": [ 1, 2 ], + "x": 84, + "y": 28 + }, + { + "flags": 4, + "matrix": [ 1, 1 ], + "x": 140, + "y": 28 + }, + { + "flags": 4, + "matrix": [ 1, 0 ], + "x": 196, + "y": 28 + }, + { + "flags": 4, + "matrix": [ 2, 3 ], + "x": 28, + "y": 44 + }, + { + "flags": 4, + "matrix": [ 2, 2 ], + "x": 84, + "y": 44 + }, + { + "flags": 4, + "matrix": [ 2, 1 ], + "x": 140, + "y": 44 + }, + { + "flags": 4, + "matrix": [ 2, 0 ], + "x": 196, + "y": 44 + }, + { + "flags": 4, + "matrix": [ 3, 3 ], + "x": 28, + "y": 60 + }, + { + "flags": 4, + "matrix": [ 3, 2 ], + "x": 84, + "y": 60 + }, + { + "flags": 4, + "matrix": [ 3, 1 ], + "x": 140, + "y": 60 + }, + { + "flags": 4, + "matrix": [ 3, 0 ], + "x": 196, + "y": 60 + }, + { + "flags": 2, + "x": 168, + "y": 48 + }, + { + "flags": 2, + "x": 168, + "y": 16 + }, + { + "flags": 2, + "x": 58, + "y": 16 + }, + { + "flags": 2, + "x": 56, + "y": 48 + } ] - } + }, + "layouts": { + "LAYOUT_ortho_4x4": { + "layout": [ + { + "label": "k00", + "matrix": [ 0, 0 ], + "w": 1, + "x": 0, + "y": 0 + }, + { + "label": "k01", + "matrix": [ 0, 1 ], + "w": 1, + "x": 1, + "y": 0 + }, + { + "label": "k02", + "matrix": [ 0, 2 ], + "w": 1, + "x": 2, + "y": 0 + }, + { + "label": "k03", + "matrix": [ 0, 3 ], + "w": 1, + "x": 3, + "y": 0 + }, + { + "label": "k10", + "matrix": [ 1, 0 ], + "w": 1, + "x": 0, + "y": 1 + }, + { + "label": "k11", + "matrix": [ 1, 1 ], + "w": 1, + "x": 1, + "y": 1 + }, + { + "label": "k12", + "matrix": [ 1, 2 ], + "w": 1, + "x": 2, + "y": 1 + }, + { + "label": "k13", + "matrix": [ 1, 3 ], + "w": 1, + "x": 3, + "y": 1 + }, + { + "label": "k20", + "matrix": [ 2, 0 ], + "w": 1, + "x": 0, + "y": 2 + }, + { + "label": "k21", + "matrix": [ 2, 1 ], + "w": 1, + "x": 1, + "y": 2 + }, + { + "label": "k22", + "matrix": [ 2, 2 ], + "w": 1, + "x": 2, + "y": 2 + }, + { + "label": "k23", + "matrix": [ 2, 3 ], + "w": 1, + "x": 3, + "y": 2 + }, + { + "label": "k30", + "matrix": [ 3, 0 ], + "w": 1, + "x": 0, + "y": 3 + }, + { + "label": "k31", + "matrix": [ 3, 1 ], + "w": 1, + "x": 1, + "y": 3 + }, + { + "label": "k32", + "matrix": [ 3, 2 ], + "w": 1, + "x": 2, + "y": 3 + }, + { + "label": "k33", + "matrix": [ 3, 3 ], + "w": 1, + "x": 3, + "y": 3 + } + ] + } } - } +} diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c index ba6d6c4d7194..ce47b9a569a7 100644 --- a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c @@ -30,21 +30,75 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT ), + + [2] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - rgb_matrix_increase_hue(); - } else { - rgb_matrix_decrease_hue(); - } - } - return false; -} \ No newline at end of file +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/default/rules.mk similarity index 100% rename from keyboards/1upkeyboards/1upslider8/keymaps/default/rules.mk rename to keyboards/1upkeyboards/super16v2/keymaps/default/rules.mk diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c index 0475107aed4d..ba180001bf09 100644 --- a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c @@ -44,5 +44,61 @@ 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 ), + + [4] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk index 36b7ba9cbc98..aaf0497be139 100644 --- a/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk +++ b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk index a7f5baf8078b..e69de29bb2d1 100644 --- a/keyboards/1upkeyboards/super16v2/rules.mk +++ b/keyboards/1upkeyboards/super16v2/rules.mk @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/1uposu5k/config.h b/keyboards/1upkeyboards/super16v2_old/config.h similarity index 60% rename from keyboards/1upkeyboards/1uposu5k/config.h rename to keyboards/1upkeyboards/super16v2_old/config.h index 06f868bb2da8..73d8badc5e5d 100644 --- a/keyboards/1upkeyboards/1uposu5k/config.h +++ b/keyboards/1upkeyboards/super16v2_old/config.h @@ -1,4 +1,4 @@ -/* Copyright 2023 Ziptyze +/* Copyright 2022 MechMerlin * * 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 @@ -16,16 +16,19 @@ #pragma once -#define RGB_DI_PIN GP24 -#define RGB_MATRIX_LED_COUNT 32 -#define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#define MOUSEKEY_MOVE_DELTA 25 + +#define RGB_MATRIX_LED_COUNT 20 +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -// # define ENABLE_RGB_MATRIX_ALPHAS_MODS -// # define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# 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 @@ -50,22 +53,44 @@ # define ENABLE_RGB_MATRIX_HUE_BREATHING # define ENABLE_RGB_MATRIX_HUE_PENDULUM # define ENABLE_RGB_MATRIX_HUE_WAVE -// # define ENABLE_RGB_MATRIX_PIXEL_RAIN -// # define ENABLE_RGB_MATRIX_PIXEL_FLOW -// # define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL // enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -// # define ENABLE_RGB_MATRIX_DIGITAL_RAIN +//# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +//# define ENABLE_RGB_MATRIX_DIGITAL_RAIN // enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE # define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS # define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +//# define ENABLE_RGB_MATRIX_MULTISPLASH +//# define ENABLE_RGB_MATRIX_SOLID_SPLASH +//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/1upkeyboards/super16v2_old/info.json b/keyboards/1upkeyboards/super16v2_old/info.json new file mode 100644 index 000000000000..39a8eefcc416 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/info.json @@ -0,0 +1,55 @@ +{ + "keyboard_name": "super16v2", + "manufacturer": "1upkeyboards", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x6F75", + "pid": "0x5517", + "device_version": "0.0.1" + }, + "ws2812": { + "pin": "B5" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["D5", "D6", "C2", "D0"], + "rows": ["D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B1", "pin_b": "B2"}, + {"pin_a": "B3", "pin_b": "B4"} + ] + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_ortho_4x4": { + "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] + } + } + } diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c new file mode 100644 index 000000000000..ba6d6c4d7194 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( /* Base */ + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_ortho_4x4( /* Fn Layer */ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + rgb_matrix_increase_hue(); + } else { + rgb_matrix_decrease_hue(); + } + } + return false; +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md new file mode 100644 index 000000000000..e229fcba7409 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c new file mode 100644 index 000000000000..8888fe35e43b --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( /* Base */ + KC_TRNS, KC_DELETE, KC_BACKSPACE, KC_MUTE, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_BTN3 + ), + + [1] = LAYOUT_ortho_4x4( /* Fn Layer */ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_MS_RIGHT, 10); + } else { + tap_code_delay(KC_MS_LEFT, 10); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code_delay(KC_AUDIO_VOL_UP, 10); + } else { + tap_code_delay(KC_AUDIO_VOL_DOWN, 10); + } + } + return false; +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md new file mode 100644 index 000000000000..e229fcba7409 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md @@ -0,0 +1 @@ +# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c new file mode 100644 index 000000000000..0475107aed4d --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( /* Base */ + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_ortho_4x4( /* Fn Layer */ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), + + [2] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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/1upkeyboards/super16v2_old/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2_old/keymaps/via/readme.md new file mode 100644 index 000000000000..e229fcba7409 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk similarity index 57% rename from keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk rename to keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk index bf70b1f3e09f..36b7ba9cbc98 100644 --- a/keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk +++ b/keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk @@ -1,4 +1,2 @@ VIA_ENABLE = yes LTO_ENABLE = yes - -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2_old/readme.md b/keyboards/1upkeyboards/super16v2_old/readme.md new file mode 100644 index 000000000000..f1b8cbaf5d6f --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/readme.md @@ -0,0 +1,25 @@ +# Super 16 V2 + +A 4x4 macropad with RGB inswitch lighting and underglow. + +* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) +* Hardware Supported: 1upkeyboards Super 16 V2 +* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/super16v2:default + +Flashing example for this keyboard: + + make 1upkeyboards/super16v2: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 `QK_BOOT` if it is available diff --git a/keyboards/1upkeyboards/super16v2_old/rules.mk b/keyboards/1upkeyboards/super16v2_old/rules.mk new file mode 100644 index 000000000000..a7f5baf8078b --- /dev/null +++ b/keyboards/1upkeyboards/super16v2_old/rules.mk @@ -0,0 +1,14 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = yes +ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2_old/super16v2.c similarity index 100% rename from keyboards/1upkeyboards/super16v2/super16v2.c rename to keyboards/1upkeyboards/super16v2_old/super16v2.c From cf126a15036523520ddbcce247b8bdbb8c0ab87b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Thu, 1 Jun 2023 15:38:23 -0400 Subject: [PATCH 23/24] fixing s16v2 issue --- keyboards/1upkeyboards/super16v2/config.h | 95 ------ keyboards/1upkeyboards/super16v2/info.json | 288 ------------------ .../super16v2/keymaps/default/keymap.c | 104 ------- .../super16v2/keymaps/default/readme.md | 1 - .../super16v2/keymaps/default/rules.mk | 1 - .../super16v2/keymaps/mouse/keymap.c | 50 --- .../super16v2/keymaps/mouse/readme.md | 1 - .../super16v2/keymaps/via/keymap.c | 104 ------- .../super16v2/keymaps/via/readme.md | 1 - .../super16v2/keymaps/via/rules.mk | 3 - keyboards/1upkeyboards/super16v2/readme.md | 25 -- keyboards/1upkeyboards/super16v2/rules.mk | 0 keyboards/1upkeyboards/super16v2_old/config.h | 96 ------ .../1upkeyboards/super16v2_old/info.json | 55 ---- .../super16v2_old/keymaps/default/keymap.c | 50 --- .../super16v2_old/keymaps/default/readme.md | 1 - .../super16v2_old/keymaps/mouse/keymap.c | 50 --- .../super16v2_old/keymaps/mouse/readme.md | 1 - .../super16v2_old/keymaps/via/keymap.c | 48 --- .../super16v2_old/keymaps/via/readme.md | 1 - .../super16v2_old/keymaps/via/rules.mk | 2 - .../1upkeyboards/super16v2_old/readme.md | 25 -- keyboards/1upkeyboards/super16v2_old/rules.mk | 14 - .../1upkeyboards/super16v2_old/super16v2.c | 41 --- 24 files changed, 1057 deletions(-) delete mode 100644 keyboards/1upkeyboards/super16v2/config.h delete mode 100644 keyboards/1upkeyboards/super16v2/info.json delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/rules.mk delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk delete mode 100644 keyboards/1upkeyboards/super16v2/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2/rules.mk delete mode 100644 keyboards/1upkeyboards/super16v2_old/config.h delete mode 100644 keyboards/1upkeyboards/super16v2_old/info.json delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/via/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk delete mode 100644 keyboards/1upkeyboards/super16v2_old/readme.md delete mode 100644 keyboards/1upkeyboards/super16v2_old/rules.mk delete mode 100644 keyboards/1upkeyboards/super16v2_old/super16v2.c diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h deleted file mode 100644 index e57845dc3590..000000000000 --- a/keyboards/1upkeyboards/super16v2/config.h +++ /dev/null @@ -1,95 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - - -#define RGB_MATRIX_LED_COUNT 20 -//# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -# define RGBLIGHT_LIMIT_VAL 255 -#ifdef RGB_MATRIX_ENABLE -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -//# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# 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_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -//# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -//# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -//# define ENABLE_RGB_MATRIX_SPLASH -//# define ENABLE_RGB_MATRIX_MULTISPLASH -//# define ENABLE_RGB_MATRIX_SOLID_SPLASH -//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json deleted file mode 100644 index 641584cca98f..000000000000 --- a/keyboards/1upkeyboards/super16v2/info.json +++ /dev/null @@ -1,288 +0,0 @@ -{ - "manufacturer": "1upkeyboards", - "keyboard_name": "super16v2", - "maintainer": "qmk", - "processor": "atmega32u2", - "bootloader": "atmel-dfu", - "usb": { - "device_version": "0.0.1", - "pid": "0x5517", - "vid": "0x6F75" - }, - "diode_direction": "COL2ROW", - "dynamic_keymap": { - "layer_count": 10 - }, - "features": { - "audio": false, - "backlight": false, - "bootmagic": true, - "command": false, - "console": false, - "encoder": true, - "extrakey": true, - "mousekey": true, - "nkro": false, - "rgb_matrix": true, - "rgblight": false - }, - "matrix_pins": { - "cols": [ "D5", "D6", "C2", "D0" ], - "rows": [ "D1", "D2", "D3", "D4" ] - }, - "encoder": { - "enabled": true, - "rotary": [ - { - "pin_a": "B1", - "pin_b": "B2" - }, - { - "pin_a": "B3", - "pin_b": "B4" - } - ] - }, - "ws2812": { - "pin": "B5" - }, - "rgb_matrix": { - "driver": "WS2812", - "layout": [ - { - "flags": 4, - "matrix": [ 0, 3 ], - "x": 28, - "y": 12 - }, - { - "flags": 4, - "matrix": [ 0, 2 ], - "x": 84, - "y": 12 - }, - { - "flags": 4, - "matrix": [ 0, 1 ], - "x": 140, - "y": 12 - }, - { - "flags": 4, - "matrix": [ 0, 0 ], - "x": 196, - "y": 12 - }, - { - "flags": 4, - "matrix": [ 1, 3 ], - "x": 28, - "y": 28 - }, - { - "flags": 4, - "matrix": [ 1, 2 ], - "x": 84, - "y": 28 - }, - { - "flags": 4, - "matrix": [ 1, 1 ], - "x": 140, - "y": 28 - }, - { - "flags": 4, - "matrix": [ 1, 0 ], - "x": 196, - "y": 28 - }, - { - "flags": 4, - "matrix": [ 2, 3 ], - "x": 28, - "y": 44 - }, - { - "flags": 4, - "matrix": [ 2, 2 ], - "x": 84, - "y": 44 - }, - { - "flags": 4, - "matrix": [ 2, 1 ], - "x": 140, - "y": 44 - }, - { - "flags": 4, - "matrix": [ 2, 0 ], - "x": 196, - "y": 44 - }, - { - "flags": 4, - "matrix": [ 3, 3 ], - "x": 28, - "y": 60 - }, - { - "flags": 4, - "matrix": [ 3, 2 ], - "x": 84, - "y": 60 - }, - { - "flags": 4, - "matrix": [ 3, 1 ], - "x": 140, - "y": 60 - }, - { - "flags": 4, - "matrix": [ 3, 0 ], - "x": 196, - "y": 60 - }, - { - "flags": 2, - "x": 168, - "y": 48 - }, - { - "flags": 2, - "x": 168, - "y": 16 - }, - { - "flags": 2, - "x": 58, - "y": 16 - }, - { - "flags": 2, - "x": 56, - "y": 48 - } - ] - }, - "layouts": { - "LAYOUT_ortho_4x4": { - "layout": [ - { - "label": "k00", - "matrix": [ 0, 0 ], - "w": 1, - "x": 0, - "y": 0 - }, - { - "label": "k01", - "matrix": [ 0, 1 ], - "w": 1, - "x": 1, - "y": 0 - }, - { - "label": "k02", - "matrix": [ 0, 2 ], - "w": 1, - "x": 2, - "y": 0 - }, - { - "label": "k03", - "matrix": [ 0, 3 ], - "w": 1, - "x": 3, - "y": 0 - }, - { - "label": "k10", - "matrix": [ 1, 0 ], - "w": 1, - "x": 0, - "y": 1 - }, - { - "label": "k11", - "matrix": [ 1, 1 ], - "w": 1, - "x": 1, - "y": 1 - }, - { - "label": "k12", - "matrix": [ 1, 2 ], - "w": 1, - "x": 2, - "y": 1 - }, - { - "label": "k13", - "matrix": [ 1, 3 ], - "w": 1, - "x": 3, - "y": 1 - }, - { - "label": "k20", - "matrix": [ 2, 0 ], - "w": 1, - "x": 0, - "y": 2 - }, - { - "label": "k21", - "matrix": [ 2, 1 ], - "w": 1, - "x": 1, - "y": 2 - }, - { - "label": "k22", - "matrix": [ 2, 2 ], - "w": 1, - "x": 2, - "y": 2 - }, - { - "label": "k23", - "matrix": [ 2, 3 ], - "w": 1, - "x": 3, - "y": 2 - }, - { - "label": "k30", - "matrix": [ 3, 0 ], - "w": 1, - "x": 0, - "y": 3 - }, - { - "label": "k31", - "matrix": [ 3, 1 ], - "w": 1, - "x": 1, - "y": 3 - }, - { - "label": "k32", - "matrix": [ 3, 2 ], - "w": 1, - "x": 2, - "y": 3 - }, - { - "label": "k33", - "matrix": [ 3, 3 ], - "w": 1, - "x": 3, - "y": 3 - } - ] - } - } -} diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c deleted file mode 100644 index ce47b9a569a7..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c +++ /dev/null @@ -1,104 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x4( /* Base */ - KC_P7, KC_P8, KC_P9, KC_PMNS, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PSLS, - MO(1), KC_P0, KC_PDOT, KC_PENT - ), - - [1] = LAYOUT_ortho_4x4( /* Fn Layer */ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT - ), - - [2] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [4] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [5] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [6] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [7] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [8] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [9] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - 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(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -}; -#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md deleted file mode 100644 index e229fcba7409..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/default/rules.mk deleted file mode 100644 index a40474b4d5c7..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c deleted file mode 100644 index 8888fe35e43b..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x4( /* Base */ - KC_TRNS, KC_DELETE, KC_BACKSPACE, KC_MUTE, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PSLS, - MO(1), KC_P0, KC_PDOT, KC_BTN3 - ), - - [1] = LAYOUT_ortho_4x4( /* Fn Layer */ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_MS_RIGHT, 10); - } else { - tap_code_delay(KC_MS_LEFT, 10); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code_delay(KC_AUDIO_VOL_UP, 10); - } else { - tap_code_delay(KC_AUDIO_VOL_DOWN, 10); - } - } - return false; -} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md deleted file mode 100644 index e229fcba7409..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c deleted file mode 100644 index ba180001bf09..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c +++ /dev/null @@ -1,104 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x4( /* Base */ - KC_P7, KC_P8, KC_P9, KC_PMNS, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PSLS, - MO(1), KC_P0, KC_PDOT, KC_PENT - ), - - [1] = LAYOUT_ortho_4x4( /* Fn Layer */ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT - ), - - [2] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [4] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [5] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [6] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [7] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [8] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [9] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - 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(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { - [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, - [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, - [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, -}; -#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md deleted file mode 100644 index e229fcba7409..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk deleted file mode 100644 index aaf0497be139..000000000000 --- a/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes -ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/readme.md b/keyboards/1upkeyboards/super16v2/readme.md deleted file mode 100644 index f1b8cbaf5d6f..000000000000 --- a/keyboards/1upkeyboards/super16v2/readme.md +++ /dev/null @@ -1,25 +0,0 @@ -# Super 16 V2 - -A 4x4 macropad with RGB inswitch lighting and underglow. - -* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) -* Hardware Supported: 1upkeyboards Super 16 V2 -* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/) - -Make example for this keyboard (after setting up your build environment): - - make 1upkeyboards/super16v2:default - -Flashing example for this keyboard: - - make 1upkeyboards/super16v2: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 `QK_BOOT` if it is available diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/keyboards/1upkeyboards/super16v2_old/config.h b/keyboards/1upkeyboards/super16v2_old/config.h deleted file mode 100644 index 73d8badc5e5d..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/config.h +++ /dev/null @@ -1,96 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - - -#define MOUSEKEY_MOVE_DELTA 25 - -#define RGB_MATRIX_LED_COUNT 20 -# define RGB_MATRIX_KEYPRESSES // reacts to keypresses -#ifdef RGB_MATRIX_ENABLE -# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended -# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# 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_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -//# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -//# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -//# define ENABLE_RGB_MATRIX_MULTISPLASH -//# define ENABLE_RGB_MATRIX_SOLID_SPLASH -//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#endif - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/1upkeyboards/super16v2_old/info.json b/keyboards/1upkeyboards/super16v2_old/info.json deleted file mode 100644 index 39a8eefcc416..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/info.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "keyboard_name": "super16v2", - "manufacturer": "1upkeyboards", - "url": "", - "maintainer": "qmk", - "usb": { - "vid": "0x6F75", - "pid": "0x5517", - "device_version": "0.0.1" - }, - "ws2812": { - "pin": "B5" - }, - "rgb_matrix": { - "driver": "WS2812" - }, - "matrix_pins": { - "cols": ["D5", "D6", "C2", "D0"], - "rows": ["D1", "D2", "D3", "D4"] - }, - "diode_direction": "COL2ROW", - "encoder": { - "rotary": [ - {"pin_a": "B1", "pin_b": "B2"}, - {"pin_a": "B3", "pin_b": "B4"} - ] - }, - "processor": "atmega32u2", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_ortho_4x4": { - "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": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - {"matrix": [1, 3], "x": 3, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2}, - {"matrix": [2, 3], "x": 3, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [3, 1], "x": 1, "y": 3}, - {"matrix": [3, 2], "x": 2, "y": 3}, - {"matrix": [3, 3], "x": 3, "y": 3} - ] - } - } - } diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c deleted file mode 100644 index ba6d6c4d7194..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/default/keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x4( /* Base */ - KC_P7, KC_P8, KC_P9, KC_PMNS, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PSLS, - MO(1), KC_P0, KC_PDOT, KC_PENT - ), - - [1] = LAYOUT_ortho_4x4( /* Fn Layer */ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - rgb_matrix_increase_hue(); - } else { - rgb_matrix_decrease_hue(); - } - } - return false; -} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md deleted file mode 100644 index e229fcba7409..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c deleted file mode 100644 index 8888fe35e43b..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/keymap.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x4( /* Base */ - KC_TRNS, KC_DELETE, KC_BACKSPACE, KC_MUTE, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PSLS, - MO(1), KC_P0, KC_PDOT, KC_BTN3 - ), - - [1] = LAYOUT_ortho_4x4( /* Fn Layer */ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, - RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT - ), -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { /* First encoder */ - if (clockwise) { - tap_code_delay(KC_MS_RIGHT, 10); - } else { - tap_code_delay(KC_MS_LEFT, 10); - } - } else if (index == 1) { /* Second encoder */ - if (clockwise) { - tap_code_delay(KC_AUDIO_VOL_UP, 10); - } else { - tap_code_delay(KC_AUDIO_VOL_DOWN, 10); - } - } - return false; -} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md deleted file mode 100644 index e229fcba7409..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/mouse/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c deleted file mode 100644 index 0475107aed4d..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ortho_4x4( /* Base */ - KC_P7, KC_P8, KC_P9, KC_PMNS, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PSLS, - MO(1), KC_P0, KC_PDOT, KC_PENT - ), - - [1] = LAYOUT_ortho_4x4( /* Fn Layer */ - RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, - RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT - ), - - [2] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_ortho_4x4( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - 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/1upkeyboards/super16v2_old/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2_old/keymaps/via/readme.md deleted file mode 100644 index e229fcba7409..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc98..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/super16v2_old/readme.md b/keyboards/1upkeyboards/super16v2_old/readme.md deleted file mode 100644 index f1b8cbaf5d6f..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/readme.md +++ /dev/null @@ -1,25 +0,0 @@ -# Super 16 V2 - -A 4x4 macropad with RGB inswitch lighting and underglow. - -* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) -* Hardware Supported: 1upkeyboards Super 16 V2 -* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/) - -Make example for this keyboard (after setting up your build environment): - - make 1upkeyboards/super16v2:default - -Flashing example for this keyboard: - - make 1upkeyboards/super16v2: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 `QK_BOOT` if it is available diff --git a/keyboards/1upkeyboards/super16v2_old/rules.mk b/keyboards/1upkeyboards/super16v2_old/rules.mk deleted file mode 100644 index a7f5baf8078b..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2_old/super16v2.c b/keyboards/1upkeyboards/super16v2_old/super16v2.c deleted file mode 100644 index 56e5fe7e7f94..000000000000 --- a/keyboards/1upkeyboards/super16v2_old/super16v2.c +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2022 MechMerlin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - // Key Matrix to LED Index - { 3, 2, 1, 0 }, - { 7, 6, 5, 4 }, - { 11, 10, 9, 8 }, - { 15, 14, 13, 12 } -}, { - // LED Index to Physical Position - { 28, 12 }, { 84, 12 }, { 140, 12 }, { 196, 12 }, - { 28, 28 }, { 84, 28 }, { 140, 28 }, { 196, 28 }, - { 28, 44 }, { 84, 44 }, { 140, 44 }, { 196, 44 }, - { 28, 60 }, { 84, 60 }, { 140, 60 }, { 196, 60 }, - { 168, 48 }, { 168, 16 }, { 58, 16 }, { 56, 48 } -}, { - // LED Index to Flag - 4, 4, 4, 4, - 4, 4, 4, 4, - 4, 4, 4, 4, - 4, 4, 4, 4, - 2, 2, 2, 2, -} }; -#endif From d37aba25d49c561eb218e00df56bef617e230e51 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Thu, 1 Jun 2023 15:41:49 -0400 Subject: [PATCH 24/24] fixing s16v2 sync issue --- keyboards/1upkeyboards/super16v2/config.h | 96 +++++++++++++++++++ keyboards/1upkeyboards/super16v2/info.json | 55 +++++++++++ .../super16v2/keymaps/default/keymap.c | 50 ++++++++++ .../super16v2/keymaps/default/readme.md | 1 + .../super16v2/keymaps/mouse/keymap.c | 50 ++++++++++ .../super16v2/keymaps/mouse/readme.md | 1 + .../super16v2/keymaps/via/keymap.c | 48 ++++++++++ .../super16v2/keymaps/via/readme.md | 1 + .../super16v2/keymaps/via/rules.mk | 2 + keyboards/1upkeyboards/super16v2/readme.md | 25 +++++ keyboards/1upkeyboards/super16v2/rules.mk | 14 +++ keyboards/1upkeyboards/super16v2/super16v2.c | 41 ++++++++ 12 files changed, 384 insertions(+) create mode 100644 keyboards/1upkeyboards/super16v2/config.h create mode 100644 keyboards/1upkeyboards/super16v2/info.json create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/default/readme.md create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/readme.md create mode 100644 keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/super16v2/readme.md create mode 100644 keyboards/1upkeyboards/super16v2/rules.mk create mode 100644 keyboards/1upkeyboards/super16v2/super16v2.c diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h new file mode 100644 index 000000000000..73d8badc5e5d --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/config.h @@ -0,0 +1,96 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + + +#define MOUSEKEY_MOVE_DELTA 25 + +#define RGB_MATRIX_LED_COUNT 20 +# define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#ifdef RGB_MATRIX_ENABLE +# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# 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_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +//# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +//# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +//# define ENABLE_RGB_MATRIX_MULTISPLASH +//# define ENABLE_RGB_MATRIX_SOLID_SPLASH +//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#endif + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json new file mode 100644 index 000000000000..39a8eefcc416 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/info.json @@ -0,0 +1,55 @@ +{ + "keyboard_name": "super16v2", + "manufacturer": "1upkeyboards", + "url": "", + "maintainer": "qmk", + "usb": { + "vid": "0x6F75", + "pid": "0x5517", + "device_version": "0.0.1" + }, + "ws2812": { + "pin": "B5" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["D5", "D6", "C2", "D0"], + "rows": ["D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", + "encoder": { + "rotary": [ + {"pin_a": "B1", "pin_b": "B2"}, + {"pin_a": "B3", "pin_b": "B4"} + ] + }, + "processor": "atmega32u2", + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_ortho_4x4": { + "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3} + ] + } + } + } diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c new file mode 100644 index 000000000000..ba6d6c4d7194 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/default/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( /* Base */ + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_ortho_4x4( /* Fn Layer */ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + rgb_matrix_increase_hue(); + } else { + rgb_matrix_decrease_hue(); + } + } + return false; +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md new file mode 100644 index 000000000000..e229fcba7409 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c new file mode 100644 index 000000000000..8888fe35e43b --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c @@ -0,0 +1,50 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( /* Base */ + KC_TRNS, KC_DELETE, KC_BACKSPACE, KC_MUTE, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_BTN3 + ), + + [1] = LAYOUT_ortho_4x4( /* Fn Layer */ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { /* First encoder */ + if (clockwise) { + tap_code_delay(KC_MS_RIGHT, 10); + } else { + tap_code_delay(KC_MS_LEFT, 10); + } + } else if (index == 1) { /* Second encoder */ + if (clockwise) { + tap_code_delay(KC_AUDIO_VOL_UP, 10); + } else { + tap_code_delay(KC_AUDIO_VOL_DOWN, 10); + } + } + return false; +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md new file mode 100644 index 000000000000..e229fcba7409 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md @@ -0,0 +1 @@ +# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c new file mode 100644 index 000000000000..0475107aed4d --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( /* Base */ + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_ortho_4x4( /* Fn Layer */ + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), + + [2] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_ortho_4x4( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + 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/1upkeyboards/super16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md new file mode 100644 index 000000000000..e229fcba7409 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default keymap for Super 16 V2 diff --git a/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/super16v2/readme.md b/keyboards/1upkeyboards/super16v2/readme.md new file mode 100644 index 000000000000..f1b8cbaf5d6f --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/readme.md @@ -0,0 +1,25 @@ +# Super 16 V2 + +A 4x4 macropad with RGB inswitch lighting and underglow. + +* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) +* Hardware Supported: 1upkeyboards Super 16 V2 +* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/super16v2:default + +Flashing example for this keyboard: + + make 1upkeyboards/super16v2: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 `QK_BOOT` if it is available diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk new file mode 100644 index 000000000000..a7f5baf8078b --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/rules.mk @@ -0,0 +1,14 @@ +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +RGB_MATRIX_ENABLE = yes +ENCODER_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c new file mode 100644 index 000000000000..56e5fe7e7f94 --- /dev/null +++ b/keyboards/1upkeyboards/super16v2/super16v2.c @@ -0,0 +1,41 @@ +/* Copyright 2022 MechMerlin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "quantum.h" + +#ifdef RGB_MATRIX_ENABLE +led_config_t g_led_config = { { + // Key Matrix to LED Index + { 3, 2, 1, 0 }, + { 7, 6, 5, 4 }, + { 11, 10, 9, 8 }, + { 15, 14, 13, 12 } +}, { + // LED Index to Physical Position + { 28, 12 }, { 84, 12 }, { 140, 12 }, { 196, 12 }, + { 28, 28 }, { 84, 28 }, { 140, 28 }, { 196, 28 }, + { 28, 44 }, { 84, 44 }, { 140, 44 }, { 196, 44 }, + { 28, 60 }, { 84, 60 }, { 140, 60 }, { 196, 60 }, + { 168, 48 }, { 168, 16 }, { 58, 16 }, { 56, 48 } +}, { + // LED Index to Flag + 4, 4, 4, 4, + 4, 4, 4, 4, + 4, 4, 4, 4, + 4, 4, 4, 4, + 2, 2, 2, 2, +} }; +#endif