Merge remote-tracking branch 'donghoonpark/feature.custom_flush'

Author: debevv

.vscode/launch.json

@@ -1,6 +1,17 @@
 {
     "version": "0.2.0",
     "configurations": [
-       // Use the CMake panel to launch/debug
+        {
+            "name": "Debug active CMake target",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${command:cmake.launchTargetPath}",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "lldb"
+        }
     ]
-}
+}

nanomodbus.c

@@ -183,8 +183,8 @@ static nmbs_error send(const nmbs_t* nmbs, uint16_t count) {
 }
 
 
-static void flush(nmbs_t* nmbs) {
-    nmbs->platform.read(nmbs->msg.buf, sizeof(nmbs->msg.buf), 0, nmbs->platform.arg);
+static int32_t flush(nmbs_t* nmbs) {
+    return nmbs->platform.read(nmbs->msg.buf, sizeof(nmbs->msg.buf), 0, nmbs->platform.arg);
 }
 
 
@@ -212,7 +212,7 @@ static void msg_state_req(nmbs_t* nmbs, uint8_t fc) {
         nmbs->current_tid++;
 
     // Flush the remaining data on the line before sending the request
-    flush(nmbs);
+    nmbs->platform.flush(nmbs);
 
     msg_state_reset(nmbs);
     nmbs->msg.unit_id = nmbs->dest_address_rtu;
@@ -261,6 +261,7 @@ void nmbs_set_byte_timeout(nmbs_t* nmbs, int32_t timeout_ms) {
 void nmbs_platform_conf_create(nmbs_platform_conf* platform_conf) {
     memset(platform_conf, 0, sizeof(nmbs_platform_conf));
     platform_conf->crc_calc = nmbs_crc_calc;
+    platform_conf->flush = flush;
     // Workaround for older user code not calling nmbs_platform_conf_create()
     platform_conf->initialized = 0xFFFFDEBE;
 }
@@ -1881,7 +1882,7 @@ static nmbs_error handle_req_fc(nmbs_t* nmbs) {
             break;
 #endif
         default:
-            flush(nmbs);
+            nmbs->platform.flush(nmbs);
             if (!nmbs->msg.ignored)
                 err = send_exception_msg(nmbs, NMBS_EXCEPTION_ILLEGAL_FUNCTION);
     }
@@ -1941,7 +1942,7 @@ nmbs_error nmbs_server_poll(nmbs_t* nmbs) {
     err = handle_req_fc(nmbs);
     if (err != NMBS_ERROR_NONE) {
         if (err != NMBS_ERROR_TIMEOUT)
-            flush(nmbs);
+            nmbs->platform.flush(nmbs);
 
         return err;
     }

nanomodbus.h

@@ -48,6 +48,8 @@
 extern "C" {
 #endif
 
+typedef struct nmbs_t nmbs_t;
+
 /**
  * nanoMODBUS errors.
  * Values <= 0 are library errors, > 0 are modbus exceptions.
@@ -117,7 +119,7 @@ typedef uint8_t nmbs_bitfield_256[32];
 /**
  * Write value v to the nmbs_bitfield bf at position b
  */
-#define nmbs_bitfield_write(bf, b, v) ((bf)[(b) >> 3] = ((bf)[(b) >> 3] & ~(1 << ((b) & 7))) | ((v) << ((b) & 7)))
+#define nmbs_bitfield_write(bf, b, v) ((bf)[(b) >> 3] = ((bf)[(b) >> 3] & ~(1 << ((b) &7))) | ((v) << ((b) &7)))
 /**
  * Reset (zero) the whole bitfield
  */
@@ -163,7 +165,8 @@ typedef struct nmbs_platform_conf {
                      void* arg); /*!< Bytes write transport function pointer */
     uint16_t (*crc_calc)(const uint8_t* data, uint32_t length,
                          void* arg); /*!< CRC calculation function pointer. Optional */
-    void* arg;                       /*!< User data, will be passed to functions above */
+    int32_t (*flush)(nmbs_t* nmbs);
+    void* arg;            /*!< User data, will be passed to functions above */
     uint32_t initialized; /*!< Reserved, workaround for older user code not calling nmbs_platform_conf_create() */
 } nmbs_platform_conf;
 
@@ -241,7 +244,7 @@ typedef struct nmbs_callbacks {
  * nanoMODBUS client/server instance type. All struct members are to be considered private,
  * it is not advisable to read/write them directly.
  */
-typedef struct nmbs_t {
+struct nmbs_t {
     struct {
         uint8_t buf[260];
         uint16_t buf_idx;
@@ -264,7 +267,7 @@ typedef struct nmbs_t {
     uint8_t address_rtu;
     uint8_t dest_address_rtu;
     uint16_t current_tid;
-} nmbs_t;
+};
 
 /**
  * Modbus broadcast address. Can be passed to nmbs_set_destination_rtu_address().