try decoding the dcf77 bits myself

This commit is contained in:
Dominic 2023-10-08 23:06:19 +02:00
parent e9050fa59e
commit 4da353ab28
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
3 changed files with 44 additions and 41 deletions

16
Cargo.lock generated
View file

@ -168,15 +168,6 @@ dependencies = [
"syn 2.0.37", "syn 2.0.37",
] ]
[[package]]
name = "dcf77_utils"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "824d8617af2b569a01b5498c76efa9dca0acba748d4b339d5fbe3c7e28cb4cfb"
dependencies = [
"radio_datetime_utils",
]
[[package]] [[package]]
name = "defmt" name = "defmt"
version = "0.3.5" version = "0.3.5"
@ -234,7 +225,6 @@ version = "0.1.0"
dependencies = [ dependencies = [
"cortex-m", "cortex-m",
"cortex-m-rt", "cortex-m-rt",
"dcf77_utils",
"defmt", "defmt",
"defmt-rtt", "defmt-rtt",
"embassy-executor", "embassy-executor",
@ -701,12 +691,6 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "radio_datetime_utils"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95cdd3b90edcd89072979b07d58b98573e6042d7d79f9b3c43aa14ceea645d6e"
[[package]] [[package]]
name = "rand_core" name = "rand_core"
version = "0.6.4" version = "0.6.4"

View file

@ -6,7 +6,6 @@ edition = "2021"
[dependencies] [dependencies]
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
cortex-m-rt = "0.7" cortex-m-rt = "0.7"
dcf77_utils = "0.5"
defmt = "0.3" defmt = "0.3"
defmt-rtt = "0.3" defmt-rtt = "0.3"
# potentially use executor-interrupt instead of executor-thread for cortex-m architectures # potentially use executor-interrupt instead of executor-thread for cortex-m architectures

View file

@ -3,11 +3,14 @@
#![feature(async_fn_track_caller, type_alias_impl_trait)] #![feature(async_fn_track_caller, type_alias_impl_trait)]
#![warn(rust_2018_idioms)] #![warn(rust_2018_idioms)]
#![forbid(elided_lifetimes_in_paths, unsafe_code)] #![forbid(elided_lifetimes_in_paths, unsafe_code)]
// STOP HIGHLIGHTING MY ENTIRE CODE RED YOU MOTHERFUCKING PEACE OF GARBAGE SOFTWARE
// SOMETIMES I AM WRITING CODE BEFORE I INSERT A BREAK SOMEWHERE
// ARE YOU AWARE THAT CODING DOESN'T PRODUCE FINISHED CODE IN A MILLISECOND???????
#![allow(clippy::never_loop, unreachable_code)]
mod static_mutex; mod static_mutex;
use dcf77_utils::DCF77Utils; use defmt::{info, println, unwrap};
use defmt::{assert, info, println, unwrap};
use defmt_rtt as _; use defmt_rtt as _;
use embassy_executor::Spawner; use embassy_executor::Spawner;
use embassy_stm32::{ use embassy_stm32::{
@ -62,34 +65,51 @@ async fn query_time(mut pon: POn, mut tco: Tco, interval: Duration) {
loop { loop {
pon.set_low(); pon.set_low();
info!("Waiting"); info!("Waiting");
tco.wait_for_falling_edge().await;
info!("Receiving");
let mut dcf77 = DCF77Utils::new(); // we need to find the minute marker
let start = Instant::now(); // that means we won't receive a transmission for an entire second
tco.wait_for_rising_edge().await;
loop { loop {
tco.wait_for_any_edge().await; tco.wait_for_falling_edge().await;
let elapsed = start.elapsed(); let start = Instant::now();
while elapsed.as_secs() > dcf77.get_second() as u64 { tco.wait_for_rising_edge().await;
dcf77.increase_second(); // our starting edge should have at least 800ms from the previous second,
} // and then a full second.
dcf77.handle_new_edge(tco.is_low(), start.elapsed().as_millis() as u32); if start.elapsed().as_millis() > 1500 {
if dcf77.get_second() + 1 == dcf77.get_next_minute_length() {
dcf77.decode_time();
let datetime = dcf77.get_radio_datetime();
println!(
"{}.{}.{} {}:{}",
datetime.get_day(),
datetime.get_month(),
datetime.get_year(),
datetime.get_hour(),
datetime.get_minute()
);
break; break;
} }
} }
let mut start = Instant::now();
info!("Receiving");
// we always start on the rising edge, with `start` set already
const SECONDS: usize = 60;
let mut bytes = [0u64; SECONDS];
let mut timing = [0u64; SECONDS];
for i in 0 .. SECONDS {
tco.wait_for_falling_edge().await;
bytes[i] = start.elapsed().as_millis();
tco.wait_for_rising_edge().await;
timing[i] = start.elapsed().as_millis();
start = Instant::now();
}
pon.set_high(); pon.set_high();
info!("Done");
for i in 0 .. SECONDS {
let data = match (bytes[i], timing[i]) {
(75 ..= 174, 900 ..= 1100) => "0",
(175 ..= 300, 900 ..= 1100) => "1",
_ => "GARBAGE"
};
println!(
"Bit {:02}: on for {:04} ms of {:04} ms total -- {:02}: {}",
i, bytes[i], timing[i], i, data
);
Timer::after(Duration::from_millis(50)).await;
}
Timer::after(interval).await; Timer::after(interval).await;
} }
@ -107,6 +127,6 @@ async fn main(spawner: Spawner) {
LED.init(Output::new(p.PA5, Level::Low, Speed::Low)).await; LED.init(Output::new(p.PA5, Level::Low, Speed::Low)).await;
let button = ExtiInput::new(Input::new(p.PC13, Pull::Up), p.EXTI13); let button = ExtiInput::new(Input::new(p.PC13, Pull::Up), p.EXTI13);
unwrap!(spawner.spawn(blinker(Duration::from_millis(500)))); unwrap!(spawner.spawn(blinker(Duration::from_millis(120))));
unwrap!(spawner.spawn(button_handler(button))); unwrap!(spawner.spawn(button_handler(button)));
} }