From e91588c8e8e2e51c891bfe6d4492f42283e1cc2a Mon Sep 17 00:00:00 2001 From: elamre Date: Fri, 11 Aug 2017 10:53:18 +0200 Subject: [PATCH] Renamed channels --- software/app/web_interface.cpp | 12 ++++++------ software/files/index.html | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/software/app/web_interface.cpp b/software/app/web_interface.cpp index d8adc47..9e4dab0 100644 --- a/software/app/web_interface.cpp +++ b/software/app/web_interface.cpp @@ -69,14 +69,14 @@ void cWebInterface::OnRefresh(HttpRequest &request, HttpResponse &response) { JsonObjectStream* stream = new JsonObjectStream(); JsonObject& json = stream->getRoot(); - json["adc_0"] = m_adc_value[0]; - json["adc_1"] = m_adc_value[1]; + json["adc_1"] = m_adc_value[0]; + json["adc_2"] = m_adc_value[1]; #ifdef REV_1 - json["adc_2"] = m_adc_value[3]; - json["adc_3"] = m_adc_value[2]; -#else - json["adc_2"] = m_adc_value[2]; json["adc_3"] = m_adc_value[3]; + json["adc_4"] = m_adc_value[2]; +#else + json["adc_3"] = m_adc_value[2]; + json["adc_4"] = m_adc_value[3]; #endif response.sendJsonObject(stream); diff --git a/software/files/index.html b/software/files/index.html index 8b9a876..8e0bfb0 100644 --- a/software/files/index.html +++ b/software/files/index.html @@ -35,10 +35,10 @@
-

Channel 0

+

Channel 1

-

{adc_0}

+

{adc_1}

@@ -47,10 +47,10 @@
-

Channel 1

+

Channel 2

-

{adc_1}

+

{adc_2}

@@ -61,10 +61,10 @@
-

Channel 2

+

Channel 3

-

{adc_2}

+

{adc_3}

@@ -73,10 +73,10 @@
-

Channel 3

+

Channel 4

-

{adc_3}

+

{adc_4}