Index: firmware/InterlockArduino/src/webserver/webserver.ino
===================================================================
--- firmware/InterlockArduino/src/webserver/webserver.ino (revision 14512)
+++ firmware/InterlockArduino/src/webserver/webserver.ino (revision 14513)
@@ -77,5 +77,5 @@
"cam_on",
"cam_off",
- "drive_toggle"};
+ "dt"}; // read drive_toggle
// outputs
@@ -108,5 +108,6 @@
void setup() {
// Open serial communications and wait for port to open:
- Serial.begin(9600);
+// Serial.begin(9600);
+ Serial.begin(19200);
@@ -166,6 +167,9 @@
{
eth += c;
- //Serial.write(c);
- //Serial.println(eth.length(), DEC);
+ Serial.write(c);
+ Serial.print(' ');
+ Serial.print(c, HEX);
+ Serial.print(' ');
+ Serial.println(eth.length(), DEC);
if ( eth.indexOf('\n') != -1 )
{
@@ -173,5 +177,6 @@
{
get_http_found = true;
- if (eth.indexOf(String("cam_on=")) !=-1){
+ // -- Cam on --
+ if (eth.indexOf(String(button_name[0])) !=-1){
Serial.println("User request: Enable Pump");
digitalWrite( FC_ON, HIGH);
@@ -179,5 +184,6 @@
fc_on_time += 3000;
}
- else if (eth.indexOf(String("cam_off=")) !=-1)
+ // -- Cam Off --
+ else if (eth.indexOf(String(button_name[1])) !=-1)
{
Serial.println("User request: Disable Pump");
@@ -185,5 +191,6 @@
fc_off_time = 500;
}
- else if (eth.indexOf(String("drive_toggle=")) !=-1)
+ // -- Drive Toggle --
+ else if (eth.indexOf(String(button_name[2])) !=-1)
{
Serial.println("User request: Toggle Drive");
@@ -204,5 +211,5 @@
}
- //Serial.println("found it");
+ Serial.println("found it");
}
}
@@ -243,17 +250,17 @@
{
// send a standard http response header
- client->println("HTTP/1.1 200 OK");
- client->println("Content-Type: text/html");
- client->println("Connnection: close");
- client->println();
- client->println("");
- client->println("");
+ client->print("HTTP/1.1 200 OK\n");
+ client->print("Content-Type: text/html\n");
+ client->print("Connnection: close\n");
+ client->print("\n");
+ client->print("\n");
+ client->print("\n");
// add a meta refresh tag, so the browser pulls again every 5 seconds:
- client->println("");
- client->println("");
-
- client->println("FACT camera power interlock control");
- client->println("