Updated ethernet stuff based on review. Also changed queue timing a bit

Author: bjackson312006

Core/Inc/u_config.h

@@ -33,5 +33,9 @@
     } \
 } while(0)
 
+/* Time and tick conversions */
+#define MS_TO_TICKS(ms)     ((ms) * TX_TIMER_TICKS_PER_SECOND / 1000) // u_TODO - i think this truncates if ms < 10. dunno if that will be an issue
+#define TICKS_TO_MS(ticks)  ((ticks) * 1000 / TX_TIMER_TICKS_PER_SECOND)
+
 
 #endif /* u_config.h */

Core/Inc/u_ethernet.h

@@ -15,6 +15,7 @@
 #define ETH_UDP_PORT  		2006 /* UDP port for communication */
 #define ETH_MESSAGE_SIZE	8    /* Maximum ethernet message size */ // u_TODO - i made this 8 bytes for consistency with CAN, but obv it can be a lot larger.
 #define ETH_MAX_PACKETS     10   /* Maximum number of packets we wanna handle simultaneously */
+#define ETH_NUMBER_OF_NODES 8    /* Number of nodes in the network. */
 
 typedef enum {
     VCU         = (1 << 0), // 0b00000001
@@ -26,7 +27,7 @@ typedef enum {
     NODE7       = (1 << 6), // 0b01000000
     NODE8       = (1 << 7), // 0b10000000
 } ethernet_node_t;
-#define ETH_IP(node) IP_ADDRESS(239,0,0,node) // u_TODO - you can configure ethernet IPs in CubeMX apparently. probably should look into that, not sure how that works w/ this
+#define ETH_IP(node) IP_ADDRESS(239,0,0,node)
 /* END CONFIG */
 
 typedef struct {

Core/Inc/u_queues.h

@@ -2,6 +2,7 @@
 #define __U_QUEUES_H
 
 #include "tx_api.h"
+#include "u_config.h"
 #include "u_ethernet.h"
 #include <stdint.h>
 
@@ -11,6 +12,9 @@
 *   Author: Blake Jackson
 */
 
+/* Queue Config Macros */
+#define QUEUE_WAIT_TIME     MS_TO_TICKS(100) // Wait 100ms for queue stuff before timing out
+
 typedef struct {
     TX_QUEUE *queue;           /* Pointer to the queue */
     CHAR     *name;            /* Name of the queue */

Core/Src/u_ethernet.c

@@ -40,7 +40,7 @@ static void _receive_message(NX_UDP_SOCKET *socket) {
     ethernet_message_t message = {0};
 
     /* Recieve the packet */
-    status = nx_udp_socket_receive(socket, &packet, TX_NO_WAIT);
+    status = nx_udp_socket_receive(socket, &packet, NX_NO_WAIT);
     if(status == NX_SUCCESS) {
         /* Extract message from packet */
         status = nx_packet_data_extract_offset(

Core/Src/u_queues.c

@@ -57,7 +57,7 @@ uint8_t queue_send(TX_QUEUE *queue, void *message) {
     UINT status;
 
     /* Send message to the queue. */
-    status = tx_queue_send(queue, message, TX_NO_WAIT);
+    status = tx_queue_send(queue, message, QUEUE_WAIT_TIME);
     if(status != TX_SUCCESS) {
         DEBUG_PRINT("ERROR: Failed to send message to queue (Status: %d, Queue: %s).", status, queue->tx_queue_name);
         return U_ERROR;
@@ -70,7 +70,7 @@ uint8_t  queue_receive(TX_QUEUE *queue, void *message) {
     UINT status;
 
     /* Receive message from the queue. */
-    status = tx_queue_receive(queue, message, TX_NO_WAIT);
+    status = tx_queue_receive(queue, message, QUEUE_WAIT_TIME);
     if(status != TX_SUCCESS) {
         DEBUG_PRINT("ERROR: Failed to receive message from queue (Status: %d, Queue: %s).", status, queue->tx_queue_name);
         return U_ERROR;

NetXDuo/Target/nx_stm32_phy_custom_driver.c

@@ -15,6 +15,7 @@
 
 /* USER CODE BEGIN Includes */
 #include "lan8670.h"
+#include "u_ethernet.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -103,13 +104,13 @@ int32_t nx_eth_phy_init(void)
     }
 
     /* Set PLCA node count and ID */
-    ret = LAN8670_PLCA_Set_Node_Count(&lan8670, 2); // u_TODO - Actually configure this stuff based on what the network looks like
+    ret = LAN8670_PLCA_Set_Node_Count(&lan8670, ETH_NUMBER_OF_NODES);
     if (ret != LAN8670_STATUS_OK)
     {
         return ETH_PHY_STATUS_ERROR;
     }
 
-    ret = LAN8670_PLCA_Set_Node_Id(&lan8670, 0); // u_TODO - Actually configure this stuff based on what the network looks like
+    ret = LAN8670_PLCA_Set_Node_Id(&lan8670, VCU);
     if (ret != LAN8670_STATUS_OK)
     {
         return ETH_PHY_STATUS_ERROR;