diff options
Diffstat (limited to 'keyboards/input_club/ergodox_infinity')
5 files changed, 6 insertions, 27 deletions
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h index 19a777e615..3147e47375 100644 --- a/keyboards/input_club/ergodox_infinity/config.h +++ b/keyboards/input_club/ergodox_infinity/config.h @@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 1 -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - #define TAPPING_TERM 200 #define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) @@ -58,7 +55,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SERIAL_USART_CONFIG { (SERIAL_USART_SPEED), } // Only field is speed #define SERIAL_USART_FULL_DUPLEX -/* number of backlight levels */ #define BACKLIGHT_LEVELS 3 #define LED_BRIGHTNESS_LO 100 @@ -124,12 +120,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define SPI_MISO_PAL_MODE PAL_MODE_ALTERNATIVE_7 // Default for A4 #endif -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c index 6f7de7ff29..fbe1bdb77f 100644 --- a/keyboards/input_club/ergodox_infinity/ergodox_infinity.c +++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c @@ -94,7 +94,7 @@ __attribute__ ((weak)) void matrix_init_user(void) {} __attribute__ ((weak)) void matrix_scan_user(void) {} -void keyboard_pre_init_kb() { +void keyboard_pre_init_kb(void) { #ifdef LED_MATRIX_ENABLE // Turn on LED controller setPinOutput(B16); diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json index dd6b3ac9aa..635355d490 100644 --- a/keyboards/input_club/ergodox_infinity/info.json +++ b/keyboards/input_club/ergodox_infinity/info.json @@ -6,6 +6,10 @@ "pid": "0xB04D", "device_version": "0.0.1" }, + "processor": "MK20DX256", + "bootloader": "kiibohd", + "board": "IC_TEENSY_3_1", + "community_layouts": ["ergodox"], "layouts": { "LAYOUT_ergodox": { "layout": [ diff --git a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c index ebdedcbe6b..d1665ecb1f 100644 --- a/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c +++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c @@ -470,7 +470,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -void matrix_init_user() { +void matrix_init_user(void) { led_matrix_enable_noeeprom(); led_matrix_set_val_noeeprom(UINT8_MAX); } diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk index c35f54de30..88bd6b0041 100644 --- a/keyboards/input_club/ergodox_infinity/rules.mk +++ b/keyboards/input_club/ergodox_infinity/rules.mk @@ -1,16 +1,3 @@ -# MCU name -MCU = MK20DX256 - -# Bootloader selection -BOOTLOADER = kiibohd - -# Board: it should exist either in <chibios>/os/hal/boards/ -# or <this_dir>/boards -# This board was copied from PJRC_TEENSY_3_1. The only difference should be a -# hack to ensure the watchdog has started before trying to disable it, and an -# override to disable restart of USB driver after returning from suspend. -BOARD = IC_TEENSY_3_1 - # Build Options # change yes to no to disable # @@ -33,5 +20,3 @@ ST7565_ENABLE = yes LED_MATRIX_ENABLE = yes LED_MATRIX_DRIVER = IS31FL3731 - -LAYOUTS = ergodox |