diff --git a/keyboards/xelus/kangaroo/info.json b/keyboards/xelus/kangaroo/info.json index d70cb92e93..adb6450826 100644 --- a/keyboards/xelus/kangaroo/info.json +++ b/keyboards/xelus/kangaroo/info.json @@ -1,12 +1,10 @@ { - "keyboard_name": "Kangaroo", "manufacturer": "Xelus", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo", - "maintainer": "qmk", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/xelus/kangaroo", + "maintainer": "qmk", "usb": { "vid": "0x5845", - "pid": "0x524F", - "device_version": "0.0.1" + "pid": "0x524F" }, "layouts": { "LAYOUT_all": { diff --git a/keyboards/xelus/kangaroo/kangaroo.c b/keyboards/xelus/kangaroo/kangaroo.c index a7a3d24800..585d33d498 100644 --- a/keyboards/xelus/kangaroo/kangaroo.c +++ b/keyboards/xelus/kangaroo/kangaroo.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Harrison Chan (Xelus) +/* Copyright 2022 Harrison Chan (Xelus) * * 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 @@ -16,9 +16,4 @@ #include "kangaroo.h" -void board_init(void) { - SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; - SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); -} - void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); } diff --git a/keyboards/xelus/kangaroo/config.h b/keyboards/xelus/kangaroo/rev1/config.h similarity index 100% rename from keyboards/xelus/kangaroo/config.h rename to keyboards/xelus/kangaroo/rev1/config.h diff --git a/keyboards/xelus/kangaroo/halconf.h b/keyboards/xelus/kangaroo/rev1/halconf.h similarity index 100% rename from keyboards/xelus/kangaroo/halconf.h rename to keyboards/xelus/kangaroo/rev1/halconf.h diff --git a/keyboards/xelus/kangaroo/rev1/info.json b/keyboards/xelus/kangaroo/rev1/info.json new file mode 100644 index 0000000000..523aef4aaa --- /dev/null +++ b/keyboards/xelus/kangaroo/rev1/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kangaroo Rev 1.0", + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/xelus/kangaroo/mcuconf.h b/keyboards/xelus/kangaroo/rev1/mcuconf.h similarity index 100% rename from keyboards/xelus/kangaroo/mcuconf.h rename to keyboards/xelus/kangaroo/rev1/mcuconf.h diff --git a/keyboards/xelus/kangaroo/readme.md b/keyboards/xelus/kangaroo/rev1/readme.md similarity index 86% rename from keyboards/xelus/kangaroo/readme.md rename to keyboards/xelus/kangaroo/rev1/readme.md index e91f32f96a..800497b698 100644 --- a/keyboards/xelus/kangaroo/readme.md +++ b/keyboards/xelus/kangaroo/rev1/readme.md @@ -1,4 +1,4 @@ -# Kangaroo +# Kangaroo Rev 1 Left Hand Fullsized Keyboard designed by Jono. @@ -8,6 +8,7 @@ Left Hand Fullsized Keyboard designed by Jono. Make example for this keyboard (after setting up your build environment): - make xelus/kangaroo:default + make xelus/kangaroo/rev1:default + make xelus/kangaroo/rev1:via 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). diff --git a/keyboards/xelus/kangaroo/chconf.h b/keyboards/xelus/kangaroo/rev1/rev1.c similarity index 66% rename from keyboards/xelus/kangaroo/chconf.h rename to keyboards/xelus/kangaroo/rev1/rev1.c index 71b34b0591..a71f476498 100644 --- a/keyboards/xelus/kangaroo/chconf.h +++ b/keyboards/xelus/kangaroo/rev1/rev1.c @@ -1,4 +1,4 @@ -/* Copyright 2020 QMK +/* Copyright 2022 Harrison Chan (Xelus) * * 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 @@ -14,18 +14,9 @@ * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/xelus/kangaroo/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_FREQUENCY 10000 - -#define CH_CFG_OPTIMIZE_SPEED FALSE - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#include_next +#include "rev1.h" +void board_init(void) { + SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; + SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); +} diff --git a/keyboards/xelus/kangaroo/rev1/rev1.h b/keyboards/xelus/kangaroo/rev1/rev1.h new file mode 100644 index 0000000000..f146b4f964 --- /dev/null +++ b/keyboards/xelus/kangaroo/rev1/rev1.h @@ -0,0 +1,17 @@ +/* Copyright 2022 Harrison Chan (Xelus) + * + * 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" diff --git a/keyboards/xelus/kangaroo/rules.mk b/keyboards/xelus/kangaroo/rev1/rules.mk similarity index 100% rename from keyboards/xelus/kangaroo/rules.mk rename to keyboards/xelus/kangaroo/rev1/rules.mk diff --git a/keyboards/xelus/kangaroo/rev2/config.h b/keyboards/xelus/kangaroo/rev2/config.h new file mode 100644 index 0000000000..a2f89a0ab1 --- /dev/null +++ b/keyboards/xelus/kangaroo/rev2/config.h @@ -0,0 +1,38 @@ +/* Copyright 2020 Harrison Chan (Xelus) + * + * 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 + +/* key matrix size */ +#define MATRIX_ROWS 12 +#define MATRIX_COLS 11 + +#define MATRIX_COL_PINS { B10, B2, B11, A10, B7, B6, B5, B4, B3, A15, A14 } +#define MATRIX_ROW_PINS { A9, A8, B15, B14, B13, B12, A4, A5, A6, A7, B0, B1 } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +#define WEAR_LEVELING_LOGICAL_SIZE 2048 +#define WEAR_LEVELING_BACKING_SIZE WEAR_LEVELING_LOGICAL_SIZE*2 diff --git a/keyboards/xelus/kangaroo/rev2/info.json b/keyboards/xelus/kangaroo/rev2/info.json new file mode 100644 index 0000000000..8f7a2c6ce9 --- /dev/null +++ b/keyboards/xelus/kangaroo/rev2/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Kangaroo Rev 2.0", + "usb": { + "device_version": "0.0.2" + } +} diff --git a/keyboards/xelus/kangaroo/rev2/readme.md b/keyboards/xelus/kangaroo/rev2/readme.md new file mode 100644 index 0000000000..b94bd43cd1 --- /dev/null +++ b/keyboards/xelus/kangaroo/rev2/readme.md @@ -0,0 +1,14 @@ +# Kangaroo Rev 2 + +Left Hand Fullsized Keyboard designed by Jono. + +* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22) +* Hardware Supported: Kangaroo +* Hardware Availability: Custom keyboard group buys + +Make example for this keyboard (after setting up your build environment): + + make xelus/kangaroo/rev2:default + make xelus/kangaroo/rev2:via + +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). diff --git a/keyboards/xelus/kangaroo/rev2/rules.mk b/keyboards/xelus/kangaroo/rev2/rules.mk new file mode 100644 index 0000000000..44ac92bb81 --- /dev/null +++ b/keyboards/xelus/kangaroo/rev2/rules.mk @@ -0,0 +1,24 @@ +# MCU name +MCU = STM32L412 + +# Bootloader selection +BOOTLOADER = stm32-dfu + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Enable N-Key Rollover +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output +EEPROM_DRIVER = i2c + +EEPROM_DRIVER = wear_leveling +WEAR_LEVELING_DRIVER = embedded_flash + +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE