judsonupchurch/nanoMODBUS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename of DEBUG() macro to NMBS_DEBUG_PRINT()

Browse Source
This commit is contained in:
Valerio De Benedetto 2023-03-15 15:12:33 +01:00
parent 8493fc5267
commit 920d25858d
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
nanomodbus.c
View File

@ -31,9 +31,9 @@
#ifdef NMBS_DEBUG #ifdef NMBS_DEBUG
#include <stdio.h> #include <stdio.h>
#define DEBUG(...) printf(__VA_ARGS__) #define NMBS_DEBUG_PRINT(...) printf(__VA_ARGS__)
#else #else
#define DEBUG(...) (void) (0) #define NMBS_DEBUG_PRINT(...) (void) (0)
#endif #endif
@ -200,7 +200,7 @@ static nmbs_error send(nmbs_t* nmbs, uint16_t count) {
static nmbs_error recv_msg_footer(nmbs_t* nmbs) { static nmbs_error recv_msg_footer(nmbs_t* nmbs) {
DEBUG("\n"); NMBS_DEBUG_PRINT("\n");
if (nmbs->platform.transport == NMBS_TRANSPORT_RTU) { if (nmbs->platform.transport == NMBS_TRANSPORT_RTU) {
uint16_t crc = nmbs_crc_calc(nmbs->msg.buf, nmbs->msg.buf_idx); uint16_t crc = nmbs_crc_calc(nmbs->msg.buf, nmbs->msg.buf_idx);
@ -301,7 +301,7 @@ static void put_msg_header(nmbs_t* nmbs, uint16_t data_length) {
static nmbs_error send_msg(nmbs_t* nmbs) { static nmbs_error send_msg(nmbs_t* nmbs) {
DEBUG("\n"); NMBS_DEBUG_PRINT("\n");
if (nmbs->platform.transport == NMBS_TRANSPORT_RTU) { if (nmbs->platform.transport == NMBS_TRANSPORT_RTU) {
uint16_t crc = nmbs_crc_calc(nmbs->msg.buf, nmbs->msg.buf_idx); uint16_t crc = nmbs_crc_calc(nmbs->msg.buf, nmbs->msg.buf_idx);
@ -336,7 +336,7 @@ static nmbs_error recv_req_header(nmbs_t* nmbs, bool* first_byte_received) {
static void put_res_header(nmbs_t* nmbs, uint16_t data_length) { static void put_res_header(nmbs_t* nmbs, uint16_t data_length) {
put_msg_header(nmbs, data_length); put_msg_header(nmbs, data_length);
DEBUG("NMBS res -> fc %d\t", nmbs->msg.fc); NMBS_DEBUG_PRINT("NMBS res -> fc %d\t", nmbs->msg.fc);
} }
@ -345,7 +345,7 @@ static nmbs_error send_exception_msg(nmbs_t* nmbs, uint8_t exception) {
put_msg_header(nmbs, 1); put_msg_header(nmbs, 1);
put_1(nmbs, exception); put_1(nmbs, exception);
DEBUG("NMBS res -> exception %d\n", exception); NMBS_DEBUG_PRINT("NMBS res -> exception %d\n", exception);
return send_msg(nmbs); return send_msg(nmbs);
} }
@ -385,14 +385,14 @@ static nmbs_error recv_res_header(nmbs_t* nmbs) {
if (exception < 1 || exception > 4) if (exception < 1 || exception > 4)
return NMBS_ERROR_INVALID_RESPONSE; return NMBS_ERROR_INVALID_RESPONSE;
DEBUG("exception %d\n", exception); NMBS_DEBUG_PRINT("exception %d\n", exception);
return exception; return exception;
} }
return NMBS_ERROR_INVALID_RESPONSE; return NMBS_ERROR_INVALID_RESPONSE;
} }
DEBUG("NMBS res <- fc %d\t", nmbs->msg.fc); NMBS_DEBUG_PRINT("NMBS res <- fc %d\t", nmbs->msg.fc);
return NMBS_ERROR_NONE; return NMBS_ERROR_NONE;
} }
@ -400,7 +400,7 @@ static nmbs_error recv_res_header(nmbs_t* nmbs) {
static void put_req_header(nmbs_t* nmbs, uint16_t data_length) { static void put_req_header(nmbs_t* nmbs, uint16_t data_length) {
put_msg_header(nmbs, data_length); put_msg_header(nmbs, data_length);
DEBUG("NMBS req -> fc %d\t", nmbs->msg.fc); NMBS_DEBUG_PRINT("NMBS req -> fc %d\t", nmbs->msg.fc);
} }
#endif #endif
@ -415,7 +415,7 @@ static nmbs_error handle_read_discrete(nmbs_t* nmbs, nmbs_error (*callback)(uint
uint16_t address = get_2(nmbs); uint16_t address = get_2(nmbs);
uint16_t quantity = get_2(nmbs); uint16_t quantity = get_2(nmbs);
DEBUG("a %d\tq %d", address, quantity); NMBS_DEBUG_PRINT("a %d\tq %d", address, quantity);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -444,12 +444,12 @@ static nmbs_error handle_read_discrete(nmbs_t* nmbs, nmbs_error (*callback)(uint
put_1(nmbs, discrete_bytes); put_1(nmbs, discrete_bytes);
DEBUG("b %d\t", discrete_bytes); NMBS_DEBUG_PRINT("b %d\t", discrete_bytes);
DEBUG("coils "); NMBS_DEBUG_PRINT("coils ");
for (int i = 0; i < discrete_bytes; i++) { for (int i = 0; i < discrete_bytes; i++) {
put_1(nmbs, bitfield[i]); put_1(nmbs, bitfield[i]);
DEBUG("%d", bitfield[i]); NMBS_DEBUG_PRINT("%d", bitfield[i]);
} }
err = send_msg(nmbs); err = send_msg(nmbs);
@ -476,7 +476,7 @@ static nmbs_error handle_read_registers(nmbs_t* nmbs, nmbs_error (*callback)(uin
uint16_t address = get_2(nmbs); uint16_t address = get_2(nmbs);
uint16_t quantity = get_2(nmbs); uint16_t quantity = get_2(nmbs);
DEBUG("a %d\tq %d", address, quantity); NMBS_DEBUG_PRINT("a %d\tq %d", address, quantity);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -505,12 +505,12 @@ static nmbs_error handle_read_registers(nmbs_t* nmbs, nmbs_error (*callback)(uin
put_1(nmbs, regs_bytes); put_1(nmbs, regs_bytes);
DEBUG("b %d\t", regs_bytes); NMBS_DEBUG_PRINT("b %d\t", regs_bytes);
DEBUG("regs "); NMBS_DEBUG_PRINT("regs ");
for (int i = 0; i < quantity; i++) { for (int i = 0; i < quantity; i++) {
put_2(nmbs, regs[i]); put_2(nmbs, regs[i]);
DEBUG("%d", regs[i]); NMBS_DEBUG_PRINT("%d", regs[i]);
} }
err = send_msg(nmbs); err = send_msg(nmbs);
@ -565,7 +565,7 @@ static nmbs_error handle_write_single_coil(nmbs_t* nmbs) {
uint16_t address = get_2(nmbs); uint16_t address = get_2(nmbs);
uint16_t value = get_2(nmbs); uint16_t value = get_2(nmbs);
DEBUG("a %d\tvalue %d", address, value); NMBS_DEBUG_PRINT("a %d\tvalue %d", address, value);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -589,7 +589,7 @@ static nmbs_error handle_write_single_coil(nmbs_t* nmbs) {
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, value); put_2(nmbs, value);
DEBUG("a %d\tvalue %d", address, value); NMBS_DEBUG_PRINT("a %d\tvalue %d", address, value);
err = send_msg(nmbs); err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -615,7 +615,7 @@ static nmbs_error handle_write_single_register(nmbs_t* nmbs) {
uint16_t address = get_2(nmbs); uint16_t address = get_2(nmbs);
uint16_t value = get_2(nmbs); uint16_t value = get_2(nmbs);
DEBUG("a %d\tvalue %d", address, value); NMBS_DEBUG_PRINT("a %d\tvalue %d", address, value);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -636,7 +636,7 @@ static nmbs_error handle_write_single_register(nmbs_t* nmbs) {
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, value); put_2(nmbs, value);
DEBUG("a %d\tvalue %d", address, value); NMBS_DEBUG_PRINT("a %d\tvalue %d", address, value);
err = send_msg(nmbs); err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -663,7 +663,7 @@ static nmbs_error handle_write_multiple_coils(nmbs_t* nmbs) {
uint16_t quantity = get_2(nmbs); uint16_t quantity = get_2(nmbs);
uint8_t coils_bytes = get_1(nmbs); uint8_t coils_bytes = get_1(nmbs);
DEBUG("a %d\tq %d\tb %d\tcoils ", address, quantity, coils_bytes); NMBS_DEBUG_PRINT("a %d\tq %d\tb %d\tcoils ", address, quantity, coils_bytes);
err = recv(nmbs, coils_bytes); err = recv(nmbs, coils_bytes);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -672,7 +672,7 @@ static nmbs_error handle_write_multiple_coils(nmbs_t* nmbs) {
nmbs_bitfield coils; nmbs_bitfield coils;
for (int i = 0; i < coils_bytes; i++) { for (int i = 0; i < coils_bytes; i++) {
coils[i] = get_1(nmbs); coils[i] = get_1(nmbs);
DEBUG("%d ", coils[i]); NMBS_DEBUG_PRINT("%d ", coils[i]);
} }
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
@ -706,7 +706,7 @@ static nmbs_error handle_write_multiple_coils(nmbs_t* nmbs) {
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, quantity); put_2(nmbs, quantity);
DEBUG("a %d\tq %d", address, quantity); NMBS_DEBUG_PRINT("a %d\tq %d", address, quantity);
err = send_msg(nmbs); err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -733,7 +733,7 @@ static nmbs_error handle_write_multiple_registers(nmbs_t* nmbs) {
uint16_t quantity = get_2(nmbs); uint16_t quantity = get_2(nmbs);
uint8_t registers_bytes = get_1(nmbs); uint8_t registers_bytes = get_1(nmbs);
DEBUG("a %d\tq %d\tb %d\tregs ", address, quantity, registers_bytes); NMBS_DEBUG_PRINT("a %d\tq %d\tb %d\tregs ", address, quantity, registers_bytes);
err = recv(nmbs, registers_bytes); err = recv(nmbs, registers_bytes);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -742,7 +742,7 @@ static nmbs_error handle_write_multiple_registers(nmbs_t* nmbs) {
uint16_t registers[0x007B]; uint16_t registers[0x007B];
for (int i = 0; i < registers_bytes / 2; i++) { for (int i = 0; i < registers_bytes / 2; i++) {
registers[i] = get_2(nmbs); registers[i] = get_2(nmbs);
DEBUG("%d ", registers[i]); NMBS_DEBUG_PRINT("%d ", registers[i]);
} }
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
@ -776,7 +776,7 @@ static nmbs_error handle_write_multiple_registers(nmbs_t* nmbs) {
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, quantity); put_2(nmbs, quantity);
DEBUG("a %d\tq %d", address, quantity); NMBS_DEBUG_PRINT("a %d\tq %d", address, quantity);
err = send_msg(nmbs); err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -794,7 +794,7 @@ static nmbs_error handle_write_multiple_registers(nmbs_t* nmbs) {
static nmbs_error handle_req_fc(nmbs_t* nmbs) { static nmbs_error handle_req_fc(nmbs_t* nmbs) {
DEBUG("fc %d\t", nmbs->msg.fc); NMBS_DEBUG_PRINT("fc %d\t", nmbs->msg.fc);
nmbs_error err; nmbs_error err;
switch (nmbs->msg.fc) { switch (nmbs->msg.fc) {
@ -922,7 +922,7 @@ static nmbs_error read_discrete(nmbs_t* nmbs, uint8_t fc, uint16_t address, uint
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, quantity); put_2(nmbs, quantity);
DEBUG("a %d\tq %d", address, quantity); NMBS_DEBUG_PRINT("a %d\tq %d", address, quantity);
nmbs_error err = send_msg(nmbs); nmbs_error err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -937,16 +937,16 @@ static nmbs_error read_discrete(nmbs_t* nmbs, uint8_t fc, uint16_t address, uint
return err; return err;
uint8_t coils_bytes = get_1(nmbs); uint8_t coils_bytes = get_1(nmbs);
DEBUG("b %d\t", coils_bytes); NMBS_DEBUG_PRINT("b %d\t", coils_bytes);
err = recv(nmbs, coils_bytes); err = recv(nmbs, coils_bytes);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
return err; return err;
DEBUG("coils "); NMBS_DEBUG_PRINT("coils ");
for (int i = 0; i < coils_bytes; i++) { for (int i = 0; i < coils_bytes; i++) {
values[i] = get_1(nmbs); values[i] = get_1(nmbs);
DEBUG("%d", values[i]); NMBS_DEBUG_PRINT("%d", values[i]);
} }
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
@ -980,7 +980,7 @@ static nmbs_error read_registers(nmbs_t* nmbs, uint8_t fc, uint16_t address, uin
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, quantity); put_2(nmbs, quantity);
DEBUG("a %d\tq %d ", address, quantity); NMBS_DEBUG_PRINT("a %d\tq %d ", address, quantity);
nmbs_error err = send_msg(nmbs); nmbs_error err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -995,16 +995,16 @@ static nmbs_error read_registers(nmbs_t* nmbs, uint8_t fc, uint16_t address, uin
return err; return err;
uint8_t registers_bytes = get_1(nmbs); uint8_t registers_bytes = get_1(nmbs);
DEBUG("b %d\t", registers_bytes); NMBS_DEBUG_PRINT("b %d\t", registers_bytes);
err = recv(nmbs, registers_bytes); err = recv(nmbs, registers_bytes);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
return err; return err;
DEBUG("regs "); NMBS_DEBUG_PRINT("regs ");
for (int i = 0; i < registers_bytes / 2; i++) { for (int i = 0; i < registers_bytes / 2; i++) {
registers[i] = get_2(nmbs); registers[i] = get_2(nmbs);
DEBUG("%d", registers[i]); NMBS_DEBUG_PRINT("%d", registers[i]);
} }
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
@ -1037,7 +1037,7 @@ nmbs_error nmbs_write_single_coil(nmbs_t* nmbs, uint16_t address, bool value) {
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, value_req); put_2(nmbs, value_req);
DEBUG("a %d\tvalue %d ", address, value_req); NMBS_DEBUG_PRINT("a %d\tvalue %d ", address, value_req);
nmbs_error err = send_msg(nmbs); nmbs_error err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -1055,7 +1055,7 @@ nmbs_error nmbs_write_single_coil(nmbs_t* nmbs, uint16_t address, bool value) {
uint16_t address_res = get_2(nmbs); uint16_t address_res = get_2(nmbs);
uint16_t value_res = get_2(nmbs); uint16_t value_res = get_2(nmbs);
DEBUG("a %d\tvalue %d", address, value_res); NMBS_DEBUG_PRINT("a %d\tvalue %d", address, value_res);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -1079,7 +1079,7 @@ nmbs_error nmbs_write_single_register(nmbs_t* nmbs, uint16_t address, uint16_t v
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, value); put_2(nmbs, value);
DEBUG("a %d\tvalue %d", address, value); NMBS_DEBUG_PRINT("a %d\tvalue %d", address, value);
nmbs_error err = send_msg(nmbs); nmbs_error err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -1096,7 +1096,7 @@ nmbs_error nmbs_write_single_register(nmbs_t* nmbs, uint16_t address, uint16_t v
uint16_t address_res = get_2(nmbs); uint16_t address_res = get_2(nmbs);
uint16_t value_res = get_2(nmbs); uint16_t value_res = get_2(nmbs);
DEBUG("a %d\tvalue %d ", address, value_res); NMBS_DEBUG_PRINT("a %d\tvalue %d ", address, value_res);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -1128,12 +1128,12 @@ nmbs_error nmbs_write_multiple_coils(nmbs_t* nmbs, uint16_t address, uint16_t qu
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, quantity); put_2(nmbs, quantity);
put_1(nmbs, coils_bytes); put_1(nmbs, coils_bytes);
DEBUG("a %d\tq %d\tb %d\t", address, quantity, coils_bytes); NMBS_DEBUG_PRINT("a %d\tq %d\tb %d\t", address, quantity, coils_bytes);
DEBUG("coils "); NMBS_DEBUG_PRINT("coils ");
for (int i = 0; i < coils_bytes; i++) { for (int i = 0; i < coils_bytes; i++) {
put_1(nmbs, coils[i]); put_1(nmbs, coils[i]);
DEBUG("%d ", coils[i]); NMBS_DEBUG_PRINT("%d ", coils[i]);
} }
nmbs_error err = send_msg(nmbs); nmbs_error err = send_msg(nmbs);
@ -1151,7 +1151,7 @@ nmbs_error nmbs_write_multiple_coils(nmbs_t* nmbs, uint16_t address, uint16_t qu
uint16_t address_res = get_2(nmbs); uint16_t address_res = get_2(nmbs);
uint16_t quantity_res = get_2(nmbs); uint16_t quantity_res = get_2(nmbs);
DEBUG("a %d\tq %d", address_res, quantity_res); NMBS_DEBUG_PRINT("a %d\tq %d", address_res, quantity_res);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -1183,12 +1183,12 @@ nmbs_error nmbs_write_multiple_registers(nmbs_t* nmbs, uint16_t address, uint16_
put_2(nmbs, address); put_2(nmbs, address);
put_2(nmbs, quantity); put_2(nmbs, quantity);
put_1(nmbs, registers_bytes); put_1(nmbs, registers_bytes);
DEBUG("a %d\tq %d\tb %d\t", address, quantity, registers_bytes); NMBS_DEBUG_PRINT("a %d\tq %d\tb %d\t", address, quantity, registers_bytes);
DEBUG("regs "); NMBS_DEBUG_PRINT("regs ");
for (int i = 0; i < quantity; i++) { for (int i = 0; i < quantity; i++) {
put_2(nmbs, registers[i]); put_2(nmbs, registers[i]);
DEBUG("%d ", registers[i]); NMBS_DEBUG_PRINT("%d ", registers[i]);
} }
nmbs_error err = send_msg(nmbs); nmbs_error err = send_msg(nmbs);
@ -1206,7 +1206,7 @@ nmbs_error nmbs_write_multiple_registers(nmbs_t* nmbs, uint16_t address, uint16_
uint16_t address_res = get_2(nmbs); uint16_t address_res = get_2(nmbs);
uint16_t quantity_res = get_2(nmbs); uint16_t quantity_res = get_2(nmbs);
DEBUG("a %d\tq %d", address_res, quantity_res); NMBS_DEBUG_PRINT("a %d\tq %d", address_res, quantity_res);
err = recv_msg_footer(nmbs); err = recv_msg_footer(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -1227,10 +1227,10 @@ nmbs_error nmbs_send_raw_pdu(nmbs_t* nmbs, uint8_t fc, const uint8_t* data, uint
msg_state_req(nmbs, fc); msg_state_req(nmbs, fc);
put_msg_header(nmbs, data_len); put_msg_header(nmbs, data_len);
DEBUG("raw "); NMBS_DEBUG_PRINT("raw ");
for (uint16_t i = 0; i < data_len; i++) { for (uint16_t i = 0; i < data_len; i++) {
put_1(nmbs, data[i]); put_1(nmbs, data[i]);
DEBUG("%d ", data[i]); NMBS_DEBUG_PRINT("%d ", data[i]);
} }
return send_msg(nmbs); return send_msg(nmbs);