Attempt to print entire payload and fail.

[apps/low-level-can-service.git] / tests / common.c

diff --git a/tests/common.c b/tests/common.c
index 427d90c..5995df7 100644 (file)
--- a/tests/common.c
+++ b/tests/common.c
@@ -5,7 +5,7 @@
 #include <stdarg.h>
 
 IsoTpShims SHIMS;
-IsoTpHandler ISOTP_HANDLER;
+IsoTpHandle HANDLE;
 
 uint16_t last_can_frame_sent_arb_id;
 uint8_t last_can_payload_sent[8];
@@ -14,12 +14,12 @@ bool can_frame_was_sent;
 
 bool message_was_received;
 uint16_t last_message_received_arb_id;
-uint8_t* last_message_received_payload;
+uint8_t last_message_received_payload[OUR_MAX_ISO_TP_MESSAGE_SIZE];
 uint8_t last_message_received_payload_size;
 
 uint16_t last_message_sent_arb_id;
 bool last_message_sent_status;
-uint8_t* last_message_sent_payload;
+uint8_t last_message_sent_payload[OUR_MAX_ISO_TP_MESSAGE_SIZE];
 uint8_t last_message_sent_payload_size;
 
 void debug(const char* format, ...) {
@@ -43,50 +43,47 @@ void mock_send_can(const uint16_t arbitration_id, const uint8_t* data,
 void mock_set_timer(uint16_t time_ms, void (*callback)) {
 }
 
-void message_received(const uint16_t arbitration_id, const uint8_t* payload,
-        const uint16_t size) {
+void message_received(const IsoTpMessage* message) {
     debug("Received ISO-TP message:");
     message_was_received = true;
-    log_isotp_message(arbitration_id, payload, size);
-    last_message_received_arb_id = arbitration_id;
-    last_message_received_payload_size = size;
-    if(size > 0) {
-        memcpy(last_message_received_payload, payload, size);
+    char str_message[24];
+    isotp_message_to_string(message, str_message, sizeof(str_message));
+    debug("%s", str_message);
+    last_message_received_arb_id = message->arbitration_id;
+    last_message_received_payload_size = message->size;
+    if(message->size > 0) {
+        memcpy(last_message_received_payload, message->payload, message->size);
     }
 }
 
-void message_sent(const uint16_t arbitration_id, const uint8_t* payload,
-        const uint16_t size, const bool success) {
+void message_sent(const IsoTpMessage* message, const bool success) {
     if(success) {
         debug("Sent ISO-TP message:");
     } else {
         debug("Unable to send ISO-TP message:");
     }
-    log_isotp_message(arbitration_id, payload, size);
+    char str_message[24] = {0};
+    isotp_message_to_string(message, str_message, sizeof(str_message));
+    debug("%s", str_message);
 
-    last_message_sent_arb_id = arbitration_id;
-    last_message_sent_payload_size = size;
+    last_message_sent_arb_id = message->arbitration_id;
+    last_message_sent_payload_size = message->size;
     last_message_sent_status = success;
-    if(size > 0) {
-        memcpy(last_message_sent_payload, payload, size);
+    if(message->size > 0) {
+        memcpy(last_message_sent_payload, message->payload, message->size);
     }
 }
 
-void can_frame_sent(const uint16_t arbitration_id,
-        const uint8_t* payload, const uint8_t size) {
-    debug("Sent CAN Frame:");
-    log_isotp_message(arbitration_id, payload, size);
-    for(int i = 0; i < size; i++) {
-        debug("0x%x", payload[i]);
-    }
+void can_frame_sent(const uint16_t arbitration_id, const uint8_t* payload,
+        const uint8_t size) {
+    debug("Sent CAN Frame with arb ID 0x%x and %d bytes", arbitration_id, size);
 }
 
 void setup() {
     SHIMS = isotp_init_shims(debug, mock_send_can, mock_set_timer);
-    ISOTP_HANDLER = isotp_init(&SHIMS, 0x2a, message_received, message_sent,
-            can_frame_sent);
-    last_message_sent_payload = malloc(MAX_ISO_TP_MESSAGE_SIZE);
-    last_message_received_payload = malloc(MAX_ISO_TP_MESSAGE_SIZE);
+    HANDLE = isotp_receive(&SHIMS, 0x2a, message_received);
+    memset(last_message_sent_payload, 0, OUR_MAX_ISO_TP_MESSAGE_SIZE);
+    memset(last_message_received_payload, 0, OUR_MAX_ISO_TP_MESSAGE_SIZE);
     memset(last_can_payload_sent, 0, sizeof(last_can_payload_sent));
     last_message_sent_status = false;
     message_was_received = false;