Index: firmware/InterlockArduino/src/webserver/webserver.ino
===================================================================
--- firmware/InterlockArduino/src/webserver/webserver.ino (revision 14511)
+++ firmware/InterlockArduino/src/webserver/webserver.ino (revision 14512)
@@ -52,12 +52,15 @@
//char * my_input_names[] = {"FC_OK", "BP_ON", "IL_ON", "FL_OK", "FP_EN", "X_ON", "Y_ON", "Z_OK"};
-char * my_input_names[] = { "Is the cooling liquid flow meter measuring enough throuput?",
- "Is Bias Power enabled?",
- "Is 24VDC Interlock power supply enabled?",
- "Is the Level of the cooling liquid ok?",
- "Is the Pump powered?",
- "Is the Drive Cabinet Enable Signal on?",
- "Is the Drive Cabinet Power Signal on?",
- "Is Drive Container Enabled?"};
+char * my_input_names[] = { "Is the cooling liquid flow meter measuring enough throuput? ",
+ "Is Bias Power enabled? ",
+ "Is 24VDC Interlock power supply enabled? ",
+ "Is the Level of the cooling liquid ok? ",
+ "Is the Pump powered? ",
+ "
Is the Drive Cabinet Enable Signal on? ",
+ "Is the Drive Cabinet Power Signal on? ",
+ "Is Drive Container Enabled? "};
+
+char * my_input_span_id[] = {"flow_meter", "bias_power", "power_24v", "level", "pump", "drive_enable", "drive_power", "drive_on"};
+
int Number_of_Buttons = 3;
// This is in HTML called the VALUE of the button,
@@ -170,5 +173,5 @@
{
get_http_found = true;
- if (eth.indexOf(String("pump_on=")) !=-1){
+ if (eth.indexOf(String("cam_on=")) !=-1){
Serial.println("User request: Enable Pump");
digitalWrite( FC_ON, HIGH);
@@ -176,5 +179,5 @@
fc_on_time += 3000;
}
- else if (eth.indexOf(String("pump_off=")) !=-1)
+ else if (eth.indexOf(String("cam_off=")) !=-1)
{
Serial.println("User request: Disable Pump");
@@ -182,5 +185,5 @@
fc_off_time = 500;
}
- else if (eth.indexOf(String("toggle_drive=")) !=-1)
+ else if (eth.indexOf(String("drive_toggle=")) !=-1)
{
Serial.println("User request: Toggle Drive");
@@ -248,5 +251,6 @@
// add a meta refresh tag, so the browser pulls again every 5 seconds:
- client->print("");
+ client->println("");
+ client->println("");
client->println("FACT camera power interlock control");
@@ -260,15 +264,19 @@
client->print(my_input_names[ch]);
client->print(" :");
- client->print(my_inputs[ch]);
- client->print(" is ");
+ client->print(" ");
+ client->print("print(my_input_span_id[ch]);
+ client->print("\" title=\"");
if ( digitalRead(my_inputs[ch]) )
{
- client->print("HIGH");
+ client->print("1\"> Yes");
+ //client->print(" Yes ");
}
else
{
- client->print("LOW");
+ client->print("0\"> No ");
+ //client->print(" No ");
}
- client->println("
");
+ client->println("
");
}
}