From aa2595a9d9237051d7f561d97f036aacfa9f4519 Mon Sep 17 00:00:00 2001 From: Pelsin Date: Fri, 29 Dec 2023 22:30:19 +0100 Subject: [PATCH] Add support for export/import of macros (#721) * Add macros to backup page * Remove usedPins data from getMacroAddonOptions in dev server --- www/server/app.js | 1 - www/src/Locales/en/BackupPage.jsx | 1 + www/src/Pages/BackupPage.jsx | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/www/server/app.js b/www/server/app.js index 6ed43d23a..2d59e8fc7 100644 --- a/www/server/app.js +++ b/www/server/app.js @@ -505,7 +505,6 @@ app.get('/api/getMacroAddonOptions', (req, res) => { macroPin: -1, macroBoardLedEnabled: 1, InputMacroAddonEnabled: 1, - usedPins: Object.values(picoController), }); }); diff --git a/www/src/Locales/en/BackupPage.jsx b/www/src/Locales/en/BackupPage.jsx index 8d30c0c88..081db6c70 100644 --- a/www/src/Locales/en/BackupPage.jsx +++ b/www/src/Locales/en/BackupPage.jsx @@ -10,6 +10,7 @@ export default { 'api-gamepad-text': 'Gamepad', 'api-led-text': 'LED', 'api-ledTheme-text': 'Custom LED Theme', + 'api-macros-text': 'Macro Mappings', 'api-pins-text': 'Pin Mappings', 'api-profiles-text': 'Profile Mappings', 'api-addons-text': 'Add-Ons', diff --git a/www/src/Pages/BackupPage.jsx b/www/src/Pages/BackupPage.jsx index 17be842d6..c3505742b 100644 --- a/www/src/Pages/BackupPage.jsx +++ b/www/src/Pages/BackupPage.jsx @@ -26,6 +26,11 @@ const API_BINDING = { get: WebApi.getCustomTheme, set: WebApi.setCustomTheme, }, + macros: { + label: 'Macro Mappings', + get: WebApi.getMacroAddonOptions, + set: WebApi.setMacroAddonOptions, + }, pins: { label: 'Pin Mappings', get: WebApi.getPinMappings,