ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
QMK Bot 2022-08-04 23:41:59 +00:00
commit 217bd431e9
29 changed files with 10 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

20
keyboards/ez_maker/directpins/promicro/config.h
View file

@ -1,20 +0,0 @@
/*
Copyright 2021 Zach White
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 "config_common.h"

1
keyboards/ez_maker/directpins/promicro/info.json
View file

@ -4,7 +4,6 @@
"maintainer": "skullydazed",
"bootloader": "atmel-dfu",
"debounce": 5,
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,

17
keyboards/ez_maker/directpins/promicro/promicro.c
View file

@ -1,17 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "promicro.h"

19
keyboards/ez_maker/directpins/promicro/promicro.h
View file

@ -1,19 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "quantum.h"

1
keyboards/ez_maker/directpins/promicro/rules.mk
View file

@ -0,0 +1 @@
# This file intentionally left blank

1
keyboards/ez_maker/directpins/proton_c/keymaps/default/readme.md
View file

@ -1 +0,0 @@
# The default keymap for directpins

17
keyboards/ez_maker/directpins/proton_c/proton_c.c
View file

@ -1,17 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "proton_c.h"

19
keyboards/ez_maker/directpins/proton_c/proton_c.h
View file

@ -1,19 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "quantum.h"

1
keyboards/ez_maker/directpins/proton_c/rules.mk
View file

@ -0,0 +1 @@
# This file intentionally left blank

20
keyboards/ez_maker/directpins/teensy_2/config.h
View file

@ -1,20 +0,0 @@
/*
Copyright 2021 Zach White
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 "config_common.h"

1
keyboards/ez_maker/directpins/teensy_2/info.json
View file

@ -5,7 +5,6 @@
"processor": "atmega32u4",
"bootloader": "halfkay",
"debounce": 5,
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,

2
keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json
View file

@ -1,5 +1,5 @@
{
"keyboard": "ez_maker/directpins/teensy2",
"keyboard": "ez_maker/directpins/teensy_2",
"keymap": "default",
"layout": "LAYOUT_all",
"layers": [

1
keyboards/ez_maker/directpins/teensy_2/rules.mk
View file

@ -0,0 +1 @@
# This file intentionally left blank

17
keyboards/ez_maker/directpins/teensy_2/teensy2.c
View file

@ -1,17 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "teensy2.h"

19
keyboards/ez_maker/directpins/teensy_2/teensy2.h
View file

@ -1,19 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "quantum.h"

20
keyboards/ez_maker/directpins/teensy_2pp/config.h
View file

@ -1,20 +0,0 @@
/*
Copyright 2021 Zach White
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 "config_common.h"

1
keyboards/ez_maker/directpins/teensy_2pp/info.json
View file

@ -5,7 +5,6 @@
"processor": "at90usb1286",
"bootloader": "halfkay",
"debounce": 5,
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,

2
keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json
View file

@ -1,5 +1,5 @@
{
"keyboard": "ez_maker/directpins/promicro",
"keyboard": "ez_maker/directpins/teensy_2pp",
"keymap": "default",
"layout": "LAYOUT_all",
"layers": [

1
keyboards/ez_maker/directpins/teensy_2pp/rules.mk
View file

@ -0,0 +1 @@
# This file intentionally left blank

17
keyboards/ez_maker/directpins/teensy_2pp/teensy2.c
View file

@ -1,17 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "teensy2.h"

19
keyboards/ez_maker/directpins/teensy_2pp/teensy2.h
View file

@ -1,19 +0,0 @@
/* Copyright 2021 Zach White
*
* 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 "quantum.h"

23
keyboards/ez_maker/directpins/teensy_32/config.h
View file

@ -1,23 +0,0 @@
/* Copyright 2019
*
* 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
// i2c_master defines
#define I2C1_SCL_PIN B0 // A2 on pinout = B0
#define I2C1_SDA_PIN B1 // A3 on pinout = B1
#define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
#define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2

27
keyboards/ez_maker/directpins/teensy_32/halconf.h
View file

@ -1,27 +0,0 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/ez_maker/onekey/teensy_32/halconf.h -r platforms/chibios/common/configs/halconf.h`
*/
#pragma once
#define HAL_USE_I2C TRUE
#include_next <halconf.h>

2
keyboards/ez_maker/directpins/teensy_32/mcuconf.h
View file

@ -45,7 +45,7 @@
/*
* I2C driver settings
*/
#define KINETIS_I2C_USE_I2C0 TRUE
#define KINETIS_I2C_USE_I2C0 FALSE
#define KINETIS_I2C_I2C0_PRIORITY 4
#endif /* _MCUCONF_H_ */

2
keyboards/ez_maker/directpins/teensy_32/rules.mk
View file

@ -1,2 +1,4 @@
USE_CHIBIOS_CONTRIB = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

23
keyboards/ez_maker/directpins/teensy_lc/config.h
View file

@ -1,23 +0,0 @@
/* Copyright 2019
*
* 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
// i2c_master defines
#define I2C1_SCL_PIN B0 // A2 on pinout = B0
#define I2C1_SDA_PIN B1 // A3 on pinout = B1
#define I2C1_SCL_PAL_MODE PAL_MODE_ALTERNATIVE_2
#define I2C1_SDA_PAL_MODE PAL_MODE_ALTERNATIVE_2

27
keyboards/ez_maker/directpins/teensy_lc/halconf.h
View file

@ -1,27 +0,0 @@
/* 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 <http://www.gnu.org/licenses/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/ez_maker/onekey/teensy_lc/halconf.h -r platforms/chibios/common/configs/halconf.h`
*/
#pragma once
#define HAL_USE_I2C TRUE
#include_next <halconf.h>

2
keyboards/ez_maker/directpins/teensy_lc/mcuconf.h
View file

@ -45,7 +45,7 @@
/*
* I2C driver settings
*/
#define KINETIS_I2C_USE_I2C0 TRUE
#define KINETIS_I2C_USE_I2C0 FALSE
#define KINETIS_I2C_I2C0_PRIORITY 4
#endif /* _MCUCONF_H_ */

1
keyboards/ez_maker/directpins/teensy_lc/rules.mk
View file

@ -1,4 +1,3 @@
# MCU name
USE_CHIBIOS_CONTRIB = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread