fix config equality

TheCacophonyProject · May 20, 2024 · 9c8d631 · 9c8d631
1 parent f5f5745
commit 9c8d631
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/src/attiny_rtc_i2c.rs b/src/attiny_rtc_i2c.rs
@@ -426,7 +426,6 @@ impl SharedI2C {
     pub fn tc2_agent_request_audio_rec(&mut self, delay: &mut Delay) -> Result<bool, Error> {
         match self.try_attiny_read_command(REG_TC2_AGENT_STATE, delay, None) {
             Ok(state) => {
-                info!("agent state {}", state);
                 let rec_state: bool = (state & 1 << 1 == 2) && (state & 0x08 == 0x08);
                 Ok(rec_state)
             }

diff --git a/src/core0_audio.rs b/src/core0_audio.rs
@@ -240,7 +240,6 @@ pub fn audio_task(
     let mut take_test_rec = false;
     if let Ok(test_rec) = shared_i2c.tc2_agent_request_audio_rec(&mut delay) {
         take_test_rec = test_rec;
-        info!("Take test rec is {}", take_test_rec);
     }
     if do_recording || take_test_rec {
         watchdog.feed();
@@ -288,7 +287,6 @@ pub fn audio_task(
                     ),
                     &mut flash_storage,
                 );
-                watchdog.start(100.micros());
                 info!("Recording failed restarting and will try again");
                 loop {
                     nop();

diff --git a/src/device_config.rs b/src/device_config.rs
@@ -22,13 +22,19 @@ pub struct DeviceConfigInner {
     pub is_audio_device: bool,
 }
 
-#[derive(PartialEq)]
 pub struct DeviceConfig {
     config_inner: DeviceConfigInner,
     pub motion_detection_mask: DetectionMask,
     pub cursor_position: usize,
 }
 
+impl PartialEq for DeviceConfig {
+    fn eq(&self, other: &Self) -> bool {
+        self.config_inner == other.config_inner
+            && self.motion_detection_mask == other.motion_detection_mask
+    }
+}
+
 impl Format for DeviceConfig {
     fn format(&self, fmt: Formatter) {}
 }

diff --git a/src/onboard_flash.rs b/src/onboard_flash.rs
@@ -110,7 +110,7 @@ impl OnboardFlashStatus {
                 }
             }
             2 => {
-                warn!("ECC error - uncorrectable error, data corrupted!");
+                // warn!("ECC error - uncorrectable error, data corrupted!");
                 EccStatus {
                     okay: false,
                     should_relocate: true,

diff --git a/src/pdm_microphone.rs b/src/pdm_microphone.rs
@@ -253,23 +253,22 @@ impl PdmMicrophone {
                 if rx_transfer.is_done() && cycle >= WARMUP_CYCLES {
                     //this causes problems
                     warn!("Couldn't keep up with data {}", cycle);
-                    // timer.delay_ms(1000);
-                    // if use_async && transfer.is_some() {
-                    //     flash_storage.finish_transfer(
-                    //         None,
-                    //         None,
-                    //         transfer.take().unwrap(),
-                    //         address.take().unwrap(),
-                    //         true,
-                    //     );
-                    // }
-                    // if flash_storage.last_used_block_index.is_some() {
-                    //     flash_storage.erase_block_range(
-                    //         start_block_index,
-                    //         flash_storage.last_used_block_index.unwrap(),
-                    //     );
-                    // }
-                    // break;
+                    if use_async && transfer.is_some() {
+                        flash_storage.finish_transfer(
+                            None,
+                            None,
+                            transfer.take().unwrap(),
+                            address.take().unwrap(),
+                            true,
+                        );
+                    }
+                    if flash_storage.last_used_block_index.is_some() {
+                        flash_storage.erase_block_range(
+                            start_block_index,
+                            flash_storage.last_used_block_index.unwrap(),
+                        );
+                    }
+                    break;
                 }
                 // When a transfer is done we immediately enqueue the buffers again.
                 let (rx_buf, next_rx_transfer) = rx_transfer.wait();