Merge branch 'main' into feature/hdc2021debr

Author: dnakhooda

NetX/inc/u_nx_ethernet.h

@@ -14,7 +14,7 @@
 
 /* CONFIG */
 #define ETH_UDP_PORT	    2006 /* UDP port for communication */
-#define ETH_MESSAGE_SIZE    8    /* Maximum ethernet message size in bytes. */
+#define ETH_MESSAGE_SIZE    128  /* Maximum ethernet message size in bytes. */
 #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. */
 
@@ -51,7 +51,7 @@ typedef enum {
 } plca_node_id_t;
 /* END CONFIG */
 
-typedef struct {
+typedef struct __attribute__((__packed__)) {
 	uint8_t sender_id;
 	uint8_t recipient_id;
 	uint8_t message_id;

NetX/src/u_nx_ethernet.c

@@ -4,6 +4,7 @@
 #include "nxd_ptp_client.h"
 #include "u_nx_debug.h"
 #include "u_tx_debug.h"
+#include "c_utils.h"
 #include "nx_api.h"
 #include <string.h>
 #include <stdio.h>
@@ -113,20 +114,15 @@ static void _receive_message(NX_UDP_SOCKET *socket) {
         }
 
         /* Extract message from packet */
-        status = nx_packet_data_extract_offset(
-            packet,                         // Packet to extract from
-            0,                              // Offset (start of packet)
-            &message,                       // Message buffer
-            sizeof(ethernet_message_t),     // Size to extract
-            &bytes_copied                   // Stores how many bytes were actually copied to &message
-        );
-        if(bytes_copied < sizeof(ethernet_message_t)) {
-            PRINTLN_WARNING("Received ethernet message was smaller than expected (only received %lu of %u expected bytes).", bytes_copied, sizeof(ethernet_message_t));
+        ULONG bytes_copied = 0;
+        status = nx_packet_data_retrieve(packet, &message, &bytes_copied);
+        if(status != NX_SUCCESS) {
+            PRINTLN_ERROR("Failed to call nx_packet_data_retrieve() (Status: %d/%s).", status, nx_status_toString(status));
         }
 
         /* Process received message */
         if(status == NX_SUCCESS) {
-            PRINTLN_INFO("Received ethernet message! (Sender ID: %d, Message ID: %d).", message.sender_id, message.message_id);
+            PRINTLN_INFO("Received ethernet message! (Sender ID: %d, Message ID: %d, bytes_copied: %d).", message.sender_id, message.message_id, bytes_copied);
             device.on_recieve(message);
         }
     }
@@ -356,7 +352,7 @@ uint8_t ethernet_send_message(ethernet_message_t *message) {
     /* Append message data to packet */
     status = nx_packet_data_append(
         packet,                     // Packet
-        &message,                   // Data to append
+        message,                    // Data to append
         sizeof(ethernet_message_t), // Size of data
         &device.packet_pool,        // Packet pool
         TX_WAIT_FOREVER             // Wait indefinitely

Testing/cmock-config.yml

@@ -1,8 +1,6 @@
 
 :cmock:
   :mock_prefix: mock_   
-  :includes:
-    - stubs.h
   :plugins:
     - :ignore
     - :ignore_arg

general/include/mcp23008.h

@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-typedef int (*write_ptr)(uint8_t addr, const uint8_t *data, uint8_t len);
+typedef int (*write_ptr)(uint8_t addr, uint8_t *data, uint8_t len);
 typedef int (*read_ptr)(uint8_t addr, uint8_t *data, uint8_t len);
 typedef struct {
 	write_ptr write;

general/include/p3t1755.h

@@ -5,18 +5,22 @@
 
 #ifndef p3t1755_H
 #define p3t1755_H
-#include <stdint.h>
 #include <math.h>
+#include <stdint.h>
 
 // REGISTERS
-// Temperature register: contains two 8-bit data bytes; to store the measured Temp data.
+// Temperature register: contains two 8-bit data bytes; to store the measured
+// Temp data.
 #define p3t1755_TEMPERATURE 0x00 // read only
-// Configuration register: contains a single 8-bit data byte; to set the device operating condition
+// Configuration register: contains a single 8-bit data byte; to set the device
+// operating condition
 #define p3t1755_CONFIGURATION 0x01
-// T_low register: Hysteresis register, it contains two 8-bit data bytes to store the hysteresis T_low limit; default = 75 °C.
+// T_low register: Hysteresis register, it contains two 8-bit data bytes to
+// store the hysteresis T_low limit; default = 75 °C.
 #define p3t1755_T_LOW 0x02
-// T_high register: Overtemperature shut down threshold register, it contains two 8-bit data bytes to
-// store the overtemperature shutdown T_high limit; default = 80 °C.
+// T_high register: Overtemperature shut down threshold register, it contains
+// two 8-bit data bytes to store the overtemperature shutdown T_high limit;
+// default = 80 °C.
 #define p3t1755_T_HIGH 0x03
 
 // TEMPERATURE REGISTER FORMAT
@@ -50,20 +54,26 @@
 #define p3t1755_220MS_CONVERSION_TIME  0x60
 
 // Function Pointers
-typedef int (*WritePtr)(uint16_t dev_addr, uint16_t reg, uint16_t *data);
-typedef int (*ReadPtr)(uint16_t dev_addr, uint16_t reg, uint16_t *data);
+typedef int32_t (*WritePtr)(uint16_t dev_addr, uint16_t reg, uint8_t *data,
+			    uint8_t length);
+typedef int32_t (*ReadPtr)(uint16_t dev_addr, uint16_t reg, uint8_t *data,
+			   uint8_t length);
 
 typedef struct {
 	uint16_t dev_addr;
 	WritePtr write;
 	ReadPtr read;
 } p3t1755_t;
 
+float p3t1755_raw_to_celsius(uint16_t raw);
+
 void p3t1755_init(p3t1755_t *p3t, WritePtr write, ReadPtr read,
 		  uint16_t dev_addr);
 
-int p3t1755_read_reg(p3t1755_t *p3t, uint16_t reg, uint16_t *data);
-int p3t1755_write_reg(p3t1755_t *p3t, uint16_t reg, uint16_t *data);
+int p3t1755_read_reg(p3t1755_t *p3t, uint16_t reg, uint8_t *data,
+		     uint8_t length);
+int p3t1755_write_reg(p3t1755_t *p3t, uint16_t reg, uint8_t *data,
+		      uint8_t length);
 
 // Reads current temp in celcius
 int p3t1755_read_temperature(p3t1755_t *p3t, float *temp_c);
@@ -86,4 +96,4 @@ int p3t1755_read_low_temp(p3t1755_t *p3t, float *temp_c);
 int p3t1755_set_high_temp(p3t1755_t *p3t, float temp_c);
 int p3t1755_set_low_temp(p3t1755_t *p3t, float temp_c);
 
-#endif
+#endif