Merge branch 'main' into portentas_compatibility

aentinger · aentinger · commit 27e8c19e8ddb · 2024-10-15T13:10:11.000+02:00
diff --git a/.github/workflows/arduino-lint.yml b/.github/workflows/arduino-lint.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Arduino Lint
-        uses: arduino/arduino-lint-action@v1
+        uses: arduino/arduino-lint-action@v2
         with:
           official: true
           project-type: library
diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
@@ -42,6 +42,9 @@ jobs:
           - fqbn: arduino:renesas_uno:unor4wifi
             platforms: |
               - name: arduino:renesas_uno
+          - fqbn: arduino:mbed_giga:giga
+            platforms: |
+              - name: arduino:mbed_giga
 
     steps:
       - name: Checkout
diff --git a/examples/UDP_Client/UDP_Client.ino b/examples/UDP_Client/UDP_Client.ino
@@ -29,18 +29,20 @@ static T1SMacSettings const t1s_default_mac_settings;
 static IPAddress const UDP_SERVER_IP_ADDR = {192, 168,  42, 100 + 0};
 static uint16_t const UDP_CLIENT_PORT = 8889;
 static uint16_t const UDP_SERVER_PORT = 8888;
-static uint8_t udp_tx_msg_buf[256] = {0};
-static uint8_t udp_rx_msg_buf[256] = {0};
 
 /**************************************************************************************
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI
-    , CS_PIN
-    , RESET_PIN
-    , IRQ_PIN);
+auto const tc6_io = new TC6::TC6_Io(
+#ifdef ARDUINO_GIGA
+  SPI1
+#else
+  SPI
+#endif
+  , CS_PIN
+  , RESET_PIN
+  , IRQ_PIN);
 auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
 Arduino_10BASE_T1S_UDP udp_client;
 
@@ -123,6 +125,7 @@ void loop()
     prev_udp_packet_sent = now;
 
     /* Prepare UDP packet. */
+    uint8_t udp_tx_msg_buf[256] = {0};
     int const tx_packet_size = snprintf((char *)udp_tx_msg_buf, sizeof(udp_tx_msg_buf), "Single-Pair Ethernet / 10BASE-T1S: packet cnt = %d", tx_packet_cnt);
 
     /* Send a UDP packet to the UDP server. */
@@ -143,24 +146,34 @@ void loop()
   int const rx_packet_size = udp_client.parsePacket();
   if (rx_packet_size)
   {
-    /* Receive incoming UDP packets. */
-    Serial.print("Received ");
+    /* Print some metadata from received UDP packet. */
+    Serial.print("[");
+    Serial.print(millis());
+    Serial.print("] Received ");
     Serial.print(rx_packet_size);
     Serial.print(" bytes from ");
     Serial.print(udp_client.remoteIP());
     Serial.print(" port ");
     Serial.print(udp_client.remotePort());
-    Serial.println();
-
-    int const bytes_read = udp_client.read(udp_rx_msg_buf, sizeof(udp_rx_msg_buf));
-    if (bytes_read > 0) {
-      udp_rx_msg_buf[bytes_read] = 0;
+    Serial.print(", data = \"");
+
+    /* Read from received UDP packet. */
+    size_t const UDP_RX_MSG_BUF_SIZE = 16 + 1; /* Reserve the last byte for the '\0' termination. */
+    uint8_t udp_rx_msg_buf[UDP_RX_MSG_BUF_SIZE] = {0};
+    int bytes_read = udp_client.read(udp_rx_msg_buf, UDP_RX_MSG_BUF_SIZE - 1);
+    while(bytes_read != 0)
+    {
+      /* Print received data to Serial. */
+      udp_rx_msg_buf[bytes_read] = '\0'; /* Terminate buffer so that we can print it as a C-string. */
+      Serial.print(reinterpret_cast<char *>(udp_rx_msg_buf));
+
+      /* Continue reading. */
+      bytes_read = udp_client.read(udp_rx_msg_buf, UDP_RX_MSG_BUF_SIZE - 1);
     }
-    Serial.print("[");
-    Serial.print(millis());
-    Serial.print("] UDP_Client received packet content: \"");
-    Serial.print(reinterpret_cast<char *>(udp_rx_msg_buf));
     Serial.println("\"");
+
+    /* Finish reading the current packet. */
+    udp_client.flush();
   }
 }
 
diff --git a/examples/UDP_Server/UDP_Server.ino b/examples/UDP_Server/UDP_Server.ino
@@ -33,17 +33,20 @@ static T1SPlcaSettings const t1s_plca_settings{T1S_PLCA_NODE_ID};
 static T1SMacSettings const t1s_default_mac_settings;
 
 static uint16_t const UDP_SERVER_LOCAL_PORT = 8888;
-static uint8_t udp_rx_msg_buf[256] = {0};
 
 /**************************************************************************************
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI
-    , CS_PIN
-    , RESET_PIN
-    , IRQ_PIN);
+auto const tc6_io = new TC6::TC6_Io(
+#ifdef ARDUINO_GIGA
+  SPI1
+#else
+  SPI
+#endif
+  , CS_PIN
+  , RESET_PIN
+  , IRQ_PIN);
 auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
 Arduino_10BASE_T1S_UDP udp_server;
 
@@ -119,34 +122,52 @@ void loop()
   }
 
   /* Check for incoming UDP packets. */
-  int const packet_size = udp_server.parsePacket();
-  if (packet_size)
+  int const rx_packet_size = udp_server.parsePacket();
+  if (rx_packet_size)
   {
-    /* Receive incoming UDP packets. */
-    Serial.print("Received ");
-    Serial.print(packet_size);
+    std::vector<uint8_t> udp_tx_buf;
+    IPAddress const destination_ip = udp_server.remoteIP();
+    uint16_t const destination_port = udp_server.remotePort();
+
+    /* Print some metadata from received UDP packet. */
+    Serial.print("[");
+    Serial.print(millis());
+    Serial.print("] Received ");
+    Serial.print(rx_packet_size);
     Serial.print(" bytes from ");
     Serial.print(udp_server.remoteIP());
     Serial.print(" port ");
     Serial.print(udp_server.remotePort());
-    Serial.println();
-
-    int const bytes_read = udp_server.read(udp_rx_msg_buf, sizeof(udp_rx_msg_buf));
-    if (bytes_read > 0) {
-      udp_rx_msg_buf[bytes_read] = 0;
+    Serial.print(", data = \"");
+
+    /* Read from received UDP packet. */
+    size_t const UDP_RX_MSG_BUF_SIZE = 16 + 1; /* Reserve the last byte for the '\0' termination. */
+    uint8_t udp_rx_msg_buf[UDP_RX_MSG_BUF_SIZE] = {0};
+    int bytes_read = udp_server.read(udp_rx_msg_buf, UDP_RX_MSG_BUF_SIZE - 1);
+    while(bytes_read != 0)
+    {
+      /* Copy received data into transmit buffer for echo functionality. */
+      std::copy(udp_rx_msg_buf, udp_rx_msg_buf + bytes_read, std::back_inserter(udp_tx_buf));
+
+      /* Print received data to Serial. */
+      udp_rx_msg_buf[bytes_read] = '\0'; /* Terminate buffer so that we can print it as a C-string. */
+      Serial.print(reinterpret_cast<char *>(udp_rx_msg_buf));
+
+      /* Continue reading. */
+      bytes_read = udp_server.read(udp_rx_msg_buf, UDP_RX_MSG_BUF_SIZE - 1);
     }
-    Serial.print("UDP_Server received packet content: \"");
-    Serial.print(reinterpret_cast<char *>(udp_rx_msg_buf));
     Serial.println("\"");
 
+    /* Finish reading the current packet. */
+    udp_server.flush();
+
     /* Send back a reply, to the IP address and port we got the packet from. */
-    udp_server.beginPacket(udp_server.remoteIP(), udp_server.remotePort());
-    udp_server.write((const uint8_t *)udp_rx_msg_buf, packet_size);
+    udp_server.beginPacket(destination_ip, destination_port);
+    udp_server.write(udp_tx_buf.data(), udp_tx_buf.size());
     udp_server.endPacket();
   }
 }
 
-
 static void OnPlcaStatus(bool success, bool plcaStatus)
 {
   if (!success)
diff --git a/examples/iperf-client/iperf-client.ino b/examples/iperf-client/iperf-client.ino
@@ -41,19 +41,15 @@ static T1SMacSettings const t1s_mac_settings{MAC_PROMISCUOUS_MODE, MAC_TX_CUT_TH
  * GLOBAL VARIABLES
  **************************************************************************************/
 
+auto const tc6_io = new TC6::TC6_Io(
 #ifdef ARDUINO_GIGA
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI1
-  , CS_PIN
-  , RESET_PIN
-  , IRQ_PIN);
+  SPI1
 #else
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI
+  SPI
+#endif
   , CS_PIN
   , RESET_PIN
   , IRQ_PIN);
-#endif
 auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
 
 /**************************************************************************************
diff --git a/examples/tools/Control-DIOx/Control-DIOx.ino b/examples/tools/Control-DIOx/Control-DIOx.ino
@@ -35,11 +35,15 @@ static auto const DIO_PIN = TC6::DIO::A0;
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI
-    , CS_PIN
-    , RESET_PIN
-    , IRQ_PIN);
+auto const tc6_io = new TC6::TC6_Io(
+#ifdef ARDUINO_GIGA
+  SPI1
+#else
+  SPI
+#endif
+  , CS_PIN
+  , RESET_PIN
+  , IRQ_PIN);
 auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
 
 /**************************************************************************************
diff --git a/examples/tools/PoDL-Sink-Auto-TurnOff/PoDL-Sink-Auto-TurnOff.ino b/examples/tools/PoDL-Sink-Auto-TurnOff/PoDL-Sink-Auto-TurnOff.ino
@@ -32,11 +32,15 @@ static T1SMacSettings const t1s_default_mac_settings;
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI
-    , CS_PIN
-    , RESET_PIN
-    , IRQ_PIN);
+auto const tc6_io = new TC6::TC6_Io(
+#ifdef ARDUINO_GIGA
+  SPI1
+#else
+  SPI
+#endif
+  , CS_PIN
+  , RESET_PIN
+  , IRQ_PIN);
 auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
 
 /**************************************************************************************
diff --git a/examples/tools/PoDL-Source/PoDL-Source.ino b/examples/tools/PoDL-Source/PoDL-Source.ino
@@ -32,11 +32,15 @@ static T1SMacSettings const t1s_default_mac_settings;
  * GLOBAL VARIABLES
  **************************************************************************************/
 
-auto const tc6_io = new TC6::TC6_Io
-  ( SPI
-    , CS_PIN
-    , RESET_PIN
-    , IRQ_PIN);
+auto const tc6_io = new TC6::TC6_Io(
+#ifdef ARDUINO_GIGA
+  SPI1
+#else
+  SPI
+#endif
+  , CS_PIN
+  , RESET_PIN
+  , IRQ_PIN);
 auto const tc6_inst = new TC6::TC6_Arduino_10BASE_T1S(tc6_io);
 
 /**************************************************************************************
diff --git a/src/Arduino_10BASE_T1S_UDP.cpp b/src/Arduino_10BASE_T1S_UDP.cpp
diff --git a/src/Arduino_10BASE_T1S_UDP.h b/src/Arduino_10BASE_T1S_UDP.h
diff --git a/src/lib/liblwip/cfg/lwipopts.h b/src/lib/liblwip/cfg/lwipopts.h
diff --git a/src/lib/lwip_sys_now.cpp b/src/lib/lwip_sys_now.cpp
