diff --git a/src/const/index.js b/src/const/index.js index 6ad88ae1..70bc2d88 100644 --- a/src/const/index.js +++ b/src/const/index.js @@ -101,6 +101,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { // Presets. PRESETS: Presets, + // VENDOR_ID PRODUCT_ID + VENDOR_ID: 'FEED', + PRODUCT_ID: '6060', + // Local settings. LOCAL: Local diff --git a/src/files/generators/config.h.js b/src/files/generators/config.h.js index 3ad46232..003a83a4 100644 --- a/src/files/generators/config.h.js +++ b/src/files/generators/config.h.js @@ -10,6 +10,8 @@ class ConfigH extends Generator { const keyboard = this.keyboard; return { + 'vendor_id': (keyboard.settings.vendor_id) ? keyboard.settings.vendor_id: C.VENDOR_ID, + 'product_id': (keyboard.settings.product_id) ? keyboard.settings.product_id: C.PRODUCT_ID, 'rows': keyboard.rows, 'cols': keyboard.cols, 'row_pins': keyboard.pins.row.join(', '), diff --git a/src/files/generators/templates/config.h.js b/src/files/generators/templates/config.h.js index fd0a4227..1e312f29 100644 --- a/src/files/generators/templates/config.h.js +++ b/src/files/generators/templates/config.h.js @@ -6,8 +6,8 @@ module.exports = ` #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6060 +#define VENDOR_ID 0x%vendor_id% +#define PRODUCT_ID 0x%product_id% #define DEVICE_VER 0x0001 #define MANUFACTURER qmkbuilder #define PRODUCT keyboard diff --git a/src/state/keyboard/index.js b/src/state/keyboard/index.js index 6bda1a6a..911f5294 100644 --- a/src/state/keyboard/index.js +++ b/src/state/keyboard/index.js @@ -38,6 +38,8 @@ class Keyboard { this.settings = { diodeDirection: C.DIODE_COL2ROW, name: '', + vendor_id: C.VENDOR_ID, + product_id: C.PRODUCT_ID, bootloaderSize: C.BOOTLOADER_4096, rgbNum: 0, backlightLevels: 3 @@ -485,6 +487,9 @@ class Keyboard { keyboard.quantum = quantum; keyboard.settings = settings; + if (!keyboard.settings.vendor_id) keyboard.settings.vendor_id = C.VENDOR_ID; + if (!keyboard.settings.product_id) keyboard.settings.product_id = C.PRODUCT_ID; + keyboard.updateWiring(); keyboard.updatePins(); keyboard.verify(); diff --git a/src/ui/panes/settings/index.js b/src/ui/panes/settings/index.js index fb7ea481..54c378ea 100644 --- a/src/ui/panes/settings/index.js +++ b/src/ui/panes/settings/index.js @@ -77,6 +77,26 @@ class Settings extends React.Component { Give your layout a name!
+