diff options
Diffstat (limited to 'keyboards')
26 files changed, 102 insertions, 84 deletions
diff --git a/keyboards/handwired/onekey/pytest/config.h b/keyboards/handwired/onekey/pytest/config.h deleted file mode 100644 index f6bedcfe64..0000000000 --- a/keyboards/handwired/onekey/pytest/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2019 - * - * 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/>. - */ - -#pragma once - -#include "config_common.h" - -#define MATRIX_COL_PINS { A3 } -#define MATRIX_ROW_PINS { A2 } -#define UNUSED_PINS diff --git a/keyboards/handwired/onekey/pytest/readme.md b/keyboards/handwired/onekey/pytest/readme.md deleted file mode 100644 index dbbd991f1c..0000000000 --- a/keyboards/handwired/onekey/pytest/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# PyTest onekey - -This is used by the python test framework. It's probably not useful otherwise. diff --git a/keyboards/handwired/onekey/pytest/rules.mk b/keyboards/handwired/onekey/pytest/rules.mk deleted file mode 100644 index 4e157baeda..0000000000 --- a/keyboards/handwired/onekey/pytest/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C diff --git a/keyboards/handwired/onekey/pytest/.noci b/keyboards/handwired/pytest/.noci index e69de29bb2..e69de29bb2 100644 --- a/keyboards/handwired/onekey/pytest/.noci +++ b/keyboards/handwired/pytest/.noci diff --git a/keyboards/handwired/pytest/basic/.noci b/keyboards/handwired/pytest/basic/.noci new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/basic/.noci diff --git a/keyboards/handwired/pytest/basic/keymaps/default/keymap.c b/keyboards/handwired/pytest/basic/keymaps/default/keymap.c new file mode 100644 index 0000000000..a5782f7a13 --- /dev/null +++ b/keyboards/handwired/pytest/basic/keymaps/default/keymap.c @@ -0,0 +1,5 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_ortho_1x1(KC_A) +}; diff --git a/keyboards/handwired/onekey/keymaps/default_json/keymap.json b/keyboards/handwired/pytest/basic/keymaps/default_json/keymap.json index ce4c4b474d..e162e41399 100644 --- a/keyboards/handwired/onekey/keymaps/default_json/keymap.json +++ b/keyboards/handwired/pytest/basic/keymaps/default_json/keymap.json @@ -1,9 +1,9 @@ { - "keyboard": "handwired/onekey/pytest", + "keyboard": "handwired/pytest/basic", "keymap": "default_json", "layout": "LAYOUT_ortho_1x1", "layers": [["KC_A"]], "author": "qmk", - "notes": "This file is a keymap.json file for handwired/onekey/pytest", + "notes": "This file is a keymap.json file for handwired/pytest/basic", "version": 1 } diff --git a/keyboards/handwired/pytest/basic/readme.md b/keyboards/handwired/pytest/basic/readme.md new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/basic/readme.md diff --git a/keyboards/handwired/pytest/basic/rules.mk b/keyboards/handwired/pytest/basic/rules.mk new file mode 100644 index 0000000000..6b42774dbf --- /dev/null +++ b/keyboards/handwired/pytest/basic/rules.mk @@ -0,0 +1 @@ +MCU = atmega32u4 diff --git a/keyboards/handwired/pytest/config.h b/keyboards/handwired/pytest/config.h new file mode 100644 index 0000000000..64cf353126 --- /dev/null +++ b/keyboards/handwired/pytest/config.h @@ -0,0 +1,18 @@ +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x6465 +#define DEVICE_VER 0x0001 +#define MANUFACTURER none +#define PRODUCT pytest + +/* key matrix size */ +#define MATRIX_ROWS 1 +#define MATRIX_COLS 1 + +#define MATRIX_COL_PINS { F4 } +#define MATRIX_ROW_PINS { F5 } +#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/pytest/has_community/.noci b/keyboards/handwired/pytest/has_community/.noci new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/has_community/.noci diff --git a/keyboards/handwired/pytest/has_community/readme.md b/keyboards/handwired/pytest/has_community/readme.md new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/has_community/readme.md diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk new file mode 100644 index 0000000000..4161649cbc --- /dev/null +++ b/keyboards/handwired/pytest/has_community/rules.mk @@ -0,0 +1,3 @@ +MCU = atmega32u4 + +LAYOUTS = ortho_1x1 diff --git a/keyboards/handwired/pytest/has_template/.noci b/keyboards/handwired/pytest/has_template/.noci new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/.noci diff --git a/keyboards/handwired/pytest/has_template/keymaps/.noci b/keyboards/handwired/pytest/has_template/keymaps/.noci new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/keymaps/.noci diff --git a/keyboards/handwired/pytest/has_template/keymaps/default/keymap.c b/keyboards/handwired/pytest/has_template/keymaps/default/keymap.c new file mode 100644 index 0000000000..a5782f7a13 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/keymaps/default/keymap.c @@ -0,0 +1,5 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + LAYOUT_ortho_1x1(KC_A) +}; diff --git a/keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json b/keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json new file mode 100644 index 0000000000..cbdce6db32 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json @@ -0,0 +1,9 @@ +{ + "keyboard": "handwired/pytest/has_template", + "keymap": "default_json", + "layout": "LAYOUT_ortho_1x1", + "layers": [["KC_A"]], + "author": "qmk", + "notes": "This file is a keymap.json file for handwired/pytest/has_template", + "version": 1 +} diff --git a/keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c b/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c index 4e06bb11ec..4e06bb11ec 100644 --- a/keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c +++ b/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c diff --git a/keyboards/handwired/pytest/has_template/readme.md b/keyboards/handwired/pytest/has_template/readme.md new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/readme.md diff --git a/keyboards/handwired/pytest/has_template/rules.mk b/keyboards/handwired/pytest/has_template/rules.mk new file mode 100644 index 0000000000..6b42774dbf --- /dev/null +++ b/keyboards/handwired/pytest/has_template/rules.mk @@ -0,0 +1 @@ +MCU = atmega32u4 diff --git a/keyboards/handwired/onekey/pytest/templates/keymap.c b/keyboards/handwired/pytest/has_template/templates/keymap.c index 6cb25d5226..6cb25d5226 100644 --- a/keyboards/handwired/onekey/pytest/templates/keymap.c +++ b/keyboards/handwired/pytest/has_template/templates/keymap.c diff --git a/keyboards/handwired/onekey/pytest/templates/keymap.json b/keyboards/handwired/pytest/has_template/templates/keymap.json index 35344388f6..04928564e9 100644 --- a/keyboards/handwired/onekey/pytest/templates/keymap.json +++ b/keyboards/handwired/pytest/has_template/templates/keymap.json @@ -1,3 +1,3 @@ { - "documentation": "This file is a keymap.json file for handwired/onekey/pytest" + "documentation": "This file is a keymap.json file for handwired/pytest/has_template" } diff --git a/keyboards/handwired/pytest/pytest.h b/keyboards/handwired/pytest/pytest.h new file mode 100644 index 0000000000..b8fe7dde59 --- /dev/null +++ b/keyboards/handwired/pytest/pytest.h @@ -0,0 +1,11 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT_ortho_1x1( \ + k00 \ +) { \ + { k00 } \ +} + +#define LAYOUT LAYOUT_ortho_1x1 diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c index 4e195d43bb..2074c73860 100644 --- a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c @@ -1,19 +1,19 @@ - /* + /* Copyright 2020 Garret Gartner - - 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/>. - */ + + 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 QMK_KEYBOARD_H @@ -159,7 +159,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // KEYMAP TEMPLATE: -// +// // /* <_LAYER>: // * // * ┌────┐ ┌────┐ ┌────┬────┬────┐ @@ -185,16 +185,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Per-Key Tapping Term Definitions: -uint16_t get_tapping_term(uint16_t keycode) { - switch (keycode) { - case TD(TD_DBQT): - return 235; - default: - return TAPPING_TERM; - } +uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case TD(TD_DBQT): + return 235; + default: + return TAPPING_TERM; + } } - // Encoder Customization: (*Order-of-Keycode Specific) void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c index 16f469b53a..8607c8e4ee 100644 --- a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c @@ -1,19 +1,19 @@ - /* + /* Copyright 2020 Garret Gartner - - 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/>. - */ + + 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 QMK_KEYBOARD_H @@ -184,19 +184,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ) - // Per-Key Tapping Term Definitions: -uint16_t get_tapping_term(uint16_t keycode) { - switch (keycode) { - case TD(TD_DBQT): - return 235; - default: - return TAPPING_TERM; - } +uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { + switch (keycode) { + case TD(TD_DBQT): + return 235; + default: + return TAPPING_TERM; + } } - - // Encoder Customization: (*Order-of-Keycode Specific) void encoder_update_user(uint8_t index, bool clockwise) { if (index == 0) { diff --git a/keyboards/nightly_boards/octopad/config.h b/keyboards/nightly_boards/octopad/config.h index fc8956d1d3..1477ce93e2 100644 --- a/keyboards/nightly_boards/octopad/config.h +++ b/keyboards/nightly_boards/octopad/config.h @@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define B5_AUDIO #define AUDIO_CLICKY - +#define NO_MUSIC_MODE /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 @@ -81,5 +81,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - |