robin/taspromto
1
0
Fork 0
mirror of https://codeberg.org/icewind/taspromto.git synced 2026-08-02 12:14:45 +02:00
Code Issues Projects Releases Wiki Activity

cleanup dsmr

Browse source
This commit is contained in:
Robin Appelman 2026-06-27 00:13:40 +02:00
commit 74463cc56e
5 changed files with 114 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/main.rs
View file

@ -4,7 +4,7 @@ mod mqtt;
mod topic;
use crate::config::{Config, ListenConfig};
use crate::device::{Device, DeviceStates, format_device_state, format_dsmr_state};
use crate::device::{Device, DeviceStates, format_device_state};
use crate::mqtt::mqtt_stream;
use crate::topic::Topic;
use clap::Parser;
@ -81,14 +81,17 @@ async fn serve(device_states: Arc<Mutex<DeviceStates>>, listen: ListenConfig) {
for (device, state) in state.devices() {
format_device_state(&mut response, device, state).unwrap();
}
for (device, state) in state.dsmr_devices() {
format_dsmr_state(&mut response, device.hostname.as_str(), state).unwrap();
for (_, state) in state.dsmr_devices() {
write!(&mut response, "{}", state.format_open_metrics())
.expect("formatting failed");
}
for (_, state) in state.mi_temp() {
write!(&mut response, "{}", state.format_prometheus()).expect("formatting failed");
write!(&mut response, "{}", state.format_open_metrics())
.expect("formatting failed");
}
for (_, state) in state.rf_temp() {
write!(&mut response, "{}", state.format_prometheus()).expect("formatting failed");
write!(&mut response, "{}", state.format_open_metrics())
.expect("formatting failed");
}
response
});