From f21d410fc12e1a2e727b225cd5642428849e474c Mon Sep 17 00:00:00 2001
From: ry4000 <154689120+ry4000@users.noreply.github.com>
Date: Mon, 7 Oct 2024 15:34:14 +1100
Subject: [PATCH 1/2] R&Y: Updated PDX hop fastpass and Added HID AIDs to
 aid_desfire.json

**Updated PDX hop fastpass**
- *Updated name and description to use its correct name/stylisation.*

**Added HID AIDs**
- *Based on information obtained within the Discord Server, with many thanks.*
- *SIO EV3 HID Factory AID added.*
- *SIO EV3 Field Encoder AID added.*

**Updated PACS AIDs**
-*Updated several name and descriptions to improve output consistency.*

Many thanks in advance, and kind regards,

-randy.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
---
 client/resources/aid_desfire.json | 42 +++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/client/resources/aid_desfire.json b/client/resources/aid_desfire.json
index e39e5fd9c..34662800d 100644
--- a/client/resources/aid_desfire.json
+++ b/client/resources/aid_desfire.json
@@ -163,40 +163,40 @@
         "AID": "53494F",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "Access Control",
-        "Description": "HID Factory",
+        "Name": "SIO EV1 - HID Factory",
+        "Description": "Access Control",
         "Type": "pacs"
     },
     {
         "AID": "6F706C",
         "Vendor": "Openpath",
         "Country": "US",
-        "Name": "Access control",
-        "Description": "Openpath PACS Application",
+        "Name": "Openpath PACS Application",
+        "Description": "Access Control",
         "Type": "pacs"
     },
     {
         "AID": "706000",
         "Vendor": "RBH Access Technologies, Inc.",
         "Country": "CA",
-        "Name": "Access Control",
-        "Description": "BlueLINE EV1 PACS Credential",
+        "Name": "BlueLINE EV1 PACS Credential",
+        "Description": "Access Control",
         "Type": "pacs"
     },
     {
         "AID": "D3494F",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "SIO DESFire EV1",
-        "Description": "Field Encoder",
+        "Name": "SIO EV1 - Field Encoder",
+        "Description": "Access Control",
         "Type": "pacs"
     },
     {
         "AID": "D9494F",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "Access control",
-        "Description": "Field Encoder",
+        "Name": "SIO EV1 - Field Encoder",
+        "Description": "Access Control",
         "Type": "pacs"
     },
     {
@@ -327,12 +327,28 @@
         "Description": "Card Application Directory (CAD)",
         "Type": "pacs"
     },
+    {
+        "AID": "F484E3",
+        "Vendor": "HID",
+        "Country": "US",
+        "Name": "SIO EV3 - Field Encoder",
+        "Description": "Access Control",
+        "Type": "pacs"
+    },
+    {
+        "AID": "F484E4",
+        "Vendor": "HID",
+        "Country": "US",
+        "Name": "SIO EV3 - HID Factory",
+        "Description": "Access Control",
+        "Type": "pacs"
+    },
     {
         "AID": "F48EF1",
         "Vendor": "Salto Systems",
         "Country": "ES",
         "Name": "Salto Systems",
-        "Description": "",
+        "Description": "Access Control",
         "Type": "pacs"
     },
     {
@@ -1003,8 +1019,8 @@
         "AID": "F210E0",
         "Vendor": "TriMet",
         "Country": "US",
-        "Name": "Hop Fastpass (PDX)",
-        "Description": "PDX Hop Card",
+        "Name": "hop fastpass (PDX)",
+        "Description": "PDX hop fastpass Card",
         "Type": "transport"
     },
     {

From 6a75c89d5e338a47b8561e95bf32bf1e3c560c79 Mon Sep 17 00:00:00 2001
From: ry4000 <154689120+ry4000@users.noreply.github.com>
Date: Tue, 8 Oct 2024 13:20:39 +1100
Subject: [PATCH 2/2] R&Y: Reverted HID AID names in aid_desfire.json

Per Iceman's feedback, `SIO DESFire EV1` / `SIO DESFire EV3` to ensure clarity rather than the ambiguous `SIO EV1` and `SIO EV3`.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
---
 client/resources/aid_desfire.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/resources/aid_desfire.json b/client/resources/aid_desfire.json
index 34662800d..e5374f217 100644
--- a/client/resources/aid_desfire.json
+++ b/client/resources/aid_desfire.json
@@ -163,7 +163,7 @@
         "AID": "53494F",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "SIO EV1 - HID Factory",
+        "Name": "SIO DESFire EV1 - HID Factory",
         "Description": "Access Control",
         "Type": "pacs"
     },
@@ -187,7 +187,7 @@
         "AID": "D3494F",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "SIO EV1 - Field Encoder",
+        "Name": "SIO DESFire EV1 - Field Encoder",
         "Description": "Access Control",
         "Type": "pacs"
     },
@@ -195,7 +195,7 @@
         "AID": "D9494F",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "SIO EV1 - Field Encoder",
+        "Name": "SIO DESFire EV1 - Field Encoder",
         "Description": "Access Control",
         "Type": "pacs"
     },
@@ -331,7 +331,7 @@
         "AID": "F484E3",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "SIO EV3 - Field Encoder",
+        "Name": "SIO DESFire EV3 - Field Encoder",
         "Description": "Access Control",
         "Type": "pacs"
     },
@@ -339,7 +339,7 @@
         "AID": "F484E4",
         "Vendor": "HID",
         "Country": "US",
-        "Name": "SIO EV3 - HID Factory",
+        "Name": "SIO DESFire EV3 - HID Factory",
         "Description": "Access Control",
         "Type": "pacs"
     },
@@ -1119,7 +1119,7 @@
         "Description": "UK National Smartcard Project // Provision of Citizen Services #3",
         "Type": "transport"
     },
-        {
+    {
         "AID": "F40113",
         "Vendor": "ITSO Ltd",
         "Country": "UK",