Skip to content

Add multi-device support #19

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 2 commits into from
Dec 10, 2024
Merged

Add multi-device support #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4c66cf
Update models subrepo
bikeshedder Dec 10, 2024
c975227
Add multi-device support
bikeshedder Nov 4, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [0.8.0] - 2024-12-10

### Added

- Add multi device support

### Changed

- Update `tokio-modbus` to version `0.16`
Expand Down
14 changes: 6 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use sunspec::{
models::{model1::Model1, model103::Model103},
};
use tokio::time::sleep;
use tokio_modbus::{client::tcp::connect_slave, Slave};
use tokio_modbus::client::tcp::connect;

#[derive(Parser)]
struct Args {
Expand All @@ -62,12 +62,10 @@ struct Args {
async fn main() -> Result<(), Box<dyn Error>> {
let args = Args::parse();

let mut client = AsyncClient::new(
connect_slave(args.addr, Slave(args.device_id)).await?,
Config::default(),
).await?;
let client = AsyncClient::new(connect(args.addr).await?, Config::default());
let device = client.device(args.device_id).await?;

let m1: Model1 = client.read_model().await?;
let m1: Model1 = device.read_model().await?;

println!("Manufacturer: {}", m1.mn);
println!("Model: {}", m1.md);
Expand All @@ -76,7 +74,7 @@ async fn main() -> Result<(), Box<dyn Error>> {

println!(
"Supported models: {}",
client
device
.models
.supported_model_ids()
.iter()
Expand All @@ -85,7 +83,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
);

loop {
let m103: Model103 = client.read_model().await?;
let m103: Model103 = device.read_model().await?;
let w = m103.w as f32 * 10f32.powf(m103.w_sf.into());
let wh = m103.wh as f32 * 10f32.powf(m103.wh_sf.into());
println!("{:12.3} kWh {:9.3} kW", wh / 1000.0, w / 1000.0,);
Expand Down
16 changes: 8 additions & 8 deletions examples/model103/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use sunspec::{
models::model1::Model1,
};
use tokio::time::sleep;
use tokio_modbus::{client::tcp::connect_slave, Slave};
use tokio_modbus::client::tcp::connect;

#[derive(Parser)]
struct Args {
Expand Down Expand Up @@ -37,18 +37,18 @@ struct Args {
async fn main() -> Result<(), Box<dyn Error>> {
let args = Args::parse();

let mut client = AsyncClient::new(
connect_slave(args.addr, Slave(args.device_id)).await?,
let client = AsyncClient::new(
connect(args.addr).await?,
Config {
discovery_addresses: args.discovery_addresses,
read_timeout: (args.read_timeout != 0.0)
.then(|| Duration::from_secs_f32(args.read_timeout)),
..Default::default()
},
)
.await?;
);

let m1: Model1 = client.read_model().await?;
let device = client.device(args.device_id).await?;
let m1: Model1 = device.read_model().await?;

println!("Manufacturer: {}", m1.mn);
println!("Model: {}", m1.md);
Expand All @@ -57,7 +57,7 @@ async fn main() -> Result<(), Box<dyn Error>> {

println!(
"Supported models: {}",
client
device
.models
.supported_model_ids()
.iter()
Expand All @@ -66,7 +66,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
);

loop {
let m103: Model103 = client.read_model().await?;
let m103: Model103 = device.read_model().await?;
let w = m103.w as f32 * 10f32.powf(m103.w_sf.into());
let wh = m103.wh as f32 * 10f32.powf(m103.wh_sf.into());
println!("{:12.3} kWh {:9.3} kW", wh / 1000.0, w / 1000.0,);
Expand Down
15 changes: 6 additions & 9 deletions examples/readme/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use sunspec::{
models::{model1::Model1, model103::Model103},
};
use tokio::time::sleep;
use tokio_modbus::{client::tcp::connect_slave, Slave};
use tokio_modbus::client::tcp::connect;

#[derive(Parser)]
struct Args {
Expand All @@ -19,13 +19,10 @@ struct Args {
async fn main() -> Result<(), Box<dyn Error>> {
let args = Args::parse();

let mut client = AsyncClient::new(
connect_slave(args.addr, Slave(args.device_id)).await?,
Config::default(),
)
.await?;
let client = AsyncClient::new(connect(args.addr).await?, Config::default());
let device = client.device(args.device_id).await?;

let m1: Model1 = client.read_model().await?;
let m1: Model1 = device.read_model().await?;

println!("Manufacturer: {}", m1.mn);
println!("Model: {}", m1.md);
Expand All @@ -34,7 +31,7 @@ async fn main() -> Result<(), Box<dyn Error>> {

println!(
"Supported models: {}",
client
device
.models
.supported_model_ids()
.iter()
Expand All @@ -43,7 +40,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
);

loop {
let m103: Model103 = client.read_model().await?;
let m103: Model103 = device.read_model().await?;
let w = m103.w as f32 * 10f32.powf(m103.w_sf.into());
let wh = m103.wh as f32 * 10f32.powf(m103.wh_sf.into());
println!("{:12.3} kWh {:9.3} kW", wh / 1000.0, w / 1000.0,);
Expand Down
2 changes: 1 addition & 1 deletion models
Open in desktop
Submodule models updated 43 files
+1 −1 .clabot
+2 −0 .gitignore
+31 −9 json/model_1.json
+1 −1 json/model_101.json
+1 −1 json/model_102.json
+1 −1 json/model_103.json
+1 −1 json/model_111.json
+1 −1 json/model_112.json
+1 −1 json/model_113.json
+1 −1 json/model_124.json
+2 −2 json/model_201.json
+1 −1 json/model_202.json
+1 −1 json/model_203.json
+1 −1 json/model_204.json
+1 −1 json/model_211.json
+1 −1 json/model_212.json
+1 −1 json/model_213.json
+1 −1 json/model_214.json
+1 −1 json/model_220.json
+2 −2 json/model_401.json
+2 −2 json/model_402.json
+2 −2 json/model_403.json
+2 −2 json/model_404.json
+1 −1 json/model_501.json
+177 −73 json/model_701.json
+158 −59 json/model_702.json
+46 −13 json/model_703.json
+135 −54 json/model_704.json
+90 −24 json/model_705.json
+72 −19 json/model_706.json
+66 −19 json/model_707.json
+66 −19 json/model_708.json
+66 −19 json/model_709.json
+66 −19 json/model_710.json
+68 −19 json/model_711.json
+69 −21 json/model_712.json
+25 −9 json/model_713.json
+3 −1 json/model_715.json
+6 −1 json/schema.json
+7 −3 smdx/manifest.py
+128 −0 utils/add_sunspec_comments.py
+117 −0 utils/add_sunspec_detail.py
+140 −0 utils/add_sunspec_standards.py
Loading
Loading