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

Add KiiBOOM Cybrix16 #23723

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
30 changes: 30 additions & 0 deletions keyboards/kiiboom/cybrix16/config.h
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of the settings in here can be moved to info.json, and this file can be removed. qmk migrate or qmk info -f json can help with that.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/* Copyright 2022 Jacky
*
* 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_MATRIX_LED_COUNT 17
#define ENCODERS_PAD_A { A6,C13, C15 }
#define ENCODERS_PAD_B { C14,A5, A7 }
#define DYNAMIC_KEYMAP_LAYER_COUNT 6





39 changes: 39 additions & 0 deletions keyboards/kiiboom/cybrix16/cybrix16.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/* Copyright 2022 Jacky
*
* 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 "quantum.h"



void keyboard_post_init_kb(void)
{
AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk);
AFIO->MAPR|= AFIO_MAPR_SWJ_CFG_DISABLE;
setPinOutput(B8);
writePinLow(B8);
setPinOutput(B6);
writePinLow(B6);
setPinOutput(B7);
writePinLow(B7);

setPinOutput(B12);
writePinLow(B12);
setPinOutput(B13);
writePinLow(B13);
setPinOutput(B14);
writePinHigh(B14);
Comment on lines +24 to +36
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for init'ing these?


}

140 changes: 140 additions & 0 deletions keyboards/kiiboom/cybrix16/info.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please run qmk format-json on this file.

Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
{
"manufacturer": "kiiboom",
"keyboard_name": "Kiiboom cybfix 16",
"board": "STM32_F103_STM32DUINO",
"bootloader": "stm32duino",
"url": "www.kiiboom",
"maintainer": "kiiboom",
"bootloader_instructions": "Press ESC(ROW0COL0), Plug USB. ",
"processor": "STM32F103",
"usb": {
"pid": "0x0080",
"vid": "0x5343",
"device_version": "1.0.5",
"wait_for": false,
"no_startup_check": true
},
"diode_direction": "ROW2COL",

"matrix_pins": {
"rows": ["A0", "A1", "A3", "A2", "A4"],
"cols": ["B0","B10", "B2", "B1"]
},


"features": {
"bootmagic": true,
"command": false,
"console": true,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgblight": false,
"rgb_matrix":true,
"os_detection":true
},




"ws2812": {
"pin": "B11"
},


"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,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": 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": [
{ "flags": 4, "matrix": [0, 0],"x": 0, "y": 0 },
{ "flags": 4, "matrix": [0, 1],"x": 75, "y": 0 },
{ "flags": 4, "matrix": [0, 2],"x": 149, "y": 0 },
{ "flags": 4, "matrix": [0, 3],"x": 224, "y": 0 },
{ "flags": 4, "matrix": [1, 3], "x": 224, "y": 21 },
{ "flags": 4, "matrix": [1, 2], "x": 149, "y": 21 },
{ "flags": 4, "matrix": [1, 1], "x": 75, "y": 21 },
{ "flags": 4, "matrix": [1, 0], "x": 0, "y": 21 },
{ "flags": 4, "matrix": [2, 0], "x": 0, "y": 43 },
{ "flags": 4, "matrix": [2, 1], "x": 75, "y": 43 },
{ "flags": 4, "matrix": [2, 2], "x": 149, "y": 43 },
{ "flags": 4, "matrix": [2, 3], "x": 224, "y": 43 },
{ "flags": 4, "matrix": [3, 3], "x": 224, "y": 64 },
{ "flags": 4, "matrix": [3, 2], "x": 149, "y": 64 },
{ "flags": 4, "matrix": [3, 1], "x": 75,"y": 64 },
{ "flags": 4, "matrix": [3, 0], "x": 0,"y": 64 }
]
},


"layouts": {
"LAYOUT": {
Comment on lines +110 to +111
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"layouts": {
"LAYOUT": {
"community_layouts": [ "ortho_4x4" ],
"layouts": {
"LAYOUT_ortho_4x4": {

"layout": [
{"matrix":[0, 0],"x": 0,"y": 0},
{"matrix":[0, 1],"x": 1.25, "y": 0},
{"matrix":[0, 2],"x": 2.25, "y": 0},
{"matrix":[0, 3],"x": 3.25, "y": 0},
{"matrix":[1, 0], "x": 0, "y": 1.25},
{"matrix":[1, 1],"x": 1.25, "y": 1.25},
{"matrix":[1, 2],"x": 2.25, "y": 1.25},
{"matrix":[1, 3], "x": 3.25, "y": 1.25},
{"matrix":[2, 0], "x": 0,"y": 2.25},
{"matrix":[2, 1],"x": 1.25, "y": 2.25},
{"matrix":[2, 2], "x": 2.25, "y": 2.25},
{"matrix":[2, 3],"x": 3.25, "y": 2.25},
{"matrix":[3, 0],"x": 0, "y": 3.25},
{"matrix":[3, 1],"x": 1.25, "y": 3.25},
{"matrix":[3, 2],"x": 2.25, "y": 3.25},
{"matrix":[3, 3],"x": 3.25, "y": 3.25},
{"matrix":[4, 0],"x": 0, "y": 4.25},
{"matrix":[4, 2],"x": 1.25, "y": 4.25},
{"matrix":[4, 1],"x": 2.25, "y": 4.25},
{"matrix":[4, 3],"x": 3.25, "y": 4.25}
]
}
}
}




39 changes: 39 additions & 0 deletions keyboards/kiiboom/cybrix16/keymaps/default/keymap.c
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has a bunch of tabs. Please replace tabs with spaces per coding conventions.

Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
Copyright 2021 owlab
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(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[0] = LAYOUT(
[0] = LAYOUT_ortho_4x4(

KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PSCR, KC_PAUS,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT,
_______, _______
)
[1] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[1] = LAYOUT(
[1] = LAYOUT_ortho_4x4(

_______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______,
_______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, QK_BOOT, _______, _______,
_______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, RGB_MOD,
_______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI,
_______, _______

)
};
92 changes: 92 additions & 0 deletions keyboards/kiiboom/cybrix16/keymaps/via/keymap.c
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As other keymap, tabs -> spaces

Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
/*
Copyright 2021 owlab
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


#define ENCODER_DIRECTION_FLIP
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_PAGE_UP, KC_PAGE_DOWN), ENCODER_CCW_CW(KC_MEDIA_PREV_TRACK, KC_MEDIA_NEXT_TRACK), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO) },
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a heads up, you can set these to KC_TRANS/_______, and they'll fall through to the bottom layer.

[2] = { ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO) },
[3] = { ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO) },
[4] = { ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO) },
[5] = { ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO), ENCODER_CCW_CW(KC_NO, KC_NO) },
};
#endif


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

[0] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[0] = LAYOUT(
[0] = LAYOUT_ortho_4x4(

KC_MY_COMPUTER, KC_7, KC_8, KC_9,
KC_WWW_HOME, KC_4, KC_5, KC_6,
LCTL(KC_X), KC_1, KC_2, KC_3,
LCTL(KC_C), LCTL(KC_V), KC_0, KC_DOT,
_______, RGB_TOG, KC_MPLY, TO(1)


),

[1] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[1] = LAYOUT(
[1] = LAYOUT_ortho_4x4(

KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, TO(2)


),
[2] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[2] = LAYOUT(
[2] = LAYOUT_ortho_4x4(

KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, TO(3)


),
[3] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[3] = LAYOUT(
[3] = LAYOUT_ortho_4x4(

KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, TO(4)


),
[4] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[4] = LAYOUT(
[4] = LAYOUT_ortho_4x4(

KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, TO(5)


),
[5] = LAYOUT(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[5] = LAYOUT(
[5] = LAYOUT_ortho_4x4(

RGB_TOG, RGB_MOD, RGB_RMOD, RGB_HUD,
RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD,
RGB_VAI, RGB_SPD, RGB_SPI, RGB_MODE_PLAIN,
RGB_MODE_BREATHE, RGB_MODE_RAINBOW, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, TO(0)

)


};


2 changes: 2 additions & 0 deletions keyboards/kiiboom/cybrix16/keymaps/via/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
LTO_ENABLE = yes
22 changes: 22 additions & 0 deletions keyboards/kiiboom/cybrix16/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Kiiboom cybfix 16

Check failure on line 1 in keyboards/kiiboom/cybrix16/readme.md

View workflow job for this annotation

GitHub Actions / lint

Requires Formatting

* A customizable mechanical keyboard.

* Keyboard Maintainer: [KiiBOOM]( https://github.com/KiiBOOM-Official)
* Hardware Supported: Kiiboom cybfix 16
* Hardware Availability: [vertex-kb](https://github.com/Vertex-kb)

Make example for this keyboard (after setting up your build environment):

make vertex/Kiiboom cybfix 16:default

Flashing example for this keyboard:

make vertex/Kiiboom cybfix 16: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 ESC in the keyboard then replug
* **Physical reset button**: Briefly press the button on the back of the PCB
* **Keycode in layout**: Press the key mapped to `QK_BOOT`
7 changes: 7 additions & 0 deletions keyboards/kiiboom/cybrix16/rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

Check failure on line 1 in keyboards/kiiboom/cybrix16/rules.mk

View workflow job for this annotation

GitHub Actions / lint

Requires Formatting
MCU_LDSCRIPT = STM32F103xB
ENCODER_MAP_ENABLE = yes
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Encoder map should only be enabled at the keymap level, never at the keyboard level.

ENCODER_ENABLE = yes



Loading