exiftool_vendored 13.30.0 → 13.33.0

data/bin/lib/Image/ExifTool/LigoGPS.pm

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool;
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 sub ProcessLigoGPS($$$;$);
 sub ProcessLigoJSON($$$);
@@ -223,11 +223,12 @@ sub DecipherLigoGPS($$$;$)
 #------------------------------------------------------------------------------
 # Parse decrypted/deciphered (but not defuzzed) LIGOGPSINFO record
 # (record starts with 4-byte int32u counter followed by date/time, etc)
-# Inputs: 0) ExifTool ref, 1) GPS string, 2) tag table ref, 3) not fuzzed
+# Inputs: 0) ExifTool ref, 1) GPS string, 2) tag table ref,
+#         3) flags: 0x01=not fuzzed, 0x02=spd in km/h
 # Returns: nothing
 sub ParseLigoGPS($$$;$)
 {
-    my ($et, $str, $tagTbl, $noFuzz) = @_;
+    my ($et, $str, $tagTbl, $flags) = @_;
 
     # example string input
     # "....2022/09/19 12:45:24 N:31.285065 W:124.759483 46.93 km/h x:-0.000 y:-0.000 z:-0.000"
@@ -235,15 +236,16 @@ sub ParseLigoGPS($$$;$)
         $et->Warn('LIGOGPSINFO format error');
         return;
     }
+    $flags or $flags = 0;
     my ($time,$latRef,$latNeg,$lat,$lonRef,$lonNeg,$lon,$spd) = ($1,$2,$3,$4,$5,$6,$7,$8);
     my %gpsScl = ( 1 => 1.524855137, 2 => 1.456027985, 3 => 1.15368 );
-    my $spdScl = $noFuzz ? $knotsToKph : 1.85407333;
+    my $spdScl = $flags & 0x01 ? ($flags & 0x02 ? 1 : $knotsToKph) : 1.85407333;
     $$et{DOC_NUM} = ++$$et{DOC_COUNT};
     $time =~ tr(/)(:);
     # convert from DDMM.MMMMMM to DD.DDDDDD if necessary
     # (speed wasn't scaled in my 1 sample with this format)
     $lat =~ /^\d{3}/ and Image::ExifTool::QuickTime::ConvertLatLon($lat,$lon), $spdScl = 1;
-    unless ($noFuzz) { # unfuzz the coordinates if necessary
+    unless ($flags & 0x01) { # unfuzz the coordinates if necessary
         my $scl = $$et{OPTIONS}{LigoGPSScale} || $$et{LigoGPSScale} || 1;
         $scl = $gpsScl{$scl} if $gpsScl{$scl};
         ($lat, $lon) = UnfuzzLigoGPS($lat, $lon, $scl);
@@ -298,7 +300,13 @@ sub ProcessLigoGPS($$$;$)
     $et->VerboseDir($dirName);
     for (; $pos + 0x84 <= length($$dataPt); $pos+=0x84) {
         my $dat = substr($$dataPt, $pos, 0x84);
-        $dat =~ /^####/ or next; # (have seen blank records filled with zeros, so keep trying)
+        unless ($dat =~ /^####/) {
+            next unless $dat =~ m(^.{4}\d{4}/\d{2}/\d{2} )s; # (have seen blank records filled with zeros, so keep trying)
+            # non-encrypted format written by Redtiger F9 4K
+            $dat =~ s/\0+$//;   # remove trailing nulls
+            ParseLigoGPS($et, $dat, $tagTbl, 0x03);
+            next;
+        }
         # decipher if we already know the encryption
         $cipherInfo and $$cipherInfo{decipher} and DecipherLigoGPS($et, $dat, $tagTbl, $noFuzz) and next;
         my $str = DecryptLigoGPS($dat);

data/bin/lib/Image/ExifTool/Microsoft.pm

@@ -13,7 +13,7 @@
 package Image::ExifTool::Microsoft;
 
 use strict;
-use vars qw($VERSION);
+use vars qw($VERSION %codePage);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
@@ -23,6 +23,163 @@ sub ProcessXtra($$$);
 sub WriteXtra($$$);
 sub CheckXtra($$$);
 
+# list of code pages used by Microsoft
+# (ref http://msdn.microsoft.com/en-us/library/dd317756(VS.85).aspx)
+%codePage = (
+     37 => 'IBM EBCDIC US-Canada',
+    437 => 'DOS United States',
+    500 => 'IBM EBCDIC International',
+    708 => 'Arabic (ASMO 708)',
+    709 => 'Arabic (ASMO-449+, BCON V4)',
+    710 => 'Arabic - Transparent Arabic',
+    720 => 'DOS Arabic (Transparent ASMO)',
+    737 => 'DOS Greek (formerly 437G)',
+    775 => 'DOS Baltic',
+    850 => 'DOS Latin 1 (Western European)',
+    852 => 'DOS Latin 2 (Central European)',
+    855 => 'DOS Cyrillic (primarily Russian)',
+    857 => 'DOS Turkish',
+    858 => 'DOS Multilingual Latin 1 with Euro',
+    860 => 'DOS Portuguese',
+    861 => 'DOS Icelandic',
+    862 => 'DOS Hebrew',
+    863 => 'DOS French Canadian',
+    864 => 'DOS Arabic',
+    865 => 'DOS Nordic',
+    866 => 'DOS Russian (Cyrillic)',
+    869 => 'DOS Modern Greek',
+    870 => 'IBM EBCDIC Multilingual/ROECE (Latin 2)',
+    874 => 'Windows Thai (same as 28605, ISO 8859-15)',
+    875 => 'IBM EBCDIC Greek Modern',
+    932 => 'Windows Japanese (Shift-JIS)',
+    936 => 'Windows Simplified Chinese (PRC, Singapore)',
+    949 => 'Windows Korean (Unified Hangul Code)',
+    950 => 'Windows Traditional Chinese (Taiwan)',
+    1026 => 'IBM EBCDIC Turkish (Latin 5)',
+    1047 => 'IBM EBCDIC Latin 1/Open System',
+    1140 => 'IBM EBCDIC US-Canada with Euro',
+    1141 => 'IBM EBCDIC Germany with Euro',
+    1142 => 'IBM EBCDIC Denmark-Norway with Euro',
+    1143 => 'IBM EBCDIC Finland-Sweden with Euro',
+    1144 => 'IBM EBCDIC Italy with Euro',
+    1145 => 'IBM EBCDIC Latin America-Spain with Euro',
+    1146 => 'IBM EBCDIC United Kingdom with Euro',
+    1147 => 'IBM EBCDIC France with Euro',
+    1148 => 'IBM EBCDIC International with Euro',
+    1149 => 'IBM EBCDIC Icelandic with Euro',
+    1200 => 'Unicode UTF-16, little endian',
+    1201 => 'Unicode UTF-16, big endian',
+    1250 => 'Windows Latin 2 (Central European)',
+    1251 => 'Windows Cyrillic',
+    1252 => 'Windows Latin 1 (Western European)',
+    1253 => 'Windows Greek',
+    1254 => 'Windows Turkish',
+    1255 => 'Windows Hebrew',
+    1256 => 'Windows Arabic',
+    1257 => 'Windows Baltic',
+    1258 => 'Windows Vietnamese',
+    1361 => 'Korean (Johab)',
+    10000 => 'Mac Roman (Western European)',
+    10001 => 'Mac Japanese',
+    10002 => 'Mac Traditional Chinese',
+    10003 => 'Mac Korean',
+    10004 => 'Mac Arabic',
+    10005 => 'Mac Hebrew',
+    10006 => 'Mac Greek',
+    10007 => 'Mac Cyrillic',
+    10008 => 'Mac Simplified Chinese',
+    10010 => 'Mac Romanian',
+    10017 => 'Mac Ukrainian',
+    10021 => 'Mac Thai',
+    10029 => 'Mac Latin 2 (Central European)',
+    10079 => 'Mac Icelandic',
+    10081 => 'Mac Turkish',
+    10082 => 'Mac Croatian',
+    12000 => 'Unicode UTF-32, little endian',
+    12001 => 'Unicode UTF-32, big endian',
+    20000 => 'CNS Taiwan',
+    20001 => 'TCA Taiwan',
+    20002 => 'Eten Taiwan',
+    20003 => 'IBM5550 Taiwan',
+    20004 => 'TeleText Taiwan',
+    20005 => 'Wang Taiwan',
+    20105 => 'IA5 (IRV International Alphabet No. 5, 7-bit)',
+    20106 => 'IA5 German (7-bit)',
+    20107 => 'IA5 Swedish (7-bit)',
+    20108 => 'IA5 Norwegian (7-bit)',
+    20127 => 'US-ASCII (7-bit)',
+    20261 => 'T.61',
+    20269 => 'ISO 6937 Non-Spacing Accent',
+    20273 => 'IBM EBCDIC Germany',
+    20277 => 'IBM EBCDIC Denmark-Norway',
+    20278 => 'IBM EBCDIC Finland-Sweden',
+    20280 => 'IBM EBCDIC Italy',
+    20284 => 'IBM EBCDIC Latin America-Spain',
+    20285 => 'IBM EBCDIC United Kingdom',
+    20290 => 'IBM EBCDIC Japanese Katakana Extended',
+    20297 => 'IBM EBCDIC France',
+    20420 => 'IBM EBCDIC Arabic',
+    20423 => 'IBM EBCDIC Greek',
+    20424 => 'IBM EBCDIC Hebrew',
+    20833 => 'IBM EBCDIC Korean Extended',
+    20838 => 'IBM EBCDIC Thai',
+    20866 => 'Russian/Cyrillic (KOI8-R)',
+    20871 => 'IBM EBCDIC Icelandic',
+    20880 => 'IBM EBCDIC Cyrillic Russian',
+    20905 => 'IBM EBCDIC Turkish',
+    20924 => 'IBM EBCDIC Latin 1/Open System with Euro',
+    20932 => 'Japanese (JIS 0208-1990 and 0121-1990)',
+    20936 => 'Simplified Chinese (GB2312)',
+    20949 => 'Korean Wansung',
+    21025 => 'IBM EBCDIC Cyrillic Serbian-Bulgarian',
+    21027 => 'Extended Alpha Lowercase (deprecated)',
+    21866 => 'Ukrainian/Cyrillic (KOI8-U)',
+    28591 => 'ISO 8859-1 Latin 1 (Western European)',
+    28592 => 'ISO 8859-2 (Central European)',
+    28593 => 'ISO 8859-3 Latin 3',
+    28594 => 'ISO 8859-4 Baltic',
+    28595 => 'ISO 8859-5 Cyrillic',
+    28596 => 'ISO 8859-6 Arabic',
+    28597 => 'ISO 8859-7 Greek',
+    28598 => 'ISO 8859-8 Hebrew (Visual)',
+    28599 => 'ISO 8859-9 Turkish',
+    28603 => 'ISO 8859-13 Estonian',
+    28605 => 'ISO 8859-15 Latin 9',
+    29001 => 'Europa 3',
+    38598 => 'ISO 8859-8 Hebrew (Logical)',
+    50220 => 'ISO 2022 Japanese with no halfwidth Katakana (JIS)',
+    50221 => 'ISO 2022 Japanese with halfwidth Katakana (JIS-Allow 1 byte Kana)',
+    50222 => 'ISO 2022 Japanese JIS X 0201-1989 (JIS-Allow 1 byte Kana - SO/SI)',
+    50225 => 'ISO 2022 Korean',
+    50227 => 'ISO 2022 Simplified Chinese',
+    50229 => 'ISO 2022 Traditional Chinese',
+    50930 => 'EBCDIC Japanese (Katakana) Extended',
+    50931 => 'EBCDIC US-Canada and Japanese',
+    50933 => 'EBCDIC Korean Extended and Korean',
+    50935 => 'EBCDIC Simplified Chinese Extended and Simplified Chinese',
+    50936 => 'EBCDIC Simplified Chinese',
+    50937 => 'EBCDIC US-Canada and Traditional Chinese',
+    50939 => 'EBCDIC Japanese (Latin) Extended and Japanese',
+    51932 => 'EUC Japanese',
+    51936 => 'EUC Simplified Chinese',
+    51949 => 'EUC Korean',
+    51950 => 'EUC Traditional Chinese',
+    52936 => 'HZ-GB2312 Simplified Chinese',
+    54936 => 'Windows XP and later: GB18030 Simplified Chinese (4 byte)',
+    57002 => 'ISCII Devanagari',
+    57003 => 'ISCII Bengali',
+    57004 => 'ISCII Tamil',
+    57005 => 'ISCII Telugu',
+    57006 => 'ISCII Assamese',
+    57007 => 'ISCII Oriya',
+    57008 => 'ISCII Kannada',
+    57009 => 'ISCII Malayalam',
+    57010 => 'ISCII Gujarati',
+    57011 => 'ISCII Punjabi',
+    65000 => 'Unicode (UTF-7)',
+    65001 => 'Unicode (UTF-8)',
+);
+
 # tags written by Microsoft HDView (ref 1)
 %Image::ExifTool::Microsoft::Stitch = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

data/bin/lib/Image/ExifTool/Minolta.pm

@@ -2411,7 +2411,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     0x5a => { #15
         Name => 'Rotation',
         PrintConv => {
-            0 => 'Horizontal (Normal)',
+            0 => 'Horizontal (normal)',
             1 => 'Rotate 270 CW',
             2 => 'Rotate 90 CW',
         },

data/bin/lib/Image/ExifTool/Nikon.pm

@@ -60,12 +60,12 @@ package Image::ExifTool::Nikon;
 use strict;
 use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
-use Image::ExifTool::NikonCustom qw(%buttonsZ9);
+use Image::ExifTool::NikonCustom qw(%buttonsZ8 %buttonsZ9);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.46';
+$VERSION = '4.49';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1013,7 +1013,7 @@ my %hDMIOutputResolutionZ9 = (
     1 => '4320p',
     2 => '2160p',
     3 => '1080p',
-    #4 => '1080i',
+    4 => '1080i',
     5 => '720p',
     #6 => '576p',
     #7 => '480p',
@@ -1059,8 +1059,8 @@ my %imageAreaZ9b = (
 );
 
 my %infoZSeries = (
-    Condition => '$$self{Model} =~ /^NIKON Z (30|5|50|6|6_2|7|7_2|8|f|fc|9)\b/i',
-    Notes => 'Z Series cameras thru October 2023',
+    Condition => '$$self{Model} =~ /^NIKON Z (30|5|50|6|6_2|7|7_2|8|f|fc|9)\b/i or $$self{Model} =~ /^NIKON Z(5_2|50_2|6_3)\b/i',  #no space after 'Nikon Z' on models from Oct 2023
+    Notes => 'Z Series cameras thru July 2025',
 );
 
 my %iSOAutoHiLimitZ6III = ( #28
@@ -1691,14 +1691,15 @@ my %cropHiSpeed = ( #IB
     4 => '3:2 Crop', # (1.2x, ref 36)
     6 => '16:9 Crop',
     8 => '2.7x Crop', #36 (D4/D500)
-    9 => 'DX Movie Crop', # (DX during movie recording, Large)
+    9 => 'DX Movie 16:9 Crop', # (DX during movie recording, Large)
     10 => '1.3x Movie Crop', #36 (D4/D500)
     11 => 'FX Uncropped',
     12 => 'DX Uncropped',
     13 => '2.8x Movie Crop', #28 (D5/D6)    5584/1936
     14 => '1.4x Movie Crop', #28 (D5/D6)    5584/3856
     15 => '1.5x Movie Crop', #36 (D4/D500)  5600/3872
-    17 => '1:1 Crop',
+    17 => 'FX 1:1 Crop',
+    18 => 'DX 1:1 Crop',
     OTHER => sub {
         my ($val, $inv, $conv) = @_;
         return undef if $inv;
@@ -2597,7 +2598,7 @@ my %base64coord = (
             },
         },
         { # (Z6_3 firmware version 1.00, ref 28)
-            Condition => '$$valPt =~ /^0809/',
+        Condition => '$$valPt =~ /^08(09|10|11)/',   #0809=Z6iii  0810=Z50ii  #0811=Z5ii
             Name => 'ShotInfoZ6III',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ6III',
@@ -4919,7 +4920,7 @@ my %base64coord = (
     DATAMEMBER => [ 0, 4, 5, 7, 66, 68 ],
     NOTES => q{
         AF information for Nikon cameras with the Expeed 7 processor: The Zf, Z6_3,
-        Z8, Z9 and Z50_3.
+        Z8, Z9, Z50_2 and Z5_2.
     },
     0 => {
         Name => 'AFInfo2Version',
@@ -4965,8 +4966,8 @@ my %base64coord = (
         PrintConv => sub { PrintAFPoints(shift, \@afPoints405) },    #full-frame sensor, 45MP, auto-area focus point configuration
         PrintConvInv => sub { PrintAFPointsInv(shift, \@afPoints405) },
     },{
-        Name => 'AFPointsUsed', # Z6iii and Zf (AFInfo2Version 0401)
-        Condition => '$$self{Model} =~ /^NIKON (Z6_3|Z f)\b/i and ($$self{AFAreaModeUsed} == 197 or $$self{AFAreaModeUsed} == 207)',
+        Name => 'AFPointsUsed', # Z6iii & Zf (AFInfo2Version 0401) and Z5ii (AFInfo2Version 0402)
+        Condition => '$$self{Model} =~ /^NIKON (Z6_3|Z f|Z5_2)\b/i and ($$self{AFAreaModeUsed} == 197 or $$self{AFAreaModeUsed} == 207)',
         Format => 'undef[38]',
         ValueConv => 'join(" ", unpack("H2"x38, $val))',
         ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
@@ -5000,17 +5001,17 @@ my %base64coord = (
     0x43 => [
     {
         Name => 'FocusPositionHorizontal',   # 209/231 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON Z50_2\b/i and $$self{AFAreaXPosition} != 0',   #model Z50ii
+        Condition => '$$self{Model} =~ /^NIKON Z50_2\b/i and $$self{AFAreaXPosition} and $$self{AFAreaXPosition} != 0',   #model Z50ii
         ValueConv => 'int($$self{AFAreaXPosition} / 260 )',     #divisor is the estimated separation between adjacent points  (informed by the measured Z7ii separation)
         PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 19 ) },
     },{
         Name => 'FocusPositionHorizontal',  #273/299 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z6_3|Z f)\b/i and $$self{AFAreaXPosition} != 0',   #models Z6iii and Zf
+        Condition => '$$self{Model} =~ /^NIKON (Z6_3|Z f|Z5_2)\b/i and $$self{AFAreaXPosition} and $$self{AFAreaXPosition} != 0',   #models Z6iii, Zf & Z5ii
         ValueConv => 'int($$self{AFAreaXPosition} / 260 )',     #divisor is the estimated separation between adjacent points  (informed by the measured Z7ii separation)
         PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 21 ) },
     },{
         Name => 'FocusPositionHorizontal',   #405/493 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 8|Z 9)\b/i and $$self{AFAreaXPosition} != 0',   #models Z8 and Z9
+        Condition => '$$self{Model} =~ /^NIKON (Z 8|Z 9)\b/i and $$self{AFAreaXPosition} and $$self{AFAreaXPosition} != 0',   #models Z8 and Z9
         ValueConv => 'int($$self{AFAreaXPosition} / 260 )',     #divisor is the measured horizontal pixel separation between adjacent points
         PrintConv => sub { my ($val) = @_; PrintAFPointsLeftRight($val, 29 ) },
     },
@@ -5024,17 +5025,17 @@ my %base64coord = (
     0x45 => [
     {
         Name => 'FocusPositionVertical',   # 209/233 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON Z50_2\b/i and $$self{AFAreaYPosition} != 0',   #model Z50ii
+        Condition => '$$self{Model} =~ /^NIKON Z50_2\b/i and $$self{AFAreaYPosition} and $$self{AFAreaYPosition} != 0',   #model Z50ii
         ValueConv => 'int($$self{AFAreaYPosition} / 286 )',      #divisor chosen to cause center point report 'C'
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 11 ) },
     },{
         Name => 'FocusPositionVertical',  #273/299 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z6_3|Z f)\b/i and $$self{AFAreaYPosition} != 0',   #models Z6iii and Zf
+        Condition => '$$self{Model} =~ /^NIKON (Z6_3|Z f|Z5_2)\b/i and $$self{AFAreaYPosition} and $$self{AFAreaYPosition} != 0',   #models Z6iii, Zf & Z5ii
         ValueConv => 'int($$self{AFAreaYPosition} / 286 )',     #divisor chosen to cause center point report 'C'
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 13 ) },
     },{
         Name => 'FocusPositionVertical',   #405/493 focus point cameras
-        Condition => '$$self{Model} =~ /^NIKON (Z 8|Z 9)\b/i and $$self{AFAreaYPosition} != 0',   #models Z8 and Z9
+        Condition => '$$self{Model} =~ /^NIKON (Z 8|Z 9)\b/i and $$self{AFAreaYPosition} and $$self{AFAreaYPosition} != 0',   #models Z8 and Z9
         ValueConv => 'int($$self{AFAreaYPosition} / 292 )',     #divisor is the measured vertical pixel separation between adjacent points
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 17 ) },
     },
@@ -5856,6 +5857,7 @@ my %nikonFocalConversions = (
             46 => 'Nikkor Z 135mm f/1.8 S Plena', #28
             47 => 'Nikkor Z 35mm f/1.2 S', #28
             48 => 'Nikkor Z 28-400mm f/4-8 VR', #30
+            49 => 'Nikkor Z 28-135mm f/4 PZ', #28
             51 => 'Nikkor Z 35mm f/1.4', #28
             52 => 'Nikkor Z 50mm f/1.4', #28
             2305 => 'Laowa FFII 10mm F2.8 C&D Dreamer', #30
@@ -8667,6 +8669,7 @@ my %nikonFocalConversions = (
     },
     0x90 => {
         Name => 'MenuOffset',
+        Condition => '$$self{Model} =~ /^NIKON Z6_3\b/i',
         Format => 'int32u',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Nikon::MenuSettingsZ6III',
@@ -9005,12 +9008,17 @@ my %nikonFocalConversions = (
         RawConv => '$$self{FocusShiftShooting} = $val',
         PrintConv => q{
             return 'Off' if $val == 0 ;
-            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"
+            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"   
+            if ($$self{PixelShiftActive} and $$self{PixelShiftActive} eq 1) {$i = sprintf("Frame %.0f",$val);}   #for the Z8 fw3 with PixelShift Enabled, the frame count is correct, but the frame total needs to be multiplied by the number of PixelShift frames (which I cannot find)
             return "On: $i"
         },
+        Hook => '$varSize += 2 if $$self{Model} =~ /^NIKON Z 8/ and $$self{FirmwareVersion} and $$self{FirmwareVersion} ge "03.00"',  # 2 bytes were added with Z8 firmware 3.0 support for pixel shift when focus stacking
     },
+#
+# Note: Offsets after this are shifted by +2 for Z8 firmware 3.0 (see Hook above)
+#    
     0x0028 => {
-        Name => 'IntervalShooting',
+        Name => 'IntervalShooting',    #will be 'On' when Interval Shooting is selected via the Photo Shooting Menu and also when a non-zero interval is specified when using Focus Shift and/or Pixel Shift Shooting
         Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
         RawConv => '$$self{IntervalShooting} = $val',
         Format => 'int16u',
@@ -9789,7 +9797,7 @@ my %nikonFocalConversions = (
 %Image::ExifTool::Nikon::MenuSettingsZ8 = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
-    DATAMEMBER => [ 72, 152, 200, 204, 244, 440, 548, 554, 570, 596 ],
+    DATAMEMBER => [ 72, 152, 200, 204, 244, 440, 548, 554, 570, 596, 636 ],
     NOTES => 'These tags are common to all Z8 firmware versions.',
     72 => {
         Name => 'HighFrameRate',        #CH and C30/C60/C120 but not CL
@@ -9804,7 +9812,7 @@ my %nikonFocalConversions = (
         RawConv => '$$self{MultipleExposureMode} = $val',
         PrintConv => \%multipleExposureModeZ9,
     },
-    154 => {Name => 'MultiExposureShots', Condition => '$$self{MultipleExposureMode} != 0'},  #range 2-9
+    154 => {Name => 'MultiExposureShots', Condition => '$$self{MultipleExposureMode} != 0'},  #range 2-9 - not present in a NEF, only in the assembled JPG
     184 => {
         Name => 'IntervalDurationHours',
         Format => 'int32u',
@@ -9903,7 +9911,7 @@ my %nikonFocalConversions = (
         Notes => 'AE and/or Flash Bracketing',
         PrintConv => \%bracketIncrementZ9,
     },
-    570 => { Name => 'HDR',                   RawConv => '$$self{HDR} = $val', PrintConv => \%multipleExposureModeZ9 },
+    570 => { Name => 'HDR',                   RawConv => '$$self{HDR} = $val', PrintConv => \%multipleExposureModeZ9 },  #will be 'on' for the tone mapped JPGs, off for the source NEF files
     #572  HDRSaveRaw 0=> No; 1=> Yes
     576 => { Name => 'SecondarySlotFunction', PrintConv => \%secondarySlotFunctionZ9 },
     582 => { Name => 'HDRLevel',              Condition => '$$self{HDR} ne 0', PrintConv => \%hdrLevelZ8 },
@@ -9918,7 +9926,15 @@ my %nikonFocalConversions = (
     },
     618 => { Name => 'ToneMap',                    PrintConv => { 0 => 'SDR', 1 => 'HLG' }, Unknown => 1 },
     622 => { Name => 'PortraitImpressionBalance',  PrintConv => \%portraitImpressionBalanceZ8 },
-    636 => { Name => 'HighFrequencyFlickerReduction', PrintConv => \%offOn, Unknown => 1 }, # new with firmware 3.0
+    636 => {
+        Name => 'HighFrequencyFlickerReduction', 
+        PrintConv => \%offOn,
+        Unknown => 1,
+        Hook => '$varSize += 4 if $$self{FirmwareVersion} and $$self{FirmwareVersion} ge "03.00"',
+    },
+#
+# firmware 3.00 adds 4 bytes somewhere in the range 638-730 (hence the Hook above)
+# 
     730 => {
         Name => 'MovieImageArea',
         Unknown => 1,
@@ -10027,7 +10043,15 @@ my %nikonFocalConversions = (
         Name => 'MenuSettingsZ8',
         Format => 'undef[943]',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::MenuSettingsZ8' },
-        Hook => '$varSize += 4 if $$self{FirmwareVersion} and $$self{FirmwareVersion} ge "02.10"',
+        Hook => q{
+            if ($$self{FirmwareVersion}) {
+                if ($$self{FirmwareVersion} =~ /^02\.10/) {
+                    $varSize += 4;
+                } elsif ($$self{FirmwareVersion} ge "03.0") {
+                    $varSize += 8
+                }
+            }
+        },
     },
     943 => {
         Name => 'CustomSettingsZ8',
@@ -10078,22 +10102,26 @@ my %nikonFocalConversions = (
     1880 => { Name => 'NonCPULens18MaxAperture', Format => 'int32u', PrintConv => 'sprintf("%.1fmm",$val/100)', Unknown => 1},
     1884 => { Name => 'NonCPULens19MaxAperture', Format => 'int32u', PrintConv => 'sprintf("%.1fmm",$val/100)', Unknown => 1},
     1888 => { Name => 'NonCPULens20MaxAperture', Format => 'int32u', PrintConv => 'sprintf("%.1fmm",$val/100)', Unknown => 1},
-    1824 => { Name => 'HDMIOutputResolution', PrintConv => \%hDMIOutputResolutionZ9 },
-    1842 => { Name => 'AirplaneMode',       PrintConv => \%offOn, Unknown => 1 },
-    1843 => { Name => 'EmptySlotRelease',   PrintConv => { 0 => 'Disable Release', 1 => 'Enable Release' }, Unknown => 1 },
-    1878 => { Name => 'EnergySavingMode',   PrintConv => \%offOn, Unknown => 1 },
-    1906 => { Name => 'USBPowerDelivery',   PrintConv => \%offOn, Unknown => 1 },
-    1915 => { Name => 'SensorShield',       PrintConv => { 0 => 'Stays Open', 1 => 'Closes' }, Unknown => 1 },
+    1904 => { Name => 'HDMIOutputResolution', PrintConv => \%hDMIOutputResolutionZ9 },
+    1922 => { Name => 'AirplaneMode',       PrintConv => \%offOn, Unknown => 1 },
+    1923 => { Name => 'EmptySlotRelease',   PrintConv => { 0 => 'Disable Release', 1 => 'Enable Release' }, Unknown => 1 },
+    1958 => { Name => 'EnergySavingMode',   PrintConv => \%offOn, Unknown => 1 },
+    1986 => { Name => 'USBPowerDelivery',   PrintConv => \%offOn, Unknown => 1 },
+    1995 => { Name => 'SensorShield',       PrintConv => { 0 => 'Stays Open', 1 => 'Closes' }, Unknown => 1 },
     2046 => { Name => 'PixelShiftShooting', RawConv => '$$self{PixelShiftShooting} = $val',  PrintConv => \%multipleExposureModeZ9 },   #off/on/on (series)
     2048 => { Name => 'PixelShiftNumberShots', Condition => '$$self{PixelShiftShooting} > 0', PrintConv => \%pixelShiftNumberShots },
     2050 => { Name => 'PixelShiftDelay',       Condition => '$$self{PixelShiftShooting} > 0', PrintConv => \%pixelShiftDelay },
-    2052 => { Name => 'PlaybackButton',  %buttonsZ9 },  #CSf2
-    2054 => { Name => 'WBButton',        %buttonsZ9},   #CSf2
-    2056 => { Name => 'BracketButton',   %buttonsZ9},   #CSf2
-    2058 => { Name => 'LensFunc1ButtonPlaybackMode', %buttonsZ9},     #CSf2
-    2060 => { Name => 'LensFunc2ButtonPlaybackMode', %buttonsZ9},     #CSf2
-    2062 => { Name => 'PlaybackButtonPlaybackMode',  %buttonsZ9},     #CSf2
-    2064 => { Name => 'BracketButtonPlaybackMode',   %buttonsZ9},     #CSf2
+    2052 => { Name => 'PlaybackButton',  %buttonsZ8 },  #CSf2
+    2054 => { Name => 'WBButton',        %buttonsZ8},   #CSf2
+    2056 => { Name => 'BracketButton',   %buttonsZ8},   #CSf2
+    2058 => { Name => 'LensFunc1ButtonPlaybackMode', %buttonsZ8},     #CSf3
+    2060 => { Name => 'LensFunc2ButtonPlaybackMode', %buttonsZ8},     #CSf3
+    2062 => { Name => 'PlaybackButtonPlaybackMode',  %buttonsZ8},     #CSf3
+    2064 => { Name => 'BracketButtonPlaybackMode',   %buttonsZ8},     #CSf3
+    #2088 FlickerFrequencyPreset #Z8 fw 3.0
+    2206 => { Name => 'MaximumApertureLV',       PrintConv => \%offOn, Unknown => 1 },   #CSa14
+    2208 => { Name => 'ReleaseModeButton', %buttonsZ8},     #CSf2
+    2216 => { Name => 'ReleaseModeButtonPlaybackMode', %buttonsZ8},     #CSf3
 );
 
 %Image::ExifTool::Nikon::MenuSettingsZ9 = (
@@ -12056,6 +12084,7 @@ my %nikonFocalConversions = (
 %Image::ExifTool::Nikon::MakerNotes0x56 = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes' },
+    DATAMEMBER => [ 12 ],
     0 => {
         Name => 'FirmwareVersion56',
         Format => 'string[4]',
@@ -12066,6 +12095,11 @@ my %nikonFocalConversions = (
         Name => 'BurstGroupID',    #all frames shot within a burst (using CL/CH/C30/C60/C120) will share the same BurstGroupID.  Value will be > 0 for all images shot in continuous modes (or via Pixel Shift).  0 for single-frame.
         Format => 'int16u'
     },
+    12 => {
+        Name => 'PixelShiftID',    # 1 => Pixel shift enabled (either directly or thru Focus Shift Shooting with Z8 fw 3.0)
+        RawConv => '$$self{PixelShiftActive} = $val',
+        Hidden => 1
+    },
 );
 
 # extra info found in IFD0 of NEF files (ref PH, Z6/Z7)
@@ -12104,6 +12138,7 @@ my %nikonFocalConversions = (
         Name => 'DistortionCorrection',   #used by ACR to determine whether the built-in lens profile is applied
         Format => 'int8u',
         PrintConv => {
+            0 => 'No Lens Attached',    #to prevent reporting 'Unknown'
             1 => 'On (Optional)',
             2 => 'Off',
             3 => 'On (Required)',
@@ -12791,7 +12826,7 @@ my %nikonFocalConversions = (
         Name => 'UnknownInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::UnknownInfo' },
     },
-    # 0x200002d - int16u[3]: "512 0 0"
+    # 0x200002d - int16u[3]: "512 0 0", "512 1 14", "512 3 10"
     0x2000032 => {
         Name => 'UnknownInfo2',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::UnknownInfo2' },
@@ -12804,10 +12839,12 @@ my %nikonFocalConversions = (
     # 0x200003f - rational64s[2]: "0 0"
     # 0x2000042 - undef[6]: "0100\x03\0"
     # 0x2000043 - undef[12]: all zeros
+    # 0x200004d - undef[84]: "0100\0\0\0\0x020100\0\0\0\x010100\0\0\0\x05\0\0\..."
     0x200004e => {
         Name => 'NikonSettings',
         SubDirectory => { TagTable => 'Image::ExifTool::NikonSettings::Main' },
     },
+    # 0x2000055 - undef[8]: "0100\x01\0\0\0"
     0x2000083 => {
         Name => 'LensType',
         # credit to Tom Christiansen (ref 7) for figuring this out...
@@ -13011,7 +13048,11 @@ my %nikonFocalConversions = (
         Condition => '$$valPt =~ /^040[012]/',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::AFInfo2V0400' },
     }],
-    # 0x20000c0 - undef[8]
+    # 0x20000c0 - undef[8]:
+    #    34 01 0c 00 90 01 0c 00
+    #    34 01 0c 00 9c 01 0c 00
+    #    3c 01 0c 00 9c 01 0c 00
+    #    3c 01 0c 00 a8 01 0c 00
     0x20000c3 => {
         Name => 'BarometerInfo',
         SubDirectory => {