added buzzer

src/buzzer.rs

@@ -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);
+}
+

src/id_store.rs

@@ -1,67 +1,77 @@
-use std::collections::HashMap;
-
-#[derive(PartialEq, Eq)]
-struct TellyID (String);
-
-struct AttendanceDay {
-    date: String,
-    ids: Vec<TellyID>,
-}
-
-struct IDStore {
-    days: HashMap<String,AttendanceDay>
-}
-
-impl IDStore {
-    fn new() -> Self {
-        IDStore{
-            days: HashMap::new(),
-        }
-    }
-
-    fn add_id(&mut self, id: TellyID){
-        let day = self.get_current_day();
-
-        day.add_id(id);
-
-        self.clean_map();
-    }
-
-    fn get_current_day(&mut self) -> &mut AttendanceDay {
-        let current_day = get_day_str();
-
-        if self.days.contains_key(&current_day) {
-            return self.days.get_mut(&current_day).unwrap();
-        }
-
-        self.days.insert(current_day.clone(), AttendanceDay::new(&current_day.clone()));
-
-        self.days.get_mut(&current_day.clone()).unwrap()
-    }
-
-    fn clean_map(&mut self){
-       todo!()
-    }
-}
-
-impl AttendanceDay {
-    fn new(day: &str) -> Self{
-        Self{
-            date: day.to_owned(),
-            ids: Vec::new(),
-        }
-    }
-
-    fn add_id(&mut self, id: TellyID){
-        if self.ids.contains(&id) {
-            return
-        } 
-
-        self.ids.push(id);
-    }
-}
-
-fn get_day_str() -> String {
-    let now = chrono::offset::Local::now();
-    now.format("%Y-%m-%d").to_string()
-}
+use std::{collections::HashMap, error::Error, fs::{self, read_to_string}, result};
+use serde::{Deserialize, Serialize};
+
+#[derive(PartialEq, Eq)]
+#[derive(Deserialize, Serialize)]
+struct TellyID (String);
+
+#[derive(Deserialize, Serialize)]
+struct AttendanceDay {
+    date: String,
+    ids: Vec<TellyID>,
+}
+
+#[derive(Deserialize, Serialize)]
+struct IDStore {
+    days: HashMap<String,AttendanceDay>
+}
+
+impl IDStore {
+    
+    fn new() -> Self {
+        IDStore{
+            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){
+        let day = self.get_current_day();
+
+        day.add_id(id);
+    
+    }
+
+    fn get_current_day(&mut self) -> &mut AttendanceDay {
+        let current_day = get_day_str();
+
+        if self.days.contains_key(&current_day) {
+            return self.days.get_mut(&current_day).unwrap();
+        }
+
+        self.days.insert(current_day.clone(), AttendanceDay::new(&current_day.clone()));
+
+        self.days.get_mut(&current_day.clone()).unwrap()
+    }
+
+    fn export_jason(&self, filepath:&str) -> Result <(), Box<dyn Error>> {
+
+        // Serialize it to a JSON string and safe it in filepath file
+        Ok(fs::write("attendence_list.json", serde_json::to_string(&self)?)?)
+    }
+}
+
+impl AttendanceDay {
+    fn new(day: &str) -> Self{
+        Self{
+            date: day.to_owned(),
+            ids: Vec::new(),
+        }
+    }
+
+    fn add_id(&mut self, id: TellyID){
+        if self.ids.contains(&id) {
+            return
+        } 
+        self.ids.push(id);
+    }
+}
+
+fn get_day_str() -> String {
+    let now = chrono::offset::Local::now();
+    now.format("%Y-%m-%d").to_string()
+}

src/main.rs

@@ -1,9 +1,10 @@
-use pm3::run_pm3;
-
-mod parser;
-mod pm3;
-mod id_store;
-
-fn main() {
-    run_pm3().unwrap();
-}
+use pm3::run_pm3;
+
+mod parser;
+mod pm3;
+mod id_store;
+mod buzzer;
+
+fn main() {
+    run_pm3().unwrap();
+}

src/parser.rs

@@ -1,8 +1,8 @@
-use regex::Regex;
-
-pub fn parse_line(line: &str) -> Option<String> {
-    let regex = Regex::new(r"(?m)^\[\+\] UID.... (.*)$").unwrap();
-    let result = regex.captures(line);
-
-    result.map(|c| c.get(1).unwrap().as_str().to_owned())
-}
+use regex::Regex;
+
+pub fn parse_line(line: &str) -> Option<String> {
+    let regex = Regex::new(r"(?m)^\[\+\] UID.... (.*)$").unwrap();
+    let result = regex.captures(line);
+
+    result.map(|c| c.get(1).unwrap().as_str().to_owned())
+}

src/pm3.rs

@@ -1,38 +1,38 @@
-use std::error::Error;
-use std::process::{Command, Stdio};
-use std::io::{self, BufRead};
-
-pub fn run_pm3() -> Result<(), Box<dyn Error>> {
-    let mut cmd = Command::new("stdbuf")
-        .arg("-oL")
-        .arg("pm3")
-        .arg("-c")
-        .arg("lf hitag reader -@")
-        .stdout(Stdio::piped())
-        .spawn()?;
-
-    let stdout = cmd.stdout.take().ok_or("Failed to get stdout")?;
-    let reader = io::BufReader::new(stdout);
-
-    for line_result in reader.lines() {
-        match line_result {
-            Ok(line) => {
-                let parse_result = super::parser::parse_line(&line);
-                if let Some(uid) = parse_result {
-                    println!("UID: {}",uid);
-                }
-            }
-            Err(e) => {
-                eprintln!("{}",e);
-            }
-        }
-    }
-
-    let status = cmd.wait().expect("Failed to wait on child");
-
-    if status.success() {
-        Ok(())
-    }else {
-        Err("pm3 had non zero exit code".into())
-    }
-}
+use std::error::Error;
+use std::process::{Command, Stdio};
+use std::io::{self, BufRead};
+
+pub fn run_pm3() -> Result<(), Box<dyn Error>> {
+    let mut cmd = Command::new("stdbuf")
+        .arg("-oL")
+        .arg("pm3")
+        .arg("-c")
+        .arg("lf hitag reader -@")
+        .stdout(Stdio::piped())
+        .spawn()?;
+
+    let stdout = cmd.stdout.take().ok_or("Failed to get stdout")?;
+    let reader = io::BufReader::new(stdout);
+
+    for line_result in reader.lines() {
+        match line_result {
+            Ok(line) => {
+                let parse_result = super::parser::parse_line(&line);
+                if let Some(uid) = parse_result {
+                    println!("UID: {}",uid);
+                }
+            }
+            Err(e) => {
+                eprintln!("{}",e);
+            }
+        }
+    }
+
+    let status = cmd.wait().expect("Failed to wait on child");
+
+    if status.success() {
+        Ok(())
+    }else {
+        Err("pm3 had non zero exit code".into())
+    }
+}