Changeset 860 for trunk/platform/ixus960_sd950/shooting.c

Timestamp:

12/11/09 03:53:46 (3 years ago)

Author:

reyalp

Message:

modemap cleanup part 1

• make all CHDK mode enum values match canon descriptions, including SCN prefix if requried
• remove extra names that refer to the same modes:

SCN_GRASS->SCN_FOLIAGE, SCN_CHILD->SCN_KIDS_PETS, SCN_PARTY->SCN_INDOOR, SCN_WATER->SCN_UNDERWATER

• resolve confused use of NIGHT modes as NIGHT_SCENE, NIGHT_SNAPSHOT and LONG_SHUTTER
• add MODE_LONG_SHUTTER for cameras without a true manual mode (mostly guessed based on firmware mode list):

a2000, a450, a460, a470, a550, a560, tx1, all ixus except ixus980_sd990 (has real manual), ixusizoom_sd30 (unknown)

• clean up modemaps as much as possible to match canon specs and firmware mode list, document these.
• cameras with known incorrect or incomplete modemaps:

a470 stitch, color accent, color swap still and video guessed
g7 not clear which night scene mode is which
ixus40_sd30 firmware list not found, status unknown
ixus55_sd450 many modes missing from list, no way to guess in old canon mode system
ixus65_sd630 video modes guessed
ixus750_sd550 longshutter and p guessed
ixus800_sd700 video modes guessed
ixus80_sd1100 many guessed, some unknown in canon list but not modemap
ixus850_sd800 many guessed, had lots that weren't in the canon list
ixus960_sd950 guessed IS0_3200, VIDEO_HIRES
ixusizoom_sd30 completely wrong, impossible to guess with old canon system
sx100 one unknown video mode

• remove tx1 manual exception from generic/shooting since tx1 no longer has a MODE_M entry
• check for MODE_LONG_SHUTTER in generic shooting Tv bracketing, treat as Tv/Manual?

File:

• trunk/platform/ixus960_sd950/shooting.c (modified) (1 diff)

trunk/platform/ixus960_sd950/shooting.c

@@ -72 +72 @@
 };          
 
+/*
+Shooting Modes
+    Auto, Camera M,
+    Special Scene
+        (Portrait, Foliage, Snow, Beach, Fireworks, Aquarium, Underwater,
+        ISO 3200, Indoor, Kids & Pets, Night Snapshot),
+    Color Accent, Color Swap, Digital Macro, Stitch Assist, Movie
+
+Movie: 1024 x 768 (15 fps), 640 x 480 (30 fps/30 fps LP), 
+    320 x 240 (30 fps) available up to 4GB or 60 minutes, 
+    640 x 480 (2 hours at 0.5 fps/1 fps), 160 x 120 (3 min. at 15 fps)
+
+canon mode list FFAD6DDC in 100d 
+*/
+
 static const CapturemodeMap modemap[] = {
-        { MODE_AUTO,               32768 }, 
+        { MODE_LONG_SHUTTER,       32774 }, // guessed
+        { MODE_AUTO,               32768 },
         { MODE_P,                  32772 },
         { MODE_DIGITAL_MACRO,      33288 },
-        { MODE_PORTRAIT,           16397 },
-        { MODE_NIGHT_SNAPSHOT,     16395 },
-        { MODE_COLOR_ACCENT,       33306 }, 
-        { MODE_MY_COLORS,          33307 },
-        { MODE_SCN_KIDS_PETS,      16400 }, 
-        { MODE_SCN_INDOOR,         16401 }, 
-        { MODE_SCN_FOLIAGE,        16402 }, 
+        { MODE_SCN_PORTRAIT,       16397 },
+        { MODE_SCN_NIGHT_SNAPSHOT, 16395 },
+        { MODE_COLOR_ACCENT,       33306 },
+        { MODE_COLOR_SWAP,         33307 }, // was MY_COLORS
+        { MODE_SCN_KIDS_PETS,      16400 },
+        { MODE_SCN_INDOOR,         16401 },
+        { MODE_SCN_FOLIAGE,        16402 },
         { MODE_SCN_SNOW,           16403 },
         { MODE_SCN_BEACH,          16404 },
         { MODE_SCN_FIREWORK,       16405 },
         { MODE_SCN_AQUARIUM,       16407 },
-        { MODE_SCN_WATER,          16406 },
+        { MODE_SCN_UNDERWATER,     16406 },
+        { MODE_SCN_ISO_3200,       16412 }, // guessed
         { MODE_VIDEO_STD,          2597  },
         { MODE_VIDEO_COMPACT,      2599  },
         { MODE_VIDEO_COLOR_ACCENT, 2595  },
         { MODE_VIDEO_MY_COLORS,    2596  },
+        { MODE_VIDEO_HIRES,        2600  }, // guessed, number in canon list
         { MODE_VIDEO_TIME_LAPSE,   2601  },
         { MODE_STITCH,             33290 },