Skip to content

Fix small issue in Write File Record server response. Add user argument to Read Device Discovery Message #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
indianaMitko62 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix small issue in Write File Record server response. Add user argument to Read Device Discovery Message #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f59110
small fix in Write File Record server response
indianaMitko62 Jul 10, 2025
54a7f5a
add user argument to read device identification handler
indianaMitko62 Sep 29, 2025
63fa72b
Fix read device identification
indianaMitko62 Sep 29, 2025
4877521
Merge branch 'master' into master
indianaMitko62 Dec 2, 2025
05abfaf
With each read device id code larger than the basic all smaller objec…
indianaMitko62 Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions nanomodbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1520,10 +1520,6 @@ static nmbs_error handle_write_file_record(nmbs_t* nmbs) {

if (!nmbs->msg.broadcast) {
// The normal response to 'Write File' is an echo of the request.
// We can restore buffer index and response msg.
nmbs->msg.buf_idx = msg_buf_idx;
discard_n(nmbs, request_size);

err = send_msg(nmbs);
if (err != NMBS_ERROR_NONE)
return err;
Expand Down Expand Up @@ -1700,7 +1696,7 @@ static nmbs_error handle_read_device_identification(nmbs_t* nmbs) {
put_1(nmbs, 1); // Number of objects

str[0] = 0;
err = nmbs->callbacks.read_device_identification(object_id, str);
err = nmbs->callbacks.read_device_identification(object_id, str, nmbs->callbacks.arg);
if (err != NMBS_ERROR_NONE) {
if (nmbs_error_is_exception(err))
return send_exception_msg(nmbs, err);
Expand Down Expand Up @@ -1741,12 +1737,12 @@ static nmbs_error handle_read_device_identification(nmbs_t* nmbs) {
last_id = 0x02;
break;
case 2:
if (object_id < 0x03 || object_id > 0x06)
if (object_id > 0x07)
return send_exception_msg(nmbs, NMBS_EXCEPTION_ILLEGAL_DATA_ADDRESS);
last_id = 0x06;
break;
case 3:
if (object_id < 0x80)
if (object_id > 0x07 && object_id < 0x80)
return send_exception_msg(nmbs, NMBS_EXCEPTION_ILLEGAL_DATA_ADDRESS);
last_id = 0xFF;
break;
Expand All @@ -1763,7 +1759,7 @@ static nmbs_error handle_read_device_identification(nmbs_t* nmbs) {
}

str[0] = 0;
err = nmbs->callbacks.read_device_identification((uint8_t) id, str);
err = nmbs->callbacks.read_device_identification((uint8_t) id, str, nmbs->callbacks.arg);
if (err != NMBS_ERROR_NONE) {
if (nmbs_error_is_exception(err))
return send_exception_msg(nmbs, err);
Expand Down
2 changes: 1 addition & 1 deletion nanomodbus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ typedef struct nmbs_callbacks {

#ifndef NMBS_SERVER_READ_DEVICE_IDENTIFICATION_DISABLED
#define NMBS_DEVICE_IDENTIFICATION_STRING_LENGTH 128
nmbs_error (*read_device_identification)(uint8_t object_id, char buffer[NMBS_DEVICE_IDENTIFICATION_STRING_LENGTH]);
nmbs_error (*read_device_identification)(uint8_t object_id, char buffer[NMBS_DEVICE_IDENTIFICATION_STRING_LENGTH], void* arg);
nmbs_error (*read_device_identification_map)(nmbs_bitfield_256 map);
#endif
#endif
Expand Down