aboutsummaryrefslogtreecommitdiffstats
path: root/src/isotp
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2013-12-31 16:42:18 -0500
committerChristopher Peplin <chris.peplin@rhubarbtech.com>2013-12-31 16:42:18 -0500
commit8702b34a8ffdf220c9b054d8f1950a82c9387d6a (patch)
treeed59fb3f6678adf6569c9f1563ac83af53c82e8f /src/isotp
parent03c3696d34a064e40c98bb5d53c9b68967353cea (diff)
Attempt to print full payload and FAIL!
Diffstat (limited to 'src/isotp')
-rw-r--r--src/isotp/isotp.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/isotp/isotp.c b/src/isotp/isotp.c
index 58243123..f7189d2b 100644
--- a/src/isotp/isotp.c
+++ b/src/isotp/isotp.c
@@ -7,11 +7,6 @@ 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;
-// TODO why isn't this picked up from the header?
-extern IsoTpHandle isotp_receive(IsoTpShims* shims, const uint16_t arbitration_id,
- IsoTpMessageReceivedHandler callback);
-
-
/* void isotp_set_timeout(IsoTpHandler* handler, uint16_t timeout_ms) { */
/* handler->timeout_ms = timeout_ms; */
/* } */
@@ -28,9 +23,14 @@ IsoTpShims isotp_init_shims(LogShim log, SendCanMessageShim send_can_message,
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);
+ char payload_string[message->size * 2 + 1];
+ for(int i = 0; i < message->size; i++) {
+ // TODO, bah this isn't working because snprintf hits the NULL char that
+ // it wrote the last time and stops cold
+ snprintf(&payload_string[i * 2], 2, "%02x", message->payload[i]);
+ }
+ snprintf(destination, destination_length, "ID: 0x%02x, Payload: 0x%s",
+ message->arbitration_id, payload_string);
}
bool isotp_receive_can_frame(IsoTpShims* shims, IsoTpHandle* handle,