Changeset 860 for trunk/platform/ixus55_sd450/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/ixus55_sd450/shooting.c (modified) (1 diff)

trunk/platform/ixus55_sd450/shooting.c

@@ -81 +81 @@
 };          
 
+/*
+http://www.usa.canon.com/consumer/controller?act=ModelInfoAct&fcategoryid=224&modelid=11939#ModelTechSpecsAct
+Shooting Modes
+        Auto; Manual,
+        Special Scene
+                (Portrait, Night Snapshot, Foliage, Snow, Beach, Fireworks,
+                Underwater, Indoor, Kids & Pets),
+        Digital Macro, My Colors, Stitch Assist, Movie
+Movie: 640 x 480/320 x 240 (30 fps/15 fps), 320 x 240 (1 min. at 60 fps), 160 x 120 (3 min. at 15 fps)
+canon mode list FF95FC68 in 100b
+*/
 static const CapturemodeMap modemap[] = {
     { MODE_P,                   0 },
-//    { ???,       1 }, // assumed long shutter 
+    { MODE_LONG_SHUTTER,        1 }, // guessed long shutter 
     { MODE_DIGITAL_MACRO,       2 },
     { MODE_MY_COLORS,           3 },
     { MODE_STITCH,              4 }, 
     { MODE_AUTO,                5 },
-    { MODE_PORTRAIT,            6 },
+    { MODE_SCN_PORTRAIT,        6 },
     { MODE_SCN_SNOW,            8 },
-    { MODE_SCN_NIGHT,          12 },
+    { MODE_SCN_NIGHT_SNAPSHOT, 12 },
+// TODO missing Foliage, Beach, Fireworks, Underwater, indoor, Kids+pets
     { MODE_VIDEO_STD,          15 }
 };