fixed configuration for cycle7 (zegonix)

This commit is contained in:
2025-04-13 20:29:56 +02:00
parent 9a7cf31e34
commit e0cb4b7e65
7 changed files with 137 additions and 133 deletions
+10 -2
View File
@@ -30,16 +30,25 @@
#endif // STM32_HSE_BYPASS
/* configuration of indicator led */
#define WS2812_DI_PIN A5
#define RGBLIGHT_LED_COUNT 1
#define WS2812_TIMING 1250
#define WS2812_T1H 640
#define WS2812_T0H 320
#define WS2812_TRST_US 200
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_GRB
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 1
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_PWM_TARGET_PERIOD 800000
#ifdef WS2812_RGBW
#undef WS2812_RGBW
#endif
#ifdef WS2812_EXTERNAL_PULLUP
#undef WS2812_EXTERNAL_PULLUP
#endif
@@ -51,4 +60,3 @@
// configuration of rgb light abstraction layer
#define RGBLIGHT_SLEEP
#define RGBLIGHT_LAYERS
#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+1 -1
View File
@@ -1,5 +1,5 @@
#pragma once
#define HAL_USE_PWM TRUE
#define HAL_USE_PWM TRUE
#include_next <halconf.h>
-115
View File
@@ -1,115 +0,0 @@
{
"manufacturer": "=",
"keyboard_name": "zegonix-cycle7",
"maintainer": "zegonix",
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"url": "https://github.com/zegonix/custom-cycle7-pcb",
"features": {
"bootmagic": true,
"nkro": true,
"extrakey": true,
"mousekey": true,
"rgblight": true
},
"required": ["lto"],
"usb": {
"device_version": "0.0.1",
"pid": "0x6337",
"vid": "0x7A78"
},
"matrix_pins": {
"cols": ["C14", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "D2", "C12", "C11", "C10", "A15", "C9", "C8", "C7"],
"rows": ["A6", "A7", "C4", "C5", "B0"]
},
"rgblight": {
"led_count": 16
},
"ws2812": {
"pin": "A5",
"driver": "bitbang"
},
"tapping": {
"term": 200
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
{"label": "1!", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
{"label": "2@", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
{"label": "3#", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
{"label": "4$", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
{"label": "5%", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
{"label": "6^", "matrix": [0, 6], "x": 6, "y": 0, "w": 1},
{"label": "7&", "matrix": [0, 7], "x": 7, "y": 0, "w": 1},
{"label": "8*", "matrix": [0, 8], "x": 8, "y": 0, "w": 1},
{"label": "9(", "matrix": [0, 9], "x": 9, "y": 0, "w": 1},
{"label": "0)", "matrix": [0, 10], "x": 10, "y": 0, "w": 1},
{"label": "-_", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
{"label": "=+", "matrix": [2, 13], "x": 12, "y": 0, "w": 1},
{"label": "BSPC", "matrix": [0, 12], "x": 13, "y": 0, "w": 2},
{"label": "INS", "matrix": [0, 13], "x": 15.5, "y": 0, "w": 1},
{"label": "HOME", "matrix": [0, 14], "x": 16.5, "y": 0, "w": 1},
{"label": "PGUP", "matrix": [0, 15], "x": 17.5, "y": 0, "w": 1},
{"label": "TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1},
{"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1},
{"label": "]}", "matrix": [3, 13], "x": 12.5, "y": 1, "w": 1},
{"label": "\\|", "matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
{"label": "DEL", "matrix": [1, 13], "x": 15.5, "y": 1, "w": 1},
{"label": "END", "matrix": [1, 14], "x": 16.5, "y": 1, "w": 1},
{"label": "PGDN", "matrix": [1, 15], "x": 17.5, "y": 1, "w": 1},
{"label": "CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1},
{"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1},
{"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1},
{"label": "ENT", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"label": "LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1},
{"label": ",<", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1},
{"label": ".>", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1},
{"label": "/?", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1},
{"label": "RSFT", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
{"label": "UP", "matrix": [3, 14], "x": 15.5, "y": 3, "w": 1},
{"label": "LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"label": "SPC0", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
{"label": "SPC1", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
{"label": "SPC2", "matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
{"label": "FUNC", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"label": "RCTL", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"label": "RGUI", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"label": "RALT", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
{"label": "LEFT", "matrix": [4, 13], "x": 15.5, "y": 4, "w": 1},
{"label": "DOWN", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1},
{"label": "RGHT", "matrix": [4, 15], "x": 17.5, "y": 4, "w": 1}
]
}
}
}
+108
View File
@@ -0,0 +1,108 @@
{
"manufacturer": "=",
"keyboard_name": "zegonix-cycle7",
"maintainer": "zegonix",
"processor": "STM32F401",
"bootloader": "stm32-dfu",
"diode_direction": "COL2ROW",
"url": "https://github.com/zegonix/custom-cycle7-pcb",
"features": {
"bootmagic": true,
"nkro": true,
"extrakey": true,
"mousekey": true,
"rgblight": true
},
"required": ["lto"],
"usb": {
"device_version": "0.0.1",
"pid": "0x6337",
"vid": "0x7A78"
},
"matrix_pins": {
"cols": ["C14", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "D2", "C12", "C11", "C10", "A15", "C9", "C8", "C7"],
"rows": ["A6", "A7", "C4", "C5", "B0"]
},
"tapping": {
"term": 200
},
"layouts": {
"LAYOUT": {
"layout": [
{"label": "ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1},
{"label": "1!", "matrix": [0, 1], "x": 1, "y": 0, "w": 1},
{"label": "2@", "matrix": [0, 2], "x": 2, "y": 0, "w": 1},
{"label": "3#", "matrix": [0, 3], "x": 3, "y": 0, "w": 1},
{"label": "4$", "matrix": [0, 4], "x": 4, "y": 0, "w": 1},
{"label": "5%", "matrix": [0, 5], "x": 5, "y": 0, "w": 1},
{"label": "6^", "matrix": [0, 6], "x": 6, "y": 0, "w": 1},
{"label": "7&", "matrix": [0, 7], "x": 7, "y": 0, "w": 1},
{"label": "8*", "matrix": [0, 8], "x": 8, "y": 0, "w": 1},
{"label": "9(", "matrix": [0, 9], "x": 9, "y": 0, "w": 1},
{"label": "0)", "matrix": [0, 10], "x": 10, "y": 0, "w": 1},
{"label": "-_", "matrix": [0, 11], "x": 11, "y": 0, "w": 1},
{"label": "=+", "matrix": [2, 13], "x": 12, "y": 0, "w": 1},
{"label": "BSPC", "matrix": [0, 12], "x": 13, "y": 0, "w": 2},
{"label": "INS", "matrix": [0, 13], "x": 15.5, "y": 0, "w": 1},
{"label": "HOME", "matrix": [0, 14], "x": 16.5, "y": 0, "w": 1},
{"label": "PGUP", "matrix": [0, 15], "x": 17.5, "y": 0, "w": 1},
{"label": "TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1},
{"label": "[{", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1},
{"label": "]}", "matrix": [3, 13], "x": 12.5, "y": 1, "w": 1},
{"label": "\\|", "matrix": [1, 12], "x": 13.5, "y": 1, "w": 1.5},
{"label": "DEL", "matrix": [1, 13], "x": 15.5, "y": 1, "w": 1},
{"label": "END", "matrix": [1, 14], "x": 16.5, "y": 1, "w": 1},
{"label": "PGDN", "matrix": [1, 15], "x": 17.5, "y": 1, "w": 1},
{"label": "CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1},
{"label": ";:", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1},
{"label": "'\"", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1},
{"label": "ENT", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
{"label": "LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
{"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1},
{"label": ",<", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1},
{"label": ".>", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1},
{"label": "/?", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1},
{"label": "RSFT", "matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75},
{"label": "UP", "matrix": [3, 14], "x": 15.5, "y": 3, "w": 1},
{"label": "LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
{"label": "LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
{"label": "SPC0", "matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25},
{"label": "SPC1", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75},
{"label": "SPC2", "matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.25},
{"label": "FUNC", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
{"label": "RCTL", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
{"label": "RGUI", "matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
{"label": "RALT", "matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25},
{"label": "LEFT", "matrix": [4, 13], "x": 15.5, "y": 4, "w": 1},
{"label": "DOWN", "matrix": [4, 14], "x": 16.5, "y": 4, "w": 1},
{"label": "RGHT", "matrix": [4, 15], "x": 17.5, "y": 4, "w": 1}
]
}
}
}
+11 -11
View File
@@ -67,9 +67,9 @@ KC_LCTL, KC_LGUI, KC_LALT, KC_M, KC_SPC, KC_
// navigation layer
[_NAV] = LAYOUT(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, QK_BOOT, _______, _______,
_______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, KC_LCTL, KC_LSFT, KC_LALT, KC_LGUI, _______, _______,
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______,
_______, _______, KC_HOME, KC_UP, KC_END, KC_PGUP, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, _______, _______, _______, _______, _______, _______,
_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
@@ -77,8 +77,8 @@ _______, _______, _______, _______, _______, ___
// div
[_DIV] = LAYOUT(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, RGB_M_P, _______,
_______, _______, _______, _______, _______, DF(_GAME), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_LALT, KC_LSFT, KC_LCTL, DF(_BASE), _______, KC_DEL, KC_VOLU, KC_VOLD, _______, _______, _______,
_______, _______, _______, KC_VOLD, KC_VOLU, DF(_GAME), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, DF(_BASE), KC_DEL, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI,
QK_BOOT, _______, _______, _______, KC_CAPS, _______, _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI
),
@@ -94,12 +94,12 @@ _______, _______, _______, _______, _______, ___
};
/* Indicator LED Configuraton */
const rgblight_segment_t PROGMEM rgb_layer_BASE[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_YELLOW});
const rgblight_segment_t PROGMEM rgb_layer_GAME[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_SPRINGGREEN});
const rgblight_segment_t PROGMEM rgb_layer_NAV[] = RGBLIGHT_LAYER_SEGMENTS({11, 2, HSV_PURPLE});
const rgblight_segment_t PROGMEM rgb_layer_DIV[] = RGBLIGHT_LAYER_SEGMENTS({11, 2, HSV_PURPLE});
const rgblight_segment_t PROGMEM rgb_layer_MOUS[] = RGBLIGHT_LAYER_SEGMENTS({11, 2, HSV_PURPLE});
const rgblight_segment_t PROGMEM rgb_layer_CAPS[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_WHITE});
const rgblight_segment_t PROGMEM rgb_layer_BASE[] = RGBLIGHT_LAYER_SEGMENTS({1, 0, HSV_YELLOW});
const rgblight_segment_t PROGMEM rgb_layer_GAME[] = RGBLIGHT_LAYER_SEGMENTS({1, 0, HSV_SPRINGGREEN});
const rgblight_segment_t PROGMEM rgb_layer_NAV[] = RGBLIGHT_LAYER_SEGMENTS({1, 0, HSV_PURPLE});
const rgblight_segment_t PROGMEM rgb_layer_DIV[] = RGBLIGHT_LAYER_SEGMENTS({1, 0, HSV_PURPLE});
const rgblight_segment_t PROGMEM rgb_layer_MOUS[] = RGBLIGHT_LAYER_SEGMENTS({1, 0, HSV_PURPLE});
const rgblight_segment_t PROGMEM rgb_layer_CAPS[] = RGBLIGHT_LAYER_SEGMENTS({1, 0, HSV_WHITE});
const rgblight_segment_t * const PROGMEM rgb_layers[] = RGBLIGHT_LAYERS_LIST(
[_BASE] = rgb_layer_BASE,
+3 -1
View File
@@ -3,8 +3,10 @@
#include_next <mcuconf.h>
/* clock configuration */
#ifdef STM32_PLLM_VALUE
#undef STM32_PLLM_VALUE
#define STM32_PLLM_VALUE 6
#endif
#define STM32_PLLM_VALUE 6
/* system configuration */
#ifdef STM32_ST_USE_TIMER
+1
View File
@@ -1 +1,2 @@
WS2812_DRIVER_REQUIRED = yes
WS2812_DRIVER = pwm