Map data driven DESCRIPTION as string literal (qmk#16523)

aki27kbd · Mar 5, 2022 · 7d41639 · 7d41639
1 parent 618aaa8
commit 7d41639
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 6 deletions.
diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
@@ -17,7 +17,7 @@
  "DEVICE_VER": {"info_key": "usb.device_ver", "value_type": "hex"},
  # TODO: Replace ^^^ with vvv
  #"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"},
  "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"},

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

diff --git a/keyboards/sowbug/ansi_tkl/config.h b/keyboards/sowbug/ansi_tkl/config.h
@@ -26,7 +26,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER github.com/sowbug
 #define PRODUCT ANSI TKL
-#define DESCRIPTION A tenkeyless ANSI-layout keyboard
 
 // key matrix size
 #define MATRIX_ROWS 6

diff --git a/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h b/keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h
@@ -23,7 +23,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER Unicomp/Purdea Andrei
 #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"
 
 /* key matrix size */

diff --git a/keyboards/xelus/ninjin/config.h b/keyboards/xelus/ninjin/config.h
@@ -22,7 +22,6 @@
 #define DEVICE_VER 0x0001
 #define MANUFACTURER Xelus
 #define PRODUCT Ninjin
-#define DESCRIPTION Ninjin
 
 /* key matrix size */
 #define MATRIX_ROWS 6

diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
@@ -259,7 +259,7 @@ def test_generate_config_h():
  result = check_subcommand('generate-config-h', '-kb', 'handwired/pytest/basic')
  check_returncode(result)
  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 MANUFACTURER none' in result.stdout
  assert '# define PRODUCT pytest' in result.stdout