Skip to content

Commit a00eb3a

Browse files
committed
added more camera props
1 parent 88938f7 commit a00eb3a

File tree

1 file changed

+49
-26
lines changed

1 file changed

+49
-26
lines changed

platform/m6/platform_camera.h

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,36 +23,59 @@
2323
*/
2424

2525
// from signature finder
26-
#define CAM_DRYOS 1
27-
#define CAM_DRYOS_2_3_R39 1 // Defined for cameras with DryOS version R39 or higher
28-
#define CAM_DRYOS_2_3_R47 1 // Defined for cameras with DryOS version R47 or higher
29-
#define CAM_DRYOS_2_3_R59 1 // Defined for cameras with DryOS version R59 or higher
30-
#define CAM_ILC 1 // Camera has interchangeable lens
31-
#define CAM_HAS_WIFI 1 // Firmware has wifi support
26+
#define CAM_DRYOS 1
27+
#define CAM_DRYOS_2_3_R39 1 // Defined for cameras with DryOS version R39 or higher
28+
#define CAM_DRYOS_2_3_R47 1 // Defined for cameras with DryOS version R47 or higher
29+
#define CAM_DRYOS_2_3_R59 1 // Defined for cameras with DryOS version R59 or higher
30+
#define CAM_ILC 1 // Camera has interchangeable lens
31+
#define CAM_HAS_WIFI 1 // Firmware has wifi support
3232
#undef CAM_UNCACHED_BIT
33-
#define CAM_UNCACHED_BIT 0x40000000 // Found @0xe01e8654
34-
#undef CAM_HAS_ND_FILTER // Camera does not have an ND filter
33+
#define CAM_UNCACHED_BIT 0x40000000 // Found @0xe01e8654
34+
#undef CAM_HAS_ND_FILTER // Camera does not have an ND filter
3535

3636
// handwritten
37-
#define CAM_PROPSET 12
38-
#define CAM_HAS_CMOS 1
39-
40-
#define CAM_RAW_ROWPIX 6112
41-
#define CAM_RAW_ROWS 4060
42-
#define CAM_JPEG_WIDTH 6000
43-
#define CAM_JPEG_HEIGHT 4000
44-
#define CAM_ACTIVE_AREA_X1 84
45-
#define CAM_ACTIVE_AREA_Y1 46
46-
#define CAM_ACTIVE_AREA_X2 6084
47-
#define CAM_ACTIVE_AREA_Y2 4046
37+
#define CAM_PROPSET 12
38+
#define CAM_HAS_CMOS 1
39+
40+
#define CAM_RAW_ROWPIX 6112
41+
#define CAM_RAW_ROWS 4060
42+
#define CAM_JPEG_WIDTH 6000
43+
#define CAM_JPEG_HEIGHT 4000
44+
#define CAM_ACTIVE_AREA_X1 84
45+
#define CAM_ACTIVE_AREA_Y1 46
46+
#define CAM_ACTIVE_AREA_X2 6084
47+
#define CAM_ACTIVE_AREA_Y2 4046
4848
#undef CAM_SENSOR_BITS_PER_PIXEL
49-
#define CAM_SENSOR_BITS_PER_PIXEL 14
50-
#define CAM_DNG_LENS_INFO { 180,10,550,10,35,10,56,10 } // 18-55mm
49+
#define CAM_SENSOR_BITS_PER_PIXEL 14
50+
#define CAM_DNG_LENS_INFO { 180,10,550,10,35,10,56,10 } // 18-55mm
51+
#define cam_CFAPattern 0x02010100
52+
#define cam_CalibrationIlluminant1 17 // Standard light A
53+
#define cam_CalibrationIlluminant2 21 // D65
5154

52-
#define CAM_HAS_CANON_RAW 1
53-
#define CAM_HAS_VIDEO_BUTTON 1
55+
#define CAM_HAS_CANON_RAW 1
56+
#define CAM_ADJUSTABLE_ALT_BUTTON 1
57+
#define CAM_ALT_BUTTON_NAMES { "Playback", "WiFi" }
58+
#define CAM_ALT_BUTTON_OPTIONS { KEY_PLAYBACK, KEY_WIFI }
59+
#define CAM_HAS_VIDEO_BUTTON 1
5460
#undef CAM_HAS_ERASE_BUTTON
5561

56-
#define CAM_3ARG_DebugAssert 1 // confirmed with Ghidra
57-
#define CAM_FILE_COUNTER_IS_VAR 1
58-
#define CAM_DATE_FOLDER_NAMING 0x80
62+
#define CAM_3ARG_DebugAssert 1 // confirmed with Ghidra
63+
#define CAM_FILE_COUNTER_IS_VAR 1
64+
#define CAM_DATE_FOLDER_NAMING 0x80
65+
#define CAM_QUALITY_OVERRIDE 1
66+
#define CAM_CALC_BLACK_LEVEL 1
67+
#define CAM_SHOW_OSD_IN_SHOOT_MENU 1
68+
#define CAM_AV_OVERRIDE_IRIS_FIX 1
69+
#define CAM_DRIVE_MODE_FROM_TIMER_MODE 1
70+
71+
#undef CAM_AF_LED
72+
#define CAM_AF_LED 1
73+
74+
#undef CAM_CIRCLE_OF_CONFUSION
75+
#define CAM_CIRCLE_OF_CONFUSION 19 // APSC - CoC value for camera/sensor (see http://www.dofmaster.com/digital_coc.html)
76+
77+
#define CAM_SD_OVER_IN_AF 1
78+
#define CAM_SD_OVER_IN_MF 1
79+
80+
#undef CAM_USB_EVENTID
81+
#define CAM_USB_EVENTID 0x302 // Levent ID for USB control

0 commit comments

Comments
 (0)