Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

1upocarina #21039

Merged
merged 26 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
97b54cb
1uposu5k
ziptyze May 23, 2023
49cd5a2
slider8
ziptyze May 24, 2023
3d88a79
change folder name
ziptyze May 24, 2023
77217cc
slider8
ziptyze May 24, 2023
2c4711d
slider8_update
ziptyze May 24, 2023
a71cd5c
Update keyboards/1upkeyboards/1uposu5k/config.h
ziptyze May 25, 2023
3d212d5
Update keyboards/1upkeyboards/1uposu5k/config.h
ziptyze May 25, 2023
c1ebfea
Update keyboards/1upkeyboards/1uposu5k/info.json
ziptyze May 25, 2023
cbd76de
Update keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c
ziptyze May 25, 2023
8dae85e
Update keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c
ziptyze May 25, 2023
9eb9e25
Update keyboards/1upkeyboards/1uposu5k/readme.md
ziptyze May 25, 2023
8b31e75
Update keyboards/1upkeyboards/1upslider8/config.h
ziptyze May 25, 2023
08e474f
Update keyboards/1upkeyboards/1upslider8/config.h
ziptyze May 25, 2023
19e6670
Update keyboards/1upkeyboards/1upslider8/info.json
ziptyze May 25, 2023
37deaf5
Update keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c
ziptyze May 25, 2023
4a9dc78
Update keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c
ziptyze May 25, 2023
8ebc263
Update keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
ziptyze May 25, 2023
b065680
Update keyboards/1upkeyboards/1upslider8/keymaps/default/keymap.c
ziptyze May 25, 2023
84d1e53
Apply suggestions from code review
ziptyze May 25, 2023
51fa3f9
Update keymap.c
ziptyze May 25, 2023
9247306
Merge branch 'qmk:master' into may_updates_01
ziptyze May 31, 2023
4658292
change osu5k to ocarina and requested changes for pr
ziptyze May 31, 2023
2aa58d3
remove slider8 from this branch
ziptyze Jun 1, 2023
cf126a1
fixing s16v2 issue
ziptyze Jun 1, 2023
d37aba2
fixing s16v2 sync issue
ziptyze Jun 1, 2023
d52acb6
Merge branch 'qmk:master' into may_updates_01
ziptyze Jun 9, 2023
File filter

Filter by extension

Filter by extension

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

#pragma once

#define RGB_DI_PIN GP24
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
#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
93 changes: 93 additions & 0 deletions keyboards/1upkeyboards/1uposu5k/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"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 }
]
}
}
}
34 changes: 34 additions & 0 deletions keyboards/1upkeyboards/1uposu5k/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#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] = {
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}
};
#endif
1 change: 1 addition & 0 deletions keyboards/1upkeyboards/1uposu5k/keymaps/default/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ENCODER_MAP_ENABLE = yes
34 changes: 34 additions & 0 deletions keyboards/1upkeyboards/1uposu5k/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#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] = {
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}
};
#endif
4 changes: 4 additions & 0 deletions keyboards/1upkeyboards/1uposu5k/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VIA_ENABLE = yes
LTO_ENABLE = yes

ENCODER_MAP_ENABLE = yes
22 changes: 22 additions & 0 deletions keyboards/1upkeyboards/1uposu5k/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 1uposu5k

*A short description of the keyboard/project*
ziptyze marked this conversation as resolved.
Show resolved Hide resolved

* 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
1 change: 1 addition & 0 deletions keyboards/1upkeyboards/1uposu5k/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
WS2812_DRIVER = vendor
84 changes: 84 additions & 0 deletions keyboards/1upkeyboards/1upslider8/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/* 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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#define OLED_DISPLAY_128X32
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
#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"
ziptyze marked this conversation as resolved.
Show resolved Hide resolved


#define SLIDER_PIN GP28
#define MIDI_ADVANCED

#define RGB_DI_PIN GP26
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
#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
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
9 changes: 9 additions & 0 deletions keyboards/1upkeyboards/1upslider8/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// 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 <halconf.h>
Loading