aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Peplin <chris.peplin@rhubarbtech.com>2014-01-02 18:31:52 -0500
committerChristopher Peplin <chris.peplin@rhubarbtech.com>2014-01-02 18:31:52 -0500
commitfe5f39179f7c85a2924c288149b5ecc8488918b1 (patch)
tree5c8f5250b136c58dc58338507446f47c2683631e
parent3b25a0491ce9ef9b55c903c6c7f0929bc2910d1a (diff)
Attempt to print entire payload and fail.
m---------deps/bitfield-c10
-rw-r--r--src/isotp/isotp.c20
-rw-r--r--tests/common.c4
3 files changed, 17 insertions, 17 deletions
diff --git a/deps/bitfield-c b/deps/bitfield-c
-Subproject 4af52c415f1668fbd168da74d0aca903c592463
+Subproject 31caa9c77dbfc438a104fbcab6db5165528c0f8
diff --git a/src/isotp/isotp.c b/src/isotp/isotp.c
index 67c644f1..6522f7aa 100644
--- a/src/isotp/isotp.c
+++ b/src/isotp/isotp.c
@@ -21,15 +21,17 @@ IsoTpShims isotp_init_shims(LogShim log, SendCanMessageShim send_can_message,
void isotp_message_to_string(const IsoTpMessage* message, char* destination,
size_t destination_length) {
- char payload_string[message->size * 2 + 1];
- memset(payload_string, 0, sizeof(payload_string));
- 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);
+ // TODO why is this still not printing the entire payload?
+ snprintf(destination, destination_length, "ID: 0x%02x, Payload: 0x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+ message->arbitration_id,
+ message->payload[0],
+ message->payload[1],
+ message->payload[2],
+ message->payload[3],
+ message->payload[4],
+ message->payload[5],
+ message->payload[6],
+ message->payload[7]);
}
IsoTpMessage isotp_receive_can_frame(IsoTpShims* shims, IsoTpHandle* handle,
diff --git a/tests/common.c b/tests/common.c
index 882c266a..5995df74 100644
--- a/tests/common.c
+++ b/tests/common.c
@@ -76,9 +76,7 @@ void message_sent(const IsoTpMessage* message, const bool success) {
void can_frame_sent(const uint16_t arbitration_id, const uint8_t* payload,
const uint8_t size) {
- debug("Sent CAN Frame:");
- // TODO add something like this to canutil
- /* log_can_message(arbitration_id, payload, size); */
+ debug("Sent CAN Frame with arb ID 0x%x and %d bytes", arbitration_id, size);
}
void setup() {