mirror of
https://github.com/Djeeberjr/fw-anwesenheit.git
synced 2025-07-01 16:54:17 +00:00
added buzzer
This commit is contained in:
parent
a9bbc61300
commit
ad009f987d
33
Cargo.lock
generated
33
Cargo.lock
generated
@ -79,9 +79,18 @@ name = "fw-anwesenheit"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
|
"gpio",
|
||||||
"regex",
|
"regex",
|
||||||
|
"serde",
|
||||||
|
"serde_json",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gpio"
|
||||||
|
version = "0.4.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4fe6783270536547ac473c9d2ae5a7e0e715ea43f29004ced47fbd1c1372d2c7"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "iana-time-zone"
|
name = "iana-time-zone"
|
||||||
version = "0.1.63"
|
version = "0.1.63"
|
||||||
@ -106,6 +115,12 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "itoa"
|
||||||
|
version = "1.0.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "js-sys"
|
name = "js-sys"
|
||||||
version = "0.3.77"
|
version = "0.3.77"
|
||||||
@ -202,6 +217,12 @@ version = "1.0.20"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
|
checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ryu"
|
||||||
|
version = "1.0.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.219"
|
version = "1.0.219"
|
||||||
@ -222,6 +243,18 @@ dependencies = [
|
|||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "serde_json"
|
||||||
|
version = "1.0.140"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
|
||||||
|
dependencies = [
|
||||||
|
"itoa",
|
||||||
|
"memchr",
|
||||||
|
"ryu",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "shlex"
|
name = "shlex"
|
||||||
version = "1.3.0"
|
version = "1.3.0"
|
||||||
|
@ -5,4 +5,7 @@ edition = "2024"
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = { version = "0.4.40", features = ["serde"] }
|
chrono = { version = "0.4.40", features = ["serde"] }
|
||||||
|
gpio = "0.4.1"
|
||||||
regex = "1.11.1"
|
regex = "1.11.1"
|
||||||
|
serde = { version = "1.0.219", features = ["derive"] }
|
||||||
|
serde_json = "1.0.140"
|
||||||
|
40
src/buzzer.rs
Normal file
40
src/buzzer.rs
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
use rppal::gpio::Gpio;
|
||||||
|
use std::{thread, time};
|
||||||
|
|
||||||
|
/// Gibt einen Ton auf einem passiven Buzzer aus.
|
||||||
|
pub fn modulated_tone(pin_num: u8, carrier_hz: u32, sound_hz: u32, duration_ms: u64) {
|
||||||
|
let gpio = Gpio::new().expect("GPIO konnte nicht initialisiert werden");
|
||||||
|
let mut pin = gpio.get(pin_num).expect("Pin konnte nicht geöffnet werden").into_output();
|
||||||
|
|
||||||
|
let carrier_period = time::Duration::from_micros((1_000_000.0 / carrier_hz as f64 / 2.0) as u64);
|
||||||
|
let mod_period = 1_000.0 / sound_hz as f64; // in ms
|
||||||
|
let total_cycles = duration_ms as f64 / mod_period;
|
||||||
|
|
||||||
|
for _ in 0..total_cycles as u64 {
|
||||||
|
// Modulations-Ein: Träger an für mod_period / 2
|
||||||
|
let cycles_on = (carrier_hz as f64 * (mod_period / 2.0) / 1000.0) as u64;
|
||||||
|
for _ in 0..cycles_on {
|
||||||
|
pin.set_high();
|
||||||
|
thread::sleep(carrier_period);
|
||||||
|
pin.set_low();
|
||||||
|
thread::sleep(carrier_period);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Modulations-Aus: Träger aus für mod_period / 2
|
||||||
|
let pause = time::Duration::from_millis((mod_period / 2.0) as u64);
|
||||||
|
thread::sleep(pause);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn beep_ack() {
|
||||||
|
// GPIO 17, Träger = 2300 Hz, Ton = 440 Hz, Dauer = 1 Sekunde
|
||||||
|
modulated_tone(4, 2300, 500, 500);
|
||||||
|
modulated_tone(4, 2300, 700, 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn beep_nak() {
|
||||||
|
// GPIO 17, Träger = 2300 Hz, Ton = 440 Hz, Dauer = 1 Sekunde
|
||||||
|
modulated_tone(4, 2300, 700, 500);
|
||||||
|
modulated_tone(4, 2300, 500, 500);
|
||||||
|
}
|
||||||
|
|
@ -1,30 +1,39 @@
|
|||||||
use std::collections::HashMap;
|
use std::{collections::HashMap, error::Error, fs::{self, read_to_string}, result};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
#[derive(PartialEq, Eq)]
|
#[derive(PartialEq, Eq)]
|
||||||
|
#[derive(Deserialize, Serialize)]
|
||||||
struct TellyID (String);
|
struct TellyID (String);
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize)]
|
||||||
struct AttendanceDay {
|
struct AttendanceDay {
|
||||||
date: String,
|
date: String,
|
||||||
ids: Vec<TellyID>,
|
ids: Vec<TellyID>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Serialize)]
|
||||||
struct IDStore {
|
struct IDStore {
|
||||||
days: HashMap<String,AttendanceDay>
|
days: HashMap<String,AttendanceDay>
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IDStore {
|
impl IDStore {
|
||||||
|
|
||||||
fn new() -> Self {
|
fn new() -> Self {
|
||||||
IDStore{
|
IDStore{
|
||||||
days: HashMap::new(),
|
days: HashMap::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn new_from_json(filepath:&str) -> Result<Self, Box<dyn Error>>{
|
||||||
|
let readed_string = fs::read_to_string(filepath)?;
|
||||||
|
Ok(serde_json::from_str(&readed_string)?)
|
||||||
|
}
|
||||||
|
|
||||||
fn add_id(&mut self, id: TellyID){
|
fn add_id(&mut self, id: TellyID){
|
||||||
let day = self.get_current_day();
|
let day = self.get_current_day();
|
||||||
|
|
||||||
day.add_id(id);
|
day.add_id(id);
|
||||||
|
|
||||||
self.clean_map();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_current_day(&mut self) -> &mut AttendanceDay {
|
fn get_current_day(&mut self) -> &mut AttendanceDay {
|
||||||
@ -39,8 +48,10 @@ impl IDStore {
|
|||||||
self.days.get_mut(¤t_day.clone()).unwrap()
|
self.days.get_mut(¤t_day.clone()).unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn clean_map(&mut self){
|
fn export_jason(&self, filepath:&str) -> Result <(), Box<dyn Error>> {
|
||||||
todo!()
|
|
||||||
|
// Serialize it to a JSON string and safe it in filepath file
|
||||||
|
Ok(fs::write("attendence_list.json", serde_json::to_string(&self)?)?)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -56,7 +67,6 @@ impl AttendanceDay {
|
|||||||
if self.ids.contains(&id) {
|
if self.ids.contains(&id) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
self.ids.push(id);
|
self.ids.push(id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ use pm3::run_pm3;
|
|||||||
mod parser;
|
mod parser;
|
||||||
mod pm3;
|
mod pm3;
|
||||||
mod id_store;
|
mod id_store;
|
||||||
|
mod buzzer;
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
run_pm3().unwrap();
|
run_pm3().unwrap();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user