Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Map data driven DESCRIPTION as string literal (#16523)

Browse source
This commit is contained in:
Ryan 2022-03-05 11:20:34 +11:00 • committed by GitHub
commit 7d41639d54
Failed to generate hash of commit
6 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/mappings/info_config.json
View file

@ -17,7 +17,7 @@
"DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"}, "DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"},
# TODO: Replace ^^^ with vvv # TODO: Replace ^^^ with vvv
#"DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"}, #"DEVICE_VER": {"info_key": "usb.device_version", "value_type": "bcd_version"},
"DESCRIPTION": {"info_key": "keyboard_folder", "to_json": false}, "DESCRIPTION": {"info_key": "keyboard_folder", "value_type": "str", "to_json": false},
"DIODE_DIRECTION": {"info_key": "diode_direction"}, "DIODE_DIRECTION": {"info_key": "diode_direction"},
"FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"}, "FORCE_NKRO": {"info_key": "usb.force_nkro", "value_type": "bool"},
"DYNAMIC_KEYMAP_EEPROM_MAX_ADDR": {"info_key": "dynamic_keymap.eeprom_max_addr", "value_type": "int"}, "DYNAMIC_KEYMAP_EEPROM_MAX_ADDR": {"info_key": "dynamic_keymap.eeprom_max_addr", "value_type": "int"},

1
keyboards/sowbug/68keys/config.h
View file

@ -26,7 +26,6 @@
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER github.com/sowbug #define MANUFACTURER github.com/sowbug
#define PRODUCT 68-key keyboard #define PRODUCT 68-key keyboard
#define DESCRIPTION A 68-key keyboard based on 68keys.io
// key matrix size // key matrix size
#define MATRIX_ROWS 5 #define MATRIX_ROWS 5

1
keyboards/sowbug/ansi_tkl/config.h
View file

@ -26,7 +26,6 @@
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER github.com/sowbug #define MANUFACTURER github.com/sowbug
#define PRODUCT ANSI TKL #define PRODUCT ANSI TKL
#define DESCRIPTION A tenkeyless ANSI-layout keyboard
// key matrix size // key matrix size
#define MATRIX_ROWS 6 #define MATRIX_ROWS 6

1
keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
View file

@ -23,7 +23,6 @@
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER Unicomp/Purdea Andrei #define MANUFACTURER Unicomp/Purdea Andrei
#define PRODUCT Unicomp Spacesaver M #define PRODUCT Unicomp Spacesaver M
#define DESCRIPTION QMK firmware for the Unicomp Spacesaver M keyboard with a replacement Overnumpad controller
#define SERIAL_NUMBER "purdea.ro:overnumpad_controller" #define SERIAL_NUMBER "purdea.ro:overnumpad_controller"
/* key matrix size */ /* key matrix size */

1
keyboards/xelus/ninjin/config.h
View file

@ -22,7 +22,6 @@
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER Xelus #define MANUFACTURER Xelus
#define PRODUCT Ninjin #define PRODUCT Ninjin
#define DESCRIPTION Ninjin
/* key matrix size */ /* key matrix size */
#define MATRIX_ROWS 6 #define MATRIX_ROWS 6

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

@ -259,7 +259,7 @@ def test_generate_config_h():
result = check_subcommand('generate-config-h', '-kb', 'handwired/pytest/basic') result = check_subcommand('generate-config-h', '-kb', 'handwired/pytest/basic')
check_returncode(result) check_returncode(result)
assert '# define DEVICE_VER 0x0001' in result.stdout assert '# define DEVICE_VER 0x0001' in result.stdout
assert '# define DESCRIPTION handwired/pytest/basic' in result.stdout assert '# define DESCRIPTION "handwired/pytest/basic"' in result.stdout
assert '# define DIODE_DIRECTION COL2ROW' in result.stdout assert '# define DIODE_DIRECTION COL2ROW' in result.stdout
assert '# define MANUFACTURER none' in result.stdout assert '# define MANUFACTURER none' in result.stdout
assert '# define PRODUCT pytest' in result.stdout assert '# define PRODUCT pytest' in result.stdout