Browse Source

Renamed channels

software_develop
elamre 7 years ago
parent
commit
e91588c8e8
  1. 12
      software/app/web_interface.cpp
  2. 16
      software/files/index.html

12
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);

16
software/files/index.html

@ -35,10 +35,10 @@
<div class="col-xs-10 col-md-5">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Channel 0</h3>
<h3 class="panel-title">Channel 1</h3>
</div>
<div class="panel-body">
<h1 id="adc_0" class="text-center main">{adc_0}</h1>
<h1 id="adc_0" class="text-center main">{adc_1}</h1>
</div>
</div>
</div>
@ -47,10 +47,10 @@
<div class="col-xs-10 col-md-5">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Channel 1</h3>
<h3 class="panel-title">Channel 2</h3>
</div>
<div class="panel-body">
<h1 id="adc_1" class="text-center main">{adc_1}</h1>
<h1 id="adc_1" class="text-center main">{adc_2}</h1>
</div>
</div>
</div>
@ -61,10 +61,10 @@
<div class="col-xs-10 col-md-5">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Channel 2</h3>
<h3 class="panel-title">Channel 3</h3>
</div>
<div class="panel-body">
<h1 id="adc_2" class="text-center main">{adc_2}</h1>
<h1 id="adc_2" class="text-center main">{adc_3}</h1>
</div>
</div>
</div>
@ -73,10 +73,10 @@
<div class="col-xs-10 col-md-5">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Channel 3</h3>
<h3 class="panel-title">Channel 4</h3>
</div>
<div class="panel-body">
<h1 id="adc_3" class="text-center main">{adc_3}</h1>
<h1 id="adc_3" class="text-center main">{adc_4}</h1>
</div>
</div>
</div>

Loading…
Cancel
Save