Dreaded_X/pico_p1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Send received data over socket directly instead of parsing it

Browse Source
This commit is contained in:
Dreaded_X 2023-06-29 20:55:09 +02:00
parent b157016942
commit f314387b8a
Signed by: Dreaded_X
GPG Key ID: FA5F485356B0D2D4
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main.rs
View File

@ -15,7 +15,7 @@ use embassy_rp::{
uart::{self, BufferedUartRx, Parity}, uart::{self, BufferedUartRx, Parity},
}; };
use embedded_io::asynch::Read; use embedded_io::asynch::{Read, Write};
use embassy_sync::{ use embassy_sync::{
blocking_mutex::raw::NoopRawMutex, blocking_mutex::raw::NoopRawMutex,
@ -274,24 +274,25 @@ async fn main(spawner: Spawner) {
warn!("Read error: {:?}", e); warn!("Read error: {:?}", e);
} }
Either::Second(readout) => { Either::Second(readout) => {
let telegram = readout.to_telegram().unwrap(); socket.write_all(&readout.buffer).await.unwrap();
debug!("checksum: {}", telegram.checksum);
debug!("prefix: {}", telegram.prefix);
debug!("identification: {}", telegram.identification);
let state = dsmr5::Result::<dsmr5::state::State>::from(&telegram).unwrap();
debug!("datetime: {}", state.datetime.unwrap().year);
debug!("meterreadings[0]: {}", state.meterreadings[0].to.unwrap());
debug!("meterreadings[1]: {}", state.meterreadings[1].to.unwrap());
debug!("slave:");
debug!("\tdevice_type: {}", state.slaves[0].device_type.unwrap());
debug!(
"\tmeter_reading: {}",
state.slaves[0].meter_reading.as_ref().unwrap().1
);
// let telegram = readout.to_telegram().unwrap();
//
// debug!("checksum: {}", telegram.checksum);
// debug!("prefix: {}", telegram.prefix);
// debug!("identification: {}", telegram.identification);
//
// let state = dsmr5::Result::<dsmr5::state::State>::from(&telegram).unwrap();
// debug!("datetime: {}", state.datetime.unwrap().year);
// debug!("meterreadings[0]: {}", state.meterreadings[0].to.unwrap());
// debug!("meterreadings[1]: {}", state.meterreadings[1].to.unwrap());
//
// debug!("slave:");
// debug!("\tdevice_type: {}", state.slaves[0].device_type.unwrap());
// debug!(
// "\tmeter_reading: {}",
// state.slaves[0].meter_reading.as_ref().unwrap().1
// );
} }
// Either::Second(message) => match socket.write(&message).await { // Either::Second(message) => match socket.write(&message).await {
// Ok(_) => {} // Ok(_) => {}