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

Move files to rev1 folder, add rev2 #21563

Merged
merged 10 commits into from
Jul 20, 2023
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
3 changes: 3 additions & 0 deletions data/mappings/keyboard_aliases.hjson
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@
"kbdfans/kbd67/mkiirgb": {
"target": "kbdfans/kbd67/mkiirgb/v1"
},
"keebio/chocopad": {
"target": "keebio/chocopad/rev1"
},
"keebio/dsp40": {
"target": "keebio/dsp40/rev1"
},
Expand Down
22 changes: 0 additions & 22 deletions keyboards/keebio/chocopad/config.h

This file was deleted.

23 changes: 3 additions & 20 deletions keyboards/keebio/chocopad/info.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,10 @@
{
"keyboard_name": "Chocopad",
"manufacturer": "Keebio",
"url": "",
"maintainer": "qmk",
"url": "https://keeb.io",
"maintainer": "nooges",
"usb": {
"vid": "0xCB10",
"pid": "0x1144",
"device_version": "1.0.0"
"vid": "0xCB10"
},
"matrix_pins": {
"cols": ["D2", "D4", "F6", "F5"],
"rows": ["D7", "E6", "B3", "B2"]
},
"diode_direction": "COL2ROW",
"backlight": {
"pin": "B5",
"levels": 6
},
"ws2812": {
"pin": "D3"
},
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4"],
"layouts": {
"LAYOUT_ortho_4x4": {
Expand Down
3 changes: 3 additions & 0 deletions keyboards/keebio/chocopad/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

#define _BASE 0
Expand Down
2 changes: 0 additions & 2 deletions keyboards/keebio/chocopad/keymaps/khord/rules.mk

This file was deleted.

7 changes: 7 additions & 0 deletions keyboards/keebio/chocopad/keymaps/via/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_PINWHEEL
#define RGB_MATRIX_DEFAULT_SPD 48
20 changes: 20 additions & 0 deletions keyboards/keebio/chocopad/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

[0] = LAYOUT_ortho_4x4(
KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_P4, KC_P5, KC_P6, KC_PERC,
KC_P1, KC_P2, KC_P3, KC_EQL,
KC_P0, MO(1), KC_PDOT, KC_PENT
),
[1] = LAYOUT_ortho_4x4(
RGB_TOG, KC_PSLS, KC_PAST, KC_PMNS,
KC_PGUP, KC_HOME, KC_UP, KC_END,
KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT,
RGB_MOD, _______, KC_VOLD, KC_VOLU
)
};
2 changes: 2 additions & 0 deletions keyboards/keebio/chocopad/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
41 changes: 41 additions & 0 deletions keyboards/keebio/chocopad/rev1/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"keyboard_name": "Chocopad Rev. 1",
"usb": {
"pid": "0x1144",
"device_version": "1.0.0"
},
"development_board": "promicro",
"matrix_pins": {
"cols": ["D2", "D4", "F6", "F5"],
"rows": ["D7", "E6", "B3", "B2"]
},
"diode_direction": "COL2ROW",
"features": {
"extrakey": true,
"mousekey": true,
"backlight": true,
"rgblight": true
},
"backlight": {
"pin": "B5",
"levels": 6
},
"ws2812": {
"pin": "D3"
},
"rgblight": {
"led_count": 4,
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#include "quantum.h"

void eeconfig_init_kb(void) {
Expand Down
1 change: 1 addition & 0 deletions keyboards/keebio/chocopad/rev1/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank
13 changes: 13 additions & 0 deletions keyboards/keebio/chocopad/rev2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Copyright 2023 Danny Nguyen (danny@keeb.io)
// SPDX-License-Identifier: GPL-2.0-or-later

#pragma once

#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U

// RGB Matrix
#define RGB_MATRIX_LED_COUNT 20
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
93 changes: 93 additions & 0 deletions keyboards/keebio/chocopad/rev2/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"keyboard_name": "Chocopad Rev. 2",
"usb": {
"pid": "0x2144",
"device_version": "2.0.0"
},
"processor": "RP2040",
"bootloader": "rp2040",
"diode_direction": "COL2ROW",
"features": {
"extrakey": true,
"mousekey": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["GP20", "GP19", "GP29", "GP0"],
"rows": ["GP28", "GP18", "GP17", "GP16"]
},
"ws2812": {
"pin": "GP15",
"driver": "vendor"
},
"rgb_matrix": {
"driver": "WS2812",
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"rainbow_moving_chevron": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
},
"layout": [
{"matrix": [0, 0], "flags": 4, "x": 0, "y": 0},
{"flags": 2, "x": 37, "y": 0},
{"matrix": [0, 1], "flags": 4, "x": 75, "y": 0},
{"matrix": [0, 2], "flags": 4, "x": 149, "y": 0},
{"flags": 2, "x": 187, "y": 0},
{"matrix": [0, 3], "flags": 4, "x": 224, "y": 0},
{"matrix": [1, 3], "flags": 4, "x": 224, "y": 21},
{"matrix": [1, 2], "flags": 4, "x": 149, "y": 21},
{"matrix": [1, 1], "flags": 4, "x": 75, "y": 21},
{"matrix": [1, 0], "flags": 4, "x": 0, "y": 21},
{"matrix": [2, 0], "flags": 4, "x": 0, "y": 43},
{"matrix": [2, 1], "flags": 4, "x": 75, "y": 43},
{"matrix": [2, 2], "flags": 4, "x": 149, "y": 43},
{"matrix": [2, 3], "flags": 4, "x": 224, "y": 43},
{"matrix": [3, 3], "flags": 4, "x": 224, "y": 64},
{"flags": 2, "x": 187, "y": 64},
{"matrix": [3, 2], "flags": 4, "x": 149, "y": 64},
{"matrix": [3, 1], "flags": 4, "x": 75, "y": 64},
{"flags": 2, "x": 37, "y": 64},
{"matrix": [3, 0], "flags": 4, "x": 0, "y": 64}
]
}
}
1 change: 1 addition & 0 deletions keyboards/keebio/chocopad/rev2/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# This file intentionally left blank
12 changes: 0 additions & 12 deletions keyboards/keebio/chocopad/rules.mk

This file was deleted.