summaryrefslogtreecommitdiff
path: root/keyboards/ferris
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ferris')
-rw-r--r--keyboards/ferris/0_1/config.h7
-rw-r--r--keyboards/ferris/0_1/info.json50
-rw-r--r--keyboards/ferris/0_1/rules.mk8
-rw-r--r--keyboards/ferris/0_2/config.h6
-rw-r--r--keyboards/ferris/0_2/info.json50
-rw-r--r--keyboards/ferris/0_2/rules.mk8
-rw-r--r--keyboards/ferris/info.json49
-rw-r--r--keyboards/ferris/keymaps/bruun-baer/config.h2
-rw-r--r--keyboards/ferris/keymaps/default/config.h2
-rw-r--r--keyboards/ferris/keymaps/madhatter/keymap.c2
-rw-r--r--keyboards/ferris/keymaps/pierrec83/config.h2
-rw-r--r--keyboards/ferris/sweep/config.h33
-rw-r--r--keyboards/ferris/sweep/info.json77
-rw-r--r--keyboards/ferris/sweep/rules.mk7
-rw-r--r--keyboards/ferris/sweep/sweep.c2
-rw-r--r--keyboards/ferris/sweep/sweep.h48
16 files changed, 183 insertions, 170 deletions
diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h
index 147abb813d..ded051ff7d 100644
--- a/keyboards/ferris/0_1/config.h
+++ b/keyboards/ferris/0_1/config.h
@@ -36,10 +36,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json
index 354545b3bd..0738a0491f 100644
--- a/keyboards/ferris/0_1/info.json
+++ b/keyboards/ferris/0_1/info.json
@@ -5,5 +5,55 @@
"vid": "0xC2AB",
"pid": "0x0000",
"device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["split_3x5_2"],
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ {"x": 0, "y": 0.93},
+ {"x": 1, "y": 0.31},
+ {"x": 2, "y": 0},
+ {"x": 3, "y": 0.28},
+ {"x": 4, "y": 0.42},
+
+ {"x": 7, "y": 0.42},
+ {"x": 8, "y": 0.28},
+ {"x": 9, "y": 0},
+ {"x": 10, "y": 0.31},
+ {"x": 11, "y": 0.93},
+
+ {"x": 0, "y": 1.93},
+ {"x": 1, "y": 1.31},
+ {"x": 2, "y": 1},
+ {"x": 3, "y": 1.28},
+ {"x": 4, "y": 1.42},
+
+ {"x": 7, "y": 1.42},
+ {"x": 8, "y": 1.28},
+ {"x": 9, "y": 1},
+ {"x": 10, "y": 1.31},
+ {"x": 11, "y": 1.93},
+
+ {"x": 0, "y": 2.93},
+ {"x": 1, "y": 2.31},
+ {"x": 2, "y": 2},
+ {"x": 3, "y": 2.28},
+ {"x": 4, "y": 2.42},
+
+ {"x": 7, "y": 2.42},
+ {"x": 8, "y": 2.28},
+ {"x": 9, "y": 2},
+ {"x": 10, "y": 2.31},
+ {"x": 11, "y": 2.93},
+
+ {"x": 3.5, "y": 3.75},
+ {"x": 4.5, "y": 4},
+
+ {"x": 6.5, "y": 4},
+ {"x": 7.5, "y": 3.75}
+ ]
+ }
}
}
diff --git a/keyboards/ferris/0_1/rules.mk b/keyboards/ferris/0_1/rules.mk
index 4b8f1f0c9a..487375928e 100644
--- a/keyboards/ferris/0_1/rules.mk
+++ b/keyboards/ferris/0_1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -23,5 +17,3 @@ LTO_ENABLE = yes
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
-
-LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h
index 868f770b16..a4731dcd49 100644
--- a/keyboards/ferris/0_2/config.h
+++ b/keyboards/ferris/0_2/config.h
@@ -42,12 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* define if matrix has ghost (lacks anti-ghosting diodes) */
-//#define MATRIX_HAS_GHOST
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
/* i2c settings */
#define I2C_DRIVER I2CD2
diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json
index 9ab2ffbdfb..f2b6b4b07b 100644
--- a/keyboards/ferris/0_2/info.json
+++ b/keyboards/ferris/0_2/info.json
@@ -3,5 +3,55 @@
"usb": {
"vid": "0xC2AB",
"device_version": "0.0.2"
+ },
+ "processor": "STM32F072",
+ "bootloader": "stm32-dfu",
+ "community_layouts": ["split_3x5_2"],
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ {"x": 0, "y": 0.93},
+ {"x": 1, "y": 0.31},
+ {"x": 2, "y": 0},
+ {"x": 3, "y": 0.28},
+ {"x": 4, "y": 0.42},
+
+ {"x": 7, "y": 0.42},
+ {"x": 8, "y": 0.28},
+ {"x": 9, "y": 0},
+ {"x": 10, "y": 0.31},
+ {"x": 11, "y": 0.93},
+
+ {"x": 0, "y": 1.93},
+ {"x": 1, "y": 1.31},
+ {"x": 2, "y": 1},
+ {"x": 3, "y": 1.28},
+ {"x": 4, "y": 1.42},
+
+ {"x": 7, "y": 1.42},
+ {"x": 8, "y": 1.28},
+ {"x": 9, "y": 1},
+ {"x": 10, "y": 1.31},
+ {"x": 11, "y": 1.93},
+
+ {"x": 0, "y": 2.93},
+ {"x": 1, "y": 2.31},
+ {"x": 2, "y": 2},
+ {"x": 3, "y": 2.28},
+ {"x": 4, "y": 2.42},
+
+ {"x": 7, "y": 2.42},
+ {"x": 8, "y": 2.28},
+ {"x": 9, "y": 2},
+ {"x": 10, "y": 2.31},
+ {"x": 11, "y": 2.93},
+
+ {"x": 3.5, "y": 3.75},
+ {"x": 4.5, "y": 4},
+
+ {"x": 6.5, "y": 4},
+ {"x": 7.5, "y": 3.75}
+ ]
+ }
}
}
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index c5a44ca9ef..f3760b7b62 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#
@@ -24,6 +18,4 @@ LTO_ENABLE = no
SRC += matrix.c
QUANTUM_LIB_SRC += i2c_master.c
-LAYOUTS = split_3x5_2
-
DEFAULT_FOLDER = ferris/0_2/base
diff --git a/keyboards/ferris/info.json b/keyboards/ferris/info.json
index 52485bd9e9..eea6a0abfb 100644
--- a/keyboards/ferris/info.json
+++ b/keyboards/ferris/info.json
@@ -1,51 +1,4 @@
{
"url": "https://github.com/pierrechevalier83/ferris/",
- "maintainer": "@pierrec83",
- "layouts": {
- "LAYOUT_split_3x5_2": {
- "layout": [
- {"x": 0, "y": 0.93},
- {"x": 1, "y": 0.31},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.28},
- {"x": 4, "y": 0.42},
-
- {"x": 7, "y": 0.42},
- {"x": 8, "y": 0.28},
- {"x": 9, "y": 0},
- {"x": 10, "y": 0.31},
- {"x": 11, "y": 0.93},
-
- {"x": 0, "y": 1.93},
- {"x": 1, "y": 1.31},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.28},
- {"x": 4, "y": 1.42},
-
- {"x": 7, "y": 1.42},
- {"x": 8, "y": 1.28},
- {"x": 9, "y": 1},
- {"x": 10, "y": 1.31},
- {"x": 11, "y": 1.93},
-
- {"x": 0, "y": 2.93},
- {"x": 1, "y": 2.31},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.28},
- {"x": 4, "y": 2.42},
-
- {"x": 7, "y": 2.42},
- {"x": 8, "y": 2.28},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2.31},
- {"x": 11, "y": 2.93},
-
- {"x": 3.5, "y": 3.75},
- {"x": 4.5, "y": 4},
-
- {"x": 6.5, "y": 4},
- {"x": 7.5, "y": 3.75}
- ]
- }
- }
+ "maintainer": "@pierrec83"
}
diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h
index 4f63ee544f..5c2377be1e 100644
--- a/keyboards/ferris/keymaps/bruun-baer/config.h
+++ b/keyboards/ferris/keymaps/bruun-baer/config.h
@@ -36,4 +36,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h
index 1937b64ffa..b10555bb0d 100644
--- a/keyboards/ferris/keymaps/default/config.h
+++ b/keyboards/ferris/keymaps/default/config.h
@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
// Underglow configuration
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/ferris/keymaps/madhatter/keymap.c b/keyboards/ferris/keymaps/madhatter/keymap.c
index db6928918b..7b0c2e82bf 100644
--- a/keyboards/ferris/keymaps/madhatter/keymap.c
+++ b/keyboards/ferris/keymaps/madhatter/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
// Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
// Tap once for Q, twice for ESC
[TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
};
diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h
index 1937b64ffa..b10555bb0d 100644
--- a/keyboards/ferris/keymaps/pierrec83/config.h
+++ b/keyboards/ferris/keymaps/pierrec83/config.h
@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
// Underglow configuration
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h
index a1043b73b5..a80d5a2824 100644
--- a/keyboards/ferris/sweep/config.h
+++ b/keyboards/ferris/sweep/config.h
@@ -19,37 +19,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-#define DIRECT_PINS { \
- { E6, F7, F6, F5, F4 }, \
- { B1, B3, B2, B6, D3 }, \
- { D1, D0, D4, C6, D7 }, \
- { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-#define DIRECT_PINS_RIGHT { \
- { F4, F5, F6, F7, E6 }, \
- { D3, B6, B2, B3, B1 }, \
- { D7, C6, D4, D0, D1 }, \
- { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D2
-
#define EE_HANDS
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json
index fc53028c34..3e3eeffe76 100644
--- a/keyboards/ferris/sweep/info.json
+++ b/keyboards/ferris/sweep/info.json
@@ -5,5 +5,82 @@
"vid": "0xC2AB",
"pid": "0x3939",
"device_version": "0.0.1"
+ },
+ "processor": "atmega32u4",
+ "bootloader": "caterina",
+ "matrix_pins": {
+ "direct": [
+ ["E6", "F7", "F6", "F5", "F4"],
+ ["B1", "B3", "B2", "B6", "D3"],
+ ["D1", "D0", "D4", "C6", "D7"],
+ ["B4", "B5", null, null, null]
+ ]
+ },
+ "split": {
+ "soft_serial_pin": "D2",
+ "bootmagic": {
+ "matrix": [4, 4]
+ },
+ "matrix_pins": {
+ "right": {
+ "direct": [
+ ["F4", "F5", "F6", "F7", "E6"],
+ ["D3", "B6", "B2", "B3", "B1"],
+ ["D7", "C6", "D4", "D0", "D1"],
+ ["B5", "B4", null, null, null]
+ ]
+ }
+ }
+ },
+ "community_layouts": ["split_3x5_2"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_2"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_2": {
+ "layout": [
+ {"x": 0, "y": 0.93, "matrix": [0, 0]},
+ {"x": 1, "y": 0.31, "matrix": [0, 1]},
+ {"x": 2, "y": 0, "matrix": [0, 2]},
+ {"x": 3, "y": 0.28, "matrix": [0, 3]},
+ {"x": 4, "y": 0.42, "matrix": [0, 4]},
+
+ {"x": 7, "y": 0.42, "matrix": [4, 0]},
+ {"x": 8, "y": 0.28, "matrix": [4, 1]},
+ {"x": 9, "y": 0, "matrix": [4, 2]},
+ {"x": 10, "y": 0.31, "matrix": [4, 3]},
+ {"x": 11, "y": 0.93, "matrix": [4, 4]},
+
+ {"x": 0, "y": 1.93, "matrix": [1, 0]},
+ {"x": 1, "y": 1.31, "matrix": [1, 1]},
+ {"x": 2, "y": 1, "matrix": [1, 2]},
+ {"x": 3, "y": 1.28, "matrix": [1, 3]},
+ {"x": 4, "y": 1.42, "matrix": [1, 4]},
+
+ {"x": 7, "y": 1.42, "matrix": [5, 0]},
+ {"x": 8, "y": 1.28, "matrix": [5, 1]},
+ {"x": 9, "y": 1, "matrix": [5, 2]},
+ {"x": 10, "y": 1.31, "matrix": [5, 3]},
+ {"x": 11, "y": 1.93, "matrix": [5, 4]},
+
+ {"x": 0, "y": 2.93, "matrix": [2, 0]},
+ {"x": 1, "y": 2.31, "matrix": [2, 1]},
+ {"x": 2, "y": 2, "matrix": [2, 2]},
+ {"x": 3, "y": 2.28, "matrix": [2, 3]},
+ {"x": 4, "y": 2.42, "matrix": [2, 4]},
+
+ {"x": 7, "y": 2.42, "matrix": [6, 0]},
+ {"x": 8, "y": 2.28, "matrix": [6, 1]},
+ {"x": 9, "y": 2, "matrix": [6, 2]},
+ {"x": 10, "y": 2.31, "matrix": [6, 3]},
+ {"x": 11, "y": 2.93, "matrix": [6, 4]},
+
+ {"x": 3.5, "y": 3.75, "matrix": [3, 0]},
+ {"x": 4.5, "y": 4, "matrix": [3, 1]},
+
+ {"x": 6.5, "y": 4, "matrix": [7, 0]},
+ {"x": 7.5, "y": 3.75, "matrix": [7, 1]}
+ ]
+ }
}
}
diff --git a/keyboards/ferris/sweep/rules.mk b/keyboards/ferris/sweep/rules.mk
index ffc17739f7..ebc2feb78e 100644
--- a/keyboards/ferris/sweep/rules.mk
+++ b/keyboards/ferris/sweep/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
# Build Options
# change yes to no to disable
#
@@ -18,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
UNICODE_ENABLE = yes # Unicode
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Use shared split_common code
-LAYOUTS = split_3x5_2
diff --git a/keyboards/ferris/sweep/sweep.c b/keyboards/ferris/sweep/sweep.c
index 98467f18ae..0d63f80cc1 100644
--- a/keyboards/ferris/sweep/sweep.c
+++ b/keyboards/ferris/sweep/sweep.c
@@ -13,7 +13,7 @@
* 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 "sweep.h"
+#include "quantum.h"
#ifdef SWAP_HANDS_ENABLE
__attribute__ ((weak))
diff --git a/keyboards/ferris/sweep/sweep.h b/keyboards/ferris/sweep/sweep.h
deleted file mode 100644
index ebfa4ede1d..0000000000
--- a/keyboards/ferris/sweep/sweep.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com>
- *
- * 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 "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_2( \
- L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
- L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
- L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
- L16, L17, R16, R17 \
- ) \
- { \
- { L01, L02, L03, L04, L05 }, \
- { L06, L07, L08, L09, L10 }, \
- { L11, L12, L13, L14, L15 }, \
- { L16, L17, ___, ___ , ___}, \
- { R01, R02, R03, R04, R05 }, \
- { R06, R07, R08, R09, R10 }, \
- { R11, R12, R13, R14, R15 }, \
- { R16, R17, ___, ___, ___ } \
- }
-
-#define LAYOUT LAYOUT_split_3x5_2
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 11:27:42 +0000