From 3842b15cf136a6edd4e6491abb3b9a85dbd5867f Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Sat, 2 Jul 2022 21:26:23 +1000 Subject: [Keymap] Update Miryoku (#16482) --- .../ferris/keymaps/manna-harbour_miryoku/config.h | 19 +++++++++++++++++++ .../ferris/keymaps/manna-harbour_miryoku/keymap.c | 4 ++++ .../ferris/keymaps/manna-harbour_miryoku/rules.mk | 4 ++++ 3 files changed, 27 insertions(+) create mode 100644 keyboards/ferris/keymaps/manna-harbour_miryoku/config.h create mode 100644 keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c create mode 100644 keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h b/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h new file mode 100644 index 0000000000..dbbff11bb6 --- /dev/null +++ b/keyboards/ferris/keymaps/manna-harbour_miryoku/config.h @@ -0,0 +1,19 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// 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 . + +#pragma once + +#define LAYOUT_miryoku( \ +K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ +K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ +K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ +N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ +) \ +LAYOUT( \ +K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ +K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ +K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + K33, K34, K35, K36 \ +) diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c new file mode 100644 index 0000000000..dbab7f9820 --- /dev/null +++ b/keyboards/ferris/keymaps/manna-harbour_miryoku/keymap.c @@ -0,0 +1,4 @@ +// Copyright 2019 Manna Harbour +// https://github.com/manna-harbour/miryoku + +// 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 . diff --git a/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk b/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk new file mode 100644 index 0000000000..ef40279cbc --- /dev/null +++ b/keyboards/ferris/keymaps/manna-harbour_miryoku/rules.mk @@ -0,0 +1,4 @@ +# Copyright 2021 Manna Harbour +# https://github.com/manna-harbour/miryoku + +MIRYOKU_KLUDGE_THUMBCOMBOS=yes -- cgit v1.2.1 From 5108d531691421be0fc4784a5a76fff7ab9aee63 Mon Sep 17 00:00:00 2001 From: bruun-baer <108467514+bruun-baer@users.noreply.github.com> Date: Sat, 2 Jul 2022 14:11:53 +0000 Subject: Add a workman-miryoku hybrid keymap for the ferris sweep keyboard (#17511) --- keyboards/ferris/keymaps/bruun-baer/config.h | 39 ++++++++++++++ keyboards/ferris/keymaps/bruun-baer/keymap.json | 71 +++++++++++++++++++++++++ keyboards/ferris/keymaps/bruun-baer/readme.md | 2 + 3 files changed, 112 insertions(+) create mode 100644 keyboards/ferris/keymaps/bruun-baer/config.h create mode 100644 keyboards/ferris/keymaps/bruun-baer/keymap.json create mode 100644 keyboards/ferris/keymaps/bruun-baer/readme.md (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h new file mode 100644 index 0000000000..4f63ee544f --- /dev/null +++ b/keyboards/ferris/keymaps/bruun-baer/config.h @@ -0,0 +1,39 @@ +/* +Copyright 2022 Alexander Bruun + +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 . +*/ + +#pragma once +// Set the mouse settings to a comfortable speed/accuracy trade-off, +// assuming a screen refresh rate of 60 Htz or higher +// The default is 50. This makes the mouse ~3 times faster and more accurate +#define MOUSEKEY_INTERVAL 16 +// The default is 20. Since we made the mouse about 3 times faster with the previous setting, +// give it more time to accelerate to max speed to retain precise control over short distances. +#define MOUSEKEY_TIME_TO_MAX 40 +// The default is 300. Let's try and make this as low as possible while keeping the cursor responsive +#define MOUSEKEY_DELAY 100 +// It makes sense to use the same delay for the mouseweel +#define MOUSEKEY_WHEEL_DELAY 100 +// The default is 100 +#define MOUSEKEY_WHEEL_INTERVAL 50 +// The default is 40 +#define MOUSEKEY_WHEEL_TIME_TO_MAX 100 + +// Pick good defaults for enabling homerow modifiers +#define TAPPING_TERM 200 +#define PERMISSIVE_HOLD +#define IGNORE_MOD_TAP_INTERRUPT +#define TAPPING_FORCE_HOLD diff --git a/keyboards/ferris/keymaps/bruun-baer/keymap.json b/keyboards/ferris/keymaps/bruun-baer/keymap.json new file mode 100644 index 0000000000..ee966ab1b5 --- /dev/null +++ b/keyboards/ferris/keymaps/bruun-baer/keymap.json @@ -0,0 +1,71 @@ +{ + "version": 1, + "notes": "Personal keymap", + "documentation": "\"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: \n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", + "keyboard": "ferris/sweep", + "keymap": "bruun-baer", + "layout": "LAYOUT_split_3x5_2", + "layers": [ + ["KC_Q" , "KC_D" , "KC_R" , "KC_W" , "KC_B", + "KC_J" , "KC_F" , "KC_U" , "KC_P" , "KC_QUOT", + + "LGUI_T(KC_A)", "LALT_T(KC_S)", "LSFT_T(KC_H)", "LCTL_T(KC_T)" , "KC_G", + "KC_Y" , "LCTL_T(KC_N)", "LSFT_T(KC_E)", "LALT_T(KC_O)" , "LGUI_T(KC_I)", + + "KC_Z" , "RALT_T(KC_X)", "KC_M" , "KC_C" , "KC_V", + "KC_K" , "KC_L" , "KC_COMM" , "RALT_T(KC_DOT)", "KC_SLSH", + + "LT(3,KC_SPC)", "LT(4,KC_TAB)", + "LT(2,KC_ENT)", "LT(1,KC_BSPC)" + ], + ["KC_LBRC" , "KC_7" , "KC_8" , "KC_9" , "KC_RBRC", + "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO", + + "KC_SCLN" , "KC_4" , "KC_5" , "KC_6" , "KC_EQL", + "KC_NO" , "KC_LCTL" , "KC_LSFT" , "KC_LALT" , "KC_LGUI", + + "KC_GRV" , "KC_1" , "KC_2" , "KC_3" , "KC_BSLS", + "KC_NO" , "KC_NO" , "KC_NO" , "KC_RALT" , "KC_NO", + + "KC_0" , "KC_MINS", + "KC_NO" , "KC_NO" + ], + ["KC_LCBR" , "KC_AMPR" , "KC_ASTR" , "KC_LPRN" , "KC_RCBR", + "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO", + + "KC_COLN" , "KC_DLR" , "KC_PERC" , "KC_CIRC" , "KC_PLUS", + "KC_NO" , "KC_LCTL" , "KC_LSFT" , "KC_LALT" , "KC_LGUI", + + "KC_TILD" , "KC_EXLM" , "KC_AT" , "KC_HASH" , "KC_PIPE", + "KC_NO" , "KC_NO" , "KC_NO" , "KC_RALT" , "KC_NO", + + "KC_RPRN" , "KC_UNDS", + "KC_NO" , "KC_NO" + ], + ["KC_F12" , "KC_F7" , "KC_F8" , "KC_F9" , "KC_PSCR", + "KC_AGIN" , "KC_PSTE" , "KC_COPY" , "KC_CUT" , "KC_UNDO", + + "KC_F11" , "KC_F4" , "KC_F5" , "KC_F6" , "KC_SCRL", + "KC_CAPS" , "KC_LEFT" , "KC_DOWN" , "KC_UP" , "KC_RGHT", + + "KC_F10" , "KC_F1" , "KC_F2" , "KC_F3" , "KC_PAUS", + "KC_INS" , "KC_HOME" , "KC_PGDN" , "KC_PGUP" , "KC_END", + + "KC_NO" , "KC_NO", + "KC_ESC" , "KC_DEL" + ], + ["KC_NO" , "KC_NO" , "KC_NO" , "KC_NO" , "KC_NO", + "KC_MPLY" , "KC_MPRV" , "KC_VOLD" , "KC_VOLU" , "KC_MNXT", + + "KC_LGUI" , "KC_LALT" , "KC_LSFT" , "KC_LCTL" , "KC_NO", + "KC_MUTE" , "KC_MS_L" , "KC_MS_D" , "KC_MS_U" , "KC_MS_R", + + "KC_NO" , "KC_RALT" , "KC_NO" , "KC_NO" , "KC_NO", + "KC_BTN3" , "KC_WH_L" , "KC_WH_D" , "KC_WH_U" , "KC_WH_R", + + "KC_NO" , "KC_NO", + "KC_BTN1" , "KC_BTN2" + ] + ], + "author": "@bruun-baer" +} diff --git a/keyboards/ferris/keymaps/bruun-baer/readme.md b/keyboards/ferris/keymaps/bruun-baer/readme.md new file mode 100644 index 0000000000..7d1d78b5f1 --- /dev/null +++ b/keyboards/ferris/keymaps/bruun-baer/readme.md @@ -0,0 +1,2 @@ +Personal Ferris Sweep Keymap +=============================================== -- cgit v1.2.1 From 70d554420c26688b198454e0a92874b084e3feb2 Mon Sep 17 00:00:00 2001 From: Albert Y <76888457+filterpaper@users.noreply.github.com> Date: Tue, 26 Jul 2022 13:22:42 +0800 Subject: [Keyboard] Add RP2040 config defaults for ferris/sweep and cradio (#17557) --- keyboards/ferris/sweep/config.h | 13 ------------- keyboards/ferris/sweep/readme.md | 7 +++++++ 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h index 4d4d7d309f..8cbaade80b 100644 --- a/keyboards/ferris/sweep/config.h +++ b/keyboards/ferris/sweep/config.h @@ -32,17 +32,6 @@ along with this program. If not, see . #define MATRIX_ROWS 8 #define MATRIX_COLS 5 -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * NO_DIODE = switches are directly connected to AVR pins - * -*/ #define DIRECT_PINS { \ { E6, F7, F6, F5, F4 }, \ { B1, B3, B2, B6, D3 }, \ @@ -57,8 +46,6 @@ along with this program. If not, see . { B5, B4, NO_PIN, NO_PIN, NO_PIN } \ } - - #define UNUSED_PINS /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ diff --git a/keyboards/ferris/sweep/readme.md b/keyboards/ferris/sweep/readme.md index 332ab2c790..b66bed5df0 100644 --- a/keyboards/ferris/sweep/readme.md +++ b/keyboards/ferris/sweep/readme.md @@ -31,6 +31,13 @@ For Elite-C or compatible controllers using `DFU` bootloader, add the line `BOOT [QMK Toolbox](http://qmk.fm/toolbox) can also be used to set EEPROM handedness. Place the controller in bootloader mode and select menu option Tools -> EEPROM -> Set Left/Right Hand +### RP2040 Controllers + +Pro Micro RP2040 controllers are supported with [QMK Converters](https://docs.qmk.fm/#/feature_converters). The make command example with handedness setting for Adafruit's KB2040 are: + + make CONVERT_TO=kb2040 ferris/sweep:default:uf2-split-left + make CONVERT_TO=kb2040 ferris/sweep:default:uf2-split-right + ## Bootloader Enter the bootloader in 3 ways: -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/ferris/0_2/config.h | 2 -- keyboards/ferris/sweep/config.h | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h index f51e5dd8f1..4e454fd0a0 100644 --- a/keyboards/ferris/0_2/config.h +++ b/keyboards/ferris/0_2/config.h @@ -52,8 +52,6 @@ along with this program. If not, see . { B7, B6, B5, A2, A0, A0, A0, A0 } #define MATRIX_COL_PINS \ { B8, B4, B3, A15, A14, A1, A1, A1, A1, A1 } -#define UNUSED_PINS \ - { A3, A4, A5, A6, A7, A8, A9, A10, A13, B0, B1, B2, B9, B12, B13, B14, B15, C13, C14, C15, F0, F1 } /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h index 8cbaade80b..c74c1bf6c5 100644 --- a/keyboards/ferris/sweep/config.h +++ b/keyboards/ferris/sweep/config.h @@ -1,4 +1,4 @@ -/* Copyright 2018-2020 +/* Copyright 2018-2020 ENDO Katsuhiro David Philip Barr <@davidphilipbarr> Pierre Chevalier @@ -46,8 +46,6 @@ along with this program. If not, see . { B5, B4, NO_PIN, NO_PIN, NO_PIN } \ } -#define UNUSED_PINS - /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -- cgit v1.2.1 From 1027aed83a264d03cf3bbfd4a85ca7d240217b0f Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 15 Aug 2022 11:53:19 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: F-I (#17958) --- keyboards/ferris/0_1/config.h | 7 ------- keyboards/ferris/0_1/info.json | 9 +++++++++ keyboards/ferris/0_2/base/info.json | 6 ++++++ keyboards/ferris/0_2/base/rules.mk | 0 keyboards/ferris/0_2/bling/config.h | 7 ------- keyboards/ferris/0_2/bling/info.json | 6 ++++++ keyboards/ferris/0_2/compact/config.h | 23 ----------------------- keyboards/ferris/0_2/compact/info.json | 6 ++++++ keyboards/ferris/0_2/config.h | 7 ------- keyboards/ferris/0_2/high/config.h | 23 ----------------------- keyboards/ferris/0_2/high/info.json | 6 ++++++ keyboards/ferris/0_2/info.json | 7 +++++++ keyboards/ferris/0_2/mini/config.h | 23 ----------------------- keyboards/ferris/0_2/mini/info.json | 6 ++++++ keyboards/ferris/0_2/rules.mk | 2 ++ keyboards/ferris/info.json | 1 - keyboards/ferris/sweep/config.h | 7 ------- keyboards/ferris/sweep/info.json | 9 +++++++++ 18 files changed, 57 insertions(+), 98 deletions(-) create mode 100644 keyboards/ferris/0_1/info.json create mode 100644 keyboards/ferris/0_2/base/info.json create mode 100644 keyboards/ferris/0_2/base/rules.mk create mode 100644 keyboards/ferris/0_2/bling/info.json delete mode 100644 keyboards/ferris/0_2/compact/config.h create mode 100644 keyboards/ferris/0_2/compact/info.json delete mode 100644 keyboards/ferris/0_2/high/config.h create mode 100644 keyboards/ferris/0_2/high/info.json create mode 100644 keyboards/ferris/0_2/info.json delete mode 100644 keyboards/ferris/0_2/mini/config.h create mode 100644 keyboards/ferris/0_2/mini/info.json create mode 100644 keyboards/ferris/sweep/info.json (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/0_1/config.h b/keyboards/ferris/0_1/config.h index 6cd5c91621..79a74ae9bb 100644 --- a/keyboards/ferris/0_1/config.h +++ b/keyboards/ferris/0_1/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC2AB -#define PRODUCT_ID 0x0000 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Pierre -#define PRODUCT Ferris the keeb - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/ferris/0_1/info.json b/keyboards/ferris/0_1/info.json new file mode 100644 index 0000000000..354545b3bd --- /dev/null +++ b/keyboards/ferris/0_1/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Ferris the keeb", + "manufacturer": "Pierre", + "usb": { + "vid": "0xC2AB", + "pid": "0x0000", + "device_version": "0.0.1" + } +} diff --git a/keyboards/ferris/0_2/base/info.json b/keyboards/ferris/0_2/base/info.json new file mode 100644 index 0000000000..d0d22b8047 --- /dev/null +++ b/keyboards/ferris/0_2/base/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Ferris 0.2", + "usb": { + "pid": "0x0001" + } +} diff --git a/keyboards/ferris/0_2/base/rules.mk b/keyboards/ferris/0_2/base/rules.mk new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/ferris/0_2/bling/config.h b/keyboards/ferris/0_2/bling/config.h index 4b2efd378d..ceb02e737b 100644 --- a/keyboards/ferris/0_2/bling/config.h +++ b/keyboards/ferris/0_2/bling/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -#undef PRODUCT_ID -#define PRODUCT_ID 0x0002 -#undef PRODUCT -#define PRODUCT Ferris 0.2 - Bling - - - /* LED Drivers */ #define DRIVER_ADDR_1 0b1110100 #define DRIVER_ADDR_2 0b1110101 diff --git a/keyboards/ferris/0_2/bling/info.json b/keyboards/ferris/0_2/bling/info.json new file mode 100644 index 0000000000..5473c33295 --- /dev/null +++ b/keyboards/ferris/0_2/bling/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Ferris 0.2 - Bling", + "usb": { + "pid": "0x0002" + } +} diff --git a/keyboards/ferris/0_2/compact/config.h b/keyboards/ferris/0_2/compact/config.h deleted file mode 100644 index ee465b9acd..0000000000 --- a/keyboards/ferris/0_2/compact/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Pierre Chevalier - -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 . -*/ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0x0003 -#undef PRODUCT -#define PRODUCT Ferris 0.2 - Compact diff --git a/keyboards/ferris/0_2/compact/info.json b/keyboards/ferris/0_2/compact/info.json new file mode 100644 index 0000000000..4ca1555776 --- /dev/null +++ b/keyboards/ferris/0_2/compact/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Ferris 0.2 - Compact", + "usb": { + "pid": "0x0003" + } +} diff --git a/keyboards/ferris/0_2/config.h b/keyboards/ferris/0_2/config.h index f51e5dd8f1..c573517037 100644 --- a/keyboards/ferris/0_2/config.h +++ b/keyboards/ferris/0_2/config.h @@ -17,13 +17,6 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC2AB -#define PRODUCT_ID 0x0001 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Cuddly Keyboards Ltd. -#define PRODUCT Ferris 0.2 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 10 diff --git a/keyboards/ferris/0_2/high/config.h b/keyboards/ferris/0_2/high/config.h deleted file mode 100644 index 67786241b4..0000000000 --- a/keyboards/ferris/0_2/high/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Pierre Chevalier - -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 . -*/ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0x0005 -#undef PRODUCT -#define PRODUCT Ferris 0.2 - High diff --git a/keyboards/ferris/0_2/high/info.json b/keyboards/ferris/0_2/high/info.json new file mode 100644 index 0000000000..adb9d07af3 --- /dev/null +++ b/keyboards/ferris/0_2/high/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Ferris 0.2 - High", + "usb": { + "pid": "0x0005" + } +} diff --git a/keyboards/ferris/0_2/info.json b/keyboards/ferris/0_2/info.json new file mode 100644 index 0000000000..9ab2ffbdfb --- /dev/null +++ b/keyboards/ferris/0_2/info.json @@ -0,0 +1,7 @@ +{ + "manufacturer": "Cuddly Keyboards Ltd.", + "usb": { + "vid": "0xC2AB", + "device_version": "0.0.2" + } +} diff --git a/keyboards/ferris/0_2/mini/config.h b/keyboards/ferris/0_2/mini/config.h deleted file mode 100644 index e357cabe0b..0000000000 --- a/keyboards/ferris/0_2/mini/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Pierre Chevalier - -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 . -*/ - -#pragma once - -#undef PRODUCT_ID -#define PRODUCT_ID 0x0004 -#undef PRODUCT -#define PRODUCT Ferris 0.2 - Mini diff --git a/keyboards/ferris/0_2/mini/info.json b/keyboards/ferris/0_2/mini/info.json new file mode 100644 index 0000000000..0ab5db559a --- /dev/null +++ b/keyboards/ferris/0_2/mini/info.json @@ -0,0 +1,6 @@ +{ + "keyboard_name": "Ferris 0.2 - Mini", + "usb": { + "pid": "0x0004" + } +} diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk index 2d406f5c1d..c5a44ca9ef 100644 --- a/keyboards/ferris/0_2/rules.mk +++ b/keyboards/ferris/0_2/rules.mk @@ -25,3 +25,5 @@ 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 93470c7253..52485bd9e9 100644 --- a/keyboards/ferris/info.json +++ b/keyboards/ferris/info.json @@ -1,5 +1,4 @@ { - "keyboard_name": "Ferris", "url": "https://github.com/pierrechevalier83/ferris/", "maintainer": "@pierrec83", "layouts": { diff --git a/keyboards/ferris/sweep/config.h b/keyboards/ferris/sweep/config.h index 4d4d7d309f..c7d5bcf91d 100644 --- a/keyboards/ferris/sweep/config.h +++ b/keyboards/ferris/sweep/config.h @@ -21,13 +21,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xC2AB -#define PRODUCT_ID 0x3939 -#define DEVICE_VER 0x0001 -#define MANUFACTURER DPB -#define PRODUCT Ferris sweep - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/ferris/sweep/info.json b/keyboards/ferris/sweep/info.json new file mode 100644 index 0000000000..fc53028c34 --- /dev/null +++ b/keyboards/ferris/sweep/info.json @@ -0,0 +1,9 @@ +{ + "keyboard_name": "Ferris sweep", + "manufacturer": "DPB", + "usb": { + "vid": "0xC2AB", + "pid": "0x3939", + "device_version": "0.0.1" + } +} -- cgit v1.2.1 From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Aug 2022 11:34:17 +0100 Subject: RESET -> QK_BOOT keyboard readme (#18110) --- keyboards/ferris/sweep/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/sweep/readme.md b/keyboards/ferris/sweep/readme.md index 332ab2c790..3fe690ab91 100644 --- a/keyboards/ferris/sweep/readme.md +++ b/keyboards/ferris/sweep/readme.md @@ -37,7 +37,7 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the top left key on the left half (or the top right key on the right half) and plug in the controller on that side. * **Physical reset button**: Briefly press the reset button soldered on the PCB. -* **Keycode in layout**: Press the key mapped to `RESET` if it is configured. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured. ## Swapped Pins -- cgit v1.2.1 From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 21 Aug 2022 23:55:30 +0100 Subject: RESET -> QK_BOOT user keymaps (#17940) --- keyboards/ferris/keymaps/madhatter/keymap.c | 2 +- keyboards/ferris/keymaps/pierrec83/keymap.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/ferris') diff --git a/keyboards/ferris/keymaps/madhatter/keymap.c b/keyboards/ferris/keymaps/madhatter/keymap.c index 5a3f416e74..1bdc8604f2 100644 --- a/keyboards/ferris/keymaps/madhatter/keymap.c +++ b/keyboards/ferris/keymaps/madhatter/keymap.c @@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT( /* [> RAISE <] */ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_PIPE, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, RESET, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/ferris/keymaps/pierrec83/keymap.json b/keyboards/ferris/keymaps/pierrec83/keymap.json index f42259be90..2cbc47d912 100644 --- a/keyboards/ferris/keymaps/pierrec83/keymap.json +++ b/keyboards/ferris/keymaps/pierrec83/keymap.json @@ -108,7 +108,7 @@ "DF(1)" , "KC_LGUI" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS", "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS", - "DF(0)" , "KC_TRNS" , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)" , "RESET", + "DF(0)" , "KC_TRNS" , "RALT_T(KC_COMM)", "RCTL_T(KC_DOT)" , "QK_BOOT", "KC_TRNS" , "KC_TAB", "KC_NO" , "KC_TRNS" -- cgit v1.2.1