From 854a95db6c3536b94f83c3d2e6195e826ee61b10 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 21 Oct 2023 15:45:12 +0200
Subject: [PATCH] added MAD entries from the Metrodroid Project. 
 https://github.com/metrodroid/metrodroid/wiki/DESFire-Applications-IDs

---
 CHANGELOG.md              |  1 +
 client/resources/mad.json | 54 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bbf838048..b190c53638 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Changed mad.json - added entries from the Metrodroid project (@iceman1001)
  - Changed `hf iclass dump` - now allow no save of dumped data (@iceman1001)
  - Changed `hf iclass calcnewkey` - Added calculations for old key elite and new key non elite (@Antiklesys)
  - Changed the CLI prompt to show tcp/udp if used (@iceman1001)
diff --git a/client/resources/mad.json b/client/resources/mad.json
index 38cdf26369..a11236189b 100644
--- a/client/resources/mad.json
+++ b/client/resources/mad.json
@@ -2940,7 +2940,7 @@
         "system_integrator": "A.I.I."
     },
     {
-        "application": "Multi-Modal Transit",
+        "application": "Multi-Modal Transit (Vix/ERG)",
         "company": "ERG Transit Systems",
         "mad": "0x2103",
         "service_provider": "ERG Transit Systems",
@@ -2953,6 +2953,13 @@
         "service_provider": "ERG Transit Systems",
         "system_integrator": "ERG Transit Systems"
     },
+    {
+        "application": "Transit (Metrocard / Christchurch)",
+        "company": "INIT Transit Systems",
+        "mad": "0x2105",
+        "service_provider": "INIT Transit Systems",
+        "system_integrator": "INIT Transit Systems"
+    },    
     {
         "application": "Mass Transportation Ticketing",
         "company": "Omnifare",
@@ -2995,6 +3002,13 @@
         "service_provider": "Emcard",
         "system_integrator": "Emtest"
     },
+    {
+        "application": "Integrated multi-modal transport ticketing system",
+        "company": "HOP Fastpass",
+        "mad": "0x210E",
+        "service_provider": "HOP Fastpass",
+        "system_integrator": "HOP Fastpass"
+    },
     {
         "application": "Integrated multi-modal transport ticketing system",
         "company": "Keane Australia PTY Limited",
@@ -3038,7 +3052,7 @@
         "system_integrator": "T-Systems GEI"
     },
     {
-        "application": "Transportation ticket",
+        "application": "Transportation ticket (Lítačka)",
         "company": "Haguess s.r.o.",
         "mad": "0x2115",
         "service_provider": "HAGUESS, a.s.",
@@ -3135,6 +3149,35 @@
         "service_provider": "RTD",
         "system_integrator": "ACS"
     },
+    {
+        "application": "Bus and rail fare collection (HOLO)",
+        "company": "INIT",
+        "mad": "0x2136",
+        "service_provider": "INIT",
+        "system_integrator": "INIT"
+    },
+    {
+        "application": "Bus and rail fare collection (Ventra)",
+        "company": "Cubic",
+        "mad": "0x2138",
+        "service_provider": "Cubic",
+        "system_integrator": "Cubic"
+    },
+    {
+        "application": "Bus and rail fare collection (Clipper)",
+        "company": "Cubic",
+        "mad": "0x2139",
+        "service_provider": "Cubic",
+        "system_integrator": "Cubic"
+    },
+    {
+        "application": "Bus and rail fare collection (WAVE)",
+        "company": "INIT Rhode Island",
+        "mad": "0x213A",
+        "service_provider": "INIT Rhode Island",
+        "system_integrator": "INIT Rhode Island"
+    },
+
     {
         "application": "Bus services with extension to rail and taxi",
         "company": "Questek Marketing",
@@ -13621,5 +13664,12 @@
         "mad": "0xF001",
         "service_provider": "Tech ID",
         "system_integrator": "Tech ID"
+    },
+    {
+        "application": "Miscellaneous applications",
+        "company": "Reserved For future Use",
+        "mad": "0xFFFF",
+        "service_provider": "RFU",
+        "system_integrator": "RFU"
     }
 ]