g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2022-05-20 16:12:15 +00:00
parent 90f3e139e6 799a7f98ce
commit 5ac861efa5
23 changed files with 139 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keyboards/axolstudio/yeti/hotswap/hotswap.c
View File

@ -96,11 +96,11 @@ led_config_t g_led_config = {
{ NO_LED, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56 },
{ NO_LED, 57, NO_LED, 58, NO_LED, 59, 60, NO_LED, 61, NO_LED, 62, NO_LED, NO_LED, NO_LED, 63 }
}, {
{0, 0},{16, 0},{16*2, 0},{16*3, 0},{16*4, 0},{16*5, 0},{16*6, 0},{16*7, 0},{16*8, 0},{16*9, 0},{16*10, 0},{16*11, 0},{16*12, 0},{16*13, 0},{16*14, 0},
{0, 16},{16,16},{16*2,16},{16*3,16},{16*4,16},{16*5,16},{16*6,16},{16*7,16},{16*8,16},{16*9,16},{16*10,16},{16*11,16},{16*12,16},{16*13,16},{16*14,16},
{0,32},{16,32},{16*2,32},{16*3,32},{16*4,32},{16*5,32},{16*6,32},{16*7,32},{16*8,32},{16*9,32},{16*10,32},{16*11,32},{16*12,32},{16*14},
{16,48},{16*2,48},{16*3,48},{16*4,48},{16*5,48},{16*6,48},{16*7,48},{16*8,48},{16*9,48},{16*10,48},{16*11,48},{16*12,48},{16*14,48},
{16,64},{16*3,64},{16*5,64},{16*6,64},{16*8,64},{16*10,64},{16*14,64}
{0, 0},{16, 0},{32, 0},{48, 0},{64, 0},{80, 0},{96, 0},{112, 0},{128, 0},{144, 0},{160, 0},{176, 0},{192, 0},{208, 0},{224, 0},
{0, 16},{16,16},{32,16},{48,16},{64,16},{80,16},{96,16},{112,16},{128,16},{144,16},{160,16},{176,16},{192,16},{208,16},{224,16},
{0,32},{16,32},{32,32},{48,32},{64,32},{80,32},{96,32},{112,32},{128,32},{144,32},{160,32},{176,32},{192,32},{224},
{16,48},{32,48},{48,48},{64,48},{80,48},{96,48},{112,48},{128,48},{144,48},{160,48},{176,48},{192,48},{224,48},
{16,64},{48,64},{80,64},{96,64},{128,64},{160,64},{224,64}
}, {
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,

2
keyboards/mechwild/obe/config.h
View File

@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 7
#define MATRIX_COLS 10
#define EEPROM_I2C_24LC64
/*
* Keyboard Matrix Assignments
*

20
keyboards/mechwild/obe/f401/eeprom/config.h 100644
View File

@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
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 EEPROM_I2C_24LC64

0
keyboards/mechwild/obe/f401/halconf.h → keyboards/mechwild/obe/f401/eeprom/halconf.h
View File

0
keyboards/mechwild/obe/f401/mcuconf.h → keyboards/mechwild/obe/f401/eeprom/mcuconf.h
View File

7
keyboards/mechwild/obe/f401/eeprom/rules.mk 100644
View File

@ -0,0 +1,7 @@
# MCU name
MCU = STM32F401
# Bootloader selection
BOOTLOADER = stm32-dfu
EEPROM_DRIVER = i2c

20
keyboards/mechwild/obe/f411/eeprom/config.h 100644
View File

@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
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 EEPROM_I2C_24LC64

0
keyboards/mechwild/obe/f411/halconf.h → keyboards/mechwild/obe/f411/eeprom/halconf.h
View File

1
keyboards/mechwild/waka60/f411/mcuconf.h → keyboards/mechwild/obe/f411/eeprom/mcuconf.h
View File

@ -20,4 +20,3 @@
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

7
keyboards/mechwild/obe/f411/eeprom/rules.mk 100644
View File

@ -0,0 +1,7 @@
# MCU name
MCU = STM32F411
# Bootloader selection
BOOTLOADER = stm32-dfu
EEPROM_DRIVER = i2c

4
keyboards/mechwild/obe/obe.h
View File

@ -16,6 +16,10 @@
#pragma once
//#ifdef KEYBOARD_mechwild_obe_eeprom
//# include "eeprom.h"
//#endif
#include "quantum.h"
/* This is a shortcut to help you visually see your layout.

2
keyboards/mechwild/obe/rules.mk
View File

@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Encoder Enabled
EEPROM_DRIVER = i2c
DEFAULT_FOLDER = mechwild/obe/f401

2
keyboards/mechwild/waka60/config.h
View File

@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 10
#define MATRIX_COLS 7
#define EEPROM_I2C_24LC64
/*
* Keyboard Matrix Assignments
*

20
keyboards/mechwild/waka60/f401/eeprom/config.h 100644
View File

@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
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 EEPROM_I2C_24LC64

0
keyboards/mechwild/waka60/f411/halconf.h → keyboards/mechwild/waka60/f401/eeprom/halconf.h
View File

1
keyboards/mechwild/obe/f411/mcuconf.h → keyboards/mechwild/waka60/f401/eeprom/mcuconf.h
View File

@ -20,4 +20,3 @@
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

7
keyboards/mechwild/waka60/f401/eeprom/rules.mk 100644
View File

@ -0,0 +1,7 @@
# MCU name
MCU = STM32F401
# Bootloader selection
BOOTLOADER = stm32-dfu
EEPROM_DRIVER = i2c

27
keyboards/mechwild/waka60/f401/mcuconf.h
View File

@ -1,27 +0,0 @@
/* Copyright 2021 Kyle McCreery
*
* 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
#include_next <mcuconf.h>
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
#undef STM32_PWM_USE_TIM1
#define STM32_PWM_USE_TIM1 TRUE
#undef STM32_GPT_USE_TIM4
#define STM32_GPT_USE_TIM4 TRUE

20
keyboards/mechwild/waka60/f411/eeprom/config.h 100644
View File

@ -0,0 +1,20 @@
/*
Copyright 2022 Kyle McCreery
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 EEPROM_I2C_24LC64

3
keyboards/mechwild/waka60/f401/halconf.h → keyboards/mechwild/waka60/f411/eeprom/halconf.h
View File

@ -17,9 +17,6 @@
#pragma once
#define HAL_USE_I2C TRUE
#define HAL_USE_PWM TRUE
#define HAL_USE_PAL TRUE
#define HAL_USE_GPT TRUE
#include_next <halconf.h>

22
keyboards/mechwild/waka60/f411/eeprom/mcuconf.h 100644
View File

@ -0,0 +1,22 @@
/* Copyright 2021 Kyle McCreery
*
* 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
#include_next <mcuconf.h>
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE

7
keyboards/mechwild/waka60/f411/eeprom/rules.mk 100644
View File

@ -0,0 +1,7 @@
# MCU name
MCU = STM32F411
# Bootloader selection
BOOTLOADER = stm32-dfu
EEPROM_DRIVER = i2c

2
keyboards/mechwild/waka60/rules.mk
View File

@ -12,6 +12,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes # Encoder Enabled
EEPROM_DRIVER = i2c
DEFAULT_FOLDER = mechwild/waka60/f401