From 8455975aed640c3a3bdeea86714e78d710e38c43 Mon Sep 17 00:00:00 2001
From: John Whittington <git@jbrengineering.co.uk>
Date: Tue, 25 Jun 2024 19:11:57 +0200
Subject: [PATCH] replace more migrated utf code FA icon defaults

---
 CHANGELOG.md   |  6 ++++++
 doc/cyme.1     |  4 ++--
 src/display.rs |  4 ++--
 src/icon.rs    | 18 +++++++++---------
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3048e717..644815df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,10 +6,16 @@
 
 - Full dumps of device descriptors for matching `--lsusb --verbose` ([#15](https://github.com/tuna-f1sh/cyme/issues/15))
 
+## [1.7.0] - 2024-25-06
+
 ### Changed
 
 - Replace [udev-rs](https://github.com/Smithay/udev-rs) and indirectly libudev-sys with Rust native [udev](https://github.com/cr8t/udev); libudev dependency (and system requirement) is now optional but can be used with `--no-default-features -F=udevlib`. ([#19](https://github.com/tuna-f1sh/cyme/pull/19))
 
+### Fixes
+
+- Replace more font-awesome icons in default look-up that have been deprecated ([#20](https://github.com/tuna-f1sh/cyme/issues/20))
+
 ## [1.6.1] - 2024-13-06
 
 ### Fixes
diff --git a/doc/cyme.1 b/doc/cyme.1
index b4cdc0a1..9be9df2f 100644
--- a/doc/cyme.1
+++ b/doc/cyme.1
@@ -1,6 +1,6 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH cyme 1  "cyme 1.6.0" 
+.TH cyme 1  "cyme 1.7.0" 
 .SH NAME
 cyme \- List system USB buses and devices; a modern cross\-platform `lsusb`
 .SH SYNOPSIS
@@ -399,6 +399,6 @@ Print help (see a summary with \*(Aq\-h\*(Aq)
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .SH VERSION
-v1.6.0
+v1.7.0
 .SH AUTHORS
 John Whittington <john@jbrengineering.co.uk>
diff --git a/src/display.rs b/src/display.rs
index 66ef1b74..122e2ed5 100644
--- a/src/display.rs
+++ b/src/display.rs
@@ -1634,8 +1634,8 @@ fn attributes_to_icons(attributes: &Vec<ConfigAttributes>, settings: &PrintSetti
     if settings.icons.is_some() {
         for a in attributes {
             match a {
-                ConfigAttributes::SelfPowered => icon_strs.push("\u{fba4}"), // ﮤ
-                ConfigAttributes::RemoteWakeup => icon_strs.push("\u{f654}"), // 
+                ConfigAttributes::SelfPowered => icon_strs.push("\u{f06a5}"), // 󰚥
+                ConfigAttributes::RemoteWakeup => icon_strs.push("\u{f0155}"), // 󰅕
             }
         }
     }
diff --git a/src/icon.rs b/src/icon.rs
index f340d553..55898add 100644
--- a/src/icon.rs
+++ b/src/icon.rs
@@ -238,14 +238,14 @@ lazy_static! {
             (Icon::UnknownVendor, "\u{f287}"), // usb plug default 
             (Icon::Vid(0x05ac), "\u{f179}"), // apple 
             (Icon::Vid(0x8086), "\u{f179}"), // apple bus 
-            (Icon::Vid(0x045e), "\u{f871}"), // microsoft 
+            (Icon::Vid(0x045e), "\u{f0372}"), // microsoft 󰍲
             (Icon::Vid(0x18d1), "\u{f1a0}"), // google 
             (Icon::Vid(0x1D6B), "\u{f17c}"), // linux foundation 
             (Icon::Vid(0x1d50), "\u{e771}"), // open source VID 
             (Icon::VidPid((0x1915, 0x520c)), "\u{f00a3}"), // specialized 󰂣
             (Icon::VidPid((0x1915, 0x520d)), "\u{f00a3}"), // specialized 󰂣
             (Icon::VidPid((0x0483, 0x572B)), "\u{f00a3}"), // specialized 󰂣
-            (Icon::Vid(0x046d), "\u{f87c}"), // logitech 
+            (Icon::Vid(0x046d), "\u{f037d}"), // logitech 󰍽
             (Icon::Vid(0x091e), "\u{e2a6}"), // garmin 
             (Icon::VidPid((0x1d50, 0x6018)), "\u{f188}"), // black magic probe 
             (Icon::Vid(0x1366), "\u{f188}"), // segger 
@@ -261,22 +261,22 @@ lazy_static! {
             (Icon::Vid(0x0483), "\u{f2db}"), // stm 
             (Icon::Vid(0x1915), "\u{f2db}"), // nordic 
             (Icon::Vid(0x1fc9), "\u{f2db}"), // nxp 
-            (Icon::Vid(0x1050), "\u{f805}"), // yubikey 
+            (Icon::Vid(0x1050), "\u{f084}"), // yubikey 
             (Icon::VidPid((0x18D1, 0x2D05)), "\u{e70e}"), // android dev 
             (Icon::VidPid((0x18D1, 0xd00d)), "\u{e70e}"), // android 
             (Icon::VidPid((0x1d50, 0x606f)), "\u{f191d}"), // candlelight_fw gs_can 󱤝
-            (Icon::VidPidMsb((0x043e, 0x9a)), "\u{f878}"), // lg monitor 
-            (Icon::VidPid((0x0781, 0xf7c9)), "\u{f878}"), // sandisk external disk 
+            (Icon::VidPidMsb((0x043e, 0x9a)), "\u{f0379}"), // lg monitor 󰍹
+            (Icon::VidPid((0x0781, 0xf7c9)), "\u{f02ca}"), // sandisk external disk 󰋊
             (Icon::Classifier(ClassCode::Audio), "\u{f001}"), // 
             (Icon::Classifier(ClassCode::Image), "\u{f03e}"), // 
             (Icon::Classifier(ClassCode::Video), "\u{f03d}"), // 
             (Icon::Classifier(ClassCode::Printer), "\u{f02f}"), // 
             // (Icon::Classifier(ClassCode::MassStorage), "\u{fc05}".into()),
             (Icon::Classifier(ClassCode::Hub), "\u{f126}"), // 
-            (Icon::Classifier(ClassCode::ContentSecurity), "\u{f805}"), // 
-            (Icon::Classifier(ClassCode::SmartCart), "\u{f805}"), // 
+            (Icon::Classifier(ClassCode::ContentSecurity), "\u{f084}"), // 
+            (Icon::Classifier(ClassCode::SmartCart), "\u{f084}"), // 
             (Icon::Classifier(ClassCode::PersonalHealthcare), "\u{f21e}"), // 
-            (Icon::Classifier(ClassCode::AudioVideo), "\u{fd3f}"), // ﴿
+            (Icon::Classifier(ClassCode::AudioVideo), "\u{f0841}"), // 󰡁
             (Icon::Classifier(ClassCode::Billboard), "\u{f05a}"), // 
             (Icon::Classifier(ClassCode::I3CDevice), "\u{f493}"), // 
             (Icon::Classifier(ClassCode::Diagnostic), "\u{f489}"), // 
@@ -284,7 +284,7 @@ lazy_static! {
             (Icon::Classifier(ClassCode::Miscellaneous), "\u{f074}"), // 
             (Icon::Classifier(ClassCode::CDCCommunications), "\u{e795}"), // serial 
             (Icon::Classifier(ClassCode::CDCData), "\u{e795}"), // serial 
-            (Icon::Classifier(ClassCode::HID), "\u{f80b}"), // 
+            (Icon::Classifier(ClassCode::HID), "\u{f030c}"), // 󰌌
             (Icon::UndefinedClassifier, "\u{2636}"), //☶
         ])
     };