source: branches/juciphox/include/camera.h @ 479

Revision 479, 22.9 KB checked in by phyrephox, 5 years ago (diff)

+ added taskviewer by reyalp http://chdk.setepontos.com/index.php/topic,2110.msg19622.html#msg19622
+ added Fishpeppers Boot Logo from here: http://chdk.setepontos.com/index.php/topic,2122.0.html
+ raw subtract for filebrowser by reyalp - http://chdk.setepontos.com/index.php/topic,2099.msg19362.html#msg19362

  • makefile changes:

added several docs in the /docs dir, these are "catted" together during compilation -> one big readme file's gonna be put into the zip. Also includes camera specific notes, if existing (placeholders for now) (thx for helping with this, Hacki).

  • Ixus 860is / SD870 - fixed ubasic_set_led (diff provided by FE50)
  • patched symboldmod and changed splashscreen a little (diff sent in by CHDKLover)
  • added toggle in scripts menu: now the saving of script params can be turned on/off (default: off)
Line 
1#ifndef CAMERA_H
2#define CAMERA_H
3
4//==========================================================
5// Camera-dependent settings
6//==========================================================
7
8//----------------------------------------------------------
9// Default values
10//----------------------------------------------------------
11    #undef  CAM_RAW_ROWPIX                  // Number of pixels in RAW row
12    #undef  CAM_RAW_ROWS                    // Number of rows in RAW
13   
14    #undef  CAM_DRYOS                       // Camera is DryOS-based
15    #undef  CAM_PROPSET                     // Camera's properties group (the generation)
16   
17    #undef  CAM_SWIVEL_SCREEN               // Camera has rotated LCD screen
18    #define CAM_USE_ZOOM_FOR_MF         1   // Zoom lever can be used for manual focus adjustments
19    #undef  CAM_ADJUSTABLE_ALT_BUTTON       // ALT-button can be set from menu
20    #define CAM_REMOTE                  1   // Camera supports USB-remote
21    #define CAM_SYNCH                   1   // Camera supports SDM precision synch
22    #undef  CAM_MULTIPART                   // Camera supports SD-card multipartitioning
23    #define CAM_HAS_ZOOM_LEVER          1   // Camera has dedicated zoom buttons
24    #undef  CAM_DRAW_EXPOSITION             // Output expo-pair on screen (for cameras which (sometimes) don't do that)
25    #define CAM_HAS_ERASE_BUTTON        1   // Camera has dedicated erase button
26    #define CAM_HAS_IRIS_DIAPHRAGM      1   // Camera has real diaphragm mechanism
27    #undef  CAM_HAS_ND_FILTER               // Camera has build-in ND filter
28    #define CAM_CAN_SD_OVER_NOT_IN_MF   1   // Camera allows subject distance (focus) override when not in manual focus mode
29    #define CAM_CAN_SD_OVERRIDE         1   // Camera allows to do subject distance override
30    #define CAM_HAS_MANUAL_FOCUS        1   // Camera has manual focus mode
31    #define CAM_HAS_USER_TV_MODES       1   // Camera has tv-priority or manual modes with ability to set tv value
32    #undef  CAM_SHOW_OSD_IN_SHOOT_MENU      // On some cameras Canon shoot menu has additional functionality and useful in this case to see CHDK OSD in this mode 
33    #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO  1 // Camera can unlock optical zoom in video (if it is locked)
34    #undef  CAM_FEATURE_FEATHER             // Cameras with "feather" or touch wheel.
35    #define CAM_HAS_IS                  1   // Camera has image stabilizer
36
37    #undef  CAM_CONSOLE_LOG_ENABLED         // Development: internal camera stdout -> A/stdout.txt
38    #define CAM_CHDK_HAS_EXT_VIDEO_MENU 1   // In CHDK for this camera realized adjustable video compression
39    #undef  CAM_CAN_MUTE_MICROPHONE         // Camera has function to mute microphone
40
41    #define CAM_EMUL_KEYPRESS_DELAY     40  // Delay to interpret <alt>-button press as longpress
42    #define CAM_EMUL_KEYPRESS_DURATION  5   // Length of keypress emulation
43
44    #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD // CHDK can make single AF scan during video record
45    #undef  CAM_HAS_VIDEO_BUTTON            // Camera can take stills in video mode, and vice versa
46
47//----------------------------------------------------------
48// Overridden values for each camera
49//----------------------------------------------------------
50
51//==========================================================
52// G-series
53//==========================================================
54#if   defined (CAMERA_g7)
55    #define CAM_PROPSET                 1
56
57    #define CAM_RAW_ROWPIX              3736   // for 10 MP
58    #define CAM_RAW_ROWS                2772   // for 10 MP
59   
60    #undef  CAM_USE_ZOOM_FOR_MF
61    #define CAM_ADJUSTABLE_ALT_BUTTON   1
62    #define CAM_MULTIPART               1
63    #define CAM_HAS_ND_FILTER           1
64    #undef  CAM_HAS_IS
65    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
66   
67//==========================================================
68// A-series
69//==========================================================
70#elif defined (CAMERA_a450)
71    #define CAM_PROPSET                 2
72
73    #define CAM_RAW_ROWPIX              2664   // for 5 MP 1/3" sensor size
74    #define CAM_RAW_ROWS                1968   // for 5 MP 1/3" sensor size
75
76    #undef  CAM_USE_ZOOM_FOR_MF
77    #undef  CAM_HAS_ZOOM_LEVER
78    #define CAM_DRAW_EXPOSITION         1
79    #undef  CAM_HAS_ERASE_BUTTON
80    #undef  CAM_HAS_IRIS_DIAPHRAGM
81    #define CAM_HAS_ND_FILTER           1
82    #undef  CAM_HAS_MANUAL_FOCUS
83    #undef  CAM_HAS_USER_TV_MODES
84    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
85    #undef  CAM_HAS_IS
86    #define CAM_CAN_MUTE_MICROPHONE     1
87    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
88   
89//----------------------------------------------------------
90#elif defined (CAMERA_a460)
91    #define CAM_PROPSET                 2
92
93    #define CAM_RAW_ROWPIX              2664   // for 5 MP 1/3" sensor size
94    #define CAM_RAW_ROWS                1968   // for 5 MP 1/3" sensor size
95
96    #undef  CAM_USE_ZOOM_FOR_MF
97    #undef  CAM_HAS_ZOOM_LEVER
98    #define CAM_DRAW_EXPOSITION         1
99    #undef  CAM_HAS_ERASE_BUTTON
100    #undef  CAM_HAS_IRIS_DIAPHRAGM
101    #define CAM_HAS_ND_FILTER           1
102    #undef  CAM_HAS_MANUAL_FOCUS
103    #undef  CAM_HAS_USER_TV_MODES
104    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
105    #undef  CAM_HAS_IS
106    #define CAM_CAN_MUTE_MICROPHONE     1
107    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
108   
109//----------------------------------------------------------
110#elif defined (CAMERA_a530)
111    #define CAM_PROPSET                 1
112
113//  2672x1968 image - like most other 5m sensors
114    #define CAM_RAW_ROWPIX              2672   // for 5 MP
115    #define CAM_RAW_ROWS                1968   // for 5 MP
116//  2672x1992 image - eventually probably real sensor size
117//  #define CAM_RAW_ROWPIX              2672   // for 5 MP
118//  #define CAM_RAW_ROWS                1992   // for 5 MP
119
120    #undef  CAM_USE_ZOOM_FOR_MF
121    #define CAM_HAS_ERASE_BUTTON        1
122    #undef  CAM_HAS_IRIS_DIAPHRAGM
123    #define CAM_HAS_ND_FILTER           1
124    #define CAM_HAS_MANUAL_FOCUS        1
125    #define CAM_DRAW_EXPOSITION         1
126    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
127    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
128    #undef  CAM_HAS_IS
129    #define CAM_CAN_MUTE_MICROPHONE     1
130    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
131   
132//----------------------------------------------------------
133#elif defined (CAMERA_a540)
134    #define CAM_PROPSET                 1
135
136    #define CAM_RAW_ROWPIX              2888   // for 6 MP
137    #define CAM_RAW_ROWS                2136   // for 6 MP
138
139    #undef  CAM_USE_ZOOM_FOR_MF
140    #define CAM_HAS_ERASE_BUTTON        1
141    #define CAM_HAS_IRIS_DIAPHRAGM      1
142    #undef  CAM_HAS_ND_FILTER
143    #define CAM_HAS_MANUAL_FOCUS        1
144    #undef  CAM_DRAW_EXPOSITION
145    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
146    #undef  CAM_HAS_IS
147    #define CAM_CAN_MUTE_MICROPHONE     1
148    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
149   
150//----------------------------------------------------------
151#elif defined (CAMERA_a550)
152    #define CAM_PROPSET                 2
153
154    #define CAM_RAW_ROWPIX              3152   // for 7 MP
155    #define CAM_RAW_ROWS                2340   // for 7 MP
156
157    #undef  CAM_USE_ZOOM_FOR_MF
158    #define CAM_MULTIPART               1
159    #undef  CAM_HAS_ERASE_BUTTON
160    #undef  CAM_HAS_IRIS_DIAPHRAGM
161    #define CAM_HAS_ND_FILTER           1
162    #undef  CAM_HAS_MANUAL_FOCUS
163    #undef  CAM_HAS_USER_TV_MODES
164    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
165    #undef  CAM_HAS_IS
166    #define CAM_CAN_MUTE_MICROPHONE     1
167    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
168   
169//----------------------------------------------------------
170#elif defined (CAMERA_a560)
171    #define CAM_PROPSET                 2
172
173    #define CAM_RAW_ROWPIX              3152   // for 7 MP
174    #define CAM_RAW_ROWS                2340   // for 7 MP
175
176    #undef  CAM_USE_ZOOM_FOR_MF
177    #define CAM_MULTIPART               1
178    #undef  CAM_HAS_ERASE_BUTTON
179    #undef  CAM_HAS_IRIS_DIAPHRAGM
180    #define CAM_HAS_ND_FILTER           1
181    #undef  CAM_HAS_MANUAL_FOCUS
182    #undef  CAM_HAS_USER_TV_MODES
183    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
184    #undef  CAM_HAS_IS
185    #define CAM_CAN_MUTE_MICROPHONE     1
186    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
187   
188//----------------------------------------------------------
189#elif defined (CAMERA_a570)
190    #define CAM_PROPSET                 2
191
192    #define CAM_RAW_ROWPIX              3152   // for 7 MP
193    #define CAM_RAW_ROWS                2340   // for 7 MP
194    #define CAM_MULTIPART               1
195    #define CAM_CAN_MUTE_MICROPHONE     1
196    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
197   
198//----------------------------------------------------------
199#elif defined (CAMERA_a610)
200    #define CAM_PROPSET                 1
201
202    #define CAM_RAW_ROWPIX              2672   // for 5 MP
203    #define CAM_RAW_ROWS                1968   // for 5 MP
204   
205    #define CAM_SWIVEL_SCREEN           1
206    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
207    #undef  CAM_HAS_IS
208    #define CAM_CAN_MUTE_MICROPHONE     1
209    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
210
211//----------------------------------------------------------
212#elif defined (CAMERA_a620)
213    #define CAM_PROPSET                 1
214
215    #define CAM_RAW_ROWPIX              3152   // for 7 MP
216    #define CAM_RAW_ROWS                2340   // for 7 MP
217   
218    #define CAM_SWIVEL_SCREEN           1
219    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
220    #undef  CAM_HAS_IS   
221    #define CAM_CAN_MUTE_MICROPHONE     1
222    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
223
224//----------------------------------------------------------
225#elif defined (CAMERA_a630)
226    #define CAM_PROPSET                 1
227
228    #define CAM_RAW_ROWPIX              3344   // for 8 MP
229    #define CAM_RAW_ROWS                2484   // for 8 MP
230   
231    #define CAM_SWIVEL_SCREEN           1
232    #define CAM_MULTIPART               1
233    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
234    #undef  CAM_HAS_IS
235    #define CAM_CAN_MUTE_MICROPHONE     1
236    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
237   
238//----------------------------------------------------------
239#elif defined (CAMERA_a640)
240    #define CAM_PROPSET                 1
241
242    #define CAM_RAW_ROWPIX              3736   // for 10 MP
243    #define CAM_RAW_ROWS                2772   // for 10 MP
244   
245    #define CAM_SWIVEL_SCREEN           1
246    #define CAM_MULTIPART               1
247    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
248    #undef  CAM_HAS_IS
249    #define CAM_CAN_MUTE_MICROPHONE     1
250    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
251   
252//----------------------------------------------------------
253#elif defined (CAMERA_a650)
254    #define CAM_PROPSET                 2
255    #define CAM_DRYOS                   1
256
257    #define CAM_RAW_ROWPIX              4104   // for 12 MP
258    #define CAM_RAW_ROWS                3048   // for 12 MP
259   
260    #define CAM_ADJUSTABLE_ALT_BUTTON   1
261    #define CAM_SWIVEL_SCREEN           1
262    #define CAM_CAN_MUTE_MICROPHONE     1
263
264    #undef  CAM_EMUL_KEYPRESS_DURATION
265    #define CAM_EMUL_KEYPRESS_DURATION  10
266    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
267   
268//----------------------------------------------------------
269#elif defined (CAMERA_a700)
270    #define CAM_PROPSET                 1
271
272    #define CAM_RAW_ROWPIX              2888   // for 6 MP
273    #define CAM_RAW_ROWS                2136   // for 6 MP
274
275    #undef  CAM_HAS_IS
276    #define CAM_CAN_MUTE_MICROPHONE     1
277    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
278   
279//----------------------------------------------------------
280#elif defined (CAMERA_a710)
281    #define CAM_PROPSET                 1
282
283    #define CAM_RAW_ROWPIX              3152   // for 7 MP
284    #define CAM_RAW_ROWS                2340   // for 7 MP
285
286    #define CAM_MULTIPART               1
287    #define CAM_CAN_MUTE_MICROPHONE     1
288    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
289   
290//----------------------------------------------------------
291#elif defined (CAMERA_a720)
292    #define CAM_PROPSET                 2
293    #define CAM_DRYOS                   1
294
295    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
296    #define CAM_RAW_ROWS                2480   // for new 8 MP
297    #define CAM_CAN_MUTE_MICROPHONE     1
298    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
299
300//==========================================================
301// SD-Series (IXUS-Series)
302//==========================================================
303#elif defined (CAMERA_ixus50_sd400)
304    #define CAM_PROPSET                 1
305
306    #define CAM_RAW_ROWPIX              2672   // for 5 MP
307    #define CAM_RAW_ROWS                1968   // for 5 MP
308
309    #undef  CAM_SYNCH 
310    #undef  CAM_USE_ZOOM_FOR_MF
311    #undef  CAM_HAS_ERASE_BUTTON
312    #undef  CAM_HAS_IRIS_DIAPHRAGM
313    #define CAM_HAS_ND_FILTER           1
314    #undef  CAM_HAS_MANUAL_FOCUS
315    #undef  CAM_HAS_USER_TV_MODES
316    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
317    #undef  CAM_HAS_IS
318        //#define CAM_CONSOLE_LOG_ENABLED     1
319
320//----------------------------------------------------------
321#elif defined (CAMERA_ixus55_sd450)
322    #define CAM_PROPSET                 1
323
324    #define CAM_RAW_ROWPIX              2672   // for 5 MP
325    #define CAM_RAW_ROWS                1968   // for 5 MP
326
327    #undef  CAM_USE_ZOOM_FOR_MF
328    #undef  CAM_HAS_ERASE_BUTTON
329    #undef  CAM_HAS_IRIS_DIAPHRAGM
330    #define CAM_HAS_ND_FILTER           1
331    #undef  CAM_HAS_MANUAL_FOCUS
332    #undef  CAM_HAS_USER_TV_MODES
333    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
334    #undef  CAM_HAS_IS
335    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
336
337//----------------------------------------------------------
338#elif defined (CAMERA_ixus60_sd600)
339    #define CAM_PROPSET                 1
340
341    #define CAM_RAW_ROWPIX              2888   // for 6 MP
342    #define CAM_RAW_ROWS                2136   // for 6 MP
343
344    #undef  CAM_SYNCH
345    #undef  CAM_USE_ZOOM_FOR_MF
346    #undef  CAM_HAS_ERASE_BUTTON
347    #undef  CAM_HAS_IRIS_DIAPHRAGM
348    #define CAM_HAS_ND_FILTER           1
349    #undef  CAM_HAS_MANUAL_FOCUS
350    #undef  CAM_HAS_USER_TV_MODES
351    #define CAM_DRAW_EXPOSITION             1
352    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
353    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
354    #define CAM_FEATURE_FEATHER         1
355
356//    #define CAM_CONSOLE_LOG_ENABLED     1  //100a won't compile if this is defined ("undefined reference to `_iosDevFind'")
357    #undef  CAM_HAS_IS
358    #undef  CAM_CHDK_HAS_EXT_VIDEO_MENU
359
360//----------------------------------------------------------
361#elif defined (CAMERA_ixus65_sd630)
362    #define CAM_PROPSET                 1
363
364    #define CAM_RAW_ROWPIX              2888   // for 6 MP
365    #define CAM_RAW_ROWS                2136   // for 6 MP
366
367    #undef  CAM_USE_ZOOM_FOR_MF
368    #undef  CAM_HAS_ERASE_BUTTON
369    #undef  CAM_HAS_IRIS_DIAPHRAGM
370    #define CAM_HAS_ND_FILTER           1
371    #undef  CAM_HAS_MANUAL_FOCUS
372    #undef  CAM_HAS_USER_TV_MODES
373    #define CAM_DRAW_EXPOSITION             1
374    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
375    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
376    #define CAM_FEATURE_FEATHER         1
377
378    #define CAM_CONSOLE_LOG_ENABLED     1
379    #undef  CAM_HAS_IS
380    #undef  CAM_CHDK_HAS_EXT_VIDEO_MENU
381
382//----------------------------------------------------------
383#elif defined (CAMERA_ixus70_sd1000)
384    #define CAM_PROPSET                 2
385
386    #define CAM_RAW_ROWPIX              3152   // for 7 MP
387    #define CAM_RAW_ROWS                2340   // for 7 MP
388
389    #undef  CAM_USE_ZOOM_FOR_MF
390    #undef  CAM_HAS_ERASE_BUTTON
391    #undef  CAM_HAS_IRIS_DIAPHRAGM
392    #define CAM_HAS_ND_FILTER           1
393    #undef  CAM_HAS_MANUAL_FOCUS
394    #undef  CAM_HAS_USER_TV_MODES
395    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
396    #undef  CAM_HAS_IS
397    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
398
399//----------------------------------------------------------
400#elif defined (CAMERA_ixus700_sd500)
401    #define CAM_PROPSET                 1
402
403    #define CAM_RAW_ROWPIX              3152   // for 7 MP
404    #define CAM_RAW_ROWS                2340   // for 7 MP
405
406    #undef  CAM_SYNCH
407    #undef  CAM_USE_ZOOM_FOR_MF
408    #define CAM_DRAW_EXPOSITION         1
409    #undef  CAM_HAS_ERASE_BUTTON
410    #undef  CAM_HAS_IRIS_DIAPHRAGM
411    #define CAM_HAS_ND_FILTER           1
412    #undef  CAM_HAS_MANUAL_FOCUS
413    #undef  CAM_HAS_USER_TV_MODES
414    #undef  CAM_CAN_SD_OVERRIDE
415    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
416    #undef  CAM_HAS_IS
417    #define CAM_MULTIPART               1
418
419//----------------------------------------------------------
420
421#elif defined (CAMERA_ixus750_sd550)
422    #define CAM_PROPSET                1
423
424    #define CAM_RAW_ROWPIX              3152  // for 7 MP
425    #define CAM_RAW_ROWS                2340  // for 7 MP
426
427    #define  CAM_USE_ZOOM_FOR_MF    1
428    #define CAM_DRAW_EXPOSITION        1
429    #undef  CAM_HAS_ERASE_BUTTON
430    #undef  CAM_HAS_IRIS_DIAPHRAGM
431    #define CAM_HAS_ND_FILTER          1
432    #undef  CAM_HAS_MANUAL_FOCUS
433    #undef  CAM_HAS_USER_TV_MODES
434    #define  CAM_CAN_SD_OVERRIDE    1
435    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
436    #undef  CAM_HAS_IS
437    #define CAM_MULTIPART              1
438    #undef CAM_SYNCH
439//----------------------------------------------------------
440#elif defined (CAMERA_ixus800_sd700)
441    #define CAM_PROPSET                 1
442
443    #define CAM_RAW_ROWPIX              2888   // for 6 MP
444    #define CAM_RAW_ROWS                2136   // for 6 MP
445
446    #undef  CAM_USE_ZOOM_FOR_MF
447    #define CAM_DRAW_EXPOSITION         1
448    #undef  CAM_HAS_ERASE_BUTTON
449    #undef  CAM_HAS_IRIS_DIAPHRAGM
450    #define CAM_HAS_ND_FILTER           1
451    #undef  CAM_HAS_MANUAL_FOCUS
452    #undef  CAM_HAS_USER_TV_MODES
453    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
454    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 2
455   
456//----------------------------------------------------------
457#elif defined (CAMERA_ixus850_sd800)
458    #define CAM_PROPSET                 1
459
460    #define CAM_RAW_ROWPIX              3152   // for 7 MP
461    #define CAM_RAW_ROWS                2340   // for 7 MP
462
463    #undef  CAM_USE_ZOOM_FOR_MF
464    #undef  CAM_HAS_ERASE_BUTTON
465    #undef  CAM_HAS_IRIS_DIAPHRAGM
466    #define CAM_HAS_ND_FILTER           1
467    #undef  CAM_HAS_MANUAL_FOCUS
468    #undef  CAM_HAS_USER_TV_MODES
469    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
470    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
471   
472//----------------------------------------------------------
473#elif defined (CAMERA_ixus860_sd870)
474    #define CAM_PROPSET                 2
475    #define CAM_DRYOS                   1
476
477    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
478    #define CAM_RAW_ROWS                2480   // for new 8 MP
479
480    #undef  CAM_USE_ZOOM_FOR_MF
481    #undef  CAM_HAS_ERASE_BUTTON
482    #undef  CAM_HAS_IRIS_DIAPHRAGM
483    #define CAM_HAS_ND_FILTER           1
484    #undef  CAM_HAS_MANUAL_FOCUS
485    #undef  CAM_HAS_USER_TV_MODES
486    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
487        #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1
488    #undef  CAM_CAN_MUTE_MICROPHONE
489   
490//----------------------------------------------------------
491#elif defined (CAMERA_ixus950_sd850)
492    #define CAM_PROPSET                 2
493
494    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
495    #define CAM_RAW_ROWS                2480   // for new 8 MP
496
497    #undef  CAM_USE_ZOOM_FOR_MF
498    #undef  CAM_HAS_ERASE_BUTTON
499    #undef  CAM_HAS_IRIS_DIAPHRAGM
500    #define CAM_HAS_ND_FILTER           1
501    #undef  CAM_HAS_MANUAL_FOCUS
502    #undef  CAM_HAS_USER_TV_MODES
503    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
504    #define CAM_MULTIPART               1
505    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
506   
507//----------------------------------------------------------
508#elif defined (CAMERA_ixus960_sd950)
509    #define CAM_PROPSET                 2
510    #define CAM_DRYOS                   1
511
512    #define CAM_RAW_ROWPIX              4104   
513    #define CAM_RAW_ROWS                3048   
514
515    #undef  CAM_USE_ZOOM_FOR_MF
516    #undef  CAM_HAS_ERASE_BUTTON
517    #undef  CAM_HAS_IRIS_DIAPHRAGM
518    #define CAM_HAS_ND_FILTER           1
519    #undef  CAM_HAS_MANUAL_FOCUS
520    #undef  CAM_HAS_USER_TV_MODES
521    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
522
523//==========================================================
524// S-Series
525//==========================================================
526#elif defined (CAMERA_s2is)
527    #define CAM_PROPSET                 1
528
529    #define CAM_RAW_ROWPIX              2672   // for 5 MP
530    #define CAM_RAW_ROWS                1968   // for 5 MP
531   
532    #undef  CAM_SYNCH   
533    #define CAM_SWIVEL_SCREEN           1
534    #define CAM_ADJUSTABLE_ALT_BUTTON   1
535    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
536    #define  CAM_HAS_VIDEO_BUTTON       1
537
538
539//----------------------------------------------------------
540#elif defined (CAMERA_s3is)
541    #define CAM_PROPSET                 1
542
543    #define CAM_RAW_ROWPIX              2888   // for 6 MP
544    #define CAM_RAW_ROWS                2136   // for 6 MP
545   
546    #undef  CAM_SYNCH 
547    #define CAM_SWIVEL_SCREEN           1
548    #define CAM_ADJUSTABLE_ALT_BUTTON   1
549    #define CAM_MULTIPART               1
550    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
551    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
552    #define  CAM_HAS_VIDEO_BUTTON       1
553
554
555//----------------------------------------------------------
556#elif defined (CAMERA_s5is)
557    #define CAM_PROPSET                 2
558    #define CAM_DRYOS                   1
559
560    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
561    #define CAM_RAW_ROWS                2480   // for new 8 MP
562   
563    #define CAM_SWIVEL_SCREEN           1
564    #define CAM_ADJUSTABLE_ALT_BUTTON   1
565    #undef  CAM_CAN_SD_OVER_NOT_IN_MF
566    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
567    #undef  CAM_CHDK_HAS_EXT_VIDEO_MENU
568    #define  CAM_HAS_VIDEO_BUTTON       1
569
570
571//==========================================================
572// TX-Series
573//==========================================================
574#elif defined (CAMERA_tx1)
575    #define CAM_PROPSET                 2
576   
577    #define CAM_RAW_ROWPIX              3152   // for 7 MP
578    #define CAM_RAW_ROWS                2340   // for 7 MP
579
580    #define CAM_SWIVEL_SCREEN           1
581    #define CAM_HAS_ND_FILTER           1
582    #undef  CAM_HAS_ERASE_BUTTON
583    #undef  CAM_HAS_MANUAL_FOCUS
584    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
585    #define CAM_MULTIPART               1
586    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
587
588//==========================================================
589// SX-Series
590//==========================================================
591#elif defined (CAMERA_sx100is)
592    #define CAM_PROPSET                 2
593    #define CAM_DRYOS                   1
594
595    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
596    #define CAM_RAW_ROWS                2480   // for new 8 MP
597    #undef CAM_SYNCH
598#define CAM_CAN_MUTE_MICROPHONE     1
599#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
600   #define CAM_ADJUSTABLE_ALT_BUTTON   1
601   #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
602
603//----------------------------------------------------------
604
605#else
606    #error camera type not defined
607
608#endif
609
610#endif /* CAMERA_H */
Note: See TracBrowser for help on using the repository browser.