From 6db79e62ee83966c050dc736492d62c29357b85c Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Mon, 25 Sep 2023 23:31:08 -0300 Subject: [PATCH 01/12] First magnum ergo 1 support --- keyboards/dark/magnum_ergo_1/config.h | 36 ++++++ keyboards/dark/magnum_ergo_1/halconf.h | 22 ++++ keyboards/dark/magnum_ergo_1/info.json | 107 ++++++++++++++++++ .../magnum_ergo_1/keymaps/default/keymap.c | 47 ++++++++ .../dark/magnum_ergo_1/keymaps/via/keymap.c | 47 ++++++++ .../dark/magnum_ergo_1/keymaps/via/rules.mk | 1 + keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 96 ++++++++++++++++ keyboards/dark/magnum_ergo_1/magnum_ergo_1.h | 40 +++++++ keyboards/dark/magnum_ergo_1/mcuconf.h | 22 ++++ keyboards/dark/magnum_ergo_1/readme.md | 28 +++++ keyboards/dark/magnum_ergo_1/rules.mk | 2 + 11 files changed, 448 insertions(+) create mode 100644 keyboards/dark/magnum_ergo_1/config.h create mode 100644 keyboards/dark/magnum_ergo_1/halconf.h create mode 100644 keyboards/dark/magnum_ergo_1/info.json create mode 100644 keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c create mode 100644 keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c create mode 100644 keyboards/dark/magnum_ergo_1/keymaps/via/rules.mk create mode 100644 keyboards/dark/magnum_ergo_1/magnum_ergo_1.c create mode 100644 keyboards/dark/magnum_ergo_1/magnum_ergo_1.h create mode 100644 keyboards/dark/magnum_ergo_1/mcuconf.h create mode 100644 keyboards/dark/magnum_ergo_1/readme.md create mode 100644 keyboards/dark/magnum_ergo_1/rules.mk diff --git a/keyboards/dark/magnum_ergo_1/config.h b/keyboards/dark/magnum_ergo_1/config.h new file mode 100644 index 000000000000..23395c05d973 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/config.h @@ -0,0 +1,36 @@ +/* Copyright 2023 Gondolindrim + +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 DEBOUNCE 5 + +#define LOCKING_SUPPORT_ENABLE +#define LOCKING_RESYNC_ENABLE + +#define BACKLIGHT_PWM_DRIVER PWMD3 +#define BACKLIGHT_PWM_CHANNEL 2 +#define BACKLIGHT_PAL_MODE 2 + +#define LED_CAPS_LOCK_PIN B1 +#define LED_INDICATOR_1 C4 +#define LED_INDICATOR_2 C5 +#define LED_INDICATOR_3 B0 +#define LED_INDICATOR_4 A5 +#define LED_INDICATOR_5 C15 + +#define WEAR_LEVELING_LOGICAL_SIZE 2048 +#define WEAR_LEVELING_BACKING_SIZE 4096 diff --git a/keyboards/dark/magnum_ergo_1/halconf.h b/keyboards/dark/magnum_ergo_1/halconf.h new file mode 100644 index 000000000000..c3777d4105e5 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/halconf.h @@ -0,0 +1,22 @@ +/* Copyright 2023 Gondolindrim + * + * 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 HAL_USE_PWM TRUE +#define HAL_USE_PAL TRUE + +#include_next diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/info.json new file mode 100644 index 000000000000..452db85089ac --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/info.json @@ -0,0 +1,107 @@ +{ + "keyboard_name": "Magnum Ergo 1", + "manufacturer": "Gondolindrim X Dark", + "url": "", + "maintainer": "Gondolindrim", + "usb": { + "vid": "0x4744", + "pid": "0x4D45", + "device_version": "0.0.1" + }, + "features": { + "audio": false, + "backlight": true, + "bootmagic": true, + "command": false, + "console": false, + "encoder": false, + "extrakey": true, + "lto": true, + "mousekey": false, + "nkro": true, + "rgblight": false + }, + "diode_direction": "COL2ROW", + "backlight": { + "pin": "C7", + "levels": 20, + "breathing": true + }, + "matrix_pins": { + "cols": ["C8", "C9" , "C6" , "B15", "B14", "B13", "B12", "B9" , "A4" , "B4" , "A2" , "C0" , "C1" , "C2" , "A1" ], + "rows": ["A10", "A8" , "B10", "A7" , "A6" , "A0", "C3" , "B5", "B8" , "A3" ] + }, + "processor": "STM32F401", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "Esc", "matrix": [0,0], "x":0.5, "y":0}, + {"label": "`~", "matrix": [0,1], "x":1.7, "y":0}, + {"label": "1!", "matrix": [0,2], "x":2.7, "y":0}, + {"label": "2@", "matrix": [0,3], "x":3.7, "y":0}, + {"label": "3#", "matrix": [0,4], "x":4.7, "y":0}, + {"label": "4$", "matrix": [0,5], "x":5.7, "y":0}, + {"label": "5%", "matrix": [4,5], "x":6.7, "y":0}, + {"label": "6^", "matrix": [0,6], "x":7.7, "y":0}, + {"label": "7&", "matrix": [5,7], "x":9.15, "y":0}, + {"label": "8*", "matrix": [5,8], "x":10.15, "y":0}, + {"label": "9(", "matrix": [5,9], "x":11.15, "y":0}, + {"label": "0)", "matrix": [5,10], "x":12.15, "y":0}, + {"label": "-_", "matrix": [5,11], "x":13.15, "y":0}, + {"label": "=+", "matrix": [5,12], "x":14.15, "y":0}, + {"label": "Backspace", "matrix": [5,13], "x":15.15, "y":0}, + {"label": "Backspace", "matrix": [5,14], "x":16.15, "y":0}, + {"label": "Page Up", "matrix": [1,0], "x":0.25, "y":1}, + {"label": "Tab", "matrix": [1,1], "x":1.5, "y":1, "w":1.5}, + {"label": "Q", "matrix": [1,2], "x":3, "y":1}, + {"label": "W", "matrix": [1,3], "x":4, "y":1}, + {"label": "E", "matrix": [1,4], "x":5, "y":1}, + {"label": "R", "matrix": [1,5], "x":6, "y":1}, + {"label": "T", "matrix": [1,6], "x":7, "y":1}, + {"label": "Y", "matrix": [6,7], "x":9, "y":1}, + {"label": "U", "matrix": [6,8], "x":10, "y":1}, + {"label": "I", "matrix": [6,9], "x":11, "y":1}, + {"label": "O", "matrix": [6,10], "x":12, "y":1}, + {"label": "P", "matrix": [6,11], "x":13, "y":1}, + {"label": "[{", "matrix": [6,12], "x":14, "y":1}, + {"label": "]}", "matrix": [6,13], "x":15, "y":1}, + {"label": "\\|", "matrix": [6,14], "x":16, "y":1, "w":1.5}, + {"label": "Page Down", "matrix": [2,0], "x":0, "y":2}, + {"label": "Caps Lock", "matrix": [2,1], "x":1.3, "y":2, "w":1.75}, + {"label": "A", "matrix": [2,2], "x":3.05, "y":2}, + {"label": "S", "matrix": [2,3], "x":4.05, "y":2}, + {"label": "D", "matrix": [2,4], "x":5.05, "y":2}, + {"label": "F", "matrix": [2,5], "x":6.05, "y":2}, + {"label": "G", "matrix": [2,6], "x":7.05, "y":2}, + {"label": "H", "matrix": [7,7], "x":9.4, "y":2}, + {"label": "J", "matrix": [7,8], "x":10.4, "y":2}, + {"label": "K", "matrix": [7,9], "x":11.4, "y":2}, + {"label": "L", "matrix": [7,10], "x":12.4, "y":2}, + {"label": ";:", "matrix": [7,11], "x":13.4, "y":2}, + {"label": "'\"", "matrix": [7,12], "x":14.4, "y":2}, + {"label": "Enter", "matrix": [7,14], "x":15.4, "y":2, "w":2.25}, + {"label": "Shift", "matrix": [3,1], "x":1.05, "y":3, "w":2.25}, + {"label": "Z", "matrix": [3,2], "x":3.3, "y":3}, + {"label": "X", "matrix": [3,3], "x":4.3, "y":3}, + {"label": "C", "matrix": [3,4], "x":5.3, "y":3}, + {"label": "V", "matrix": [3,5], "x":6.3, "y":3}, + {"label": "B", "matrix": [3,6], "x":7.3, "y":3}, + {"label": "B", "matrix": [8,7], "x":9.1, "y":3}, + {"label": "N", "matrix": [8,8], "x":10.1, "y":3}, + {"label": "M", "matrix": [8,9], "x":11.1, "y":3}, + {"label": ",<", "matrix": [8,10], "x":12.1, "y":3}, + {"label": ".>", "matrix": [8,11], "x":13.1, "y":3}, + {"label": "/?", "matrix": [8,12], "x":14.1, "y":3}, + {"label": "Shift", "matrix": [8,13], "x":15.1, "y":3, "w":1.75}, + {"label": "MO(1)", "matrix": [8,14], "x":16.85, "y":3}, + {"label": "LCtrl", "matrix": [4,1], "x":1.3, "y":4, "w":1.5}, + {"label": "LAlt", "matrix": [4,3], "x":3.6, "y":4, "w":1.5}, + {"label": "Space", "matrix": [4,4], "x":5.1, "y":4, "w":2.25}, + {"label": "Space", "matrix": [4,6], "x":7.35, "y":4}, + {"label": "Space", "matrix": [9,8], "x":9.0, "y":4, "w":2.75}, + {"label": "RAlt", "matrix": [9,10], "x":11.75, "y":4, "w":1.5}, + {"label": "RCtrl", "matrix": [9,14], "x":15.35, "y":4, "w":1.5}] + } + } +} diff --git a/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c b/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c new file mode 100644 index 000000000000..8102e92d1e43 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2020 Gondolindrim + * + * 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( /* Base */ + KC_GRV , KC_ESC , 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_BSPC, + KC_INS , 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_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_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , + KC_LCTL, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RCTL +), +[1] = LAYOUT( + QK_BOOT, 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, 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, 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, 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, KC_TRNS +), +[2] = LAYOUT( + 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, + 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, 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, 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, KC_TRNS, KC_TRNS +), +[3] = LAYOUT( + 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, + 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, 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, 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, KC_TRNS, KC_TRNS +) +}; diff --git a/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c b/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c new file mode 100644 index 000000000000..8102e92d1e43 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c @@ -0,0 +1,47 @@ +/* Copyright 2020 Gondolindrim + * + * 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( /* Base */ + KC_GRV , KC_ESC , 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_BSPC, + KC_INS , 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_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_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , + KC_LCTL, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RCTL +), +[1] = LAYOUT( + QK_BOOT, 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, 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, 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, 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, KC_TRNS +), +[2] = LAYOUT( + 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, + 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, 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, 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, KC_TRNS, KC_TRNS +), +[3] = LAYOUT( + 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, + 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, 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, 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, KC_TRNS, KC_TRNS +) +}; diff --git a/keyboards/dark/magnum_ergo_1/keymaps/via/rules.mk b/keyboards/dark/magnum_ergo_1/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c new file mode 100644 index 000000000000..289df97e6b73 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -0,0 +1,96 @@ +/* Copyright 2022 Gondolindrim + * + * 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" + +void board_init(void) { +#ifndef LED_CAPS_LOCK_PIN + writePin(LED_CAPS_LOCK_PIN, 0); +#endif + +#ifndef LED_INDICATOR_1 + writePin(LED_INDICATOR_1, 0); +#endif + +#ifndef LED_INDICATOR_2 + writePin(LED_INDICATOR_2, 0); +#endif + +#ifndef LED_INDICATOR_3 + writePin(LED_INDICATOR_3, 0); +#endif + +#ifndef LED_INDICATOR_4 + writePin(LED_INDICATOR_4, 0); +#endif + +#ifndef LED_INDICATOR_5 + writePin(LED_INDICATOR_5, 0); +#endif +} + +bool led_update_kb(led_t led_state) { + bool res = led_update_user(led_state); + #ifdef LED_CAPS_LOCK_PIN + if(res) { + writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); + } + #endif + return res; +} + +layer_state_t layer_state_set_kb(layer_state_t state) { + switch (get_highest_layer(state)) { + case 1: +#ifdef LED_INDICATOR_4 + writePin(LED_INDICATOR_4, 1); +#endif + +#ifdef LED_INDICATOR_5 + writePin(LED_INDICATOR_5, 1); +#endif + break; + case 2: +#ifdef LED_INDICATOR_1 + writePin(LED_INDICATOR_1, 1); +#endif +#ifdef LED_INDICATOR_2 + writePin(LED_INDICATOR_2, 1); +#endif +#ifdef LED_INDICATOR_3 + writePin(LED_INDICATOR_3, 1); +#endif + break; + default: +#ifdef LED_INDICATOR_1 + writePin(LED_INDICATOR_1, 0); +#endif +#ifdef LED_INDICATOR_2 + writePin(LED_INDICATOR_2, 0); +#endif +#ifdef LED_INDICATOR_3 + writePin(LED_INDICATOR_3, 0); +#endif +#ifdef LED_INDICATOR_4 + writePin(LED_INDICATOR_4, 0); +#endif +#ifdef LED_INDICATOR_5 + writePin(LED_INDICATOR_5, 0); +#endif + break; + } + return state; +} diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.h b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.h new file mode 100644 index 000000000000..ebc9fa039474 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.h @@ -0,0 +1,40 @@ +/* Copyright 2020 Gondolindrim + * + * 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 ___ KC_NO + +#include "quantum.h" + +#define LAYOUT_all( \ + K00, K01, K02, K03, K04, K05, K45, K06, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, \ + K10, K11, K12, K13, K14, K15, K16, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, \ + K20, K21, K22, K23, K24, K25, K26, K77, K78, K79, K7A, K7B, K7C, K7E, \ + K31, K32, K33, K34, K35, K36, K87, K88, K89, K8A, K8B, K8C, K8D, K8E, \ + K41, K43, K44, K46, K98, K9A, K9E \ +)\ +{\ + { K00, K01, K02, K03, K04, K05, K06, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { K10, K11, K12, K13, K14, K15, K16, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { K20, K21, K22, K23, K24, K25, K26, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, K31, K32, K33, K34, K35, K36, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, K41, ___, K43, K44, K45, K46, ___, ___, ___, ___, ___, ___, ___, ___ }, \ + { ___, ___, ___, ___, ___, ___, ___, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \ + { ___, ___, ___, ___, ___, ___, ___, K67, K68, K69, K6A, K6B, K6C, K6D, K6E }, \ + { ___, ___, ___, ___, ___, ___, ___, K77, K78, K79, K7A, K7B, K7C, ___, K7E }, \ + { ___, ___, ___, ___, ___, ___, ___, K87, K88, K89, K8A, K8B, K8C, K8D, K8E }, \ + { ___, ___, ___, ___, ___, ___, ___, ___, K98, ___, K9A, ___, ___, ___, K9E } \ +} diff --git a/keyboards/dark/magnum_ergo_1/mcuconf.h b/keyboards/dark/magnum_ergo_1/mcuconf.h new file mode 100644 index 000000000000..a81f8122071c --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2020 QMK + * + * 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 + +#include_next + +#undef STM32_PWM_USE_TIM3 +#define STM32_PWM_USE_TIM3 TRUE diff --git a/keyboards/dark/magnum_ergo_1/readme.md b/keyboards/dark/magnum_ergo_1/readme.md new file mode 100644 index 000000000000..c6a5d23b5668 --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/readme.md @@ -0,0 +1,28 @@ +# Gondolindrim X Dark Magnum Ergo 1 PCB QMK firmware + +The Magnum Ergo 1 is an Alice-layout ergonomic keyboard designed by Dark, with a PCB designer by Gondolindrim. + +* Keyboard Maintainer: [Gondolindrim](https://github.com/Gondolindrim) +* Hardware Supported: proprietary PCB using STM32F4x1C microcontroller; +* Availability: as of november 2022 both keyboard and PCB were sold in a private Group Buy; therefore availability is limited. + +## How to flash + +### Enter bootloader + +The DFU state in the bootloader can be accessed in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key, grave accent in the default keymap) and plug in the keyboard; +* **Physical reset button**: press the button on the front of the PCB, next to caps lock, for at least five seconds; +* **Keycode in layout**: Press the key mapped to `QK_BOOT`; in the default layout, that is top left key ('grave') in layer 1. + +### How to compile and flash + +You can compile the Iron 165R2 default keymap by using the following: + + make magnum_ergo_1:default + +And use dfu-util in the command line or through a GUI like QMK toolbox to upload the firmware to the PCB. To directly flash the PCB after it is put into a DFU state, use: + + make magnum_ergo_1:default:flash + diff --git a/keyboards/dark/magnum_ergo_1/rules.mk b/keyboards/dark/magnum_ergo_1/rules.mk new file mode 100644 index 000000000000..a92b0993283e --- /dev/null +++ b/keyboards/dark/magnum_ergo_1/rules.mk @@ -0,0 +1,2 @@ +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE From b46cd511786385cd0c3da57a6503db7dee9eb56a Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Mon, 25 Sep 2023 23:45:08 -0300 Subject: [PATCH 02/12] Delete keyboard.h --- keyboards/dark/magnum_ergo_1/magnum_ergo_1.h | 40 -------------------- 1 file changed, 40 deletions(-) delete mode 100644 keyboards/dark/magnum_ergo_1/magnum_ergo_1.h diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.h b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.h deleted file mode 100644 index ebc9fa039474..000000000000 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 Gondolindrim - * - * 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 ___ KC_NO - -#include "quantum.h" - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K45, K06, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, \ - K10, K11, K12, K13, K14, K15, K16, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, \ - K20, K21, K22, K23, K24, K25, K26, K77, K78, K79, K7A, K7B, K7C, K7E, \ - K31, K32, K33, K34, K35, K36, K87, K88, K89, K8A, K8B, K8C, K8D, K8E, \ - K41, K43, K44, K46, K98, K9A, K9E \ -)\ -{\ - { K00, K01, K02, K03, K04, K05, K06, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { K10, K11, K12, K13, K14, K15, K16, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { K20, K21, K22, K23, K24, K25, K26, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, K31, K32, K33, K34, K35, K36, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, K41, ___, K43, K44, K45, K46, ___, ___, ___, ___, ___, ___, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \ - { ___, ___, ___, ___, ___, ___, ___, K67, K68, K69, K6A, K6B, K6C, K6D, K6E }, \ - { ___, ___, ___, ___, ___, ___, ___, K77, K78, K79, K7A, K7B, K7C, ___, K7E }, \ - { ___, ___, ___, ___, ___, ___, ___, K87, K88, K89, K8A, K8B, K8C, K8D, K8E }, \ - { ___, ___, ___, ___, ___, ___, ___, ___, K98, ___, K9A, ___, ___, ___, K9E } \ -} From f3cafc13660d16efd59cd3af7e6450fbb0e7820a Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Mon, 25 Sep 2023 23:46:44 -0300 Subject: [PATCH 03/12] Fix license headers --- keyboards/dark/magnum_ergo_1/halconf.h | 2 +- keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c | 2 +- keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/dark/magnum_ergo_1/halconf.h b/keyboards/dark/magnum_ergo_1/halconf.h index c3777d4105e5..8dd395b2f655 100644 --- a/keyboards/dark/magnum_ergo_1/halconf.h +++ b/keyboards/dark/magnum_ergo_1/halconf.h @@ -1,4 +1,4 @@ -/* Copyright 2023 Gondolindrim +/* Copyright 2023 Gondolindrim * * 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 diff --git a/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c b/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c index 8102e92d1e43..855b306171be 100644 --- a/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c +++ b/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Gondolindrim +/* Copyright 2023 Gondolindrim * * 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 From 31508d18e0e4af788d3577f4938c1a4ce22accc7 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Mon, 25 Sep 2023 23:48:04 -0300 Subject: [PATCH 04/12] Fix license headers --- keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 2 +- keyboards/dark/magnum_ergo_1/mcuconf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c index 289df97e6b73..240cdb783847 100644 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -1,4 +1,4 @@ -/* Copyright 2022 Gondolindrim +/* Copyright 2023 Gondolindrim * * 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 diff --git a/keyboards/dark/magnum_ergo_1/mcuconf.h b/keyboards/dark/magnum_ergo_1/mcuconf.h index a81f8122071c..b7b462f8cd3c 100644 --- a/keyboards/dark/magnum_ergo_1/mcuconf.h +++ b/keyboards/dark/magnum_ergo_1/mcuconf.h @@ -1,4 +1,4 @@ -/* Copyright 2020 QMK +/* Copyright 2023 Gondolindrim * * 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 From 477dec241099ac15a710ff6f5d56a819329e918d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Tue, 26 Sep 2023 18:47:47 -0300 Subject: [PATCH 05/12] Remove debounce macro Co-authored-by: Drashna Jaelre --- keyboards/dark/magnum_ergo_1/config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dark/magnum_ergo_1/config.h b/keyboards/dark/magnum_ergo_1/config.h index 23395c05d973..207bc978e870 100644 --- a/keyboards/dark/magnum_ergo_1/config.h +++ b/keyboards/dark/magnum_ergo_1/config.h @@ -16,7 +16,6 @@ along with this program. If not, see . #pragma once -#define DEBOUNCE 5 #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE From 252d62336d8eccfad5c8ca9772d42930d38c33c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Tue, 26 Sep 2023 18:47:59 -0300 Subject: [PATCH 06/12] Remove `rules.mk` Co-authored-by: Drashna Jaelre --- keyboards/dark/magnum_ergo_1/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/dark/magnum_ergo_1/rules.mk b/keyboards/dark/magnum_ergo_1/rules.mk index a92b0993283e..e69de29bb2d1 100644 --- a/keyboards/dark/magnum_ergo_1/rules.mk +++ b/keyboards/dark/magnum_ergo_1/rules.mk @@ -1,2 +0,0 @@ -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE From 7cb5651a076b1abb9b2bd9570899d47cc2aceebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20A=2E=20Volpato?= Date: Tue, 26 Sep 2023 18:50:20 -0300 Subject: [PATCH 07/12] Use community layout, remove unused layers Co-authored-by: Duncan Sutherland --- keyboards/dark/magnum_ergo_1/info.json | 3 ++- .../magnum_ergo_1/keymaps/default/keymap.c | 19 +++---------------- .../dark/magnum_ergo_1/keymaps/via/keymap.c | 18 ++---------------- 3 files changed, 7 insertions(+), 33 deletions(-) diff --git a/keyboards/dark/magnum_ergo_1/info.json b/keyboards/dark/magnum_ergo_1/info.json index 452db85089ac..a213d92fd56e 100644 --- a/keyboards/dark/magnum_ergo_1/info.json +++ b/keyboards/dark/magnum_ergo_1/info.json @@ -33,8 +33,9 @@ }, "processor": "STM32F401", "bootloader": "stm32-dfu", + "community_layouts": ["alice_split_bs"], "layouts": { - "LAYOUT": { + "LAYOUT_alice_split_bs": { "layout": [ {"label": "Esc", "matrix": [0,0], "x":0.5, "y":0}, {"label": "`~", "matrix": [0,1], "x":1.7, "y":0}, diff --git a/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c b/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c index 855b306171be..7810919fe727 100644 --- a/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c +++ b/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c @@ -16,32 +16,19 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ +[0] = LAYOUT_alice_split_bs( /* Base */ KC_GRV , KC_ESC , 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_BSPC, KC_INS , 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_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_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_LCTL, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RCTL ), -[1] = LAYOUT( +[1] = LAYOUT_alice_split_bs( QK_BOOT, 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, 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, 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, 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, KC_TRNS -), -[2] = LAYOUT( - 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, - 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, 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, 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, KC_TRNS, KC_TRNS -), -[3] = LAYOUT( - 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, - 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, 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, 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, KC_TRNS, KC_TRNS +) ) }; diff --git a/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c b/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c index 855b306171be..67e3ff2387b7 100644 --- a/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c +++ b/keyboards/dark/magnum_ergo_1/keymaps/via/keymap.c @@ -16,32 +16,18 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ +[0] = LAYOUT_alice_split_bs( /* Base */ KC_GRV , KC_ESC , 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_BSPC, KC_INS , 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_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_B , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , KC_LCTL, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RCTL ), -[1] = LAYOUT( +[1] = LAYOUT_alice_split_bs( QK_BOOT, 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, 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, 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, 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, KC_TRNS -), -[2] = LAYOUT( - 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, - 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, 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, 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, KC_TRNS, KC_TRNS -), -[3] = LAYOUT( - 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, - 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, 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, 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, KC_TRNS, KC_TRNS ) }; From 622b3a48f533b57c2f51d623a23c22eae2741f30 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Tue, 26 Sep 2023 18:57:37 -0300 Subject: [PATCH 08/12] Fix default firmware --- keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c b/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c index 7810919fe727..67e3ff2387b7 100644 --- a/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c +++ b/keyboards/dark/magnum_ergo_1/keymaps/default/keymap.c @@ -30,5 +30,4 @@ 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, 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 ) -) }; From 1c3ab2fb8ac533ac5263811b699d3a9ba3d120e4 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 29 Sep 2023 10:43:26 -0300 Subject: [PATCH 09/12] Add pin output sets and change `board_init` to `post_init_kb` --- keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c index 240cdb783847..21697de08d0c 100644 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -16,7 +16,13 @@ #include "quantum.h" -void board_init(void) { +void keyoard_post_init_kb(void) { + setPinOutput(LED_CAPS_LOCK_PIN); + setPinOutput(LED_INDICATOR_1); + setPinOutput(LED_INDICATOR_2); + setPinOutput(LED_INDICATOR_3); + setPinOutput(LED_INDICATOR_4); + setPinOutput(LED_INDICATOR_5); #ifndef LED_CAPS_LOCK_PIN writePin(LED_CAPS_LOCK_PIN, 0); #endif From 3be4f35fe8420e4fad3760b1dd76525ea2687716 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 29 Sep 2023 10:45:17 -0300 Subject: [PATCH 10/12] Remove caps lock callback from `keyboard.c` --- keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c index 21697de08d0c..0169a162706a 100644 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -48,16 +48,6 @@ void keyoard_post_init_kb(void) { #endif } -bool led_update_kb(led_t led_state) { - bool res = led_update_user(led_state); - #ifdef LED_CAPS_LOCK_PIN - if(res) { - writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock); - } - #endif - return res; -} - layer_state_t layer_state_set_kb(layer_state_t state) { switch (get_highest_layer(state)) { case 1: From cc22166cfe7c68f4028e2b665e0e66838807a387 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Fri, 29 Sep 2023 10:47:49 -0300 Subject: [PATCH 11/12] Add user func as return in layer state --- keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c index 0169a162706a..9796a270144d 100644 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -88,5 +88,5 @@ layer_state_t layer_state_set_kb(layer_state_t state) { #endif break; } - return state; + return layer_state_set_user(state); } From 14b46ca88e62b0df1afd10063119286648672388 Mon Sep 17 00:00:00 2001 From: Gondolindrim Date: Thu, 5 Oct 2023 20:13:29 -0300 Subject: [PATCH 12/12] Add user func callback --- keyboards/dark/magnum_ergo_1/magnum_ergo_1.c | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c index 9796a270144d..9125410df056 100644 --- a/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c +++ b/keyboards/dark/magnum_ergo_1/magnum_ergo_1.c @@ -46,6 +46,7 @@ void keyoard_post_init_kb(void) { #ifndef LED_INDICATOR_5 writePin(LED_INDICATOR_5, 0); #endif + keyboard_post_init_user(); } layer_state_t layer_state_set_kb(layer_state_t state) {