From 8a827fe979559002147b075bc32ee8d3d7520727 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Mon, 8 Feb 2010 14:08:30 +0000 Subject: [PATCH] Updated Nikon Lens lookup table to v4.2.377.1 of Robert Rottmerhusen's fmountlens list. --- src/nikonmn.cpp | 471 ++++++++++++++++++++++++++---------------------- 1 file changed, 251 insertions(+), 220 deletions(-) diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp index 9ecbe1d6..8a815907 100644 --- a/src/nikonmn.cpp +++ b/src/nikonmn.cpp @@ -1437,30 +1437,50 @@ namespace Exiv2 { { #ifdef EXV_HAVE_LENSDATA //------------------------------------------------------------------------------ -// List of AF F-Mount lenses - Version 4.1.361.01 2009-11-10 +// List of AF F-Mount lenses - Version 4.2.377.01 2010-01-27 //------------------------------------------------------------------------------ -#define FMLVERSION "4.1.361.01" -#define FMLDATE "2009-11-10" +#define FMLVERSION "4.2.377.01" +#define FMLDATE "2010-01-27" //------------------------------------------------------------------------------ // // -// created by Robert Rottmerhusen 2005 - 2009 +// Created by Robert Rottmerhusen 2005 - 2010 // http://www.rottmerhusen.com (lens_id@rottmerhusen.com) // -// for contributor info and more visit my online list: +// For contributor info and more visit my online list: // http://www.rottmerhusen.com/objektives/lensid/thirdparty.html // -// three misidentified lenses (ID like the a Nikkor): -// "Sigma" "105mm F2.8 EX DG Macro"; -// "Tokina" "AT-X 235 AF PRO / AF 20-35mm f/2.8"; -// "Tokina" "AT-X 124 AF PRO DX II / 12-24mm f/4"; // -// free use in non-commercial, GPL or open source software only! -// please contact me for adding lenses or use in commercial software. +// Seven misidentified lenses due to double LensIDs: +// +// 2F 48 30 44 24 24 29 02: Nikon AF Zoom-Nikkor 20-35mm f/2.8D IF +// 2F 48 30 44 24 24 29 02: Tokina AT-X 235 AF PRO (AF 20-35mm f/2.8) +// +// 32 54 6A 6A 24 24 35 02: Nikon AF Micro-Nikkor 105mm f/2.8D +// 32 54 6A 6A 24 24 35 02: Sigma Macro 105mm F2.8 EX DG +// +// 7A 3C 1F 37 30 30 7E 06: Nikon AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED +// 7A 3C 1F 37 30 30 7E 06: Tokina AT-X 124 AF PRO DX II (AF 12-24mm f/4) +// +// 8B 40 2D 80 2C 3C FD 0E: Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED +// 8B 40 2D 80 2C 3C FD 0E: Nikon AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II +// +// 32 53 64 64 24 24 35 02: Tamron SP AF 90mm F/2.8 Macro 1:1 (172E) +// 32 53 64 64 24 24 35 02: Tamron SP AF 90mm F/2.8 Di Macro 1:1 (272E) +// +// 2F 40 30 44 2C 34 29 02: Tokina AF 193 (AF 19-35mm f/3.5-4.5) +// 2F 40 30 44 2C 34 29 02: Tokina AF 235 II (AF 20-35mm f/3.5-4.5) +// +// 25 48 3C 5C 24 24 1B 02: Tokina AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8) +// 25 48 3C 5C 24 24 1B 02: Tokina AT-X 287 AF PRO SV (AF 28-70mm f/2.8) +// // // product number/order code not complete // -//"data from TAG 0x98" "ltyp" " "TC" "MID" "manuf" "PN" "lens name from manuf"; +// Free use in non-commercial, GPL or open source software only! +// Please contact me for adding lenses or use in commercial software. +// +//"data from TAG 0x98" "ltyp" " "TC" "MID" "maker" "PN" "lens name from manuf"; // //------------------------------------------------------------------------------ // Nikkor lenses by their LensID @@ -1474,11 +1494,12 @@ fmountlens[] = { {0x03,0x48,0x5C,0x81,0x30,0x30,0x02,0x00,0x00,0x00, "Nikon", "JAA72801", "AF Zoom-Nikkor 70-210mm f/4"}, {0x04,0x48,0x3C,0x3C,0x24,0x24,0x03,0x00,0x00,0x00, "Nikon", "JAA12001", "AF Nikkor 28mm f/2.8"}, {0x05,0x54,0x50,0x50,0x0C,0x0C,0x04,0x00,0x00,0x00, "Nikon", "JAA01001", "AF Nikkor 50mm f/1.4"}, -{0x06,0x54,0x53,0x53,0x24,0x24,0x06,0x00,0x00,0x00, "Nikon", "JAA62101", "AF Micro-Nikkor 55mm f/2.8"}, +{0x06,0x54,0x53,0x53,0x24,0x24,0x06,0x00,0x40,0x00, "Nikon", "JAA62101", "AF Micro-Nikkor 55mm f/2.8"}, {0x07,0x40,0x3C,0x62,0x2C,0x34,0x03,0x00,0x00,0x00, "Nikon", "JAA72901", "AF Zoom-Nikkor 28-85mm f/3.5-4.5"}, {0x08,0x40,0x44,0x6A,0x2C,0x34,0x04,0x00,0x00,0x00, "Nikon", "JAA73001", "AF Zoom-Nikkor 35-105mm f/3.5-4.5"}, {0x09,0x48,0x37,0x37,0x24,0x24,0x04,0x00,0x00,0x00, "Nikon", "JAA12101", "AF Nikkor 24mm f/2.8"}, -{0x0A,0x48,0x8E,0x8E,0x24,0x24,0x03,0x00,0x00,0x00, "Nikon", "JAA322AB", "AF Nikkor 300mm f/2.8 IF-ED"}, +{0x0A,0x48,0x8E,0x8E,0x24,0x24,0x03,0x00,0x00,0x00, "Nikon", "JAA322AA", "AF Nikkor 300mm f/2.8 IF-ED"}, +{0x0A,0x48,0x8E,0x8E,0x24,0x24,0x05,0x00,0x00,0x00, "Nikon", "JAA322AB", "AF Nikkor 300mm f/2.8 IF-ED N"}, {0x0B,0x48,0x7C,0x7C,0x24,0x24,0x05,0x00,0x00,0x00, "Nikon", "JAA32101", "AF Nikkor 180mm f/2.8 IF-ED"}, //0C {0x0D,0x40,0x44,0x72,0x2C,0x34,0x07,0x00,0x00,0x00, "Nikon", "JAA73101", "AF Zoom-Nikkor 35-135mm f/3.5-4.5"}, @@ -1499,8 +1520,8 @@ fmountlens[] = { {0x1B,0x44,0x5E,0x8E,0x34,0x3C,0x10,0x00,0x00,0x00, "Nikon", "JAA738AA", "AF Zoom-Nikkor 75-300mm f/4.5-5.6"}, {0x1C,0x48,0x30,0x30,0x24,0x24,0x12,0x00,0x00,0x00, "Nikon", "JAA12301", "AF Nikkor 20mm f/2.8"}, {0x1D,0x42,0x44,0x5C,0x2A,0x34,0x12,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-70mm f/3.3-4.5 N"}, -{0x1E,0x54,0x56,0x56,0x24,0x24,0x13,0x00,0x00,0x00, "Nikon", "JAA62201", "AF Micro-Nikkor 60mm f/2.8"}, -{0x1F,0x54,0x6A,0x6A,0x24,0x24,0x14,0x00,0x00,0x00, "Nikon", "JAA62301", "AF Micro-Nikkor 105mm f/2.8"}, +{0x1E,0x54,0x56,0x56,0x24,0x24,0x13,0x00,0x40,0x00, "Nikon", "JAA62201", "AF Micro-Nikkor 60mm f/2.8"}, +{0x1F,0x54,0x6A,0x6A,0x24,0x24,0x14,0x00,0x40,0x00, "Nikon", "JAA62301", "AF Micro-Nikkor 105mm f/2.8"}, {0x20,0x48,0x60,0x80,0x24,0x24,0x15,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 80-200mm f/2.8 ED"}, {0x21,0x40,0x3C,0x5C,0x2C,0x34,0x16,0x00,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 28-70mm f/3.5-4.5"}, {0x22,0x48,0x72,0x72,0x18,0x18,0x16,0x00,0x00,0x00, "Nikon", "JAA32501", "AF DC-Nikkor 135mm f/2"}, @@ -1510,33 +1531,33 @@ fmountlens[] = { {0x25,0x48,0x44,0x5c,0x24,0x24,0x1B,0x02,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D"}, {0x25,0x48,0x44,0x5c,0x24,0x24,0x52,0x02,0x00,0x00, "Nikon", "JAA743DA", "AF Zoom-Nikkor 35-70mm f/2.8D"}, //26 -{0x27,0x48,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x08,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED"}, -{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E"}, -{0x27,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x28,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-17E"}, -{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x28,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E"}, -{0x28,0x3C,0xA6,0xA6,0x30,0x30,0x1D,0x02,0x08,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED"}, -{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-14E"}, -{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-17E"}, -{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-20E"}, +{0x27,0x48,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x07,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED"}, +{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x0F,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E"}, +{0x27,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x0F,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-17E"}, +{0x27,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x0F,0x00, "Nikon", "JAA326DA", "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E"}, +{0x28,0x3C,0xA6,0xA6,0x30,0x30,0x1D,0x02,0x07,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED"}, +{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x0F,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-14E"}, +{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x0F,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-17E"}, +{0x28,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x0F,0x00, "Nikon", "JAA519DA", "AF-I Nikkor 600mm f/4D IF-ED + TC-20E"}, //29 {0x2A,0x54,0x3C,0x3C,0x0C,0x0C,0x26,0x02,0x00,0x00, "Nikon", "JAA124DA", "AF Nikkor 28mm f/1.4D"}, {0x2B,0x3C,0x44,0x60,0x30,0x3C,0x1F,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 35-80mm f/4-5.6D"}, {0x2C,0x48,0x6A,0x6A,0x18,0x18,0x27,0x02,0x00,0x00, "Nikon", "JAA327DA", "AF DC-Nikkor 105mm f/2D"}, -{0x2D,0x48,0x80,0x80,0x30,0x30,0x21,0x02,0x00,0x00, "Nikon", "JAA624DA", "AF Micro-Nikkor 200mm f/4D IF-ED"}, +{0x2D,0x48,0x80,0x80,0x30,0x30,0x21,0x02,0x40,0x00, "Nikon", "JAA624DA", "AF Micro-Nikkor 200mm f/4D IF-ED"}, {0x2E,0x48,0x5C,0x82,0x30,0x3C,0x28,0x02,0x00,0x00, "Nikon", "JAA747DA", "AF Nikkor 70-210mm f/4-5.6D"}, {0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x00, "Nikon", "JAA746DA", "AF Zoom-Nikkor 20-35mm f/2.8D IF"}, -{0x30,0x48,0x98,0x98,0x24,0x24,0x24,0x02,0x08,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED"}, -{0x30,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E"}, -{0x30,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E"}, -{0x30,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x28,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E"}, -{0x31,0x54,0x56,0x56,0x24,0x24,0x25,0x02,0x00,0x00, "Nikon", "JAA625DA", "AF Micro-Nikkor 60mm f/2.8D"}, -{0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x00, "Nikon", "JAA627DA", "AF Micro-Nikkor 105mm f/2.8D"}, +{0x30,0x48,0x98,0x98,0x24,0x24,0x24,0x02,0x07,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED"}, +{0x30,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x0F,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E"}, +{0x30,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x0F,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E"}, +{0x30,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x0F,0x00, "Nikon", "JAA520DA", "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E"}, +{0x31,0x54,0x56,0x56,0x24,0x24,0x25,0x02,0x40,0x00, "Nikon", "JAA625DA", "AF Micro-Nikkor 60mm f/2.8D"}, +{0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x40,0x00, "Nikon", "JAA627DA", "AF Micro-Nikkor 105mm f/2.8D"}, {0x33,0x48,0x2D,0x2D,0x24,0x24,0x31,0x02,0x00,0x00, "Nikon", "JAA126DA", "AF Nikkor 18mm f/2.8D"}, {0x34,0x48,0x29,0x29,0x24,0x24,0x32,0x02,0x00,0x00, "Nikon", "JAA626DA", "AF Fisheye Nikkor 16mm f/2.8D"}, -{0x35,0x3C,0xA0,0xA0,0x30,0x30,0x33,0x02,0x08,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED"}, -{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-14E"}, -{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-17E"}, -{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-20E"}, +{0x35,0x3C,0xA0,0xA0,0x30,0x30,0x33,0x02,0x07,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED"}, +{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x0F,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-14E"}, +{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x0F,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-17E"}, +{0x35,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x0F,0x00, "Nikon", "JAA521DA", "AF-I Nikkor 500mm f/4D IF-ED + TC-20E"}, {0x36,0x48,0x37,0x37,0x24,0x24,0x34,0x02,0x00,0x00, "Nikon", "JAA125DA", "AF Nikkor 24mm f/2.8D"}, {0x37,0x48,0x30,0x30,0x24,0x24,0x36,0x02,0x00,0x00, "Nikon", "JAA127DA", "AF Nikkor 20mm f/2.8D"}, {0x38,0x4C,0x62,0x62,0x14,0x14,0x37,0x02,0x00,0x00, "Nikon", "JAA328DA", "AF Nikkor 85mm f/1.8D"}, @@ -1555,19 +1576,19 @@ fmountlens[] = { {0x45,0x40,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x00, "Nikon", "JAA752DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"}, {0x46,0x3C,0x44,0x60,0x30,0x3C,0x49,0x02,0x00,0x00, "Nikon", "JAA754DA", "AF Zoom-Nikkor 35-80mm f/4-5.6D N"}, {0x47,0x42,0x37,0x50,0x2A,0x34,0x4A,0x02,0x00,0x00, "Nikon", "JAA756DA", "AF Zoom-Nikkor 24-50mm f/3.3-4.5D"}, -{0x48,0x48,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x08,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED"}, -{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x28,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E"}, -{0x48,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x28,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E"}, -{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x28,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E"}, -{0x49,0x3C,0xA6,0xA6,0x30,0x30,0x4C,0x02,0x08,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED"}, -{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-14E"}, -{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-17E"}, -{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-20E"}, +{0x48,0x48,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x07,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED"}, +{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF1,0x02,0x0F,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E"}, +{0x48,0x48,0x8E,0x8E,0x24,0x24,0xE1,0x02,0x0F,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E"}, +{0x48,0x48,0x8E,0x8E,0x24,0x24,0xF2,0x02,0x0F,0x00, "Nikon", "JAA333DA", "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E"}, +{0x49,0x3C,0xA6,0xA6,0x30,0x30,0x4C,0x02,0x07,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED"}, +{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF1,0x02,0x0F,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-14E"}, +{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xE1,0x02,0x0F,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-17E"}, +{0x49,0x3C,0xA6,0xA6,0x30,0x30,0xF2,0x02,0x0F,0x00, "Nikon", "JAA522DA", "AF-S Nikkor 600mm f/4D IF-ED + TC-20E"}, {0x4A,0x54,0x62,0x62,0x0C,0x0C,0x4D,0x02,0x00,0x00, "Nikon", "JAA332DA", "AF Nikkor 85mm f/1.4D IF"}, -{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0x4E,0x02,0x08,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED"}, -{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x28,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-14E"}, -{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x28,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-17E"}, -{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x28,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-20E"}, +{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0x4E,0x02,0x07,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED"}, +{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF1,0x02,0x0F,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-14E"}, +{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xE1,0x02,0x0F,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-17E"}, +{0x4B,0x3C,0xA0,0xA0,0x30,0x30,0xF2,0x02,0x0F,0x00, "Nikon", "JAA523DA", "AF-S Nikkor 500mm f/4D IF-ED + TC-20E"}, {0x4C,0x40,0x37,0x6E,0x2C,0x3C,0x4F,0x02,0x00,0x00, "Nikon", "JAA757DA", "AF Zoom-Nikkor 24-120mm f/3.5-5.6D IF"}, {0x4D,0x40,0x3C,0x80,0x2C,0x3C,0x62,0x02,0x00,0x00, "Nikon", "JAA758DA", "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF"}, {0x4E,0x48,0x72,0x72,0x18,0x18,0x51,0x02,0x00,0x00, "Nikon", "JAA329DA", "AF DC-Nikkor 135mm f/2D"}, @@ -1583,141 +1604,146 @@ fmountlens[] = { {0x56,0x48,0x5C,0x8E,0x30,0x3C,0x5A,0x02,0x00,0x00, "Nikon", "JAA764DA", "AF Zoom-Nikkor 70-300mm f/4-5.6D ED"}, //57 //58 -{0x59,0x48,0x98,0x98,0x24,0x24,0x5D,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED"}, -{0x59,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E"}, -{0x59,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E"}, -{0x59,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x08,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E"}, +{0x59,0x48,0x98,0x98,0x24,0x24,0x5D,0x02,0x07,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED"}, +{0x59,0x48,0x98,0x98,0x24,0x24,0xF1,0x02,0x0F,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E"}, +{0x59,0x48,0x98,0x98,0x24,0x24,0xE1,0x02,0x0F,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E"}, +{0x59,0x48,0x98,0x98,0x24,0x24,0xF2,0x02,0x0F,0x00, "Nikon", "JAA524DA", "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E"}, {0x5A,0x3C,0x3E,0x56,0x30,0x3C,0x5E,0x06,0x00,0x00, "Nikon", "JBA704AA", "IX-Nikkor 30-60mm f/4-5.6"}, {0x5B,0x44,0x56,0x7C,0x34,0x3C,0x5F,0x06,0x00,0x00, "Nikon", "JBA705AA", "IX-Nikkor 60-180mm f/4.5-5.6"}, // "JBA706AC" "IX-Nikkor 20-60 mm f/3.5-5.6N"; //5C -{0x5D,0x48,0x3C,0x5C,0x24,0x24,0x63,0x02,0x05,0x00, "Nikon", "JAA767DA", "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED"}, -{0x5E,0x48,0x60,0x80,0x24,0x24,0x64,0x02,0x05,0x00, "Nikon", "JAA765DA", "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED"}, +{0x5D,0x48,0x3C,0x5C,0x24,0x24,0x63,0x02,0x01,0x00, "Nikon", "JAA767DA", "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED"}, +{0x5E,0x48,0x60,0x80,0x24,0x24,0x64,0x02,0x03,0x00, "Nikon", "JAA765DA", "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED"}, {0x5F,0x40,0x3C,0x6A,0x2C,0x34,0x65,0x02,0x00,0x00, "Nikon", "JAA766DA", "AF Zoom-Nikkor 28-105mm f/3.5-4.5D IF"}, {0x60,0x40,0x3C,0x60,0x2C,0x3C,0x66,0x02,0x00,0x00, "Nikon", "JAA769DA", "AF Zoom-Nikkor 28-80mm f/3.5-5.6D"}, {0x61,0x44,0x5E,0x86,0x34,0x3C,0x67,0x02,0x00,0x00, "Nikon", "", "AF Zoom-Nikkor 75-240mm f/4.5-5.6D"}, //62 69 -{0x63,0x48,0x2B,0x44,0x24,0x24,0x68,0x02,0x05,0x00, "Nikon", "JAA770DA", "AF-S Nikkor 17-35mm f/2.8D IF-ED"}, -{0x64,0x00,0x62,0x62,0x24,0x24,0x6A,0x02,0x00,0x00, "Nikon", "JAA628DA", "PC Micro-Nikkor 85mm f/2.8D"}, +{0x63,0x48,0x2B,0x44,0x24,0x24,0x68,0x02,0x01,0x00, "Nikon", "JAA770DA", "AF-S Nikkor 17-35mm f/2.8D IF-ED"}, +{0x64,0x00,0x62,0x62,0x24,0x24,0x6A,0x02,0x40,0x00, "Nikon", "JAA628DA", "PC Micro-Nikkor 85mm f/2.8D"}, {0x65,0x44,0x60,0x98,0x34,0x3C,0x6B,0x0A,0x00,0x00, "Nikon", "JAA771DA", "AF VR Zoom-Nikkor 80-400mm f/4.5-5.6D ED"}, {0x66,0x40,0x2D,0x44,0x2C,0x34,0x6C,0x02,0x00,0x00, "Nikon", "JAA772DA", "AF Zoom-Nikkor 18-35mm f/3.5-4.5D IF-ED"}, {0x67,0x48,0x37,0x62,0x24,0x30,0x6D,0x02,0x00,0x00, "Nikon", "JAA774DA", "AF Zoom-Nikkor 24-85mm f/2.8-4D IF"}, {0x68,0x42,0x3C,0x60,0x2A,0x3C,0x6E,0x06,0x00,0x00, "Nikon", "JAA777DA", "AF Zoom-Nikkor 28-80mm f/3.3-5.6G"}, {0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x06,0x00,0x00, "Nikon", "JAA776DA", "AF Zoom-Nikkor 70-300mm f/4-5.6G"}, -{0x6A,0x48,0x8E,0x8E,0x30,0x30,0x70,0x02,0x00,0x00, "Nikon", "JAA334DA", "AF-S Nikkor 300mm f/4D IF-ED"}, +{0x6A,0x48,0x8E,0x8E,0x30,0x30,0x70,0x02,0x03,0x00, "Nikon", "JAA334DA", "AF-S Nikkor 300mm f/4D IF-ED"}, {0x6B,0x48,0x24,0x24,0x24,0x24,0x71,0x02,0x00,0x00, "Nikon", "JAA130DA", "AF Nikkor ED 14mm f/2.8D"}, //6C 72 -{0x6D,0x48,0x8E,0x8E,0x24,0x24,0x73,0x02,0x04,0x00, "Nikon", "JAA335DA", "AF-S Nikkor 300mm f/2.8D IF-ED II"}, -{0x6E,0x48,0x98,0x98,0x24,0x24,0x74,0x02,0x04,0x00, "Nikon", "JAA525DA", "AF-S Nikkor 400mm f/2.8D IF-ED II"}, -{0x6F,0x3C,0xA0,0xA0,0x30,0x30,0x75,0x02,0x04,0x00, "Nikon", "JAA526DA", "AF-S Nikkor 500mm f/4D IF-ED II"}, -{0x70,0x3C,0xA6,0xA6,0x30,0x30,0x76,0x02,0x04,0x00, "Nikon", "JAA527DA", "AF-S Nikkor 600mm f/4D IF-ED II"}, +{0x6D,0x48,0x8E,0x8E,0x24,0x24,0x73,0x02,0x03,0x00, "Nikon", "JAA335DA", "AF-S Nikkor 300mm f/2.8D IF-ED II"}, +{0x6E,0x48,0x98,0x98,0x24,0x24,0x74,0x02,0x03,0x00, "Nikon", "JAA525DA", "AF-S Nikkor 400mm f/2.8D IF-ED II"}, +{0x6F,0x3C,0xA0,0xA0,0x30,0x30,0x75,0x02,0x03,0x00, "Nikon", "JAA526DA", "AF-S Nikkor 500mm f/4D IF-ED II"}, +{0x70,0x3C,0xA6,0xA6,0x30,0x30,0x76,0x02,0x03,0x00, "Nikon", "JAA527DA", "AF-S Nikkor 600mm f/4D IF-ED II"}, //71 {0x72,0x48,0x4C,0x4C,0x24,0x24,0x77,0x00,0x00,0x00, "Nikon", "JAA012AA", "Nikkor 45mm f/2.8 P"}, //73 -{0x74,0x40,0x37,0x62,0x2C,0x34,0x78,0x06,0x05,0x00, "Nikon", "JAA780DA", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"}, +{0x74,0x40,0x37,0x62,0x2C,0x34,0x78,0x06,0x01,0x00, "Nikon", "JAA780DA", "AF-S Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED"}, {0x75,0x40,0x3C,0x68,0x2C,0x3C,0x79,0x06,0x00,0x00, "Nikon", "JAA778DA", "AF Zoom-Nikkor 28-100mm f/3.5-5.6G"}, {0x76,0x58,0x50,0x50,0x14,0x14,0x7A,0x02,0x00,0x00, "Nikon", "JAA013DA", "AF Nikkor 50mm f/1.8D"}, -{0x77,0x48,0x5C,0x80,0x24,0x24,0x7B,0x0E,0x04,0x00, "Nikon", "JAA781DA", "AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED"}, -{0x78,0x40,0x37,0x6E,0x2C,0x3C,0x7C,0x0E,0x05,0x00, "Nikon", "JAA782DA", "AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED"}, +{0x77,0x48,0x5C,0x80,0x24,0x24,0x7B,0x0E,0x03,0x00, "Nikon", "JAA781DA", "AF-S VR Zoom-Nikkor 70-200mm f/2.8G IF-ED"}, +{0x78,0x40,0x37,0x6E,0x2C,0x3C,0x7C,0x0E,0x01,0x00, "Nikon", "JAA782DA", "AF-S VR Zoom-Nikkor 24-120mm f/3.5-5.6G IF-ED"}, {0x79,0x40,0x3C,0x80,0x2C,0x3C,0x7F,0x06,0x00,0x00, "Nikon", "JAA783DA", "AF Zoom-Nikkor 28-200mm f/3.5-5.6G IF-ED"}, -{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x05,0x00, "Nikon", "JAA784DA", "AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED"}, -{0x7B,0x48,0x80,0x98,0x30,0x30,0x80,0x0E,0x04,0x00, "Nikon", "JAA787DA", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED"}, +{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x00, "Nikon", "JAA784DA", "AF-S DX Zoom-Nikkor 12-24mm f/4G IF-ED"}, +{0x7B,0x48,0x80,0x98,0x30,0x30,0x80,0x0E,0x03,0x00, "Nikon", "JAA787DA", "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED"}, //7C 81 {0x7D,0x48,0x2B,0x53,0x24,0x24,0x82,0x06,0x01,0x00, "Nikon", "JAA788DA", "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED"}, //7E 83 -{0x7F,0x40,0x2D,0x5C,0x2C,0x34,0x84,0x06,0x01,0x00, "Nikon", "JAA790DA", "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED"}, +{0x7F,0x40,0x2D,0x5C,0x2C,0x34,0x84,0x06,0x11,0x00, "Nikon", "JAA790DA", "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED"}, {0x80,0x48,0x1A,0x1A,0x24,0x24,0x85,0x06,0x00,0x00, "Nikon", "JAA629DA", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"}, {0x81,0x54,0x80,0x80,0x18,0x18,0x86,0x0E,0x03,0x00, "Nikon", "JAA336DA", "AF-S VR Nikkor 200mm f/2G IF-ED"}, -{0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E,0x03,0x00, "Nikon", "JAA337DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED"}, -//83 -//84 -//85 +{0x82,0x48,0x8E,0x8E,0x24,0x24,0x87,0x0E,0x13,0x00, "Nikon", "JAA337DA", "AF-S VR Nikkor 300mm f/2.8G IF-ED"}, +//83 +//84 +//85 //86 //87 -//88 -{0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x00,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"}, -{0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x03,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"}, -{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x00,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"}, -{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x00,0x00, "Nikon", "JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED (II)"}, -{0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06,0x00,0x00, "Nikon", "JAA792DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"}, -{0x8D,0x44,0x5C,0x8E,0x34,0x3C,0x8F,0x0E,0x00,0x00, "Nikon", "JAA795DA", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"}, +//88 +{0x89,0x3C,0x53,0x80,0x30,0x3C,0x8B,0x06,0x01,0x00, "Nikon", "JAA793DA", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"}, +{0x8A,0x54,0x6A,0x6A,0x24,0x24,0x8C,0x0E,0x53,0x00, "Nikon", "JAA630DA", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"}, +{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0x8D,0x0E,0x01,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"}, +{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x00, "Nikon", "JAA794DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED"}, +{0x8B,0x40,0x2D,0x80,0x2C,0x3C,0xFD,0x0E,0x01,0x00, "Nikon", "JAA813DA", "AF-S DX VR Zoom-Nikkor 18-200mm f/3.5-5.6G IF-ED II"}, +{0x8C,0x40,0x2D,0x53,0x2C,0x3C,0x8E,0x06,0x01,0x00, "Nikon", "JAA792DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED"}, +{0x8D,0x44,0x5C,0x8E,0x34,0x3C,0x8F,0x0E,0x31,0x00, "Nikon", "JAA795DA", "AF-S VR Zoom-Nikkor 70-300mm f/4.5-5.6G IF-ED"}, //8E 90 -{0x8F,0x40,0x2D,0x72,0x2C,0x3C,0x91,0x06,0x00,0x00, "Nikon", "JAA796DA", "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"}, -{0x90,0x3B,0x53,0x80,0x30,0x3C,0x92,0x0E,0x00,0x00, "Nikon", "JAA798DA", "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED"}, +{0x8F,0x40,0x2D,0x72,0x2C,0x3C,0x91,0x06,0x01,0x00, "Nikon", "JAA796DA", "AF-S DX Zoom-Nikkor 18-135mm f/3.5-5.6G IF-ED"}, +{0x90,0x3B,0x53,0x80,0x30,0x3C,0x92,0x0E,0x01,0x00, "Nikon", "JAA798DA", "AF-S DX VR Zoom-Nikkor 55-200mm f/4-5.6G IF-ED"}, //91 93 {0x92,0x48,0x24,0x37,0x24,0x24,0x94,0x06,0x01,0x00, "Nikon", "JAA801DA", "AF-S Zoom-Nikkor 14-24mm f/2.8G ED"}, {0x93,0x48,0x37,0x5C,0x24,0x24,0x95,0x06,0x01,0x00, "Nikon", "JAA802DA", "AF-S Zoom-Nikkor 24-70mm f/2.8G ED"}, -{0x94,0x40,0x2D,0x53,0x2C,0x3C,0x96,0x06,0x00,0x00, "Nikon", "JAA797DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"}, +{0x94,0x40,0x2D,0x53,0x2C,0x3C,0x96,0x06,0x01,0x00, "Nikon", "JAA797DA", "AF-S DX Zoom-Nikkor 18-55mm f/3.5-5.6G ED II"}, {0x95,0x4C,0x37,0x37,0x2C,0x2C,0x97,0x02,0x00,0x00, "Nikon", "JAA631DA", "PC-E Nikkor 24mm f/3.5D ED"}, {0x95,0x00,0x37,0x37,0x2C,0x2C,0x97,0x06,0x00,0x00, "Nikon", "JAA631DA", "PC-E Nikkor 24mm f/3.5D ED"}, -{0x96,0x48,0x98,0x98,0x24,0x24,0x98,0x0E,0x02,0x00, "Nikon", "JAA528DA", "AF-S VR Nikkor 400mm f/2.8G ED"}, -{0x97,0x3C,0xA0,0xA0,0x30,0x30,0x99,0x0E,0x02,0x00, "Nikon", "JAA529DA", "AF-S VR Nikkor 500mm f/4G ED"}, -{0x98,0x3C,0xA6,0xA6,0x30,0x30,0x9A,0x0E,0x02,0x00, "Nikon", "JAA530DA", "AF-S VR Nikkor 600mm f/4G ED"}, -{0x99,0x40,0x29,0x62,0x2C,0x3C,0x9B,0x0E,0x00,0x00, "Nikon", "JAA800DA", "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED"}, -{0x9A,0x40,0x2D,0x53,0x2C,0x3C,0x9C,0x0E,0x00,0x00, "Nikon", "JAA803DA", "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G"}, +{0x96,0x48,0x98,0x98,0x24,0x24,0x98,0x0E,0x13,0x00, "Nikon", "JAA528DA", "AF-S VR Nikkor 400mm f/2.8G ED"}, +{0x97,0x3C,0xA0,0xA0,0x30,0x30,0x99,0x0E,0x13,0x00, "Nikon", "JAA529DA", "AF-S VR Nikkor 500mm f/4G ED"}, +{0x98,0x3C,0xA6,0xA6,0x30,0x30,0x9A,0x0E,0x13,0x00, "Nikon", "JAA530DA", "AF-S VR Nikkor 600mm f/4G ED"}, +{0x99,0x40,0x29,0x62,0x2C,0x3C,0x9B,0x0E,0x01,0x00, "Nikon", "JAA800DA", "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED"}, +{0x9A,0x40,0x2D,0x53,0x2C,0x3C,0x9C,0x0E,0x01,0x00, "Nikon", "JAA803DA", "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G"}, {0x9B,0x54,0x4C,0x4C,0x24,0x24,0x9D,0x02,0x00,0x00, "Nikon", "JAA633DA", "PC-E Micro Nikkor 45mm f/2.8D ED"}, {0x9B,0x00,0x4C,0x4C,0x24,0x24,0x9D,0x06,0x00,0x00, "Nikon", "JAA633DA", "PC-E Micro Nikkor 45mm f/2.8D ED"}, -{0x9C,0x54,0x56,0x56,0x24,0x24,0x9E,0x06,0x00,0x00, "Nikon", "JAA632DA", "AF-S Micro Nikkor 60mm f/2.8G ED"}, -{0x9D,0x54,0x62,0x62,0x24,0x24,0x9F,0x02,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"}, -{0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06,0x00,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"}, -{0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E,0x00,0x00, "Nikon", "JAA805DA", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"}, -{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x00,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"}, -{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x00,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"}, -{0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x00,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"}, -{0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x00,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"}, +{0x9C,0x54,0x56,0x56,0x24,0x24,0x9E,0x06,0x41,0x00, "Nikon", "JAA632DA", "AF-S Micro Nikkor 60mm f/2.8G ED"}, +{0x9D,0x54,0x62,0x62,0x24,0x24,0x9F,0x02,0x40,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"}, +{0x9D,0x00,0x62,0x62,0x24,0x24,0x9F,0x06,0x40,0x00, "Nikon", "JAA634DA", "PC-E Micro Nikkor 85mm f/2.8D"}, +{0x9E,0x40,0x2D,0x6A,0x2C,0x3C,0xA0,0x0E,0x01,0x00, "Nikon", "JAA805DA", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"}, +{0x9F,0x58,0x44,0x44,0x14,0x14,0xA1,0x06,0x01,0x00, "Nikon", "JAA132DA", "AF-S DX Nikkor 35mm f/1.8G"}, +{0xA0,0x54,0x50,0x50,0x0C,0x0C,0xA2,0x06,0x01,0x00, "Nikon", "JAA014DA", "AF-S Nikkor 50mm f/1.4G"}, +{0xA1,0x40,0x18,0x37,0x2C,0x34,0xA3,0x06,0x01,0x00, "Nikon", "JAA804DA", "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED"}, +{0xA2,0x48,0x5C,0x80,0x24,0x24,0xA4,0x0E,0x13,0x00, "Nikon", "JAA807DA", "AF-S Nikkor 70-200mm f/2.8G ED VR II"}, +//A3 A5 +//A4 A6 +//A5 A7 +//A6 A8 +{0xA7,0x4B,0x62,0x62,0x2C,0x2C,0xA9,0x0E,0x41,0x00, "Nikon", "JAA637DA", "AF-S DX Micro Nikkor 85mm f/3.5G ED VR"}, // // {0x01,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"}, {0x01,0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x00,0x00, "Nikon", "JAA90701", "TC-16A"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x20,0x00, "Nikon", "JAA908DA", "TC-14E"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x20,0x00, "Nikon", "JAA909DA", "TC-20E"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x20,0x00, "Nikon", "JAA910DA", "TC-14E II"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x20,0x00, "Nikon", "JAA911DA", "TC-20E II"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xE1,0x12,0x20,0x00, "Nikon", "JAA912DA", "TC-17E II"}, // //------------------------------------------------------------------------------ // Sigma lenses by focal length, first fixed then zoom lenses //------------------------------------------------------------------------------ // -{0xFE,0x47,0x00,0x00,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "486556", "4.5mm F2.8 EX DC HSM Circular Fisheye"}, +{0xFE,0x47,0x00,0x00,0x24,0x24,0x4B,0x06,0x01,0x05, "Sigma", "486556", "4.5mm F2.8 EX DC HSM Circular Fisheye"}, {0x26,0x48,0x11,0x11,0x30,0x30,0x1C,0x02,0x00,0x05, "Sigma", "483", "8mm F4 EX Circular Fisheye"}, {0x79,0x40,0x11,0x11,0x2C,0x2C,0x1C,0x06,0x00,0x05, "Sigma", "485597", "8mm F3.5 EX Circular Fisheye"}, -{0xDC,0x48,0x19,0x19,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "477554", "10mm F2.8 EX DC HSM Fisheye"}, +{0xDC,0x48,0x19,0x19,0x24,0x24,0x4B,0x06,0x01,0x05, "Sigma", "477554", "10mm F2.8 EX DC HSM Fisheye"}, {0x02,0x3F,0x24,0x24,0x2C,0x2C,0x02,0x00,0x00,0x05, "Sigma", "468", "14mm F3.5"}, -{0x48,0x48,0x24,0x24,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "", "14mm F2.8 EX Aspherical HSM"}, +{0x48,0x48,0x24,0x24,0x24,0x24,0x4B,0x02,0x01,0x05, "Sigma", "", "14mm F2.8 EX Aspherical HSM"}, {0x26,0x48,0x27,0x27,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "476441", "15mm F2.8 EX Diagonal Fisheye"}, -// "Sigma" "410" "18mm F3.5"; +//M "Sigma" "410" "18mm F3.5"; {0x26,0x58,0x31,0x31,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "411442", "20mm F1.8 EX DG Aspherical RF"}, {0x26,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"}, {0xE1,0x58,0x37,0x37,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "432447", "24mm F1.8 EX DG Aspherical Macro"}, {0x02,0x46,0x37,0x37,0x25,0x25,0x02,0x00,0x00,0x05, "Sigma", "438", "24mm F2.8 Super Wide II Macro"}, {0x26,0x58,0x3C,0x3C,0x14,0x14,0x1C,0x02,0x00,0x05, "Sigma", "440442", "28mm F1.8 EX DG Aspherical Macro"}, -{0x48,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"}, -{0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x00,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"}, -{0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x00,0x05, "Sigma", "310554", "50mm F1.4 EX DG HSM"}, +{0x48,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"}, +{0xF8,0x54,0x3E,0x3E,0x0C,0x0C,0x4B,0x06,0x01,0x05, "Sigma", "477554", "30mm F1.4 EX DC HSM"}, +{0xDE,0x54,0x50,0x50,0x0C,0x0C,0x4B,0x06,0x01,0x05, "Sigma", "310554", "50mm F1.4 EX DG HSM"}, {0x32,0x54,0x50,0x50,0x24,0x24,0x35,0x02,0x00,0x05, "Sigma", "346447", "Macro 50mm F2.8 EX DG"}, {0x79,0x48,0x5C,0x5C,0x24,0x24,0x1C,0x06,0x00,0x05, "Sigma", "270599", "Macro 70mm F2.8 EX DG"}, -{0x02,0x48,0x65,0x65,0x24,0x24,0x02,0x00,0x00,0x05, "Sigma", "", "90mm F2.8 Macro"}, +{0x02,0x48,0x65,0x65,0x24,0x24,0x02,0x00,0x00,0x05, "Sigma", "", "Macro 90mm F2.8"}, {0x32,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x05, "Sigma", "256", "Macro 105mm F2.8 EX DG"}, -{0xE5,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x00,0x05, "Sigma", "257446", "Macro 105mm F2.8 EX DG"}, -{0x48,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x04,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"}, -{0xF5,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x04,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"}, -{0x48,0x4C,0x7C,0x7C,0x2C,0x2C,0x4B,0x02,0x00,0x05, "Sigma", "", "180mm F3.5 EX DG Macro"}, -{0x48,0x4C,0x7D,0x7D,0x2C,0x2C,0x4B,0x02,0x00,0x05, "Sigma", "105556", "APO Macro 180mm F3.5 EX DG HSM"}, -{0x48,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 300mm F2.8 EX DG HSM"}, -{0xFB,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "195557", "APO 300mm F2.8 EX DG HSM"}, +{0xE5,0x54,0x6A,0x6A,0x24,0x24,0x35,0x02,0x40,0x05, "Sigma", "257446", "Macro 105mm F2.8 EX DG"}, +{0x48,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x43,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"}, +{0xF5,0x48,0x76,0x76,0x24,0x24,0x4B,0x06,0x43,0x05, "Sigma", "104559", "APO Macro 150mm F2.8 EX DG HSM"}, +{0x48,0x4C,0x7C,0x7C,0x2C,0x2C,0x4B,0x02,0x43,0x05, "Sigma", "", "APO Macro 180mm F3.5 EX DG HSM"}, +{0x48,0x4C,0x7D,0x7D,0x2C,0x2C,0x4B,0x02,0x43,0x05, "Sigma", "105556", "APO Macro 180mm F3.5 EX DG HSM"}, +//M "Sigma" "" "APO 300mm F2.8"; +{0x48,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x05, "Sigma", "", "APO 300mm F2.8 EX DG HSM"}, +{0xFB,0x54,0x8E,0x8E,0x24,0x24,0x4B,0x02,0x13,0x05, "Sigma", "195557", "APO 300mm F2.8 EX DG HSM"}, {0x26,0x48,0x8E,0x8E,0x30,0x30,0x1C,0x02,0x00,0x05, "Sigma", "", "APO Tele Macro 300mm F4"}, -{0x02,0x2F,0x98,0x98,0x3D,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "400mm F5.6 APO"}, +{0x02,0x2F,0x98,0x98,0x3D,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "APO 400mm F5.6"}, +{0x26,0x3C,0x98,0x98,0x3C,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "APO Tele Macro 400mm F5.6"}, {0x02,0x37,0xA0,0xA0,0x34,0x34,0x02,0x00,0x00,0x05, "Sigma", "", "APO 500mm F4.5"}, -{0x48,0x44,0xA0,0xA0,0x34,0x34,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 500mm F4.5 EX HSM"}, -// "Sigma" "" "500mm F7.2 APO"; -// "Sigma" "" "800mm F5.6 APO"; -{0x48,0x3C,0xB0,0xB0,0x3C,0x3C,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 800mm F5.6 EX HSM"}, -// "Sigma" "152550" "APO 800mm F5.6 EX DG HSM"; +{0x48,0x44,0xA0,0xA0,0x34,0x34,0x4B,0x02,0x03,0x05, "Sigma", "", "APO 500mm F4.5 EX HSM"}, +{0xF1,0x44,0xA0,0xA0,0x34,0x34,0x4B,0x02,0x03,0x05, "Sigma", "184551", "APO 500mm F4.5 EX DG HSM"}, +{0x02,0x34,0xA0,0xA0,0x44,0x44,0x02,0x00,0x00,0x05, "Sigma", "", "APO 500mm F7.2"}, +{0x02,0x3C,0xB0,0xB0,0x3C,0x3C,0x02,0x00,0x00,0x05, "Sigma", "", "APO 800mm F5.6"}, +{0x48,0x3C,0xB0,0xB0,0x3C,0x3C,0x4B,0x02,0x03,0x05, "Sigma", "", "APO 800mm F5.6 EX HSM"}, +//M "Sigma" "152550" "APO 800mm F5.6 EX DG HSM"; +//02 B8 B8 49 49 02" "00" "00" "05" "Sigma" "" "APO 1000mm F8.0"; // -{0xA1,0x41,0x19,0x31,0x2C,0x2C,0x4B,0x06,0x00,0x05, "Sigma", "", "10-20mm F3.5 EX DC HSM"}, -{0x48,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"}, -{0xF9,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"}, +{0xA1,0x41,0x19,0x31,0x2C,0x2C,0x4B,0x06,0x01,0x05, "Sigma", "", "10-20mm F3.5 EX DC HSM"}, +{0x48,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x01,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"}, +{0xF9,0x3C,0x19,0x31,0x30,0x3C,0x4B,0x06,0x01,0x05, "Sigma", "201555", "10-20mm F4-5.6 EX DC HSM"}, {0x48,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"}, {0xF0,0x38,0x1F,0x37,0x34,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "200558", "12-24mm F4.5-5.6 EX DG Aspherical HSM"}, {0x26,0x40,0x27,0x3F,0x2C,0x34,0x1C,0x02,0x00,0x05, "Sigma", "", "15-30mm F3.5-4.5 EX DG Aspherical DF"}, @@ -1731,16 +1757,17 @@ fmountlens[] = { {0x7F,0x48,0x2D,0x50,0x24,0x24,0x1C,0x06,0x00,0x05, "Sigma", "", "18-50mm F2.8 EX DC Macro"}, {0x7A,0x48,0x2D,0x50,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "582593", "18-50mm F2.8 EX DC Macro"}, {0x26,0x40,0x2D,0x50,0x2C,0x3C,0x1C,0x06,0x00,0x05, "Sigma", "", "18-50mm F3.5-5.6 DC"}, -{0x7A,0x40,0x2D,0x50,0x2C,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "551551", "18-50mm F3.5-5.6 DC HSM"}, +{0x7A,0x40,0x2D,0x50,0x2C,0x3C,0x4B,0x06,0x01,0x05, "Sigma", "551551", "18-50mm F3.5-5.6 DC HSM"}, {0x26,0x40,0x2D,0x70,0x2B,0x3C,0x1C,0x06,0x00,0x05, "Sigma", "", "18-125mm F3.5-5.6 DC"}, -{0xCD,0x3D,0x2D,0x70,0x2E,0x3C,0x4B,0x0E,0x00,0x05, "Sigma", "853556", "18-125mm F3.8-5.6 DC OS HSM"}, +{0xCD,0x3D,0x2D,0x70,0x2E,0x3C,0x4B,0x0E,0x01,0x05, "Sigma", "853556", "18-125mm F3.8-5.6 DC OS HSM"}, {0x26,0x40,0x2D,0x80,0x2C,0x40,0x1C,0x06,0x00,0x05, "Sigma", "777555", "18-200mm F3.5-6.3 DC"}, -{0xED,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x00,0x05, "Sigma", "888558", "18-200mm F3.5-6.3 DC OS HSM"}, -{0xA5,0x40,0x2D,0x88,0x2C,0x40,0x4B,0x0E,0x00,0x05, "Sigma", "", "18-250mm F3.5-6.3 DC OS HSM"}, +{0x7A,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x01,0x05, "Sigma", "888558", "18-200mm F3.5-6.3 DC OS HSM"}, +{0xED,0x40,0x2D,0x80,0x2C,0x40,0x4B,0x0E,0x01,0x05, "Sigma", "888558", "18-200mm F3.5-6.3 DC OS HSM"}, +{0xA5,0x40,0x2D,0x88,0x2C,0x40,0x4B,0x0E,0x01,0x05, "Sigma", "", "18-250mm F3.5-6.3 DC OS HSM"}, {0x26,0x48,0x31,0x49,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "", "20-40mm F2.8"}, {0x26,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"}, {0xB6,0x48,0x37,0x56,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "547448", "24-60mm F2.8 EX DG"}, -{0xA6,0x48,0x37,0x5C,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "24-70mm F2.8 IF EX DG HSM"}, +{0xA6,0x48,0x37,0x5C,0x24,0x24,0x4B,0x06,0x01,0x05, "Sigma", "571559", "24-70mm F2.8 IF EX DG HSM"}, {0x26,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "", "24-70mm F2.8 EX DG Macro"}, {0x67,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"}, {0xE9,0x54,0x37,0x5C,0x24,0x24,0x1C,0x02,0x00,0x05, "Sigma", "548445", "24-70mm F2.8 EX DG Macro"}, @@ -1762,104 +1789,106 @@ fmountlens[] = { {0x26,0x40,0x3C,0x8E,0x2C,0x40,0x1C,0x02,0x00,0x05, "Sigma", "", "28-300mm F3.5-6.3 Macro"}, {0x02,0x3B,0x44,0x61,0x30,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "35-80mm F4-5.6"}, {0x02,0x40,0x44,0x73,0x2B,0x36,0x02,0x00,0x00,0x05, "Sigma", "", "35-135mm F3.5-4.5 a"}, -{0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "50-150mm F2.8 EX APO DC HSM"}, -{0xFD,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "691554", "50-150mm F2.8 EX APO DC HSM II"}, -{0x48,0x3C,0x50,0xA0,0x30,0x40,0x4B,0x02,0x04,0x05, "Sigma", "736552", "APO 50-500mm F4-6.3 EX HSM"}, +{0x7A,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x03,0x05, "Sigma", "", "50-150mm F2.8 EX APO DC HSM"}, +{0xFD,0x47,0x50,0x76,0x24,0x24,0x4B,0x06,0x03,0x05, "Sigma", "691554", "50-150mm F2.8 EX APO DC HSM II"}, +{0x48,0x3C,0x50,0xA0,0x30,0x40,0x4B,0x02,0x03,0x05, "Sigma", "736552", "APO 50-500mm F4-6.3 EX HSM"}, +//M "Sigma" "686550" "50–200mm F4-5.6 DC OS HSM"; {0x26,0x3C,0x54,0x80,0x30,0x3C,0x1C,0x06,0x00,0x05, "Sigma", "", "55-200mm F4-5.6 DC"}, -{0x7A,0x3B,0x53,0x80,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "", "55-200mm F4-5.6 DC HSM"}, +{0x7A,0x3B,0x53,0x80,0x30,0x3C,0x4B,0x06,0x01,0x05, "Sigma", "", "55-200mm F4-5.6 DC HSM"}, {0x48,0x54,0x5C,0x80,0x24,0x24,0x4B,0x02,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX APO IF HSM"}, -{0x7A,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "", "70-200mm F2.8 EX APO DG Macro HSM II"}, -{0xEE,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x00,0x05, "Sigma", "579555", "70-200mm F2.8 EX APO DG Macro HSM II"}, +{0x7A,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x03,0x05, "Sigma", "", "70-200mm F2.8 EX APO DG Macro HSM II"}, +{0xEE,0x48,0x5C,0x80,0x24,0x24,0x4B,0x06,0x03,0x05, "Sigma", "579555", "70-200mm F2.8 EX APO DG Macro HSM II"}, {0x02,0x46,0x5C,0x82,0x25,0x25,0x02,0x00,0x00,0x05, "Sigma", "", "70-210mm F2.8 APO"}, {0x26,0x3C,0x5C,0x82,0x30,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "70-210mm F4-5.6 UC-II"}, {0x26,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 DG Macro"}, {0x56,0x3C,0x5C,0x8E,0x30,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 APO Macro Super II"}, -{0xE0,0x3C,0x5C,0x8E,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "", "70-300mm F4-5.6 APO DG Macro HSM"}, +{0xE0,0x3C,0x5C,0x8E,0x30,0x3C,0x4B,0x06,0x00,0x05, "Sigma", "508555", "APO 70–300mm F4–5.6 DG Macro"}, +{0xA3,0x3C,0x5C,0x8E,0x30,0x3C,0x4B,0x0E,0x00,0x05, "Sigma", "572556", "70–300mm F4–5.6 DG OS"}, {0x02,0x37,0x5E,0x8E,0x35,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "75-300mm F4.5-5.6 APO"}, {0x02,0x3A,0x5E,0x8E,0x32,0x3D,0x02,0x00,0x00,0x05, "Sigma", "", "75-300mm F4.0-5.6"}, -{0x77,0x44,0x61,0x98,0x34,0x3C,0x7B,0x0E,0x04,0x05, "Sigma", "", "80-400mm f4.5-5.6 EX OS"}, -{0x48,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02,0x04,0x05, "Sigma", "", "APO 100-300mm F4 EX IF HSM"}, -{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02,0x04,0x05, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"}, -{0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x04,0x05, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"}, -{0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x00,0x05, "Sigma", "", "APO 120-400mm F4.5-5.6 DG OS HSM"}, +{0x77,0x44,0x61,0x98,0x34,0x3C,0x7B,0x0E,0x03,0x05, "Sigma", "", "80-400mm f4.5-5.6 EX OS"}, +{0x48,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02,0x03,0x05, "Sigma", "134556", "APO 100-300mm F4 EX IF HSM"}, +{0xF3,0x48,0x68,0x8E,0x30,0x30,0x4B,0x02,0x13,0x05, "Sigma", "134556", "APO 100-300mm F4 EX IF HSM"}, +{0x48,0x54,0x6F,0x8E,0x24,0x24,0x4B,0x02,0x03,0x05, "Sigma", "", "APO 120-300mm F2.8 EX DG HSM"}, +{0x7A,0x54,0x6E,0x8E,0x24,0x24,0x4B,0x02,0x03,0x05, "Sigma", "135553", "APO 120-300mm F2.8 EX DG HSM"}, +{0xCF,0x38,0x6E,0x98,0x34,0x3C,0x4B,0x0E,0x03,0x05, "Sigma", "728557", "APO 120-400mm F4.5-5.6 DG OS HSM"}, {0x26,0x44,0x73,0x98,0x34,0x3C,0x1C,0x02,0x00,0x05, "Sigma", "", "135-400mm F4.5-5.6 APO Aspherical"}, -{0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E,0x00,0x05, "Sigma", "", "APO 150-500mm F5-6.3 DG OS HSM"}, +{0xCE,0x34,0x76,0xA0,0x38,0x40,0x4B,0x0E,0x03,0x05, "Sigma", "737559", "APO 150-500mm F5-6.3 DG OS HSM"}, {0x26,0x40,0x7B,0xA0,0x34,0x40,0x1C,0x02,0x00,0x05, "Sigma", "", "APO 170-500mm F5-6.3 Aspherical RF"}, -{0x48,0x3C,0x8E,0xB0,0x3C,0x3C,0x4B,0x02,0x00,0x05, "Sigma", "", "APO 300-800 F5.6 EX DG HSM"}, -// -{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x10,0x05, "Sigma", "", "APO Tele Converter 1.4x EX DG"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x10,0x05, "Sigma", "", "APO Tele Converter 2x EX DG"}, +//M "03" "05" "Sigma" "" "APO 200-500mm F2.8 EX DG"; +{0x48,0x3C,0x8E,0xB0,0x3C,0x3C,0x4B,0x02,0x03,0x05, "Sigma", "595555", "APO 300-800mm F5.6 EX DG HSM"}, // //------------------------------------------------------------------------------ // Tamron lenses by focal length, first fixed then zoom lenses //------------------------------------------------------------------------------ // -// "Tamron" "69E" "SP AF 14mm F/2.8 Aspherical (IF)" -{0xF4,0x54,0x56,0x56,0x18,0x18,0x84,0x06,0x00,0x02, "Tamron", "G005", "SP AF 60mm F/2 Di II LD (IF) Macro 1:1"}, -{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00,0x00,0x02, "Tamron", "52E", "SP AF 90mm F/2.5"}, -// "Tamron" "152E" "SP AF 90mm F/2.5"; -// "Tamron" "72E" "SP AF 90mm F/2.8 Macro 1:1"; -{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02,0x00,0x02, "Tamron", "272E", "SP AF 90mm F/2.8 Di Macro 1:1"}, -{0xF8,0x55,0x64,0x64,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"}, +{0x00,0x47,0x25,0x25,0x24,0x24,0x00,0x02,0x00,0x02, "Tamron", "69E", "SP AF 14mm F/2.8 Aspherical (IF)"}, +{0xF4,0x54,0x56,0x56,0x18,0x18,0x84,0x06,0x01,0x02, "Tamron", "G005", "SP AF 60mm F/2 Di II LD (IF) Macro 1:1"}, +{0x1E,0x5D,0x64,0x64,0x20,0x20,0x13,0x00,0x40,0x02, "Tamron", "52E", "SP AF 90mm F/2.5"}, +{0x20,0x5A,0x64,0x64,0x20,0x20,0x14,0x00,0x40,0x02, "Tamron", "152E", "SP AF 90mm F/2.5 Macro"}, +{0x22,0x53,0x64,0x64,0x24,0x24,0xE0,0x02,0x40,0x02, "Tamron", "72E", "SP AF 90mm F/2.8 Macro 1:1"}, +{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02,0x40,0x02, "Tamron", "172E", "SP AF 90mm F/2.8 Macro 1:1"}, +{0x32,0x53,0x64,0x64,0x24,0x24,0x35,0x02,0x40,0x02, "Tamron", "272E", "SP AF 90mm F/2.8 Di Macro 1:1"}, +{0xF8,0x55,0x64,0x64,0x24,0x24,0x84,0x06,0x41,0x02, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"}, +{0xF8,0x54,0x64,0x64,0x24,0x24,0xDF,0x06,0x41,0x02, "Tamron", "272NII", "SP AF 90mm F/2.8 Di Macro 1:1"}, {0x00,0x4C,0x7C,0x7C,0x2C,0x2C,0x00,0x02,0x00,0x02, "Tamron", "B01", "SP AF 180mm F/3.5 Di Model"}, -// "Tamron" "60E" "SP AF 300mm F/2.8 LD-IF"; -// "Tamron" "360E" "SP AF 300mm F/2.8 LD-IF"; +{0x21,0x56,0x8E,0x8E,0x24,0x24,0x14,0x00,0x00,0x02, "Tamron", "60E", "SP AF 300mm F/2.8 LD-IF"}, +{0x27,0x54,0x8E,0x8E,0x24,0x24,0x1D,0x02,0x00,0x02, "Tamron", "360E", "SP AF 300mm F/2.8 LD-IF"}, // -{0xF6,0x3F,0x18,0x37,0x2C,0x34,0x84,0x06,0x00,0x02, "Tamron", "B001", "SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical (IF)"}, +{0xF6,0x3F,0x18,0x37,0x2C,0x34,0x84,0x06,0x01,0x02, "Tamron", "B001", "SP AF 10-24mm F/3.5-4.5 Di II LD Aspherical (IF)"}, {0x00,0x36,0x1C,0x2D,0x34,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A13", "SP AF 11-18mm F/4.5-5.6 Di II LD Aspherical (IF)"}, {0x07,0x46,0x2B,0x44,0x24,0x30,0x03,0x02,0x00,0x02, "Tamron", "A05", "SP AF 17-35mm F/2.8-4 Di LD Aspherical (IF)"}, {0x00,0x53,0x2B,0x50,0x24,0x24,0x00,0x06,0x00,0x02, "Tamron", "A16", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"}, -{0x00,0x54,0x2B,0x50,0x24,0x24,0x00,0x06,0x00,0x02, "Tamron", "A16NII", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"}, -{0xF3,0x54,0x2B,0x50,0x24,0x24,0x84,0x0E,0x00,0x02, "Tamron", "B005", "SP AF 17-50mm F/2.8 XR Di II VC LD Aspherical (IF)"}, +{0x00,0x54,0x2B,0x50,0x24,0x24,0x00,0x06,0x01,0x02, "Tamron", "A16NII", "SP AF 17-50mm F/2.8 XR Di II LD Aspherical (IF)"}, +{0xF3,0x54,0x2B,0x50,0x24,0x24,0x84,0x0E,0x01,0x02, "Tamron", "B005", "SP AF 17-50mm F/2.8 XR Di II VC LD Aspherical (IF)"}, {0x00,0x3F,0x2D,0x80,0x2B,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF)"}, {0x00,0x3F,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"}, -{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"}, +{0x00,0x40,0x2D,0x80,0x2C,0x40,0x00,0x06,0x01,0x02, "Tamron", "A14NII", "AF 18-200mm F/3.5-6.3 XR Di II LD Aspherical (IF) Macro"}, {0x00,0x40,0x2D,0x88,0x2C,0x40,0x62,0x06,0x00,0x02, "Tamron", "A18", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro"}, -{0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06,0x00,0x02, "Tamron", "A18NII", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro "}, -{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro"}, +{0x00,0x40,0x2D,0x88,0x2C,0x40,0x00,0x06,0x01,0x02, "Tamron", "A18NII", "AF 18-250mm F/3.5-6.3 Di II LD Aspherical (IF) Macro "}, +{0xF5,0x40,0x2C,0x8A,0x2C,0x40,0x40,0x0E,0x01,0x02, "Tamron", "B003", "AF 18-270mm F/3.5-6.3 Di II VC LD Aspherical (IF) Macro"}, {0x07,0x40,0x2F,0x44,0x2C,0x34,0x03,0x02,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"}, {0x07,0x40,0x30,0x45,0x2D,0x35,0x03,0x02,0x00,0x02, "Tamron", "A10", "AF 19-35mm F/3.5-4.5"}, {0x00,0x49,0x30,0x48,0x22,0x2B,0x00,0x02,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"}, {0x0E,0x4A,0x31,0x48,0x23,0x2D,0x0E,0x02,0x00,0x02, "Tamron", "166D", "SP AF 20-40mm F/2.7-3.5"}, -// "Tamron" "266D" "SP AF 20-40mm F/2.7-3.5 Aspherical-IF"; -// "Tamron" "73D" "AF 24-70mm F/3.3-5.6 Aspherical"; +//M "Tamron" "266D" "SP AF 20-40mm F/2.7-3.5 Aspherical-IF"; +//M "Tamron" "73D" "AF 24-70mm F/3.3-5.6 Aspherical"; {0x45,0x41,0x37,0x72,0x2C,0x3C,0x48,0x02,0x00,0x02, "Tamron", "190D", "SP AF 24-135mm F/3.5-5.6 AD Aspherical (IF) Macro"}, -// "Tamron" "159D" "AF 28-70mm F/3.5-4.5"; -// "Tamron" "259D" "AF 28-70mm F/3.5-4.5"; +//M "Tamron" "159D" "AF 28-70mm F/3.5-4.5"; +//M "Tamron" "259D" "AF 28-70mm F/3.5-4.5"; {0x33,0x54,0x3C,0x5E,0x24,0x24,0x62,0x02,0x00,0x02, "Tamron", "A09", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"}, -{0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"}, +{0xFA,0x54,0x3C,0x5E,0x24,0x24,0x84,0x06,0x01,0x02, "Tamron", "A09NII", "SP AF 28-75mm F/2.8 XR Di LD Aspherical (IF) Macro"}, {0x10,0x3D,0x3C,0x60,0x2C,0x3C,0xD2,0x02,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"}, {0x45,0x3D,0x3C,0x60,0x2C,0x3C,0x48,0x02,0x00,0x02, "Tamron", "177D", "AF 28-80mm F/3.5-5.6 Aspherical"}, {0x00,0x48,0x3C,0x6A,0x24,0x24,0x00,0x02,0x00,0x02, "Tamron", "176D", "SP AF 28-105mm F/2.8 LD Aspherical IF"}, -// "Tamron" "276D" "SP AF 28-105mm F/2.8 LD Aspherical IF"; -// "Tamron" "179D" "AF 28-105mm F4.0-5.6 IF"; -// "Tamron" "285D" "AF 28-300mm F/3.8-6.3 LD Aspherical IF Silver"; -// "Tamron" "271D" "AF 28-200mm F/3.8-5.6 LD Aspherical IF Super Silver"; -// "Tamron" "471D" "AF 28-200mm F/3.8-5.6 Aspherical IF Super2 Silver"; +//M "Tamron" "276D" "SP AF 28-105mm F/2.8 LD Aspherical IF"; +//M "Tamron" "179D" "AF 28-105mm F4.0-5.6 IF"; +//M "Tamron" "471D" "AF 28-200mm F/3.8-5.6 Aspherical IF Super2 Silver"; {0x0B,0x3E,0x3D,0x7F,0x2F,0x3D,0x0E,0x00,0x00,0x02, "Tamron", "71D", "AF 28-200mm F/3.8-5.6"}, {0x0B,0x3E,0x3D,0x7F,0x2F,0x3D,0x0E,0x02,0x00,0x02, "Tamron", "171D", "AF 28-200mm F/3.8-5.6D"}, -{0x12,0x3D,0x3C,0x80,0x2E,0x3C,0xDF,0x02,0x00,0x02, "Tamron", "271D", "AF 28-200mm F/3.8-5.6 AF Aspherical LD (IF)"}, +{0x12,0x3D,0x3C,0x80,0x2E,0x3C,0xDF,0x02,0x00,0x02, "Tamron", "271D", "AF 28-200mm F/3.8-5.6 LD Aspherical (IF)"}, {0x4D,0x41,0x3C,0x8E,0x2B,0x40,0x62,0x02,0x00,0x02, "Tamron", "A061", "AF 28-300mm F/3.5-6.3 XR Di LD Aspherical (IF)"}, {0x4D,0x41,0x3C,0x8E,0x2C,0x40,0x62,0x02,0x00,0x02, "Tamron", "185D", "AF 28-300mm F/3.5-6.3 XR LD Aspherical (IF)"}, -{0xF9,0x40,0x3C,0x8E,0x2C,0x40,0x40,0x0E,0x00,0x02, "Tamron", "A20", "AF 28-300mm F/3.5-6.3 XR Di VC LD Aspherical (IF) Macro"}, -// "Tamron" "63D" "AF 35-90mm F/4-5.6"; -// "Tamron" "65D" "SP AF 35-105mm F/2.8 Aspherical"; -// "Tamron" "" "AF 35-135mm F/3.5-4.5"; +//M "Tamron" "285D" "AF 28-300mm F/3.8-6.3 LD Aspherical IF Silver"; +{0xF9,0x40,0x3C,0x8E,0x2C,0x40,0x40,0x0E,0x01,0x02, "Tamron", "A20", "AF 28-300mm F/3.5-6.3 XR Di VC LD Aspherical (IF) Macro"}, +//M "Tamron" "63D" "AF 35-90mm F/4-5.6"; +//M "Tamron" "65D" "SP AF 35-105mm F/2.8 Aspherical"; +//M "Tamron" "" "AF 35-135mm F/3.5-4.5"; {0x00,0x47,0x53,0x80,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A15", "AF 55-200mm F/4-5.6 Di II LD"}, -{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x00,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"}, -// "Tamron" "67D" "SP AF 70-210mm f/2.8 LD"; -// "Tamron" "" "AF 70-210mm F/3.5-4.5"; -// "Tamron" "158D" "AF 70-210mm F/4-5.6"; -// "Tamron" "258D" "AF 70-210mm F/4-5.6"; -// "Tamron" "67D" "SP AF 70-210mm F/2.8 LD"; -// "Tamron" "172D" "AF 70-300mm F/4-5.6"; -// "Tamron" "472D" "AF 70-300mm F/4-5.6 LD"; +{0xF7,0x53,0x5C,0x80,0x24,0x24,0x84,0x06,0x01,0x02, "Tamron", "A001", "SP AF 70-200mm F/2.8 Di LD (IF) Macro"}, +//M "Tamron" "67D" "SP AF 70-210mm f/2.8 LD"; +//M "Tamron" "" "AF 70-210mm F/3.5-4.5"; +//M "Tamron" "158D" "AF 70-210mm F/4-5.6"; +//M "Tamron" "258D" "AF 70-210mm F/4-5.6"; +//M "Tamron" "172D" "AF 70-300mm F/4-5.6"; +//M "Tamron" "472D" "AF 70-300mm F/4-5.6 LD"; {0x69,0x48,0x5C,0x8E,0x30,0x3C,0x6F,0x02,0x00,0x02, "Tamron", "772D", "AF 70-300mm F/4-5.6 LD Macro 1:2"}, -{0x00,0x48,0x5C,0x8E,0x30,0x3C,0x00,0x06,0x00,0x02, "Tamron", "A17", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"}, -// "Tamron" "872D" "AF 75-300mm F/4-5.6 LD"; -// "Tamron" "278D" "AF 80-210mm F/4.5-5.6"; -// "Tamron" "62D" "AF 90-300mm F/4.5-5.6"; -// "Tamron" "186D" "AF 100-300mm F/5-6.3"; +{0x69,0x47,0x5C,0x8E,0x30,0x3C,0x00,0x02,0x00,0x02, "Tamron", "A17N", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"}, +{0x00,0x48,0x5C,0x8E,0x30,0x3C,0x00,0x06,0x01,0x02, "Tamron", "A17NII", "AF 70-300mm F/4-5.6 Di LD Macro 1:2"}, +//M "Tamron" "872D" "AF 75-300mm F/4-5.6 LD"; +//M "Tamron" "278D" "AF 80-210mm F/4.5-5.6"; +//M "Tamron" "62D" "AF 90-300mm F/4.5-5.6"; +//M "Tamron" "186D" "AF 100-300mm F/5-6.3"; {0x20,0x3C,0x80,0x98,0x3D,0x3D,0x1E,0x02,0x00,0x02, "Tamron", "75D", "AF 200-400mm F/5.6 LD IF"}, {0x00,0x3E,0x80,0xA0,0x38,0x3F,0x00,0x02,0x00,0x02, "Tamron", "A08", "SP AF 200-500mm F/5-6.3 Di LD (IF)"}, {0x00,0x3F,0x80,0xA0,0x38,0x3F,0x00,0x02,0x00,0x02, "Tamron", "A08", "SP AF 200-500mm F/5-6.3 Di"}, @@ -1869,47 +1898,52 @@ fmountlens[] = { //------------------------------------------------------------------------------ // {0x00,0x40,0x2B,0x2B,0x2C,0x2C,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 17 AF PRO (AF 17mm f/3.5)"}, -{0x00,0x47,0x44,0x44,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "T303503", "AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"}, -{0x00,0x54,0x68,0x68,0x24,0x24,0x00,0x02,0x00,0x03, "Tokina", "T310003N", "AT-X M100 PRO D (AF 100mm f/2.8 Macro)"}, -// "Tokina" "" "AT-X 304 AF (AF 300mm f/4.0)"; +{0x00,0x47,0x44,0x44,0x24,0x24,0x00,0x06,0x40,0x03, "Tokina", "T303503", "AT-X M35 PRO DX (AF 35mm f/2.8 Macro)"}, +{0x00,0x54,0x68,0x68,0x24,0x24,0x00,0x02,0x40,0x03, "Tokina", "T310003N", "AT-X M100 PRO D (AF 100mm f/2.8 Macro)"}, +{0x27,0x48,0x8E,0x8E,0x30,0x30,0x1D,0x02,0x00,0x03, "Tokina", "", "AT-X 304 AF (AF 300mm f/4.0)"}, {0x00,0x54,0x8E,0x8E,0x24,0x24,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 300 AF PRO (AF 300mm f/2.8)"}, -// "Tokina" "" "AT-X 400 AF SD (AF 400mm f/5.6)"; +{0x12,0x3B,0x98,0x98,0x3D,0x3D,0x09,0x00,0x00,0x03, "Tokina", "", "AT-X 400 AF SD (AF 400mm f/5.6)"}, // {0x00,0x40,0x18,0x2B,0x2C,0x34,0x00,0x06,0x00,0x03, "Tokina", "T4101703", "AT-X 107 DX Fisheye (AF 10-17mm f/3.5-4.5)"}, {0x00,0x48,0x1C,0x29,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "T4111603", "AT-X 116 PRO DX (AF 11-16mm f/2.8)"}, {0x00,0x3C,0x1F,0x37,0x30,0x30,0x00,0x06,0x00,0x03, "Tokina", "T4122403", "AT-X 124 AF PRO DX (AF 12-24mm f/4)"}, -{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x00,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"}, +{0x7A,0x3C,0x1F,0x37,0x30,0x30,0x7E,0x06,0x01,0x03, "Tokina", "T4122423", "AT-X 124 AF PRO DX II (AF 12-24mm f/4)"}, {0x00,0x48,0x29,0x50,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 165 PRO DX (AF 16-50mm f/2.8)"}, {0x00,0x40,0x2A,0x72,0x2C,0x3C,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)"}, -// "Tokina" "" "AF 193 (AF 19-35mm f/3.5-4.5)"; +{0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x03, "Tokina", "", "AF 193 (AF 19-35mm f/3.5-4.5)"}, {0x2F,0x48,0x30,0x44,0x24,0x24,0x29,0x02,0x00,0x03, "Tokina", "", "AT-X 235 AF PRO (AF 20-35mm f/2.8)"}, -// "Tokina" "" "AF 235 (AF 20-35mm f/3.5-4.5)"; +//M "Tokina" "" "AF 235 (AF 20-35mm f/3.5-4.5)"; {0x2F,0x40,0x30,0x44,0x2C,0x34,0x29,0x02,0x00,0x03, "Tokina", "", "AF 235 II (AF 20-35mm f/3.5-4.5)"}, -// "Tokina" "" "AT-X 240 AF (AF 24-40mm f/2.8)"; -// "Tokina" "" "AT-X 242 AF (AF 24-200mm f/3.5-4.5)"; +//M "Tokina" "" "AT-X 240 AF (AF 24-40mm f/2.8)"; +{0x00,0x40,0x37,0x80,0x2C,0x3C,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 242 AF (AF 24-200mm f/3.5-5.6)"}, {0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x03, "Tokina", "", "AT-X 270 AF PRO II (AF 28-70mm f/2.6-2.8)"}, -//25 48 3C 5C 24 24 1B" "02" "00" "03" "Tokina" "" "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)"; +{0x25,0x48,0x3C,0x5C,0x24,0x24,0x1B,0x02,0x00,0x03, "Tokina", "", "AT-X 287 AF PRO SV (AF 28-70mm f/2.8)"}, {0x07,0x48,0x3C,0x5C,0x24,0x24,0x03,0x00,0x00,0x03, "Tokina", "", "AT-X 287 AF (AF 28-70mm f/2.8)"}, {0x07,0x47,0x3C,0x5C,0x25,0x35,0x03,0x00,0x00,0x03, "Tokina", "", "AF 287 SD (AF 28-70mm f/2.8-4.5)"}, -// "Tokina" "" "AF 270 II (AF 28-70mm f/3.5-4.5)"; +//M "Tokina" "" "AF 270 II (AF 28-70mm f/3.5-4.5)"; {0x00,0x48,0x3C,0x60,0x24,0x24,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 280 AF PRO (AF 28-80mm f/2.8)"}, -// "Tokina" "" "AF 280 II EMZ (AF 28-80mm f/3.5-5.6)"; -// "Tokina" "" "AF 205 (AF 28-105mm f/3.5-4.5); -// "Tokina" "" "AF 282 EMZ II (AF 28-210mm f/4.2-6.5)"; -// "Tokina" "" "AF 370 II (AF 35-70mm f/3.5-4.6)"; -// "Tokina" "" "AF 353 (AF 35-300mm f/4.5-6.7); +//M "Tokina" "" "AF 280 II EMZ (AF 28-80mm f/3.5-5.6)"; +//M "Tokina" "" "AF 205 (AF 28-105mm f/3.5-4.5); +//M "Tokina" "" "AF 282 (AF 28-200mm 3.5-5.6)"; +//M "Tokina" "" "AF 282 EMZ II (AF 28-210mm f/4.2-6.5)"; +//M "Tokina" "" "AF 370 (AF 35-70mm f/3.5-4.6)"; +//M "Tokina" "" "AF 370 II (AF 35-70mm f/3.5-4.6)"; +//M "Tokina" "" "AF 353 (AF 35-300mm f/4.5-6.7); {0x00,0x48,0x50,0x72,0x24,0x24,0x00,0x06,0x00,0x03, "Tokina", "", "AT-X 535 PRO DX (AF 50-135mm f/2.8)"}, -// "Tokina" "" "AF 210 II SD (AF 70-210mm f/4.0-5.6)"; -// "Tokina" "" "AF-730 II (AF 75-300mm f/4.5-5.6)"; -// "Tokina" "" "AT-X 828 AF (AF 80-200mm f/2.8)"; -{0x14,0x54,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF PRO (AF 80-200mm f/2.8)"}, -// "Tokina" "" "AT-X 840 AF (AF 80-400mm f/4.5-5.6)"; +//M "Tokina" "" "AF 745 (AF 70-210mm f/4.5); +//M "Tokina" "" "AF 210 (AF 70-210mm f/4.0-5.6)"; +//M "Tokina" "" "AF 210 II SD (AF 70-210mm f/4.0-5.6)"; +{0x12,0x44,0x5E,0x8E,0x34,0x3C,0x09,0x00,0x00,0x03, "Tokina", "", "AF 730 (AF 75-300mm F4.5-5.6)"}, +//M "Tokina" "" "AF 730 II (AF 75-300mm f/4.5-5.6)"; +{0x14,0x54,0x60,0x80,0x24,0x24,0x0B,0x00,0x00,0x03, "Tokina", "", "AT-X 828 AF (AF 80-200mm f/2.8)"}, +{0x24,0x54,0x60,0x80,0x24,0x24,0x1A,0x02,0x00,0x03, "Tokina", "", "AT-X 828 AF PRO (AF 80-200mm f/2.8)"}, +//M "Tokina" "" "AT-X 840 AF (AF 80-400mm f/4.5-5.6)"; {0x24,0x44,0x60,0x98,0x34,0x3C,0x1A,0x02,0x00,0x03, "Tokina", "", "AT-X 840 AF-II (AF 80-400mm f/4.5-5.6)"}, -{0x00,0x44,0x60,0x98,0x34,0x3C,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 840 AF D (AF 80-400mm f/4.5-5.6)"}, +{0x00,0x44,0x60,0x98,0x34,0x3C,0x00,0x02,0x00,0x03, "Tokina", "", "AT-X 840 D (AF 80-400mm f/4.5-5.6)"}, {0x14,0x48,0x68,0x8E,0x30,0x30,0x0B,0x00,0x00,0x03, "Tokina", "", "AT-X 340 AF (AF 100-300mm f/4)"}, -// "Tokina" "" "AT-X 340 AF-II (AF 100-300mm f/4)"; -// "Tokina" "" "AF 130 EMZ II (AF 100-300mm f/5.6-6.7)"; -// "Tokina" "" "AF 140 EMZ (AF 100-400mm f/4.5-6.3)"; +//M "Tokina" "" "AT-X 340 AF-II (AF 100-300mm f/4)"; +//M "Tokina" "" "AF 130 EMZ II (AF 100-300mm f/5.6-6.7)"; +//M "Tokina" "" "AF 140 EMZ (AF 100-400mm f/4.5-6.3)"; // //------------------------------------------------------------------------------ // Lenses from various other brands @@ -1918,14 +1952,14 @@ fmountlens[] = { {0x06,0x3F,0x68,0x68,0x2C,0x2C,0x06,0x00,0x00,0x04, "Cosina", "", "AF 100mm F3.5 Macro"}, {0x07,0x36,0x3D,0x5F,0x2C,0x3C,0x03,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-80mm F3.5-5.6 MC Macro"}, {0x07,0x46,0x3D,0x6A,0x25,0x2F,0x03,0x00,0x00,0x04, "Cosina", "", "AF Zoom 28-105mm F2.8-3.8 MC"}, -// "Cosina" "" "AF Zoom 28-210mm F3.5-5.6"; -// "Cosina" "" "AF Zoom 28-210mm F4.2-6.5 Aspherical IF"; -// "Cosina" "" "AF Zoom 28-300mm F4.0-6.3"; -// "Cosina" "" "AF Zoom 70-210mm F2.8-4.0"; +//M "Cosina" "" "AF Zoom 28-210mm F3.5-5.6"; +//M "Cosina" "" "AF Zoom 28-210mm F4.2-6.5 Aspherical IF"; +//M "Cosina" "" "AF Zoom 28-300mm F4.0-6.3"; +//M "Cosina" "" "AF Zoom 70-210mm F2.8-4.0"; {0x12,0x36,0x5C,0x81,0x35,0x3D,0x09,0x00,0x00,0x04, "Cosina", "", "AF Zoom 70-210mm F4.5-5.6 MC Macro"}, {0x12,0x39,0x5C,0x8E,0x34,0x3D,0x08,0x02,0x00,0x04, "Cosina", "", "AF Zoom 70-300mm F4.5-5.6 MC Macro"}, {0x12,0x3B,0x68,0x8D,0x3D,0x43,0x09,0x02,0x00,0x04, "Cosina", "", "AF Zoom 100-300mm F5.6-6.7 MC Macro"}, -// "Cosina" "" "AF Zoom 100-400mm F5.6-6.7 MC"; +//M "Cosina" "" "AF Zoom 100-400mm F5.6-6.7 MC"; // {0x00,0x40,0x31,0x31,0x2C,0x2C,0x00,0x00,0x00,0x04, "Voigtlander", "BA295AN", "Color Skopar 20mm F3.5 SLII Aspherical"}, {0x00,0x54,0x48,0x48,0x18,0x18,0x00,0x00,0x00,0x04, "Voigtlander", "BA229DN", "Ultron 40mm F2 SLII Aspherical"}, @@ -1938,9 +1972,6 @@ fmountlens[] = { {0x03,0x43,0x5C,0x81,0x35,0x35,0x02,0x00,0x00,0x13, "Soligor", "", "AF C/D Zoom UMCS 70-210mm 1:4.5"}, {0x12,0x4A,0x5C,0x81,0x31,0x3D,0x09,0x00,0x00,0x13, "Soligor", "", "AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS"}, // -{0x00,0x00,0x00,0x00,0x00,0x00,0xF1,0x0C,0x10,0x08, "Kenko", "KE-MCP1DGN", "Teleplus PRO 300 DG 1.4x"}, -{0x00,0x00,0x00,0x00,0x00,0x00,0xF2,0x18,0x10,0x08, "Kenko", "KE-MCP2DGN", "Teleplus PRO 300 DG 2.0x"}, -// {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, "Manual Lens", "", "No CPU"}, // //------------------------------------------------------------------------------