summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/handwired/pytest/basic/info.json2
-rw-r--r--keyboards/handwired/pytest/config.h6
-rw-r--r--keyboards/handwired/pytest/info.json5
-rw-r--r--keyboards/handwired/pytest/macro/info.json14
-rw-r--r--lib/python/qmk/tests/minimal_info.json2
-rw-r--r--lib/python/qmk/tests/test_cli_commands.py2
6 files changed, 15 insertions, 16 deletions
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json
index 9cabb3e32e..bcd6f686b8 100644
--- a/keyboards/handwired/pytest/basic/info.json
+++ b/keyboards/handwired/pytest/basic/info.json
@@ -2,7 +2,7 @@
"layouts": {
"LAYOUT_custom": {
"layout": [
- { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 }
+ {"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
]
}
}
diff --git a/keyboards/handwired/pytest/config.h b/keyboards/handwired/pytest/config.h
deleted file mode 100644
index a61b8f5094..0000000000
--- a/keyboards/handwired/pytest/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
index a966477f24..00a3bff1f6 100644
--- a/keyboards/handwired/pytest/info.json
+++ b/keyboards/handwired/pytest/info.json
@@ -7,6 +7,11 @@
"pid": "0x6465",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4"],
+ "rows": ["F5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/info.json
index 914d5edcd6..6c2d0dea4d 100644
--- a/keyboards/handwired/pytest/macro/info.json
+++ b/keyboards/handwired/pytest/macro/info.json
@@ -1,10 +1,10 @@
{
- "maintainer": "qmk",
- "layouts": {
- "LAYOUT_custom": {
- "layout": [
- { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 }
- ]
+ "maintainer": "qmk",
+ "layouts": {
+ "LAYOUT_custom": {
+ "layout": [
+ {"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
+ ]
+ }
}
- }
}
diff --git a/lib/python/qmk/tests/minimal_info.json b/lib/python/qmk/tests/minimal_info.json
index 3aae4722bf..7f5ec1f983 100644
--- a/lib/python/qmk/tests/minimal_info.json
+++ b/lib/python/qmk/tests/minimal_info.json
@@ -4,7 +4,7 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }
+ {"label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0}
]
}
}
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 176a52a35a..13359808a0 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -168,7 +168,7 @@ def test_json2c_wrong_json():
def test_json2c_no_json():
- result = check_subcommand('json2c', 'keyboards/handwired/pytest/config.h')
+ result = check_subcommand('json2c', 'keyboards/handwired/pytest/basic/keymaps/default/keymap.c')
check_returncode(result, [1])
assert 'Invalid JSON encountered' in result.stdout