Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move miscellaneous defines to data driven #21382

Merged
merged 2 commits into from
Jul 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions keyboards/7c8/framework/config.h

This file was deleted.

4 changes: 4 additions & 0 deletions keyboards/7c8/framework/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
"qmk": {
"tap_keycode_delay": 16
},
"leader_key": {
"timeout": 250,
"timing": true
},
"processor": "atmega328p",
"bootloader": "usbasploader",
"layouts": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/acheron/athena/alpha/alpha.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ void keyboard_post_init_kb(void){
palSetLineMode(BACKLIGHT_PIN, PAL_MODE_ALTERNATE(BACKLIGHT_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING);
}

#define LED_PIN_ON_STATE 1
void led_init_ports(void) {
palSetLineMode(LED_CAPS_LOCK_PIN, PAL_MODE_OUTPUT_OPENDRAIN | PAL_STM32_PUPDR_FLOATING);
}
Expand Down
1 change: 0 additions & 1 deletion keyboards/acheron/elongate/delta/delta.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

#include "quantum.h"

#define LED_PIN_ON_STATE 1
// Inits all indicator LEDs as push-pull outputs
void led_init_ports(void) {
palSetLineMode(LED1_PIN, PAL_MODE_OUTPUT_PUSHPULL);
Expand Down
4 changes: 0 additions & 4 deletions keyboards/alas/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* Ensure we jump to bootloader if the RESET keycode was pressed */
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE

/* Indicator LEDs */
#define LED_CAPS_LOCK_PIN B6
#define LED_PIN_ON_STATE 0
4 changes: 4 additions & 0 deletions keyboards/alas/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"pid": "0x414C",
"device_version": "0.0.1"
},
"indicators": {
"caps_lock": "B6",
"on_state": 0
},
"matrix_pins": {
"cols": ["A1", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "B2", "B10", "B11", "B12", "B13", "B14"],
"rows": ["A2", "B9", "B8", "B5", "B4"]
Expand Down
25 changes: 0 additions & 25 deletions keyboards/ash1800/ash1800.c

This file was deleted.

4 changes: 0 additions & 4 deletions keyboards/ash1800/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define NUM_LOCK_LED_PIN E6
#define CAPS_LOCK_LED_PIN F0
#define SCROLL_LOCK_LED_PIN F7

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
6 changes: 6 additions & 0 deletions keyboards/ash1800/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
"pid": "0x1800",
"device_version": "0.0.1"
},
"indicators": {
"caps_lock": "F0",
"num_lock": "E6",
"scroll_lock": "F7",
"on_state": 0
},
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
"rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
Expand Down
25 changes: 0 additions & 25 deletions keyboards/ash_xiix/ash_xiix.c

This file was deleted.

4 changes: 0 additions & 4 deletions keyboards/ash_xiix/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

#pragma once

#define NUM_LOCK_LED_PIN E6
#define CAPS_LOCK_LED_PIN F0
#define SCROLL_LOCK_LED_PIN F7

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
#define LOCKING_RESYNC_ENABLE
6 changes: 6 additions & 0 deletions keyboards/ash_xiix/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
"pid": "0x14BC",
"device_version": "0.0.1"
},
"indicators": {
"caps_lock": "F0",
"num_lock": "E6",
"scroll_lock": "F7",
"on_state": 0
},
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "B0", "B2", "B1", "B3", "B7", "C7"],
"rows": ["C6", "B6", "B5", "B4", "D7", "D0", "D1", "D2", "D3", "D5", "D4", "D6"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/bpiphany/hid_liber/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#define MATRIX_COLS 8

// HID Liberation Device uses custom matrix code to accomodate a 74HC238 3 to 8 decoder on pins B1, B2 and B3.
//#define DIODE_DIRECTION

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
Expand Down
3 changes: 0 additions & 3 deletions keyboards/coban/pad3a/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@

#pragma once

#define ENCODERS_PAD_A { GP5 }
#define ENCODERS_PAD_B { GP4 }

#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
5 changes: 5 additions & 0 deletions keyboards/coban/pad3a/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
"vid": "0xCB3A",
"device_version": "1.1.0"
},
"encoder": {
"rotary": [
{"pin_a": "GP5", "pin_b": "GP4"}
]
},
"matrix_pins": {
"direct": [
["GP8", "GP7", "GP6"]
Expand Down
1 change: 0 additions & 1 deletion keyboards/dumbpad/v3x/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Cleanup RGB
#ifdef RGB_MATRIX_ENABLE

#define RGB_MATRIX_TIMEOUT 300000 // 5 minutes (5 * 60 * 1000ms)
#define RGB_DISABLE_WHEN_USB_SUSPENDED

#define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain
Expand Down
3 changes: 2 additions & 1 deletion keyboards/dumbpad/v3x/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"device_version": "0.1.0"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"timeout": 300000
},
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"],
Expand Down
20 changes: 0 additions & 20 deletions keyboards/eason/greatsword80/config.h

This file was deleted.

4 changes: 4 additions & 0 deletions keyboards/eason/greatsword80/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"pid": "0x998F",
"device_version": "0.0.1"
},
"indicators": {
"caps_lock": "F0",
"on_state": 0
},
"matrix_pins": {
"cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7", "E2", "F7", "F6", "F5", "F4", "B0", "B1", "B2", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
Expand Down
2 changes: 0 additions & 2 deletions keyboards/fancytech/fancyalice66/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
#pragma once

#ifdef RGB_MATRIX_ENABLE
# define WS2812_DI_PIN B0
# define RGB_DI_PIN B0
# define RGB_MATRIX_LED_COUNT 82

/* RGB Matrix effect */
Expand Down
3 changes: 3 additions & 0 deletions keyboards/fancytech/fancyalice66/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@
"pid": "0x3663",
"vid": "0xECED"
},
"ws2812": {
"pin": "B0"
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
2 changes: 0 additions & 2 deletions keyboards/fungo/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
/** public parameter **/
/*************************************/

#define MATRIX_IO_DELAY 15 // default 30

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE

Expand Down
3 changes: 2 additions & 1 deletion keyboards/fungo/rev1/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"],
"io_delay": 15
},
"diode_direction": "COL2ROW",
"split": {
Expand Down
2 changes: 0 additions & 2 deletions keyboards/handwired/datahand/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
#define MATRIX_ROWS 13
#define MATRIX_COLS 4

//#define DIODE_DIRECTION

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
Expand Down
2 changes: 0 additions & 2 deletions keyboards/handwired/split65/promicro/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
#pragma once

#define MATRIX_IO_DELAY 5

#define SELECT_SOFT_SERIAL_SPEED 1

// Feature diable options
Expand Down
3 changes: 2 additions & 1 deletion keyboards/handwired/split65/promicro/info.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
"rows": ["D4", "C6", "D7", "E6", "B4"],
"io_delay": 5
},
"diode_direction": "COL2ROW",
"split": {
Expand Down
2 changes: 0 additions & 2 deletions keyboards/handwired/split65/stm32/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
#define AUDIO_PIN_ALT A4
#define AUDIO_PIN_ALT_AS_NEGATIVE

#define MATRIX_IO_DELAY 5

#define SELECT_SOFT_SERIAL_SPEED 1
#define SERIAL_USART_DRIVER SD1
#define SERIAL_USART_TX_PAL_MODE 7
Expand Down
3 changes: 2 additions & 1 deletion keyboards/handwired/split65/stm32/info.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"matrix_pins": {
"cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"],
"rows": ["B5", "B4", "B3", "B2", "B1"]
"rows": ["B5", "B4", "B3", "B2", "B1"],
"io_delay": 5
},
"diode_direction": "COL2ROW",
"split": {
Expand Down
3 changes: 0 additions & 3 deletions keyboards/hineybush/hbcp/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { B1, B6, D0, C7, C6, C5 }
#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, A0, A1, A2, A3, A4, A5, B5, B4, B3, B2 }

//EITHERWAY is supported through a custom matrix
//#define DIODE_DIRECTION EITHERWAY

#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/id42/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

#pragma once

/* Change the USB polling rate [default = 1000Hz (1ms)] and
* use larger value of keys per scan for elite games */
#define USB_POLLING_INTERVAL_MS 2 // 500Hz

/* LED Matrix & Animations */
#ifdef RGB_MATRIX_ENABLE

Expand Down
3 changes: 2 additions & 1 deletion keyboards/idobao/id42/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"vid": "0x6964",
"pid": "0x0042",
"device_version": "1.0.0",
"force_nkro": true
"force_nkro": true,
"polling_interval": 2
},
"layouts": {
"LAYOUT": {
Expand Down
1 change: 0 additions & 1 deletion keyboards/jadookb/jkb65/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_TIMEOUT 90000
#define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
Expand Down
3 changes: 2 additions & 1 deletion keyboards/jadookb/jkb65/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"pin": "F0"
},
"rgb_matrix": {
"driver": "WS2812"
"driver": "WS2812",
"timeout": 90000
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
Expand Down
4 changes: 0 additions & 4 deletions keyboards/jones/v03/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }
#define MATRIX_COL_PINS { D4, D7, C7, F1, F4, F5, D6, D5, E6, B0, B1 }

/* COL2ROW, ROW2COL*/
// No need to define DIODE_DIRECTION for Jones' custom Round-Robin matrix.
//#define DIODE_DIRECTION COL2ROW

/* Audio */
#ifdef AUDIO_ENABLE
#define AUDIO_PIN C6
Expand Down
Loading