Changeset 617

Timestamp:

12/05/08 05:50:43 (5 years ago)

Author:

phyrephox

Message:

a590:
+ added supposedly correct adresses for PT_PLaysound - now scripts like metronome.lua should work (in general the play_sound function) (thx to fudgey)
+ added right defines & dng stuff into camera.h, now generating of dngs should be possible (thx to stanislas, see ​http://chdk.setepontos.com/index.php/topic,2710.msg25436.html#msg25436)

Location:

trunk

Files:

• include/camera.h (modified) (1 diff)
• platform/a590/sub/100e/stubs_entry_2.S (modified) (1 diff)
• platform/a590/sub/101b/stubs_entry_2.S (modified) (1 diff)

trunk/include/camera.h

@@ -386 +386 @@
 //----------------------------------------------------------
 #elif defined (CAMERA_a590)
-    #define CAM_PROPSET                 2
-    #define CAM_DRYOS                   1
-
-    #define CAM_RAW_ROWPIX              3336   // for new 8 MP
-    #define CAM_RAW_ROWS                2480    // for new 8 MP
-    #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
-        // TODO / test
-    #define  CAM_CAN_MUTE_MICROPHONE 1
+#define CAM_PROPSET                 2
+#define CAM_DRYOS                   1
+
+#define CAM_RAW_ROWPIX              3336   // for new 8 MP
+#define CAM_RAW_ROWS                2480   // for new 8 MP
+
+#define CAM_USE_ZOOM_FOR_MF         1      // Zoom lever can be used for manual focus adjustments
+
+// cannot mute during video-zoom through CHDK, it can mute in general firmware settings (non CHDK)
+#undef  CAM_CAN_MUTE_MICROPHONE            // Camera has no function to mute microphone
+
+#define CAM_HAS_IRIS_DIAPHRAGM      1      // it has a 6 blade iris diaphragm
+#undef  CAM_HAS_ND_FILTER
+
+#define CAM_HAS_MANUAL_FOCUS        1      // Camera has manual focus mode
+
+#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1   // Camera adapts focus in video recording
+#define CAM_EV_IN_VIDEO             1      // cam can change exposure in video mode
+#define DNG_SUPPORT                 1
+// pattern
+// It has indeed Green Blue Red Green, so that makes 01 00 02 01
+#define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
+// color 
+#define CAM_COLORMATRIX1                               \
+0.647380, 1000000, -0.169846, 1000000, -0.115337, 1000000, \
+-0.011566, 1000000, 0.451223, 1000000, 0.013279, 1000000, \
+0.062541, 1000000, 0.054140, 1000000, 0.161148, 1000000
+
+#define cam_CalibrationIlluminant1 1 // Daylight
+// cropping
+#define CAM_JPEG_WIDTH  3264
+#define CAM_JPEG_HEIGHT 2448
+#define CAM_ACTIVE_AREA_X1 10
+#define CAM_ACTIVE_AREA_Y1 8
+#define CAM_ACTIVE_AREA_X2 3302
+#define CAM_ACTIVE_AREA_Y2 2474
+
+// camera name
+#define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+
 
 //----------------------------------------------------------

trunk/platform/a590/sub/100e/stubs_entry_2.S

@@ -91 +91 @@
 NSTUB(taskSuspend,                       0xFFC00948)
 NHSTUB(SetZoomActuatorSpeedPercent, 0xFFC00948)
-NHSTUB(PT_PlaySound, 0xFFC00948)
+NHSTUB(PT_PlaySound, 0xffc4cedc)
 NHSTUB(GetBatteryTemperature,   0xFFC377B4)
 NHSTUB(GetOpticalTemperature,   0xFFC37824)

trunk/platform/a590/sub/101b/stubs_entry_2.S

@@ -16 +16 @@
 NSTUB(PhySw_testgpio,                           0xFFC356EC)
 NSTUB(PostLEDMessage,                   0xFFC34B78)
-NHSTUB(PT_PlaySound,                            0xFFC00948)
+NHSTUB(PT_PlaySound,                                    0xffc4cedc)
 NSTUB(taskcreate_AudioTsk,                      0xFFC3591C)
 NSTUB(TurnOnBackLight,                          0xFFC6C558)