Updated stm32 example to use the new filter.

Author: davidv1992

statime-stm32/src/ethernet.rs

@@ -1,6 +1,5 @@
 use core::task::Poll;
 
-use super::{Monotonic, Systick};
 use defmt::unwrap;
 use futures::future::poll_fn;
 use ieee802_3_miim::{
@@ -21,6 +20,8 @@ use stm32_eth::{
 };
 use stm32f7xx_hal::signature::Uid;
 
+use super::{Monotonic, Systick};
+
 pub struct DmaResources {
     pub rx_ring: [RxRingEntry; 2],
     pub tx_ring: [TxRingEntry; 2],
@@ -127,12 +128,8 @@ pub fn setup_smoltcp(
         unwrap!(a.push(IpCidr::new(IpAddress::v4(10, 0, 0, 2), 24)));
     });
 
-    unwrap!(interface.join_multicast_group(
-        Ipv4Address::new(224, 0, 1, 129)
-    ));
-    unwrap!(interface.join_multicast_group(
-        Ipv4Address::new(224, 0, 0, 107)
-    ));
+    unwrap!(interface.join_multicast_group(Ipv4Address::new(224, 0, 1, 129)));
+    unwrap!(interface.join_multicast_group(Ipv4Address::new(224, 0, 0, 107)));
 
     defmt::info!("Set IPs to: {}", interface.ip_addrs());
 

statime-stm32/src/main.rs

@@ -17,7 +17,7 @@ use smoltcp::{
     socket::dhcpv4,
     wire::{IpCidr, Ipv4Address, Ipv4Cidr},
 };
-use statime::{filters::BasicFilter, port::TimestampContext, PtpInstance};
+use statime::{filters::KalmanFilter, port::TimestampContext, PtpInstance};
 use stm32_eth::{dma::PacketId, EthPins, Parts, PartsIn};
 use stm32f7xx_hal::{
     gpio::{Output, Pin, Speed},
@@ -37,7 +37,7 @@ mod port;
 mod ptp_clock;
 mod ptp_state_mutex;
 
-type StmPtpInstance = PtpInstance<BasicFilter, PtpStateMutex>;
+type StmPtpInstance = PtpInstance<KalmanFilter, PtpStateMutex>;
 
 defmt::timestamp!("{=u64:iso8601ms}", {
     let time = stm32_eth::ptp::EthernetPTP::get_time();
@@ -220,8 +220,9 @@ mod app {
                 .unwrap_or_else(|_| defmt::panic!("Failed to start instance bmca"));
 
             // Poll network interfaces and run DHCP
-            // poll_smoltcp::spawn().unwrap_or_else(|_| defmt::panic!("Failed to start poll_smoltcp"));
-            // dhcp::spawn(dhcp_socket).unwrap_or_else(|_| defmt::panic!("Failed to start dhcp"));
+            // poll_smoltcp::spawn().unwrap_or_else(|_| defmt::panic!("Failed to
+            // start poll_smoltcp")); dhcp::spawn(dhcp_socket).
+            // unwrap_or_else(|_| defmt::panic!("Failed to start dhcp"));
         }
 
         (

statime-stm32/src/port.rs

@@ -12,7 +12,7 @@ use statime::{
         AcceptAnyMaster, ClockIdentity, ClockQuality, DelayMechanism, InstanceConfig, PortConfig,
         PtpMinorVersion, SdoId, TimePropertiesDS, TimeSource,
     },
-    filters::BasicFilter,
+    filters::KalmanFilter,
     port::{InBmca, NoForwardedTLVs, PortAction, PortActionIterator, Running, TimestampContext},
     time::{Duration, Interval, Time},
     PtpInstance,
@@ -30,7 +30,7 @@ type StmPort<State> = statime::port::Port<
     AcceptAnyMaster,
     Rng,
     &'static PtpClock,
-    BasicFilter,
+    KalmanFilter,
     PtpStateMutex,
 >;
 
@@ -307,9 +307,7 @@ pub fn setup_statime(
         minor_ptp_version: PtpMinorVersion::One,
     };
 
-    let filter_config = 0.1;
-
-    let ptp_port = ptp_instance.add_port(port_config, filter_config, ptp_clock, rng);
+    let ptp_port = ptp_instance.add_port(port_config, Default::default(), ptp_clock, rng);
 
     (ptp_instance, ptp_port)
 }