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

Formatting after merge

Browse Source
This commit is contained in:
Valerio De Benedetto 2024-09-20 14:12:36 +02:00
parent ed53826382
commit 5729bafbbd
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nanomodbus.c
View File

@ -59,8 +59,7 @@ static void discard_1(nmbs_t* nmbs) {
#ifndef NMBS_SERVER_DISABLED #ifndef NMBS_SERVER_DISABLED
#if !defined(NMBS_SERVER_READ_FILE_RECORD_DISABLED) || \ #if !defined(NMBS_SERVER_READ_FILE_RECORD_DISABLED) || !defined(NMBS_SERVER_WRITE_FILE_RECORD_DISABLED)
!defined(NMBS_SERVER_WRITE_FILE_RECORD_DISABLED)
static void discard_n(nmbs_t* nmbs, uint16_t n) { static void discard_n(nmbs_t* nmbs, uint16_t n) {
nmbs->msg.buf_idx += n; nmbs->msg.buf_idx += n;
} }
@ -516,11 +515,9 @@ static void put_req_header(nmbs_t* nmbs, uint16_t data_length) {
#endif #endif
#if !defined(NMBS_CLIENT_DISABLED) || \ #if !defined(NMBS_CLIENT_DISABLED) || \
(!defined(NMBS_SERVER_DISABLED) && ( \ (!defined(NMBS_SERVER_DISABLED) && \
!defined(NMBS_SERVER_READ_COILS_DISABLED) || \ (!defined(NMBS_SERVER_READ_COILS_DISABLED) || !defined(NMBS_SERVER_READ_DISCRETE_INPUTS_DISABLED)))
!defined(NMBS_SERVER_READ_DISCRETE_INPUTS_DISABLED) \
))
static nmbs_error recv_read_discrete_res(nmbs_t* nmbs, nmbs_bitfield values) { static nmbs_error recv_read_discrete_res(nmbs_t* nmbs, nmbs_bitfield values) {
nmbs_error err = recv_res_header(nmbs); nmbs_error err = recv_res_header(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)
@ -558,11 +555,9 @@ static nmbs_error recv_read_discrete_res(nmbs_t* nmbs, nmbs_bitfield values) {
#endif #endif
#if !defined(NMBS_CLIENT_DISABLED) || \ #if !defined(NMBS_CLIENT_DISABLED) || \
(!defined(NMBS_SERVER_DISABLED) && ( \ (!defined(NMBS_SERVER_DISABLED) && (!defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || \
!defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || \ !defined(NMBS_SERVER_READ_INPUT_REGISTERS_DISABLED)))
!defined(NMBS_SERVER_READ_INPUT_REGISTERS_DISABLED) \
))
static nmbs_error recv_read_registers_res(nmbs_t* nmbs, uint16_t quantity, uint16_t* registers) { static nmbs_error recv_read_registers_res(nmbs_t* nmbs, uint16_t quantity, uint16_t* registers) {
nmbs_error err = recv_res_header(nmbs); nmbs_error err = recv_res_header(nmbs);
if (err != NMBS_ERROR_NONE) if (err != NMBS_ERROR_NONE)

6
nanomodbus.h
View File

@ -176,8 +176,7 @@ typedef struct nmbs_callbacks {
void* arg); void* arg);
#endif #endif
#if !defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || \ #if !defined(NMBS_SERVER_READ_HOLDING_REGISTERS_DISABLED) || !defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED)
!defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED)
nmbs_error (*read_holding_registers)(uint16_t address, uint16_t quantity, uint16_t* registers_out, uint8_t unit_id, nmbs_error (*read_holding_registers)(uint16_t address, uint16_t quantity, uint16_t* registers_out, uint8_t unit_id,
void* arg); void* arg);
#endif #endif
@ -200,8 +199,7 @@ typedef struct nmbs_callbacks {
void* arg); void* arg);
#endif #endif
#if !defined(NMBS_SERVER_WRITE_MULTIPLE_REGISTERS_DISABLED) || \ #if !defined(NMBS_SERVER_WRITE_MULTIPLE_REGISTERS_DISABLED) || !defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED)
!defined(NMBS_SERVER_READ_WRITE_REGISTERS_DISABLED)
nmbs_error (*write_multiple_registers)(uint16_t address, uint16_t quantity, const uint16_t* registers, nmbs_error (*write_multiple_registers)(uint16_t address, uint16_t quantity, const uint16_t* registers,
uint8_t unit_id, void* arg); uint8_t unit_id, void* arg);
#endif #endif