diff --git a/src/bin/dual-iir.rs b/src/bin/dual-iir.rs index fb128af..5d51632 100644 --- a/src/bin/dual-iir.rs +++ b/src/bin/dual-iir.rs @@ -6,10 +6,7 @@ use stm32h7xx_hal as hal; use stabilizer::hardware; -use miniconf::{ - embedded_nal::{IpAddr, Ipv4Addr}, - minimq, Miniconf, MqttInterface, -}; +use miniconf::{minimq, Miniconf, MqttInterface}; use serde::Deserialize; use dsp::iir; @@ -62,9 +59,12 @@ const APP: () = { let mqtt_interface = { let mqtt_client = { - let broker = IpAddr::V4(Ipv4Addr::new(10, 34, 16, 10)); - minimq::MqttClient::new(broker, "", stabilizer.net.stack) - .unwrap() + minimq::MqttClient::new( + hardware::design_parameters::MQTT_BROKER.into(), + "", + stabilizer.net.stack, + ) + .unwrap() }; MqttInterface::new( diff --git a/src/bin/lockin-external.rs b/src/bin/lockin-external.rs index ebfddd8..306ae45 100644 --- a/src/bin/lockin-external.rs +++ b/src/bin/lockin-external.rs @@ -4,10 +4,7 @@ use generic_array::typenum::U4; -use miniconf::{ - embedded_nal::{IpAddr, Ipv4Addr}, - minimq, Miniconf, MqttInterface, -}; +use miniconf::{minimq, Miniconf, MqttInterface}; use serde::Deserialize; use dsp::{Accu, Complex, ComplexExt, Lockin, RPLL}; @@ -77,11 +74,12 @@ const APP: () = { let (mut stabilizer, _pounder) = setup(c.core, c.device); let mqtt_interface = { - let mqtt_client = { - let broker = IpAddr::V4(Ipv4Addr::new(10, 34, 16, 10)); - minimq::MqttClient::new(broker, "", stabilizer.net.stack) - .unwrap() - }; + let mqtt_client = minimq::MqttClient::new( + design_parameters::MQTT_BROKER.into(), + "", + stabilizer.net.stack, + ) + .unwrap(); MqttInterface::new( mqtt_client, diff --git a/src/hardware/design_parameters.rs b/src/hardware/design_parameters.rs index ddc0614..9a4279b 100644 --- a/src/hardware/design_parameters.rs +++ b/src/hardware/design_parameters.rs @@ -49,3 +49,6 @@ pub const ADC_SAMPLE_TICKS: u16 = 1 << ADC_SAMPLE_TICKS_LOG2; // The desired ADC sample processing buffer size. pub const SAMPLE_BUFFER_SIZE_LOG2: u8 = 3; pub const SAMPLE_BUFFER_SIZE: usize = 1 << SAMPLE_BUFFER_SIZE_LOG2; + +// The MQTT broker IPv4 address +pub const MQTT_BROKER: [u8; 4] = [10, 34, 16, 10];