Merge pull request #58 from TheCacophonyProject/r36

- Bump version r36

Author: hardiesoft

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     env:
-      RP2040_FIRMWARE_VERSION: 0.2.40
+      RP2040_FIRMWARE_VERSION: 0.2.41
 
     steps:
       - name: Checkout repository
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.89.0
+          toolchain: 1.90.0
           override: true
           components: rustfmt, clippy
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.89.0"  # If changing this then also change it in .github/workflows/release.yaml rust toolchain
+channel = "1.90.0"  # If changing this then also change it in .github/workflows/release.yaml rust toolchain
 targets = ["aarch64-unknown-linux-musl"]

src/camera_transfer_state.rs

@@ -476,7 +476,7 @@ pub fn enter_camera_transfer_loop(
                                         firmware version: {firmware_version}"
                                 );
                                 let estimated_offload_mb =
-                                    (num_blocks_to_offload * 128) as f32 / 1024.0;
+                                    num_blocks_to_offload as f32 * 128.0 / 1024.0;
                                 let estimated_offload_time_seconds =
                                     (estimated_offload_mb * 2.0) / 60.0;
                                 if num_files_to_offload > 0 && num_events_to_offload > 0 {
@@ -696,6 +696,7 @@ pub fn enter_camera_transfer_loop(
                             CAMERA_BEGIN_FILE_TRANSFER => {
                                 if file_download.is_some() {
                                     warn!("Trying to begin file without ending current");
+                                    part_count = 0;
                                 }
                                 info!("Begin file transfer");
                                 // Open new file transfer

src/device_config.rs

@@ -48,6 +48,8 @@ fn default_location_accuracy() -> Option<f32> {
 fn default_output_dir() -> String {
     String::from("/var/spool/cptv")
 }
+
+#[allow(dead_code)]
 fn default_activate_thermal_throttler() -> bool {
     false
 }
@@ -535,6 +537,7 @@ impl Default for ThermalRecordingSettings {
 }
 
 #[derive(Deserialize, Debug, PartialEq, Clone)]
+#[allow(dead_code)]
 struct ThermalThrottlerSettings {
     #[serde(default = "default_activate_thermal_throttler")]
     activate: bool,

src/double_buffer.rs

@@ -24,11 +24,11 @@ impl DoubleBuffer {
 
     pub fn get_front(&self) -> &Mutex<RefCell<Option<Frame>>> {
         let val = self.swapper.load(Ordering::Acquire);
-        if val % 2 == 0 { &self.front } else { &self.back }
+        if val.is_multiple_of(2) { &self.front } else { &self.back }
     }
 
     pub fn get_back(&self) -> &Mutex<RefCell<Option<Frame>>> {
         let val = self.swapper.load(Ordering::Acquire);
-        if val % 2 == 0 { &self.back } else { &self.front }
+        if val.is_multiple_of(2) { &self.back } else { &self.front }
     }
 }

src/event_logger.rs

@@ -90,6 +90,18 @@ impl From<u8> for FileType {
     }
 }
 
+impl FileType {
+    pub fn is_cptv(&self) -> bool {
+        matches!(
+            self,
+            FileType::CptvScheduled
+                | FileType::CptvUserRequested
+                | FileType::CptvStartup
+                | FileType::CptvShutdown
+        )
+    }
+}
+
 #[derive(Copy, Clone, Debug)]
 pub struct DiscardedRecordingInfo {
     pub recording_type: FileType,
@@ -324,8 +336,8 @@ impl LoggerEvent {
             let num_frames = discard_info.num_frames;
             let seconds_since_last_ffc = discard_info.seconds_since_last_ffc;
             call.body
-                .push_param(format!(r#"{{ "recording-type": "{recording_type:?}", "num-frames": "{num_frames}", "seconds-since-last-ffc": "{seconds_since_last_ffc}" }}"#))
-                .unwrap();
+                    .push_param(format!(r#"{{ "recording-type": "{recording_type:?}", "num-frames": "{num_frames}", "seconds-since-last-ffc": "{seconds_since_last_ffc}" }}"#))
+                    .unwrap();
             call.body.push_param("WouldDiscardAsFalsePositive").unwrap();
         } else if let LoggerEventKind::Rp2040GotNewConfig(new_config_info) = self.event {
             let audio_mode = new_config_info.audio_mode;

src/main.rs

@@ -52,7 +52,7 @@ use crate::recording_state::RecordingState;
 const AUDIO_SHEBANG: u16 = 1;
 
 const EXPECTED_RP2040_FIRMWARE_HASH: &str = include_str!("../_releases/tc2-firmware.sha256");
-const EXPECTED_RP2040_FIRMWARE_VERSION: u32 = 35;
+const EXPECTED_RP2040_FIRMWARE_VERSION: u32 = 36;
 const EXPECTED_ATTINY_FIRMWARE_VERSION: u8 = 1;
 
 const SEGMENT_LENGTH: usize = 9760;