ank/door
1
Fork 0
Code Issues Activity

music manager

Browse source
This commit is contained in:
Andy Killorin 2024-12-05 12:21:37 -05:00
parent 542be263df
commit a9f2c33418
Signed by: ank
GPG key ID: 23F9463ECB67FE8C
4 changed files with 160 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
inside/src/main.rs
View file

@ -171,7 +171,6 @@ async fn main(spawner: Spawner) {
info!("rxd {}", from_utf8(&buf[..n]).unwrap());
Timer::after_millis(30).await;
let mut segs = buf[..n].trim_ascii().split(|c| *c == ' ' as u8);

68
outside/Cargo.lock generated
View file

@ -126,6 +126,12 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
[[package]]
name = "base64"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64"
version = "0.21.7"
@ -254,6 +260,12 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "const-default"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b396d1f76d455557e1218ec8066ae14bba60b4b36ecd55577ba979f5db7ecaa"
[[package]]
name = "const-oid"
version = "0.9.6"
@ -801,6 +813,18 @@ dependencies = [
"log",
]
[[package]]
name = "embedded-alloc"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f2de9133f68db0d4627ad69db767726c99ff8585272716708227008d3f1bddd"
dependencies = [
"const-default",
"critical-section",
"linked_list_allocator",
"rlsf",
]
[[package]]
name = "embedded-graphics"
version = "0.7.1"
@ -1425,6 +1449,12 @@ dependencies = [
"libc",
]
[[package]]
name = "linked_list_allocator"
version = "0.10.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9afa463f5405ee81cdb9cc2baf37e08ec7e4c8209442b5d72c04cfb2cd6e6286"
[[package]]
name = "litrs"
version = "0.4.1"
@ -1567,6 +1597,7 @@ dependencies = [
"embassy-time",
"embassy-usb",
"embassy-usb-logger",
"embedded-alloc",
"embedded-graphics",
"embedded-hal 1.0.0",
"embedded-hal-async",
@ -1591,6 +1622,7 @@ dependencies = [
"smart-leds",
"st7789",
"static_cell",
"talc",
"usbd-hid",
]
@ -1887,7 +1919,7 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66584b58c3b0cd8cfea750408a932fe86df79ee05ccc87ee745a8e6be4a1abe0"
dependencies = [
"base64",
"base64 0.21.7",
"buffered-io",
"defmt",
"embedded-io",
@ -1911,6 +1943,18 @@ dependencies = [
"bytemuck",
]
[[package]]
name = "rlsf"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "222fb240c3286247ecdee6fa5341e7cdad0ffdf8e7e401d9937f2d58482a20bf"
dependencies = [
"cfg-if",
"const-default",
"libc",
"svgbobdoc",
]
[[package]]
name = "rp-pac"
version = "6.0.0"
@ -2162,6 +2206,19 @@ version = "2.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "svgbobdoc"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2c04b93fc15d79b39c63218f15e3fdffaa4c227830686e3b7c5f41244eb3e50"
dependencies = [
"base64 0.13.1",
"proc-macro2",
"quote",
"syn 1.0.109",
"unicode-width",
]
[[package]]
name = "syn"
version = "1.0.109"
@ -2184,6 +2241,15 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "talc"
version = "4.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fcad3be1cfe36eb7d716a04791eba36a197da9d9b6ea1e28e64ac569da3701d"
dependencies = [
"lock_api",
]
[[package]]
name = "term"
version = "0.7.0"

2
outside/Cargo.toml
View file

@ -61,6 +61,8 @@ embedded-sdmmc = "0.7.0"
bt-hci = { version = "0.1.0", default-features = false, features = ["defmt"] }
hex = { version = "0.4.3", default-features=false}
itoa = "1.0.14"
embedded-alloc = "0.6.0"
talc = "4.4.2"
[profile.release]
debug = 2

111
outside/src/main.rs
View file

@ -10,6 +10,7 @@ use core::borrow::BorrowMut;
use core::cell::RefCell;
use core::fmt::Formatter;
use core::marker::PhantomData;
use core::mem::MaybeUninit;
use core::panic::PanicInfo;
use core::str::from_utf8;
use core::sync::atomic::{AtomicU8};
@ -25,7 +26,7 @@ use embassy_rp::multicore::{spawn_core1, Stack};
use embassy_rp::pwm::{self, Pwm};
use embassy_rp::uart::{BufferedInterruptHandler, BufferedUart};
use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex;
use embassy_sync::channel::Channel;
use embassy_sync::channel::{Channel, Receiver};
use fixed::FixedU16;
use log::*;
//use embassy_rp::i2c::InterruptHandler;
@ -35,7 +36,7 @@ use embassy_net::{Config, IpEndpoint, Ipv4Address, StackResources};
use embassy_rp::{bind_interrupts, interrupt, uart};
use embassy_rp::clocks::RoscRng;
use embassy_rp::gpio::{AnyPin, Input, InterruptTrigger, Level, Output};
use embassy_rp::peripherals::{DMA_CH0, PIN_21, PIO0, UART1, USB};
use embassy_rp::peripherals::{DMA_CH0, PIN_20, PIN_21, PIO0, UART1, USB};
use embassy_rp::pio::{InterruptHandler, Pio};
use embassy_rp::usb::Driver;
use embassy_time::{Duration, Timer};
@ -57,6 +58,7 @@ static READ_CARD: Mutex<RefCell<u64>> =
static BIT: AtomicU8 = AtomicU8::new(0);
static CHANNEL: Channel<CriticalSectionRawMutex, u64, 1> = Channel::new();
static MUSIC: Channel<CriticalSectionRawMutex, (&'static str, u8), 3> = Channel::new();
#[embassy_executor::task]
async fn logger_task(driver: Driver<'static, USB>) {
@ -107,11 +109,7 @@ async fn main(spawner: Spawner) {
let data_0= Input::new(p.PIN_17, embassy_rp::gpio::Pull::None);
let data_1= Input::new(p.PIN_16, embassy_rp::gpio::Pull::None);
let mut config = uart::Config::default();
config.baudrate = 115200;
let mut rx = [0; 2048];
let mut tx = [0; 2048];
let mut uart = BufferedUart::new(p.UART1, Irqs, p.PIN_20, p.PIN_21, &mut tx, &mut rx, config);
spawner.spawn(music_manager(p.UART1, Irqs, p.PIN_20, p.PIN_21)).unwrap();
let button = Input::new(p.PIN_22, embassy_rp::gpio::Pull::Up);
@ -214,22 +212,87 @@ async fn main(spawner: Spawner) {
}
});
defmt::unwrap!(spawner.spawn(send_badge(CHANNEL.receiver(),stack)));
}
#[embassy_executor::task]
async fn music_manager(uart: UART1, irqs: Irqs, txp: PIN_20, rxp: PIN_21) -> ! {
let mut config = uart::Config::default();
config.baudrate = 115200;
let mut rx = [0; 2048];
let mut tx = [0; 2048];
let mut uart = BufferedUart::new(uart, irqs, txp, rxp, &mut tx, &mut rx, config);
loop {
let card = CHANNEL.receive().await;
//join(CHANNEL.receive().await, button.wait_for_falling_edge())
let song = MUSIC.receive().await;
info!("playing: {}{}.mp3",song.0,song.1);
let num = (RoscRng::next_u32(&mut rng) % 5) + 1;
uart.write_all(b"AT+PLAYFILE=/").await.unwrap();
match card {
_ => uart.write_all(b"d").await.unwrap(),
};
uart.write_all(itoa::Buffer::new().format(num).as_bytes()).await.unwrap();
uart.write_all(song.0.as_bytes()).await.unwrap();
uart.write_all(itoa::Buffer::new().format(song.1).as_bytes()).await.unwrap();
uart.write_all(b".mp3\r\n").await.unwrap();
//uart.write_all(b"AT+QUERY=4\r\n").await.unwrap();
let mut buffer = [0;512];
let mut pos = 0;
loop {
if let Ok(len) = uart.read(&mut buffer[pos..]).await {
let to_print = unsafe { core::str::from_utf8_unchecked(&buffer[..(pos + len)]) };
if to_print.contains("\r\n") {
info!("{}", to_print);
break;
}
pos += len;
} else {
break;
}
}
uart.write_all(b"AT+QUERY=4\r\n").await.unwrap();
let mut buffer = [0;512];
let mut pos = 0;
loop {
if let Ok(len) = uart.read(&mut buffer[pos..]).await {
let to_print = unsafe { core::str::from_utf8_unchecked(&buffer[..(pos + len)]) };
if to_print.contains("\r\n") {
info!("{}", to_print);
pos += len;
break;
}
pos += len;
} else {
break;
}
}
let output = unsafe { core::str::from_utf8_unchecked(&buffer[..(pos)]) };
if let Ok(length) = output.trim().parse::<u64>() {
Timer::after_secs(length).await;
}
}
}
#[embassy_executor::task]
async fn send_badge(channel: Receiver<'static,CriticalSectionRawMutex,u64,1>,stack: embassy_net::Stack<'static>) -> ! {
let mut rx_buffer = [0; 4096];
let mut tx_buffer = [0; 4096];
loop {
let card = channel.receive().await;
let mut rng = RoscRng;
let num = (RoscRng::next_u32(&mut rng) % 5) + 1;
let name = match card {
0x2c55dc3f5 => "evan",
0x3161dc3f7 => "andy",
_ => "d",
};
let mut socket = TcpSocket::new(stack, &mut rx_buffer, &mut tx_buffer);
socket.set_timeout(Some(Duration::from_secs(1)));
socket.set_timeout(Some(Duration::from_secs(10)));
info!("attempting conn to inside");
if let Err(e) = socket.connect(IpEndpoint::new(Ipv4Address::new(169, 254, 1, 1).into_address(), 1234)).await {
warn!("connect error: {:?}", e);
@ -237,18 +300,26 @@ async fn main(spawner: Spawner) {
}
info!("Connected to {:?}", socket.remote_endpoint());
control.gpio_set(0, true).await;
let mut data: [u8;18] = [b' ';18];
let mut data: [u8;18] = [b'0';18];
data[0] = b'B';
data[1] = b' ';
hex::encode_to_slice(&card.to_ne_bytes(), &mut data[2..]).unwrap();
let to_print = unsafe { core::str::from_utf8_unchecked(&data) };
info!("data: {to_print}");
//socket.write_all(b"O \r\n").await.unwrap();
socket.write_all(&data).await.unwrap();
info!("wrote to {:?}", socket.remote_endpoint());
socket.close();
control.gpio_set(0, false).await;
socket.flush().await.unwrap();
socket.close();
info!("disconnected");
MUSIC.send(("a",num as u8)).await;
MUSIC.send((name,num as u8)).await;
}
}