Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
qmk-bot committed Aug 30, 2022
2 parents 1a33b5a + f3d52d8 commit 4a7a4b2
Show file tree
Hide file tree
Showing 20 changed files with 600 additions and 503 deletions.
6 changes: 0 additions & 6 deletions keyboards/jacky_studio/piggy60/config.h

This file was deleted.

3 changes: 2 additions & 1 deletion keyboards/jacky_studio/piggy60/hotswap/info.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"diode_direction": "ROW2COL"
"diode_direction": "ROW2COL",
"community_layouts": ["60_hhkb", "60_tsangan_hhkb"]
}
465 changes: 2 additions & 463 deletions keyboards/jacky_studio/piggy60/info.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions keyboards/jacky_studio/piggy60/keymaps/via/keymap.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
"LT(1,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_NUHS", "KC_ENT",
"KC_LSFT", "KC_NUBS", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "LT(1,KC_MUTE)",
"KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "LT(1,KC_APP)", "KC_RALT", "KC_RGUI", "KC_RCTL"
]
],
[
"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_PSCR", "KC_DEL",
"KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_PGUP", "KC_HOME", "KC_TRNS", "KC_VOLU", "KC_BRIU", "KC_TRNS", "KC_WH_U", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_PGDN", "KC_END", "KC_TRNS", "KC_VOLD", "KC_BRID", "KC_TRNS", "KC_WH_D", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"RGB_TOG", "KC_TRNS", "RGB_MOD", "RGB_HUI", "RGB_SAI", "RGB_VAI", "RGB_SPI", "KC_TRNS", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
]
],
[
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
]
],
[
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
Expand Down
1 change: 0 additions & 1 deletion keyboards/jacky_studio/piggy60/rules.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
DEFAULT_FOLDER = jacky_studio/piggy60/solder
LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_hhkb 60_iso 60_iso_split_bs_rshift 60_iso_tsangan 60_tsangan_hhkb
476 changes: 475 additions & 1 deletion keyboards/jacky_studio/piggy60/solder/info.json

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions keyboards/xelus/kangaroo/info.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
7 changes: 1 addition & 6 deletions keyboards/xelus/kangaroo/kangaroo.c
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"); }
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions keyboards/xelus/kangaroo/rev1/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "Kangaroo Rev 1.0",
"usb": {
"device_version": "0.0.1"
}
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Kangaroo
# Kangaroo Rev 1

Left Hand Fullsized Keyboard designed by Jono.

Expand All @@ -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).
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,18 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

/*
* 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 <chconf.h>
#include "rev1.h"

void board_init(void) {
SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
}
17 changes: 17 additions & 0 deletions keyboards/xelus/kangaroo/rev1/rev1.h
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#include "quantum.h"
File renamed without changes.
38 changes: 38 additions & 0 deletions keyboards/xelus/kangaroo/rev2/config.h
Original file line number Diff line number Diff line change
@@ -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 <http://www.gnu.org/licenses/>.
*/

#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
6 changes: 6 additions & 0 deletions keyboards/xelus/kangaroo/rev2/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"keyboard_name": "Kangaroo Rev 2.0",
"usb": {
"device_version": "0.0.2"
}
}
14 changes: 14 additions & 0 deletions keyboards/xelus/kangaroo/rev2/readme.md
Original file line number Diff line number Diff line change
@@ -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).
24 changes: 24 additions & 0 deletions keyboards/xelus/kangaroo/rev2/rules.mk
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4a7a4b2

Please sign in to comment.