jrd/floorbell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Factor warp config into separate function

Browse Source
This commit is contained in:
Jared Burce
2020-10-29 06:06:48 -07:00
parent a0e3b256fb
commit f4d2280680
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.rs
View File

@@ -15,8 +15,10 @@ use warp::{Filter, sse, sse::ServerSentEvent};
const OUTDOOR_CHIME_FILE: &str = "static/outdoor.mp3"; const OUTDOOR_CHIME_FILE: &str = "static/outdoor.mp3";
const BUTTON_PIN: u8 = 26; const BUTTON_PIN: u8 = 26;
const CHANNEL_VEC_SIZE: usize = 32;
fn button_pressed(_level: Level, clients: &Arc<Mutex<SmallVec<[mpsc::Sender<()>; 8]>>>) { fn button_pressed(_level: Level,
clients: &Arc<Mutex<SmallVec<[mpsc::Sender<()>; CHANNEL_VEC_SIZE]>>>) {
info!("DOORBELL PRESS"); info!("DOORBELL PRESS");
clients.lock().unwrap().retain(|tx: &mut mpsc::Sender<()>| { clients.lock().unwrap().retain(|tx: &mut mpsc::Sender<()>| {
match tx.try_send(()) { match tx.try_send(()) {
@@ -44,6 +46,11 @@ async fn main() {
pin.set_async_interrupt(Trigger::FallingEdge, move |level| button_pressed(level, &clients)) pin.set_async_interrupt(Trigger::FallingEdge, move |level| button_pressed(level, &clients))
.expect("set interrupt"); .expect("set interrupt");
let warp = warp(events_clients);
warp.await;
}
async fn warp(clients: Arc<Mutex<SmallVec<[mpsc::Sender<()>; CHANNEL_VEC_SIZE]>>>) {
// GET / // GET /
let root = warp::path::end() let root = warp::path::end()
.and(warp::get()) .and(warp::get())
@@ -56,7 +63,7 @@ async fn main() {
.map(move || { .map(move || {
info!("GET /events"); info!("GET /events");
let (tx, rx) = mpsc::channel(1); let (tx, rx) = mpsc::channel(1);
events_clients.lock().unwrap().push(tx); clients.lock().unwrap().push(tx);
let stream = stream::select( let stream = stream::select(
interval(Duration::from_secs(3)).map(move |_| { interval(Duration::from_secs(3)).map(move |_| {