From 88696c70478854d7e5ea04ab7021275e4c082f1a Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Wed, 20 Oct 2021 14:27:21 -0600
Subject: [PATCH] Add MacBookPro18,x data set

---
 data/cpu_data.py    |  3 ++-
 data/smbios_data.py | 49 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/data/cpu_data.py b/data/cpu_data.py
index 641980694..ef2f2b745 100644
--- a/data/cpu_data.py
+++ b/data/cpu_data.py
@@ -19,4 +19,5 @@ class cpu_data(enum.IntEnum):
 
     apple_dtk = 112  # A12
     apple_m1 = 114  # A14
-    apple_m2 = 115  # A15
+    apple_m1_pro = 115
+    apple_m1_max = 116
diff --git a/data/smbios_data.py b/data/smbios_data.py
index 14e13c433..3f7c35e2e 100644
--- a/data/smbios_data.py
+++ b/data/smbios_data.py
@@ -1171,6 +1171,55 @@ smbios_dictionary = {
         "Max OS Supported": os_data.os_data.max_os,
         "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
         "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe,
+        "Screen Size": 13,
+        "Ethernet Chipset": None,
+        "Stock GPUs": [],
+    },
+    "MacBookPro18,1": {
+        "Board ID": None,
+        "FirmwareFeatures": None,
+        "SecureBootModel": "j316s",
+        "CPU Generation": cpu_data.cpu_data.apple_m1_pro.value,
+        "Max OS Supported": os_data.os_data.max_os,
+        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe,
+        "Screen Size": 16,
+        "Ethernet Chipset": None,
+        "Stock GPUs": [],
+    },
+    "MacBookPro18,2": {
+        "Board ID": None,
+        "FirmwareFeatures": None,
+        "SecureBootModel": "j316c",
+        "CPU Generation": cpu_data.cpu_data.apple_m1_max.value,
+        "Max OS Supported": os_data.os_data.max_os,
+        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe,
+        "Screen Size": 16,
+        "Ethernet Chipset": None,
+        "Stock GPUs": [],
+    },
+    "MacBookPro18,3": {
+        "Board ID": None,
+        "FirmwareFeatures": None,
+        "SecureBootModel": "j314s",
+        "CPU Generation": cpu_data.cpu_data.apple_m1_pro.value,
+        "Max OS Supported": os_data.os_data.max_os,
+        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe,
+        "Screen Size": 14,
+        "Ethernet Chipset": None,
+        "Stock GPUs": [],
+    },
+    "MacBookPro18,4": {
+        "Board ID": None,
+        "FirmwareFeatures": None,
+        "SecureBootModel": "j314c",
+        "CPU Generation": cpu_data.cpu_data.apple_m1_max.value,
+        "Max OS Supported": os_data.os_data.max_os,
+        "Wireless Model": device_probe.Broadcom.Chipsets.AppleBCMWLANBusInterfacePCIe,
+        "Bluetooth Model": bluetooth_data.bluetooth_data.PCIe,
+        "Screen Size": 14,
         "Ethernet Chipset": None,
         "Stock GPUs": [],
     },