Change the address of the nrf24l01 and the packet format

base-station/software/src/radio.rs

@@ -1,6 +1,7 @@
 use std::convert::TryInto;
 use std::sync::mpsc;
 use std::thread;
+use std::thread::sleep;
 use std::time::{Duration, Instant};
 
 use embedded_nrf24l01::{Configuration, CrcMode, DataRate, NRF24L01};
@@ -70,9 +71,9 @@ fn radio_thread(updates: &mpsc::Sender<SensorUpdate>) -> Result<(), Error> {
     nrf24.set_rf(DataRate::R2Mbps, 3)?;
     nrf24.set_crc(Some(CrcMode::OneByte))?;
     nrf24.set_auto_retransmit(250, 3)?;
-    nrf24.set_pipes_rx_enable(&[true, false, false, false, false, false])?;
+    nrf24.set_pipes_rx_enable(&[false, true, false, false, false, false])?; // TODO enable pipe 0 once the base station receives messages
     nrf24
-        .set_rx_addr(0, &[0x56, 0x34, 0x12, 0x00, 0x00])
+        .set_rx_addr(1, &[0xB3, 0xB3, 0xB3, 0xB3, 0x00])
         .unwrap();
     nrf24.flush_rx().unwrap();
     nrf24.flush_tx().unwrap();
@@ -88,6 +89,7 @@ fn radio_thread(updates: &mpsc::Sender<SensorUpdate>) -> Result<(), Error> {
     let mut nrf24 = nrf24.rx().unwrap();
     info!("Starting to receive:");
     loop {
+        sleep(Duration::from_millis(1));
         if let Some(pipe) = nrf24.can_read().unwrap() {
             let payload = nrf24.read().unwrap();
             info!(
@@ -96,25 +98,27 @@ fn radio_thread(updates: &mpsc::Sender<SensorUpdate>) -> Result<(), Error> {
                 payload.as_ref(),
                 payload.len()
             );
-            if payload.len() != 12 {
+            if payload.len() != 13 {
                 continue;
             }
 
-            let pressure = u32::from_le_bytes(payload.as_ref()[0..4].try_into().unwrap());
+            let sensor_id = payload.as_ref()[0];
+
+            let pressure = u32::from_le_bytes(payload.as_ref()[1..5].try_into().unwrap());
 
             if pressure < 50000 || pressure > 150000 {
                 info!("pressure outside of range: {}", pressure);
                 continue;
             }
 
-            let temperature = i32::from_le_bytes(payload.as_ref()[4..8].try_into().unwrap());
+            let temperature = i32::from_le_bytes(payload.as_ref()[5..9].try_into().unwrap());
 
             if temperature < -50 * 100 || temperature > 100 * 100 {
                 info!("temperature outside of range: {}", temperature);
                 continue;
             }
 
-            let humidity = u32::from_le_bytes(payload.as_ref()[8..12].try_into().unwrap());
+            let humidity = u32::from_le_bytes(payload.as_ref()[9..13].try_into().unwrap());
             if humidity > 100 * 1024 {
                 info!("humidity outside of range: {}", humidity);
                 continue;
@@ -123,9 +127,11 @@ fn radio_thread(updates: &mpsc::Sender<SensorUpdate>) -> Result<(), Error> {
             let pressure = pressure as f32 / 100.0;
             let temperature = temperature as f32 / 100.0;
             let humidity = humidity as f32 / 1024.0;
+            info!("sensor id: 0x{:x}", sensor_id);
             info!("pressure: {}", pressure);
             info!("temperature: {}", temperature);
             info!("humidity: {}", humidity);
+            /*
             updates
                 .send(SensorUpdate {
                     location: 0,
@@ -136,6 +142,7 @@ fn radio_thread(updates: &mpsc::Sender<SensorUpdate>) -> Result<(), Error> {
                     ],
                 })
                 .unwrap();
+            */
             let end = Instant::now();
             let elapsed = end.duration_since(start);
             info!("Debug: {:?}", elapsed);