From 8770054c167a8fd0790f94cfcf278fca8a4d238d Mon Sep 17 00:00:00 2001 From: Roger Fachini Date: Mon, 23 Dec 2019 16:58:32 -0800 Subject: [PATCH 1/3] Fix iterating through request body on /v1/settings --- src/components/core/comms/api/cncserver.api.settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/core/comms/api/cncserver.api.settings.js b/src/components/core/comms/api/cncserver.api.settings.js index a883838..51c463a 100644 --- a/src/components/core/comms/api/cncserver.api.settings.js +++ b/src/components/core/comms/api/cncserver.api.settings.js @@ -55,7 +55,7 @@ module.exports = (cncserver) => { return { code: 200, body: getSettings() }; } if (req.route.method === 'put') { - for (const [key, value] of req.body) { + for (const [key, value] of Object.entries(req.body)) { conf.set(key, value); } return { code: 200, body: getSettings() }; From 7fb64dd3ad3c95474e98138cc7cdd766c4f99c85 Mon Sep 17 00:00:00 2001 From: Roger Fachini Date: Mon, 23 Dec 2019 17:31:29 -0800 Subject: [PATCH 2/3] Propagate debug setting to runner config --- src/components/core/comms/api/cncserver.api.settings.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/core/comms/api/cncserver.api.settings.js b/src/components/core/comms/api/cncserver.api.settings.js index 51c463a..d21b503 100644 --- a/src/components/core/comms/api/cncserver.api.settings.js +++ b/src/components/core/comms/api/cncserver.api.settings.js @@ -58,6 +58,15 @@ module.exports = (cncserver) => { for (const [key, value] of Object.entries(req.body)) { conf.set(key, value); } + + // Send debug setting to the runner when changed + // TODO: what other settings should be updated on the runner? + if (setType === 'global' && req.body.debug != undefined ){ + cncserver.ipc.sendMessage('runner.config', { + debug: req.body.debug, + }); + + } return { code: 200, body: getSettings() }; } From 17f69901399babc9d8feee569f2cc32e0f4fdabc Mon Sep 17 00:00:00 2001 From: Roger Fachini Date: Mon, 23 Dec 2019 18:06:02 -0800 Subject: [PATCH 3/3] Send showSerial & bot.controller settings to runner --- .../core/comms/api/cncserver.api.settings.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/components/core/comms/api/cncserver.api.settings.js b/src/components/core/comms/api/cncserver.api.settings.js index d21b503..17adad9 100644 --- a/src/components/core/comms/api/cncserver.api.settings.js +++ b/src/components/core/comms/api/cncserver.api.settings.js @@ -59,13 +59,18 @@ module.exports = (cncserver) => { conf.set(key, value); } - // Send debug setting to the runner when changed - // TODO: what other settings should be updated on the runner? - if (setType === 'global' && req.body.debug != undefined ){ + console.log((req.body.debug != undefined || req.body.showSerial != undefined)) + + // Send updated setting to the runner when changed + if (setType === 'global' && (req.body.debug != undefined || req.body.showSerial != undefined)){ cncserver.ipc.sendMessage('runner.config', { debug: req.body.debug, + showSerial: req.body.showSerial + }); + }else if (setType === 'bot' && (req.body.controller != undefined )){ + cncserver.ipc.sendMessage('runner.config', { + controller: req.body.controller, }); - } return { code: 200, body: getSettings() }; }