Changeset 1770 for branches/release-1_0/platform/ixus310_elph500hs/main.c

Timestamp:

03/28/12 08:36:37 (14 months ago)

Author:

philmoz

Message:

Merge CHDK-DE revision 975 into CHDK.

File:

• branches/release-1_0/platform/ixus310_elph500hs/main.c (modified) (1 diff)

branches/release-1_0/platform/ixus310_elph500hs/main.c

@@ -28 +28 @@
 }
 
-// Focus length table in firmware @ 0xFFF4A30C
-#define NUM_FL 64               // 0 - 63, entries in firmware (3 words each entry, first is FL)
-extern int focus_len_table[NUM_FL*3];
+// Focus length table in firmware @0xfff4a30c
+#define NUM_FL      64  // 0 - 63, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
 // Conversion factor lens FL --> 35mm equiv
 // lens      35mm     CF
 // ----      ----     --
-// 4.3       24       (24/4.3) * 430 = 2400  (min FL)
-// 18.8      105      (105/18.8) * 430 = 2401.6  (max FL)
-#define CF_EFL 2402     // rounded up
-#define CF_EFL_DIV 430
+// 4.3       24       ( 24/ 4.3) * 43 = 240  (min FL)
+// 18.8      105      (105/18.8) * 43 = 240.2  (max FL)
+#define CF_EFL      240
+#define CF_EFL_DIV  43
 
-const int zoom_points = NUM_FL;  // OK
+const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        if (zp < 0) zp = 0;
-        else if (zp >= NUM_FL) zp = NUM_FL-1;
-        return focus_len_table[zp*3];
+    if (zp < 0) zp = 0;
+    else if (zp >= NUM_FL) zp = NUM_FL-1;
+    return focus_len_table[zp*NUM_DATA];
 }
 
 int get_zoom_x(int zp) {
-        return get_focal_length(zp)*10/focus_len_table[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }