From f03b10b6c1c9a5b0e07f7f78c6060610246b4a7f Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 5 Jan 2021 00:52:31 +0000 Subject: Migrate python tests away from onekey (#11367) * Migrate python tests away from onekey * Add stub files to stop lint complaints * Make all the pytest keymaps compile --- .../onekey/keymaps/default_json/keymap.json | 9 --------- .../handwired/onekey/keymaps/pytest_nocpp/keymap.c | 23 ---------------------- keyboards/handwired/onekey/pytest/.noci | 0 keyboards/handwired/onekey/pytest/config.h | 23 ---------------------- keyboards/handwired/onekey/pytest/readme.md | 3 --- keyboards/handwired/onekey/pytest/rules.mk | 2 -- .../handwired/onekey/pytest/templates/keymap.c | 2 -- .../handwired/onekey/pytest/templates/keymap.json | 3 --- keyboards/handwired/pytest/.noci | 0 keyboards/handwired/pytest/basic/.noci | 0 .../pytest/basic/keymaps/default/keymap.c | 5 +++++ .../pytest/basic/keymaps/default_json/keymap.json | 9 +++++++++ keyboards/handwired/pytest/basic/readme.md | 0 keyboards/handwired/pytest/basic/rules.mk | 1 + keyboards/handwired/pytest/config.h | 18 +++++++++++++++++ keyboards/handwired/pytest/has_community/.noci | 0 keyboards/handwired/pytest/has_community/readme.md | 0 keyboards/handwired/pytest/has_community/rules.mk | 3 +++ keyboards/handwired/pytest/has_template/.noci | 0 .../handwired/pytest/has_template/keymaps/.noci | 0 .../pytest/has_template/keymaps/default/keymap.c | 5 +++++ .../has_template/keymaps/default_json/keymap.json | 9 +++++++++ .../pytest/has_template/keymaps/nocpp/keymap.c | 23 ++++++++++++++++++++++ keyboards/handwired/pytest/has_template/readme.md | 0 keyboards/handwired/pytest/has_template/rules.mk | 1 + .../pytest/has_template/templates/keymap.c | 2 ++ .../pytest/has_template/templates/keymap.json | 3 +++ keyboards/handwired/pytest/pytest.h | 11 +++++++++++ 28 files changed, 90 insertions(+), 65 deletions(-) delete mode 100644 keyboards/handwired/onekey/keymaps/default_json/keymap.json delete mode 100644 keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c delete mode 100644 keyboards/handwired/onekey/pytest/.noci delete mode 100644 keyboards/handwired/onekey/pytest/config.h delete mode 100644 keyboards/handwired/onekey/pytest/readme.md delete mode 100644 keyboards/handwired/onekey/pytest/rules.mk delete mode 100644 keyboards/handwired/onekey/pytest/templates/keymap.c delete mode 100644 keyboards/handwired/onekey/pytest/templates/keymap.json create mode 100644 keyboards/handwired/pytest/.noci create mode 100644 keyboards/handwired/pytest/basic/.noci create mode 100644 keyboards/handwired/pytest/basic/keymaps/default/keymap.c create mode 100644 keyboards/handwired/pytest/basic/keymaps/default_json/keymap.json create mode 100644 keyboards/handwired/pytest/basic/readme.md create mode 100644 keyboards/handwired/pytest/basic/rules.mk create mode 100644 keyboards/handwired/pytest/config.h create mode 100644 keyboards/handwired/pytest/has_community/.noci create mode 100644 keyboards/handwired/pytest/has_community/readme.md create mode 100644 keyboards/handwired/pytest/has_community/rules.mk create mode 100644 keyboards/handwired/pytest/has_template/.noci create mode 100644 keyboards/handwired/pytest/has_template/keymaps/.noci create mode 100644 keyboards/handwired/pytest/has_template/keymaps/default/keymap.c create mode 100644 keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json create mode 100644 keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c create mode 100644 keyboards/handwired/pytest/has_template/readme.md create mode 100644 keyboards/handwired/pytest/has_template/rules.mk create mode 100644 keyboards/handwired/pytest/has_template/templates/keymap.c create mode 100644 keyboards/handwired/pytest/has_template/templates/keymap.json create mode 100644 keyboards/handwired/pytest/pytest.h (limited to 'keyboards') diff --git a/keyboards/handwired/onekey/keymaps/default_json/keymap.json b/keyboards/handwired/onekey/keymaps/default_json/keymap.json deleted file mode 100644 index ce4c4b474d..0000000000 --- a/keyboards/handwired/onekey/keymaps/default_json/keymap.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "keyboard": "handwired/onekey/pytest", - "keymap": "default_json", - "layout": "LAYOUT_ortho_1x1", - "layers": [["KC_A"]], - "author": "qmk", - "notes": "This file is a keymap.json file for handwired/onekey/pytest", - "version": 1 -} diff --git a/keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c b/keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c deleted file mode 100644 index 4e06bb11ec..0000000000 --- a/keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c +++ /dev/null @@ -1,23 +0,0 @@ -#include QMK_KEYBOARD_H -#include "audio.h" - -/* THIS FILE WAS GENERATED AND IS EXPERIMENTAL! - * - * This file was generated by qmk-compile-json. You may or may not want to - * edit it directly. - */ - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT(KC_ENTER) -}; - -void encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0) { - if (clockwise) { - tap_code(KC_UP); - } else { - tap_code(KC_DOWN); - } - } - -}; diff --git a/keyboards/handwired/onekey/pytest/.noci b/keyboards/handwired/onekey/pytest/.noci deleted file mode 100644 index e69de29bb2..0000000000 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 . - */ - -#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 b17a3d0316..0000000000 --- a/keyboards/handwired/onekey/pytest/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# MCU name -MCU = STM32F303 diff --git a/keyboards/handwired/onekey/pytest/templates/keymap.c b/keyboards/handwired/onekey/pytest/templates/keymap.c deleted file mode 100644 index 6cb25d5226..0000000000 --- a/keyboards/handwired/onekey/pytest/templates/keymap.c +++ /dev/null @@ -1,2 +0,0 @@ -#include QMK_KEYBOARD_H -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; diff --git a/keyboards/handwired/onekey/pytest/templates/keymap.json b/keyboards/handwired/onekey/pytest/templates/keymap.json deleted file mode 100644 index 35344388f6..0000000000 --- a/keyboards/handwired/onekey/pytest/templates/keymap.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "documentation": "This file is a keymap.json file for handwired/onekey/pytest" -} diff --git a/keyboards/handwired/pytest/.noci b/keyboards/handwired/pytest/.noci new file mode 100644 index 0000000000..e69de29bb2 diff --git a/keyboards/handwired/pytest/basic/.noci b/keyboards/handwired/pytest/basic/.noci new file mode 100644 index 0000000000..e69de29bb2 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/pytest/basic/keymaps/default_json/keymap.json b/keyboards/handwired/pytest/basic/keymaps/default_json/keymap.json new file mode 100644 index 0000000000..e162e41399 --- /dev/null +++ b/keyboards/handwired/pytest/basic/keymaps/default_json/keymap.json @@ -0,0 +1,9 @@ +{ + "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/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 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 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 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 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 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/pytest/has_template/keymaps/nocpp/keymap.c b/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c new file mode 100644 index 0000000000..4e06bb11ec --- /dev/null +++ b/keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c @@ -0,0 +1,23 @@ +#include QMK_KEYBOARD_H +#include "audio.h" + +/* THIS FILE WAS GENERATED AND IS EXPERIMENTAL! + * + * This file was generated by qmk-compile-json. You may or may not want to + * edit it directly. + */ + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT(KC_ENTER) +}; + +void encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0) { + if (clockwise) { + tap_code(KC_UP); + } else { + tap_code(KC_DOWN); + } + } + +}; 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 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/pytest/has_template/templates/keymap.c b/keyboards/handwired/pytest/has_template/templates/keymap.c new file mode 100644 index 0000000000..6cb25d5226 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/templates/keymap.c @@ -0,0 +1,2 @@ +#include QMK_KEYBOARD_H +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__}; diff --git a/keyboards/handwired/pytest/has_template/templates/keymap.json b/keyboards/handwired/pytest/has_template/templates/keymap.json new file mode 100644 index 0000000000..04928564e9 --- /dev/null +++ b/keyboards/handwired/pytest/has_template/templates/keymap.json @@ -0,0 +1,3 @@ +{ + "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 -- cgit v1.2.1 From 375ef0b8c3e13b9d60de2cb79ef2a54215388792 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Mon, 4 Jan 2021 20:14:10 -0800 Subject: [Keyboard] Fix compiler errors for Kingly Key boards (#11100) --- .../kingly_keys/ave/ortho/keymaps/default/keymap.c | 47 +++++++++++----------- .../ave/staggered/keymaps/default/keymap.c | 47 ++++++++++------------ 2 files changed, 45 insertions(+), 49 deletions(-) (limited to 'keyboards') 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 . - */ + + 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 . + */ #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 . - */ + + 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 . + */ #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) { -- cgit v1.2.1 From 3d1e7bd36fee748b6bfaa89d4a14c3f4f841c0ca Mon Sep 17 00:00:00 2001 From: Drashna Jael're Date: Mon, 4 Jan 2021 18:48:13 -0800 Subject: [Keyboard] Disable music mode on OctoPad to reduce size --- keyboards/nightly_boards/octopad/config.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'keyboards') 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 . #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 . #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - - -- cgit v1.2.1