Update deps.

[apps/low-level-can-service.git] / src / isotp / isotp.c

diff --git a/src/isotp/isotp.c b/src/isotp/isotp.c
index da7fa29..f303e21 100644 (file)
--- a/src/isotp/isotp.c
+++ b/src/isotp/isotp.c
@@ -1,20 +1,12 @@
 #include <isotp/isotp.h>
+#include <isotp/receive.h>
+#include <bitfield/bitfield.h>
 
 const uint16_t MAX_ISO_TP_MESSAGE_SIZE = 4096;
 const uint16_t MAX_CAN_FRAME_SIZE = 8;
 const uint8_t ISO_TP_DEFAULT_RESPONSE_TIMEOUT = 100;
 const bool ISO_TP_DEFAULT_FRAME_PADDING_STATUS = true;
 
-void isotp_receive_can_frame(const uint16_t arbitration_id, const uint8_t* data,
-        const uint8_t length) {
-    //match with any request we made
-    //handle flow control if necessary
-    //call callback if message completed
-}
-
-bool isotp_send(const uint8_t* payload, uint16_t payload_size) {
-     // we determine if it's single/multi frame and start the send
-}
 
 void isotp_set_timeout(IsoTpHandler* handler, uint16_t timeout_ms) {
     handler->timeout_ms = timeout_ms;
@@ -36,6 +28,7 @@ IsoTpHandler isotp_init(IsoTpShims* shims, uint16_t arbitration_id,
         IsoTpCanFrameSentHandler can_frame_sent_callback) {
     IsoTpHandler handler = {
         shims: shims,
+        arbitration_id: arbitration_id,
         message_received_callback: message_received_callback,
         message_sent_callback: message_sent_callback,
         can_frame_sent_callback: can_frame_sent_callback,
@@ -46,11 +39,9 @@ IsoTpHandler isotp_init(IsoTpShims* shims, uint16_t arbitration_id,
     return handler;
 }
 
-// TODO this would be better as a "isotp_message_to_string"
-void log_isotp_message(const uint16_t arbitration_id,
-        const uint8_t* payload, const uint16_t size) {
-    debug("ID: 0x%02x, Payload:", arbitration_id);
-    for(int i = 0; i < size; i++) {
-        debug("0x%x", payload[i]);
-    }
+void isotp_message_to_string(const IsoTpMessage* message, char* destination,
+        size_t destination_length) {
+    snprintf(destination, destination_length,"ID: 0x%02x, Payload: 0x%llx",
+            // TODO the payload may be backwards here
+            message->arbitration_id, message->payload);
 }