diff --git a/AppleModels/DataBase/MacBookPro/MBP162.yaml b/AppleModels/DataBase/MacBookPro/MBP162.yaml index 925333b5..403be742 100644 --- a/AppleModels/DataBase/MacBookPro/MBP162.yaml +++ b/AppleModels/DataBase/MacBookPro/MBP162.yaml @@ -82,6 +82,7 @@ AppleModelCode: - "ML7M" - "ML7J" - "ML88" + - "0DHT" # Note, first board code is used by macserial AppleBoardCode: - "0000" diff --git a/AppleModels/DataBase/MacBookPro/MBP163.yaml b/AppleModels/DataBase/MacBookPro/MBP163.yaml index 60bd1d20..23e5aa02 100644 --- a/AppleModels/DataBase/MacBookPro/MBP163.yaml +++ b/AppleModels/DataBase/MacBookPro/MBP163.yaml @@ -81,6 +81,8 @@ AppleModelCode: - "P3Y1" - "P3Y2" - "P3YW" + - "049N" + - "0056" # Note, first board code is used by macserial AppleBoardCode: - "0000" diff --git a/AppleModels/DataBase/MacBookPro/MBP164.yaml b/AppleModels/DataBase/MacBookPro/MBP164.yaml index ac2d83f1..4b0ad6f9 100644 --- a/AppleModels/DataBase/MacBookPro/MBP164.yaml +++ b/AppleModels/DataBase/MacBookPro/MBP164.yaml @@ -80,6 +80,10 @@ Specifications: # Note, first model code is used by macserial AppleModelCode: - "MD6T" + - "03T9" + - "0DH8" + - "0051" + - "05J5" # Note, first board code is used by macserial AppleBoardCode: - "0000" diff --git a/AppleModels/DataBase/iMac/IM181.yaml b/AppleModels/DataBase/iMac/IM181.yaml index b6b110a4..f189219f 100644 --- a/AppleModels/DataBase/iMac/IM181.yaml +++ b/AppleModels/DataBase/iMac/IM181.yaml @@ -101,6 +101,11 @@ AppleModelCode: - "H7K0" - "H7VG" - "JFRR" + - "07F0" + - "07DW" + - "07DY" + - "07DX" + - "0LX3" # Note, first board code is used by macserial AppleBoardCode: - "H69F" diff --git a/AppleModels/DataBase/iMac/IM191.yaml b/AppleModels/DataBase/iMac/IM191.yaml index 1558b6bd..619e3b97 100644 --- a/AppleModels/DataBase/iMac/IM191.yaml +++ b/AppleModels/DataBase/iMac/IM191.yaml @@ -126,6 +126,10 @@ AppleModelCode: - "NY2G" - "P1WV" - "MMTC" + - "0H1M" + - "0H1L" + - "0H1K" + - "0H1J" # Note, first board code is used by macserial AppleBoardCode: - "LNV9" diff --git a/AppleModels/DataBase/iMac/IM192.yaml b/AppleModels/DataBase/iMac/IM192.yaml index 90dda101..8ba65452 100644 --- a/AppleModels/DataBase/iMac/IM192.yaml +++ b/AppleModels/DataBase/iMac/IM192.yaml @@ -126,6 +126,28 @@ AppleModelCode: - "N6JT" - "N9LN" - "N07H" + - "0LKD" + - "0PYY" + - "03C7" + - "0MN1" + - "0L08" + - "0KYN" + - "0JVT" + - "07F8" + - "07F5" + - "07F4" + - "07F7" + - "07F6" + - "07F1" + - "07F3" + - "07F2" + - "0L0H" + - "0L0F" + - "0L0G" + - "0L09" + - "0LX4" + - "0LX7" + - "0LX8" # Note, first board code is used by macserial AppleBoardCode: - "KGQG" diff --git a/AppleModels/DataBase/iMac/IM202.yaml b/AppleModels/DataBase/iMac/IM202.yaml index ff01194c..c6ceeda0 100644 --- a/AppleModels/DataBase/iMac/IM202.yaml +++ b/AppleModels/DataBase/iMac/IM202.yaml @@ -89,6 +89,19 @@ AppleModelCode: - "046L" - "046T" - "090Y" + - "08TD" + - "0LKK" + - "0LKJ" + - "0472" + - "0LCY" + - "07CK" + - "0D1R" + - "0D1T" + - "0LF2" + - "0LF3" + - "0LF0" + - "0LF1" + - "0LF4" # Note, first board code is used by macserial AppleBoardCode: - "0000" diff --git a/AppleModels/DataBase/iMacPro/IMP11.yaml b/AppleModels/DataBase/iMacPro/IMP11.yaml index 03c3f45b..38880ea5 100644 --- a/AppleModels/DataBase/iMacPro/IMP11.yaml +++ b/AppleModels/DataBase/iMacPro/IMP11.yaml @@ -100,6 +100,8 @@ AppleModelCode: - "JLD2" - "MC9H" - "M0XV" + - "0833" + - "0832" # Note, first board code is used by macserial AppleBoardCode: - "JG36" diff --git a/AppleModels/Products.zjson b/AppleModels/Products.zjson index b15ac784..3ce483e9 100644 Binary files a/AppleModels/Products.zjson and b/AppleModels/Products.zjson differ diff --git a/Utilities/macserial/modelinfo_autogen.h b/Utilities/macserial/modelinfo_autogen.h index bba8b2eb..0dde350e 100755 --- a/Utilities/macserial/modelinfo_autogen.h +++ b/Utilities/macserial/modelinfo_autogen.h @@ -304,9 +304,9 @@ static const char *AppleModelCode[][APPLE_MODEL_CODE_MAX] = { /* MacBookPro15,3 */ {"LVCG", "LVCJ", "LVDQ", "LVDR", "LVDV", "LVDT", "MVC0", "LVCL", "LVCF", "LVCK", "LVCH", "MV9T", "NQMC", "NCM6", "N6KF", "N6RJ", "NQM9", "NCM5", "NCM3", "N5T6", "NQMF", "NQMD", "NCM4"}, /* MacBookPro15,4 */ {"L40Y", "L410", "L411", "L412", "L413", "L414", "L415", "L416", "NY19", "NY17", "NY1F", "NY18", "NY1H", "N71G", "NXJM", "NR4Y", "N71F", "N71D", "N71C", "NY1G", "NY1C", "P0LW", "P4LF"}, /* MacBookPro16,1 */ {"MD6N", "MD6M", "MD6X", "MD6Q", "MD6P", "MD6R", "MD6W", "MD6V", "PG8W", "PG8V", "PG8Y", "PG8X", "PG8T", "PG90", "PG91"}, - /* MacBookPro16,2 */ {"ML7H", "ML7L", "ML7K", "ML87", "ML86", "ML85", "ML7M", "ML7J", "ML88"}, - /* MacBookPro16,3 */ {"P3XY", "P3YV", "P3YX", "P3YY", "P3Y0", "P3Y1", "P3Y2", "P3YW"}, - /* MacBookPro16,4 */ {"MD6T"}, + /* MacBookPro16,2 */ {"ML7H", "ML7L", "ML7K", "ML87", "ML86", "ML85", "ML7M", "ML7J", "ML88", "0DHT"}, + /* MacBookPro16,3 */ {"P3XY", "P3YV", "P3YX", "P3YY", "P3Y0", "P3Y1", "P3Y2", "P3YW", "049N", "0056"}, + /* MacBookPro16,4 */ {"MD6T", "03T9", "0DH8", "0051", "05J5"}, /* MacBookPro2,1 */ {"W0H", "X9W", "Y9M", "W4M", "X44", "XWV", "W0M", "W0J", "X40", "XCT", "X6C", "X42", "X41", "X3Y", "X43", "X57"}, /* MacBookPro2,2 */ {"W0L", "Y1C", "XKU", "W0G", "W4K", "W4L", "Y6N", "X2G", "Y99", "Y98", "X2K", "W0K", "X2L", "X2H", "X2F", "X9U", "X9V", "XDB", "XDL", "XDK", "YJ9", "XCS", "Y41", "XAQ", "XC6", "X5X", "X6A", "X6B", "X2J", "X2E"}, /* MacBookPro3,1 */ {"X91", "1CY", "0PA", "02V", "0M0", "0S3", "0S6", "0LQ", "0LZ", "1CZ", "2QV", "2QU", "1MG", "1MF", "1CW", "1CX", "027", "0NM", "0ND", "0LR", "2QW", "02D", "028", "0PD", "09R", "09S", "YQ4", "YAP", "YZ2", "Z5M", "YNS", "YWC", "YWB", "YNQ", "X94", "YRD", "YR2", "YQ5", "YRE", "YNW", "XA9", "YZ1", "YAN", "YAA", "YRF", "YAM", "YAL", "YYX", "YZ0", "YWA", "YW5", "Y9T", "Y9S", "Z09", "Z05", "Z0G", "YL0", "X92", "YKZ", "YKY", "YKX", "YQ3", "XAG", "YWD", "YW9", "XAH", "YYV"}, @@ -362,13 +362,13 @@ static const char *AppleModelCode[][APPLE_MODEL_CODE_MAX] = { /* iMac16,1 */ {"GF1J", "HQ9V", "HQ9W", "HQ9T", "H0N6", "H8KX", "H1WR", "GF1L", "GF1M", "GF1K", "J0DJ", "J0DH", "J0DG", "GG77", "GG79", "GG7G", "GG7D", "H0P6", "H25M", "HYGQ", "HHMG", "H2KW", "H1DY", "H1DX", "H1F2", "H1F1"}, /* iMac16,2 */ {"GG7F", "H15R", "H3RJ", "H8KY", "H25N", "GG7C", "GG7H", "H0P7", "H8L0", "H8L1", "H8L2", "H8L3", "H0KF", "H28H", "GG78", "HLWV", "H1F3", "H1F7", "H1F5", "H1F9", "H1F8"}, /* iMac17,1 */ {"GG7L", "GG7J", "GG7N", "GG7R", "GG7T", "GG7V", "GG80", "GG81", "GG82", "GQ17", "GQ18", "H0Q3", "H0Q4", "H0Q5", "H3GP", "H3GQ", "H3GR", "H3GT", "H3GV", "H3GW", "H8L5", "H8L6", "H3H4", "H3HJ", "HJRN", "H1H9", "H4JM", "H2YQ", "J0DK", "GG7Q", "HN8P", "H3H9", "H3H8", "H3H7", "H3H6", "H3H5", "H3H3", "H3H2", "H3H1", "H3H0", "H3HH", "H3HD", "H3HC", "HMMQ", "H3HG", "H3HF", "H3GX", "H3GY", "H3GN"}, - /* iMac18,1 */ {"H7JY", "H7VF", "JGDR", "MCD9", "MCD7", "KQFL", "MCD8", "H7K0", "H7VG", "JFRR"}, + /* iMac18,1 */ {"H7JY", "H7VF", "JGDR", "MCD9", "MCD7", "KQFL", "MCD8", "H7K0", "H7VG", "JFRR", "07F0", "07DW", "07DY", "07DX", "0LX3"}, /* iMac18,2 */ {"J1G5", "J9X5", "J9X4", "LQHG", "JGDT", "J1GC", "J1GF", "J1GD", "J1G8", "J1G9", "J1G6", "J1G7", "J608", "JKF9", "JFPW", "L7H6", "JP10"}, /* iMac18,3 */ {"J1GJ", "J1GQ", "J1GG", "J9XC", "J9X7", "J9X6", "J9X9", "JNGD", "JNGF", "JCCR", "JCCT", "JT72", "J9X8", "JM3R", "JM3V", "J1GR", "J1GP", "J1GV", "J1GT", "J1GK", "J1GH", "J1GN", "J1GL", "J1GM", "JCND", "JC5L", "JX8H", "J2GJ", "J609", "J60C"}, - /* iMac19,1 */ {"JV3Q", "JV3P", "JV40", "JV41", "JV42", "JV43", "MC9K", "MC9J", "MX7W", "JV3N", "JV3T", "JV3W", "JV3R", "JV3Y", "JV3X", "MW2R", "MW2P", "MW2Q", "MW2V", "MW2W", "MW2T", "MQQP", "NY2G", "P1WV", "MMTC"}, - /* iMac19,2 */ {"JWDW", "JWDX", "MQ87", "MC9M", "MC9L", "MRVM", "MPM0", "MW28", "JWDY", "MMTK", "MMTL", "MTML", "MCC1", "JWF3", "JWF2", "JWF1", "JWF0", "JWF4", "N6JT", "N9LN", "N07H"}, + /* iMac19,1 */ {"JV3Q", "JV3P", "JV40", "JV41", "JV42", "JV43", "MC9K", "MC9J", "MX7W", "JV3N", "JV3T", "JV3W", "JV3R", "JV3Y", "JV3X", "MW2R", "MW2P", "MW2Q", "MW2V", "MW2W", "MW2T", "MQQP", "NY2G", "P1WV", "MMTC", "0H1M", "0H1L", "0H1K", "0H1J"}, + /* iMac19,2 */ {"JWDW", "JWDX", "MQ87", "MC9M", "MC9L", "MRVM", "MPM0", "MW28", "JWDY", "MMTK", "MMTL", "MTML", "MCC1", "JWF3", "JWF2", "JWF1", "JWF0", "JWF4", "N6JT", "N9LN", "N07H", "0LKD", "0PYY", "03C7", "0MN1", "0L08", "0KYN", "0JVT", "07F8", "07F5", "07F4", "07F7", "07F6", "07F1", "07F3", "07F2", "0L0H", "0L0F", "0L0G", "0L09", "0LX4", "0LX7", "0LX8"}, /* iMac20,1 */ {"PN5T", "PN5Y", "PN5X", "PN5W", "PN5V", "PN78", "PN7D", "PN77", "PN7C"}, - /* iMac20,2 */ {"046M", "046N", "046L", "046T", "090Y"}, + /* iMac20,2 */ {"046M", "046N", "046L", "046T", "090Y", "08TD", "0LKK", "0LKJ", "0472", "0LCY", "07CK", "0D1R", "0D1T", "0LF2", "0LF3", "0LF0", "0LF1", "0LF4"}, /* iMac4,1 */ {"U2P", "V67", "V4Q", "VX0", "V4P", "V4R", "X0U", "U2S", "VH0", "VH2", "VW4", "WXN", "VGM", "VGC", "V66", "V4U", "V4N", "VV4", "VHP", "VH1", "VV6", "V4M", "U2N", "U2R", "VGB", "VGZ"}, /* iMac4,2 */ {"V2H", "W8K", "WCV", "WAE", "WD4", "W9E", "X11", "V2J", "WKT"}, /* iMac5,1 */ {"X1A", "X9G", "Y3U", "Y9B", "X29", "WRS", "WSD", "YAE", "X0E", "Y3R", "X9E", "XCR", "XCY", "XA4", "WRX", "X6S", "VUV", "VUW", "YDW", "X9Y", "Y3X", "YAG", "WVR", "WV8", "Y3W", "Y3V", "WAR", "X2W", "Y6K", "YLJ", "Y97", "X6Q", "WRR", "X9F", "Y94", "X1W", "WRW", "AC1", "XLF", "VUX", "VUY"}, @@ -377,7 +377,7 @@ static const char *AppleModelCode[][APPLE_MODEL_CODE_MAX] = { /* iMac7,1 */ {"X87", "1NW", "2CB", "0PP", "1SC", "3PA", "0PN", "0PM", "0PL", "0PU", "1NU", "1NV", "3PB", "02X", "0U1", "0PR", "0PQ", "0PT", "09Q", "X86", "Z58", "ZFD", "Z9G", "ZEG", "X85", "X88", "ZCV", "ZCW", "ZGH", "ZCT", "Z59", "Z9F", "ZEF", "ZCR", "X89", "X8A", "ZGP"}, /* iMac8,1 */ {"3SZ", "8R3", "8R2", "3FF", "3FG", "28B", "5A8", "6F9", "5J0", "2PR", "2PN", "39S", "3F9", "3FH", "3GS", "2E4", "5U6", "3NX", "0N4", "6J3", "6J6", "0KM", "2NX", "5J1", "2PT", "6ZC", "28A", "1LW", "ZE7", "ZE4", "ZE2", "ZE3", "ZE6", "ZE5"}, /* iMac9,1 */ {"6MJ", "6X0", "0TH", "9LN", "8TT", "8TS", "0TF", "8M5", "9EX", "9TH", "6MH", "6X3", "6X1", "6X2", "9F3", "0TM", "0TJ", "0TG", "9LR", "9LS", "9LP", "9LQ", "8XH", "0TL", "8M6", "259", "250", "9ET", "HUE", "DWY", "HT6", "HS6", "HS7", "H1S", "E86", "DMV", "FUN", "GM9", "BAH", "FXN", "E1B"}, - /* iMacPro1,1 */ {"HX87", "HX8F", "JL53", "JL54", "JL55", "JLCN", "JLCP", "JLCR", "JLCT", "JLCV", "JLCW", "JLCX", "JLCY", "JLD0", "JLD1", "JLD2", "MC9H", "M0XV"}, + /* iMacPro1,1 */ {"HX87", "HX8F", "JL53", "JL54", "JL55", "JLCN", "JLCP", "JLCR", "JLCT", "JLCV", "JLCW", "JLCX", "JLCY", "JLD0", "JLD1", "JLD2", "MC9H", "M0XV", "0833", "0832"}, }; #define APPLE_BOARD_CODE_MAX 128 @@ -5395,11 +5395,65 @@ static APPLE_MODEL_DESC AppleModelDesc[] = { {"ZP8", "AirPort Express 802.11n (1st Generation)"}, {"ZTM", "AirPort Time Capsule 802.11n (1st Generation)"}, {"ZTN", "AirPort Time Capsule 802.11n (1st Generation)"}, + {"0051", "MacBook Pro (16-inch, 2019)"}, + {"0056", "MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)"}, + {"03C7", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"03T9", "MacBook Pro (16-inch, 2019)"}, {"046L", "iMac (Retina 5K, 27-inch, 2020)"}, {"046M", "iMac (Retina 5K, 27-inch, 2020)"}, {"046N", "iMac (Retina 5K, 27-inch, 2020)"}, {"046T", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0472", "iMac (Retina 5K, 27-inch, 2020)"}, + {"049N", "MacBook Pro (13-inch, 2020, Two Thunderbolt 3 ports)"}, + {"05J5", "MacBook Pro (16-inch, 2019)"}, + {"07CK", "iMac (Retina 5K, 27-inch, 2020)"}, + {"07DW", "iMac (21.5-inch, 2017)"}, + {"07DX", "iMac (21.5-inch, 2017)"}, + {"07DY", "iMac (21.5-inch, 2017)"}, + {"07F0", "iMac (21.5-inch, 2017)"}, + {"07F1", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F2", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F3", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F4", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F5", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F6", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F7", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"07F8", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0832", "iMac Pro (2017)"}, + {"0833", "iMac Pro (2017)"}, + {"08TD", "iMac (Retina 5K, 27-inch, 2020)"}, {"090Y", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0C6L", "AirPods Pro"}, + {"0D1R", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0D1T", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0DH8", "MacBook Pro (16-inch, 2019)"}, + {"0DHT", "MacBook Pro (13-inch, 2020, Four Thunderbolt 3 ports)"}, + {"0H1J", "iMac (Retina 5K, 27-inch, 2019)"}, + {"0H1K", "iMac (Retina 5K, 27-inch, 2019)"}, + {"0H1L", "iMac (Retina 5K, 27-inch, 2019)"}, + {"0H1M", "iMac (Retina 5K, 27-inch, 2019)"}, + {"0JVT", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0KYN", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0L08", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0L09", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0L0F", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0L0G", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0L0H", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0LCY", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LF0", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LF1", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LF2", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LF3", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LF4", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LKD", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0LKJ", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LKK", "iMac (Retina 5K, 27-inch, 2020)"}, + {"0LX3", "iMac (21.5-inch, 2017)"}, + {"0LX4", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0LX7", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0LX8", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0MN1", "iMac (Retina 4K, 21.5-inch, 2019)"}, + {"0PYY", "iMac (Retina 4K, 21.5-inch, 2019)"}, {"AY5W", "MacBook Pro (17-inch, Late 2011)"}, {"DC79", "MacBook Pro (17-inch, Mid 2010)"}, {"DC7C", "MacBook Pro (17-inch, Mid 2010)"},