Changeset 1723

Timestamp:

03/11/12 07:38:39 (15 months ago)

Author:

reyalp

Message:

a800 100a port from mland, patch by waterwings in ​http://chdk.setepontos.com/index.php?topic=650.msg81174#msg81174

Location:

trunk

Files:

• camera_list.csv (modified) (1 diff)
• core/gui.c (modified) (1 diff)
• include/modelist.h (modified) (1 diff)
• loader/a800 (added)
• loader/a800/Makefile (added)
• loader/a800/blobs.S (added)
• loader/a800/entry.S (added)
• loader/a800/main.c (added)
• loader/a800/resetcode (added)
• loader/a800/resetcode/Makefile (added)
• loader/a800/resetcode/entry.S (added)
• loader/a800/resetcode/main.c (added)
• platform/a800 (added)
• platform/a800/Makefile (added)
• platform/a800/kbd.c (added)
• platform/a800/lib.c (added)
• platform/a800/main.c (added)
• platform/a800/platform_camera.h (added)
• platform/a800/shooting.c (added)
• platform/a800/sub (added)
• platform/a800/sub/100c (added)
• platform/a800/sub/100c/Makefile (added)
• platform/a800/sub/100c/boot.c (added)
• platform/a800/sub/100c/capt_seq.c (added)
• platform/a800/sub/100c/lib.c (added)
• platform/a800/sub/100c/makefile.inc (added)
• platform/a800/sub/100c/movie_rec.c (added)
• platform/a800/sub/100c/stubs_asm.h (added)
• platform/a800/sub/100c/stubs_auto.S (added)
• platform/a800/sub/100c/stubs_entry.S (added)
• platform/a800/sub/100c/stubs_entry_2.S (added)
• platform/a800/sub/100c/stubs_min.S (added)
• platform/a800/sub/Makefile (added)
• platform/a800/wrappers.c (added)

trunk/camera_list.csv

@@ -42 +42 @@
 a710,100a,,,
 a720,100c,,,
+a800,100c,BETA,,
 d10,100a,BETA,100b,
 g10,102a,,,

trunk/core/gui.c

@@ -2111 +2111 @@
         if (conf.unlock_optical_zoom_for_video && (movie_status==VIDEO_RECORD_IN_PROGRESS) &&  kbd_is_key_clicked(key)){
             short x;
-            get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x));
-            if (x) {
-                get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x));
-    #if defined (CAMERA_s90) || defined (CAMERA_s95) || defined (CAMERA_g12) || defined (CAMERA_a3000)
-        if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium
-    #else
-        if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM;
+     get_property_case(PROPCASE_DIGITAL_ZOOM_STATE, &x, sizeof(x));
+     if (x) {
+      get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x));
+#if defined (CAMERA_s90) || defined (CAMERA_s95) || defined (CAMERA_g12) || defined (CAMERA_a3000) || defined (CAMERA_a800)
+          if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium
+#else
+          if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM;
     #endif
 

trunk/include/modelist.h

@@ -126 +126 @@
     MODE_FIREWORK           , // ixus1000 end
     MODE_LIVE               , // A3300is
-    MODE_DISCREET           , // A3300is
+    MODE_DISCREET                        , // A3300is
+    MODE_BLUR_REDUCTION     , // a800
 };