Changeset 1231

Timestamp:

07/10/11 06:18:36 (23 months ago)

Author:

reyalp

Message:

Modemap update for G12 & SX30 from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg70055#msg70055

Location:

trunk

Files:

• include/modelist.h (modified) (2 diffs)
• platform/g12/shooting.c (modified) (1 diff)
• platform/sx30/shooting.c (modified) (1 diff)

trunk/include/modelist.h

@@ -98 +98 @@
     MODE_LOWLIGHT           , // g11
     MODE_SCN_NOSTALGIC      , // s90
-        MODE_SCN_SMART_SHUTTER  , // sx30
+        MODE_SCN_SMART_SHUTTER  , // sx30/g12 (Smart Shutter, Smile detection mode)
         MODE_SCN_LOWLIGHT               , // sx30
         MODE_SCN_SUPER_VIVID    , // sx30
@@ -112 +112 @@
         MODE_SCN_TOY_CAMERA     , // sx220
         MODE_SCN_MONOCHROME     , // sx220
+    MODE_SCN_WINK_SELF_TIMER, // sx30/g12 (Smart Shutter, Wink Self Timer mode)
+    MODE_SCN_FACE_SELF_TIMER, // sx30/g12 (Smart Shutter, Face Self Timer mode)
 };
 

trunk/platform/g12/shooting.c

@@ -82 +82 @@
 
 /*
-http://www.usa.canon.com/consumer/controller?act=ModelInfoAct&fcategoryid=225&modelid=17630#ModelTechSpecsAct
-Shooting Modes
-        Auto, P, Av, Tv, M, C, Portrait, Landscape, Sports, 
-        Special Scene 
-                (Foliage, Snow, Beach, Sunset, Fireworks, Aquarium, Night Scene, Indoor,
-                ISO 3200, Color Accent, Color Swap),
-        Super Macro, Night Snapshot, Stitch Assist, Movie
+http://www.usa.canon.com/cusa/consumer/products/cameras/digital_cameras/powershot_g12#Specifications
+Shooting Modes:
+    Smart AUTO, P, Tv, Av, M, C1, C2, Low Light, Quick Shot, SCN, Movie
+
+SCN Scene Modes:
+    Portrait, Landscape, Kids & Pets, Sports, Smart Shutter, 
+    Super Vivid, Poster Effect, Color Accent, Color Swap, 
+    High Dynamic Range, Nostalgic, Fisheye Effect, 
+    Miniature Effect, Beach, Underwater, Foliage, Snow, Fireworks, Stitch Assist
+
+Movie Modes:
+    Standard, Miniature Effect, Color Accent, Color Swap
+
+Smart Shutter Modes:
+    Smile, Wink Self-timer, Face Self-Timer
 */
+// G12 modelist table found @0xFFC89550 (firmware 1.00c)
 static const CapturemodeMap modemap[] = {
-        { MODE_AUTO,               32768  },
-        { MODE_P,                  32772  },
+        { MODE_QUICK,                      33315  },
         { MODE_TV,                 32771  },
         { MODE_AV,                 32770  },
+        { MODE_P,                  32772  },
         { MODE_M,                  32769  },
+        { MODE_AUTO,               32768  },
+        { MODE_LOWLIGHT,           32801  },
+
+    { MODE_SCN_STITCH,         16908  },
+        { MODE_SCN_COLOR_ACCENT,   16925  },
+        { MODE_SCN_COLOR_SWAP,     16926  },
+        { MODE_SCN_MINIATURE,      16940  },
+        { MODE_SCN_FISHEYE,        16939  },
+        { MODE_SCN_HDR,            16942  },
+        { MODE_SCN_PORTRAIT,       16399  },
+        { MODE_SCN_SUPER_VIVID,    16934  },
+        { MODE_SCN_POSTER_EFFECT,  16935  },
+        { MODE_SCN_LANDSCAPE,      16398  },
+    { MODE_SCN_FACE_SELF_TIMER,16936  },
+        { MODE_SCN_SMART_SHUTTER,  16937  },
+    { MODE_SCN_WINK_SELF_TIMER,16938  },
+        { MODE_SCN_FOLIAGE,        16405  },
+        { MODE_SCN_SNOW,           16406  },
+        { MODE_SCN_BEACH,          16407  },
+        { MODE_SCN_UNDERWATER,     16409  },
+        { MODE_SCN_NOSTALGIC,      16933  },
+        { MODE_SCN_KIDS_PETS,      16402  },
+        { MODE_SCN_FIREWORK,       16408  },
+        { MODE_SCN_SPORT,          16903  },
+
     { MODE_VIDEO_COLOR_ACCENT, 2612   },
     { MODE_VIDEO_COLOR_SWAP,   2613   },
-        { MODE_VIDEO_STD,          2614   }, // video standby
     { MODE_VIDEO_MINIATURE,    2620   },
-        { MODE_LOWLIGHT,           32801  },
-        { MODE_QUICK,                      33315  },
-
-        { MODE_SCN_PORTRAIT,       16999  },
-        { MODE_SCN_LANDSCAPE,      16998  },
-        { MODE_SCN_KIDS_PETS,      16402  },
-        { MODE_SCN_SPORT,          16903  },
-        { MODE_SCN_SMART_SHUTTER,  16937  },
-        { MODE_SCN_SUPER_VIVID,    16934  },
-        { MODE_SCN_POSTER_EFFECT,  16935  },
-        { MODE_SCN_COLOR_ACCENT,   16925  },
-        { MODE_SCN_COLOR_SWAP,     16926  },
-        { MODE_SCN_HDR,            16942  },
-        { MODE_SCN_NOSTALGIC,      16933  },
-        { MODE_SCN_FISHEYE,        16939  },
-        { MODE_SCN_MINIATURE,      16940  },
-        { MODE_SCN_BEACH,          16407  },
-        { MODE_SCN_UNDERWATER,     16409  },
-        { MODE_SCN_FOLIAGE,        16405  },
-        { MODE_SCN_SNOW,           16406  },
-        { MODE_SCN_FIREWORK,       16408  },
-        { MODE_SCN_STITCH,         16908  },
+        { MODE_VIDEO_STD,          2614   },
 };
 

trunk/platform/sx30/shooting.c

@@ -82 +82 @@
 /*
 http://www.usa.canon.com/cusa/consumer/products/cameras/digital_cameras/powershot_sx30_is#Specifications
-Shooting Modes
-        Auto, P, Av, Tv, M, C1, C2, Portrait, Landscape, Sports, 
-        Special Scene 
-                (*1Smart Shutter*3, Low Light, Super Vivid, Poster Effect,
-        Color Accent, Color Swap, Fisheye Effect, Miniature Effect,
-        Beach, Foliage, Snow, Fireworks, Stitch Assist)
-    Movie
-    canon mode list at FFC67954 in 100h
+Shooting Modes:
+    Smart AUTO, P, Tv, Av, M, C1, C2, Portrait, Landscape, Sports, SCN, Movie
+
+SCN Scene Modes:
+    Smart Shutter, Low Light, Super Vivid, Poster Effect, Color Accent, 
+    Color Swap, Fisheye Effect, Miniature Effect, Beach, Foliage, Snow, 
+    Fireworks, Stitch Assist
+
+Movie Modes:
+    Standard, Miniature Effect, Color Accent, Color Swap
+
+Smart Shutter Modes:
+    Smile, Wink Self-timer, Face Self-Timer
 */
+// SX30 modelist table found @0xFFC67954 (firmware 1.00h)
 static const CapturemodeMap modemap[] = {
-        { MODE_AUTO,               32768  },
-        { MODE_P,                  32772  },
+        { MODE_M,                  32769  },
         { MODE_TV,                 32771  },
         { MODE_AV,                 32770  },
-        { MODE_M,                  32769  },
-        { MODE_PORTRAIT,           32783  },
+        { MODE_P,                  32772  },
+        { MODE_AUTO,               32768  },
+
+        { MODE_SCN_STITCH,         16908  },
+        { MODE_SCN_COLOR_ACCENT,   16925  },
+        { MODE_SCN_COLOR_SWAP,     16926  },
+    { MODE_PORTRAIT,           32783  },
+    { MODE_SCN_FACE_SELF_TIMER,16936  },
+        { MODE_SCN_SMART_SHUTTER,  16937  },
+    { MODE_SCN_WINK_SELF_TIMER,16938  },
+        { MODE_SCN_LOWLIGHT,       16417  },
+        { MODE_SCN_FISHEYE,        16939  },
+        { MODE_SCN_MINIATURE,      16940  },
+        { MODE_SCN_SUPER_VIVID,    16934  },
+        { MODE_SCN_POSTER_EFFECT,  16935  },
         { MODE_LANDSCAPE,          32782  },
+        { MODE_SCN_FOLIAGE,        16405  },
+        { MODE_SCN_SNOW,           16406  },
+        { MODE_SCN_BEACH,          16407  },
+        { MODE_SCN_FIREWORK,       16408  },
         { MODE_SPORTS,             33287  },
 
     { MODE_VIDEO_COLOR_ACCENT, 2612   },
     { MODE_VIDEO_COLOR_SWAP,   2613   },
+    { MODE_VIDEO_MINIATURE,    2620   },
         { MODE_VIDEO_STD,          2614   },
-    { MODE_VIDEO_MINIATURE,    2620   },
-
-        { MODE_SCN_SMART_SHUTTER,  16937  },
-        { MODE_SCN_LOWLIGHT,       16417  },
-        { MODE_SCN_SUPER_VIVID,    16934  },
-        { MODE_SCN_POSTER_EFFECT,  16935  },
-        { MODE_SCN_FISHEYE,        16939  },
-        { MODE_SCN_MINIATURE,      16940  },
-        { MODE_SCN_STITCH,         16908  },
-        { MODE_SCN_FOLIAGE,        16405  },
-        { MODE_SCN_SNOW,           16406  },
-        { MODE_SCN_BEACH,          16407  },
-        { MODE_SCN_FIREWORK,       16408  },
-        { MODE_SCN_COLOR_ACCENT,   16925  },
-        { MODE_SCN_COLOR_SWAP,     16926  },
-        { MODE_SCN_STITCH,         16908  },
 };