~ruther/qmk_firmware

8978960a875b61d9e3de6ef0ca60d066e19e4fef — Joel Challis 3 years ago efd3b1e
Tidy up ez_maker (#17910)

29 files changed, 10 insertions(+), 313 deletions(-)

D keyboards/ez_maker/directpins/promicro/config.h
M keyboards/ez_maker/directpins/promicro/info.json
D keyboards/ez_maker/directpins/promicro/promicro.c
D keyboards/ez_maker/directpins/promicro/promicro.h
M keyboards/ez_maker/directpins/promicro/rules.mk
D keyboards/ez_maker/directpins/proton_c/keymaps/default/readme.md
D keyboards/ez_maker/directpins/proton_c/proton_c.c
D keyboards/ez_maker/directpins/proton_c/proton_c.h
M keyboards/ez_maker/directpins/proton_c/rules.mk
D keyboards/ez_maker/directpins/teensy_2/config.h
M keyboards/ez_maker/directpins/teensy_2/info.json
M keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json
M keyboards/ez_maker/directpins/teensy_2/rules.mk
D keyboards/ez_maker/directpins/teensy_2/teensy2.c
D keyboards/ez_maker/directpins/teensy_2/teensy2.h
D keyboards/ez_maker/directpins/teensy_2pp/config.h
M keyboards/ez_maker/directpins/teensy_2pp/info.json
M keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json
M keyboards/ez_maker/directpins/teensy_2pp/rules.mk
D keyboards/ez_maker/directpins/teensy_2pp/teensy2.c
D keyboards/ez_maker/directpins/teensy_2pp/teensy2.h
D keyboards/ez_maker/directpins/teensy_32/config.h
D keyboards/ez_maker/directpins/teensy_32/halconf.h
M keyboards/ez_maker/directpins/teensy_32/mcuconf.h
M keyboards/ez_maker/directpins/teensy_32/rules.mk
D keyboards/ez_maker/directpins/teensy_lc/config.h
D keyboards/ez_maker/directpins/teensy_lc/halconf.h
M keyboards/ez_maker/directpins/teensy_lc/mcuconf.h
M keyboards/ez_maker/directpins/teensy_lc/rules.mk
D keyboards/ez_maker/directpins/promicro/config.h => keyboards/ez_maker/directpins/promicro/config.h +0 -20
@@ 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"

M keyboards/ez_maker/directpins/promicro/info.json => keyboards/ez_maker/directpins/promicro/info.json +0 -1
@@ 4,7 4,6 @@
    "maintainer": "skullydazed",
    "bootloader": "atmel-dfu",
    "debounce": 5,
    "diode_direction": "COL2ROW",
    "features": {
        "bootmagic": true,
        "extrakey": true,

D keyboards/ez_maker/directpins/promicro/promicro.c => keyboards/ez_maker/directpins/promicro/promicro.c +0 -17
@@ 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"

D keyboards/ez_maker/directpins/promicro/promicro.h => keyboards/ez_maker/directpins/promicro/promicro.h +0 -19
@@ 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"

M keyboards/ez_maker/directpins/promicro/rules.mk => keyboards/ez_maker/directpins/promicro/rules.mk +1 -0
@@ 0,0 1,1 @@
# This file intentionally left blank

D keyboards/ez_maker/directpins/proton_c/keymaps/default/readme.md => keyboards/ez_maker/directpins/proton_c/keymaps/default/readme.md +0 -1
@@ 1,1 0,0 @@
# The default keymap for directpins

D keyboards/ez_maker/directpins/proton_c/proton_c.c => keyboards/ez_maker/directpins/proton_c/proton_c.c +0 -17
@@ 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"

D keyboards/ez_maker/directpins/proton_c/proton_c.h => keyboards/ez_maker/directpins/proton_c/proton_c.h +0 -19
@@ 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"

M keyboards/ez_maker/directpins/proton_c/rules.mk => keyboards/ez_maker/directpins/proton_c/rules.mk +1 -0
@@ 0,0 1,1 @@
# This file intentionally left blank

D keyboards/ez_maker/directpins/teensy_2/config.h => keyboards/ez_maker/directpins/teensy_2/config.h +0 -20
@@ 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"

M keyboards/ez_maker/directpins/teensy_2/info.json => keyboards/ez_maker/directpins/teensy_2/info.json +0 -1
@@ 5,7 5,6 @@
    "processor": "atmega32u4",
    "bootloader": "halfkay",
    "debounce": 5,
    "diode_direction": "COL2ROW",
    "features": {
        "bootmagic": true,
        "extrakey": true,

M keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json => keyboards/ez_maker/directpins/teensy_2/keymaps/default/keymap.json +1 -1
@@ 1,5 1,5 @@
{
    "keyboard": "ez_maker/directpins/teensy2",
    "keyboard": "ez_maker/directpins/teensy_2",
    "keymap": "default",
    "layout": "LAYOUT_all",
    "layers": [

M keyboards/ez_maker/directpins/teensy_2/rules.mk => keyboards/ez_maker/directpins/teensy_2/rules.mk +1 -0
@@ 0,0 1,1 @@
# This file intentionally left blank

D keyboards/ez_maker/directpins/teensy_2/teensy2.c => keyboards/ez_maker/directpins/teensy_2/teensy2.c +0 -17
@@ 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"

D keyboards/ez_maker/directpins/teensy_2/teensy2.h => keyboards/ez_maker/directpins/teensy_2/teensy2.h +0 -19
@@ 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"

D keyboards/ez_maker/directpins/teensy_2pp/config.h => keyboards/ez_maker/directpins/teensy_2pp/config.h +0 -20
@@ 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"

M keyboards/ez_maker/directpins/teensy_2pp/info.json => keyboards/ez_maker/directpins/teensy_2pp/info.json +0 -1
@@ 5,7 5,6 @@
    "processor": "at90usb1286",
    "bootloader": "halfkay",
    "debounce": 5,
    "diode_direction": "COL2ROW",
    "features": {
        "bootmagic": true,
        "extrakey": true,

M keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json => keyboards/ez_maker/directpins/teensy_2pp/keymaps/default/keymap.json +1 -1
@@ 1,5 1,5 @@
{
    "keyboard": "ez_maker/directpins/promicro",
    "keyboard": "ez_maker/directpins/teensy_2pp",
    "keymap": "default",
    "layout": "LAYOUT_all",
    "layers": [

M keyboards/ez_maker/directpins/teensy_2pp/rules.mk => keyboards/ez_maker/directpins/teensy_2pp/rules.mk +1 -0
@@ 0,0 1,1 @@
# This file intentionally left blank

D keyboards/ez_maker/directpins/teensy_2pp/teensy2.c => keyboards/ez_maker/directpins/teensy_2pp/teensy2.c +0 -17
@@ 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"

D keyboards/ez_maker/directpins/teensy_2pp/teensy2.h => keyboards/ez_maker/directpins/teensy_2pp/teensy2.h +0 -19
@@ 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"

D keyboards/ez_maker/directpins/teensy_32/config.h => keyboards/ez_maker/directpins/teensy_32/config.h +0 -23
@@ 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

D keyboards/ez_maker/directpins/teensy_32/halconf.h => keyboards/ez_maker/directpins/teensy_32/halconf.h +0 -27
@@ 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>


M keyboards/ez_maker/directpins/teensy_32/mcuconf.h => keyboards/ez_maker/directpins/teensy_32/mcuconf.h +1 -1
@@ 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_ */

M keyboards/ez_maker/directpins/teensy_32/rules.mk => keyboards/ez_maker/directpins/teensy_32/rules.mk +2 -0
@@ 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

D keyboards/ez_maker/directpins/teensy_lc/config.h => keyboards/ez_maker/directpins/teensy_lc/config.h +0 -23
@@ 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

D keyboards/ez_maker/directpins/teensy_lc/halconf.h => keyboards/ez_maker/directpins/teensy_lc/halconf.h +0 -27
@@ 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>


M keyboards/ez_maker/directpins/teensy_lc/mcuconf.h => keyboards/ez_maker/directpins/teensy_lc/mcuconf.h +1 -1
@@ 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_ */

M keyboards/ez_maker/directpins/teensy_lc/rules.mk => keyboards/ez_maker/directpins/teensy_lc/rules.mk +0 -1
@@ 1,4 1,3 @@
# MCU name
USE_CHIBIOS_CONTRIB = yes

# Enter lower-power sleep mode when on the ChibiOS idle thread