source: trunk/platform/ixus700_sd500/shooting.c @ 860

Revision 860, 4.3 KB checked in by reyalp, 3 years ago (diff)

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?
  • Property svn:eol-style set to native
Line 
1#define PARAM_FILE_COUNTER      0x2A
2
3#include "platform.h"
4
5const ApertureSize aperture_sizes_table[] = {
6    {  9, 294, "2.8" },
7    { 10, 309, "3.2" },
8    { 11, 328, "3.5" },
9    { 12, 353, "3.5" },
10    { 13, 385, "4.0" },
11    { 14, 384, "4.0" },
12    { 15, 416, "4.5" },
13    { 16, 449, "4.9" },
14    { 17, 545, "7.1" },
15    { 18, 560, "7.1" },
16    { 19, 579, "8.0" },
17    { 20, 604, "9.0" },
18    { 21, 636, "10" },
19    { 22, 667, "11" },
20    { 23, 700, "13" },
21
22};
23
24const ShutterSpeed shutter_speeds_table[] = {
25    { -12, -384, "15", 15000000 },
26    { -11, -352, "13", 13000000 },
27    { -10, -320, "10", 10000000 },
28    {  -9, -288, "8",   8000000 },
29    {  -8, -256, "6",   6000000 },
30    {  -7, -224, "5",   5000000 },
31    {  -6, -192, "4",   4000000 },
32    {  -5, -160, "3.2", 3200000 },
33    {  -4, -128, "2.5", 2500000 },
34    {  -3,  -96, "2",   2000000 },
35    {  -2,  -64, "1.6", 1600000 },
36    {  -1,  -32, "1.3", 1300000 },
37    {   0,    0, "1",   1000000 },
38    {   1,   32, "0.8",  800000 },
39    {   2,   64, "0.6",  600000 },
40    {   3,   96, "0.5",  500000 },
41    {   4,  128, "0.4",  400000 },
42    {   5,  160, "0.3",  300000 },
43    {   6,  192, "1/4",  250000 },
44    {   7,  224, "1/5",  200000 },
45    {   8,  256, "1/6",  166667 },
46    {   9,  288, "1/8",  125000 },
47    {  10,  320, "1/10", 100000 },
48    {  11,  352, "1/13",  76923 },
49    {  12,  384, "1/15",  66667 },
50    {  13,  416, "1/20",  50000 },
51    {  14,  448, "1/25",  40000 },
52    {  15,  480, "1/30",  33333 },
53    {  16,  512, "1/40",  25000 },
54    {  17,  544, "1/50",  20000 },
55    {  18,  576, "1/60",  16667 },
56    {  19,  608, "1/80",  12500 },
57    {  20,  640, "1/100", 10000 },
58    {  21,  672, "1/125",  8000 },
59    {  22,  704, "1/160",  6250 },
60    {  23,  736, "1/200",  5000 },
61    {  24,  768, "1/250",  4000 },
62    {  25,  800, "1/320",  3125 },
63    {  26,  832, "1/400",  2500 },
64    {  27,  864, "1/500",  2000 },
65    {  28,  896, "1/640",  1563 },
66    {  29,  928, "1/800",  1250 },
67    {  30,  960, "1/1000", 1000 },
68    {  31,  992, "1/1250",  800 },
69    {  32, 1021, "1/1600",  625 },
70    {  33, 1053, "1/2000",  500 },
71    {  34, 1084, "1/2500",  400 },
72    {  35, 1117, "1/3200",  313 },
73};
74
75const ISOTable iso_table[] = {
76    {  0,    0, "Auto", -1},
77    {  1,   50,   "50", -1},
78    {  2,  100,  "100", -1},
79    {  3,  200,  "200", -1},
80    {  4,  400,  "400", -1},
81};         
82
83/*
84canon mode list FF967C0C in 100a
85http://www.usa.canon.com/consumer/controller?act=ModelInfoAct&fcategoryid=224&modelid=11157#ModelTechSpecsAct
86
87Shooting Modes
88        Still Images: Auto, Manual,
89        Scene Modes
90                (Digital Macro, Portrait, Night Snapshot, Kids & Pets, Indoor,
91                Underwater),
92        My Colors, Stitch Assist;
93        Movies:
94                Standard, Fast Frame Rate, Compact, My Colors.
95Movie: 640x480, 320x240, 160x120
96*/
97static const CapturemodeMap modemap[] = {
98    { MODE_SCN_DIGITAL_MACRO,   0 },
99    { MODE_P,                   1 },
100    { MODE_LONG_SHUTTER,        2 }, // 1-15s
101    { MODE_AUTO,                3 },
102    { MODE_MY_COLORS,           4 },
103    { MODE_SCN_PORTRAIT,        5 },
104    { MODE_SCN_FOLIAGE,         6 },
105    { MODE_SCN_SNOW,            7 },
106    { MODE_SCN_BEACH,           8 },
107    { MODE_SCN_FIREWORK,        9 },
108    { MODE_SCN_UNDERWATER,     10 },
109    { MODE_SCN_INDOOR,         11 },
110    { MODE_SCN_KIDS_PETS,      12 },
111    { MODE_SCN_NIGHT_SNAPSHOT, 13 },
112    { MODE_STITCH,             14 },
113    { MODE_VIDEO_STD,          15 }
114};
115
116#include "../generic/shooting.c"
117
118long get_file_next_counter() {
119    return ((get_file_counter()>>4)+1)<<4;
120}
121
122long get_target_file_num() {
123    long n;
124   
125    n = get_file_next_counter();
126    n = (n>>4)&0x3FFF;
127    return n;
128}
129
130long get_target_dir_num() {
131    long n;
132   
133    n = get_file_next_counter();
134    n = (n>>18)&0x3FF;
135    return n;
136}
137
138int circle_of_confusion = 6;
139
140char* shooting_get_tv_str()
141{
142    short int tvv;
143    long i;
144    _GetPropertyCase(PROPCASE_TV, &tvv, sizeof(tvv));
145    for (i=0;i<SS_SIZE;i++){
146        if (shutter_speeds_table[i].prop_id >= tvv)
147            return (char*)shutter_speeds_table[i].name;
148    }
149    return (void*)"?";
150}
151
152char* shooting_get_av_str()
153{
154    short int avv;
155    long i;
156    _GetPropertyCase(PROPCASE_AV, &avv, sizeof(avv));
157    for (i=0;i<AS_SIZE;i++){
158        if (aperture_sizes_table[i].prop_id == avv)
159            return (char*)aperture_sizes_table[i].name;
160    }
161    return (char*) "?";
162}
163
Note: See TracBrowser for help on using the repository browser.