From 7d41639d549c7db0763d6769a089794b6050c99f Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 5 Mar 2022 11:20:34 +1100
Subject: [PATCH] Map data driven `DESCRIPTION` as string literal (#16523)

---
 data/mappings/info_config.json                                  | 2 +-
 keyboards/sowbug/68keys/config.h                                | 1 -
 keyboards/sowbug/ansi_tkl/config.h                              | 1 -
 keyboards/unicomp/spacesaver_m_pre_2013/overnumpad_1xb/config.h | 1 -
 keyboards/xelus/ninjin/config.h                                 | 1 -
 lib/python/qmk/tests/test_cli_commands.py                       | 2 +-
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/data/mappings/info_config.json b/data/mappings/info_config.json
index 6c55f11647940ff6f5835312ddeed9202cf1a125..2121741d1996e53afff36493b151a315eacdafff 100644
--- 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
index 0aad9a457470c201a5619476ed3c3f72af170217..0721302dbe1ea07ce8a7996b4c3f9b2d4577eeca 100644
--- 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
index 505453b72b5590324e868d555cc80a0b5260e0af..44e82bbac73498af4e857c6223883ef687ec2bce 100644
--- 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
index 7bd5b224dff1379547ad168e6268c56fd31988c7..597d287b077c2e8a7413bb05116035673070fa44 100644
--- 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
index cbaca37b5edc2af2c6af7f2167930e169ff53b7c..4dd40210a66a0665cec6741c6aaf594ae57027a4 100644
--- 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
index d5cf1841c9aeacf9f60b320d2607b59fe2bc29c9..d40d4bf5739414c83fb958133bcfdd00330ea7bf 100644
--- 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