Compare commits
1 Commits
develop
...
feature/en
Author | SHA1 | Date | |
---|---|---|---|
45171346bd |
@ -11,6 +11,8 @@ pub struct NetworkConfig {
|
|||||||
pub password: Option<heapless::String<64>>,
|
pub password: Option<heapless::String<64>>,
|
||||||
pub mqtt_url: Option<heapless::String<128>>,
|
pub mqtt_url: Option<heapless::String<128>>,
|
||||||
pub base_topic: Option<heapless::String<64>>,
|
pub base_topic: Option<heapless::String<64>>,
|
||||||
|
pub mqtt_user: Option<heapless::String<32>>,
|
||||||
|
pub mqtt_password: Option<heapless::String<64>>,
|
||||||
pub max_wait: u32,
|
pub max_wait: u32,
|
||||||
}
|
}
|
||||||
impl Default for NetworkConfig {
|
impl Default for NetworkConfig {
|
||||||
@ -21,6 +23,8 @@ impl Default for NetworkConfig {
|
|||||||
password: None,
|
password: None,
|
||||||
mqtt_url: None,
|
mqtt_url: None,
|
||||||
base_topic: None,
|
base_topic: None,
|
||||||
|
mqtt_user: None,
|
||||||
|
mqtt_password: None,
|
||||||
max_wait: 10000,
|
max_wait: 10000,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -430,6 +430,8 @@ impl Esp<'_> {
|
|||||||
}),
|
}),
|
||||||
client_id: Some("plantctrl"),
|
client_id: Some("plantctrl"),
|
||||||
keep_alive_interval: Some(Duration::from_secs(60 * 60 * 2)),
|
keep_alive_interval: Some(Duration::from_secs(60 * 60 * 2)),
|
||||||
|
username: network_config.mqtt_user.as_ref().map(|v| &**v),
|
||||||
|
password: network_config.mqtt_password.as_ref().map(|v| &**v),
|
||||||
//room for improvement
|
//room for improvement
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user