Skip to content
Snippets Groups Projects
Commit 1cee3683 authored by Kyrre Ness Sjobaek's avatar Kyrre Ness Sjobaek
Browse files

Prolong waiting time for SPC data to something that experimentally works,... 

Prolong waiting time for SPC data to something that experimentally works, print 3 digits after decimal (down to mm), make WEB update interval a variable.
parent 65977fe5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 13 deletions
PositionGaugeServer.ino
+ 17
− 13
View file @ 1cee3683
...@@ -52,9 +52,12 @@ IPAddress subnet(255, 255, 0, 0); ...@@ -52,9 +52,12 @@ IPAddress subnet(255, 255, 0, 0);
#endif #endif
// ***** OTHER CONFIG *************************** // ***** OTHER CONFIG ***************************
const unsigned long update_interval = 1000; //[ms] const unsigned long update_interval = 1000; //[ms] How often to loop
const unsigned long SPC_timeout = 5; //[ms] 260 us per 4-bit word, 13 words, plus some buffer // (poll sensors, check for new network clients,
const unsigned long WEB_timeout = 600; //[ms] Max time allowed waiting for web client // feed data to network clients, DHCP housekeeping)
const unsigned long WEB_update_interval = 5; //[s] WEB requests are heavy, not too often is good.
const unsigned long SPC_timeout = 100; //[ms] Experimentally verified to be OK.
const unsigned long WEB_timeout = 600; //[ms] Max time allowed waiting for web client
// ***** GLOBAL VARIABLES *********************** // ***** GLOBAL VARIABLES ***********************
...@@ -267,7 +270,7 @@ void readSPCdummy(uint8_t ch) { ...@@ -267,7 +270,7 @@ void readSPCdummy(uint8_t ch) {
Serial.print("Update on ch #"); Serial.print("Update on ch #");
Serial.print(ch); Serial.print(ch);
Serial.print(", new value = "); Serial.print(", new value = ");
Serial.print(measData[ch]); Serial.print(measData[ch],3);
Serial.print(", IsValid = "); Serial.print(", IsValid = ");
Serial.println(measDataIsValid[ch]); Serial.println(measDataIsValid[ch]);
} }
...@@ -379,7 +382,7 @@ void readSPCinstrument(uint8_t ch) { ...@@ -379,7 +382,7 @@ void readSPCinstrument(uint8_t ch) {
} }
Serial.print(" converted="); Serial.print(" converted=");
Serial.print(newMeasData); Serial.print(newMeasData,3);
if (isMM){ if (isMM){
Serial.println("[mm]"); Serial.println("[mm]");
} }
...@@ -437,7 +440,7 @@ void HTTPserver () { ...@@ -437,7 +440,7 @@ void HTTPserver () {
client.println("HTTP/1.1 200 OK"); client.println("HTTP/1.1 200 OK");
client.println("Content-Type: text/html"); client.println("Content-Type: text/html");
client.println("Connection: close"); // the connection will be closed after completion of the response client.println("Connection: close"); // the connection will be closed after completion of the response
client.println("Refresh: 5"); // refresh the page automatically every 5 sec client.print("Refresh: "); client.println(WEB_update_interval); // refresh the page automatically every WEB_update_interval sec
client.println(); client.println();
client.println("<!DOCTYPE HTML>"); client.println("<!DOCTYPE HTML>");
client.println("<html>"); client.println("<html>");
...@@ -445,10 +448,11 @@ void HTTPserver () { ...@@ -445,10 +448,11 @@ void HTTPserver () {
client.println("<H1>PositionGaugeServer</H1>"); client.println("<H1>PositionGaugeServer</H1>");
client.println("<p>"); client.println("<p>");
client.print("IP address: "); client.print(Ethernet.localIP()); client.println("<br>"); client.print("IP address: "); client.print(Ethernet.localIP()); client.println("<br>");
client.print("No. channels: "); client.print(numCh); client.println("<br>"); client.print("No. channels: "); client.print(numCh); client.println("<br>");
client.print("Update interval "); client.print(update_interval); client.println(" [ms]<br>"); client.print("Update interval "); client.print(update_interval); client.println(" [ms]<br>");
client.print("Time: "); client.print(millis()); client.println(" [ms]<br>"); client.print("WEB update interval "); client.print(WEB_update_interval); client.println(" [s]<br>");
client.print("Internal time: "); client.print(millis()); client.println(" [ms]<br>");
client.println("</p>"); client.println("</p>");
...@@ -461,7 +465,7 @@ void HTTPserver () { ...@@ -461,7 +465,7 @@ void HTTPserver () {
client.println("<p>"); client.println("<p>");
client.print("Value = "); client.print("Value = ");
client.print(measData[ch]); client.print(measData[ch],3);
if (measDataIsMm[ch]) { if (measDataIsMm[ch]) {
client.print(" mm"); client.print(" mm");
} }
...@@ -550,7 +554,7 @@ void TXTserver (uint8_t ch) { ...@@ -550,7 +554,7 @@ void TXTserver (uint8_t ch) {
//clients[i].println(ch); //clients[i].println(ch);
//Feed the new client some data right away //Feed the new client some data right away
clients[i].print(measData[ch]); clients[i].print(measData[ch],3);
if (measDataIsValid[ch]) { if (measDataIsValid[ch]) {
if (measDataIsMm[ch]) { if (measDataIsMm[ch]) {
clients[i].println("mm"); clients[i].println("mm");
...@@ -588,7 +592,7 @@ void TXTserver (uint8_t ch) { ...@@ -588,7 +592,7 @@ void TXTserver (uint8_t ch) {
if (measDataFresh[ch]) { if (measDataFresh[ch]) {
for (byte i = 0; i < MAX_SOCK_NUM; i++) { for (byte i = 0; i < MAX_SOCK_NUM; i++) {
if (clients[i] && (clients_ch[i]==ch)) { if (clients[i] && (clients_ch[i]==ch)) {
clients[i].print(measData[ch]); clients[i].print(measData[ch],3);
if (measDataIsValid[ch]) { if (measDataIsValid[ch]) {
if (measDataIsMm[ch]) { if (measDataIsMm[ch]) {
clients[i].println("mm"); clients[i].println("mm");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment