Changeset 1794

Timestamp:

04/09/12 10:42:51 (14 months ago)

Author:

philmoz

Message:

Merged revision(s) 1793 from branches/release-1_0:

Location:

trunk

Files:

• . (modified) (1 prop)
• camera_list.csv (modified) (1 diff)
• platform/a800/shooting.c (modified) (1 diff)
• platform/a800/sub/100b (copied) (copied from branches/release-1_0/platform/a800/sub/100b)
• platform/ixus120_sd940/platform_camera.h (modified) (1 diff)

trunk/camera_list.csv

@@ -44 +44 @@
 a710,100a,,,
 a720,100c,,,
+a800,100b,BETA,,
 a800,100c,BETA,,
 d10,100a,BETA,100b,

trunk/platform/a800/shooting.c

@@ -110 +110 @@
 
 #if defined(CAM_DATE_FOLDER_NAMING)
-void get_target_dir_name(char *out) {
+// A800 uses date to name directory
+void get_target_dir_name(char *out) 
+{
     extern void _GetImageFolder(char*,int,int,int);
-    out[0] = 'A';
-    _GetImageFolder(out+1,get_file_next_counter(),CAM_DATE_FOLDER_NAMING,time(NULL));
-    out[15] = '\0';
+        _GetImageFolder(out,get_file_next_counter(),0x400,time(NULL));
 }
 #else

trunk/platform/ixus120_sd940/platform_camera.h

@@ -38 +38 @@
     #define CAM_UNCACHED_BIT                0x40000000
     #define CAM_HAS_ND_FILTER               1
-
+    #undef CAM_HAS_ERASE_BUTTON    // Camera does not have a dedicated erase button
+   
     #define CAM_DNG_LENS_INFO               { 50,10, 200,10, 28,10, 59,10 } // See comments in camera.h
     // pattern