From 255120b398dc6f32cfef5e99b980a989f545fd06 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 8 Oct 2020 11:00:40 +0100 Subject: [PATCH 1/5] Update --- server/server.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/server.js b/server/server.js index a003ee9..789906a 100644 --- a/server/server.js +++ b/server/server.js @@ -44,6 +44,9 @@ app.post('/setlight', async function (request, responce) { color: led_array.color } }) + .catch((err) => { + console.error(err) + }) responce.send({success: true, error: false}) } From a89c6d1de1eaddb652e62987194dd9c0e362a701 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 8 Oct 2020 12:13:00 +0100 Subject: [PATCH 2/5] Update --- server/server.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/server/server.js b/server/server.js index 789906a..9ccc6d9 100644 --- a/server/server.js +++ b/server/server.js @@ -23,7 +23,7 @@ var led_array = { app.get('/', function (request, responce) { - responce.render('index.ejs', {led_array:led_array}) + responce.render('index.ejs', { led_array: led_array }) }) @@ -44,10 +44,13 @@ app.post('/setlight', async function (request, responce) { color: led_array.color } }) - .catch((err) => { - console.error(err) - }) - responce.send({success: true, error: false}) + .catch((err) => { + console.error(err) + responce.send({ success: false, error: "NETWORK" }) + }) + .then(() => { + responce.send({ success: true, error: false }) + }) } else { @@ -62,7 +65,7 @@ app.post('/getlight', async function (request, responce) { brightness: led_array.brightness, color: led_array.color } - responce.send({led_array: rsp}) + responce.send({ led_array: rsp }) }) From 5f2a549387af1c6830923e8e87870917bfe7d3c5 Mon Sep 17 00:00:00 2001 From: Main server Date: Sat, 10 Oct 2020 17:35:06 +0100 Subject: [PATCH 3/5] updating ip --- server/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index 9ccc6d9..4e9694b 100644 --- a/server/server.js +++ b/server/server.js @@ -36,7 +36,7 @@ app.post('/setlight', async function (request, responce) { // Now make an api call to the led controller axios({ - url: 'http://192.168.0.23:5000/setState', + url: 'http://192.168.0.27:5000/setState', method: 'post', data: { power: led_array.power, From 62c585d11f2423c1bc1e2fb8f8b1649b7ea7c0c4 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 10 Oct 2020 17:37:24 +0100 Subject: [PATCH 4/5] Update --- server/server.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index 4e9694b..d868b8f 100644 --- a/server/server.js +++ b/server/server.js @@ -49,7 +49,23 @@ app.post('/setlight', async function (request, responce) { responce.send({ success: false, error: "NETWORK" }) }) .then(() => { - responce.send({ success: true, error: false }) + + axios({ + url: 'http://192.168.0.27:5000/setState', + method: 'post', + data: { + power: led_array.power, + brightness: led_array.brightness, + color: led_array.color + } + }) + .catch((err) => { + console.error(err) + responce.send({ success: false, error: "NETWORK" }) + }) + .then(() => { + responce.send({ success: true, error: false }) + }) }) } From 2537a08259fe89d5211531363b4628fc5dc84c07 Mon Sep 17 00:00:00 2001 From: Max Date: Sat, 10 Oct 2020 17:42:20 +0100 Subject: [PATCH 5/5] Update --- server/server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.js b/server/server.js index d868b8f..464d8df 100644 --- a/server/server.js +++ b/server/server.js @@ -51,7 +51,7 @@ app.post('/setlight', async function (request, responce) { .then(() => { axios({ - url: 'http://192.168.0.27:5000/setState', + url: 'http://192.168.0.23:5000/setState', method: 'post', data: { power: led_array.power,