Merge branch 'main' of https://github.com/OpenDevicePartnership/embedded-services into personal/razbenhemo/hid_device_handle_cmds

Author: Raz Ben Hemo

.github/workflows/cargo-vet.yml

@@ -3,6 +3,12 @@ permissions:
   contents: read
 on:
   pull_request:
+  workflow_call:
+    inputs:
+      download-lockfiles:
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -29,18 +35,23 @@ jobs:
       run: echo "${{ runner.tool_cache }}/cargo-vet/bin" >> $GITHUB_PATH
     - name: Ensure that the tool cache is populated with the cargo-vet binary
       run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --version ${{ env.CARGO_VET_VERSION }} cargo-vet
+    - name: Download Cargo.lock files
+      if: ${{ inputs.download-lockfiles }}
+      uses: actions/download-artifact@v4
+      with:
+        name: updated-lock-files
     - name: Invoke cargo-vet
       run: cargo vet --locked
     - name: Save PR number
     # PR number is saved as an artifact so it can be used to determine the PR to comment on by the vet-pr-comment workflow
     # vet-pr-comment workflow is triggered by the workflow_run event so it runs in the context of the base branch and not the PR branch
-      if: ${{ failure() }} || ${{ success() }}
+      if: ${{ github.event_name == 'pull_request' && (failure() || success()) }}
       run: |
         mkdir -p ./pr
         echo ${{ github.event.number }} > ./pr/NR
     - uses: actions/upload-artifact@v4
     # Need to upload the artifact in both success and failure cases so comment can be updated in either case
-      if: ${{ failure() }} || ${{ success() }}
+      if: ${{ github.event_name == 'pull_request' && (failure() || success()) }}
       with:
         name: pr
         path: pr/

.github/workflows/check.yml

@@ -167,7 +167,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        msrv: ["1.85"]
+        msrv: ["1.88"]
         target: [x86_64-unknown-linux-gnu, thumbv8m.main-none-eabihf]
     name: ubuntu / ${{ matrix.msrv }} / ${{ matrix.target }}
     steps:

.github/workflows/rolling.yml

@@ -52,11 +52,19 @@ jobs:
     uses: ./.github/workflows/check.yml
     with:
       download-lockfiles: true
+  
+  check-cargo-vet:
+    name: cargo-update / check-cargo-vet
+    needs: [update-dependencies, check-build]
+    if: ${{ needs.update-dependencies.outputs.pr-needed == 'true' }}
+    uses: ./.github/workflows/cargo-vet.yml
+    with:
+      download-lockfiles: true
 
   pull-request:
     name: cargo-update / pull-request
     runs-on: ubuntu-latest
-    needs: [check-build, update-dependencies]
+    needs: [check-build, check-cargo-vet, update-dependencies]
     if: ${{ needs.update-dependencies.outputs.pr-needed == 'true' }}
     steps:
       - uses: actions/checkout@v4

Cargo.lock

@@ -42,7 +42,6 @@ cortex-m-rt = "0.7.5"
 critical-section = "1.1"
 defmt = "0.3"
 document-features = "0.2.7"
-embassy-executor = "0.9.1"
 embassy-futures = "0.1.2"
 embassy-imxrt = { git = "https://github.com/OpenDevicePartnership/embassy-imxrt" }
 embassy-sync = "0.7.2"
@@ -69,7 +68,7 @@ postcard = "1.*"
 proc-macro2 = "1.0"
 quote = "1.0"
 rand_core = "0.6.4"
-rstest = {version = "0.26.1", default-features = false }
+rstest = { version = "0.26.1", default-features = false }
 serde = { version = "1.0.*", default-features = false }
 static_cell = "2.1.0"
 toml = { version = "0.8", default-features = false }

Cargo.toml

@@ -4,15 +4,14 @@ version = "0.1.0"
 edition = "2024"
 description = "Battery fuel gauge and charger embedded service implementation"
 repository = "https://github.com/OpenDevicePartnership/embedded-services"
-rust-version = "1.85"
+rust-version = "1.88"
 license = "MIT"
 
 [lints]
 workspace = true
 
 [dependencies]
 defmt = { workspace = true, optional = true }
-embassy-executor.workspace = true
 embassy-futures.workspace = true
 embassy-sync.workspace = true
 embassy-time.workspace = true
@@ -31,7 +30,6 @@ defmt = [
     "embedded-services/defmt",
     "embassy-time/defmt",
     "embassy-sync/defmt",
-    "embassy-executor/defmt",
     "embedded-batteries-async/defmt",
     "mctp-rs/defmt",
 ]
@@ -40,5 +38,4 @@ log = [
     "embedded-services/log",
     "embassy-time/log",
     "embassy-sync/log",
-    "embassy-executor/log",
 ]

battery-service/Cargo.toml

@@ -134,32 +134,35 @@ pub(crate) fn compute_bix<'a>(
             oem_info: [0u8; STD_BIX_OEM_SIZE],
             battery_swapping_capability: embedded_batteries_async::acpi::BatterySwapCapability::NonSwappable,
         };
-    bix_return.model_number[..core::cmp::min(STD_BIX_MODEL_SIZE - 1, static_cache.device_name.len() - 1)]
-        .copy_from_slice(
-            static_cache.device_name[..core::cmp::min(STD_BIX_MODEL_SIZE - 1, static_cache.device_name.len() - 1)]
-                .try_into()
-                .map_err(|_| ())?,
-        );
-    bix_return.serial_number[..core::cmp::min(STD_BIX_SERIAL_SIZE - 1, static_cache.serial_num.len() - 1)]
-        .copy_from_slice(
-            static_cache.serial_num[..core::cmp::min(STD_BIX_SERIAL_SIZE - 1, static_cache.serial_num.len() - 1)]
-                .try_into()
-                .map_err(|_| ())?,
-        );
-    bix_return.battery_type[..core::cmp::min(STD_BIX_BATTERY_SIZE - 1, static_cache.device_chemistry.len() - 1)]
-        .copy_from_slice(
-            static_cache.device_chemistry
-                [..core::cmp::min(STD_BIX_BATTERY_SIZE - 1, static_cache.device_chemistry.len() - 1)]
-                .try_into()
-                .map_err(|_| ())?,
-        );
-    bix_return.oem_info[..core::cmp::min(STD_BIX_OEM_SIZE - 1, static_cache.manufacturer_name.len() - 1)]
-        .copy_from_slice(
-            static_cache.manufacturer_name
-                [..core::cmp::min(STD_BIX_OEM_SIZE - 1, static_cache.manufacturer_name.len() - 1)]
-                .try_into()
-                .map_err(|_| ())?,
-        );
+
+    let model_number_len = core::cmp::min(STD_BIX_MODEL_SIZE - 1, static_cache.device_name.len() - 1);
+    bix_return
+        .model_number
+        .get_mut(..model_number_len)
+        .ok_or(())?
+        .copy_from_slice(static_cache.device_name.get(..model_number_len).ok_or(())?);
+
+    let serial_number_len = core::cmp::min(STD_BIX_SERIAL_SIZE - 1, static_cache.serial_num.len() - 1);
+    bix_return
+        .serial_number
+        .get_mut(..serial_number_len)
+        .ok_or(())?
+        .copy_from_slice(static_cache.serial_num.get(..serial_number_len).ok_or(())?);
+
+    let battery_type_len = core::cmp::min(STD_BIX_BATTERY_SIZE - 1, static_cache.device_chemistry.len() - 1);
+    bix_return
+        .battery_type
+        .get_mut(..battery_type_len)
+        .ok_or(())?
+        .copy_from_slice(static_cache.device_chemistry.get(..battery_type_len).ok_or(())?);
+
+    let oem_info_len = core::cmp::min(STD_BIX_OEM_SIZE - 1, static_cache.manufacturer_name.len() - 1);
+    bix_return
+        .oem_info
+        .get_mut(..oem_info_len)
+        .ok_or(())?
+        .copy_from_slice(static_cache.manufacturer_name.get(..oem_info_len).ok_or(())?);
+
     Ok(bix_return)
 }