diff --git a/Cargo.lock b/Cargo.lock index a049cd5..96b2356 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -310,8 +310,8 @@ checksum = "1c1de5542ea7a8e8654e93e3d00b28c1f3318f95b0f270240685c9eeeb300986" [[package]] name = "profirust" -version = "0.2.0" -source = "git+https://github.com/rahix/profirust.git?rev=6274541806f2b5fb8cfdffb641ca8fa452806c81#6274541806f2b5fb8cfdffb641ca8fa452806c81" +version = "0.6.0" +source = "git+https://github.com/rahix/profirust.git?rev=0a1396c3ef44aa479f1ba9d7586c86f0b9621a0e#0a1396c3ef44aa479f1ba9d7586c86f0b9621a0e" dependencies = [ "bitflags 2.5.0", "bitvec", diff --git a/Cargo.toml b/Cargo.toml index a8066e6..13e2ada 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ process-image = "0.2.1" [dependencies.profirust] # version = 0.2.0 git = "https://github.com/rahix/profirust.git" -rev = "6274541806f2b5fb8cfdffb641ca8fa452806c81" +rev = "0a1396c3ef44aa479f1ba9d7586c86f0b9621a0e" default-features = false features = ["phy-linux", "std"] diff --git a/src/fieldbus.rs b/src/fieldbus.rs index 73608a1..c013657 100644 --- a/src/fieldbus.rs +++ b/src/fieldbus.rs @@ -144,10 +144,10 @@ fn fieldbus_task(fieldbus_data: Arc>) { dp::Peripheral::new( RIO_ADDRESS, options, - &mut buffer_inputs, - &mut buffer_outputs, + &mut buffer_inputs[..], + &mut buffer_outputs[..], ) - .with_diag_buffer(&mut buffer_diagnostics), + .with_diag_buffer(&mut buffer_diagnostics[..]), ); peripherals.push(PeripheralInfo { @@ -175,7 +175,8 @@ fn fieldbus_task(fieldbus_data: Arc>) { loop { let now = profirust::time::Instant::now(); - let events = fdl.poll(now, &mut phy, &mut dp_master); + fdl.poll(now, &mut phy, &mut dp_master); + let events = dp_master.take_last_events(); { let mut data = fieldbus_data.lock().unwrap();