Reduce program size (fits on Nano)

Author: budulinek

README.md

@@ -104,6 +104,6 @@ Not everything could fit into the limited flash memory of Arduino Nano / Uno. If
 
 <img src="/pics/modbus6.png" alt="06" style="zoom:100%;" />
 
-* #define ENABLE_EXTRA_DIAG  shows extra info on "Current status" page: per socket diagnostics, run time counter.
+* #define ENABLE_EXTRA_DIAG  shows extra info on "Current status" page: per socket diagnostics, run time counter, ethernet data counter.
 
 <img src="/pics/modbus1x.png" alt="01x" style="zoom:100%;" />

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

@@ -87,8 +87,10 @@ void recvUdp()
         Udp.write(highByte(crc));
       }
       Udp.endPacket();
+#ifdef ENABLE_EXTRA_DIAG
       ethTxCount += 5;
       if (!localConfig.enableRtuOverTcp) ethTxCount += 4;
+#endif /* ENABLE_EXTRA_DIAG */
     }
   }
 }
@@ -133,8 +135,10 @@ void recvTcp()
         client.write(lowByte(crc));        // send CRC, low byte first
         client.write(highByte(crc));
       }
+#ifdef ENABLE_EXTRA_DIAG
       ethTxCount += 5;
       if (!localConfig.enableRtuOverTcp) ethTxCount += 4;
+#endif /* ENABLE_EXTRA_DIAG */
     }
   }
 }

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

@@ -105,8 +105,10 @@ void recvSerial()
           Udp.write(serialIn, rxNdx - 2);      //send without CRC
         }
         Udp.endPacket();
+#ifdef ENABLE_EXTRA_DIAG
         ethTxCount += rxNdx;
         if (!localConfig.enableRtuOverTcp) ethTxCount += 4;
+#endif /* ENABLE_EXTRA_DIAG */
       } else if (queueHeaders.first().clientNum != SCAN_REQUEST) {
         EthernetClient client = EthernetClient(queueHeaders.first().clientNum);
         // make sure that this is really our socket
@@ -116,8 +118,10 @@ void recvSerial()
             client.write(MBAP, 6);
             client.write(serialIn, rxNdx - 2);      //send without CRC
           }
+#ifdef ENABLE_EXTRA_DIAG
           ethTxCount += rxNdx;
           if (!localConfig.enableRtuOverTcp) ethTxCount += 4;
+#endif /* ENABLE_EXTRA_DIAG */
         }
       }
       deleteRequest();
@@ -150,8 +154,10 @@ void recvSerial()
           Udp.write(highByte(crc));
         }
         Udp.endPacket();
+#ifdef ENABLE_EXTRA_DIAG
         ethTxCount += 5;
         if (!localConfig.enableRtuOverTcp) ethTxCount += 4;
+#endif /* ENABLE_EXTRA_DIAG */
       } else {
         EthernetClient client = EthernetClient(queueHeaders.first().clientNum);
         // make sure that this is really our socket
@@ -164,8 +170,10 @@ void recvSerial()
             client.write(lowByte(crc));        // send CRC, low byte first
             client.write(highByte(crc));
           }
+#ifdef ENABLE_EXTRA_DIAG
           ethTxCount += 5;
           if (!localConfig.enableRtuOverTcp) ethTxCount += 4;
+#endif /* ENABLE_EXTRA_DIAG */
         }
       }
       deleteRequest();

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

@@ -221,15 +221,15 @@ void contentStatus(ChunkedPrint &chunked)
   chunked.print(serialTxCount);
   chunked.print(F(" Tx bytes / "));
   chunked.print(serialRxCount);
-  chunked.print(F(" Rx bytes"
-                  "<tr><td>Ethernet Data:<td>"));
+  chunked.print(F(" Rx bytes"));
+
+#ifdef ENABLE_EXTRA_DIAG
+  chunked.print(F("<tr><td>Ethernet Data:<td>"));
   chunked.print(ethTxCount);
   chunked.print(F(" Tx bytes / "));
   chunked.print(ethRxCount);
-  chunked.print(F(" Rx bytes  (excl. WebUI)"));
-
-#ifdef ENABLE_EXTRA_DIAG
-  chunked.print(F("<tr><td colspan=2>"
+  chunked.print(F(" Rx bytes  (excl. WebUI)"
+                  "<tr><td colspan=2>"
                   "<table style=border-collapse:collapse;text-align:center>"
                   "<tr><td><td>Socket Mode<td>Socket Status<td>Local Port<td>Remote IP<td>Remote Port"));
   for (byte i = 0; i < maxSockNum ; i++) {

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

@@ -36,10 +36,11 @@
   v2.4 2021-10-15 Add SW version. Forced factory reset (load defaut settings from sketch) on MAJOR version change.
   v3.0 2021-11-07 Improve POST parameters processing, bugfix 404 and 204 error headers. 
   v3.1 2022-01-28 Code optimization, bugfix DHCP settings.
+  v3.2 2022-06-04 Reduce program size (so that it fits on Nano), ethernet data counter only available when ENABLE_EXTRA_DIAG.
 
 */
 
-const byte version[] = {3, 1};
+const byte version[] = {3, 2};
 
 #include <SPI.h>
 #include <Ethernet.h>