Changeset 1814

Timestamp:

04/22/12 01:32:32 (14 months ago)

Author:

reyalp

Message:

updating live view branch with trunk changes up to r1811

Location:

branches/reyalp-ptp-live

Files:

• . (modified) (1 prop)
• CHDK/DATA/GPS_Kreis.txt (copied) (copied from trunk/CHDK/DATA/GPS_Kreis.txt)
• CHDK/DATA/GPS_Pfeil.txt (copied) (copied from trunk/CHDK/DATA/GPS_Pfeil.txt)
• CHDK/DATA/GPS_Sat.txt (copied) (copied from trunk/CHDK/DATA/GPS_Sat.txt)
• CHDK/DATA/GPS_Track_1.txt (copied) (copied from trunk/CHDK/DATA/GPS_Track_1.txt)
• CHDK/DATA/GPS_Track_2.txt (copied) (copied from trunk/CHDK/DATA/GPS_Track_2.txt)
• CHDK/DATA/GPS_Track_3.txt (copied) (copied from trunk/CHDK/DATA/GPS_Track_3.txt)
• CHDK/DATA/logo.dat (deleted)
• CHDK/LANG/english.lng (modified) (2 diffs)
• CHDK/LANG/german.lng (modified) (1 diff)
• CHDK/Makefile (modified) (2 diffs)
• CHDK/logo.dat (copied) (copied from trunk/CHDK/logo.dat)
• CHDK/logo_de.dat (copied) (copied from trunk/CHDK/logo_de.dat)
• Makefile (modified) (3 diffs)
• buildconf.inc (modified) (3 diffs)
• camera_list.csv (modified) (4 diffs)
• chdk_ver.inc (deleted)
• core/conf.c (modified) (5 diffs)
• core/dng.c (modified) (21 diffs)
• core/gui.c (modified) (5 diffs)
• core/gui_draw.c (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/modules.c (modified) (1 diff)
• core/raw.c (modified) (2 diffs)
• core/shooting.c (modified) (2 diffs)
• include/camera.h (modified) (1 diff)
• include/conf.h (modified) (2 diffs)
• include/propset1.h (modified) (1 diff)
• include/propset2.h (modified) (1 diff)
• loader/g1x (copied) (copied from trunk/loader/g1x)
• loader/s100 (copied) (copied from trunk/loader/s100)
• makefile.inc (modified) (3 diffs)
• platform/a1000/main.c (modified) (1 diff)
• platform/a1100/main.c (modified) (1 diff)
• platform/a2000/main.c (modified) (1 diff)
• platform/a3000/main.c (modified) (1 diff)
• platform/a3300/main.c (modified) (1 diff)
• platform/a3300/sub/100a/stubs_entry.S (modified) (1 diff)
• platform/a3300/sub/100c/stubs_entry.S (modified) (1 diff)
• platform/a3300/sub/100d/stubs_entry.S (modified) (1 diff)
• platform/a480/main.c (modified) (1 diff)
• platform/a490/main.c (modified) (1 diff)
• platform/a495/main.c (modified) (1 diff)
• platform/a580/main.c (modified) (1 diff)
• platform/a590/main.c (modified) (1 diff)
• platform/a720/main.c (modified) (1 diff)
• platform/a800/main.c (modified) (1 diff)
• platform/a800/shooting.c (modified) (1 diff)
• platform/a800/sub/100b (copied) (copied from trunk/platform/a800/sub/100b)
• platform/a800/sub/100c/stubs_entry.S (modified) (1 diff)
• platform/d10/main.c (modified) (1 diff)
• platform/g10/main.c (modified) (1 diff)
• platform/g11/main.c (modified) (1 diff)
• platform/g12/main.c (modified) (1 diff)
• platform/g12/sub/100c/stubs_entry.S (modified) (1 diff)
• platform/g12/sub/100c/stubs_min.S (modified) (1 diff)
• platform/g12/sub/100e/stubs_entry.S (modified) (1 diff)
• platform/g12/sub/100e/stubs_min.S (modified) (1 diff)
• platform/g12/sub/100f/stubs_entry.S (modified) (1 diff)
• platform/g12/sub/100f/stubs_min.S (modified) (1 diff)
• platform/g12/sub/100g/stubs_entry.S (modified) (1 diff)
• platform/g12/sub/100g/stubs_min.S (modified) (1 diff)
• platform/g1x (copied) (copied from trunk/platform/g1x)
• platform/ixus1000_sd4500/main.c (modified) (1 diff)
• platform/ixus1000_sd4500/platform_camera.h (modified) (1 diff)
• platform/ixus1000_sd4500/sub/100d/stubs_entry.S (modified) (1 diff)
• platform/ixus1000_sd4500/sub/100f/stubs_entry.S (modified) (1 diff)
• platform/ixus1000_sd4500/sub/102b (copied) (copied from trunk/platform/ixus1000_sd4500/sub/102b)
• platform/ixus100_sd780/main.c (modified) (1 diff)
• platform/ixus120_sd940/main.c (modified) (1 diff)
• platform/ixus120_sd940/platform_camera.h (modified) (1 diff)
• platform/ixus200_sd980/main.c (modified) (1 diff)
• platform/ixus200_sd980/platform_camera.h (modified) (1 diff)
• platform/ixus220_elph300hs/main.c (modified) (1 diff)
• platform/ixus220_elph300hs/sub/100c/stubs_entry.S (modified) (1 diff)
• platform/ixus220_elph300hs/sub/101a/stubs_entry.S (modified) (1 diff)
• platform/ixus220_elph300hs/sub/101c/stubs_entry.S (modified) (1 diff)
• platform/ixus220_elph300hs/sub/101g/stubs_entry.S (modified) (1 diff)
• platform/ixus230_elph310hs/main.c (modified) (1 diff)
• platform/ixus230_elph310hs/sub/100b/stubs_entry.S (modified) (1 diff)
• platform/ixus300_sd4000/main.c (modified) (1 diff)
• platform/ixus300_sd4000/platform_camera.h (modified) (1 diff)
• platform/ixus310_elph500hs/main.c (modified) (1 diff)
• platform/ixus310_elph500hs/sub/100a/stubs_entry.S (modified) (1 diff)
• platform/ixus310_elph500hs/sub/100a/stubs_min.S (modified) (1 diff)
• platform/ixus310_elph500hs/sub/101a/stubs_entry.S (modified) (1 diff)
• platform/ixus310_elph500hs/sub/101a/stubs_min.S (modified) (1 diff)
• platform/ixus310_elph500hs/sub/101c/stubs_entry.S (modified) (1 diff)
• platform/ixus310_elph500hs/sub/101c/stubs_min.S (modified) (1 diff)
• platform/ixus85_sd770/main.c (modified) (1 diff)
• platform/ixus860_sd870/main.c (modified) (1 diff)
• platform/ixus95_sd1200/main.c (modified) (1 diff)
• platform/ixus960_sd950/main.c (modified) (1 diff)
• platform/ixus970_sd890/main.c (modified) (1 diff)
• platform/ixus980_sd990/main.c (modified) (1 diff)
• platform/s100 (copied) (copied from trunk/platform/s100)
• platform/s95/main.c (modified) (1 diff)
• platform/s95/sub/100e/stubs_entry.S (modified) (1 diff)
• platform/s95/sub/100h/stubs_entry.S (modified) (1 diff)
• platform/s95/sub/100i/stubs_entry.S (modified) (1 diff)
• platform/s95/sub/100k/stubs_entry.S (modified) (1 diff)
• platform/sx100is/main.c (modified) (1 diff)
• platform/sx110is/main.c (modified) (1 diff)
• platform/sx120is/main.c (modified) (1 diff)
• platform/sx130is/main.c (modified) (1 diff)
• platform/sx130is/sub/101c/stubs_entry.S (modified) (1 diff)
• platform/sx130is/sub/101d/stubs_entry.S (modified) (1 diff)
• platform/sx130is/sub/101f/stubs_entry.S (modified) (1 diff)
• platform/sx150is/kbd.c (modified) (6 diffs)
• platform/sx150is/main.c (modified) (1 diff)
• platform/sx150is/notes.txt (modified) (1 diff)
• platform/sx150is/platform_camera.h (modified) (1 diff)
• platform/sx150is/sub/100a/stubs_entry.S (modified) (1 diff)
• platform/sx220hs/kbd.c (modified) (2 diffs)
• platform/sx220hs/main.c (modified) (1 diff)
• platform/sx220hs/notes.txt (modified) (1 diff)
• platform/sx220hs/platform_camera.h (modified) (1 diff)
• platform/sx220hs/sub/100a/stubs_entry.S (modified) (1 diff)
• platform/sx220hs/sub/100a/stubs_min.S (modified) (1 diff)
• platform/sx220hs/sub/101a/stubs_entry.S (modified) (1 diff)
• platform/sx220hs/sub/101a/stubs_min.S (modified) (1 diff)
• platform/sx220hs/sub/101b/stubs_entry.S (modified) (1 diff)
• platform/sx220hs/sub/101b/stubs_min.S (modified) (1 diff)
• platform/sx230hs/kbd.c (modified) (3 diffs)
• platform/sx230hs/main.c (modified) (1 diff)
• platform/sx230hs/notes.txt (modified) (1 diff)
• platform/sx230hs/sub/100c/stubs_entry.S (modified) (1 diff)
• platform/sx230hs/sub/101a/stubs_entry.S (modified) (1 diff)
• platform/sx230hs/sub/101b/stubs_entry.S (modified) (1 diff)
• platform/sx30/kbd.c (modified) (1 diff)
• platform/sx30/main.c (modified) (1 diff)
• platform/sx30/platform_camera.h (modified) (1 diff)
• platform/sx30/sub/100e/stubs_entry.S (modified) (1 diff)
• platform/sx30/sub/100e/stubs_min.S (modified) (1 diff)
• platform/sx30/sub/100h/stubs_entry.S (modified) (1 diff)
• platform/sx30/sub/100h/stubs_min.S (modified) (1 diff)
• platform/sx30/sub/100l/stubs_entry.S (modified) (1 diff)
• platform/sx30/sub/100l/stubs_min.S (modified) (1 diff)
• platform/sx30/sub/100n/stubs_entry.S (modified) (1 diff)
• platform/sx30/sub/100n/stubs_min.S (modified) (1 diff)
• platform/sx30/sub/100p/stubs_entry.S (modified) (1 diff)
• platform/sx30/sub/100p/stubs_min.S (modified) (1 diff)
• platform/sx40hs/kbd.c (modified) (1 diff)
• platform/sx40hs/main.c (modified) (1 diff)
• platform/sx40hs/platform_camera.h (modified) (1 diff)
• platform/sx40hs/sub/100d/stubs_entry.S (modified) (1 diff)
• platform/sx40hs/sub/100d/stubs_min.S (modified) (1 diff)
• platform/sx40hs/sub/100f/stubs_entry.S (modified) (1 diff)
• platform/sx40hs/sub/100f/stubs_min.S (modified) (1 diff)
• platform/sx40hs/sub/100g/stubs_entry.S (modified) (1 diff)
• platform/sx40hs/sub/100g/stubs_min.S (modified) (1 diff)
• platform/sx40hs/sub/100i/stubs_entry.S (modified) (1 diff)
• platform/sx40hs/sub/100i/stubs_min.S (modified) (1 diff)
• tools/dancingbits.h (modified) (2 diffs)
• tools/finsig_dryos.c (modified) (38 diffs)

branches/reyalp-ptp-live/CHDK/LANG/english.lng

@@ -436 +436 @@
 335 "Mute during zooming"
 
-336 "Bad pixel removal"
+336 "Manual bad pixel removal"
 337 "Off"
 338 "Averag."
@@ -672 +672 @@
 
 551 "Enable script start"
+
+552 "Disable Zoom Assist button"
+
+553 "DNG version"

branches/reyalp-ptp-live/CHDK/LANG/german.lng

@@ -685 +685 @@
 
 550 "Abbruch mit [Auslöser halb]"
+
+551 "Skript-Start an/aus"
+
+552 "Taste Zoom-Assistent deaktivieren"
+
+553 "DNG-Version"

branches/reyalp-ptp-live/CHDK/Makefile

@@ -1 +1 @@
 topdir=../
 include $(topdir)makefile.inc
+
+ifndef OPT_DE_VERSION
+LOGO=logo.dat
+else
+LOGO=logo_de.dat
+endif
 
 GENLUA=LUALIB/GEN/propset1.lua LUALIB/GEN/propset2.lua LUALIB/GEN/propset3.lua LUALIB/GEN/propset4.lua LUALIB/GEN/modelist.lua
 # generate some lua files from CHDK source
 all: $(GENLUA)
+        @echo "copy" $(LOGO)
+        mkdir -p $(topdir)CHDK/DATA
+        cp $(topdir)CHDK/$(LOGO) $(topdir)CHDK/DATA/$(LOGO)
 
 LUALIB/GEN/propset1.lua:  $(topdir)include/propset1.h
@@ -28 +37 @@
 clean:
         rm -f $(GENLUA)
+        rm -f $(topdir)CHDK/DATA/$(LOGO)
         rm -f MODULES/*.flt
 

branches/reyalp-ptp-live/Makefile

@@ -22 +22 @@
 endif
 tmp:=$(shell echo "BUILD_SVNREV := $(BUILD_SVNREV)" > revision.inc)
+
+# CHDK folder for full package
+ZIPDIRS:=$(shell ls -R CHDK | grep CHDK/ | $(ESED) 's?:?/*?')
 
 SUBDIRS=tools lib platform core loader CHDK
@@ -133 +136 @@
         LANG=C echo -e "CHDK-$(VER) for $(PLATFORM) fw:$(PLATFORMSUB) build:$(BUILD_NUMBER)$(STATE) date:`date -R`" | \
         zip -9jz $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)bin/DISKBOOT.BIN > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SYMBOLS/*  > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/BOOKS/*  > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/CURVES/*  > $(DEVNULL)
-    ifeq ($(VER),CHDK-DE)
-                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/CURVES/ISOBoost/*  > $(DEVNULL)
-    endif
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/DATA/*  > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/FONTS/*  > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/GAMES/*   > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/GRIDS/* > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/LANG/*   > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/LUALIB/*   > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/LUALIB/GEN/*   > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/*  > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EXAM/*     > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/TEST/*     > $(DEVNULL)
-    ifeq ($(VER),CHDK-DE)
-                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/MD/*   > $(DEVNULL)
-                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/CURV/*     > $(DEVNULL)
-                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/USER/* > $(DEVNULL)
-    else
-                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/SCRIPTS/EDITOR/*   > $(DEVNULL)
-    endif
+        $(foreach ZIPDIR, $(ZIPDIRS), \
+                zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)$(ZIPDIR) > $(DEVNULL) ; \
+        )
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/syscurves.CVF      > $(DEVNULL)
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)doc/changelog.txt  > $(DEVNULL)
@@ -163 +146 @@
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
         zip -9j $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)doc/readme.txt  > $(DEVNULL)
-        zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)-full$(STATE).zip $(topdir)CHDK/MODULES/*  > $(DEVNULL)
         zip -9 $(topdir)bin/$(PLATFORM)-$(PLATFORMSUB)-$(BUILD_NUMBER)$(STATE).zip $(topdir)CHDK/MODULES/*  > $(DEVNULL)
 

branches/reyalp-ptp-live/buildconf.inc

@@ -16 +16 @@
 # WARNING: This is DANGEROUS. e.g. call_event_proc("EraseSectorOfRom",...)
 # NOTE: the interface for this may change in the future, to support better support buffers etc
-ifeq ($(VER),CHDK-DE)
-OPT_LUA_CALL_NATIVE=1
-endif
+#OPT_LUA_CALL_NATIVE=1
 
 # experimental - allocate memory from alternate heap. Default 2MB from EXMEM_RAMDISK
@@ -46 +44 @@
 # for people who won't use lang files at all / not done yet
 #!OPT_LANGUAGEINTERFACE=1
+# for CHDK-DE presets without OPT_DEFAULT_LANG
+#OPT_DE_VERSION=1
 
 # Override the value below to compile a different default language into
@@ -51 +51 @@
 # desired language.
 # Set the value to the language file name without extension - e.g. OPT_DEFAULT_LANG=russian
-ifeq ($(VER),CHDK-DE)
-OPT_DEFAULT_LANG=german
-endif
+#OPT_DEFAULT_LANG=
 
-# Default svn revsion. Used when svnversion fail.
+# Default svn revision. Used when svnversion fail.
 DEF_SVN_REF=0

branches/reyalp-ptp-live/camera_list.csv

@@ -44 +44 @@
 a710,100a,,,
 a720,100c,,,
+a800,100b,BETA,,
 a800,100c,BETA,,
 d10,100a,BETA,100b,
@@ -56 +57 @@
 g12,100f,,,
 g12,100g,,,
+g1x,100f,ALPHA,,
 g7,100e,,,
 g7,100g,,,
@@ -65 +67 @@
 ixus1000_sd4500,100d,BETA,,
 ixus1000_sd4500,100f,BETA,,
+ixus1000_sd4500,102b,BETA,,
 ixus100_sd780,100b,BETA,,
 ixus100_sd780,100c,BETA,,
@@ -141 +144 @@
 s95,100i,BETA,,
 s95,100k,BETA,,
+s100,100d,ALPHA,,
+s100,100e,ALPHA,,
+s100,101a,ALPHA,,
 sx1,200h,BETA,,
 sx1,201a,BETA,,

branches/reyalp-ptp-live/core/conf.c

@@ -375 +375 @@
     //CONF_INFO(224, conf.edge_overlay_zoom,          CONF_DEF_VALUE, i:1, NULL),               // moved to edge overlay module
     CONF_INFO(225, conf.raw_cache,                  CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(226, conf.dng_raw,                    CONF_DEF_VALUE, i:0, conf_change_dng),
+    CONF_INFO(226, conf.dng_raw,                    CONF_DEF_VALUE, i:1, conf_change_dng),
     CONF_INFO(227, conf.flash_sync_curtain,         CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(228, conf.raw_timer,                  CONF_DEF_VALUE, i:0, NULL),
@@ -383 +383 @@
     CONF_INFO(232, conf.flash_video_override,       CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(233, conf.flash_video_override_power, CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(234, conf.raw_dng_ext,                CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(234, conf.raw_dng_ext,                CONF_DEF_VALUE, i:1, NULL),
     CONF_INFO(235, conf.dng_usb_ext,                CONF_DEF_VALUE, i:0, conf_change_dng_ext),
     CONF_INFO(236, conf.flash_manual_override,      CONF_DEF_VALUE, i:0, NULL),
@@ -454 +454 @@
     CONF_INFO(286, conf.overexp_threshold,          CONF_DEF_VALUE,     i:5, NULL),
     CONF_INFO(287, conf.overexp_ev_enum,            CONF_DEF_VALUE,     i:3, conf_change_autoiso),
+
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    CONF_INFO(288, conf.zoom_assist_button_disable, CONF_DEF_VALUE,     i:0, NULL),
+#endif
+
+    CONF_INFO(289, conf.dng_version,                CONF_DEF_VALUE,     i:0, conf_change_dng),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))
@@ -472 +478 @@
     case 194: conf_change_script_file(); break;
     case 2:
-    case 226: conf_change_dng(); break;
+    case 226: 
+    case 289: conf_change_dng(); break;
     case 235: conf_change_dng_ext(); break;
     case 284: conf_change_autoiso(); break;
@@ -514 +521 @@
 void conf_change_dng(void){
 #if DNG_SUPPORT
- if (conf.save_raw && conf.dng_raw) {
+ if (conf.save_raw && conf.dng_raw && conf.dng_version) {
         if ( !module_dng_load(LIBDNG_OWNED_BY_RAW) )
-                return;
-        if (!libdng->badpixel_list_loaded_b()) libdng->load_bad_pixels_list_b("A/CHDK/badpixel.bin");
-        if (!libdng->badpixel_list_loaded_b()) conf.dng_raw=0;
+        return;
+    if (!libdng->badpixel_list_loaded_b()) libdng->load_bad_pixels_list_b("A/CHDK/badpixel.bin");
+    if (!libdng->badpixel_list_loaded_b()) conf.dng_version=0;
  }
  else if ( libdng && libdng->load_bad_pixels_list_b ) {
-        libdng->load_bad_pixels_list_b(0);        //unload badpixel.bin
+    libdng->load_bad_pixels_list_b(0);        //unload badpixel.bin
         module_dng_unload(LIBDNG_OWNED_BY_RAW);
  }

branches/reyalp-ptp-live/core/dng.c

@@ -20 +20 @@
 struct dir_entry{unsigned short tag; unsigned short type; unsigned int count; unsigned int offset;};
 
-#define T_END       0
 #define T_BYTE      1
 #define T_ASCII     2
@@ -34 +33 @@
 #define T_DOUBLE    12
 #define T_PTR       0x100   // Stored as long/short etc in DNG header, referenced by pointer in IFD (must be pointer to int variable)
+#define T_SKIP      0x200   // Tag value to be skipped (for marking GPS entries if camera does not have GPS)
 
 unsigned short get_exp_program_for_exif(int exp_program);
@@ -48 +48 @@
 const char cam_chdk_ver[]               = HDK_VERSION" ver. "BUILD_NUMBER;
 const int cam_Resolution[]              = {180,1};
-int cam_AsShotNeutral[]                 = {1000,1000,1000,1000,1000,1000};
+static int cam_AsShotNeutral[]          = {1000,1000,1000,1000,1000,1000};
+static char cam_datetime[20]            = "";                   // DateTimeOriginal
+static int cam_shutter[2]               = { 0, 1000000 };       // Shutter speed
+static int cam_aperture[2]              = { 0, 10 };            // Aperture
+static int cam_apex_shutter[2]          = { 0, 96 };            // Shutter speed in APEX units
+static int cam_apex_aperture[2]         = { 0, 96 };            // Aperture in APEX units
+static int cam_exp_bias[2]              = { 0, 96 };
+static int cam_max_av[2]                = { 0, 96 };
+static int cam_focal_length[2]          = { 0, 1000 };
 
 struct t_data_for_exif{
- short iso;
- int exp_program;
- int effective_focal_length;
- short orientation;
- short flash_mode;
- short flash_fired;
- short metering_mode;
+    short iso;
+    int exp_program;
+    int effective_focal_length;
+    short orientation;
+    short flash_mode;
+    short flash_fired;
+    short metering_mode;
 };
 
 static struct t_data_for_exif exif_data;
 
+#define BE(v)   ((v&0x000000FF)<<24)|((v&0x0000FF00)<<8)|((v&0x00FF0000)>>8)|((v&0xFF000000)>>24)   // Convert to big_endian
+
+static unsigned int badpixel_opcode[] =
+{
+    // *** all values must be in big endian order
+
+    BE(1),              // Count = 1
+
+    BE(4),              // FixBadPixelsConstant = 4
+    BE(0x01030000),     // DNG version = 1.3.0.0
+    BE(1),              // Flags = 1
+    BE(8),              // Opcode length = 8 bytes
+    BE(0),              // Constant = 0
+#if   cam_CFAPattern == 0x02010100
+    BE(1),              // BayerPhase = 1 (top left pixel is green in a green/red row)
+#elif cam_CFAPattern == 0x01020001
+    BE(0),              // BayerPhase = 0 (top left pixel is red)
+#elif cam_CFAPattern == 0x01000201
+    BE(3),              // BayerPhase = 3 (top left pixel is blue)
+#elif cam_CFAPattern == 0x00010102
+    BE(2),              // BayerPhase = 2 (top left pixel is green in a green/blue row)
+#endif
+};
+
 // warning: according to TIFF format specification, elements must be sorted by tag value in ascending order!
 
-struct dir_entry IFD0[]={
- {0xFE,   T_LONG,       1,  1},                                 // NewSubFileType: Preview Image
- {0x100,  T_LONG,       1,  DNG_TH_WIDTH},                      // ImageWidth
- {0x101,  T_LONG,       1,  DNG_TH_HEIGHT},                     // ImageLength
- {0x102,  T_SHORT,      3,  (int)cam_PreviewBitsPerSample},     // BitsPerSample: 8,8,8
- {0x103,  T_SHORT,      1,  1},                                 // Compression: Uncompressed
- {0x106,  T_SHORT,      1,  2},                                 //PhotometricInterpretation: RGB
- {0x10E,  T_ASCII,      1,  0},                                 // ImageDescription
- {0x10F,  T_ASCII,      sizeof(CAM_MAKE), (int)CAM_MAKE},       // Make
- {0x110,  T_ASCII,      32, (int)cam_name},                     //Model: Filled at header generation.
- {0x111,  T_LONG,       1,  0},                                 //StripOffsets: Offset
- {0x112,  T_SHORT,      1,  1},                                 //Orientation: 1 - 0th row is top, 0th column is left
- {0x115,  T_SHORT,      1,  3},                                 // SamplesPerPixel: 3
- {0x116,  T_SHORT,      1,  DNG_TH_HEIGHT},                     //RowsPerStrip
- {0x117,  T_LONG,       1,  DNG_TH_WIDTH*DNG_TH_HEIGHT*3},      // StripByteCounts = preview size
- {0x11C,  T_SHORT,      1,  1},                                 // PlanarConfiguration: 1
- {0x131,  T_ASCII,      sizeof(cam_chdk_ver), (int)cam_chdk_ver},//Software
- {0x132,  T_ASCII,      20, 0},                                 // DateTime
- {0x14A,  T_LONG,       1,  0},                                 //SubIFDs offset
- {0x8298, T_ASCII,      1,  0},                                 // Copyright
- {0x8769, T_LONG,       1,  0},                                 //EXIF_IFD offset
- {0x8825, T_LONG,       1,  0},                                 //GPS_IFD offset
- {0x9216, T_BYTE,       4,  0x00000001},                        // TIFF/EPStandardID: 1.0.0.0
- {0xC612, T_BYTE,       4,  0x00000101},                        //DNGVersion: 1.1.0.0
- {0xC614, T_ASCII,      32, (int)cam_name},                     //UniqueCameraModel. Filled at header generation.
- {0xC621, T_SRATIONAL,  9,  (int)&camera_sensor.color_matrix1},
- {0xC627, T_RATIONAL,   3,  (int)cam_AnalogBalance},
- {0xC628, T_RATIONAL,   3,  (int)cam_AsShotNeutral},
- {0xC62A, T_SRATIONAL,  1,  (int)&camera_sensor.exposure_bias},
- {0xC62B, T_RATIONAL,   1,  (int)cam_BaselineNoise},
- {0xC62C, T_RATIONAL,   1,  (int)cam_BaselineSharpness},
- {0xC62E, T_RATIONAL,   1,  (int)cam_LinearResponseLimit},
- {0xC630, T_RATIONAL,   4,  (int)&camera_sensor.lens_info},
- {0xC65A, T_SHORT|T_PTR,1,  (int)&camera_sensor.calibration_illuminant1}, 
- {0, T_END}
-};
-
-                                                                                      
-struct dir_entry IFD1[]={
- {0xFE,   T_LONG,       1,  0},                                 // NewSubFileType: Main Image
- {0x100,  T_LONG|T_PTR, 1,  (int)&camera_sensor.raw_rowpix},      // ImageWidth
- {0x101,  T_LONG|T_PTR, 1,  (int)&camera_sensor.raw_rows},        // ImageLength
- {0x102,  T_SHORT|T_PTR,1,  (int)&camera_sensor.bits_per_pixel},  // BitsPerSample
- {0x103,  T_SHORT,      1,  1},                                 // Compression: Uncompressed
- {0x106,  T_SHORT,      1,  0x8023},                            //PhotometricInterpretation: CFA
- {0x111,  T_LONG,       1,  0},                                 //StripOffsets: Offset
- {0x115,  T_SHORT,      1,  1},                                 // SamplesPerPixel: 1
- {0x116,  T_SHORT|T_PTR,1,  (int)&camera_sensor.raw_rows},        //RowsPerStrip
- {0x117,  T_LONG|T_PTR, 1,  (int)&camera_sensor.raw_size},        // StripByteCounts = CHDK RAW size
- {0x11A,  T_RATIONAL,   1,  (int)cam_Resolution},               // XResolution
- {0x11B,  T_RATIONAL,   1,  (int)cam_Resolution},               // YResolution
- {0x11C,  T_SHORT,      1,  1},                                 // PlanarConfiguration: 1
- {0x128,  T_SHORT,      1,  2},                                 // ResolutionUnit: inch
- {0x828D, T_SHORT,      2,  0x00020002},                        // CFARepeatPatternDim: Rows = 2, Cols = 2
- {0x828E, T_BYTE|T_PTR, 4,  (int)&camera_sensor.cfa_pattern},
- {0xC61A, T_LONG|T_PTR, 1,  (int)&camera_sensor.black_level},     // BlackLevel
- {0xC61D, T_LONG|T_PTR, 1,  (int)&camera_sensor.white_level},     // WhiteLevel
- {0xC61F, T_LONG,       2,  (int)&camera_sensor.crop.origin},
- {0xC620, T_LONG,       2,  (int)&camera_sensor.crop.size},
- {0xC68D, T_LONG,       4,  (int)&camera_sensor.dng_active_area},
- {0, T_END}
-};
-
-
-static int cam_shutter[2]       = { 0, 1000000 };       // Shutter speed
-static int cam_aperture[2]      = { 0, 10 };            // Aperture
-static char cam_datetime[20]    = "";                   // DateTimeOriginal
-static int cam_apex_shutter[2]  = { 0, 96 };            // Shutter speed in APEX units
-static int cam_apex_aperture[2] = { 0, 96 };            // Aperture in APEX units
-static int cam_exp_bias[2]      = { 0, 96 };
-static int cam_max_av[2]        = { 0, 96 };
-static int cam_focal_length[2]  = { 0, 1000 };
-
-struct dir_entry EXIF_IFD[]={
- {0x829A, T_RATIONAL,   1,  (int)cam_shutter},          // Shutter speed
- {0x829D, T_RATIONAL,   1,  (int)cam_aperture},         // Aperture
- {0x8822, T_SHORT,      1,  0},                         // ExposureProgram
- {0x8827, T_SHORT|T_PTR,1,  (int)&exif_data.iso},       // ISOSpeedRatings
- {0x9000, T_UNDEFINED,  4,  0x31323230},                // ExifVersion: 2.21
- {0x9003, T_ASCII,      20, (int)cam_datetime},         // DateTimeOriginal
- {0x9201, T_SRATIONAL,  1,  (int)cam_apex_shutter},     // ShutterSpeedValue (APEX units)
- {0x9202, T_RATIONAL,   1,  (int)cam_apex_aperture},    // ApertureValue (APEX units)
- {0x9204, T_SRATIONAL,  1,  (int)cam_exp_bias},         // ExposureBias
- {0x9205, T_RATIONAL,   1,  (int)cam_max_av},           // MaxApertureValue
- {0x9207, T_SHORT,      1,  0},                         // Metering mode
- {0x9209, T_SHORT,      1,  0},                         // Flash mode
- {0x920A, T_RATIONAL,   1,  (int)cam_focal_length},     // FocalLength
- {0xA405, T_SHORT|T_PTR,1,  (int)&exif_data.effective_focal_length},    // FocalLengthIn35mmFilm
- {0, T_END}
+// Index of specific entries in ifd0 below.
+// *** warning - if entries are added or removed these should be updated ***
+#define CAMERA_NAME_INDEX           8       // tag 0x110
+#define THUMB_DATA_INDEX            9       // tag 0x111
+#define ORIENTATION_INDEX           10      // tag 0x112
+#define SUBIFDS_INDEX               17      // tag 0x14A
+#define EXIF_IFD_INDEX              19      // tag 0x8769
+#define GPS_IFD_INDEX               20      // tag 0x8825
+#define DNG_VERSION_INDEX           22      // tag 0xC612
+#define UNIQUE_CAMERA_MODEL_INDEX   23      // tag 0xC614
+
+struct dir_entry ifd0[]={
+    {0xFE,   T_LONG,       1,  1},                                 // NewSubFileType: Preview Image
+    {0x100,  T_LONG,       1,  DNG_TH_WIDTH},                      // ImageWidth
+    {0x101,  T_LONG,       1,  DNG_TH_HEIGHT},                     // ImageLength
+    {0x102,  T_SHORT,      3,  (int)cam_PreviewBitsPerSample},     // BitsPerSample: 8,8,8
+    {0x103,  T_SHORT,      1,  1},                                 // Compression: Uncompressed
+    {0x106,  T_SHORT,      1,  2},                                 // PhotometricInterpretation: RGB
+    {0x10E,  T_ASCII,      1,  0},                                 // ImageDescription
+    {0x10F,  T_ASCII,      sizeof(CAM_MAKE), (int)CAM_MAKE},       // Make
+    {0x110,  T_ASCII,      32, (int)cam_name},                     // Model: Filled at header generation.
+    {0x111,  T_LONG,       1,  0},                                 // StripOffsets: Offset
+    {0x112,  T_SHORT,      1,  1},                                 // Orientation: 1 - 0th row is top, 0th column is left
+    {0x115,  T_SHORT,      1,  3},                                 // SamplesPerPixel: 3
+    {0x116,  T_SHORT,      1,  DNG_TH_HEIGHT},                     // RowsPerStrip
+    {0x117,  T_LONG,       1,  DNG_TH_WIDTH*DNG_TH_HEIGHT*3},      // StripByteCounts = preview size
+    {0x11C,  T_SHORT,      1,  1},                                 // PlanarConfiguration: 1
+    {0x131,  T_ASCII,      sizeof(cam_chdk_ver), (int)cam_chdk_ver},//Software
+    {0x132,  T_ASCII,      20, (int)cam_datetime},                 // DateTime
+    {0x14A,  T_LONG,       1,  0},                                 // SubIFDs offset
+    {0x8298, T_ASCII,      1,  0},                                 // Copyright
+    {0x8769, T_LONG,       1,  0},                                 // EXIF_IFD offset
+    {0x8825, T_LONG,       1,  0},                                 // GPS_IFD offset
+    {0x9216, T_BYTE,       4,  0x00000001},                        // TIFF/EPStandardID: 1.0.0.0
+    {0xC612, T_BYTE,       4,  0x00000301},                        // DNGVersion: 1.3.0.0
+    {0xC614, T_ASCII,      32, (int)cam_name},                     // UniqueCameraModel. Filled at header generation.
+    {0xC621, T_SRATIONAL,  9,  (int)&camera_sensor.color_matrix1},
+    {0xC627, T_RATIONAL,   3,  (int)cam_AnalogBalance},
+    {0xC628, T_RATIONAL,   3,  (int)cam_AsShotNeutral},
+    {0xC62A, T_SRATIONAL,  1,  (int)&camera_sensor.exposure_bias},
+    {0xC62B, T_RATIONAL,   1,  (int)cam_BaselineNoise},
+    {0xC62C, T_RATIONAL,   1,  (int)cam_BaselineSharpness},
+    {0xC62E, T_RATIONAL,   1,  (int)cam_LinearResponseLimit},
+    {0xC630, T_RATIONAL,   4,  (int)&camera_sensor.lens_info},
+    {0xC65A, T_SHORT|T_PTR,1,  (int)&camera_sensor.calibration_illuminant1}, 
+};
+
+// Index of specific entries in ifd1 below.
+// *** warning - if entries are added or removed these should be updated ***
+#define RAW_DATA_INDEX              6       // tag 0x111
+#define BADPIXEL_OPCODE_INDEX       21      // tag 0xC740
+
+struct dir_entry ifd1[]={
+    {0xFE,   T_LONG,       1,  0},                                 // NewSubFileType: Main Image
+    {0x100,  T_LONG|T_PTR, 1,  (int)&camera_sensor.raw_rowpix},    // ImageWidth
+    {0x101,  T_LONG|T_PTR, 1,  (int)&camera_sensor.raw_rows},      // ImageLength
+    {0x102,  T_SHORT|T_PTR,1,  (int)&camera_sensor.bits_per_pixel},// BitsPerSample
+    {0x103,  T_SHORT,      1,  1},                                 // Compression: Uncompressed
+    {0x106,  T_SHORT,      1,  0x8023},                            //PhotometricInterpretation: CFA
+    {0x111,  T_LONG,       1,  0},                                 //StripOffsets: Offset
+    {0x115,  T_SHORT,      1,  1},                                 // SamplesPerPixel: 1
+    {0x116,  T_SHORT|T_PTR,1,  (int)&camera_sensor.raw_rows},      //RowsPerStrip
+    {0x117,  T_LONG|T_PTR, 1,  (int)&camera_sensor.raw_size},      // StripByteCounts = CHDK RAW size
+    {0x11A,  T_RATIONAL,   1,  (int)cam_Resolution},               // XResolution
+    {0x11B,  T_RATIONAL,   1,  (int)cam_Resolution},               // YResolution
+    {0x11C,  T_SHORT,      1,  1},                                 // PlanarConfiguration: 1
+    {0x128,  T_SHORT,      1,  2},                                 // ResolutionUnit: inch
+    {0x828D, T_SHORT,      2,  0x00020002},                        // CFARepeatPatternDim: Rows = 2, Cols = 2
+    {0x828E, T_BYTE|T_PTR, 4,  (int)&camera_sensor.cfa_pattern},
+    {0xC61A, T_LONG|T_PTR, 1,  (int)&camera_sensor.black_level},   // BlackLevel
+    {0xC61D, T_LONG|T_PTR, 1,  (int)&camera_sensor.white_level},   // WhiteLevel
+    {0xC61F, T_LONG,       2,  (int)&camera_sensor.crop.origin},
+    {0xC620, T_LONG,       2,  (int)&camera_sensor.crop.size},
+    {0xC68D, T_LONG,       4,  (int)&camera_sensor.dng_active_area},
+    {0xC740, T_UNDEFINED|T_PTR, sizeof(badpixel_opcode),  (int)&badpixel_opcode},
+};
+
+// Index of specific entries in exif_ifd below.
+// *** warning - if entries are added or removed these should be updated ***
+#define EXPOSURE_PROGRAM_INDEX      2       // tag 0x8822
+#define METERING_MODE_INDEX         10      // tag 0x9207
+#define FLASH_MODE_INDEX            11      // tag 0x9209
+
+struct dir_entry exif_ifd[]={
+    {0x829A, T_RATIONAL,   1,  (int)cam_shutter},          // Shutter speed
+    {0x829D, T_RATIONAL,   1,  (int)cam_aperture},         // Aperture
+    {0x8822, T_SHORT,      1,  0},                         // ExposureProgram
+    {0x8827, T_SHORT|T_PTR,1,  (int)&exif_data.iso},       // ISOSpeedRatings
+    {0x9000, T_UNDEFINED,  4,  0x31323230},                // ExifVersion: 2.21
+    {0x9003, T_ASCII,      20, (int)cam_datetime},         // DateTimeOriginal
+    {0x9201, T_SRATIONAL,  1,  (int)cam_apex_shutter},     // ShutterSpeedValue (APEX units)
+    {0x9202, T_RATIONAL,   1,  (int)cam_apex_aperture},    // ApertureValue (APEX units)
+    {0x9204, T_SRATIONAL,  1,  (int)cam_exp_bias},         // ExposureBias
+    {0x9205, T_RATIONAL,   1,  (int)cam_max_av},           // MaxApertureValue
+    {0x9207, T_SHORT,      1,  0},                         // Metering mode
+    {0x9209, T_SHORT,      1,  0},                         // Flash mode
+    {0x920A, T_RATIONAL,   1,  (int)cam_focal_length},     // FocalLength
+    {0xA405, T_SHORT|T_PTR,1,  (int)&exif_data.effective_focal_length},    // FocalLengthIn35mmFilm
 };
 
 tGPS gps_data;
 
-struct dir_entry GPS_IFD[]={
-  {0x0000, T_BYTE,              4,  0x00000302},                    //GPSVersionID: 2 3 0 0
-  {0x0001, T_ASCII,             2,  (int)gps_data.latitudeRef},     //North or South Latitude "N\0" or "S\0"
-  {0x0002, T_RATIONAL,          3,  (int)gps_data.latitude},        //Latitude
-  {0x0003, T_ASCII,             2,  (int)gps_data.longitudeRef},    //East or West Latitude "E\0" or "W\0"
-  {0x0004, T_RATIONAL,          3,  (int)gps_data.longitude},       //Longitude
-  {0x0005, T_BYTE,              1,  (int)gps_data.heightRef},       //AltitudeRef
-  {0x0006, T_RATIONAL,          1,  (int)gps_data.height},          //Altitude
-  {0x0007, T_RATIONAL,          3,  (int)gps_data.timeStamp},       //TimeStamp
-  {0x0009, T_ASCII,             2,  (int)gps_data.status},          //Status
-//{0x000A, T_ASCII,             1,  0},                             //MeasureMode
-  {0x0012, T_ASCII,             7,  (int)gps_data.mapDatum},        //MapDatum 7 + 1 pad byte
-  {0x001D, T_ASCII,             11, (int)gps_data.dateStamp},       //DateStamp 11 + 1 pad byte
-  {0, T_END}
-};
-
-
-int get_type_size(int type){
- switch(type & 0xFF){
-  case T_BYTE:
-  case T_SBYTE:
-  case T_UNDEFINED:
-  case T_ASCII:     return 1; 
-  case T_SHORT:
-  case T_SSHORT:    return 2;
-  case T_LONG:
-  case T_SLONG:
-  case T_FLOAT:     return 4;
-  case T_RATIONAL:
-  case T_SRATIONAL:
-  case T_DOUBLE:    return 8;
-  default:          return 0;
- }
-}
-
-struct {struct dir_entry* entry; int count;} IFD_LIST[]={{IFD0,0}, {IFD1,0}, {EXIF_IFD,0}, {GPS_IFD, 0}};
-
-#define IFDs (sizeof(IFD_LIST)/sizeof(IFD_LIST[0]))
+struct dir_entry gpd_ifd[]={
+    {0x0000, T_BYTE,              4,  0x00000302},                    //GPSVersionID: 2 3 0 0
+    {0x0001, T_ASCII|T_PTR,       2,  (int)gps_data.latitudeRef},     //North or South Latitude "N\0" or "S\0"
+    {0x0002, T_RATIONAL,          3,  (int)gps_data.latitude},        //Latitude
+    {0x0003, T_ASCII|T_PTR,       2,  (int)gps_data.longitudeRef},    //East or West Latitude "E\0" or "W\0"
+    {0x0004, T_RATIONAL,          3,  (int)gps_data.longitude},       //Longitude
+    {0x0005, T_BYTE|T_PTR,        1,  (int)&gps_data.heightRef},      //AltitudeRef
+    {0x0006, T_RATIONAL,          1,  (int)gps_data.height},          //Altitude
+    {0x0007, T_RATIONAL,          3,  (int)gps_data.timeStamp},       //TimeStamp
+    {0x0009, T_ASCII|T_PTR,       2,  (int)gps_data.status},          //Status
+    //{0x000A, T_ASCII,             1,  0},                             //MeasureMode
+    {0x0012, T_ASCII,             7,  (int)gps_data.mapDatum},        //MapDatum 7 + 1 pad byte
+    {0x001D, T_ASCII,             11, (int)gps_data.dateStamp},       //DateStamp 11 + 1 pad byte
+};
+
+int get_type_size(int type)
+{
+    switch(type & 0xFF)
+    {
+    case T_BYTE:
+    case T_SBYTE:
+    case T_UNDEFINED:
+    case T_ASCII:     return 1; 
+    case T_SHORT:
+    case T_SSHORT:    return 2;
+    case T_LONG:
+    case T_SLONG:
+    case T_FLOAT:     return 4;
+    case T_RATIONAL:
+    case T_SRATIONAL:
+    case T_DOUBLE:    return 8;
+    default:          return 0;
+    }
+}
+
+#define DIR_SIZE(ifd)   (sizeof(ifd)/sizeof(ifd[0]))
+
+struct
+{
+    struct dir_entry* entry;
+    int count;                  // Number of entries to be saved
+    int entry_count;            // Total number of entries
+} ifd_list[] = 
+{
+    {ifd0,      DIR_SIZE(ifd0),     DIR_SIZE(ifd0)}, 
+    {ifd1,      DIR_SIZE(ifd1),     DIR_SIZE(ifd1)}, 
+    {exif_ifd,  DIR_SIZE(exif_ifd), DIR_SIZE(exif_ifd)}, 
+    {gpd_ifd,   DIR_SIZE(gpd_ifd),  DIR_SIZE(gpd_ifd)}
+};
 
 #define TIFF_HDR_SIZE (8)
@@ -205 +257 @@
 void add_to_buf(void* var, int size)
 {
- memcpy(dng_header_buf+dng_header_buf_offset,var,size);
- dng_header_buf_offset+=size;
+    memcpy(dng_header_buf+dng_header_buf_offset,var,size);
+    dng_header_buf_offset += size;
+}
+
+void add_val_to_buf(int val, int size)
+{
+    add_to_buf(&val,size);
 }
 
 void create_dng_header(){
- int var;
- int i,j;
- int extra_offset;
- int raw_offset;
-
- // filling EXIF fields
-
- gps_getData(&gps_data); 
-
- for (j=0;j<IFDs;j++) {
-  for(i=0; IFD_LIST[j].entry[i].type; i++) {
-    switch (IFD_LIST[j].entry[i].tag) {
-     // For camera name string make sure the 'count' in the IFD header is correct for the string
-     case 0x110 :                                                                                       // CameraName
-     case 0xC614: IFD_LIST[j].entry[i].count = strlen((char*)IFD_LIST[j].entry[i].offset) + 1; break;   // UniqueCameraModel
-     case 0x132 :
-     case 0x8822: IFD_LIST[j].entry[i].offset=get_exp_program_for_exif(exif_data.exp_program); break;//ExposureProgram
-     case 0x0112: IFD_LIST[j].entry[i].offset=get_orientation_for_exif(exif_data.orientation); break; //Orientation
-     case 0x9209: IFD_LIST[j].entry[i].offset=get_flash_mode_for_exif(exif_data.flash_mode, exif_data.flash_fired); break; //Flash mode
-     case 0x9207: IFD_LIST[j].entry[i].offset=get_metering_mode_for_exif(exif_data.metering_mode); break; // Metering mode
-    }
-  }
- }
-  
- // calculating offset of RAW data and count of directories for each IFD
-
- raw_offset=TIFF_HDR_SIZE;
-
- for (j=0;j<IFDs;j++) {
-  IFD_LIST[j].count=0;
-  raw_offset+=6; // IFD header+footer
-  for(i=0; IFD_LIST[j].entry[i].type; i++) {
-   int size_ext;
-   IFD_LIST[j].count++;
-   raw_offset+=12; // IFD directory size
-   size_ext=get_type_size(IFD_LIST[j].entry[i].type)*IFD_LIST[j].entry[i].count;
-   if (size_ext>4) raw_offset+=size_ext+(size_ext&1);
-  }
- }
-
- // creating buffer for writing data
- raw_offset=(raw_offset/512+1)*512; // exlusively for CHDK fast file writing
- dng_header_buf_size=raw_offset;
- dng_header_buf=umalloc(raw_offset);
- dng_header_buf_offset=0;
- if (!dng_header_buf) return;
-
- // create buffer for thumbnail
- thumbnail_buf = malloc(DNG_TH_WIDTH*DNG_TH_HEIGHT*3);
- if (!thumbnail_buf)
- {
-     ufree(dng_header_buf);
-     dng_header_buf = 0;
-     return;
- }
-
- //  writing  offsets for EXIF IFD and RAW data and calculating offset for extra data
-
- extra_offset=TIFF_HDR_SIZE;
-
- for (j=0;j<IFDs;j++) {
-  extra_offset+=6+IFD_LIST[j].count*12; // IFD header+footer
-  for(i=0; IFD_LIST[j].entry[i].type; i++) {
-   if (IFD_LIST[j].entry[i].tag==0x8769) IFD_LIST[j].entry[i].offset=TIFF_HDR_SIZE+(IFD_LIST[0].count+IFD_LIST[1].count)*12+6+6;  // EXIF IFD offset
-   if (IFD_LIST[j].entry[i].tag==0x8825) IFD_LIST[j].entry[i].offset=TIFF_HDR_SIZE+(IFD_LIST[0].count+IFD_LIST[1].count+IFD_LIST[2].count)*12+6+6+6;  // GPS IFD offset
-   if (IFD_LIST[j].entry[i].tag==0x14A)  IFD_LIST[j].entry[i].offset=TIFF_HDR_SIZE+IFD_LIST[0].count*12+6; // SubIFDs offset
-   if (IFD_LIST[j].entry[i].tag==0x111)  {
-    if (j==1) IFD_LIST[j].entry[i].offset=raw_offset+DNG_TH_WIDTH*DNG_TH_HEIGHT*3;  //StripOffsets for main image
-    if (j==0) IFD_LIST[j].entry[i].offset=raw_offset;  //StripOffsets for thumbnail
-   }
-  }
- }
-
- // TIFF file header
-
- var=0x4949; // little endian
- add_to_buf(&var, sizeof(short));
- var=42; //An arbitrary but carefully chosen number that further identifies the file as a TIFF file.
- add_to_buf(&var, sizeof(short));
- var=0x8; // offset of first IFD
- add_to_buf(&var, sizeof(int));
-
-
- // writing IFDs
-
- for (j=0;j<IFDs;j++) {
-  int size_ext;
-  var=IFD_LIST[j].count;
-  add_to_buf(&var, sizeof(short));
-  for(i=0; IFD_LIST[j].entry[i].type; i++) {
-    add_to_buf(&IFD_LIST[j].entry[i].tag, sizeof(short));
-    unsigned short t = IFD_LIST[j].entry[i].type & 0xFF;
-    add_to_buf(&t, sizeof(short));
-    add_to_buf(&IFD_LIST[j].entry[i].count, sizeof(int));
-    size_ext=get_type_size(IFD_LIST[j].entry[i].type)*IFD_LIST[j].entry[i].count;
-    if (size_ext<=4) 
-    {
-        if (IFD_LIST[j].entry[i].type & T_PTR)
+    int i,j;
+    int extra_offset;
+    int raw_offset;
+
+    // Set version and opcodes
+    if (conf.dng_version)
+    {
+        // If CHDK is removing bad pixels then set DNG version to 1.1 and remove opcodes
+        ifd0[DNG_VERSION_INDEX].offset = BE(0x01010000);
+        ifd1[BADPIXEL_OPCODE_INDEX].type |= T_SKIP;
+        ifd_list[1].count = DIR_SIZE(ifd1) - 1;
+    }
+    else
+    {
+        // Set DNG version to 1.3 and add bad pixel opcodes
+        ifd0[DNG_VERSION_INDEX].offset = BE(0x01030000);
+        ifd1[BADPIXEL_OPCODE_INDEX].type &= ~T_SKIP;
+        ifd_list[1].count = DIR_SIZE(ifd1);
+    }
+
+    // filling EXIF fields
+
+    int ifd_count = DIR_SIZE(ifd_list);
+
+    if (camera_info.props.gps)
+    {
+        // If camera has GPS get the GPS data
+        gps_getData(&gps_data); 
+    }
+    else
+    {
+        // If no GPS then remove the GPS data from the header - assumes gps_ifd is the last one in ifd_list
+        ifd_count--;
+        ifd_list[0].count = DIR_SIZE(ifd0) - 1;     // Entry 0x8825 won't be saved so don't count it
+        ifd0[GPS_IFD_INDEX].type |= T_SKIP;         // mark entry so it is skipped
+    }
+
+    // Fix the counts and offsets where needed
+
+    ifd0[CAMERA_NAME_INDEX].count = ifd0[UNIQUE_CAMERA_MODEL_INDEX].count = strlen(cam_name) + 1;
+    ifd0[ORIENTATION_INDEX].offset = get_orientation_for_exif(exif_data.orientation);
+
+    exif_ifd[EXPOSURE_PROGRAM_INDEX].offset = get_exp_program_for_exif(exif_data.exp_program);
+    exif_ifd[METERING_MODE_INDEX].offset = get_metering_mode_for_exif(exif_data.metering_mode);
+    exif_ifd[FLASH_MODE_INDEX].offset = get_flash_mode_for_exif(exif_data.flash_mode, exif_data.flash_fired);
+
+    // calculating offset of RAW data and count of entries for each IFD
+    raw_offset=TIFF_HDR_SIZE;
+
+    for (j=0;j<ifd_count;j++)
+    {
+        raw_offset+=6; // IFD header+footer
+        for(i=0; i<ifd_list[j].entry_count; i++)
         {
-            add_to_buf((void*)IFD_LIST[j].entry[i].offset, sizeof(int));
+            if ((ifd_list[j].entry[i].type & T_SKIP) == 0)  // Exclude skipped entries (e.g. GPS info if camera doesn't have GPS)
+            {
+                raw_offset+=12; // IFD directory entry size
+                int size_ext=get_type_size(ifd_list[j].entry[i].type)*ifd_list[j].entry[i].count;
+                if (size_ext>4) raw_offset+=size_ext+(size_ext&1);
+            }
         }
-        else
+    }
+
+    // creating buffer for writing data
+    raw_offset=(raw_offset/512+1)*512; // exlusively for CHDK fast file writing
+    dng_header_buf_size=raw_offset;
+    dng_header_buf=umalloc(raw_offset);
+    dng_header_buf_offset=0;
+    if (!dng_header_buf) return;
+
+    // create buffer for thumbnail
+    thumbnail_buf = malloc(DNG_TH_WIDTH*DNG_TH_HEIGHT*3);
+    if (!thumbnail_buf)
+    {
+        ufree(dng_header_buf);
+        dng_header_buf = 0;
+        return;
+    }
+
+    //  writing offsets for EXIF IFD and RAW data and calculating offset for extra data
+
+    extra_offset=TIFF_HDR_SIZE;
+
+    ifd0[SUBIFDS_INDEX].offset = TIFF_HDR_SIZE + ifd_list[0].count * 12 + 6;                            // SubIFDs offset
+    ifd0[EXIF_IFD_INDEX].offset = TIFF_HDR_SIZE + (ifd_list[0].count + ifd_list[1].count) * 12 + 6 + 6; // EXIF IFD offset
+    if (camera_info.props.gps)
+        ifd0[GPS_IFD_INDEX].offset = TIFF_HDR_SIZE + (ifd_list[0].count + ifd_list[1].count + ifd_list[2].count) * 12 + 6 + 6 + 6;  // GPS IFD offset
+
+    ifd0[THUMB_DATA_INDEX].offset = raw_offset;                                     //StripOffsets for thumbnail
+    ifd1[RAW_DATA_INDEX].offset = raw_offset + DNG_TH_WIDTH * DNG_TH_HEIGHT * 3;    //StripOffsets for main image
+
+    for (j=0;j<ifd_count;j++)
+    {
+        extra_offset += 6 + ifd_list[j].count * 12; // IFD header+footer
+    }
+
+    // TIFF file header
+
+    add_val_to_buf(0x4949, sizeof(short));      // little endian
+    add_val_to_buf(42, sizeof(short));          // An arbitrary but carefully chosen number that further identifies the file as a TIFF file.
+    add_val_to_buf(TIFF_HDR_SIZE, sizeof(int)); // offset of first IFD
+
+    // writing IFDs
+
+    for (j=0;j<ifd_count;j++)
+    {
+        int size_ext;
+        add_val_to_buf(ifd_list[j].count, sizeof(short));
+        for(i=0; i<ifd_list[j].entry_count; i++)
         {
-            add_to_buf(&IFD_LIST[j].entry[i].offset, sizeof(int));
+            if ((ifd_list[j].entry[i].type & T_SKIP) == 0)
+            {
+                add_val_to_buf(ifd_list[j].entry[i].tag, sizeof(short));
+                add_val_to_buf(ifd_list[j].entry[i].type & 0xFF, sizeof(short));
+                add_val_to_buf(ifd_list[j].entry[i].count, sizeof(int));
+                size_ext=get_type_size(ifd_list[j].entry[i].type)*ifd_list[j].entry[i].count;
+                if (size_ext<=4) 
+                {
+                    if (ifd_list[j].entry[i].type & T_PTR)
+                    {
+                        add_to_buf((void*)ifd_list[j].entry[i].offset, sizeof(int));
+                    }
+                    else
+                    {
+                        add_val_to_buf(ifd_list[j].entry[i].offset, sizeof(int));
+                    }
+                }
+                else
+                {
+                    add_val_to_buf(extra_offset, sizeof(int));
+                    extra_offset += size_ext+(size_ext&1);    
+                }
+            }
         }
-    }
-    else
-    {
-        add_to_buf(&extra_offset, sizeof(int));
-        extra_offset+=size_ext+(size_ext&1);    
-    }
-  }
- var=0; 
- add_to_buf(&var, sizeof(int));
- }
-
-
- // writing extra data
-
- for (j=0;j<IFDs;j++) {
-  int size_ext;
-  char zero=0;
-  for(i=0; IFD_LIST[j].entry[i].type; i++) {
-   size_ext=get_type_size(IFD_LIST[j].entry[i].type)*IFD_LIST[j].entry[i].count;
-   if (size_ext>4){
-    add_to_buf((void*)IFD_LIST[j].entry[i].offset, size_ext);
-    if (size_ext&1) add_to_buf(&zero, 1);
-   }
-  }
- }
-
- // writing zeros to tail of dng header (just for fun)
- for (i=dng_header_buf_offset; i<dng_header_buf_size; i++) dng_header_buf[i]=0;
+        add_val_to_buf(0, sizeof(int));
+    }
+
+    // writing extra data
+
+    for (j=0;j<ifd_count;j++)
+    {
+        int size_ext;
+        for(i=0; i<ifd_list[j].entry_count; i++)
+        {
+            if ((ifd_list[j].entry[i].type & T_SKIP) == 0)
+            {
+                size_ext=get_type_size(ifd_list[j].entry[i].type)*ifd_list[j].entry[i].count;
+                if (size_ext>4)
+                {
+                    add_to_buf((void*)ifd_list[j].entry[i].offset, size_ext);
+                    if (size_ext&1) add_val_to_buf(0, 1);
+                }
+            }
+        }
+    }
+
+    // writing zeros to tail of dng header (just for fun)
+    for (i=dng_header_buf_offset; i<dng_header_buf_size; i++) dng_header_buf[i]=0;
 }
 
@@ -359 +441 @@
 }
 
-unsigned short get_exp_program_for_exif(int exp_program){
- switch(exp_program){
-  case MODE_M: return 1;
-  case MODE_P: return 2;
-  case MODE_AV: return 3;
-  case MODE_TV: return 4;
-  default: return 0;
- }
-}
-
-unsigned short get_orientation_for_exif(short orientation){
- switch(orientation){
-  case  90: return 6;  // Right  - Top
-  case 180: return 3;  // Bottom - Right
-  case 270: return 8;  // Left   - Bottom
-  case   0:            // Top    - Left
-  default : return 1;
- }
+unsigned short get_exp_program_for_exif(int exp_program)
+{
+    switch(exp_program)
+    {
+    case MODE_M: return 1;
+    case MODE_P: return 2;
+    case MODE_AV: return 3;
+    case MODE_TV: return 4;
+    default: return 0;
+    }
+}
+
+unsigned short get_orientation_for_exif(short orientation)
+{
+    switch(orientation)
+    {
+    case  90: return 6;  // Right  - Top
+    case 180: return 3;  // Bottom - Right
+    case 270: return 8;  // Left   - Bottom
+    case   0:            // Top    - Left
+    default : return 1;
+    }
 }
 
 unsigned short get_flash_mode_for_exif(short mode, short fired){
- fired&=1;
- switch(mode){
-  case 0: return (3<<3)|fired; // auto
-  case 1: return (1<<3)|fired; // on
-  case 2: return (2<<3)|fired; // off
-  default: return fired;
- };
-}
-
-unsigned short get_metering_mode_for_exif(short metering_mode){
- switch (metering_mode){
-  case 0: return 5; // Evaluative
-  case 1: return 3; // Spot
-  case 2: return 2; // CenterWeightedAverage
-  default: return 255; // other
- }
+    fired&=1;
+    switch(mode)
+    {
+    case 0: return (3<<3)|fired; // auto
+    case 1: return (1<<3)|fired; // on
+    case 2: return (2<<3)|fired; // off
+    default: return fired;
+    };
+}
+
+unsigned short get_metering_mode_for_exif(short metering_mode)
+{
+    switch (metering_mode)
+    {
+    case 0: return 5; // Evaluative
+    case 1: return 3; // Spot
+    case 2: return 2; // CenterWeightedAverage
+    default: return 255; // other
+    }
 }
 
 void capture_data_for_exif(void)
 {
- short short_prop_val;
- time_t datetime;
- struct tm *ttm;
- extern volatile long shutter_open_time; // defined in platform/generic/capt_seq.c
- int wb[3];
-
- exif_data.iso=shooting_get_iso_market();
-
- // Shutter speed tags
- get_property_case(camera_info.props.tv, &short_prop_val, sizeof(short_prop_val));
- cam_shutter[0]      = pow_calc( 1000000, 2, 1, -short_prop_val, 96);
- cam_apex_shutter[0] = short_prop_val;
-
- // Date & time tag (note - uses shutter speed from 'short_prop_val' code above)
- if (shutter_open_time) { datetime = shutter_open_time + pow_calc(1, 2, 1, -short_prop_val, 96); shutter_open_time=0;} // shutter closing time
- else  datetime = time(NULL);
- ttm = localtime(&datetime);
- sprintf(cam_datetime, "%04d:%02d:%02d %02d:%02d:%02d", ttm->tm_year+1900, ttm->tm_mon+1, ttm->tm_mday, ttm->tm_hour, ttm->tm_min, ttm->tm_sec);
-
- get_property_case(camera_info.props.av, &short_prop_val, sizeof(short_prop_val));
- cam_aperture[0]      = pow_calc( 10, 2, 1, short_prop_val, 192);
- cam_apex_aperture[0] = short_prop_val;
-
- get_property_case(camera_info.props.min_av, &short_prop_val, sizeof(short_prop_val));
- cam_max_av[0] = short_prop_val;
-
- get_property_case(camera_info.props.ev_correction_2, &short_prop_val, sizeof(short_prop_val));
- cam_exp_bias[0] = short_prop_val;
-
- exif_data.exp_program=mode_get() & MODE_SHOOTING_MASK;
-
- cam_focal_length[0] = get_focal_length(shooting_get_zoom());
- exif_data.effective_focal_length = get_effective_focal_length(shooting_get_zoom()) / 1000;
-
- get_property_case(camera_info.props.orientation_sensor, &exif_data.orientation, sizeof(exif_data.orientation));
- get_parameter_data(camera_info.params.camera_name, &cam_name, sizeof(cam_name));
- get_property_case(camera_info.props.flash_mode, &exif_data.flash_mode, sizeof(exif_data.flash_mode));
- get_property_case(camera_info.props.flash_fire, &exif_data.flash_fired, sizeof(exif_data.flash_fired));
- get_property_case(camera_info.props.metering_mode, &exif_data.metering_mode, sizeof(exif_data.metering_mode));
-
- get_property_case(camera_info.props.wb_adj, &wb, sizeof(wb));  
- cam_AsShotNeutral[1]=wb[1];
- cam_AsShotNeutral[3]=wb[0];
- cam_AsShotNeutral[5]=wb[2];
+    short short_prop_val;
+    time_t datetime;
+    struct tm *ttm;
+    extern volatile long shutter_open_time; // defined in platform/generic/capt_seq.c
+    int wb[3];
+
+    exif_data.iso=shooting_get_iso_market();
+
+    // Shutter speed tags
+    get_property_case(camera_info.props.tv, &short_prop_val, sizeof(short_prop_val));
+    cam_shutter[0]      = pow_calc( 1000000, 2, 1, -short_prop_val, 96);
+    cam_apex_shutter[0] = short_prop_val;
+
+    // Date & time tag (note - uses shutter speed from 'short_prop_val' code above)
+    if (shutter_open_time) { datetime = shutter_open_time + pow_calc(1, 2, 1, -short_prop_val, 96); shutter_open_time=0;} // shutter closing time
+    else  datetime = time(NULL);
+    ttm = localtime(&datetime);
+    sprintf(cam_datetime, "%04d:%02d:%02d %02d:%02d:%02d", ttm->tm_year+1900, ttm->tm_mon+1, ttm->tm_mday, ttm->tm_hour, ttm->tm_min, ttm->tm_sec);
+
+    get_property_case(camera_info.props.av, &short_prop_val, sizeof(short_prop_val));
+    cam_aperture[0]      = pow_calc( 10, 2, 1, short_prop_val, 192);
+    cam_apex_aperture[0] = short_prop_val;
+
+    get_property_case(camera_info.props.min_av, &short_prop_val, sizeof(short_prop_val));
+    cam_max_av[0] = short_prop_val;
+
+    get_property_case(camera_info.props.ev_correction_2, &short_prop_val, sizeof(short_prop_val));
+    cam_exp_bias[0] = short_prop_val;
+
+    exif_data.exp_program=mode_get() & MODE_SHOOTING_MASK;
+
+    cam_focal_length[0] = get_focal_length(shooting_get_zoom());
+    exif_data.effective_focal_length = get_effective_focal_length(shooting_get_zoom()) / 1000;
+
+    get_property_case(camera_info.props.orientation_sensor, &exif_data.orientation, sizeof(exif_data.orientation));
+    get_parameter_data(camera_info.params.camera_name, &cam_name, sizeof(cam_name));
+    get_property_case(camera_info.props.flash_mode, &exif_data.flash_mode, sizeof(exif_data.flash_mode));
+    get_property_case(camera_info.props.flash_fire, &exif_data.flash_fired, sizeof(exif_data.flash_fired));
+    get_property_case(camera_info.props.metering_mode, &exif_data.metering_mode, sizeof(exif_data.metering_mode));
+
+    get_property_case(camera_info.props.wb_adj, &wb, sizeof(wb));  
+    cam_AsShotNeutral[1]=wb[1];
+    cam_AsShotNeutral[3]=wb[0];
+    cam_AsShotNeutral[5]=wb[2];
 }
 
 //-------------------------------------------------------------------
 
-void convert_dng_to_chdk_raw(char* fn){
- #define BUF_SIZE (32768)
- FILE *dng, *raw;
- int *buf;
- int i;
- struct STD_stat st;
- struct utimbuf t;
-
- if (safe_stat(fn, &st) != 0 || st.st_size<=camera_sensor.raw_size)  return;
- buf=malloc(BUF_SIZE);
- if (buf){
-  started();
-  dng=fopen(fn,"rb");
-  if (dng){
-   fread(buf, 1, 8, dng);
-   if (buf[0]==0x2A4949 && buf[1]==8) {  // chdk dng header
-    i=strlen(fn)-3;
-    if (strncmp(fn+i,"CR",2)==0) strcpy(fn+i,"WAV"); else strcpy(fn+i,"CRW");
-    raw=fopen(fn,"w+b");
-    if (raw){
-     fseek(dng, st.st_size-camera_sensor.raw_size, SEEK_SET); // SEEK_END is not working?
-     for (i=0; i<camera_sensor.raw_size/BUF_SIZE; i++) {
-      fread(buf, 1, BUF_SIZE, dng);
-      reverse_bytes_order((char*)buf, BUF_SIZE);
-      fwrite(buf, 1, BUF_SIZE, raw);
-     }
-     fread(buf, 1, camera_sensor.raw_size%BUF_SIZE, dng);
-     reverse_bytes_order((char*)buf, camera_sensor.raw_size%BUF_SIZE);
-     fwrite(buf, 1, camera_sensor.raw_size%BUF_SIZE, raw);
-     fclose(raw);
-     t.actime = t.modtime = time(NULL);
-     utime(fn, &t);
-    } // if (raw)
-   } // if chdk dng header
-  fclose(dng);
-  } //if (dng)
- free(buf);
- finished();
- }  //if (buf)
+void convert_dng_to_chdk_raw(char* fn)
+{
+#define BUF_SIZE (32768)
+    FILE *dng, *raw;
+    int *buf;
+    int i;
+    struct STD_stat st;
+    struct utimbuf t;
+
+    if (safe_stat(fn, &st) != 0 || st.st_size<=camera_sensor.raw_size)  return;
+    buf=malloc(BUF_SIZE);
+    if (buf)
+    {
+        started();
+        dng=fopen(fn,"rb");
+        if (dng)
+        {
+            fread(buf, 1, 8, dng);
+            if (buf[0]==0x2A4949 && buf[1]==8)
+            {  // chdk dng header
+                i=strlen(fn)-3;
+                if (strncmp(fn+i,"CR",2)==0) strcpy(fn+i,"WAV"); else strcpy(fn+i,"CRW");
+                raw=fopen(fn,"w+b");
+                if (raw){
+                    fseek(dng, st.st_size-camera_sensor.raw_size, SEEK_SET); // SEEK_END is not working?
+                    for (i=0; i<camera_sensor.raw_size/BUF_SIZE; i++)
+                    {
+                        fread(buf, 1, BUF_SIZE, dng);
+                        reverse_bytes_order((char*)buf, BUF_SIZE);
+                        fwrite(buf, 1, BUF_SIZE, raw);
+                    }
+                    fread(buf, 1, camera_sensor.raw_size%BUF_SIZE, dng);
+                    reverse_bytes_order((char*)buf, camera_sensor.raw_size%BUF_SIZE);
+                    fwrite(buf, 1, camera_sensor.raw_size%BUF_SIZE, raw);
+                    fclose(raw);
+                    t.actime = t.modtime = time(NULL);
+                    utime(fn, &t);
+                } // if (raw)
+            } // if chdk dng header
+            fclose(dng);
+        } //if (dng)
+        free(buf);
+        finished();
+    }  //if (buf)
 }
 
@@ -494 +588 @@
 static unsigned char gamma[256];
 
-void fill_gamma_buf(void) {
+void fill_gamma_buf(void)
+{
     int i;
     if (gamma[255]) return;
@@ -502 +597 @@
 }
 
-void create_thumbnail() {
+void create_thumbnail()
+{
     register int i, j, x, y, yadj, xadj;
     register char *buf = thumbnail_buf;
@@ -541 +637 @@
 int init_badpixel_bin_flag; // contants above to count/create file, > 0 num bad pixel
 
-int raw_init_badpixel_bin() {
+int raw_init_badpixel_bin()
+{
     int count;
     unsigned short c[2];
     FILE*f;
-    if(init_badpixel_bin_flag == INIT_BADPIXEL_FILE) {
+    if(init_badpixel_bin_flag == INIT_BADPIXEL_FILE)
+    {
         f=fopen(PATH_BAD_TMP_BIN,"w+b");
-    } else if (init_badpixel_bin_flag == INIT_BADPIXEL_COUNT) {
+    }
+    else if (init_badpixel_bin_flag == INIT_BADPIXEL_COUNT)
+    {
         f=NULL;
-    } else {
+    }
+    else
+    {
         return 0;
     }
@@ -579 +681 @@
 int binary_count=-1;
 
-void load_bad_pixels_list_b(char* filename) {
+void load_bad_pixels_list_b(char* filename)
+{
     struct STD_stat st;
     long filesize;
@@ -585 +688 @@
     FILE *fd;
 
-        if ( filename==0 )
-         { unload_bad_pixels_list_b(); return; }
+    if ( filename==0 )
+    { 
+        unload_bad_pixels_list_b();
+        return;
+    }
 
     binary_count=-1;
@@ -592 +698 @@
     filesize=st.st_size;
     if (filesize%(2*sizeof(short)) != 0) return;
-        if (filesize == 0) { binary_count = 0; return; }        // Allow empty badpixel.bin file
+    if (filesize == 0) { binary_count = 0; return; }    // Allow empty badpixel.bin file
     ptr=malloc(filesize);
     if (!ptr) return;
     fd=fopen(filename, "rb");
-    if (fd) {
+    if (fd)
+    {
         fread(ptr,1, filesize,fd);
         fclose(fd);
@@ -605 +712 @@
 }
 
-void unload_bad_pixels_list_b(void) {
+void unload_bad_pixels_list_b(void)
+{
     if (binary_list) free(binary_list);
     binary_list=NULL;
@@ -611 +719 @@
 }
 
-void patch_bad_pixels_b(void) {
+void patch_bad_pixels_b(void)
+{
     int i;
     short* ptr=binary_list;
@@ -626 +735 @@
 
 int badpixel_list_loaded_b(void) {
-        return (binary_count >= 0) ? 1 : 0;
+    return (binary_count >= 0) ? 1 : 0;
 }
 
@@ -637 +746 @@
 };
 
-int badpixel_task_stack(long p) {
+int badpixel_task_stack(long p)
+{
     static unsigned int badpix_cnt1;
 
-    switch(p) {
-        case BADPIX_START:
-            action_pop();
-
-            console_clear();
-            console_add_line("Wait please... ");
-            console_add_line("This takes a few seconds,");
-            console_add_line("don't panic!");
-
-            init_badpixel_bin_flag = INIT_BADPIXEL_COUNT;
-
-            shooting_set_tv96_direct(96, SET_LATER);
-            action_push(BADPIX_S1);
-            action_push(AS_SHOOT);
-            action_push_delay(3000);
-            break;
-        case BADPIX_S1:
-            action_pop();
-
-            badpix_cnt1 = init_badpixel_bin_flag;
-            init_badpixel_bin_flag = INIT_BADPIXEL_FILE;
-            shooting_set_tv96_direct(96, SET_LATER);
-
-            action_push(BADPIX_S2);
-            action_push(AS_SHOOT);
-            break;
-        case BADPIX_S2:
-            action_pop();
-
-            console_clear();
-            if (badpix_cnt1 == init_badpixel_bin_flag) {
-                // TODO script asked confirmation first
-                // should sanity check bad pixel count at least,
-                // wrong buffer address could make badpixel bigger than available mem
-                char msg[32];
-                console_add_line("badpixel.bin created.");
-                sprintf(msg, "Bad pixel count: %d", badpix_cnt1);
-                console_add_line(msg);
-                remove(PATH_BADPIXEL_BIN);
-                rename(PATH_BAD_TMP_BIN,PATH_BADPIXEL_BIN);
-            } else {
-                console_add_line("badpixel.bin failed.");
-                console_add_line("Please try again.");
-            }
-            init_badpixel_bin_flag = 0;
-            remove(PATH_BAD_TMP_BIN);
-
-            action_push_delay(3000);
-            break;
-        default:
-            action_stack_standard(p);
-            break;
+    switch(p)
+    {
+    case BADPIX_START:
+        action_pop();
+
+        console_clear();
+        console_add_line("Wait please... ");
+        console_add_line("This takes a few seconds,");
+        console_add_line("don't panic!");
+
+        init_badpixel_bin_flag = INIT_BADPIXEL_COUNT;
+
+        shooting_set_tv96_direct(96, SET_LATER);
+        action_push(BADPIX_S1);
+        action_push(AS_SHOOT);
+        action_push_delay(3000);
+        break;
+    case BADPIX_S1:
+        action_pop();
+
+        badpix_cnt1 = init_badpixel_bin_flag;
+        init_badpixel_bin_flag = INIT_BADPIXEL_FILE;
+        shooting_set_tv96_direct(96, SET_LATER);
+
+        action_push(BADPIX_S2);
+        action_push(AS_SHOOT);
+        break;
+    case BADPIX_S2:
+        action_pop();
+
+        console_clear();
+        if (badpix_cnt1 == init_badpixel_bin_flag)
+        {
+            // TODO script asked confirmation first
+            // should sanity check bad pixel count at least,
+            // wrong buffer address could make badpixel bigger than available mem
+            char msg[32];
+            console_add_line("badpixel.bin created.");
+            sprintf(msg, "Bad pixel count: %d", badpix_cnt1);
+            console_add_line(msg);
+            remove(PATH_BADPIXEL_BIN);
+            rename(PATH_BAD_TMP_BIN,PATH_BADPIXEL_BIN);
+        }
+        else
+        {
+            console_add_line("badpixel.bin failed.");
+            console_add_line("Please try again.");
+        }
+        init_badpixel_bin_flag = 0;
+        remove(PATH_BAD_TMP_BIN);
+
+        action_push_delay(3000);
+        break;
+    default:
+        action_stack_standard(p);
+        break;
     }
 
@@ -698 +812 @@
 
 
-void create_badpixel_bin() {
-    if (!(mode_get() & MODE_REC)) {
+void create_badpixel_bin()
+{
+    if (!(mode_get() & MODE_REC))
+    {
         gui_mbox_init(LANG_ERROR, LANG_MSG_RECMODE_REQUIRED, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
         return;
@@ -713 +829 @@
 void write_dng(int fd, char* rawadr, char* altrawadr, unsigned long uncachedbit) 
 {
-        create_dng_header();
+    create_dng_header();
 
     if (dng_header_buf)
     {
         fill_gamma_buf();
-        patch_bad_pixels_b();
+        if (conf.dng_version)
+            patch_bad_pixels_b();
         create_thumbnail();
         write(fd, dng_header_buf, dng_header_buf_size);
@@ -729 +846 @@
 
         if (rawadr == altrawadr)    // If only one RAW buffer then we have to swap the bytes back
-            reverse_bytes_order2(rawadr, altrawadr, camera_sensor.raw_size);
+            reverse_bytes_order2(rawadr, altrawadr, camera_sensor.raw_size);
 
         free_dng_header();
@@ -740 +857 @@
 
 struct libdng_sym libdng = {
-                        MAKE_API_VERSION(1,0),          // apiver: increase major if incompatible changes made in module, 
-                                                                                // increase minor if compatible changes made(including extending this struct)
-
-                        create_badpixel_bin,
-                        raw_init_badpixel_bin,
-                        capture_data_for_exif,
-                        load_bad_pixels_list_b,
-                        badpixel_list_loaded_b,
-
-                        convert_dng_to_chdk_raw,
-                        write_dng
-                };
+    MAKE_API_VERSION(1,0),      // apiver: increase major if incompatible changes made in module, 
+    // increase minor if compatible changes made(including extending this struct)
+
+    create_badpixel_bin,
+    raw_init_badpixel_bin,
+    capture_data_for_exif,
+    load_bad_pixels_list_b,
+    badpixel_list_loaded_b,
+
+    convert_dng_to_chdk_raw,
+    write_dng
+};
 
 
 //-------------------------------------------
 void* MODULE_EXPORT_LIST[] = {
-        /* 0 */ (void*)EXPORTLIST_MAGIC_NUMBER,
-        /* 1 */ (void*)1,
-
-                        &libdng
-                };
+    /* 0 */ (void*)EXPORTLIST_MAGIC_NUMBER,
+    /* 1 */ (void*)1,
+
+    &libdng
+};
 
 //--------------------------------------------
 int _module_loader( unsigned int* chdk_export_list )
 {
-  if ( chdk_export_list[0] != EXPORTLIST_MAGIC_NUMBER )
-     return 1;
-
-  if ( !API_VERSION_MATCH_REQUIREMENT( camera_sensor.api_version, 1, 0 ) )
-         return 1;
-  if ( !API_VERSION_MATCH_REQUIREMENT( camera_info.api_version, 1, 0 ) )
-         return 1;
-
-  return 0;
+    if ( chdk_export_list[0] != EXPORTLIST_MAGIC_NUMBER )
+        return 1;
+
+    if ( !API_VERSION_MATCH_REQUIREMENT( camera_sensor.api_version, 1, 0 ) )
+        return 1;
+    if ( !API_VERSION_MATCH_REQUIREMENT( camera_info.api_version, 1, 0 ) )
+        return 1;
+
+    return 0;
 }
 
@@ -783 +900 @@
 int _module_unloader()
 {
-
-        unload_bad_pixels_list_b();
+    unload_bad_pixels_list_b();
     free_dng_header();
     return 0;
@@ -792 +908 @@
 /******************** Module Information structure ******************/
 
-struct ModuleInfo _module_info = {      MODULEINFO_V1_MAGICNUM,
-                                                                        sizeof(struct ModuleInfo),
-
-                                                                        ANY_CHDK_BRANCH, 0,                     // Requirements of CHDK version
-                                                                        PLATFORMID,                                     // Specify platform dependency
-                                                                        MODULEINFO_FLAG_SYSTEM,         // flag
-                                                                        (int32_t)"DNG (dll)",   // Module name
-                                                                        1, 0,                                           // Module version
-                                                                        (int32_t)"Processing of DNG"
-                                                                 };
+struct ModuleInfo _module_info = {  MODULEINFO_V1_MAGICNUM,
+    sizeof(struct ModuleInfo),
+
+    ANY_CHDK_BRANCH, 0,         // Requirements of CHDK version
+    PLATFORMID,                 // Specify platform dependency
+    MODULEINFO_FLAG_SYSTEM,     // flag
+    (int32_t)"DNG (dll)",       // Module name
+    1, 0,                       // Module version
+    (int32_t)"Processing of DNG"
+};
 
 

branches/reyalp-ptp-live/core/gui.c

@@ -237 +237 @@
 #if DNG_SUPPORT
     static void cb_change_dng(); 
+    static const char* gui_dng_version(int change, int arg);
     void gui_menuproc_badpixel_create(int arg);
 #endif
@@ -494 +495 @@
 #if CAM_ADJUSTABLE_ALT_BUTTON
     MENU_ITEM(0x22,LANG_MENU_MISC_ALT_BUTTON,               MENUITEM_ENUM,                  gui_alt_mode_button_enum,           0 ),
+#endif
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    MENU_ITEM   (0x5c,LANG_MENU_MISC_ZOOM_ASSIST,           MENUITEM_BOOL,                  &conf.zoom_assist_button_disable,   0 ),
 #endif
     MENU_ITEM(0x5d,LANG_MENU_MISC_DISABLE_LCD_OFF,    MENUITEM_ENUM,    gui_alt_power_enum, 0 ),
@@ -860 +864 @@
 static CMenuItem raw_submenu_items[] = {
 #if DNG_SUPPORT
-    MENU_ITEM(0x5c,LANG_MENU_RAW_SAVE,                MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.save_raw, (int)cb_change_dng ),
+    MENU_ITEM   (0x5c,LANG_MENU_RAW_SAVE,                   MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.save_raw, (int)cb_change_dng ),
 #else
-    MENU_ITEM(0x5c,LANG_MENU_RAW_SAVE,                MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.save_raw, 0 ),
-#endif
-    MENU_ITEM(0x59,LANG_MENU_OSD_RAW_EXCEPTIONS_PARAMS,         MENUITEM_SUBMENU,   &raw_exceptions_submenu, 0 ),
-    MENU_ENUM2(0x5f,LANG_MENU_RAW_NOISE_REDUCTION,    &conf.raw_nr, gui_raw_nr_modes ),
-    MENU_ITEM(0x5c,LANG_MENU_RAW_FIRST_ONLY,          MENUITEM_BOOL,      &conf.raw_save_first_only, 0 ),
-    MENU_ITEM(0x5c,LANG_MENU_RAW_SAVE_IN_DIR,         MENUITEM_BOOL,      &conf.raw_in_dir, 0 ),
-    MENU_ENUM2a(0x5f,LANG_MENU_RAW_PREFIX,            &conf.raw_prefix, img_prefixes, NUM_IMG_PREFIXES ),
-    MENU_ENUM2a(0x5f,LANG_MENU_RAW_EXTENSION,         &conf.raw_ext, img_exts, NUM_IMG_EXTS ),
-    MENU_ENUM2a(0x5f,LANG_MENU_SUB_PREFIX,            &conf.sub_batch_prefix, img_prefixes, NUM_IMG_PREFIXES ),
-    MENU_ENUM2a(0x5f,LANG_MENU_SUB_EXTENSION,         &conf.sub_batch_ext, img_exts, NUM_IMG_EXTS ),
-//  MENU_ITEM(0x60,LANG_MENU_SUB_IN_DARK_VALUE,       MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.sub_in_dark_value, MENU_MINMAX(0, 1023) ),
-//  MENU_ITEM(0x60,LANG_MENU_SUB_OUT_DARK_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.sub_out_dark_value, MENU_MINMAX(0, 1023) ),
-    MENU_ITEM(0x2a,LANG_MENU_RAW_DEVELOP,             MENUITEM_PROC,      gui_raw_develop, 0 ),
-    MENU_ITEM(0x5c,LANG_MENU_BAD_PIXEL_REMOVAL,       MENUITEM_ENUM,      gui_bad_pixel_enum, 0 ),
+    MENU_ITEM   (0x5c,LANG_MENU_RAW_SAVE,                   MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.save_raw, 0 ),
+#endif
+    MENU_ITEM   (0x59,LANG_MENU_OSD_RAW_EXCEPTIONS_PARAMS,      MENUITEM_SUBMENU,   &raw_exceptions_submenu, 0 ),
+    MENU_ENUM2  (0x5f,LANG_MENU_RAW_NOISE_REDUCTION,        &conf.raw_nr, gui_raw_nr_modes ),
+    MENU_ITEM   (0x5c,LANG_MENU_RAW_FIRST_ONLY,             MENUITEM_BOOL,      &conf.raw_save_first_only, 0 ),
+    MENU_ITEM   (0x5c,LANG_MENU_RAW_SAVE_IN_DIR,            MENUITEM_BOOL,      &conf.raw_in_dir, 0 ),
+    MENU_ENUM2a (0x5f,LANG_MENU_RAW_PREFIX,                 &conf.raw_prefix, img_prefixes, NUM_IMG_PREFIXES ),
+    MENU_ENUM2a (0x5f,LANG_MENU_RAW_EXTENSION,              &conf.raw_ext, img_exts, NUM_IMG_EXTS ),
+    MENU_ENUM2a (0x5f,LANG_MENU_SUB_PREFIX,                 &conf.sub_batch_prefix, img_prefixes, NUM_IMG_PREFIXES ),
+    MENU_ENUM2a (0x5f,LANG_MENU_SUB_EXTENSION,              &conf.sub_batch_ext, img_exts, NUM_IMG_EXTS ),
+//  MENU_ITEM   (0x60,LANG_MENU_SUB_IN_DARK_VALUE,          MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.sub_in_dark_value, MENU_MINMAX(0, 1023) ),
+//  MENU_ITEM   (0x60,LANG_MENU_SUB_OUT_DARK_VALUE,         MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.sub_out_dark_value, MENU_MINMAX(0, 1023) ),
+    MENU_ITEM   (0x2a,LANG_MENU_RAW_DEVELOP,                MENUITEM_PROC,      gui_raw_develop, 0 ),
+    MENU_ITEM   (0x5c,LANG_MENU_BAD_PIXEL_REMOVAL,          MENUITEM_ENUM,      gui_bad_pixel_enum, 0 ),
+    MENU_ITEM   (0x5c,LANG_MENU_RAW_CACHED,                 MENUITEM_BOOL,      &conf.raw_cache,            0 ),
 #if DNG_SUPPORT
-    MENU_ITEM(0x5c,LANG_MENU_DNG_FORMAT,              MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.dng_raw , (int)cb_change_dng ),
-    MENU_ITEM(0x5c,LANG_MENU_RAW_DNG_EXT,             MENUITEM_BOOL,      &conf.raw_dng_ext, 0 ),
-    MENU_ITEM(0x2a,LANG_MENU_BADPIXEL_CREATE,         MENUITEM_PROC,      gui_menuproc_badpixel_create, 0 ),
-#endif
-    MENU_ITEM   (0x5c,LANG_MENU_RAW_CACHED,                 MENUITEM_BOOL,      &conf.raw_cache,            0 ),
+    MENU_ITEM   (0x0 ,(int)"DNG",                           MENUITEM_SEPARATOR, 0,                                                      0 ),
+    MENU_ITEM   (0x5c,LANG_MENU_DNG_FORMAT,                 MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.dng_raw , (int)cb_change_dng ),
+    MENU_ITEM   (0x5c,LANG_MENU_RAW_DNG_EXT,                MENUITEM_BOOL,      &conf.raw_dng_ext, 0 ),
+    MENU_ITEM   (0x5f,LANG_MENU_DNG_VERSION,                MENUITEM_ENUM,      gui_dng_version, 0),
+    MENU_ITEM   (0x2a,LANG_MENU_BADPIXEL_CREATE,            MENUITEM_PROC,      gui_menuproc_badpixel_create, 0 ),
+#endif
     MENU_ITEM   (0x51,LANG_MENU_BACK,                       MENUITEM_UP,        0,                          0 ),
     {0}
@@ -1037 +1043 @@
 #if DNG_SUPPORT
 void cb_change_dng(){
-     int old=conf.dng_raw;
+     int old=conf.dng_version;
      conf_change_dng();
-     if ((old==1) && (conf.dng_raw==0)) gui_mbox_init(LANG_ERROR, LANG_CANNOT_OPEN_BADPIXEL_FILE, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+     if ((old==1) && (conf.dng_version==0)) gui_mbox_init(LANG_ERROR, LANG_CANNOT_OPEN_BADPIXEL_FILE, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
 }
     
+const char* gui_dng_version(int change, int arg)
+{
+    static const char* modes[]={ "1.3", "1.1" };
+
+    gui_enum_value_change(&conf.dng_version,change,sizeof(modes)/sizeof(modes[0]));
+    cb_change_dng();
+
+    return modes[conf.dng_version];
+}
+
 void gui_menuproc_badpixel_create(int arg) {
         // After this action module will not be unloaded until reboot 
@@ -1225 +1241 @@
         static const char* names[]={ "Print", "Display"};
         static const int keys[] = {KEY_PRINT, KEY_DISPLAY};
-    #elif defined(CAMERA_sx220hs) || defined(CAMERA_sx230hs)
-        static const char* names[]={ "Disp+Set", "Display", "Playback", "Video"};
-        static const int keys[] = {KEY_PRINT, KEY_DISPLAY, KEY_PLAYBACK, KEY_VIDEO};
+    #elif defined(CAMERA_sx150is) || (CAMERA_sx220hs) || defined(CAMERA_sx230hs) || defined(CAMERA_s100)
+        static const char* names[]={ "Playback", "Video", "Display" };
+        static const int keys[] = {KEY_PRINT, KEY_VIDEO, KEY_DISPLAY};
     #elif defined(CAMERA_ixus220_elph300hs) || defined(CAMERA_ixus230_elph310hs)
         static const char* names[]={ "Video", "Display", "Playback", "Video"};

branches/reyalp-ptp-live/core/gui_draw.c

@@ -13 +13 @@
 //-------------------------------------------------------------------
 static void draw_pixel_std(unsigned int offset, color cl) {
-    frame_buffer[0][offset] = frame_buffer[1][offset] = cl & 0xff;
+#ifdef DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY        
+        extern int active_bitmap_buffer;
+        frame_buffer[active_bitmap_buffer][offset] = cl & 0xff;
+#else
+        frame_buffer[0][offset] = frame_buffer[1][offset] = cl & 0xff;
+#endif
 }
 

branches/reyalp-ptp-live/core/gui_lang.h

@@ -677 +677 @@
 #define LANG_MENU_SCRIPT_START_ENABLE                   551
 
-#define GUI_LANG_ITEMS                          551
+#define LANG_MENU_MISC_ZOOM_ASSIST              552
+
+#define LANG_MENU_DNG_VERSION                   553
+
+#define GUI_LANG_ITEMS                          553
 
 //-------------------------------------------------------------------

branches/reyalp-ptp-live/core/modules.c

@@ -69 +69 @@
 #elif CAM_SENSOR_BITS_PER_PIXEL==12
 #define MODULE_NAME_RAWOP "_rawop12.flt"
+#elif CAM_SENSOR_BITS_PER_PIXEL==14
+#define MODULE_NAME_RAWOP "_rawop14.flt"
 #else 
  #error define set_raw_pixel for sensor bit depth

branches/reyalp-ptp-live/core/raw.c

@@ -212 +212 @@
         case 3: addr[4] = (unsigned char)value; addr[5] = (addr[5]&0xF0) | (unsigned char)(value >> 8);  break;
     }
+#elif CAM_SENSOR_BITS_PER_PIXEL==14
 #else 
     #error define set_raw_pixel for sensor bit depth
@@ -239 +240 @@
         case 3: return ((unsigned short)(addr[5] & 0x0F) << 8) | (addr[4]);
     }
+#elif CAM_SENSOR_BITS_PER_PIXEL==14
+    return CAM_BLACK_LEVEL;
 #else 
     #error define get_raw_pixel for sensor bit depth

branches/reyalp-ptp-live/core/shooting.c

@@ -333 +333 @@
 int shooting_get_subject_distance_override_value()
 {
-  return (conf.subj_dist_override_value < shooting_get_lens_to_focal_plane_width()?0:(conf.subj_dist_override_value - shooting_get_lens_to_focal_plane_width()));
+    if (conf.subj_dist_override_value != INFINITY_DIST)
+        return (conf.subj_dist_override_value < shooting_get_lens_to_focal_plane_width()?0:(conf.subj_dist_override_value - shooting_get_lens_to_focal_plane_width()));
+    else
+        return INFINITY_DIST;
 }
 
@@ -1074 +1077 @@
                 s=shooting_get_near_limit_f(v,shooting_get_min_real_aperture(),get_focal_length(lens_get_zoom_point()));
             }
-            if (!conf.dof_use_exif_subj_dist) 
+            if (!conf.dof_use_exif_subj_dist && (s != INFINITY_DIST)) 
                 s+=shooting_get_lens_to_focal_plane_width();
             lens_set_focus_pos(s); 

branches/reyalp-ptp-live/include/camera.h

@@ -194 +194 @@
     #define CAMERA_MIN_DIST         0           // Define min distance that can be set in _MoveFocusLensToDistance (allow override - e.g. G12 min dist = 1)
     #define CAMERA_MAX_DIST         65535       // Define max distance that can be set in _MoveFocusLensToDistance (allow override for superzooms - SX30/SX40)
+
+        #undef  DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY       // Draw pixels on active bitmap buffer only. Requires active_bitmap_buffer location in stubs_min.S or stubs_entry.S.
+        
+    #undef  CAM_ZOOM_ASSIST_BUTTON_CONTROL      // Activate menu option to enable/disable the zoom assist button on the SX30/SX40
+                                                // For other cameras, requires additional support code in kbd.c (see the SX30 or SX40 version)
 
 //----------------------------------------------------------

branches/reyalp-ptp-live/include/conf.h

@@ -60 +60 @@
     int raw_cache;
     int dng_raw;
+    int dng_version;    // User selectable DNG version (0=1.3, 1=1.1) - select 1.1 for CHDK to do bad pixel removal (requires creation of badpixel.bin)
     int raw_timer;
     int raw_dng_ext;
@@ -327 +328 @@
 
         // gen 2 USB remote
-        int remote_switch_type ;
-        int remote_control_mode ;
+        int remote_switch_type;
+        int remote_control_mode;
 
     int ext_video_time;
     
-    int remote_enable_scripts ;  // usb remote activates scripts in <ALT> mode
+    int remote_enable_scripts;  // usb remote activates scripts in <ALT> mode
     
+#if defined(CAM_ZOOM_ASSIST_BUTTON_CONTROL)
+    int zoom_assist_button_disable;    // used to disable the zoom assist button on SX30 & SX40 for people who keep accidentaly pressing it
+#endif
+
 #ifdef CAM_HAS_GPS
     int gps_record;

branches/reyalp-ptp-live/include/propset1.h

@@ -46 +46 @@
 #define PROPCASE_WB_ADJ                     100
 #define PROPCASE_OPTICAL_ZOOM_POSITION      99 //untested !
+#define PROPCASE_STITCH_DIRECTION           52 // 0=left>right, 1=right>left. Some cams have more
+#define PROPCASE_STITCH_SEQUENCE            48 // counts shots in stitch sequence, positive for left-right, negative for right-left
 #endif

branches/reyalp-ptp-live/include/propset2.h

@@ -51 +51 @@
 #define PROPCASE_CONTINUOUS_AF              12      //G10 0 = Continuous AF off, 1 = Continuous AF on
 #define PROPCASE_DIGITAL_ZOOM_MODE          91      //G10 Digital Zoom Mode/State 0 = off/standard, 2 = 1.7x, 3 = 2.1x
+#define PROPCASE_STITCH_DIRECTION           233     //D10 0=left>right, 1=right>left
+#define PROPCASE_STITCH_SEQUENCE            238     //D10 counts shots in stitch sequence, positive=left>right, negative=right>left
 #endif

branches/reyalp-ptp-live/makefile.inc

@@ -1 @@
-include $(topdir)chdk_ver.inc
 
 MEMISOSIZE="(&_end-&_start)"
@@ -12 +11 @@
 include $(topdir)version.inc
 -include $(topdir)revision.inc
+
+ifndef OPT_DE_VERSION
+    VER=CHDK
+else
+    VER=CHDK_DE
+    ifndef OPT_DEFAULT_LANG
+        OPT_DEFAULT_LANG=german
+    endif
+endif
 
 ifdef PLATFORM
@@ -140 +148 @@
 LDFLAGS+=-L$(topdir)platform/$(PLATFORM) -L$(topdir)platform/$(PLATFORM)/sub/$(PLATFORMSUB)
 
-ifeq ($(VER),CHDK)
+ifndef OPT_DE_VERSION
 CFLAGS+=-DVER_CHDK
 else

branches/reyalp-ptp-live/platform/a1000/main.c

@@ -28 +28 @@
 }
 
-static const int fl_tbl[] = {5800, 6420, 7060, 7700, 8340, 9950, 11550, 13160, 14750, 17150, 19570, 22760, 26750, 30750, 34800};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60345
+// Focus length table in firmware @0xfffe297c
+#define NUM_FL      8   // 0 - 7, 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
+// ----      ----     --
+// 6.2       35       ( 35/ 6.2) * 62 = 350  (min FL)
+// 24.8      140      (140/24.8) * 62 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  62
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a1100/main.c

@@ -29 +29 @@
 }
 
-static const int fl_tbl[] = {6200, 7780, 9410, 11370, 13790, 16770, 20180, 24800};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56451   //---corect
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      8   // 0 - 7, 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
+// ----      ----     --
+// 6.2       35       ( 35/ 6.2) * 62 = 350  (min FL)
+// 24.8      140      (140/24.8) * 62 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  62
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a2000/main.c

@@ -29 +29 @@
 }
 
-static const int fl_tbl[] = {6400, 6800, 7600, 8800, 10500, 12300, 14100, 16100, 18500, 21200, 24000, 27100, 30700, 35100, 38400};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
+// Focus length table in firmware @0xfffe297c
+#define NUM_FL      15  // 0 - 14, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-// focal length range is 6.4 - 38.4 mm, 36 - 216 in 35-mm equivalent.
-// So, CF_EFL = 36/6.4 * 1000 = 56250 or 216/38.4 * 1000 = 56250.
-#define CF_EFL 5625
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.4       36       ( 36/ 6.4) * 64 = 360  (min FL)
+// 38.4      216      (216/38.4) * 64 = 360  (max FL)
+#define CF_EFL      360
+#define CF_EFL_DIV  64
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/a3000/main.c

@@ -26 +26 @@
 }
 
-//zoom position is get_parameter_data(87)
-static const struct {
-        int zp, fl;
-} fl_tbl[] = {
-  {   0,   6200},
-  {   1,   7780},
-  {   2,   9410},
-  {   3,   11370},
-  {   4,   13790},
-  {   5,   16770},
-  {   6,   20180},
-  {   7,   24800},
-};
+// Focus length table in firmware @0xfffe29b0
+#define NUM_FL      8   // 0 - 7, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-// A3000IS focal lenght range 6.2 - 24.8 mm (35 mm equivalent: 34.8 - 139.4 mm)(1/2.3" (7.7mm, crop 5.62) Type CCD, Scale Factor To 35 mm Equivalent: 4.6)
-// 34.8/6.2*10000=56129
-// 139.4/24.8*10000=56210
-
-#define CF_EFL 56200
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.2       35       ( 35/ 6.2) * 62 = 350  (min FL)
+// 24.8      140      (140/24.8) * 62 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  62
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else 
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp) 
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp) 
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        return fl_tbl[NUM_FL-1].fl;
+    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/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/a3300/main.c

@@ -28 +28 @@
 }
 
+// Focus length table in firmware @0xfffe2f88
+#define NUM_FL      12  // 0 - 11, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-#define NUM_FL 12
-extern int focus_len_table[NUM_FL*3];
-//a3300is
-// Focal length range is 5.0 - 25.0 mm, 28 - 140 in 35-mm equivalent.
-// So, CF_EFL = 28/5.0*10000=56000 or 140/25*10000=56000
-// divide by 10 to avoid overflow in get_effective_focal_length()
-#define CF_EFL  5600
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 25.0      140      (140/25.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
+
 const int zoom_points = NUM_FL;
 
-
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/10000;
+    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];
 }
-
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/a3300/sub/100a/stubs_entry.S

@@ -46 +46 @@
 DEF(focus_busy                              ,0x000064d8) // Found @0xff960130
 DEF(recreview_hold                          ,0x00003534) // Found @0xff89af5c
+DEF(palette_control                         ,0x0000916c) // Found @0xffa06c70
+DEF(active_palette_buffer                   ,0x00009174) // Found @0xffa06c74
+DEF(palette_buffer                          ,0x000b477c) // Found @0xffa07028
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/a3300/sub/100c/stubs_entry.S

@@ -46 +46 @@
 DEF(focus_busy                              ,0x000064d8) // Found @0xff960130
 DEF(recreview_hold                          ,0x00003534) // Found @0xff89af5c
+DEF(palette_control                         ,0x0000916c) // Found @0xffa06c70
+DEF(active_palette_buffer                   ,0x00009174) // Found @0xffa06c74
+DEF(palette_buffer                          ,0x000b477c) // Found @0xffa07028
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/a3300/sub/100d/stubs_entry.S

@@ -46 +46 @@
 DEF(focus_busy                              ,0x000064d8) // Found @0xff960130
 DEF(recreview_hold                          ,0x00003534) // Found @0xff89af5c
+DEF(palette_control                         ,0x0000916c) // Found @0xffa06c70
+DEF(active_palette_buffer                   ,0x00009174) // Found @0xffa06c74
+DEF(palette_buffer                          ,0x000b477c) // Found @0xffa07028
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/a480/main.c

@@ -28 +28 @@
 }
 
-static const int fl_tbl[] = {6600, 8060, 9840, 12050, 14800, 17550, 21600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56481L
+// Focus length table in firmware @0xfffe297c
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 6.6       37       ( 37/ 6.6) * 66 = 370  (min FL)
+// 21.6      122      (122/21.6) * 66 = 372,8  (max FL)
+#define CF_EFL      370
+#define CF_EFL_DIV  66
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/a490/main.c

@@ -28 +28 @@
 }
 
-// TODO: Check focal length table
-static const int fl_tbl[] = {6600, 8060, 9840, 12050, 14800, 17550, 21600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56481L
+// Focus length table in firmware @0xfffe2990
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 6.6       37       ( 37/ 6.6) * 66 = 370  (min FL)
+// 21.6      122      (122/21.6) * 66 = 372.8  (max FL)
+#define CF_EFL      370
+#define CF_EFL_DIV  66
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a495/main.c

@@ -28 +28 @@
 }
 
-// TODO: Check focal length table
-static const int fl_tbl[] = {6600, 8060, 9840, 12050, 14800, 17550, 21600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56481L
+// Focus length table in firmware @0xfffe2990
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 6.6       37       ( 37/ 6.6) * 66 = 370  (min FL)
+// 21.6      122      (122/21.6) * 66 = 372,8  (max FL)
+#define CF_EFL      370
+#define CF_EFL_DIV  66
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a580/main.c

@@ -29 +29 @@
 }
 
+// Focus length table in firmware @0xfffe297c
+#define NUM_FL      8   // 0 - 7, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {5800, 6700, 8000, 10000, 12600, 15800, 19300, 23200};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60345 //OK
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.8       35       ( 35/ 5.8) * 58 = 350  (min FL)
+// 23.2      140      (140/23.2) * 58 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  58
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a590/main.c

@@ -30 +30 @@
 }
 
-static const int fl_tbl[] = {5800, 6600, 7900, 9900, 12700, 16000, 19600, 23200};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60345
+// Focus length table in firmware @0xfffe29ac
+#define NUM_FL      8   // 0 - 7, 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
+// ----      ----     --
+// 5.8       35       ( 35/ 5.8) * 58 = 350  (min FL)
+// 23.2      140      (140/23.2) * 58 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  58
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a720/main.c

@@ -29 +29 @@
 }
 
+// Focus length table in firmware @0xfffe299c
+#define NUM_FL      15  // 0 - 14, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {5800, 6420, 7060, 7700, 8340, 9950, 11550, 13160, 14750, 17150, 19570, 22760, 26750, 30750, 34800};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60345
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.8       35       ( 35/ 5.8) * 58 = 350  (min FL)
+// 34.8      210      (210/34.8) * 58 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  58
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/a800/main.c

@@ -28 +28 @@
 }
 
-// TODO: Check focal length table
-static const int fl_tbl[] = {6600, 8060, 9840, 12050, 14800, 21600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56481L
+// Focus length table in firmware @0xfffe2ee8
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 6.6       37       ( 37/ 6.6) * 66 = 370  (min FL)
+// 21.6      122      (122/21.6) * 66 = 372.7  (max FL)
+#define CF_EFL      370
+#define CF_EFL_DIV  66
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/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

branches/reyalp-ptp-live/platform/a800/sub/100c/stubs_entry.S

@@ -45 +45 @@
 DEF(focus_busy                              ,0x0000551c) // Found @0xffd125c4
 DEF(recreview_hold                          ,0x000030d4) // Found @0xffc78de0
+DEF(palette_control                         ,0x00007810) // Found @0xffd88c44
+DEF(active_palette_buffer                   ,0x00007818) // Found @0xffd88c48
+DEF(palette_buffer                          ,0x00088f3c) // Found @0xffd88ff0
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/d10/main.c

@@ -43 +43 @@
 CF_EFL ~54800-56000
 */
-static const int fl_tbl[] = {6200, 7200, 8300, 9700, 11600, 14300, 18600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 55400
+
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 6.2       35       ( 35/ 6.2) * 62 = 350  (min FL)
+// 18.6      105      (105/18.6) * 62 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  62
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 // uses NB-6L, similar specs to NB-5L, copied from sd990 below 

branches/reyalp-ptp-live/platform/g10/main.c

@@ -28 +28 @@
 }
 
-// G10 focus length table in firmware @ FFFE2A8C for 1.02a, 1.03b & 1.04a
-// Note: same lens & table as G12
-
-#define NUM_FL 14               // 0 - 13, entries in firmware (3 words each entry, first is FL)
-extern int focus_len_table[NUM_FL*3];
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      14  // 0 - 13, 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
 // ----      ----     --
-// 6.1       28       (28/6.1) * 61 = 280  (min FL)
+// 6.1       28       ( 28/ 6.1) * 61 = 280  (min FL)
 // 30.5      140      (140/30.5) * 61 = 280  (max FL)
-
-#define CF_EFL 280
-#define CF_EFL_DIV 61
+#define CF_EFL      280
+#define CF_EFL_DIV  61
 
 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];
 }
 

branches/reyalp-ptp-live/platform/g11/main.c

@@ -26 +26 @@
 }
 
-//zoom position is get_parameter_data(87)
-static const struct {
-        int zp, fl;
-} fl_tbl[] = {
-  {   0,   6100},
-  {   1,   6800},
-  {   2,   7400},
-  {   3,   8100},
-  {   4,   8900},
-  {   5,   9800},
-  {   6,   10800},
-  {   7,   12100},
-  {   8,   13800},
-  {   9,   15700},
-  {  10,   18100},
-  {  11,   21500},
-  {  12,   25000},
-  {  13,   30500},
-};
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      14  // 0 - 13, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-// G11 focal lenght range 6.1 - 30.5 mm (35 mm equivalent: 27.8 - 139.1 mm)(1/1.7" Type CCD, Scale Factor To 35 mm Equivalent: 4.6)
-// 27,8/6,1*10000=45574
-// 139,1/30,5*10000=45607
-#define CF_EFL 45574
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.1       28       ( 28/ 6.1) * 61 = 280  (min FL)
+// 30.5      140      (140/30.5) * 61 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  61
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else 
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp) 
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp) 
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        return fl_tbl[NUM_FL-1].fl;
+    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/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/g12/main.c

@@ -36 +36 @@
 }
 
-// Focus length table in firmware @ FFFE2A80
-#define NUM_FL 14               // 0 - 13, entries in firmware (3 words each entry, first is FL)
-extern int focus_len_table[NUM_FL*3];
+// Focus length table in firmware @0xfffe2a80
+#define NUM_FL      14  // 0 - 13, 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
 // ----      ----     --
-// 6.1       28       (28/6.1) * 61 = 280  (min FL)
+// 6.1       28       ( 28/ 6.1) * 61 = 280  (min FL)
 // 30.5      140      (140/30.5) * 61 = 280  (max FL)
-#define CF_EFL 280
-#define CF_EFL_DIV 61
+#define CF_EFL      280
+#define CF_EFL_DIV  61
 
-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];
 }
 

branches/reyalp-ptp-live/platform/g12/sub/100c/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x000070c0) // Found @0xff97d6c8
 DEF(recreview_hold                          ,0x00003f50) // Found @0xff8a8134
+DEF(palette_control                         ,0x0000a5dc) // Found @0xffa53c24
+DEF(active_palette_buffer                   ,0x0000a5e4) // Found @0xffa53c28
+DEF(palette_buffer                          ,0x000bbf5c) // Found @0xffa5415c
+DEF(bitmap_buffer                           ,0x0000a618) // Found @0xffa57bb4
+DEF(active_bitmap_buffer                    ,0x0000a610) // Found @0xffa57bb8
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/g12/sub/100c/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 DEF(front_dial_position,                0xC0240306)
-// bitmap_buffer & acive_bitmap_buffer (1.00c)
-//      0xa610 = 0 or 1, used as index into 0xa618
-//      0xa618 = 0x40471000
-//      0xa61c = 0x404b0480 = 0x40471000 + bitmap size
-DEF(active_bitmap_buffer,               0xA610)         // 0xA5FC+0x14 (1.00c sub_FFA57B64 -> FFA57B68 + FFA57BB8)
-DEF(bitmap_buffer,                      0xA618)         // FFA57BB4
-DEF(palette_control,                    0xA5DC)         // sub_FFA53CDC (1.00c)
-DEF(active_palette_buffer,              0xA5E4)         // sub_FFA53C24 (1.00c)
-DEF(palette_buffer,                     0xBBF5C)        // sub_FFA54118 (1.00c)
 DEF(viewport_buffers,                   0xFFBB822C)     // 1.00c sub_FF852148 (FF85243C)
 DEF(active_viewport_buffer,             0x20AC)         // 1.00c sub_FF852148 (FF85214C & FF852468)

branches/reyalp-ptp-live/platform/g12/sub/100e/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x000070c0) // Found @0xff97d6c8
 DEF(recreview_hold                          ,0x00003f50) // Found @0xff8a8134
+DEF(palette_control                         ,0x0000a5dc) // Found @0xffa53c30
+DEF(active_palette_buffer                   ,0x0000a5e4) // Found @0xffa53c34
+DEF(palette_buffer                          ,0x000bbf5c) // Found @0xffa54168
+DEF(bitmap_buffer                           ,0x0000a618) // Found @0xffa57bc0
+DEF(active_bitmap_buffer                    ,0x0000a610) // Found @0xffa57bc4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/g12/sub/100e/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 DEF(front_dial_position,                0xC0240306)
-DEF(active_bitmap_buffer,               0xA610)         // 0xA5FC+0x14 (1.00e sub_FFA57B70 -> FFA57B74 + FFA57BC4)
-DEF(bitmap_buffer,                      0xA618)         // FFA57BC0
-DEF(palette_control,                    0xA5DC)         // sub_FFA53CDC (1.00c)
-DEF(active_palette_buffer,              0xA5E4)         // sub_FFA53C24 (1.00c)
-DEF(palette_buffer,                     0xBBF5C)        // sub_FFA54118 (1.00c)
 DEF(viewport_buffers,                   0xFFBB83DC)     // 1.00c sub_FF852148 (FF85243C)
 DEF(active_viewport_buffer,             0x20AC)         // 1.00c sub_FF852148 (FF85214C & FF852468)

branches/reyalp-ptp-live/platform/g12/sub/100f/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x000070c0) // Found @0xff97d6c8
 DEF(recreview_hold                          ,0x00003f50) // Found @0xff8a8134
+DEF(palette_control                         ,0x0000a5dc) // Found @0xffa53c30
+DEF(active_palette_buffer                   ,0x0000a5e4) // Found @0xffa53c34
+DEF(palette_buffer                          ,0x000bbf5c) // Found @0xffa54168
+DEF(bitmap_buffer                           ,0x0000a618) // Found @0xffa57bc0
+DEF(active_bitmap_buffer                    ,0x0000a610) // Found @0xffa57bc4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/g12/sub/100f/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 DEF(front_dial_position,                0xC0240306)
-DEF(active_bitmap_buffer,               0xA610)         // 0xA5FC+0x14 (1.00f sub_FFA57B70 -> FFA57B74 + FFA57BC4)
-DEF(bitmap_buffer,                      0xA618)         // FFA57BC0
-DEF(palette_control,                    0xA5DC)         // sub_FFA53CDC (1.00c)
-DEF(active_palette_buffer,              0xA5E4)         // sub_FFA53C24 (1.00c)
-DEF(palette_buffer,                     0xBBF5C)        // sub_FFA54118 (1.00c)
 DEF(viewport_buffers,                   0xFFBB83CC)     // 1.00c sub_FF852148 (FF85243C)
 DEF(active_viewport_buffer,             0x20AC)         // 1.00c sub_FF852148 (FF85214C & FF852468)

branches/reyalp-ptp-live/platform/g12/sub/100g/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x000070c0) // Found @0xff97d6c8
 DEF(recreview_hold                          ,0x00003f50) // Found @0xff8a8134
+DEF(palette_control                         ,0x0000a5dc) // Found @0xffa53c30
+DEF(active_palette_buffer                   ,0x0000a5e4) // Found @0xffa53c34
+DEF(palette_buffer                          ,0x000bbf5c) // Found @0xffa54168
+DEF(bitmap_buffer                           ,0x0000a618) // Found @0xffa57bc0
+DEF(active_bitmap_buffer                    ,0x0000a610) // Found @0xffa57bc4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/g12/sub/100g/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 DEF(front_dial_position,                0xC0240306)
-DEF(active_bitmap_buffer,               0xA610)         // 0xA5FC+0x14 (1.00g sub_FFA57B70 -> FFA57B74 + FFA57BC4)
-DEF(bitmap_buffer,                      0xA618)         // FFA57BC0
-DEF(palette_control,                    0xA5DC)         // sub_FFA53CDC (1.00c)
-DEF(active_palette_buffer,              0xA5E4)         // sub_FFA53C24 (1.00c)
-DEF(palette_buffer,                     0xBBF5C)        // sub_FFA54118 (1.00c)
 DEF(viewport_buffers,                   0xFFBB83B8)     // 1.00c sub_FF852148 (FF85243C)
 DEF(active_viewport_buffer,             0x20AC)         // 1.00c sub_FF852148 (FF85214C & FF852468)

branches/reyalp-ptp-live/platform/ixus1000_sd4500/main.c

@@ -31 +31 @@
 }
 
+// Focus length table in firmware @0xfffe9eac
+#define NUM_FL      101 // 0 - 100, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-//zoom position is get_parameter_data(87)
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.3       36       ( 36/ 6.3) * 63 = 360  (min FL)
+// 63.0      360      (360/63.0) * 63 = 360  (max FL)
+#define CF_EFL      360
+#define CF_EFL_DIV  63
 
-// Ixus 1000 576 =1
-static const struct {
-        int zp, fl;
-} fl_tbl[] = {
-  {   0,   6300},
-  {   5,  5*576+6300},
-  {   10, 10*576+6300},
-  {  20,  20*576+6300},
-  {  30,  30*576+6300},
-  {  40,  40*576+6300},
-  {  50,  50*576+6300},
-  {  60,  60*576+6300},
-  {  70,  70*576+6300},
-  {  80,  80*576+6300},
-  {  90,  90*576+6300},
-  { 100,  63000},
-};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-
-// Focal length range is 6.3 - 63,0 mm, 36.0 - 360 in 35-mm equivalent. for Ixus 1000 HS
-
-// Focal length range is 6.0 - 70,0 mm, 27.3 - 392 in 35-mm equivalent. for Sx210
-// So, CF_EFL = 27.3/5.0*10000=54600 or392/70*10000=56000
-// diff = 54600 - 54566.6 = 1400, split it 1400 / 2 = 700
-// add to base 56000 + 700 = 56700
-// divide by 10 to avoid overflow in get_effective_focal_length()
-#define CF_EFL  5714
-const int zoom_points = 100;
+const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp)
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp)
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        return fl_tbl[NUM_FL-1].fl;
+    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/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/ixus1000_sd4500/platform_camera.h

@@ -37 +37 @@
 
     #undef  CAM_CAN_SD_OVER_NOT_IN_MF
+    #define CAM_USE_ZOOM_FOR_MF             1
+    #define CAM_CAN_SD_OVER_IN_AF_LOCK      1
+    
     #undef  CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
 

branches/reyalp-ptp-live/platform/ixus1000_sd4500/sub/100d/stubs_entry.S

@@ -42 +42 @@
 DEF(focus_busy                              ,0x00007394) // Found @0xff972b30
 //DEF(recreview_hold                          ,0x00004294) // Found @0xff8a8800, ** != ** stubs_min = 0x000087e0 (0x86F4+0xEC)
+DEF(palette_control                         ,0x0000a338) // Found @0xffa2bd68
+DEF(active_palette_buffer                   ,0x0000a340) // Found @0xffa2bd6c
+DEF(palette_buffer                          ,0x000b84ac) // Found @0xffa2c2a0
+DEF(bitmap_buffer                           ,0x0000a374) // Found @0xffa30f50
+DEF(active_bitmap_buffer                    ,0x0000a36c) // Found @0xffa30f54
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus1000_sd4500/sub/100f/stubs_entry.S

@@ -42 +42 @@
 DEF(focus_busy                              ,0x00007394) // Found @0xff972b30
 //DEF(recreview_hold                          ,0x00004294) // Found @0xff8a8800, ** != ** stubs_min = 0x000087e8 (0x86FC+0xEC)
+DEF(palette_control                         ,0x0000a340) // Found @0xffa2bd6c
+DEF(active_palette_buffer                   ,0x0000a348) // Found @0xffa2bd70
+DEF(palette_buffer                          ,0x000b84ac) // Found @0xffa2c2a4
+DEF(bitmap_buffer                           ,0x0000a37c) // Found @0xffa30f54
+DEF(active_bitmap_buffer                    ,0x0000a374) // Found @0xffa30f58
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus100_sd780/main.c

@@ -66 +66 @@
 #define MODESCNT (sizeof(modemap)/sizeof(modemap[0]))
 
-//SD780 is [f/3.2 is 6mm] [f/3.5 7mm] [f/4.5 11mm] [f/5   15mm] [f/5.8 18mm]
-//SD780 is 5.9-17.9mm f/3.2-5.8 (35mm film equivalent: 33-100mm)
-static const int fl_tbl[] = {5900,7170,8740,10550,12490,14780,17900};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 55932
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 5.9       33       ( 33/ 5.9) * 59 = 330  (min FL)
+// 17.9      100      (100/17.9) * 59 = 329.6  (max FL)
+#define CF_EFL      330
+#define CF_EFL_DIV  59
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus120_sd940/main.c

@@ -28 +28 @@
 }
 
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      10  // 0 - 9, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-
-static const int fl_tbl[] = {5000, 6000, 7000, 8000, 9500, 10900, 12800,15000,173000,20000};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-// SD940 focal length range is 5 - 20 mm
-// So, CF_EFL = 15/5*10000=30000
-#define CF_EFL 30000
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 20.0      112      (112/20.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/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

branches/reyalp-ptp-live/platform/ixus200_sd980/main.c

@@ -28 +28 @@
 }
 
+// Focus length table in firmware @0xfffe2ac8
+#define NUM_FL      12  // 0 - 11, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-
-static const int fl_tbl[] = {4000, 5000, 6000, 7000, 8000, 9000, 11000, 13000,15000,18000,22000};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-// SD980 focal length range is 4 - 22 mm
-// So, CF_EFL = 22/4*10000=55000
-#define CF_EFL 55000
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 4.3       24       ( 24/ 4.3) * 43 = 240  (min FL)
+// 21.5      120      (120/21.5) * 43 = 240  (max FL)
+#define CF_EFL      240
+#define CF_EFL_DIV  43
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus200_sd980/platform_camera.h

@@ -35 +35 @@
     #define CAM_BRACKETING                  1
     #undef  CAM_VIDEO_CONTROL
-    #undef  CAM_HAS_IRIS_DIAPHRAGM
     #define CAM_MULTIPART                   1
     #define CAM_HAS_JOGDIAL                 1

branches/reyalp-ptp-live/platform/ixus220_elph300hs/main.c

@@ -30 +30 @@
 
 // Focus length table in firmware @0xfffea288
-#define NUM_FL 60               // 0 - 59, entries in firmware (3 words each entry, first is FL)
-extern int focus_len_table[NUM_FL*3];
+#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) * 43 = 240  (min FL)
+// 21.5      120      (120/21.5) * 43 = 240  (max FL)
+#define CF_EFL      240
+#define CF_EFL_DIV  43
 
-// Focal length range is 4.3 - 21.5 mm, 24 - 120 in 35-mm equivalent.
-// So, CF_EFL = 21.5/4.3*10000=50000 or 120/24*10000=50000
-// divide by 10 to avoid overflow in get_effective_focal_length()
-#define CF_EFL  5000
-const int zoom_points = 60;
+const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    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];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/100c/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
 DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
+DEF(palette_control                         ,0x00009d00) // Found @0xffa32d78
+DEF(active_palette_buffer                   ,0x00009d08) // Found @0xffa32d7c
+DEF(palette_buffer                          ,0x000bb254) // Found @0xffa33254
+DEF(bitmap_buffer                           ,0x00009d40) // Found @0xffa36ca0
+DEF(active_bitmap_buffer                    ,0x00009d38) // Found @0xffa36ca4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101a/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
 DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
+DEF(palette_control                         ,0x00009d00) // Found @0xffa32d78
+DEF(active_palette_buffer                   ,0x00009d08) // Found @0xffa32d7c
+DEF(palette_buffer                          ,0x000bb254) // Found @0xffa33254
+DEF(bitmap_buffer                           ,0x00009d40) // Found @0xffa36ca0
+DEF(active_bitmap_buffer                    ,0x00009d38) // Found @0xffa36ca4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101c/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
 DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
+DEF(palette_control                         ,0x00009d00) // Found @0xffa32d78
+DEF(active_palette_buffer                   ,0x00009d08) // Found @0xffa32d7c
+DEF(palette_buffer                          ,0x000bb254) // Found @0xffa33254
+DEF(bitmap_buffer                           ,0x00009d40) // Found @0xffa36ca0
+DEF(active_bitmap_buffer                    ,0x00009d38) // Found @0xffa36ca4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus220_elph300hs/sub/101g/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
 DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510
+DEF(palette_control                         ,0x00009d00) // Found @0xffa32d78
+DEF(active_palette_buffer                   ,0x00009d08) // Found @0xffa32d7c
+DEF(palette_buffer                          ,0x000bb254) // Found @0xffa33254
+DEF(bitmap_buffer                           ,0x00009d40) // Found @0xffa36ca0
+DEF(active_bitmap_buffer                    ,0x00009d38) // Found @0xffa36ca4
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus230_elph310hs/main.c

@@ -29 +29 @@
 }
 
-// Focus length table in firmware @0xFFF4ABC8
-#define NUM_FL 127
-extern int focus_len_table[NUM_FL*3];
+// Focus length table in firmware @0xfff4abc8
+#define NUM_FL      127 // 0 - 126, entries in firmware
+#define NUM_DATA    2   // 2 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 40.0      224      (224/40.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
 
-// Focal length range is 5.0 - 40.0 mm, 28 - 224 in 35-mm equivalent.
-// So, CF_EFL = 28/5*10000=56000 or 224/40*10000=56000
-// divide by 10 to avoid overflow in get_effective_focal_length()
-#define CF_EFL  5600
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    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];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/ixus230_elph310hs/sub/100b/stubs_entry.S

@@ -40 +40 @@
 DEF(focus_busy                              ,0x00006a40) // Found @0xff17aa94
 DEF(recreview_hold                          ,0x000038ec) // Found @0xff09a5d4
+DEF(palette_control                         ,0x00009a2c) // Found @0xff22fc38
+DEF(active_palette_buffer                   ,0x00009a34) // Found @0xff22fc3c
+DEF(palette_buffer                          ,0x000b9c80) // Found @0xff230104
+DEF(bitmap_buffer                           ,0x00009a70) // Found @0xff233948
+DEF(active_bitmap_buffer                    ,0x00009a68) // Found @0xff23394c
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus300_sd4000/main.c

@@ -33 +33 @@
 }
 
-// F/2.0 - 5.3
-// 4.9 - 18.6mm
-static const int fl_tbl[] = {5800, 6420, 7060, 7700, 8340, 9950, 11550, 13160, 14750, 17150, 19570, 22760, 26750, 30750, 34800};    // ToDo, convert a focus position to a focal length (* 1000), http://chdk.setepontos.com/index.php?topic=5722.msg59333#msg59333
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60345    // ToDo, convert a camera focal length to a 35mm effective focal length, http://chdk.setepontos.com/index.php?topic=5722.msg59333#msg59333
+// Focus length table in firmware @0xfffe9718 
+#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.9       28       ( 28/ 4.9) * 49 = 280  (min FL)
+// 18.6      105      (105/18.6) * 49 = 276.6  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  49
 
 const int zoom_points = NUM_FL;
 
-// ToDo, http://chdk.setepontos.com/index.php?topic=5722.msg59333#msg59333
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
-// ToDo
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    if (zp < 0) zp = 0;
+    else if (zp >= NUM_FL) zp = NUM_FL-1;
+    return focus_len_table[zp*NUM_DATA];
 }
 
-// ToDo
 int get_zoom_x(int zp) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus300_sd4000/platform_camera.h

@@ -56 +56 @@
 
     #define PARAM_CAMERA_NAME               4        // parameter number for GetParameterData to get camera name
+
+    #undef  DNG_BADPIXEL_VALUE_LIMIT
+    #define DNG_BADPIXEL_VALUE_LIMIT        16      // Camera sensor apparently has bad pixels with value > 0 & <=16
 
     #define CAM_DNG_LENS_INFO               { 49,10, 186,10, 20,10, 53,10 } // See comments in camera.h

branches/reyalp-ptp-live/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];
 }
 

branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/100a/stubs_entry.S

@@ -42 +42 @@
 DEF(focus_busy                              ,0x00006e70) // Found @0xff173e9c
 DEF(recreview_hold                          ,0x0000391c) // Found @0xff098530
+DEF(palette_control                         ,0x0000a424) // Found @0xff244990
+DEF(active_palette_buffer                   ,0x0000a42c) // Found @0xff244994
+DEF(palette_buffer                          ,0x000c7dec) // Found @0xff244e6c
+DEF(bitmap_buffer                           ,0x0000a464) // Found @0xff249aec
+DEF(active_bitmap_buffer                    ,0x0000a45c) // Found @0xff249af0
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/100a/stubs_min.S

@@ -1 +1 @@
 #include "stubs_asm.h"
 
-DEF(active_bitmap_buffer,               0xA45C)         // 0xA448+0x14 (1.00a sub_FF249A94 -> FF249A98 + FF249AF0)
-DEF(bitmap_buffer,                      0xA464)         // FF249AEC (1.00a)
-DEF(palette_control,                    0xA424)         // sub_FF244A48 (1.00a)
-DEF(active_palette_buffer,              0xA42C)         // sub_FF244990 (1.00a)
-DEF(palette_buffer,                     0xC7DEC)        // sub_FF244E28 (1.00a)
 DEF(viewport_buffers,                   0xFF3D0418)     // 1.00a sub_FF0435C8 (FF043978)
 DEF(active_viewport_buffer,             0x2104)         // 1.00a sub_FF0435C8 (FF0435CC & FF043A28)

branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/101a/stubs_entry.S

@@ -42 +42 @@
 DEF(focus_busy                              ,0x00006e70) // Found @0xff173e9c
 DEF(recreview_hold                          ,0x0000391c) // Found @0xff098530
+DEF(palette_control                         ,0x0000a424) // Found @0xff244990
+DEF(active_palette_buffer                   ,0x0000a42c) // Found @0xff244994
+DEF(palette_buffer                          ,0x000c7dec) // Found @0xff244e6c
+DEF(bitmap_buffer                           ,0x0000a464) // Found @0xff249aec
+DEF(active_bitmap_buffer                    ,0x0000a45c) // Found @0xff249af0
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/101a/stubs_min.S

@@ -1 +1 @@
 #include "stubs_asm.h"
 
-DEF(active_bitmap_buffer,               0xA45C)         // 0xA448+0x14 (1.01a sub_FF249A94 -> FF249A98 + FF249AF0)
-DEF(bitmap_buffer,                      0xA464)         // FF249AEC (1.00a)
-DEF(palette_control,                    0xA424)         // sub_FF244A48 (1.00a)
-DEF(active_palette_buffer,              0xA42C)         // sub_FF244990 (1.00a)
-DEF(palette_buffer,                     0xC7DEC)        // sub_FF244E28 (1.00a)
 DEF(viewport_buffers,                   0xFF3D0418)     // 1.00a sub_FF0435C8 (FF043978)
 DEF(active_viewport_buffer,             0x2104)         // 1.00a sub_FF0435C8 (FF0435CC & FF043A28)

branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/101c/stubs_entry.S

@@ -42 +42 @@
 DEF(focus_busy                              ,0x00006e70) // Found @0xff173e9c
 DEF(recreview_hold                          ,0x0000391c) // Found @0xff098530
+DEF(palette_control                         ,0x0000a424) // Found @0xff244990
+DEF(active_palette_buffer                   ,0x0000a42c) // Found @0xff244994
+DEF(palette_buffer                          ,0x000c7dec) // Found @0xff244e6c
+DEF(bitmap_buffer                           ,0x0000a464) // Found @0xff249aec
+DEF(active_bitmap_buffer                    ,0x0000a45c) // Found @0xff249af0
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/ixus310_elph500hs/sub/101c/stubs_min.S

@@ -11 +11 @@
 DEF(cds_gain_value                                                      ,0x0000abd0)
 
-DEF(active_bitmap_buffer, 0xA45C)                                       // 0xA448+0x14 (1.01a sub_FF249A94 -> FF249A98 + FF249AF0)
-DEF(bitmap_buffer, 0xA464)                                                      // FF249AEC (1.00a)
-DEF(palette_control, 0xA424)                                            // sub_FF244A48 (1.00a)
-DEF(active_palette_buffer, 0xA42C)                                      // sub_FF244990 (1.00a)
-DEF(palette_buffer, 0xC7DEC)                                            // sub_FF244E28 (1.00a)
 DEF(viewport_buffers, 0xFF3D0428)                       // 1.00a sub_FF0435C8 (FF043978)
 DEF(active_viewport_buffer, 0x2104)                     // 1.00a sub_FF0435C8 (FF0435CC & FF043A28)

branches/reyalp-ptp-live/platform/ixus85_sd770/main.c

@@ -26 +26 @@
 }
 
+// Focus length table in firmware @0xfffe297c
+#define NUM_FL      7   // 0 - 6, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {6200, 7230, 8295, 9681, 11614, 14303, 18600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56460
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.2       35       ( 35/ 6.2) * 62 = 350  (min FL)
+// 18.6      105      (105/18.6) * 62 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  62
 
 const int zoom_points = NUM_FL;
 
-int get_effective_focal_length(int zp)
-{
-        return (CF_EFL*get_focal_length(zp))/10000;
+int get_effective_focal_length(int zp) {
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
-int get_focal_length(int zp)
-{
-        if (zp<0) {
-                return fl_tbl[0];
-        } else if (zp>NUM_FL-1) {
-                return fl_tbl[NUM_FL-1];
-        } else {
-                return fl_tbl[zp];
-        }
+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*NUM_DATA];
 }
 
-int get_zoom_x(int zp)
-{
-        if (zp<1) {
-                return 10;
-        } else if (zp>NUM_FL-1) {
-                return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-        } else {
-                return fl_tbl[zp]*10/fl_tbl[0];
-        }
+int get_zoom_x(int zp) {
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus860_sd870/main.c

@@ -29 +29 @@
 }
 
+// Focus length table in firmware @0xfffe2990
+#define NUM_FL      8   // 0 - 7, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {4600, 6140, 7560, 9110, 10830, 12670, 14690, 17300};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60869
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 4.6       28       ( 28/ 4.6) * 46 = 280  (min FL)
+// 17.3      105      (105/17.3) * 46 = 279.2  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  46
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus95_sd1200/main.c

@@ -67 +67 @@
 #define MODESCNT (sizeof(modemap)/sizeof(modemap[0]))
 
-static const int fl_tbl[] = {6200,7230,8295,9681,11614,14303,18600};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56452
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      7   // 0 - 6, 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
+// ----      ----     --
+// 6.2       35       ( 35/ 6.2) * 62 = 350  (min FL)
+// 18.6      105      (105/18.6) * 62 = 350  (max FL)
+#define CF_EFL      350
+#define CF_EFL_DIV  62
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus960_sd950/main.c

@@ -25 +25 @@
 }
 
+// Focus length table in firmware @0xfffe296c
+#define NUM_FL      8   // 0 - 7, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {7700, 9572, 11454, 13683, 16293, 19548, 23495, 28500};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 60869
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 7.7       36       ( 36/ 7.7) * 77 = 360  (min FL)
+// 28.5      133      (133/28.5) * 77 = 359.3  (max FL)
+#define CF_EFL      360
+#define CF_EFL_DIV  77
+
 const int zoom_points = NUM_FL;
+
 int get_effective_focal_length(int zp) {
-return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
+
 int get_focal_length(int zp) {
-if (zp<0) return fl_tbl[0];
-else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-else return fl_tbl[zp];
+    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) {
-if (zp<1) return 10;
-else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
+
 #if 0
 int rec_switch_state(void) {

branches/reyalp-ptp-live/platform/ixus970_sd890/main.c

@@ -26 +26 @@
 }
 
+// Focus length table in firmware @0xfffe297c
+#define NUM_FL      12  // 0 - 11, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {6600, 7800, 9000, 10300, 11900,13500, 15400, 17700, 20400, 23700, 28000, 33000};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 56060
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.6       37       ( 37/ 6.6) * 66 = 370  (min FL)
+// 33.0      185      (185/33.0) * 66 = 370  (max FL)
+#define CF_EFL      370
+#define CF_EFL_DIV  66
 
 const int zoom_points = NUM_FL;
 
-int get_effective_focal_length(int zp)
-{
-        return (CF_EFL*get_focal_length(zp))/10000;
+int get_effective_focal_length(int zp) {
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
-int get_focal_length(int zp)
-{
-        if (zp<0) {
-                return fl_tbl[0];
-        } else if (zp>NUM_FL-1) {
-                return fl_tbl[NUM_FL-1];
-        } else {
-                return fl_tbl[zp];
-        }
+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*NUM_DATA];
 }
 
-int get_zoom_x(int zp)
-{
-        if (zp<1) {
-                return 10;
-        } else if (zp>NUM_FL-1) {
-                return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-        } else {
-                return fl_tbl[zp]*10/fl_tbl[0];
-        }
+int get_zoom_x(int zp) {
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/ixus980_sd990/main.c

@@ -29 +29 @@
 }
 
-// from sd950, zoom steps and sensor size same
-static const int fl_tbl[] = {7700, 9572, 11454, 13683, 16293, 19548, 23495, 28500};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-// sd950 uses wrong value
-// #define CF_EFL 60869
-// ewavr
-// SD990 focal length range is 7,7 - 28,5 mm, 36 - 133 in 35-mm equivalent.
-// So, CF_EFL = 36/7.7*10000=46753 or 133/28.5*10000=46666.
-#define CF_EFL 46710 // split the difference
+// Focus length table in firmware @0xfffe2a8c
+#define NUM_FL      8   // 0 - 7, 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
+// ----      ----     --
+// 7.7       36       ( 36/ 7.7) * 77 = 360  (min FL)
+// 28.5      133      (133/28.5) * 77 = 359.3  (max FL) //360 on 133.2mm(T)
+#define CF_EFL      360
+#define CF_EFL_DIV  77
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/s95/main.c

@@ -26 +26 @@
 }
 
+// Focus length table in firmware @0xfffe2d2c
+#define NUM_FL      10  // 0 - 9, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-//zoom position is get_parameter_data(87)
-static const struct {
-        int zp, fl;
-} fl_tbl[] = {
-  {   0,   6000},
-  {   1,   6850},
-  {   2,   7490},
-  {   3,   8560},
-  {   4,   9640},
-  {   5,   10700},
-  {   6,   12850},
-  {   7,   14980},
-  {   8,   18190},
-  {   9,   22500},
-};
-
-
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-// S90 focal lenght range 6.0 - 22.5 mm (35 mm equivalent: 28 - 105 mm)(1/1.7" Type CCD, Scale Factor To 35 mm Equivalent: 4.6)
-// 28/6,0*10000=46666
-// 105/22,5*10000=46666
-
-#define CF_EFL 46666
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.0       28       ( 28/ 6.0) * 60 = 280  (min FL)
+// 22.5      105      (105/22.5) * 60 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  60
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/10000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else {
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp)
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp)
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        }
-        return fl_tbl[NUM_FL-1].fl;
+    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/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/s95/sub/100e/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006f30) // Found @0xff97bec4
 //DEF(recreview_hold                          ,0x00003e14) // Found @0xff8a8648, ** != ** stubs_min = 0x0000828c (0x81f8+0x94)
+DEF(palette_control                         ,0x0000a0d4) // Found @0xffa47590
+DEF(active_palette_buffer                   ,0x0000a0dc) // Found @0xffa47594
+DEF(palette_buffer                          ,0x000bc434) // Found @0xffa47ac8
+DEF(bitmap_buffer                           ,0x0000a110) // Found @0xffa4c778
+DEF(active_bitmap_buffer                    ,0x0000a108) // Found @0xffa4c77c
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/s95/sub/100h/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006f30) // Found @0xff97bec4
 //DEF(recreview_hold                          ,0x00003e14) // Found @0xff8a8648, ** != ** stubs_min = 0x000082e0 (0x81f8+0xE8)
+DEF(palette_control                         ,0x0000a0d4) // Found @0xffa4759c
+DEF(active_palette_buffer                   ,0x0000a0dc) // Found @0xffa475a0
+DEF(palette_buffer                          ,0x000bc434) // Found @0xffa47ad4
+DEF(bitmap_buffer                           ,0x0000a110) // Found @0xffa4c784
+DEF(active_bitmap_buffer                    ,0x0000a108) // Found @0xffa4c788
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/s95/sub/100i/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006f30) // Found @0xff97bec4
 //DEF(recreview_hold                          ,0x00003e14) // Found @0xff8a8648, ** != ** stubs_min = 0x000082e0 (0x81f8+0xE8)
+DEF(palette_control                         ,0x0000a0d4) // Found @0xffa4759c
+DEF(active_palette_buffer                   ,0x0000a0dc) // Found @0xffa475a0
+DEF(palette_buffer                          ,0x000bc434) // Found @0xffa47ad4
+DEF(bitmap_buffer                           ,0x0000a110) // Found @0xffa4c784
+DEF(active_bitmap_buffer                    ,0x0000a108) // Found @0xffa4c788
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/s95/sub/100k/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00006f30) // Found @0xff97bec4
 //DEF(recreview_hold                          ,0x00003e14) // Found @0xff8a8648, ** != ** stubs_min = 0x000082e0 (0x81f8+0xE8)
+DEF(palette_control                         ,0x0000a0d4) // Found @0xffa4759c
+DEF(active_palette_buffer                   ,0x0000a0dc) // Found @0xffa475a0
+DEF(palette_buffer                          ,0x000bc434) // Found @0xffa47ad4
+DEF(bitmap_buffer                           ,0x0000a110) // Found @0xffa4c784
+DEF(active_bitmap_buffer                    ,0x0000a108) // Found @0xffa4c788
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx100is/main.c

@@ -29 +29 @@
 }
 
+// Focus length table in firmware @0xfffe31ac
+#define NUM_FL      23  // 0 - 22, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-static const int fl_tbl[] = {6000, 6700, 7300, 8200, 9100, 10300, 11500, 12800, 14400, 16100, 18100, 20100, 22400, 25200, 28100, 31500, 34900, 38900, 42500, 46600, 51100, 55900, 60000};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-#define CF_EFL 6000
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.0       36       ( 36/ 6.0) * 60 = 360  (min FL)
+// 60.0      360      (360/60.0) * 60 = 360  (max FL)
+#define CF_EFL      360
+#define CF_EFL_DIV  60
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/1000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/sx110is/main.c

@@ -29 +29 @@
 }
 
+// Focus length table in firmware @0xfffe31bc
+#define NUM_FL      23  // 0 - 22, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-//fl_tbl still the same as sx100
-static const int fl_tbl[] = {6000, 6700, 7300, 8200, 9100, 10300, 11500, 12800, 14400, 16100, 18100, 20100, 22400, 25200, 28100, 31500, 34900, 38900, 42500, 46600, 51100, 55900, 60000};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-//#define CF_EFL 6000
-#define CF_EFL 5600             //      1/2.3" as sx10
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 6.0       36       ( 36/ 6.0) * 60 = 360  (min FL)
+// 60.0      360      (360/60.0) * 60 = 360  (max FL)
+#define CF_EFL      360
+#define CF_EFL_DIV  60
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
 

branches/reyalp-ptp-live/platform/sx120is/main.c

@@ -29 +29 @@
 }
 
-// from sx100
-//fl_tbl still the same as sx100
-static const int fl_tbl[] = {6000, 6700, 7300, 8200, 9100, 10300, 11500, 12800, 14400, 16100, 18100, 20100, 22400, 25200, 28100, 31500, 34900, 38900, 42500, 46600, 51100, 55900, 60000};
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-//#define CF_EFL 6000
-#define CF_EFL 5600             //      1/2.3" as sx10
+// Focus length table in firmware @0xfffe328c
+#define NUM_FL      23  // 0 - 22, 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
+// ----      ----     --
+// 6.0       36       ( 36/ 6.0) * 60 = 360  (min FL)
+// 60.0      360      (360/60.0) * 60 = 360  (max FL)
+#define CF_EFL      360
+#define CF_EFL_DIV  60
 
 const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-    if (zp<0) return fl_tbl[0];
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1];
-    else return fl_tbl[zp];
+    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) {
-    if (zp<1) return 10;
-    else if (zp>NUM_FL-1) return fl_tbl[NUM_FL-1]*10/fl_tbl[0];
-    else return fl_tbl[zp]*10/fl_tbl[0];
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
-//end sx100
-
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/sx130is/main.c

@@ -26 +26 @@
 }
 
+// Focus length table in firmware @0xfffe94ec
+#define NUM_FL      128 // 0 - 127, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-//zoom position is get_parameter_data(87)
-static const struct {
-        int zp, fl;
-} fl_tbl[] = {
-  {   0,    5000},
-  {   16,   8225},
-  {   32,   13080},
-  {   48,   20270},
-  {   64,   29150},
-  {   80,   38125},
-  {   96,   45750},
-  {   112,  51650},
-  {   127,  60000}
-};
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 60.0      336      (336/60.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
 
-
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-
-// SX130 focal lenght range 5.0 - 60 mm (35 mm equivalent: 28 - 336 mm)(1/2.3" Type CCD, Scale Factor To 35 mm Equivalent: 5.6)
-// 28/5.0*100=560
-// 336/60*100=560
-#define CF_EFL 560
-
-const int zoom_points = 128;
+const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/100;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else {
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp)
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp)
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        }
-        return fl_tbl[NUM_FL-1].fl;
+    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/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/sx130is/sub/101c/stubs_entry.S

@@ -45 +45 @@
 DEF(focus_busy                              ,0x00006978) // Found @0xff95fd2c
 //DEF(recreview_hold                          ,0x00003a50) // Found @0xff89d940, ** != ** stubs_min = 0x000079d0 (0x78E4+0xEC)
+DEF(palette_control                         ,0x00009458) // Found @0xffa093d0
+DEF(active_palette_buffer                   ,0x00009460) // Found @0xffa093d4
+DEF(palette_buffer                          ,0x000b3a58) // Found @0xffa0978c
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx130is/sub/101d/stubs_entry.S

@@ -45 +45 @@
 DEF(focus_busy                              ,0x00006978) // Found @0xff95fd2c
 //DEF(recreview_hold                          ,0x00003a50) // Found @0xff89d940, ** != ** stubs_min = 0x000079d0 (0x78E4+0xEC)
+DEF(palette_control                         ,0x00009458) // Found @0xffa093d0
+DEF(active_palette_buffer                   ,0x00009460) // Found @0xffa093d4
+DEF(palette_buffer                          ,0x000b3a58) // Found @0xffa0978c
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx130is/sub/101f/stubs_entry.S

@@ -42 +42 @@
 DEF(focus_busy                              ,0x00006978) // Found @0xff95fd2c
 //DEF(recreview_hold                          ,0x00003a50) // Found @0xff89d940, ** != ** stubs_min = 0x000079d0 (0x78E4+0xEC)
+DEF(palette_control                         ,0x00009458) // Found @0xffa093d0
+DEF(active_palette_buffer                   ,0x00009460) // Found @0xffa093d4
+DEF(palette_buffer                          ,0x000b3a58) // Found @0xffa0978c
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx150is/kbd.c

@@ -18 +18 @@
 static KeyMap keymap[];
 static long last_kbd_key = 0;
-static long alt_mode_key_mask = 0x00005000;
-static long alt_mode_key_reg  = 2;
 
 volatile int jogdial_stopped=0;
@@ -26 +24 @@
 #define KEYS_MASK0 (0x00000000)
 #define KEYS_MASK1 (0x0000F000)
-#define KEYS_MASK2 (0x00007F00)
+#define KEYS_MASK2 (0x00007F50)
 
 #define SD_READONLY_FLAG    (0x20000) // Found @0xffb90df0, levent 0x20a
@@ -51 +49 @@
         // always pressed if KEY_SHOOT_FULL is. --MarcusSt
     { 2, KEY_VIDEO     , 0x00000010 },
-    { 2, KEY_PLAYBACK  , 0x00000040 },
+    { 2, KEY_PRINT     , 0x00000040 }, // playback
+    { 2, KEY_PLAYBACK  , 0x00000040 }, // alias so script can use it TODO not clear if wee need PRINT version
         { 2, KEY_UP        , 0x00000100 },
         { 2, KEY_DOWN      , 0x00000200 },
@@ -58 +57 @@
         { 2, KEY_SET       , 0x00001000 },
         { 2, KEY_MENU      , 0x00002000 },
-        { 2, KEY_PRINT     , 0x00005000 }, // SET+DISP
         { 2, KEY_DISPLAY   , 0x00004000 },
         { 2, KEY_ERASE     , 0x00008000 },
@@ -134 +132 @@
                 physw_status[1] = kbd_new_state[1];
                 physw_status[2] = kbd_new_state[2];
-                //physw_status[0] |= alt_mode_key_mask;
                 jogdial_stopped=0;
         }
@@ -162 +159 @@
 }
 
+// NOP
 void kbd_set_alt_mode_key_mask(long key)
 {
-    int i;
-    for (i=0; keymap[i].hackkey; ++i) {
-        if (keymap[i].hackkey == key) {
-            alt_mode_key_mask = keymap[i].canonkey;
-            alt_mode_key_reg  = keymap[i].grp;
-            return;
-        }
-    }
 }
 

branches/reyalp-ptp-live/platform/sx150is/main.c

@@ -26 +26 @@
 }
 
+// Focus length table in firmware @0xfffeabd8
+#define NUM_FL      128 // 0 - 127, entries in firmware
+#define NUM_DATA    2   // 2 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-//zoom position is get_parameter_data(87)
-static const struct {
-        int zp, fl;
-} fl_tbl[] = {
-  {   0,    5000},
-  {   16,   8225},
-  {   32,   13080},
-  {   48,   20270},
-  {   64,   29150},
-  {   80,   38125},
-  {   96,   45750},
-  {   112,  51650},
-  {   127,  60000}
-};
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 60.0      336      (336/60.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
 
-
-#define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0]))
-
-// SX150 focal lenght range 5.0 - 60 mm (35 mm equivalent: 28 - 336 mm)(1/2.3" Type CCD, Scale Factor To 35 mm Equivalent: 5.6)
-// 28/5.0*100=560
-// 336/60*100=560
-#define CF_EFL 560
-
-const int zoom_points = 128;
+const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-    return (CF_EFL*get_focal_length(zp))/100;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
 int get_focal_length(int zp) {
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else {
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp)
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp)
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        }
-        return fl_tbl[NUM_FL-1].fl;
+    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/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/sx150is/notes.txt

@@ -3 +3 @@
 * DryOS R39 Camera
 ---
-Alt shortcut: disp+set
-Note, you can hold either one and click the other
+Alt shortcut:
+adjustable, default is the play button. Hold for 1/2 second for original function
 
 This camera is able to boot from FAT32 cards when the appropriate BOOTDISK string is written

branches/reyalp-ptp-live/platform/sx150is/platform_camera.h

@@ -36 +36 @@
     #undef  CAM_UNCACHED_BIT
     #define CAM_UNCACHED_BIT                            0x40000000
+
+    #define CAM_ADJUSTABLE_ALT_BUTTON           1
 
     #define CAM_DNG_LENS_INFO                           { 50,10, 600,10, 34,10, 56,10 } // See comments in camera.h

branches/reyalp-ptp-live/platform/sx150is/sub/100a/stubs_entry.S

@@ -40 +40 @@
 DEF(focus_busy                              ,0x00006c5c) // Found @0xff97b73c
 DEF(recreview_hold                          ,0x00003b7c) // Found @0xff8a6484
+DEF(palette_control                         ,0x00009654) // Found @0xffa29f88
+//DEF(active_palette_buffer                   ,0x0000965c) // Found @0xffa29f8c, ** != ** stubs_min = 0x00009654 (0x9654)
+//DEF(palette_buffer                          ,0x000baa84) // Found @0xffa2a340,          stubs_min = 0x000baa84 (0xBAA84)
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx220hs/kbd.c

@@ -17 +17 @@
 static KeyMap keymap[];
 static long last_kbd_key = 0;
-
-static long alt_mode_key_mask = 0x00010800; // disp + set
 static int alt_mode_led=0;
 extern void _GetKbdState(long*);
@@ -50 +48 @@
 static KeyMap keymap[] = {
 
-        /* tiny bug: key order matters. see kbd_get_pressed_key()
-         * for example*/
- 
-
-        { 0, KEY_ZOOM_OUT        , 0x00000001 },
-        { 0, KEY_ZOOM_OUT1       , 0x00000001 },
-        { 0, KEY_ZOOM_OUT        , 0x00000002 },        
-        { 0, KEY_ZOOM_OUT3       , 0x00000002 },        
-        { 0, KEY_ZOOM_OUT                , 0x00000003 },
-        { 0, KEY_ZOOM_OUT2               , 0x00000003 },
-        { 0, KEY_ZOOM_IN         , 0x00000004 },
-        { 0, KEY_ZOOM_IN1        , 0x00000004 },        
-        { 0, KEY_ZOOM_IN                 , 0x00000008 },
-        { 0, KEY_ZOOM_IN3                , 0x00000008 },
-        { 0, KEY_ZOOM_IN                 , 0x0000000C },
-        { 0, KEY_ZOOM_IN2                , 0x0000000C },
-        { 0, KEY_DISPLAY         , 0x00000800 },
-        { 0, KEY_UP                      , 0x00001000 }, 
-        { 0, KEY_RIGHT               , 0x00006000 },
-        { 0, KEY_SET                 , 0x00010000 },
-        { 0, KEY_PRINT               , 0x00010800 },  //DISP+SET for ALT menu
-        { 0, KEY_DOWN                , 0x00020000 },
-        { 0, KEY_MENU                , 0x00040000 },
-        { 0, KEY_VIDEO               , 0x00080000 },    
-        { 0, KEY_RIGHT_SOFT          , 0x00002000 },
-        { 0, KEY_UP_SOFT             , 0x00000400 },
-        { 0, KEY_DOWN_SOFT           , 0x00008000 },    
-        
-        { 2, KEY_LEFT_SOFT               , 0x00000080 },
-        { 2, KEY_LEFT                    , 0x00000100 },
-        { 2, KEY_SHOOT_FULL              , 0x00002002 },        
-        { 2, KEY_SHOOT_FULL_ONLY , 0x00000002 },        
-        { 2, KEY_SHOOT_HALF              , 0x00002000 },
-
-        { 1, KEY_PLAYBACK            , 0x00200000 },    
-
-        { 0, 0, 0 }
+    /* tiny bug: key order matters. see kbd_get_pressed_key()
+    * for example*/
+
+    { 0, KEY_ZOOM_OUT        , 0x00000001 },
+    { 0, KEY_ZOOM_OUT1       , 0x00000001 },
+    { 0, KEY_ZOOM_OUT        , 0x00000002 },
+    { 0, KEY_ZOOM_OUT3       , 0x00000002 },
+    { 0, KEY_ZOOM_OUT        , 0x00000003 },
+    { 0, KEY_ZOOM_OUT2       , 0x00000003 },
+    { 0, KEY_ZOOM_IN         , 0x00000004 },
+    { 0, KEY_ZOOM_IN1        , 0x00000004 },
+    { 0, KEY_ZOOM_IN         , 0x00000008 },
+    { 0, KEY_ZOOM_IN3        , 0x00000008 },
+    { 0, KEY_ZOOM_IN         , 0x0000000C },
+    { 0, KEY_ZOOM_IN2        , 0x0000000C },
+    { 0, KEY_DISPLAY         , 0x00000800 },
+    { 0, KEY_UP              , 0x00001000 }, 
+    { 0, KEY_RIGHT           , 0x00006000 },
+    { 0, KEY_SET             , 0x00010000 },
+    { 0, KEY_DOWN            , 0x00020000 },
+    { 0, KEY_MENU            , 0x00040000 },
+    { 0, KEY_VIDEO           , 0x00080000 },
+ //   { 0, KEY_RIGHT_SOFT      , 0x00002000 },  //soft keys commented out but still counted in the keymasks, seems to disable them like we want.
+ //   { 0, KEY_UP_SOFT         , 0x00000400 },  //if enabled can cause unintentional button presses in alt menu when rotating the jogdial really fast.
+ //   { 0, KEY_DOWN_SOFT       , 0x00008000 },
+
+    { 1, KEY_PRINT           , 0x00200000 }, // playback = alt button
+    { 1, KEY_PLAYBACK        , 0x00200000 },
+
+ //   { 2, KEY_LEFT_SOFT       , 0x00000080 },
+    { 2, KEY_LEFT            , 0x00000100 },
+    { 2, KEY_SHOOT_FULL      , 0x00002002 },
+    { 2, KEY_SHOOT_FULL_ONLY , 0x00000002 },
+    { 2, KEY_SHOOT_HALF      , 0x00002000 },
+
+    { 0, 0, 0 }
 };
 
+// NOP
 void kbd_set_alt_mode_key_mask(long key)
 {
-        int i;
-        for (i=0; keymap[i].hackkey; ++i) {
-                if (keymap[i].hackkey == key) {
-                        alt_mode_key_mask = keymap[i].canonkey;
-                        return;
-                }
-        }
 }
 

branches/reyalp-ptp-live/platform/sx220hs/main.c

@@ -29 +29 @@
 }
 
-// Focus length table in firmware @FFF4A3DC  //sx220. like in g12 and sx30
-#define NUM_FL 126              // 0 - 125, entries in firmware (3 words each entry, first is FL)
-extern int focus_len_table[NUM_FL*3];
+// Focus length table in firmware @FFF4A3DC
+#define NUM_FL      126 // 0 - 125, 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
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 70.0      392      (392/70.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
 
-// Focal length range is 5.0 - 70,0 mm, 28 - 392 in 35-mm equivalent.
-// So, CF_EFL = 28/5.0*10000=56000 or392/70*10000=56000
-// divide by 10 to avoid overflow in get_effective_focal_length()
-#define CF_EFL  5600
-const int zoom_points = 126;
+const int zoom_points = NUM_FL;
 
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    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];
 }
-
 
 long get_vbatt_min()

branches/reyalp-ptp-live/platform/sx220hs/notes.txt

@@ -2 +2 @@
 SX220 HS Notes
 
-To enter CHDK <Alt> mode use the DISP+SET button.
+To enter CHDK <Alt> mode use the playback button.
 
 Support for dual partition is not available.

branches/reyalp-ptp-live/platform/sx220hs/platform_camera.h

@@ -110 +110 @@
         #define REMOTE_SYNC_STATUS_LED  0xC0220130              // specifies an LED that turns on while camera waits for USB remote to sync
         
+        #define DRAW_ON_ACTIVE_BITMAP_BUFFER_ONLY       1
 //----------------------------------------------------------

branches/reyalp-ptp-live/platform/sx220hs/sub/100a/stubs_entry.S

@@ -49 +49 @@
 DEF(focus_busy                              ,0x00008338) // Found @0xff17c768
 //DEF(recreview_hold                          ,0x00004d80) // Found @0xff09e130, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+DEF(palette_control                         ,0x0000b35c) // Found @0xff23d5a4
+DEF(active_palette_buffer                   ,0x0000b364) // Found @0xff23d5a8
+DEF(palette_buffer                          ,0x000cae40) // Found @0xff23da80
+DEF(bitmap_buffer                           ,0x0000b39c) // Found @0xff242700
+DEF(active_bitmap_buffer                    ,0x0000b394) // Found @0xff242704
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx220hs/sub/100a/stubs_min.S

@@ -6 +6 @@
 DEF(palette_buffer,                     0xCAE40) // loc_FF23DA3C (1.01a)
 DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
-DEF(enabled_refresh_physical_screen,    0x53C4 + 0x14)  //changed to fix error when displaying menu, was 0x20 FF0A99C0 
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4

branches/reyalp-ptp-live/platform/sx220hs/sub/101a/stubs_entry.S

@@ -49 +49 @@
 DEF(focus_busy                              ,0x00008338) // Found @0xff17c768
 //DEF(recreview_hold                          ,0x00004d80) // Found @0xff09e130, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+DEF(palette_control                         ,0x0000b35c) // Found @0xff23d5a4
+DEF(active_palette_buffer                   ,0x0000b364) // Found @0xff23d5a8
+DEF(palette_buffer                          ,0x000cae40) // Found @0xff23da80
+DEF(bitmap_buffer                           ,0x0000b39c) // Found @0xff242700
+DEF(active_bitmap_buffer                    ,0x0000b394) // Found @0xff242704
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx220hs/sub/101a/stubs_min.S

@@ -7 +7 @@
 DEF(zoom_status,                        0xF5A4)         // ff31c404
 DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
-DEF(enabled_refresh_physical_screen,    0x53C4 + 0x14)  //changed to fix error when displaying menu, was 0x20 FF0A99C0 
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4

branches/reyalp-ptp-live/platform/sx220hs/sub/101b/stubs_entry.S

@@ -49 +49 @@
 DEF(focus_busy                              ,0x00008338) // Found @0xff17c768
 //DEF(recreview_hold                          ,0x00004d80) // Found @0xff09e130, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+DEF(palette_control                         ,0x0000b35c) // Found @0xff23d5a4
+DEF(active_palette_buffer                   ,0x0000b364) // Found @0xff23d5a8
+DEF(palette_buffer                          ,0x000cae40) // Found @0xff23da80
+DEF(bitmap_buffer                           ,0x0000b39c) // Found @0xff242700
+DEF(active_bitmap_buffer                    ,0x0000b394) // Found @0xff242704
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx220hs/sub/101b/stubs_min.S

@@ -8 +8 @@
 DEF(zoom_status,                        0xF5A4)         // ff31c404
 DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
-DEF(enabled_refresh_physical_screen,    0x53C4 + 0x14)  //changed to fix error when displaying menu, was 0x20 FF0A99C0 
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4

branches/reyalp-ptp-live/platform/sx230hs/kbd.c

@@ -20 +20 @@
 static KeyMap keymap[];
 static long last_kbd_key = 0;
-;
-static long alt_mode_key_mask = 0x00010800; // disp + set
 static int alt_mode_led=0;
 extern void _GetKbdState(long*);
@@ -79 +77 @@
     { 0, KEY_DOWN_SOFT       , 0x00008000 },
     { 0, KEY_SET             , 0x00010000 },
-    { 0, KEY_PRINT           , 0x00010800 },  //DISP+SET for ALT menu
     { 0, KEY_DOWN            , 0x00020000 },
     { 0, KEY_MENU            , 0x00040000 },
     { 0, KEY_VIDEO           , 0x00080000 },
+
+    { 1, KEY_PRINT           , 0x00200000 }, // playback = alt button
     { 1, KEY_PLAYBACK        , 0x00200000 },
+
     { 2, KEY_LEFT_SOFT       , 0x00000080 },
     { 2, KEY_LEFT            , 0x00000100 },
@@ -89 +89 @@
     { 2, KEY_SHOOT_FULL_ONLY , 0x00000002 },
     { 2, KEY_SHOOT_HALF      , 0x00002000 },
+
     { 0, 0, 0 }
 };
 
+// NOP
 void kbd_set_alt_mode_key_mask(long key)
 {
-        int i;
-        for (i=0; keymap[i].hackkey; ++i) {
-                if (keymap[i].hackkey == key) {
-                        alt_mode_key_mask = keymap[i].canonkey;
-                        return;
-                }
-        }
-}
+}
+
 void my_blinkk(void) {
         int i;

branches/reyalp-ptp-live/platform/sx230hs/main.c

@@ -28 +28 @@
 }
 
-// Focus length table in firmware @FFF4A3DC 
-#define NUM_FL 126              // 0 - 125, entries in firmware (3 words each entry, first is FL)
-extern int focus_len_table[NUM_FL*3];
+// Focus length table in firmware @FFF4A3DC
+#define NUM_FL      126 // 0 - 125, entries in firmware
+#define NUM_DATA    3   // 3 words each entry, first is FL
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
-// Focal length range is 5.0 - 70,0 mm, 28 - 392 in 35-mm equivalent.
-// So, CF_EFL = 28/5.0*10000=56000 or392/70*10000=56000
-// divide by 10 to avoid overflow in get_effective_focal_length()
-#define CF_EFL  5600
-const int zoom_points = 126;
+// Conversion factor lens FL --> 35mm equiv
+// lens      35mm     CF
+// ----      ----     --
+// 5.0       28       ( 28/ 5.0) * 50 = 280  (min FL)
+// 70.0      392      (392/70.0) * 50 = 280  (max FL)
+#define CF_EFL      280
+#define CF_EFL_DIV  50
 
-//TODO
+const int zoom_points = NUM_FL;
+
 int get_effective_focal_length(int zp) {
-        return (CF_EFL*get_focal_length(zp))/1000;
+    return (CF_EFL*get_focal_length(zp))/CF_EFL_DIV;
 }
 
-//TODO
 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];
-/*      
-        int i;
-
-        if (zp<fl_tbl[0].zp)
-                return fl_tbl[0].fl;
-        else if (zp>fl_tbl[NUM_FL-1].zp)
-                return fl_tbl[NUM_FL-1].fl;
-        else
-                for (i=1; i<NUM_FL; ++i) {
-                        if (zp==fl_tbl[i-1].zp)
-                                return fl_tbl[i-1].fl;
-                        else if (zp==fl_tbl[i].zp)
-                                return fl_tbl[i].fl;
-                        else if (zp<fl_tbl[i].zp)
-                                return fl_tbl[i-1].fl+(zp-fl_tbl[i-1].zp)*(fl_tbl[i].fl-fl_tbl[i-1].fl)/(fl_tbl[i].zp-fl_tbl[i-1].zp);
-                }
-        return fl_tbl[NUM_FL-1].fl;
-*/
+    if (zp < 0) zp = 0;
+    else if (zp >= NUM_FL) zp = NUM_FL-1;
+    return focus_len_table[zp*NUM_DATA];
 }
 
-//TODO
 int get_zoom_x(int zp) {
-        return get_focal_length(zp)*10/focus_len_table[0];
-        //return get_focal_length(zp)*10/fl_tbl[0].fl;
+    return get_focal_length(zp)*10/focus_len_table[0];
 }
-
 
 //TODO

branches/reyalp-ptp-live/platform/sx230hs/notes.txt

@@ -2 +2 @@
 SX230 HS Notes
 
-To enter CHDK <Alt> mode use the DISP+SET button.
+To enter CHDK <Alt> mode use the playback button.
 
 Support for dual partition is not available.

branches/reyalp-ptp-live/platform/sx230hs/sub/100c/stubs_entry.S

@@ -51 +51 @@
 DEF(focus_busy                              ,0x000083c4) // Found @0xff181c8c
 //DEF(recreview_hold                          ,0x00004e04) // Found @0xff0a00d8, ** != ** stubs_min = 0x0000956c (0x947C+0xF0)
+DEF(palette_control                         ,0x0000b440) // Found @0xff24480c
+DEF(active_palette_buffer                   ,0x0000b448) // Found @0xff244810
+DEF(palette_buffer                          ,0x000ceb38) // Found @0xff244ce8
+DEF(bitmap_buffer                           ,0x0000b480) // Found @0xff249960
+DEF(active_bitmap_buffer                    ,0x0000b478) // Found @0xff249964
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx230hs/sub/101a/stubs_entry.S

@@ -51 +51 @@
 DEF(focus_busy                              ,0x000083c4) // Found @0xff181e44
 //DEF(recreview_hold                          ,0x00004e04) // Found @0xff0a0170, ** != ** stubs_min = 0x0000956c (0x947C+0xF0)
+DEF(palette_control                         ,0x0000b440) // Found @0xff244988
+DEF(active_palette_buffer                   ,0x0000b448) // Found @0xff24498c
+DEF(palette_buffer                          ,0x000ceb38) // Found @0xff244e64
+DEF(bitmap_buffer                           ,0x0000b480) // Found @0xff249ae4
+DEF(active_bitmap_buffer                    ,0x0000b478) // Found @0xff249ae8
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx230hs/sub/101b/stubs_entry.S

@@ -51 +51 @@
 DEF(focus_busy                              ,0x000083c4) // Found @0xff181e44
 //DEF(recreview_hold                          ,0x00004e04) // Found @0xff0a0170, ** != ** stubs_min = 0x0000956c (0x947C+0xF0)
+DEF(palette_control                         ,0x0000b440) // Found @0xff244988
+DEF(active_palette_buffer                   ,0x0000b448) // Found @0xff24498c
+DEF(palette_buffer                          ,0x000ceb38) // Found @0xff244e64
+DEF(bitmap_buffer                           ,0x0000b480) // Found @0xff249ae4
+DEF(active_bitmap_buffer                    ,0x0000b478) // Found @0xff249ae8
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx30/kbd.c

@@ -174 +174 @@
         }
 
+    // Disable Zoom Assist button
+    if (conf.zoom_assist_button_disable)
+        physw_status[0] |= 0x00010000;
+
         //_kbd_read_keys_r2(physw_status);
 

branches/reyalp-ptp-live/platform/sx30/main.c

@@ -37 +37 @@
 
 // Focus length table in firmware @ FFFEA5CC
-#define NUM_FL 201              // 0 - 200, entries in firmware
-extern int focus_len_table[NUM_FL];
+#define NUM_FL      201 // 0 - 200, entries in firmware
+#define NUM_DATA    1   // 1 int value each entry
+extern int focus_len_table[NUM_FL*NUM_DATA];
 
 // Conversion factor lens FL --> 35mm equiv
 // lens      35mm     CF
 // ----      ----     --
-// 4.3       24       (24/4.3) * 43 = 240  (min FL)
+// 4.3       24       ( 24/  4.3) * 43 = 240  (min FL)
 // 150.5     840      (840/150.5) * 43 = 240  (max FL)
-#define CF_EFL 240
-#define CF_EFL_DIV 43
+#define CF_EFL      240
+#define CF_EFL_DIV  43
 
-const int zoom_points = 201;
+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];
+    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];
 }
 

branches/reyalp-ptp-live/platform/sx30/platform_camera.h

@@ -127 +127 @@
     #define CAMERA_MAX_DIST                 9090910 // Override max subject distance
 
+    #define CAM_ZOOM_ASSIST_BUTTON_CONTROL      1       // Activate the menu option to allow disabling the zoom assist button
+
 //----------------------------------------------------------
 

branches/reyalp-ptp-live/platform/sx30/sub/100e/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00007a70) // Found @0xff97df04
 DEF(recreview_hold                          ,0x0000468c) // Found @0xff8ac610
+DEF(palette_control                         ,0x0000b198) // Found @0xffa46818
+DEF(active_palette_buffer                   ,0x0000b1a0) // Found @0xffa4681c
+DEF(palette_buffer                          ,0x000cf9b4) // Found @0xffa46d50
+DEF(bitmap_buffer                           ,0x0000b1d4) // Found @0xffa4a7a8
+DEF(active_bitmap_buffer                    ,0x0000b1cc) // Found @0xffa4a7ac
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx30/sub/100e/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 
-DEF(active_bitmap_buffer,               0xB1CC)         // 0xB1B8+0x14 (1.00e sub_FFA4A758 -> FFA4A75C + FFA4A7AC)
-DEF(bitmap_buffer,                      0xB1D4)         // FFA4A7A8
-DEF(palette_control,                    0xB198)         // sub_FFA4698C (1.00h)
-DEF(active_palette_buffer,              0xB1A0)         // sub_FFA468D4 (1.00h)
-DEF(palette_buffer,                     0xCF9B4)        // sub_FFA46DC8 (1.00h)
 DEF(viewport_buffers,                   0xFFB96808)     // 1.00h sub_FF851C44 (FF851F2C)
 DEF(active_viewport_buffer,             0x20A8)         // 1.00h sub_FF851C44 (FF851C48 & FF851F58)

branches/reyalp-ptp-live/platform/sx30/sub/100h/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00007a74) // Found @0xff97df38
 DEF(recreview_hold                          ,0x0000468c) // Found @0xff8ac610
+DEF(palette_control                         ,0x0000b198) // Found @0xffa468d4
+DEF(active_palette_buffer                   ,0x0000b1a0) // Found @0xffa468d8
+DEF(palette_buffer                          ,0x000cf9b4) // Found @0xffa46e0c
+DEF(bitmap_buffer                           ,0x0000b1d4) // Found @0xffa4a864
+DEF(active_bitmap_buffer                    ,0x0000b1cc) // Found @0xffa4a868
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx30/sub/100h/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 
-DEF(active_bitmap_buffer,               0xB1CC)         // 0xB1B8+0x14 (1.00h sub_FFA4A814 -> FFA4A818 + FFA4A868)
-DEF(bitmap_buffer,                      0xB1D4)         // FFA4A864
-DEF(palette_control,                    0xB198)         // sub_FFA4698C (1.00h)
-DEF(active_palette_buffer,              0xB1A0)         // sub_FFA468D4 (1.00h)
-DEF(palette_buffer,                     0xCF9B4)        // sub_FFA46DC8 (1.00h)
 DEF(viewport_buffers,                   0xFFB968C4)     // 1.00h sub_FF851C44 (FF851F2C)
 DEF(active_viewport_buffer,             0x20A8)         // 1.00h sub_FF851C44 (FF851C48 & FF851F58)

branches/reyalp-ptp-live/platform/sx30/sub/100l/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00007a74) // Found @0xff97df3c
 DEF(recreview_hold                          ,0x0000468c) // Found @0xff8ac614
+DEF(palette_control                         ,0x0000b198) // Found @0xffa46a7c
+DEF(active_palette_buffer                   ,0x0000b1a0) // Found @0xffa46a80
+DEF(palette_buffer                          ,0x000cf9b4) // Found @0xffa46fb4
+DEF(bitmap_buffer                           ,0x0000b1d4) // Found @0xffa4aa0c
+DEF(active_bitmap_buffer                    ,0x0000b1cc) // Found @0xffa4aa10
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx30/sub/100l/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 
-DEF(active_bitmap_buffer,               0xB1CC)         // 0xB1B8+0x14 (1.00l sub_FFA4A9BC -> FFA4A9C0 + FFA4AA10)
-DEF(bitmap_buffer,                      0xB1D4)         // FFA4AA0C
-DEF(palette_control,                    0xB198)         // sub_FFA4698C (1.00h)
-DEF(active_palette_buffer,              0xB1A0)         // sub_FFA468D4 (1.00h)
-DEF(palette_buffer,                     0xCF9B4)        // sub_FFA46DC8 (1.00h)
 DEF(viewport_buffers,                   0xFFB96A6C)     // 1.00h sub_FF851C44 (FF851F2C)
 DEF(active_viewport_buffer,             0x20A8)         // 1.00h sub_FF851C44 (FF851C48 & FF851F58)

branches/reyalp-ptp-live/platform/sx30/sub/100n/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00007a74) // Found @0xff97dfc0
 DEF(recreview_hold                          ,0x0000468c) // Found @0xff8ac614
+DEF(palette_control                         ,0x0000b198) // Found @0xffa46b00
+DEF(active_palette_buffer                   ,0x0000b1a0) // Found @0xffa46b04
+DEF(palette_buffer                          ,0x000cf9b4) // Found @0xffa47038
+DEF(bitmap_buffer                           ,0x0000b1d4) // Found @0xffa4aa90
+DEF(active_bitmap_buffer                    ,0x0000b1cc) // Found @0xffa4aa94
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx30/sub/100n/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 
-DEF(active_bitmap_buffer,               0xB1CC)         // 0xB1B8+0x14 (1.00n sub_FFA4AA40 -> FFA4AA44 + FFA4AA94)
-DEF(bitmap_buffer,                      0xB1D4)         // FFA4AA90
-DEF(palette_control,                    0xB198)         // sub_FFA4698C (1.00h)
-DEF(active_palette_buffer,              0xB1A0)         // sub_FFA468D4 (1.00h)
-DEF(palette_buffer,                     0xCF9B4)        // sub_FFA46DC8 (1.00h)
 DEF(viewport_buffers,                   0xFFB96AE0)     // 1.00h sub_FF851C44 (FF851F2C)
 DEF(active_viewport_buffer,             0x20A8)         // 1.00h sub_FF851C44 (FF851C48 & FF851F58)

branches/reyalp-ptp-live/platform/sx30/sub/100p/stubs_entry.S

@@ -41 +41 @@
 DEF(focus_busy                              ,0x00007a74) // Found @0xff97dfc0
 DEF(recreview_hold                          ,0x0000468c) // Found @0xff8ac614
+DEF(palette_control                         ,0x0000b198) // Found @0xffa46b00
+DEF(active_palette_buffer                   ,0x0000b1a0) // Found @0xffa46b04
+DEF(palette_buffer                          ,0x000cf9b4) // Found @0xffa47038
+DEF(bitmap_buffer                           ,0x0000b1d4) // Found @0xffa4aa90
+DEF(active_bitmap_buffer                    ,0x0000b1cc) // Found @0xffa4aa94
 
 // Values below go in 'lib.c':

branches/reyalp-ptp-live/platform/sx30/sub/100p/stubs_min.S

@@ -3 +3 @@
 DEF(rear_dial_position,                 0xC0240106)
 
-DEF(active_bitmap_buffer,               0xB1CC)         // 0xB1B8+0x14 (1.00p sub_FFA4AA40 -> FFA4AA44 + FFA4AA94)
-DEF(bitmap