diff --git a/inside/src/main.rs b/inside/src/main.rs index 95c4233..74d2e41 100644 --- a/inside/src/main.rs +++ b/inside/src/main.rs @@ -11,6 +11,7 @@ use core::panic::PanicInfo; use core::str::from_utf8; use bt_hci::cmd::info; +use cyw43::JoinOptions; use cyw43_pio::PioSpi; use embassy_rp::pwm::{self, Pwm}; use fixed::FixedU16; @@ -109,12 +110,12 @@ async fn main(spawner: Spawner) { control.init(clm).await; control - .set_power_management(cyw43::PowerManagementMode::PowerSave) + .set_power_management(cyw43::PowerManagementMode::Performance) .await; // Use a link-local address for communication without DHCP server let config = Config::ipv4_static(embassy_net::StaticConfigV4 { - address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::new(169, 254, 1, 1), 16), + address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::new(192, 168, 0, 10), 24), dns_servers: heapless::Vec::new(), gateway: None, }); @@ -128,8 +129,17 @@ async fn main(spawner: Spawner) { defmt::unwrap!(spawner.spawn(net_task(runner))); - //control.start_ap_open("door409", 5).await; - control.start_ap_wpa2("door409", "babelite", 5).await; + loop { + match control + .await + { + Ok(_) => break, + Err(err) => { + info!("join failed with status={}", err.status); + } + } + } + let mut rx_buffer = [0; 4096]; let mut tx_buffer = [0; 4096]; diff --git a/outside/src/main.rs b/outside/src/main.rs index fadc79d..8650a8e 100644 --- a/outside/src/main.rs +++ b/outside/src/main.rs @@ -111,7 +111,7 @@ async fn main(spawner: Spawner) { // Use a link-local address for communication without DHCP server let config = Config::ipv4_static(embassy_net::StaticConfigV4 { - address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::new(169, 254, 2, 1), 16), + address: embassy_net::Ipv4Cidr::new(embassy_net::Ipv4Address::new(192, 168, 0, 12), 24), dns_servers: heapless::Vec::new(), gateway: None, }); diff --git a/outside/src/wiggle.rs b/outside/src/wiggle.rs index f61699c..c3a1a8a 100644 --- a/outside/src/wiggle.rs +++ b/outside/src/wiggle.rs @@ -41,7 +41,7 @@ pub async fn wiggle_manager(pwm: PWM_SLICE5, head: PIN_26, tail: PIN_27) -> ! { c.compare_b = 6248; pwm.set_config(&c); - Timer::after_millis(50).await; + Timer::after_millis(500).await; LOCKOUT.store(false, core::sync::atomic::Ordering::SeqCst); }