From 03cc71586ea99ba4a8a8d908d354b971ec392e91 Mon Sep 17 00:00:00 2001 From: Stephen Dade Date: Wed, 10 Jun 2020 18:34:47 +1000 Subject: [PATCH] FlightController: send out error messages --- server/flightController.js | 3 ++- server/index.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/flightController.js b/server/flightController.js index 5c56db82..12f71783 100644 --- a/server/flightController.js +++ b/server/flightController.js @@ -423,9 +423,10 @@ class FCDetails { this.startInterval() this.saveSerialSettings() } - return callback(null, this.activeDevice !== null) + return callback(err, this.activeDevice !== null) }) } else { + // close link this.activeDevice = null this.closeLink((err) => { this.saveSerialSettings() diff --git a/server/index.js b/server/index.js index d8b5b60e..1e854aa7 100644 --- a/server/index.js +++ b/server/index.js @@ -253,11 +253,11 @@ app.post('/api/FCModify', [check('device').isJSON(), check('baud').isJSON(), che if (!err) { res.setHeader('Content-Type', 'application/json'); //console.log(isSuccess); - res.send(JSON.stringify({telemetryStatus: isSuccess})); + res.send(JSON.stringify({telemetryStatus: isSuccess, error: null})); } else { res.setHeader('Content-Type', 'application/json'); - res.send(JSON.stringify({ telemetryStatus: false})); + res.send(JSON.stringify({ telemetryStatus: false, error: err})); winston.error('Error in /api/FCModify ', { message: err }); }