Changeset 866 for trunk

Timestamp:

12/30/09 22:23:41 (3 years ago)

Author:

fe50

Message:

• added ixus90_sd790 1.00d BETA support, based on the work of: brake, sharky, snc, ehmu; provided by ehmu here: ​http://chdk.setepontos.com/index.php/topic,2187.msg44933.html#msg44933

Notes:

video may be buggy
fast shutter speed overrides (< 1/1500s) doesn't work
colormap probably needs adaptation

• added ixus960_sd950-100c to the makefile (copy of the 100d version, 100c and 100d are identical)

Location:

trunk

Files:

• Makefile (modified) (7 diffs)
• core/kbd.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• loader/ixus90_sd790 (added)
• loader/ixus90_sd790/Makefile (added)
• loader/ixus90_sd790/blobs.S (added)
• loader/ixus90_sd790/entry.S (added)
• loader/ixus90_sd790/main.c (added)
• loader/ixus90_sd790/resetcode (added)
• loader/ixus90_sd790/resetcode/Makefile (added)
• loader/ixus90_sd790/resetcode/entry.S (added)
• loader/ixus90_sd790/resetcode/main.c (added)
• makefile.inc (modified) (1 diff)
• platform/ixus90_sd790 (added)
• platform/ixus90_sd790/Makefile (added)
• platform/ixus90_sd790/kbd.c (added)
• platform/ixus90_sd790/leds.h (added)
• platform/ixus90_sd790/lib.c (added)
• platform/ixus90_sd790/main.c (added)
• platform/ixus90_sd790/notes.txt (added)
• platform/ixus90_sd790/shooting.c (added)
• platform/ixus90_sd790/sub (added)
• platform/ixus90_sd790/sub/100d (added)
• platform/ixus90_sd790/sub/100d/Makefile (added)
• platform/ixus90_sd790/sub/100d/boot.c (added)
• platform/ixus90_sd790/sub/100d/capt_seq.c (added)
• platform/ixus90_sd790/sub/100d/lib.c (added)
• platform/ixus90_sd790/sub/100d/makefile.inc (added)
• platform/ixus90_sd790/sub/100d/movie_rec.c (added)
• platform/ixus90_sd790/sub/100d/stubs_asm.h (added)
• platform/ixus90_sd790/sub/100d/stubs_entry.S (added)
• platform/ixus90_sd790/sub/100d/stubs_entry_2.S (added)
• platform/ixus90_sd790/sub/100d/stubs_min.S (added)
• platform/ixus90_sd790/sub/Makefile (added)
• platform/ixus90_sd790/wrappers.c (added)

trunk/Makefile

@@ -224 +224 @@
         $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub
         $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub
         @echo "**** All firmwares created successfully"
         @echo "**** Copying duplicate Firmwares"
@@ -238 +239 @@
         cp $(topdir)bin/$(VER)-a470-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a470-101a-$(BUILD_NUMBER).zip
         cp $(topdir)bin/$(VER)-sx200is-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx200is-100d-$(BUILD_NUMBER).zip
+        cp $(topdir)bin/$(VER)-ixus960_sd950-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus960_sd950-100c-$(BUILD_NUMBER).zip
         mv $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER)_BETA.zip
@@ -245 +247 @@
         mv $(topdir)bin/$(VER)-ixus980_sd990-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus980_sd990-101b-$(BUILD_NUMBER)_BETA.zip
         mv $(topdir)bin/$(VER)-a2000-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a2000-100c-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/$(VER)-ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus90_sd790-100d-$(BUILD_NUMBER)_BETA.zip
         @echo "**** Done Copying duplicate Firmwares"
         @echo "**** Summary of memisosizes"
@@ -339 +342 @@
         $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete
         $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete
         @echo "**** All zipfiles including firmwares and extra stuff created successfully"
         @echo "**** Copying duplicate Firmwares"
@@ -365 +369 @@
         cp $(topdir)bin/sx200is-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx200is-100d-$(BUILD_NUMBER)-full.zip
         cp $(topdir)bin/sx200is-100c-$(BUILD_NUMBER).zip $(topdir)bin/sx200is-100d-$(BUILD_NUMBER).zip
+        cp $(topdir)bin/ixus960_sd950-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus960_sd950-100c-$(BUILD_NUMBER)-full.zip
+        cp $(topdir)bin/ixus960_sd950-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus960_sd950-100c-$(BUILD_NUMBER).zip
         mv $(topdir)bin/sx1-200h-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx1-200h-$(BUILD_NUMBER)-full_BETA.zip
         mv $(topdir)bin/sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/sx1-200h-$(BUILD_NUMBER)_BETA.zip
@@ -379 +385 @@
         mv $(topdir)bin/a2000-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/a2000-100c-$(BUILD_NUMBER)-full_BETA.zip
         mv $(topdir)bin/a2000-100c-$(BUILD_NUMBER).zip $(topdir)bin/a2000-100c-$(BUILD_NUMBER)_BETA.zip
+        mv $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)-full_BETA.zip
+        mv $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)_BETA.zip
         @echo "**** Done Copying duplicate Firmwares"
         @echo "**** Summary of memisosizes"
@@ -471 +479 @@
         $(MAKE) -s --no-print-directory PLATFORM=sx110is  PLATFORMSUB=100b NO_INC_BUILD=1 clean
         $(MAKE) -s --no-print-directory PLATFORM=sx200is  PLATFORMSUB=100c NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790  PLATFORMSUB=100d NO_INC_BUILD=1 clean
 .PHONY: fir upload

trunk/core/kbd.c

@@ -85 +85 @@
 #endif
 
-#if defined(CAMERA_a460) || defined(CAMERA_a530) || defined (CAMERA_a540) || defined(CAMERA_a550) || defined(CAMERA_a560) || defined(CAMERA_a570) || defined(CAMERA_a590) ||defined(CAMERA_ixus860_sd870) || defined(CAMERA_ixus960_sd950) || defined(CAMERA_ixus80_sd1100) || defined(CAMERA_ixus970_sd890) || defined(CAMERA_ixus980_sd990)
+#if defined(CAMERA_a460) || defined(CAMERA_a530) || defined (CAMERA_a540) || defined(CAMERA_a550) || defined(CAMERA_a560) || defined(CAMERA_a570) || defined(CAMERA_a590) ||defined(CAMERA_ixus860_sd870) || defined(CAMERA_ixus960_sd950) || defined(CAMERA_ixus80_sd1100) || defined(CAMERA_ixus970_sd890) || defined(CAMERA_ixus980_sd990) || defined(CAMERA_ixus90_sd790)
 #define ZSTEP_TABLE_SIZE 8
 static int nTxtbl[]={0,1,2,3,4,5,6,7};

trunk/include/camera.h

@@ -1680 +1680 @@
 
 //    #define DNG_EXT_FROM ".CR2"
+
+//----------------------------------------------------------
+ #elif defined (CAMERA_ixus90_sd790)
+    #define CAM_PROPSET                 2
+    #define CAM_DRYOS                   1
+
+    #define CAM_RAW_ROWPIX              3720
+    #define CAM_RAW_ROWS                2772
+
+    #undef CAM_USE_ZOOM_FOR_MF
+    #undef CAM_HAS_ERASE_BUTTON
+    #define CAM_MULTIPART               1
+    #undef CAM_HAS_IRIS_DIAPHRAGM
+    #undef CAM_HAS_MANUAL_FOCUS
+    #undef CAM_CHDK_HAS_EXT_VIDEO_MENU
+
+    #define CAM_HAS_ND_FILTER           1
+    #undef  CAM_HAS_USER_TV_MODES
+          #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #define CAM_HAS_JOGDIAL             1
+
+    #define DNG_SUPPORT                 1
+    // pattern
+    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue
+    // color
+    #define CAM_COLORMATRIX1                               \
+      650591, 1000000, -199585, 1000000, -123118, 1000000, \
+     -69617,  1000000, 583926,  1000000,  34354,  1000000, \
+     -19113,  1000000, 82163,   1000000, 210786,  1000000
+    #define cam_CalibrationIlluminant1 1 // Daylight
+
+    // cropping 
+    #define CAM_JPEG_WIDTH  3648
+    #define CAM_JPEG_HEIGHT 2736
+    #define CAM_ACTIVE_AREA_X1 6
+    #define CAM_ACTIVE_AREA_Y1 12
+    #define CAM_ACTIVE_AREA_X2 3690
+    #define CAM_ACTIVE_AREA_Y2 2772
+
+    // camera name
+    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #undef  CAM_SENSOR_BITS_PER_PIXEL
+    #undef  CAM_WHITE_LEVEL
+    #undef  CAM_BLACK_LEVEL
+    #define CAM_SENSOR_BITS_PER_PIXEL   12
+    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
+    #define CAM_BLACK_LEVEL             127
 
 //==========================================================

trunk/makefile.inc

@@ -238 +238 @@
 #PLATFORM=a2000
 #PLATFORMSUB=100c
+
+#PLATFORM=ixus90_sd790
+#PLATFORMSUB=100d
 
 MEMISOSIZE="(&_end-&_start)"