From b63c1325f1c2ef409a36a8c17cc4810a9c1c7d5d Mon Sep 17 00:00:00 2001 From: EnviousData Date: Sat, 13 Aug 2022 16:05:56 +0100 Subject: [PATCH] Made suggested changes --- keyboards/enviousdesign/60f/config.h | 4 ++-- keyboards/enviousdesign/60f/rules.mk | 6 ++---- keyboards/enviousdesign/65m/rules.mk | 10 ++-------- keyboards/enviousdesign/mcro/rev1/rev1.c | 3 --- keyboards/enviousdesign/mcro/rev1/rules.mk | 15 ++------------- keyboards/enviousdesign/tkl/rev0/config.h | 4 ++-- keyboards/enviousdesign/tkl/rev0/rules.mk | 9 +-------- keyboards/enviousdesign/tkl/rev1/config.h | 4 ++-- .../enviousdesign/tkl/rev1/keymaps/via/rules.mk | 2 +- keyboards/enviousdesign/tkl/rev1/rules.mk | 13 +++---------- keyboards/enviousdesign/tkl/rgb/rules.mk | 6 +----- 11 files changed, 18 insertions(+), 58 deletions(-) diff --git a/keyboards/enviousdesign/60f/config.h b/keyboards/enviousdesign/60f/config.h index fdd12313b16..64df499c887 100644 --- a/keyboards/enviousdesign/60f/config.h +++ b/keyboards/enviousdesign/60f/config.h @@ -41,9 +41,9 @@ * */ #define MATRIX_ROW_PINS \ - { 11, 12, 13, 14, 15 } + { GP11, GP12, GP13, GP14, GP15 } #define MATRIX_COL_PINS \ - { 10, 9, 8, 7, 6, 5, 16, 17, 18, 19, 20, 21, 22, 26, 27 } + { GP10, GP9, GP8, GP7, GP6, GP5, GP16, GP17, GP18, GP19, GP20, GP21, GP22, GP26, GP27 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ diff --git a/keyboards/enviousdesign/60f/rules.mk b/keyboards/enviousdesign/60f/rules.mk index 084edb96ffc..9b709c9babf 100644 --- a/keyboards/enviousdesign/60f/rules.mk +++ b/keyboards/enviousdesign/60f/rules.mk @@ -3,12 +3,11 @@ MCU = RP2040 BOOTLOADER = rp2040 # Build Options -# change yes to no to disable -# +# change yes to no to disable BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug +CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend @@ -18,4 +17,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - diff --git a/keyboards/enviousdesign/65m/rules.mk b/keyboards/enviousdesign/65m/rules.mk index 70a370a1d78..9b709c9babf 100644 --- a/keyboards/enviousdesign/65m/rules.mk +++ b/keyboards/enviousdesign/65m/rules.mk @@ -2,16 +2,12 @@ MCU = RP2040 BOOTLOADER = rp2040 - -VIA_ENABLE = no - # Build Options -# change yes to no to disable -# +# change yes to no to disable BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug +CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend @@ -21,5 +17,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - -#LAYOUTS = 65m_all diff --git a/keyboards/enviousdesign/mcro/rev1/rev1.c b/keyboards/enviousdesign/mcro/rev1/rev1.c index 78a689c215f..553bd778b70 100644 --- a/keyboards/enviousdesign/mcro/rev1/rev1.c +++ b/keyboards/enviousdesign/mcro/rev1/rev1.c @@ -16,6 +16,3 @@ #include QMK_KEYBOARD_H - -void board_init(void) { -} diff --git a/keyboards/enviousdesign/mcro/rev1/rules.mk b/keyboards/enviousdesign/mcro/rev1/rules.mk index 0cf6595954e..9b709c9babf 100644 --- a/keyboards/enviousdesign/mcro/rev1/rules.mk +++ b/keyboards/enviousdesign/mcro/rev1/rules.mk @@ -1,24 +1,13 @@ -# MCU name -# MCU_FAMILY = PICO -# MCU_SERIES = RP2040 -# MCU = cortex-m0plus - # MCU name MCU = RP2040 BOOTLOADER = rp2040 -#ALLOW_WARNINGS = yes -#PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS! - -VIA_ENABLE = no - # Build Options -# change yes to no to disable -# +# change yes to no to disable BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug +CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend diff --git a/keyboards/enviousdesign/tkl/rev0/config.h b/keyboards/enviousdesign/tkl/rev0/config.h index db3b2a30a67..3250f8b38f6 100644 --- a/keyboards/enviousdesign/tkl/rev0/config.h +++ b/keyboards/enviousdesign/tkl/rev0/config.h @@ -44,9 +44,9 @@ * */ #define MATRIX_ROW_PINS \ - { 20, 21, 22, 26, 27, 28 } + { GP20, GP21, GP22, GP26, GP27, GP28 } #define MATRIX_COL_PINS \ - { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 19, 18, 17, 16 } + { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15, GP19, GP18, GP17, GP16 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ diff --git a/keyboards/enviousdesign/tkl/rev0/rules.mk b/keyboards/enviousdesign/tkl/rev0/rules.mk index 7ac4da74e5c..89ac4d8cbd5 100644 --- a/keyboards/enviousdesign/tkl/rev0/rules.mk +++ b/keyboards/enviousdesign/tkl/rev0/rules.mk @@ -2,12 +2,8 @@ MCU = RP2040 BOOTLOADER = rp2040 -ALLOW_WARNINGS = yes -PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS! - # Build Options -# change yes to no to disable -# +# change yes to no to disable BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control @@ -21,6 +17,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output -OLED_DRIVER_ENABLE = no # oled enable - -#EEPROM_DRIVER = transient diff --git a/keyboards/enviousdesign/tkl/rev1/config.h b/keyboards/enviousdesign/tkl/rev1/config.h index 7e1dc70e4ff..33c227d734d 100644 --- a/keyboards/enviousdesign/tkl/rev1/config.h +++ b/keyboards/enviousdesign/tkl/rev1/config.h @@ -45,9 +45,9 @@ * */ #define MATRIX_ROW_PINS \ - { 20, 21, 22, 26, 27, 28 } + { GP20, GP21, GP22, GP26, GP27, GP28 } #define MATRIX_COL_PINS \ - { 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 19, 18, 17, 16 } + { GP2, GP3, GP4, GP5, GP6, GP7, GP8, GP9, GP10, GP11, GP12, GP13, GP14, GP15, GP19, GP18, GP17, GP16 } #define UNUSED_PINS /* COL2ROW, ROW2COL */ diff --git a/keyboards/enviousdesign/tkl/rev1/keymaps/via/rules.mk b/keyboards/enviousdesign/tkl/rev1/keymaps/via/rules.mk index 4f5eaac61ce..d8c072b7089 100644 --- a/keyboards/enviousdesign/tkl/rev1/keymaps/via/rules.mk +++ b/keyboards/enviousdesign/tkl/rev1/keymaps/via/rules.mk @@ -1,2 +1,2 @@ EEPROM_DRIVER = vendor -VIA_ENABLE = yes \ No newline at end of file +VIA_ENABLE = yes diff --git a/keyboards/enviousdesign/tkl/rev1/rules.mk b/keyboards/enviousdesign/tkl/rev1/rules.mk index f0f4f9c1cbc..89ac4d8cbd5 100644 --- a/keyboards/enviousdesign/tkl/rev1/rules.mk +++ b/keyboards/enviousdesign/tkl/rev1/rules.mk @@ -2,17 +2,13 @@ MCU = RP2040 BOOTLOADER = rp2040 -#ALLOW_WARNINGS = yes -#PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS! - # Build Options -# change yes to no to disable -# +# change yes to no to disable BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work @@ -21,6 +17,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output - -#OLED_ENABLE = yes -#OLED_DRIVER = SSD1306 diff --git a/keyboards/enviousdesign/tkl/rgb/rules.mk b/keyboards/enviousdesign/tkl/rgb/rules.mk index 818ee20462c..c5c65e3fbc9 100644 --- a/keyboards/enviousdesign/tkl/rgb/rules.mk +++ b/keyboards/enviousdesign/tkl/rgb/rules.mk @@ -2,12 +2,8 @@ MCU = RP2040 BOOTLOADER = rp2040 -#ALLOW_WARNINGS = yes -#PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS! - # Build Options -# change yes to no to disable -# +# change yes to no to disable BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration MOUSEKEY_ENABLE = no # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control