From 9396cd668d6e97f4a1cc2f721e3adaaf43ef86ce Mon Sep 17 00:00:00 2001
From: Stephen D <webmaster@scd31.com>
Date: Sat, 9 Dec 2023 12:28:33 -0400
Subject: [PATCH] update to latest ham-cats

---
 Cargo.lock   | 18 +++++++++---------
 Cargo.toml   |  2 +-
 src/main.rs  |  2 +-
 src/radio.rs |  7 +++++--
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 269a610..f02927d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "atomic-polyfill"
-version = "0.1.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
+checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4"
 dependencies = [
  "critical-section",
 ]
@@ -70,7 +70,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cats-mobile-transceiver-mainboard"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "arrayvec",
  "cortex-m",
@@ -197,9 +197,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "deranged"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
 dependencies = [
  "powerfmt",
 ]
@@ -296,8 +296,8 @@ dependencies = [
 
 [[package]]
 name = "ham-cats"
-version = "0.1.0"
-source = "git+https://gitlab.scd31.com/cats/ham-cats#2662fd88ededffad2598ece932a58e1049325aaa"
+version = "0.2.0"
+source = "git+https://gitlab.scd31.com/cats/ham-cats#79ba39217c85f023b8571d789f279e96eac548b8"
 dependencies = [
  "arrayvec",
  "bitvec",
@@ -326,9 +326,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "heapless"
-version = "0.7.16"
+version = "0.7.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
+checksum = "cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f"
 dependencies = [
  "atomic-polyfill",
  "hash32",
diff --git a/Cargo.toml b/Cargo.toml
index 2fb5ad4..0a8c49c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cats-mobile-transceiver-mainboard"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 license = "MIT"
 
diff --git a/src/main.rs b/src/main.rs
index edf15e9..f160fde 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -55,7 +55,7 @@ mod app {
     const LED_BLINK_RATE: u64 = 250;
 
     const HARDWARE_ID: u16 = 0x7c84;
-    const SOFTWARE_ID: u8 = 0;
+    const SOFTWARE_ID: u8 = 1;
 
     const MODE: Mode = Mode {
         polarity: Polarity::IdleLow,
diff --git a/src/radio.rs b/src/radio.rs
index 1c3812e..b98cd36 100644
--- a/src/radio.rs
+++ b/src/radio.rs
@@ -1,4 +1,4 @@
-use ham_cats::{buffer::Buffer, packet::Packet};
+use ham_cats::{buffer::Buffer, identity::Identity, packet::Packet};
 use rand::{rngs::SmallRng, Rng, SeedableRng};
 use rf4463::{config::RADIO_CONFIG_CATS, error::TransferError, Rf4463};
 use rtic::Mutex;
@@ -163,7 +163,10 @@ impl<'a> RadioManager<'a> {
         ssid: u8,
         rssi: f64,
     ) {
-        if packet.should_digipeat(callsign, ssid).is_ok() {
+        if packet
+            .should_digipeat(Identity::new(callsign, ssid))
+            .is_ok()
+        {
             if packet.append_to_route(callsign, ssid, Some(rssi)).is_err() {
                 return;
             }
-- 
GitLab