Skip to content

Work around devices without end model like some SMA inverters. #20

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

Merged
bikeshedder merged 1 commit into from
Dec 10, 2024
Merged

Work around devices without end model like some SMA inverters. #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 17 additions & 5 deletions src/client/async.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,16 +150,28 @@ async fn discover_models(

let mut models = Models::default();
let mut unknown_models: Vec<UnknownModel> = vec![];
let mut model_count = 0;

loop {
let [model_id, len] = apply_timeout(
read_holding_registers_array::<2>(client, addr),
read_timeout,
)
.await?;
let res = apply_timeout(read_holding_registers_array::<2>(client, addr), read_timeout).await;
let [model_id, len] = match res {
Ok(d) => d,
Err(ModbusError::IllegalDataAddress) => {
if model_count > 0 {
[0xFFFF, 0] //simulate end for devices without end model
} else {
return Err(DiscoveryError::ModbusError(ModbusError::IllegalDataAddress));
}
}
Err(e) => return Err(DiscoveryError::ModbusError(e)),
};

if model_id == 0xFFFF {
break;
}

model_count += 1;

addr = addr.checked_add(2).ok_or(DiscoveryError::AddressOverflow)?;
if !models.set_addr(model_id, addr, len) {
unknown_models.push(UnknownModel {
Expand Down
Loading