Skip to content

Issue#3849 fix backported to 2.9 #3857

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
JTrantow wants to merge 3 commits into
base: 2.9
Choose a base branch
from
+3 −5
Open

Issue#3849 fix backported to 2.9 #3857

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
582951b
Issue#3849 fix backported to 2.9
Mar 10, 2026
cbd8d09
Back to original voodoo caused by conflating modbus timing calculatio…
Mar 10, 2026
2b20cd1
Fix msg and reverse (baudrate > 19200).
Mar 11, 2026
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
8 changes: 3 additions & 5 deletions src/hal/drivers/mesa-hostmot2/hm2_modbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,10 +387,10 @@ static unsigned calc_ifdelay(hm2_modbus_inst_t *inst, unsigned baudrate, unsigne
}

// calculation works for baudrates less than ~24 Mbit/s
if(baudrate <= 19200)
if(baudrate > 19200)
return (175u * baudrate + 99999u) / 100000u;
unsigned bits = 1 + 8 + (parity ? 1 : 0) + (stopbits > 1 ? 2 : 1);
return (bits * 35 + 9) / 10; // Bit-times * 3.5 rounded up
return (bits * 35 + 9) / 10; // Ceil of bits in 3.5 characters.
}

//
Expand Down Expand Up @@ -1049,12 +1049,10 @@ static void process(void *arg, long period)
break;
}
if(inst->maxicharbits && HM2_PKTUART_RCR_ICHARBITS_VAL(frsize) > inst->maxicharbits) {
MSG_WARN("%s: warning: reply to command %u had too long inter-character delay (%u > %u), dropping\n",
MSG_WARN("%s: warning: reply to command %u had too long inter-character delay (%u > %u), trying to interpret\n",
inst->name, inst->cmdidx,
HM2_PKTUART_RCR_ICHARBITS_VAL(frsize), inst->maxicharbits);
set_error(inst, ENOMSG);
force_resend(inst);
break;
}
inst->rxdata[0] = 0; // This will fail the parse packet if the read did not resolve
r = hm2_pktuart_queue_read_data(inst->uart, inst->rxdata, HM2_PKTUART_RCR_NBYTES_VAL(frsize));
Expand Down
Loading