From 249c4f3919c955f37eea7dad23f3a9cf86736000 Mon Sep 17 00:00:00 2001
From: Jonathan Reichelt Gjertsen <jonathan.gjertsen@hagal.com>
Date: Tue, 7 Jun 2022 19:44:42 +0200
Subject: [PATCH] Sometimes it's useful to turn `NMBS_DEBUG` on, but the output
 is a bit of a mess if the read/write callbacks also log to the same channel.
 Moving the DEBUG statements in `recv_msg_footer` and `send_msg_footer` to the
 start of the function makes the output a bit cleaner, although it's not
 perfect.

Example output before this change:

```
NMBS req -> fc 16   a 12326 q 2     b 4     regs 4660 43981 transmitted[13] = { f7, 10, 30, 26, 00, 02, 04, 12, 34, ab, cd, c2, 04, }

received[1] = { 0xf7, }
received[1] = { 0x10, }
NMBS res <- fc 16   received[4] = { 0x30, 0x26, 00, 0x2, }
a 12326     q 2received[2] = { 0xbb, 0x95, }

NMBS req -> fc 3    a 12326 q 2 transmitted[8] = { f7, 03, 30, 26, 00, 02, 3e, 56, }

received[1] = { 0xf7, }
received[1] = { 0x3, }
NMBS res <- fc 3    received[1] = { 0x4, }
b 4 received[4] = { 0x12, 0x34, 0xab, 0xcd, }
regs 466043981received[2] = { 0x96, 0x2f, }
```

after:

```
NMBS req -> fc 16   a 12326 q 2     b 4     regs 4660 43981
transmitted[13] = { f7, 10, 30, 26, 00, 02, 04, 12, 34, ab, cd, c2, 04, }
received[1] = { 0xf7, }
received[1] = { 0x10, }
NMBS res <- fc 16   received[4] = { 0x30, 0x26, 00, 0x2, }
a 12326     q 2
received[2] = { 0xbb, 0x95, }
NMBS req -> fc 3    a 12326 q 2
transmitted[8] = { f7, 03, 30, 26, 00, 02, 3e, 56, }
received[1] = { 0xf7, }
received[1] = { 0x3, }
NMBS res <- fc 3    received[1] = { 0x4, }
b 4 received[4] = { 0x12, 0x34, 0xab, 0xcd, }
regs 466043981
received[2] = { 0x96, 0x2f, }
```
---
 nanomodbus.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nanomodbus.c b/nanomodbus.c
index 47fed6f..48fa3aa 100644
--- a/nanomodbus.c
+++ b/nanomodbus.c
@@ -228,6 +228,8 @@ static nmbs_error send(nmbs_t* nmbs, uint16_t count) {
 
 
 static nmbs_error recv_msg_footer(nmbs_t* nmbs) {
+    DEBUG("\n");
+
     if (nmbs->platform.transport == NMBS_TRANSPORT_RTU) {
         uint16_t crc = crc_calc(nmbs->msg.buf, nmbs->msg.buf_idx);
 
@@ -241,7 +243,6 @@ static nmbs_error recv_msg_footer(nmbs_t* nmbs) {
             return NMBS_ERROR_CRC;
     }
 
-    DEBUG("\n");
 
     return NMBS_ERROR_NONE;
 }
@@ -396,6 +397,8 @@ static void send_msg_header(nmbs_t* nmbs, uint16_t data_length) {
 
 
 static nmbs_error send_msg_footer(nmbs_t* nmbs) {
+    DEBUG("\n");
+
     if (nmbs->platform.transport == NMBS_TRANSPORT_RTU) {
         uint16_t crc = crc_calc(nmbs->msg.buf, nmbs->msg.buf_idx);
         put_2(nmbs, crc);
@@ -403,7 +406,6 @@ static nmbs_error send_msg_footer(nmbs_t* nmbs) {
 
     nmbs_error err = send(nmbs, nmbs->msg.buf_idx);
 
-    DEBUG("\n");
 
     return err;
 }