Changeset 1136 for trunk

Timestamp:

04/10/11 06:38:25 (2 years ago)

Author:

reyalP

Message:

a580 work in progress, not added to batch builds. From various authors in ​http://chdk.setepontos.com/index.php?topic=2900.105 via horape in ​http://chdk.setepontos.com/index.php?topic=650.msg64412#msg64412

Location:

trunk

Files:

• core/kbd.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• loader/a580 (added)
• loader/a580/Makefile (added)
• loader/a580/blobs.S (added)
• loader/a580/entry.S (added)
• loader/a580/main.c (added)
• loader/a580/resetcode (added)
• loader/a580/resetcode/Makefile (added)
• loader/a580/resetcode/entry.S (added)
• loader/a580/resetcode/main.c (added)
• platform/a580 (added)
• platform/a580/Makefile (added)
• platform/a580/kbd.c (added)
• platform/a580/lib.c (added)
• platform/a580/main.c (added)
• platform/a580/shooting.c (added)
• platform/a580/sub (added)
• platform/a580/sub/101b (added)
• platform/a580/sub/101b/Makefile (added)
• platform/a580/sub/101b/boot.c (added)
• platform/a580/sub/101b/capt_seq.c (added)
• platform/a580/sub/101b/lib.c (added)
• platform/a580/sub/101b/makefile.inc (added)
• platform/a580/sub/101b/movie_rec.c (added)
• platform/a580/sub/101b/stubs_asm.h (added)
• platform/a580/sub/101b/stubs_auto.S (added)
• platform/a580/sub/101b/stubs_entry.S (added)
• platform/a580/sub/101b/stubs_entry_2.S (added)
• platform/a580/sub/101b/stubs_min.S (added)
• platform/a580/sub/Makefile (added)
• platform/a580/wrappers.c (added)

trunk/core/kbd.c

@@ -41 +41 @@
 #endif
 
-#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200)
+#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) || defined(CAMERA_a580)
 #define ZSTEP_TABLE_SIZE 7
 static int nTxtbl[]={0,1,2,3,4,5,6};    // remote zoom steps (we need a distinct number of steps, even if the camera zooms smoothly)

trunk/include/camera.h

@@ -652 +652 @@
 #define CAM_MULTIPART               1
 #define  CAM_CHDK_PTP               1 // include CHDK PTP support
+//----------------------------------------------------------
+
+#elif defined (CAMERA_a580)
+#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
+
+#undef CAM_CAN_MUTE_MICROPHONE
+#define CAM_HAS_IRIS_DIAPHRAGM      1
+#undef  CAM_HAS_ND_FILTER
+
+#define CAM_HAS_MANUAL_FOCUS        1
+
+#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+//#define CAM_EV_IN_VIDEO             1      // not working on 101b!!!
+#define DNG_SUPPORT                 1
+// pattern
+#define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green
+// color
+#define CAM_COLORMATRIX1                              \
+ 726857, 1000000, -176454, 1000000, -124118, 1000000, \
+ -71340, 1000000,  592001, 1000000,   75622, 1000000, \
+  63222, 1000000,   50547, 1000000,  219582, 1000000
+
+#define cam_CalibrationIlluminant1 1 // Daylight
+// cropping
+#define CAM_JPEG_WIDTH  3264
+#define CAM_JPEG_HEIGHT 2448
+#define CAM_ACTIVE_AREA_X1 12
+#define CAM_ACTIVE_AREA_Y1 10
+// note: the above contains some pixels which have valid data,
+// but are not at the same levels as the rest of the frame
+// the values below crop the "different" looking pixels.
+//#define CAM_ACTIVE_AREA_X1 16
+//#define CAM_ACTIVE_AREA_Y1 18
+#define CAM_ACTIVE_AREA_X2 3300
+#define CAM_ACTIVE_AREA_Y2 2480
+
+// camera name
+#define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+
+#undef CAM_ADJUSTABLE_ALT_BUTTON
+#undef CAM_EXT_TV_RANGE
+//#define CAM_MULTIPART               1
+#undef CAM_MULTIPART
 //----------------------------------------------------------