Code cleanup, remove debug code

Code intended for debugging was removed. Not useful anymore, limited abillities.

Author: budulinek

arduino-modbus-rtu-tcp-gateway/01-interfaces.ino

@@ -86,8 +86,6 @@ void startEthernet() {
   if (Ethernet.hardwareStatus() == EthernetW5100) {
     maxSockNum = 4;  // W5100 chip never supports more than 4 sockets
   }
-  dbg(F("[arduino] Server available at http://"));
-  dbgln(Ethernet.localIP());
 }
 
 void (*resetFunc)(void) = 0;  //declare reset function at address 0

arduino-modbus-rtu-tcp-gateway/04-webserver.ino

@@ -84,8 +84,6 @@ enum post_key : byte {
 void recvWeb() {
   EthernetClient client = webServer.available();
   if (client) {
-    dbg(F("[web in] Data from client "));
-
     char uri[smallbuffersize];  // the requested page
     // char requestParameter[smallbuffersize];      // parameter appended to the URI after a ?
     // char postParameter[smallbuffersize] {'\0'};         // parameter transmitted in the body / by POST
@@ -102,34 +100,19 @@ void recvWeb() {
       status = REQUEST;
       while (client.available()) {
         char c = client.read();
-        // dbg(c);     // Debug print received characters to Serial monitor
         if (c == '\n') {
           if (status == REQUEST)  // read the first line
           {
-            dbg(F("[web in] webInBuffer="));
-            dbgln(webInBuffer);
             // now split the input
             char *ptr;
             ptr = strtok(webInBuffer, " ");  // strtok willdestroy the newRequest
             ptr = strtok(NULL, " ");
             strlcpy(uri, ptr, sizeof(uri));  // enthält noch evtl. parameter
-            dbg(F("[web in] uri="));
-            dbgln(uri);
             status = EMPTY_LINE;                 // jump to next status
           } else if (status > REQUEST && i < 2)  // check if we have an empty line
           {
             status = BODY;
           }
-          //            else if (status == BODY)
-          //            {
-          //              dbg(F("[web] postParameter=")); dbgln(webInBuffer);
-          //              if (webInBuffer[0] != '\0') {
-          //                dbg(F("[web] Processing POST"));
-          //                processPost(webInBuffer);
-          //              }
-          //              // strlcpy(postParameter, webInBuffer, sizeof(postParameter));
-          //              break; // we have received one line payload and break out
-          //            }
           i = 0;
           memset(webInBuffer, 0, sizeof(webInBuffer));
         } else {
@@ -143,8 +126,6 @@ void recvWeb() {
       }
       if (status == BODY)  // status 3 could end without linefeed, therefore we takeover here also
       {
-        dbg(F("[web in] POST data="));
-        dbgln(webInBuffer);
         if (webInBuffer[0] != '\0') {
           processPost(webInBuffer);
         }
@@ -350,7 +331,6 @@ void processPost(char postParameter[]) {
   // new parameter values received, save them to EEPROM
   EEPROM.put(configStart + 1, localConfig);  // it is safe to call, only changed values are updated
   if (action == SERIAL_SOFT) {               // can do it without "please wait" page
-    dbgln(F("[serial] reload Serial"));
     Serial.flush();
     Serial.end();
     startSerial();

arduino-modbus-rtu-tcp-gateway/05-pages.ino

@@ -29,7 +29,6 @@ const byte webOutBufferSize = 128;  // size of web server write buffer (used by
 void sendPage(EthernetClient &client, byte reqPage) {
   char webOutBuffer[webOutBufferSize];
   ChunkedPrint chunked(client, webOutBuffer, sizeof(webOutBuffer));  // the StreamLib object to replace client print
-  dbgln(F("[web out] 200 response send"));
   chunked.print(F("HTTP/1.1 200 OK\r\n"
                   "Connection: close\r\n"
                   "Content-Type: text/html\r\n"
@@ -629,15 +628,12 @@ void helperStats(ChunkedPrint &chunked, const byte stat) {
 }
 
 void send404(EthernetClient &client) {
-  dbgln(F("[web out] response 404 file not found"));
   client.println(F("HTTP/1.1 404 Not Found\r\n"
                    "Content-Length: 0"));
   client.stop();
 }
 
-
 void send204(EthernetClient &client) {
-  dbgln(F("[web out] response 204 no content"));
   client.println(F("HTTP/1.1 204 No content"));
   client.stop();
 }

arduino-modbus-rtu-tcp-gateway/arduino-modbus-rtu-tcp-gateway.ino

@@ -58,7 +58,7 @@ const byte version[] = { 4, 0 };
 
 /****** ADVANCED SETTINGS ******/
 
-const byte maxQueueRequests = 10;                                // max number of TCP or UDP requests stored in a queue
+const byte maxQueueRequests = 10;                             // max number of TCP or UDP requests stored in a queue
 const int maxQueueData = 256;                                 // total length of TCP or UDP requests stored in a queue (in bytes)
 const byte maxSlaves = 247;                                   // max number of Modbus slaves (Modbus supports up to 247 slaves, the rest is for reserved addresses)
 const int modbusSize = 256;                                   // size of a MODBUS RTU frame (determines size of serialInBuffer and tcpInBuffer)
@@ -148,13 +148,7 @@ const byte MAC_START[3] = { 0x90, 0xA2, 0xDA };
 EthernetUDP Udp;
 EthernetServer modbusServer(502);
 EthernetServer webServer(80);
-#ifdef DEBUG
-#define dbg(x...) debugSerial.print(x);
-#define dbgln(x...) debugSerial.println(x);
-#else /* DEBUG */
-#define dbg(x...) ;
-#define dbgln(x...) ;
-#endif                     /* DEBUG */
+
 #define UDP_REQUEST 0xFF   // We store these codes in "header.clientNum" in order to differentiate
 #define SCAN_REQUEST 0xFE  // between TCP requests (their clientNum is nevew higher than 0x07), UDP requests and scan requests (triggered by scan button)
 
@@ -251,14 +245,8 @@ void setup() {
     EEPROM.write(configStart, version[0]);
     EEPROM.put(configStart + 1, localConfig);
   }
-
-#ifdef DEBUG
-  debugSerial.begin(localConfig.baud);  // same baud as RS485
-#endif                                  /* DEBUG */
-
   startSerial();
   startEthernet();
-  dbgln(F("\n[arduino] Starting..."));
 }
 
 /****** LOOP ******/
@@ -267,12 +255,8 @@ void loop() {
   recvUdp();
   recvTcp();
   processRequests();
-
-#ifndef DEBUG
   sendSerial();
   recvSerial();
-#endif /* DEBUG */
-
   recvWeb();
 
 #ifdef ENABLE_DHCP