From 0a8012b6f7689146b100a563b71b499eef7befae Mon Sep 17 00:00:00 2001
From: Andy Killorin <37423245+Speedy6451@users.noreply.github.com>
Date: Fri, 15 Nov 2024 21:32:47 -0500
Subject: [PATCH] changed netconfig

---
 inside/src/main.rs  | 10 +++++-----
 outside/src/main.rs | 15 +--------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/inside/src/main.rs b/inside/src/main.rs
index 47c0ab3..c40fbfe 100644
--- a/inside/src/main.rs
+++ b/inside/src/main.rs
@@ -72,8 +72,8 @@ fn main() -> ! {
     let mut stack = Stack::new(iface, device, socket_set, now, rng.random());
 
     let client_config = Configuration::Client(ClientConfiguration {
-        ssid: "🐟".try_into().unwrap(),
-        password: "ilcougars1234".try_into().unwrap(),
+        ssid: include_str!("../../ssid").try_into().unwrap(),
+        password: include_str!("../../password").try_into().unwrap(),
         ..Default::default()
     });
     let res = controller.set_configuration(&client_config);
@@ -106,10 +106,10 @@ fn main() -> ! {
         .set_iface_configuration(&ipv4::Configuration::Client(
             ipv4::ClientConfiguration::Fixed(
                 ipv4::ClientSettings {
-                    ip: ipv4::Ipv4Addr::new(10,0,0,2),
+                    ip: ipv4::Ipv4Addr::new(169,254,2,2),
                     subnet: ipv4::Subnet {
-                        gateway: ipv4::Ipv4Addr::new(10,0,0,1),
-                        mask: ipv4::Mask(24),
+                        gateway: ipv4::Ipv4Addr::new(169, 254, 2, 1),
+                        mask: ipv4::Mask(16),
                     },
                     dns: None,
                     secondary_dns: None,
diff --git a/outside/src/main.rs b/outside/src/main.rs
index 9b5bfdb..c9df6bb 100644
--- a/outside/src/main.rs
+++ b/outside/src/main.rs
@@ -154,20 +154,7 @@ async fn main(spawner: Spawner) {
 
     defmt::unwrap!(spawner.spawn(net_task(runner)));
 
-    loop {
-        match control
-            .join("door409", JoinOptions::new("babelite".as_bytes()))
-            .await
-        {
-            Ok(_) => break,
-            Err(err) => {
-                info!("join failed with status={}", err.status);
-            }
-        }
-    }
-
-    //control.start_ap_open("door409", 5).await;
-    //control.start_ap_wpa2("door409-outside", "outerbabes", 5).await;
+    control.start_ap_wpa2(include_str!("../../ssid"), include_str!("../../password"), 5).await;
 
     let mut rx_buffer = [0; 4096];
     let mut tx_buffer = [0; 4096];