dashboard gauge settings wip
This commit is contained in:
parent
393812cf85
commit
74606207b0
2 changed files with 57 additions and 2 deletions
include/Webserver
|
@ -1023,7 +1023,7 @@ String Proc_WebPage_grow_dashboard(const String& var) {
|
|||
|
||||
/* Charts */
|
||||
} else if(var == "TR_TD_CHART") {
|
||||
String html;
|
||||
String html;
|
||||
for(byte i = 0; i < Max_Dashboard_Chart; i++) {
|
||||
if(config.grow.dashboard.chartConfigured[i] == true) {
|
||||
html += F("<tr><td>");
|
||||
|
@ -1084,6 +1084,61 @@ String html;
|
|||
return html;
|
||||
} else if(var == "TR_TD_DATA") {
|
||||
String html;
|
||||
for(byte i = 0; i < Max_Sensors; i++) {
|
||||
if(config.grow.dashboard.dataConfigured[i] == true) {
|
||||
html += F("<tr><td>");
|
||||
html += i;
|
||||
html += F("</td><td>");
|
||||
html += config.system.sensor.name[config.grow.dashboard.dataSensor[i]];
|
||||
html += F("</td><td>");
|
||||
|
||||
String unit;
|
||||
//html += FPSTR(Sensor_Read_descr[SensorIndex[config.system.sensor.type[config.grow.dashboard.gaugeSensor[i]]].read[config.grow.dashboard.gaugeRead[i]]]);
|
||||
/* when RAW convert is set, use this for description. Otherwise use RAW*/
|
||||
if((SensorIndex[config.system.sensor.type[config.grow.dashboard.dataSensor[i]]].read[config.grow.dashboard.dataRead[i]] == SENSOR_READ_TYPE_RAW) && (config.system.sensor.rawConvert[config.grow.dashboard.dataSensor[i]][config.grow.dashboard.dataRead[i]] > 0)) {
|
||||
html += FPSTR(Sensor_Convert_Raw_descr[config.system.sensor.rawConvert[config.grow.dashboard.dataSensor[i]][config.grow.dashboard.dataRead[i]]]);
|
||||
unit = FPSTR(Sensor_Convert_Raw_unit[config.system.sensor.rawConvert[config.grow.dashboard.dataSensor[i]][config.grow.dashboard.dataRead[i]]]);
|
||||
} else {
|
||||
html += FPSTR(Sensor_Read_descr[SensorIndex[config.system.sensor.type[config.grow.dashboard.dataSensor[i]]].read[config.grow.dashboard.dataRead[i]]]);
|
||||
unit = FPSTR(Sensor_Read_unit[SensorIndex[config.system.sensor.type[config.grow.dashboard.dataSensor[i]]].read[config.grow.dashboard.dataRead[i]]]);
|
||||
}
|
||||
html += F("</td><td>");
|
||||
//html += config.grow.dashboard.dataColor[i];
|
||||
html += Sensor_getCalibratedValue(config.grow.dashboard.dataSensor[i], config.grow.dashboard.dataRead[i]);
|
||||
html += " ";
|
||||
|
||||
unit.replace(F("%"), F("%"));
|
||||
html += unit;
|
||||
html += F("</td><td>");
|
||||
// edit button
|
||||
html += F("<form class='linkForm' action='/grow/dashboard/dataAdd' method='get'>");
|
||||
html += F("<input type='hidden' name='edit' value='");
|
||||
html += i;
|
||||
html += F("'>");
|
||||
html += F("<input type='submit' value='✏️' title='Edit'></form> ");
|
||||
// delete button
|
||||
html += F("<form class='linkForm' action='/grow/dashboard/' method='post'>");
|
||||
html += F("<input type='hidden' name='delete_data' value='");
|
||||
html += i;
|
||||
html += F("'>");
|
||||
html += F("<input type='submit' value='❌' onclick=\"return confirmDelete('");
|
||||
html += F("data for ");
|
||||
html += config.system.sensor.name[config.grow.dashboard.dataSensor[i]];
|
||||
html += F(" ");
|
||||
|
||||
|
||||
//html += FPSTR(Sensor_Read_descr[SensorIndex[config.system.sensor.type[config.grow.dashboard.gaugeSensor[i]]].read[config.grow.dashboard.gaugeRead[i]]]);
|
||||
/* when RAW convert is set, use this for description. Otherwise use RAW*/
|
||||
if((SensorIndex[config.system.sensor.type[config.grow.dashboard.dataSensor[i]]].read[config.grow.dashboard.dataRead[i]] == SENSOR_READ_TYPE_RAW) && (config.system.sensor.rawConvert[config.grow.dashboard.dataSensor[i]][config.grow.dashboard.dataRead[i]] > 0)) {
|
||||
html += FPSTR(Sensor_Convert_Raw_descr[config.system.sensor.rawConvert[config.grow.dashboard.dataSensor[i]][config.grow.dashboard.dataRead[i]]]);
|
||||
} else {
|
||||
html += FPSTR(Sensor_Read_descr[SensorIndex[config.system.sensor.type[config.grow.dashboard.dataSensor[i]]].read[config.grow.dashboard.dataRead[i]]]);
|
||||
}
|
||||
|
||||
html += F("')\" title='Delete'></form>");
|
||||
html += F("</td></tr>");
|
||||
}
|
||||
}
|
||||
return html;
|
||||
} else {
|
||||
return String();
|
||||
|
|
|
@ -120,7 +120,7 @@ const char Page_grow_dashboard_HTML[] PROGMEM = R"(%HEADER%
|
|||
<hr>
|
||||
|
||||
<h3>Data</h3>
|
||||
<a class='button %ADD_DISABLED%' href='/system/sensor/add'>➕ Add data</a>
|
||||
<a class='button %ADD_DISABLED%' href='/grow/dashboard/dataAdd'>➕ Add data</a>
|
||||
<table class='centered'>
|
||||
<tr>
|
||||
<th> </th>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue