darkkirb/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix test_json2c_no_json() (#20756)

Browse source
This commit is contained in:
Ryan 2023-05-06 23:00:27 +10:00 committed by GitHub
parent dea9912cc9
commit 578102b400
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/handwired/pytest/basic/info.json
View file

@ -2,7 +2,7 @@
"layouts": { "layouts": {
"LAYOUT_custom": { "LAYOUT_custom": {
"layout": [ "layout": [
{ "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 } {"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
] ]
} }
} }

6
keyboards/handwired/pytest/config.h
View file

@ -1,6 +0,0 @@
#pragma once
#define MATRIX_COL_PINS { F4 }
#define MATRIX_ROW_PINS { F5 }
#define DIODE_DIRECTION COL2ROW

5
keyboards/handwired/pytest/info.json
View file

@ -7,6 +7,11 @@
"pid": "0x6465", "pid": "0x6465",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"matrix_pins": {
"cols": ["F4"],
"rows": ["F5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4", "processor": "atmega32u4",
"bootloader": "atmel-dfu", "bootloader": "atmel-dfu",
"layout_aliases": { "layout_aliases": {

14
keyboards/handwired/pytest/macro/info.json
View file

@ -1,10 +1,10 @@
{ {
"maintainer": "qmk", "maintainer": "qmk",
"layouts": { "layouts": {
"LAYOUT_custom": { "LAYOUT_custom": {
"layout": [ "layout": [
{ "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 } {"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
] ]
}
} }
}
} }

2
lib/python/qmk/tests/minimal_info.json
View file

@ -4,7 +4,7 @@
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [
{ "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 } {"label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0}
] ]
} }
} }

2
lib/python/qmk/tests/test_cli_commands.py
View file

@ -168,7 +168,7 @@ def test_json2c_wrong_json():
def test_json2c_no_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]) check_returncode(result, [1])
assert 'Invalid JSON encountered' in result.stdout assert 'Invalid JSON encountered' in result.stdout