Changeset 1663

trunk

Property svn:mergeinfo changed
/branches/release-1_0 merged: 1662

trunk/core/levent.c

-                      r992
+                      r1663
 #include "levent.h"
+// functions dealing with "logical events"
+unsigned levent_index_for_name(const char *name) {
+    unsigned i;
+    // TODO could check for id=-1 or id=0, both show up at end of table ?
+    for (i=0; levent_table[i].name; i++) {
+        // case insensitive might be better
+        if (strcmp(levent_table[i].name,name) == 0) {
+            return i;
+        }
+/* function dealing with "logical events"*/
+unsigned levent_index_for_name(const char *name)
+{
+  unsigned i;
+  // TODO could check for id=-1 or id=0, both show up at end of table ?
+  for (i=0; levent_table[i].name; i++) {
+    // case insensitive might be better
+    if (strcmp(levent_table[i].name,name) == 0) {
+        return i;
+    }
+    return LEVENT_INVALID_INDEX;
+  }
+  return LEVENT_INVALID_INDEX;
+}
 unsigned levent_index_for_id(unsigned id) {
+    unsigned i;
     // TODO could check for id=-1 or id=0, both show up at end of table ?
     for (i=0; levent_table[i].name; i++) {
         // case insensitive might be better
         if (id == levent_table[i].id) {
             return i;
+        }
+unsigned levent_index_for_id(unsigned id)
+{
+  unsigned i;
+  // TODO could check for id=-1 or id=0, both show up at end of table ?
+  for (i=0; levent_table[i].name; i++) {
+    // case insensitive might be better
+    if (id == levent_table[i].id) {
+        return i;
+    }
+    return LEVENT_INVALID_INDEX;
+  }
+  return LEVENT_INVALID_INDEX;
+}
 unsigned levent_count(void) {
+    static unsigned num_levents = 0;
     if(!num_levents) {
         levent_def *ev;
         // TODO could check for id=-1 or id=0, both show up at end of table ?
         for (ev = levent_table; ev->name; ev++) {
             num_levents++;
+        }
+unsigned levent_count(void)
+{
+  static unsigned num_levents = 0;
+  if(!num_levents) {
+    levent_def *ev;
+    // TODO could check for id=-1 or id=0, both show up at end of table ?
+    for (ev = levent_table; ev->name; ev++) {
+      num_levents++;
+    }
+    return num_levents;
+  }
+  return num_levents;
+}
+unsigned levent_id_for_name(const char *name) {
+    unsigned i = levent_index_for_name(name);
+    if (i!=LEVENT_INVALID_INDEX)
+        return levent_table[i].id;
+    else
+        return 0; // or -1 ? both appear at the end of the event list
+unsigned levent_id_for_name(const char *name)
+{
+  unsigned i = levent_index_for_name(name);
+  if (i!=LEVENT_INVALID_INDEX)
+    return levent_table[i].id;
+  else
+    return 0; // or -1 ? both appear at the end of the event list
+}
+const char * levent_name_for_id(unsigned id) {
+    unsigned i = levent_index_for_id(id);
+    if (i!=LEVENT_INVALID_INDEX)
+        return levent_table[i].name;
+    else
+        return NULL;
+const char * levent_name_for_id(unsigned id)
+{
+  unsigned i = levent_index_for_id(id);
+  if (i!=LEVENT_INVALID_INDEX)
+    return levent_table[i].name;
+  else
+    return NULL;
+}
 // note, slow linear search every time
+int levent_post_to_ui_by_name(const char *name) {
+    unsigned id=levent_id_for_name(name);
+    if(id) {
+        PostLogicalEventToUI(id,0);
+        return 1;
+    }
+    return 0;
+int levent_post_to_ui_by_name(const char *name)
+{
+        unsigned id=levent_id_for_name(name);
+        if(id) {
+                PostLogicalEventToUI(id,0);
+                return 1;
+        }
+        return 0;
+}
 void levent_set_record(void) {
     levent_post_to_ui_by_name("PressRecButton");
     levent_post_to_ui_by_name("UnpressRecButton");
+        levent_post_to_ui_by_name("PressRecButton");
+        levent_post_to_ui_by_name("UnpressRecButton");
+}
 void levent_set_play(void) {
     levent_post_to_ui_by_name("PressPBButton");
     levent_post_to_ui_by_name("UnpressPBButton");
+        levent_post_to_ui_by_name("PressPBButton");
+        levent_post_to_ui_by_name("UnpressPBButton");
+}

trunk/core/luascript.c

-                      r1632
+                      r1663
 static void lua_count_hook(lua_State *L, lua_Debug *ar)
+{
   run_hook_count++;
   if( L->nCcalls > L->baseCcalls || !yield_hook_enabled )
+    run_hook_count++;
+    if( L->nCcalls > L->baseCcalls || !yield_hook_enabled )
     return;
   if(run_hook_count >= yield_max_count || get_tick_count() - run_start_tick >= yield_max_ms)
+    if(run_hook_count >= yield_max_count || get_tick_count() - run_start_tick >= yield_max_ms)
     lua_yield( L, 0 );
+}
 …
+}
+// begin lua draw fuctions
 unsigned char script_colors[][2]  = {
 …
                                         {COLOR_HISTO_B_PLAY,        COLOR_HISTO_B},             //  12  blue_light  - placeholder
                                         {COLOR_BLACK,               COLOR_BLACK},                           //  13  grey        - placeholder (there's no universal grey)
                                         {COLOR_BLACK,               COLOR_BLACK},                           //  14  grey_dark   - placeholder (there's no universal grey)
+                                        {COLOR_BLACK,               COLOR_BLACK},               //  13  grey        - placeholder (there's no universal grey)
+                                        {COLOR_BLACK,               COLOR_BLACK},               //  14  grey_dark   - placeholder (there's no universal grey)
                                         {COLOR_WHITE,               COLOR_WHITE},               //  15  grey_light  - placeholder (there's no universal grey)
 …
   return 1;
+}
+// end lua draw functions
 static int luaCB_autostarted( lua_State* L )
 …
 static int luaCB_set_movie_status( lua_State* L )
+{
-  int to;
   switch(luaL_checknumber( L, 1 )) {
     case 1:
 …
+{
   unsigned *argbuf=NULL;
-  unsigned i;
   unsigned n_args = lua_gettop(L)-1;
   void *fptr;
 …
   const char *evpname;
   unsigned *argbuf;
-  unsigned i;
   unsigned n_args = lua_gettop(L);
 …
 static int luaCB_reboot( lua_State* L )
+{
         lua_pushboolean(L, reboot(luaL_optstring( L, 1, NULL )));
         return 1;
+    lua_pushboolean(L, reboot(luaL_optstring( L, 1, NULL )));
+    return 1;
+}
 …
+}
 static void register_func( lua_State* L, const char *name, void *func) {
   lua_pushcfunction( L, func );

trunk/include/asmsafe.h

-                      r994
+                      r1663
 #ifndef ASMSAFE_H
 #define ASMSAFE_H
 /*
 macros to safely call C functions from most inline ASM
 …
 usage
     asm volatile (
         ...
         ASM_SAFE("BL my_func\n")
         ...
+...
+    ASM_SAFE("BL my_func\n")
+    ...
+    )
 …
     "LDR R0,[SP],#4\n" \
     "MSR CPSR_cxsf,R0\n" \
     "LDMFD SP!, {R0-R12,LR}\n"
+    "LDMFD SP!, {R0-R12,LR}\n"
 #define ASM_SAFE(asmcode) \
 …
     ASM_SAFE_LEAVE
 #endif    // ASMSAFE_H
+#endif // ASMSAFE_H

trunk/include/camera.h

-                      r1656
+                      r1663
 //----------------------------------------------------------
+#undef  CAM_DRYOS                               // Camera is DryOS-based
+#undef  CAM_PROPSET                             // Camera's properties group (the generation)
+#undef  CAM_DRYOS_2_3_R39                       // Define for cameras with DryOS release R39 or greater
+#undef  CAM_DRYOS_2_3_R47                       // Define for cameras with DryOS release R47 or greater
+#undef  CAM_SWIVEL_SCREEN                       // Camera has rotated LCD screen
+#define CAM_USE_ZOOM_FOR_MF         1           // Zoom lever can be used for manual focus adjustments
+#undef  CAM_ADJUSTABLE_ALT_BUTTON               // ALT-button can be set from menu
+#define CAM_REMOTE                  1           // Camera supports USB-remote
+#undef  SYNCHABLE_REMOTE_NOT_ENABLED            // Disable support for synchable remote switch (in kbd.c) TODO only used by one camera ???
+#define CAM_SYNCH                   1           // Camera supports SDM precision synch
+#undef  CAM_MULTIPART                           // Camera supports SD-card multipartitioning
+#define CAM_HAS_ZOOM_LEVER          1           // Camera has dedicated zoom buttons
+#undef  CAM_DRAW_EXPOSITION                     // Output expo-pair on screen (for cameras which (sometimes) don't do that)
+#define CAM_HAS_ERASE_BUTTON        1           // Camera has dedicated erase button
+#define CAM_HAS_IRIS_DIAPHRAGM      1           // Camera has real diaphragm mechanism (http://en.wikipedia.org/wiki/Diaphragm_%28optics%29)
+#undef  CAM_HAS_ND_FILTER                       // Camera has build-in ND filter
+#define CAM_CAN_SD_OVER_NOT_IN_MF   1           // Camera allows subject distance (focus) override when not in manual focus mode
+#undef  CAM_CAN_SD_OVER_IN_AF_LOCK              // Camera allows subject distance (focus) override when in AF Lock mode
+#define CAM_CAN_SD_OVERRIDE         1           // Camera allows to do subject distance override
+#define CAM_HAS_MANUAL_FOCUS        1           // Camera has manual focus mode
+#define CAM_HAS_USER_TV_MODES       1           // Camera has tv-priority or manual modes with ability to set tv value
+#undef  CAM_SHOW_OSD_IN_SHOOT_MENU              // On some cameras Canon shoot menu has additional functionality and useful in this case to see CHDK OSD in this mode
+#define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO  1 // Camera can unlock optical zoom in video (if it is locked)
+#undef  CAM_FEATURE_FEATHER                     // Cameras with "feather" or touch wheel.
+#define CAM_HAS_IS                  1           // Camera has image stabilizer
+#undef  CAM_HAS_JOGDIAL                         // Camera has a "jog dial"
+#undef  CAM_CONSOLE_LOG_ENABLED                 // Development: internal camera stdout -> A/stdout.txt
+#define CAM_CHDK_HAS_EXT_VIDEO_MENU 1           // In CHDK for this camera realized adjustable video compression
+#undef  CAM_CAN_MUTE_MICROPHONE                 // Camera has function to mute microphone
+#define CAM_EMUL_KEYPRESS_DELAY     40          // Delay to interpret <alt>-button press as longpress
+#define CAM_EMUL_KEYPRESS_DURATION  5           // Length of keypress emulation
+#define CAM_MENU_BORDERWIDTH        30          // Defines the width of the border on each side of the CHDK menu. The CHDK menu will have this
+    #undef  CAM_DRYOS                           // Camera is DryOS-based
+    #undef  CAM_PROPSET                         // Camera's properties group (the generation)
+    #undef  CAM_DRYOS_2_3_R31                   // Define for cameras with DryOS release R31 or greater -> G10
+    #undef  CAM_DRYOS_2_3_R39                   // Define for cameras with DryOS release R39 or greater
+    #undef  CAM_DRYOS_2_3_R47                   // Define for cameras with DryOS release R47 or greater -> Cameras can boot from FAT32
+    #undef  CAM_HAS_CMOS                        // Camera has CMOS sensor
+    #undef  CAM_SWIVEL_SCREEN                   // Camera has rotated LCD screen
+    #define CAM_USE_ZOOM_FOR_MF             1   // Zoom lever can be used for manual focus adjustments
+    #undef  CAM_ADJUSTABLE_ALT_BUTTON           // ALT-button can be set from menu
+    #define CAM_REMOTE                      1   // Camera supports USB-remote
+    #undef  SYNCHABLE_REMOTE_NOT_ENABLED        // Disable support for synchable remote switch (in kbd.c) TODO only used by one camera ???
+    #define CAM_SYNCH                       1   // Camera supports SDM precision synch
+    #undef  CAM_MULTIPART                       // Camera supports SD-card multipartitioning
+    #define CAM_HAS_ZOOM_LEVER              1   // Camera has dedicated zoom buttons
+    #undef  CAM_DRAW_EXPOSITION                 // Output expo-pair on screen (for cameras which (sometimes) don't do that)
+    #define CAM_HAS_ERASE_BUTTON            1   // Camera has dedicated erase button
+    #define CAM_HAS_IRIS_DIAPHRAGM          1   // Camera has real diaphragm mechanism (http://en.wikipedia.org/wiki/Diaphragm_%28optics%29)
+    #undef  CAM_HAS_ND_FILTER                   // Camera has build-in ND filter
+    #define CAM_CAN_SD_OVER_NOT_IN_MF       1   // Camera allows subject distance (focus) override when not in manual focus mode
+    #undef  CAM_CAN_SD_OVER_IN_AF_LOCK          // Camera allows subject distance (focus) override when in AF Lock mode
+    #define CAM_CAN_SD_OVERRIDE             1   // Camera allows to do subject distance override
+    #define CAM_HAS_MANUAL_FOCUS            1   // Camera has manual focus mode
+    #define CAM_HAS_USER_TV_MODES           1   // Camera has tv-priority or manual modes with ability to set tv value
+    #undef  CAM_SHOW_OSD_IN_SHOOT_MENU          // On some cameras Canon shoot menu has additional functionality and useful in this case to see CHDK OSD in this mode
+    #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1 // Camera can unlock optical zoom in video (if it is locked)
+    #undef  CAM_FEATURE_FEATHER                 // Cameras with "feather" or touch wheel.
+    #define CAM_HAS_IS                      1   // Camera has image stabilizer
+    #undef  CAM_HAS_JOGDIAL                     // Camera has a "jog dial"
+    #undef  CAM_CONSOLE_LOG_ENABLED             // Development: internal camera stdout -> A/stdout.txt
+    #define CAM_CHDK_HAS_EXT_VIDEO_MENU     1   // In CHDK for this camera realized adjustable video compression
+    #undef  CAM_CAN_MUTE_MICROPHONE             // Camera has function to mute microphone
+    #define CAM_EMUL_KEYPRESS_DELAY         40  // Delay to interpret <alt>-button press as longpress
+    #define CAM_EMUL_KEYPRESS_DURATION      5   // Length of keypress emulation
+    #define CAM_MENU_BORDERWIDTH            30  // Defines the width of the border on each side of the CHDK menu. The CHDK menu will have this
                                                 // many pixels left blank to the on each side. Should not be less than 10 to allow room for the
                                                 // scroll bar on the right.
+#undef  CAM_DETECT_SCREEN_ERASE                 // Define this to add 'guard' pixel to the screen bitmap to help detect if the firmware has erase the screen
+    #define CAM_DETECT_SCREEN_ERASE         1   // Define this to add 'guard' pixel to the screen bitmap to help detect if the firmware has erase the screen
                                                 // If the guard pixel changes the CHDK ALT menu is forced to redraw.
                                                 // Take care not to place CHDK OSD elements over the guard pixel.
                                                 // The guard pixel is the first pixel of the top row in the screen bitmap.
 #undef  CAM_TOUCHSCREEN_UI                      // Define to enable touch screen U/I (e.g. IXUS 310 HS)
 #define CAM_TS_BUTTON_BORDER        0           // Define this to leave a border on each side of the OSD display for touch screen buttons.
+    #undef  CAM_TOUCHSCREEN_UI                  // Define to enable touch screen U/I (e.g. IXUS 310 HS)
+    #define CAM_TS_BUTTON_BORDER            0   // Define this to leave a border on each side of the OSD display for touch screen buttons.
                                                 // Used on the IXUS 310 to stop the OSD from overlapping the on screen buttons on each side
+#define CAM_DISP_ALT_TEXT           1           // Display the '<ALT>' message at the bottom of the screen in ALT mode (IXUS 310 changes button color instead)
+#undef  CAM_AF_SCAN_DURING_VIDEO_RECORD         // CHDK can make single AF scan during video record
+#undef  CAM_HAS_VIDEO_BUTTON                    // Camera can take stills in video mode, and vice versa
+#undef  CAM_EV_IN_VIDEO                         // CHDK can change exposure in video mode
+#define CAM_VIDEO_CONTROL           1           // pause / unpause video recordings
+#undef  CAM_VIDEO_QUALITY_ONLY                  // Override Video Bitrate is not supported
+#define ZOOM_OVERRIDE               0           // Shall zoom-override be used? default 0 becoz not implemented right now
+#undef  CAM_REAR_CURTAIN                        // Camera do not have front/rear curtain flash sync in menu
+#undef  CAM_BRACKETING                          // Cameras that have bracketing (focus & ev) in original firmware already, most likely s- & g-series (propcase for digic III not found yet!)
+#undef  CAM_EXT_TV_RANGE                        // CHDK can make exposure time longer than 64s
+#define CAM_CHDK_PTP                1           // include CHDK PTP support
+#define CAM_UNCACHED_BIT            0x10000000  // bit indicating the uncached memory
+#define CAM_MAKE                    "Canon"
+#define CAM_SENSOR_BITS_PER_PIXEL   10          // Bits per pixel. 10 is standard, 12 is supported except for curves
+#define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)      // 10bpp = 1023 ((1<<10)-1), 12bpp = 4095 ((1<<12)-1)
+#define CAM_BLACK_LEVEL             ((1<<(CAM_SENSOR_BITS_PER_PIXEL-5))-1)  // 10bpp = 31 ((1<<5)-1),    12bpp = 127 ((1<<7)-1)
+#define CAM_BITMAP_PALETTE          1           // which color set is used for this camera
+// Older cameras had a screen/bitmap buffer that was 360 pixels wide (or 480 for wide screen models)
+// CHDK was built around this 360 pixel wide display model
+// Newer cameras have a 720 pixel wide bitmap (960 for wide screen cameras)
+// To accomadate this the CHDK co-ordinate system assumes a 360/480 wide buffer and the
+// pixel drawing routines draw every pixel twice to scale the image up to the actual buffer size
+// Define CAM_USES_ASPECT_CORRECTION with a value of 1 to enable this scaled display
+#define CAM_USES_ASPECT_CORRECTION  0
+#define CAM_SCREEN_WIDTH            360         // Width of bitmap screen in CHDK co-ordinates (360 or 480)
+#define CAM_SCREEN_HEIGHT           240         // Height of bitmap screen in CHDK co-ordinates (always 240 on all cameras so far)
+#define CAM_BITMAP_WIDTH            360         // Actual width of bitmap screen in bytes (may be larger than displayed area)
+#define CAM_BITMAP_HEIGHT           240         // Actual height of bitmap screen in rows (240 or 270)
+#define EDGE_HMARGIN                0           // define sup and inf screen margins on edge overlay without overlay.  Necessary to save memory buffer space. sx200is needs values other than 0
+// end of section by nandoid
+#undef CAM_QUALITY_OVERRIDE                     // define this in platform_camera.h to enable 'Super Fine' JPEG compression mode
+    #define CAM_DISP_ALT_TEXT               1   // Display the '<ALT>' message at the bottom of the screen in ALT mode (IXUS 310 changes button color instead)
+    #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD     // CHDK can make single AF scan during video record
+    #undef  CAM_HAS_VIDEO_BUTTON                // Camera can take stills in video mode, and vice versa
+    #undef  CAM_EV_IN_VIDEO                     // CHDK can change exposure in video mode
+    #define CAM_VIDEO_CONTROL               1   // pause / unpause video recordings
+    #undef  CAM_VIDEO_QUALITY_ONLY              // Override Video Bitrate is not supported
+    #undef  CAM_CHDK_HAS_EXT_VIDEO_TIME         // Camera can override time limit of video record -> sx220/230
+    #define ZOOM_OVERRIDE                   0   // Shall zoom-override be used? default 0 becoz not implemented right now
+    #undef  CAM_REAR_CURTAIN                    // Camera do not have front/rear curtain flash sync in menu
+    #undef  CAM_BRACKETING                      // Cameras that have bracketing (focus & ev) in original firmware already, most likely s- & g-series (propcase for digic III not found yet!)
+    #undef  CAM_EXT_TV_RANGE                    // CHDK can make exposure time longer than 64s
+    #define CAM_CHDK_PTP                    1   // include CHDK PTP support
+    #define CAM_UNCACHED_BIT                0x10000000 // bit indicating the uncached memory
+    #define CAM_MAKE                        "Canon"
+    #define CAM_SENSOR_BITS_PER_PIXEL       10  // Bits per pixel. 10 is standard, 12 is supported except for curves
+    #define CAM_WHITE_LEVEL                 ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)      // 10bpp = 1023 ((1<<10)-1), 12bpp = 4095 ((1<<12)-1)
+    #define CAM_BLACK_LEVEL                 ((1<<(CAM_SENSOR_BITS_PER_PIXEL-5))-1)  // 10bpp = 31 ((1<<5)-1),    12bpp = 127 ((1<<7)-1)
+    #define CAM_BITMAP_PALETTE              1   // which color set is used for this camera
+    #undef  CAM_HAS_VARIABLE_ASPECT             // can switch between 16:9 and 4:3
+    // Older cameras had a screen/bitmap buffer that was 360 pixels wide (or 480 for wide screen models)
+    // CHDK was built around this 360 pixel wide display model
+    // Newer cameras have a 720 pixel wide bitmap (960 for wide screen cameras)
+    // To accomadate this the CHDK co-ordinate system assumes a 360/480 wide buffer and the
+    // pixel drawing routines draw every pixel twice to scale the image up to the actual buffer size
+    // Define CAM_USES_ASPECT_CORRECTION with a value of 1 to enable this scaled display
+    #define CAM_USES_ASPECT_CORRECTION      0
+    #define CAM_SCREEN_WIDTH                360 // Width of bitmap screen in CHDK co-ordinates (360 or 480)
+    #define CAM_SCREEN_HEIGHT               240 // Height of bitmap screen in CHDK co-ordinates (always 240 on all cameras so far)
+    #define CAM_BITMAP_WIDTH                360 // Actual width of bitmap screen in bytes (may be larger than displayed area)
+    #define CAM_BITMAP_HEIGHT               240 // Actual height of bitmap screen in rows (240 or 270)
+    #define EDGE_HMARGIN                    0   // define sup and inf screen margins on edge overlay without overlay.  Necessary to save memory buffer space. sx200is needs values other than 0
+    #undef CAM_QUALITY_OVERRIDE                 // define this in platform_camera.h to enable 'Super Fine' JPEG compression mode
                                                 // used to allow super fine JPEG option on cameras where this has been removed
                                                 // from the Canon menu. Note: may not actually work on all cameras.
 #undef CAM_ZEBRA_ASPECT_ADJUST                  // zebra needs to account for real bitmap size being different from what lib.c reports
+    #undef  CAM_ZEBRA_ASPECT_ADJUST             // zebra needs to account for real bitmap size being different from what lib.c reports
                                                 // also used by some cameras with normal bitmap layouts for memory saving ?
+#undef CAM_ZEBRA_NOBUF                          // zebra draws directly on bitmap buffer.
+#undef CAM_HAS_VARIABLE_ASPECT                  // can switch between 16:9 and 4:3 (only used by zebra code)
+#undef CAM_DATE_FOLDER_NAMING                   // set if camera uses date based folder naming (Option "Create Folder" in Canon Menu) and get_target_dir_name is implemented
+#undef CAM_KEY_CLICK_DELAY                      // additional delay between press and release for scripted click
+#define CAM_KEY_PRESS_DELAY         20          // delay after a press - TODO can we combine this with above ?
+#define CAM_KEY_RELEASE_DELAY       20          // delay after a release - TODO do we really need to wait after release ?
+#undef  CAM_STARTUP_CRASH_FILE_OPEN_FIX         // enable fix for camera intermittently crash at startup when opening the conf / font files
+    #undef  CAM_ZEBRA_NOBUF                     // zebra draws directly on bitmap buffer. Requires above as well
+    #undef  CAM_DATE_FOLDER_NAMING              // set if camera uses date based folder naming (Option "Create Folder" in Canon Menu) and get_target_dir_name is implemented
+    #undef  CAM_KEY_CLICK_DELAY                 // additional delay between press and release for scripted click
+    #define CAM_KEY_PRESS_DELAY             20  // delay after a press - TODO can we combine this with above ?
+    #define CAM_KEY_RELEASE_DELAY           20  // delay after a release - TODO do we really need to wait after release ?
+    #undef  CAM_STARTUP_CRASH_FILE_OPEN_FIX     // enable fix for camera intermittently crash at startup when opening the conf / font files
                                                 // Some cameras throw "ASSERT!! FsIoNotify.c Line xxx    Task name: SpyTask" in ROMLOG
+                                                // see http://chdk.setepontos.com/index.php?topic=6179.0
+// RAW & DNG related values
+#define DNG_SUPPORT                 1           // Camera supports DNG format for saving of RAW images
+#define DEFAULT_RAW_EXT             1           // extension to use for raw (see raw_exts in conf.c)
+#undef  CAM_RAW_ROWPIX                          // Number of pixels in RAW row (physical size of the sensor Note : as of July 2011, this value can be found in stub_entry.S for dryos cameras)
+#undef  CAM_RAW_ROWS                            // Number of rows in RAW (physical size of the sensor       Note : as of July 2011, this value can be found in stub_entry.S for dryos cameras)
+#undef  CAM_JPEG_WIDTH                          // Default crop size (width) stored in DNG (to match camera JPEG size. From dimensions of the largest size jpeg your camera produces)
+#undef  CAM_JPEG_HEIGHT                         // Default crop size (height) stored in DNG (to match camera JPEG size. From dimensions of the largest size jpeg your camera produces)
+#undef  CAM_ACTIVE_AREA_X1                      // Define usable area of the sensor - needs to be divisible by 4 - calibrate using a CHDK RAW image converted with rawconvert.exe (eg :rawconvert -12to8 -pgm -w=4480 -h=3348 photo.crw photo.pgm)
+#undef  CAM_ACTIVE_AREA_Y1                      // Define usable area of the sensor - needs to be divisible by 2 - "
+#undef  CAM_ACTIVE_AREA_X2                      // Define usable area of the sensor - needs to be divisible by 4 - "
+#undef  CAM_ACTIVE_AREA_Y2                      // Define usable area of the sensor - needs to be divisible by 2 = "
+#undef  cam_CFAPattern                          // Camera Bayer sensor data layout (DNG colors are messed up if not correct - should be either 0x01000201 = [Green Blue Red Green]  or 0x02010100 = [Red  Green  Green  Blue]
+#undef  CAM_COLORMATRIX1                        // DNG color profile matrix
+#undef  cam_CalibrationIlluminant1              // DNG color profile illuminant - set it to 17 for standard light A
+#undef  CAM_DNG_EXPOSURE_BIAS                   // Specify DNG exposure bias value (to override default of -0.5 in the dng.c code)
+#undef  DNG_EXT_FROM                            // Extension in the cameras known extensions to replace with .DNG to allow DNG
+    // RAW & DNG related values
+    #define DNG_SUPPORT                     1   // Camera supports DNG format for saving of RAW images
+    #define DEFAULT_RAW_EXT                 1   // extension to use for raw (see raw_exts in conf.c)
+    #undef  CAM_RAW_ROWPIX                      // Number of pixels in RAW row (physical size of the sensor Note : as of July 2011, this value can be found in stub_entry.S for dryos cameras)
+    #undef  CAM_RAW_ROWS                        // Number of rows in RAW (physical size of the sensor       Note : as of July 2011, this value can be found in stub_entry.S for dryos cameras)
+    #undef  CAM_JPEG_WIDTH                      // Default crop size (width) stored in DNG (to match camera JPEG size. From dimensions of the largest size jpeg your camera produces)
+    #undef  CAM_JPEG_HEIGHT                     // Default crop size (height) stored in DNG (to match camera JPEG size. From dimensions of the largest size jpeg your camera produces)
+    #undef  CAM_ACTIVE_AREA_X1                  // Define usable area of the sensor - needs to be divisible by 4 - calibrate using a CHDK RAW image converted with rawconvert.exe (eg :rawconvert -12to8 -pgm -w=4480 -h=3348 photo.crw photo.pgm)
+    #undef  CAM_ACTIVE_AREA_Y1                  // Define usable area of the sensor - needs to be divisible by 2 - "
+    #undef  CAM_ACTIVE_AREA_X2                  // Define usable area of the sensor - needs to be divisible by 4 - "
+    #undef  CAM_ACTIVE_AREA_Y2                  // Define usable area of the sensor - needs to be divisible by 2 = "
+    #undef  cam_CFAPattern                      // Camera Bayer sensor data layout (DNG colors are messed up if not correct - should be either 0x01000201 = [Green Blue Red Green]  or 0x02010100 = [Red  Green  Green  Blue]
+    #undef  CAM_COLORMATRIX1                    // DNG color profile matrix
+    #undef  cam_CalibrationIlluminant1          // DNG color profile illuminant - set it to 17 for standard light A
+    #undef  CAM_DNG_EXPOSURE_BIAS               // Specify DNG exposure bias value (to override default of -0.5 in the dng.c code)
+    #undef  DNG_EXT_FROM                        // Extension in the cameras known extensions to replace with .DNG to allow DNG
                                                 // files to be transfered over standard PTP. Only applicable to older cameras
 #undef  CAM_DNG_LENS_INFO                       // Define this to include camera lens information in DNG files
+    #undef  CAM_DNG_LENS_INFO                   // Define this to include camera lens information in DNG files
                                                 // Value should be an array of 4 DNG 'RATIONAL' values specifying
                                                 //   - min focal length in mm
 …
                                                 // Each pair of integers is one 'RATIONAL' value (numerator,denominator)
+#undef  PARAM_CAMERA_NAME                        // parameter number for GetParameterData to get camera name
+#undef  PARAM_DISPLAY_MODE1                      // param number for LCD display mode when camera in playback
+#undef  PARAM_DISPLAY_MODE2                      // param number for LCD display mode when camera in record view hold mode
+#undef  CAM_FIRMWARE_MEMINFO                     // Use 'GetMemInfo' (dryos) or 'memPartInfoGet'/'memPartFindMax' (vxworks)
+                                                 // function in firmware to get free memory details
+                                                 // GetMemInfo should be found correctly by the gensig/finsig signature
+                                                 // finder for all dryos based cameras.
+#undef CAM_NO_MEMPARTINFO                        // VXWORKS camera does not have memPartInfoGet, fall back to memPartFindMax
+#undef CAM_DRIVE_MODE_FROM_TIMER_MODE            // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
+                                                 // Used to enabled bracketing in custom timer, required on many recent cameras
+                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
+#undef CAM_AV_OVERRIDE_IRIS_FIX                  // for cameras that require _MoveIrisWithAv function to override Av (for bracketing).
+#undef CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE         // For cameras with 'low light' mode that does not work with raw define this
+#undef CAM_DISABLE_RAW_IN_HQ_BURST               // For cameras with 'HQ Burst' mode that does not work with raw define this
+#undef CAM_DISABLE_RAW_IN_HANDHELD_NIGHT_SCN     // For cameras with 'HandHeld Night Scene' mode that does not work with raw define this
+#undef CAM_LOAD_CUSTOM_COLORS                   // Define to enable loading CHDK custom colors into the camera color palette
+    #undef  PARAM_CAMERA_NAME                   // parameter number for GetParameterData to get camera name
+    #undef  PARAM_DISPLAY_MODE1                 // param number for LCD display mode when camera in playback
+    #undef  PARAM_DISPLAY_MODE2                 // param number for LCD display mode when camera in record view hold mode
+    #undef  CAM_FIRMWARE_MEMINFO                // Use 'GetMemInfo' (dryos) or 'memPartInfoGet'/'memPartFindMax' (vxworks)
+                                                // function in firmware to get free memory details
+                                                // GetMemInfo should be found correctly by the gensig/finsig signature
+                                                // finder for all dryos based cameras.
+    #undef  CAM_NO_MEMPARTINFO                  // VXWORKS camera does not have memPartInfoGet, fall back to memPartFindMax
+    #undef  CAM_DRIVE_MODE_FROM_TIMER_MODE      // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
+                                                // Used to enabled bracketing in custom timer, required on many recent cameras
+                                                // see http://chdk.setepontos.com/index.php/topic,3994.405.html
+    #undef CAM_AV_OVERRIDE_IRIS_FIX             // for cameras that require _MoveIrisWithAv function to override Av (for bracketing).
+    #undef CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE    // For cameras with 'low light' mode that does not work with raw define this
+    #undef CAM_DISABLE_RAW_IN_HQ_BURST          // For cameras with 'HQ Burst' mode that does not work with raw define this
+    #undef CAM_DISABLE_RAW_IN_HANDHELD_NIGHT_SCN // For cameras with 'HandHeld Night Scene' mode that does not work with raw define this
+    #undef  CAM_HAS_GPS                         // for cameras with GPS reseiver: includes the GPS coordinates in in DNG file
+    #undef  CHDK_COLOR_BASE                     // Start color index for CHDK colors loaded into camera palette.
+    #undef  CAM_LOAD_CUSTOM_COLORS              // Define to enable loading CHDK custom colors into the camera color palette
                                                 // requires load_chdk_palette() and vid_get_bitmap_active_palette() to be defined
                                                 // correctly for the camera along with
 #undef CAM_USE_COLORED_ICONS                    // If the color palette contains enough shades of red, green, yellow and grey
+    #undef  CAM_USE_COLORED_ICONS               // If the color palette contains enough shades of red, green, yellow and grey
                                                 // defined then enable this use the better icons (from CHDK-DE). See gui_batt.c
                                                 // and gui_space.c.
+#define CAM_USB_EVENTID         0x902           // Levent ID for USB control. Changed to 0x202 in DryOS R49 so needs to be overridable.
+#undef CAM_NEED_SET_ZOOM_DELAY                  // Define to add a delay after setting the zoom position before resetting the focus position in shooting_set_zoom
+#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)
+    #define CAM_USB_EVENTID         0x902       // Levent ID for USB control. Changed to 0x202 in DryOS R49 so needs to be overridable.
+    #undef  CAM_NEED_SET_ZOOM_DELAY             // Define to add a delay after setting the zoom position before resetting the focus position in shooting_set_zoom
+    #undef  USE_REAL_AUTOISO                    // Define this to use real-iso instead of marketing-iso as values of autoiso mechanizm
+    #undef  OVEREXP_COMPENSATE_OVERALL          // Define this to make overexposure_compensation work for all scenes, instead of day-light only
+    #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)
 //----------------------------------------------------------
 // Override Default values for Camera if necessary
+// Overridden values for each camera
 //----------------------------------------------------------
 …
 // the CHDK horizontal (X) co-ordinates
 #if CAM_USES_ASPECT_CORRECTION
 #define ASPECT_XCORRECTION(x)   ((x)<<1)    // See comments for CAM_USES_ASPECT_CORRECTION above
+    #define ASPECT_XCORRECTION(x)   ((x)<<1)    // See comments for CAM_USES_ASPECT_CORRECTION above
 #else
 #define ASPECT_XCORRECTION(x)   (x)         // See comments for CAM_USES_ASPECT_CORRECTION above
+    #define ASPECT_XCORRECTION(x)   (x)         // See comments for CAM_USES_ASPECT_CORRECTION above
 #endif
 // curves only work in 10bpp for now
 #if CAM_SENSOR_BITS_PER_PIXEL != 10
 #undef OPT_CURVES
+    #undef OPT_CURVES
 #endif
 #ifndef OPT_PTP
 #undef CAM_CHDK_PTP
+    #undef CAM_CHDK_PTP
 #endif

trunk/include/conf.h

-                      r1621
+                      r1663
 #include "script.h"
 #define USER_MENU_ITEMS 14
+#define USER_MENU_ITEMS     14
 #define CONF_STR_LEN        100
 …
     int raw_prefix;
     int raw_ext;
     int raw_save_first_only;    //for series shooting
+    int raw_save_first_only; //for series shooting
     int raw_nr;
     int sub_batch_prefix;    // output of batch subtracts
+    int sub_batch_prefix; // output of batch subtracts
     int sub_batch_ext;
     int sub_in_dark_value;    // values <= to this are not subtracted, i.e. the dark value of your darkframe
 …
     color histo_color;
     color histo_color2;    // markers/border
+    color histo_color2; // markers/border
     color osd_color;
     color osd_color_warn;
 …
     int use_zoom_mf;
     long alt_mode_button;    // for S-series
+    long alt_mode_button; //for S-series
     int alt_prevent_shutdown;
 …
     int video_quality;
     int video_bitrate;
     int tv_bracket_value;
     int av_bracket_value;
 …
     int tv_enum_type;
     int av_override_value;
     int nd_filter_state;
     int iso_override_value;
     int iso_override_koef;
 …
     int values_show_luminance;
     int debug_shortcut_action;  // 0=none, 1=dump, 2=page display
     int debug_display;          // 0=none, 1=props, 2=flash param, 3=tasks
+    int debug_shortcut_action;   // 0=none, 1=dump, 2=page display
+    int debug_display;           // 0=none, 1=props, 2=flash param, 3=tasks
     int debug_propcase_page;     // save propcase page
     int debug_lua_restart_on_error;    // 0=no, 1=yes
+    int debug_lua_restart_on_error; // 0=no, 1=yes
     int debug_misc_vals_show;    // 0=no, 1=yes
     int script_startup;    // remote autostart
     int remote_enable;    // remote enable
+    int script_startup;          // remote autostart
+    int remote_enable;           // remote enable
     int user_menu_enable;
     int user_menu_vars[USER_MENU_ITEMS];
 …
 #define SHOOTING_PROGRESS_DONE          3
 // video quality defaults. Ideally, these should match the camera default settings
 #define VIDEO_DEFAULT_QUALITY   84    // ? where does 84 come from
+#define VIDEO_DEFAULT_QUALITY   84  // ? where does 84 come from
 #define VIDEO_MAX_QUALITY       99
+#define VIDEO_DEFAULT_BITRATE   3    // should be 1 for all cams
+#define VIDEO_DEFAULT_BITRATE   3   // should be 1 for all cams
+extern void user_menu_restore();
 extern int state_kbd_script_run;
 …
 extern int state_save_raw_nth_only;
 extern void script_autostart();    // remote autostart
+extern void script_autostart();     // remote autostart
 extern void conf_save();
 extern void conf_restore();
 …
 // reyalp: putting these in conf, since the conf values are lookups for them
 // prefixes and extentions available for raw images (index with conf.raw_prefix etc)
 #define NUM_IMG_PREFIXES 3    // IMG_ CRW_ SND_ (could add ETC_ SDR_ AUT_ MVI_ MRK_)
 #define NUM_IMG_EXTS 5    // .JPG .CRW .CR2 .THM .WAV (could add .AVI .MRK)
+#define NUM_IMG_PREFIXES 3  // IMG_ CRW_ SND_ (could add ETC_ SDR_ AUT_ MVI_ MRK_)
+#define NUM_IMG_EXTS 5      // .JPG .CRW .CR2 .THM .WAV (could add .AVI .MRK)
 extern const char* img_prefixes[NUM_IMG_PREFIXES];
 extern const char* img_exts[NUM_IMG_EXTS];

trunk/include/gui.h

-                      r1621
+                      r1663
 #define GUI_H
 typedef unsigned int      coord;
 typedef unsigned short    color;
+typedef unsigned int    coord;
+typedef unsigned short  color;
 #define MAKE_COLOR(bg, fg)    ((color)((((char)(bg))<<8)|((char)(fg))))
+#define MAKE_COLOR(bg, fg)  ((color)((((char)(bg))<<8)|((char)(fg))))
 #define FG_COLOR(color)     ((unsigned char)(color & 0xFF))
 #define BG_COLOR(color)     ((unsigned char)(color >> 8))

trunk/include/keyboard.h

-                      r1344
+                      r1663
 #define KEYBOARD_H
 #define KEY_UP            1
 #define KEY_DOWN          2
 #define KEY_LEFT          3
 #define KEY_RIGHT         4
 #define KEY_SET           5
 #define KEY_SHOOT_HALF    6
 #define KEY_SHOOT_FULL    7     // includes KEY_SHOOT_HALF press/release. See also KEY_SHOOT_FULL_ONLY.
 #define KEY_ZOOM_IN       8
 #define KEY_ZOOM_OUT      9
 #define KEY_MENU          10
 #define KEY_DISPLAY       11
 #define KEY_PRINT         12    // S-series: Shortcut
 #define KEY_ERASE         13    // S-series: Func
 #define KEY_ISO           14    // S-series
 #define KEY_FLASH         15    // S-series
 #define KEY_MF            16    // S-series
 #define KEY_MACRO         17    // S-series
 #define KEY_VIDEO         18    // S-series
 #define KEY_TIMER         19    // S-series
 #define KEY_EXPO_CORR     20    // G-series
 #define KEY_MICROPHONE    21
 #define KEY_FACE          22    // SX100IS
 #define KEY_DUMMY         23    // dummy key for pressing to disable energy saving in alt mode
+#define KEY_UP          1
+#define KEY_DOWN        2
+#define KEY_LEFT        3
+#define KEY_RIGHT       4
+#define KEY_SET         5
+#define KEY_SHOOT_HALF  6
+#define KEY_SHOOT_FULL  7       // includes KEY_SHOOT_HALF press/release. See also KEY_SHOOT_FULL_ONLY.
+#define KEY_ZOOM_IN     8
+#define KEY_ZOOM_OUT    9
+#define KEY_MENU        10
+#define KEY_DISPLAY     11
+#define KEY_PRINT       12      //S-series: Shortcut
+#define KEY_ERASE       13      //S-series: Func
+#define KEY_ISO         14      //S-series
+#define KEY_FLASH       15      //S-series
+#define KEY_MF          16      //S-series
+#define KEY_MACRO       17      //S-series
+#define KEY_VIDEO       18      //S-series
+#define KEY_TIMER       19      //S-series
+#define KEY_EXPO_CORR   20      //G-series
+#define KEY_MICROPHONE  21
+#define KEY_FACE        22      //SX100IS
+#define KEY_DUMMY       23      //dummy key for pressing to disable energy saving in alt mode
 // SX30
 #define KEY_ZOOM_IN1      24    // SX30 has three zoom speeds each way
 #define KEY_ZOOM_IN2      25
 #define KEY_ZOOM_IN3      26
 #define KEY_ZOOM_OUT1     27
 #define KEY_ZOOM_OUT2     28
 #define KEY_ZOOM_OUT3     29
 #define KEY_ZOOM_ASSIST   30    // SX30 new button
+#define KEY_ZOOM_IN1    24      // SX30 has three zoom speeds each way
+#define KEY_ZOOM_IN2    25
+#define KEY_ZOOM_IN3    26
+#define KEY_ZOOM_OUT1   27
+#define KEY_ZOOM_OUT2   28
+#define KEY_ZOOM_OUT3   29
+#define KEY_ZOOM_ASSIST 30      // SX30 new button
 // G12
 #define KEY_AE_LOCK               31    // G12 AE/FE Lock button
 #define KEY_METERING      32    // G12 metering mode button
+#define KEY_AE_LOCK             31      // G12 AE/FE Lock button
+#define KEY_METERING    32      // G12 metering mode button
 //SX220
 #define KEY_PLAYBACK      33
 #define KEY_LEFT_SOFT     34    // jogdial keys have two steps
 #define KEY_RIGHT_SOFT    35
 #define KEY_UP_SOFT               36
 #define KEY_DOWN_SOFT     37
+//SX220
+#define KEY_PLAYBACK    33
+#define KEY_LEFT_SOFT   34    // jogdial keys have two steps
+#define KEY_RIGHT_SOFT  35
+#define KEY_UP_SOFT     36
+#define KEY_DOWN_SOFT   37
 #define KEY_SHOOT_FULL_ONLY 38  // As KEY_SHOOT_FULL but press/release KEY_SHOOT_HALF is not included
 #define JOGDIAL_LEFT      100
 #define JOGDIAL_RIGHT     101
+#define JOGDIAL_LEFT    100
+#define JOGDIAL_RIGHT   101
 #define FRONTDIAL_LEFT    102
 #define FRONTDIAL_RIGHT   103

trunk/include/lauxlib.h

-                      r515
+                      r1663
 #endif
 /* extra error code for `luaL_load' */
 #define LUA_ERRFILE     (LUA_ERRERR+1)
 typedef struct luaL_Reg {
 …
   lua_CFunction func;
 } luaL_Reg;
 LUALIB_API void (luaI_openlib) (lua_State *L, const char *libname,
 …
                                          const char *fname, int szhint);
 /*
 ** ===============================================================
 …
 */
 #define luaL_argcheck(L, cond,numarg,extramsg)  \
                 ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
 #define luaL_checkstring(L,n)   (luaL_checklstring(L, (n), NULL))
 #define luaL_optstring(L,n,d)   (luaL_optlstring(L, (n), (d), NULL))
 #define luaL_checkint(L,n)      ((int)luaL_checkinteger(L, (n)))
 #define luaL_optint(L,n,d)      ((int)luaL_optinteger(L, (n), (d)))
 #define luaL_checklong(L,n)     ((long)luaL_checkinteger(L, (n)))
 #define luaL_optlong(L,n,d)     ((long)luaL_optinteger(L, (n), (d)))
+#define luaL_argcheck(L, cond,numarg,extramsg)  \
+        ((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
+#define luaL_checkstring(L,n)   (luaL_checklstring(L, (n), NULL))
+#define luaL_optstring(L,n,d)   (luaL_optlstring(L, (n), (d), NULL))
+#define luaL_checkint(L,n)      ((int)luaL_checkinteger(L, (n)))
+#define luaL_optint(L,n,d)      ((int)luaL_optinteger(L, (n), (d)))
+#define luaL_checklong(L,n)     ((long)luaL_checkinteger(L, (n)))
+#define luaL_optlong(L,n,d)     ((long)luaL_optinteger(L, (n), (d)))
 #define luaL_typename(L,i)      lua_typename(L, lua_type(L,(i)))
+#define luaL_typename(L,i)  lua_typename(L, lua_type(L,(i)))
 #define luaL_dofile(L, fn) \
         (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
+    (luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
 #define luaL_dostring(L, s) \
         (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
+    (luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
 #define luaL_getmetatable(L,n)  (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
 …
 */
 typedef struct luaL_Buffer {
   char *p;                      /* current position in buffer */
   int lvl;  /* number of strings in the stack (level) */
+  char *p;      /* current position in buffer */
+  int lvl;      /* number of strings in the stack (level) */
   lua_State *L;
   char buffer[LUAL_BUFFERSIZE];
 …
 /* compatibility only */
 #define luaL_putchar(B,c)       luaL_addchar(B,c)
+#define luaL_putchar(B,c)   luaL_addchar(B,c)
 #define luaL_addsize(B,n)       ((B)->p += (n))
+#define luaL_addsize(B,n)   ((B)->p += (n))
 LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
 …
 LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
 /* }====================================================== */
 /* compatibility with ref system */
 …
 #define luaL_reg        luaL_Reg
+#define luaL_reg    luaL_Reg
 #endif

trunk/include/levent.h

-                      r993
+                      r1663
 #define LEVENT_INVALID_INDEX 0xFFFFFFFF
 /* logical event definition */
+/* logical event definition*/
 typedef struct {
     char *name; /* name of event, may point to empty string */
 …
 } levent_def;
 /*
 table of event definitions in ROM,
 address can be found with tools/find_levent
 terminated by an event with a NULL (not empty string) name pointer.
+ table of event definitions in ROM,
+ address can be found with tools/find_levent
+ terminated by an event with a NULL (not empty string) name pointer.
 */
 extern levent_def levent_table[];
 …
 void levent_set_record(void);
 void levent_set_play(void);
 #endif

trunk/include/lolevel.h

-                      r1658
+                      r1663
 extern void _SleepTask(long msec);
 extern void __attribute__((noreturn)) _ExitTask();
 extern int _taskNameToId(char* taskName); // VxWorks only, task's name first letter must be 't', maximum 10 chars total
+extern int _taskNameToId(char* taskName); // VxWorks only, task's name first letter must be 't', maximum 10 chars total
 extern const char *_taskName(int taskID); // VxWorks only for now
 extern int _taskIdListGet(int *idlist,int max); // VxWorks only for now
 …
 extern int _LEDDrive(int led, int action);
 extern long _LockMainPower();
 extern long _UnlockMainPower();
 …
 The following two functions post an event such as button press, switch change, cable connection change.
 event:
   A number identifying the event. This number may vary between camera models.
+  A number identifying the event. This number may vary between camera models.
   See levent.c and levent.h for methods to identify events by name.
 unk:
+unk:
   Unknown value, usually 0 in canon code. For jogdial messages, this is number of clicks.
 return value:
 …
 extern int  _PostLogicalEventToUI(int event, int unk);
 /*
 Used in the canon code to modify the generation or delivery of events. For example, Canon
+Used in the canon code to modify the generation or delivery of events. For example, Canon
 mode override code sets 1 on the desired dial position, and zero on all others.
 event: as described above for PostLogicalEvent*
 …
 extern void _ScreenLock();
 extern void _SetCurrentCaptureModeType();
 extern unsigned _ExecuteEventProcedure(const char *name,...);
+extern unsigned _ExecuteEventProcedure(const char *name, ...);
 // known in CHDK as _RefreshPhysicalScreen
 //extern void _ScreenUnLock();

trunk/include/lua.h

-                      r515
+                      r1663
 */
 #ifndef lua_h
 #define lua_h
 …
 #include <stddef.h>
 #include "luaconf.h"
+#define LUA_VERSION     "Lua 5.1"
+#define LUA_RELEASE     "Lua 5.1.3"
+#define LUA_VERSION_NUM 501
+#define LUA_COPYRIGHT   "Copyright (C) 1994-2008 Lua.org, PUC-Rio"
+#define LUA_AUTHORS     "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
+#define LUA_VERSION     "Lua 5.1"
+#define LUA_RELEASE     "Lua 5.1.3"
+#define LUA_VERSION_NUM 501
+#define LUA_COPYRIGHT   "Copyright (C) 1994-2008 Lua.org, PUC-Rio"
+#define LUA_AUTHORS     "R. Ierusalimschy, L. H. de Figueiredo & W. Celes"
 /* mark for precompiled code (`<esc>Lua') */
 #define LUA_SIGNATURE   "\033Lua"
+#define LUA_SIGNATURE   "\033Lua"
 /* option for multiple returns in `lua_pcall' and `lua_call' */
+#define LUA_MULTRET     (-1)
+#define LUA_MULTRET (-1)
 /*
 ** pseudo-indices
 */
+#define LUA_REGISTRYINDEX       (-10000)
+#define LUA_ENVIRONINDEX        (-10001)
+#define LUA_GLOBALSINDEX        (-10002)
+#define lua_upvalueindex(i)     (LUA_GLOBALSINDEX-(i))
+#define LUA_REGISTRYINDEX   (-10000)
+#define LUA_ENVIRONINDEX    (-10001)
+#define LUA_GLOBALSINDEX    (-10002)
+#define lua_upvalueindex(i) (LUA_GLOBALSINDEX-(i))
 /* thread status; 0 is OK */
+#define LUA_YIELD       1
+#define LUA_ERRRUN      2
+#define LUA_ERRSYNTAX   3
+#define LUA_ERRMEM      4
+#define LUA_ERRERR      5
+#define LUA_YIELD       1
+#define LUA_ERRRUN      2
+#define LUA_ERRSYNTAX   3
+#define LUA_ERRMEM      4
+#define LUA_ERRERR      5
 typedef struct lua_State lua_State;
 …
 typedef int (*lua_CFunction) (lua_State *L);
 /*
 ** functions that read/write blocks when loading/dumping Lua chunks
 …
 typedef int (*lua_Writer) (lua_State *L, const void* p, size_t sz, void* ud);
 /*
 ** prototype for memory-allocation functions
 …
 typedef void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);
 /*
 ** basic types
 */
+#define LUA_TNONE               (-1)
+#define LUA_TNIL                0
+#define LUA_TBOOLEAN            1
+#define LUA_TLIGHTUSERDATA      2
+#define LUA_TNUMBER             3
+#define LUA_TSTRING             4
+#define LUA_TTABLE              5
+#define LUA_TFUNCTION           6
+#define LUA_TUSERDATA           7
+#define LUA_TTHREAD             8
+#define LUA_TNONE           (-1)
+#define LUA_TNIL            0
+#define LUA_TBOOLEAN        1
+#define LUA_TLIGHTUSERDATA  2
+#define LUA_TNUMBER         3
+#define LUA_TSTRING         4
+#define LUA_TTABLE          5
+#define LUA_TFUNCTION       6
+#define LUA_TUSERDATA       7
+#define LUA_TTHREAD         8
 /* minimum Lua stack available to a C function */
+#define LUA_MINSTACK    20
+#define LUA_MINSTACK        20
 /*
 …
 #endif
 /* type of numbers in Lua */
 typedef LUA_NUMBER lua_Number;
 /* type for integer functions */
 typedef LUA_INTEGER lua_Integer;
 /*
 …
 LUA_API lua_CFunction (lua_atpanic) (lua_State *L, lua_CFunction panicf);
 /*
 …
 LUA_API void  (lua_xmove) (lua_State *from, lua_State *to, int n);
 /*
 ** access functions (stack -> C)
 …
 LUA_API const char     *(lua_typename) (lua_State *L, int tp);
 LUA_API int            (lua_equal) (lua_State *L, int idx1, int idx2);
 LUA_API int            (lua_rawequal) (lua_State *L, int idx1, int idx2);
 LUA_API int            (lua_lessthan) (lua_State *L, int idx1, int idx2);
+LUA_API int             (lua_equal) (lua_State *L, int idx1, int idx2);
+LUA_API int             (lua_rawequal) (lua_State *L, int idx1, int idx2);
+LUA_API int             (lua_lessthan) (lua_State *L, int idx1, int idx2);
 LUA_API lua_Number      (lua_tonumber) (lua_State *L, int idx);
 …
 LUA_API size_t          (lua_objlen) (lua_State *L, int idx);
 LUA_API lua_CFunction   (lua_tocfunction) (lua_State *L, int idx);
 LUA_API void           *(lua_touserdata) (lua_State *L, int idx);
+LUA_API void           *(lua_touserdata) (lua_State *L, int idx);
 LUA_API lua_State      *(lua_tothread) (lua_State *L, int idx);
 LUA_API const void     *(lua_topointer) (lua_State *L, int idx);
 /*
 …
 LUA_API int   (lua_pushthread) (lua_State *L);
 /*
 ** get functions (Lua -> stack)
 …
 LUA_API void  (lua_getfenv) (lua_State *L, int idx);
 /*
 ** set functions (stack -> Lua)
 …
 LUA_API int   (lua_setfenv) (lua_State *L, int idx);
 /*
 ** `load' and `call' functions (load and run Lua code)
 …
 LUA_API int (lua_dump) (lua_State *L, lua_Writer writer, void *data);
 /*
 ** coroutine functions
 …
 */
 #define LUA_GCSTOP              0
 #define LUA_GCRESTART           1
 #define LUA_GCCOLLECT           2
 #define LUA_GCCOUNT             3
 #define LUA_GCCOUNTB            4
 #define LUA_GCSTEP              5
 #define LUA_GCSETPAUSE          6
 #define LUA_GCSETSTEPMUL        7
+#define LUA_GCSTOP          0
+#define LUA_GCRESTART       1
+#define LUA_GCCOLLECT       2
+#define LUA_GCCOUNT         3
+#define LUA_GCCOUNTB        4
+#define LUA_GCSTEP          5
+#define LUA_GCSETPAUSE      6
+#define LUA_GCSETSTEPMUL    7
 LUA_API int (lua_gc) (lua_State *L, int what, int data);
 /*
 …
 LUA_API lua_Alloc (lua_getallocf) (lua_State *L, void **ud);
 LUA_API void lua_setallocf (lua_State *L, lua_Alloc f, void *ud);
 /*
 …
 */
+#define lua_pop(L,n)            lua_settop(L, -(n)-1)
+#define lua_newtable(L)         lua_createtable(L, 0, 0)
+#define lua_register(L,n,f) (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
+#define lua_pushcfunction(L,f)  lua_pushcclosure(L, (f), 0)
+#define lua_strlen(L,i)         lua_objlen(L, (i))
+#define lua_isfunction(L,n)     (lua_type(L, (n)) == LUA_TFUNCTION)
+#define lua_istable(L,n)        (lua_type(L, (n)) == LUA_TTABLE)
+#define lua_islightuserdata(L,n)        (lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)          (lua_type(L, (n)) == LUA_TNIL)
+#define lua_isboolean(L,n)      (lua_type(L, (n)) == LUA_TBOOLEAN)
+#define lua_isthread(L,n)       (lua_type(L, (n)) == LUA_TTHREAD)
+#define lua_isnone(L,n)         (lua_type(L, (n)) == LUA_TNONE)
+#define lua_isnoneornil(L, n)   (lua_type(L, (n)) <= 0)
+#define lua_pushliteral(L, s)   \
+        lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
+#define lua_setglobal(L,s)      lua_setfield(L, LUA_GLOBALSINDEX, (s))
+#define lua_getglobal(L,s)      lua_getfield(L, LUA_GLOBALSINDEX, (s))
+#define lua_tostring(L,i)       lua_tolstring(L, (i), NULL)
+#define lua_pop(L,n)            lua_settop(L, -(n)-1)
+#define lua_newtable(L)         lua_createtable(L, 0, 0)
+#define lua_register(L,n,f)     (lua_pushcfunction(L, (f)), lua_setglobal(L, (n)))
+#define lua_pushcfunction(L,f)  lua_pushcclosure(L, (f), 0)
+#define lua_strlen(L,i)         lua_objlen(L, (i))
+#define lua_isfunction(L,n)     (lua_type(L, (n)) == LUA_TFUNCTION)
+#define lua_istable(L,n)        (lua_type(L, (n)) == LUA_TTABLE)
+#define lua_islightuserdata(L,n)    (lua_type(L, (n)) == LUA_TLIGHTUSERDATA)
+#define lua_isnil(L,n)          (lua_type(L, (n)) == LUA_TNIL)
+#define lua_isboolean(L,n)      (lua_type(L, (n)) == LUA_TBOOLEAN)
+#define lua_isthread(L,n)       (lua_type(L, (n)) == LUA_TTHREAD)
+#define lua_isnone(L,n)         (lua_type(L, (n)) == LUA_TNONE)
+#define lua_isnoneornil(L, n)   (lua_type(L, (n)) <= 0)
+#define lua_pushliteral(L, s)   \
+    lua_pushlstring(L, "" s, (sizeof(s)/sizeof(char))-1)
+#define lua_setglobal(L,s)      lua_setfield(L, LUA_GLOBALSINDEX, (s))
+#define lua_getglobal(L,s)      lua_getfield(L, LUA_GLOBALSINDEX, (s))
+#define lua_tostring(L,i)       lua_tolstring(L, (i), NULL)
 /*
 …
 */
+#define lua_open()      luaL_newstate()
+#define lua_getregistry(L)      lua_pushvalue(L, LUA_REGISTRYINDEX)
+#define lua_getgccount(L)       lua_gc(L, LUA_GCCOUNT, 0)
+#define lua_Chunkreader         lua_Reader
+#define lua_Chunkwriter         lua_Writer
+#define lua_open()          luaL_newstate()
+#define lua_getregistry(L)  lua_pushvalue(L, LUA_REGISTRYINDEX)
+#define lua_getgccount(L)   lua_gc(L, LUA_GCCOUNT, 0)
+#define lua_Chunkreader     lua_Reader
+#define lua_Chunkwriter     lua_Writer
 /* hack */
+LUA_API void lua_setlevel       (lua_State *from, lua_State *to);
+LUA_API void lua_setlevel   (lua_State *from, lua_State *to);
 /*
 …
 */
 /*
 ** Event codes
 */
 #define LUA_HOOKCALL    0
 #define LUA_HOOKRET     1
 #define LUA_HOOKLINE    2
 #define LUA_HOOKCOUNT   3
+#define LUA_HOOKCALL    0
+#define LUA_HOOKRET     1
+#define LUA_HOOKLINE    2
+#define LUA_HOOKCOUNT   3
 #define LUA_HOOKTAILRET 4
 /*
 ** Event masks
 */
 #define LUA_MASKCALL    (1 << LUA_HOOKCALL)
 #define LUA_MASKRET     (1 << LUA_HOOKRET)
 #define LUA_MASKLINE    (1 << LUA_HOOKLINE)
 #define LUA_MASKCOUNT   (1 << LUA_HOOKCOUNT)
+#define LUA_MASKCALL    (1 << LUA_HOOKCALL)
+#define LUA_MASKRET     (1 << LUA_HOOKRET)
+#define LUA_MASKLINE    (1 << LUA_HOOKLINE)
+#define LUA_MASKCOUNT   (1 << LUA_HOOKCOUNT)
 typedef struct lua_Debug lua_Debug;  /* activation record */
 /* Functions to be called by the debuger in specific events */
 typedef void (*lua_Hook) (lua_State *L, lua_Debug *ar);
 LUA_API int lua_getstack (lua_State *L, int level, lua_Debug *ar);
 …
 LUA_API int lua_gethookcount (lua_State *L);
 struct lua_Debug {
   int event;
   const char *name;     /* (n) */
   const char *namewhat; /* (n) `global', `local', `field', `method' */
   const char *what;     /* (S) `Lua', `C', `main', `tail' */
   const char *source;   /* (S) */
   int currentline;      /* (l) */
   int nups;             /* (u) number of upvalues */
   int linedefined;      /* (S) */
   int lastlinedefined;  /* (S) */
   char short_src[LUA_IDSIZE]; /* (S) */
   /* private part */
   int i_ci;  /* active function */
+    int event;
+    const char *name;           /* (n) */
+    const char *namewhat;       /* (n) `global', `local', `field', `method' */
+    const char *what;           /* (S) `Lua', `C', `main', `tail' */
+    const char *source;         /* (S) */
+    int currentline;            /* (l) */
+    int nups;                   /* (u) number of upvalues */
+    int linedefined;            /* (S) */
+    int lastlinedefined;        /* (S) */
+    char short_src[LUA_IDSIZE]; /* (S) */
+    /* private part */
+    int i_ci;                   /* active function */
 };
 /* }====================================================================== */
 /******************************************************************************
 …
 ******************************************************************************/
 #endif

trunk/include/luaconf.h

-                      r515
+                      r1663
 */
 #ifndef lconfig_h
 #define lconfig_h
 …
 */
 /*
@@ LUA_ANSI controls the use of non-ansi features.
 …
 #endif
 #if !defined(LUA_ANSI) && defined(_WIN32)
 #define LUA_WIN
 …
 #if defined(LUA_USE_LINUX)
 #define LUA_USE_POSIX
 #define LUA_USE_DLOPEN          /* needs an extra library: -ldl */
 #define LUA_USE_READLINE        /* needs some extra libraries */
+#define LUA_USE_DLOPEN      /* needs an extra library: -ldl */
+#define LUA_USE_READLINE    /* needs some extra libraries */
 #endif
 #if defined(LUA_USE_MACOSX)
 #define LUA_USE_POSIX
+#define LUA_DL_DYLD             /* does not need extra library */
+#endif
+#define LUA_DL_DYLD         /* does not need extra library */
+#endif
 /*
 …
 #endif
 /*
@@ LUA_PATH and LUA_CPATH are the names of the environment variables that
 …
 #define LUA_PATH        "LUA_PATH"
 #define LUA_CPATH       "LUA_CPATH"
+#define LUA_INIT        "LUA_INIT"
+#define LUA_INIT        "LUA_INIT"
 /*
 …
 ** path of the directory of the executable file of the current process.
 */
 #define LUA_LDIR        "!\\lua\\"
 #define LUA_CDIR        "!\\"
+#define LUA_LDIR    "!\\lua\\"
+#define LUA_CDIR    "!\\"
 #define LUA_PATH_DEFAULT  \
                 ".\\?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
                              LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua"
+        ".\\?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?\\init.lua;" \
+                    LUA_CDIR"?.lua;"  LUA_CDIR"?\\init.lua"
 #define LUA_CPATH_DEFAULT \
         ".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
 #else
 #define LUA_ROOT        "/usr/local/"
 #define LUA_LDIR        LUA_ROOT "share/lua/5.1/"
 #define LUA_CDIR        LUA_ROOT "lib/lua/5.1/"
+    ".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
+#else
+#define LUA_ROOT    "/usr/local/"
+#define LUA_LDIR    LUA_ROOT "share/lua/5.1/"
+#define LUA_CDIR    LUA_ROOT "lib/lua/5.1/"
 #define LUA_PATH_DEFAULT  \
                 "./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
                             LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
+        "./?.lua;"  LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
+                    LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua"
 #define LUA_CPATH_DEFAULT \
+        "./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+#endif
+    "./?.so;"  LUA_CDIR"?.so;" LUA_CDIR"loadall.so"
+#endif
 /*
 …
 */
 #if defined(_WIN32)
+#define LUA_DIRSEP      "\\"
+#else
+#define LUA_DIRSEP      "/"
+#endif
+#define LUA_DIRSEP  "\\"
+#else
+#define LUA_DIRSEP  "/"
+#endif
 /*
 …
 ** in file/directory names.) Probably you do not need to change them.
 */
+#define LUA_PATHSEP     ";"
+#define LUA_PATH_MARK   "?"
+#define LUA_EXECDIR     "!"
+#define LUA_IGMARK      "-"
+#define LUA_PATHSEP     ";"
+#define LUA_PATH_MARK   "?"
+#define LUA_EXECDIR     "!"
+#define LUA_IGMARK      "-"
 /*
 …
 ** machines, ptrdiff_t gives a good choice between int or long.)
 */
+#define LUA_INTEGER     int
+#define LUA_INTEGER     int
 /*
 …
 #else
 #define LUA_API         extern
+#define LUA_API     extern
 #endif
 /* more often than not the libs go together with the core */
+#define LUALIB_API      LUA_API
+#define LUALIB_API  LUA_API
 /*
 …
 */
 #if defined(luaall_c)
 #define LUAI_FUNC       static
 #define LUAI_DATA       /* empty */
+#define LUAI_FUNC   static
+#define LUAI_DATA   /* empty */
 #elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \
 …
 /* reyalp: hidden is irrelevant if not dynamically linked*/
 #if defined(HDK_VERSION)
+#define LUAI_FUNC       extern
+#else
+#define LUAI_FUNC       __attribute__((visibility("hidden"))) extern
+#endif
+#define LUAI_DATA       LUAI_FUNC
+#else
+#define LUAI_FUNC       extern
+#define LUAI_DATA       extern
+#endif
+#define LUAI_FUNC   extern
+#else
+#define LUAI_FUNC   __attribute__((visibility("hidden"))) extern
+#endif
+#define LUAI_DATA   LUAI_FUNC
+#else
+#define LUAI_FUNC   extern
+#define LUAI_DATA   extern
+#endif
 /*
 …
 ** CHANGE it if you want a different appearance.
 */
+#define LUA_QL(x)       "'" x "'"
+#define LUA_QS          LUA_QL("%s")
+#define LUA_QL(x)   "'" x "'"
+#define LUA_QS      LUA_QL("%s")
 /*
 …
 */
 #define LUA_IDSIZE      60
 /*
 …
 #if defined(LUA_USE_ISATTY)
 #include <unistd.h>
 #define lua_stdin_is_tty()      isatty(0)
+#define lua_stdin_is_tty()  isatty(0)
 #elif defined(LUA_WIN)
 #include <io.h>
 #include <stdio.h>
+#define lua_stdin_is_tty()      _isatty(_fileno(stdin))
+#else
+#define lua_stdin_is_tty()      1  /* assume stdin is a tty */
+#endif
+#define lua_stdin_is_tty()  _isatty(_fileno(stdin))
+#else
+#define lua_stdin_is_tty()  1  /* assume stdin is a tty */
+#endif
 /*
 …
 ** prompts dynamically, assigning to globals _PROMPT/_PROMPT2.)
 */
+#define LUA_PROMPT              "> "
+#define LUA_PROMPT2             ">> "
+#define LUA_PROMPT      "> "
+#define LUA_PROMPT2     ">> "
 /*
 …
 ** your system is not able to detect that name automatically.
 */
+#define LUA_PROGNAME            "lua"
+#define LUA_PROGNAME    "lua"
 /*
 …
 ** CHANGE it if you need longer lines.
 */
+#define LUA_MAXINPUT    512
+#define LUA_MAXINPUT    512
 /*
 …
 #define lua_readline(L,b,p)     ((void)L, ((b)=readline(p)) != NULL)
 #define lua_saveline(L,idx) \
         if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
           add_history(lua_tostring(L, idx));  /* add it to history */
+    if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
+    add_history(lua_tostring(L, idx));  /* add it to history */
 #define lua_freeline(L,b)       ((void)L, free(b))
 #else
 #define lua_readline(L,b,p)     \
         ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
         fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
+    ((void)L, fputs(p, stdout), fflush(stdout),  /* show prompt */ \
+    fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
 #define lua_saveline(L,idx)     { (void)L; (void)idx; }
 #define lua_freeline(L,b)       { (void)L; (void)b; }
 …
 /* }================================================================== */
 /*
 …
 ** this value dynamically.
 */
+#define LUAI_GCPAUSE    200  /* 200% (wait memory to double before next GC) */
+#define LUAI_GCPAUSE    200  /* 200% (wait memory to double before next GC) */
 /*
 …
 #define LUAI_GCMUL      200 /* GC runs 'twice the speed' of memory allocation */
 /*
@@ LUA_COMPAT_GETN controls compatibility with old getn behavior.
 …
 */
 #undef LUA_COMPAT_OPENLIB
 /*
 …
 #if defined(LUA_USE_APICHECK)
 #include <assert.h>
+#define luai_apicheck(L,o)      { (void)L; assert(o); }
+#else
+#define luai_apicheck(L,o)      { (void)L; }
+#endif
+#define luai_apicheck(L,o)  { (void)L; assert(o); }
+#else
+#define luai_apicheck(L,o)  { (void)L; }
+#endif
 /*
 …
 /* avoid overflows in comparison */
 #if INT_MAX-20 < 32760
 #define LUAI_BITSINT    16
+#define LUAI_BITSINT    16
 #elif INT_MAX > 2147483640L
 /* int has at least 32 bits */
 #define LUAI_BITSINT    32
+#define LUAI_BITSINT    32
 #else
 #error "you must define LUA_BITSINT with number of bits in an integer"
 #endif
 /*
 …
 */
 #if LUAI_BITSINT >= 32
 #define LUAI_UINT32     unsigned int
 #define LUAI_INT32      int
 #define LUAI_MAXINT32   INT_MAX
 #define LUAI_UMEM       size_t
 #define LUAI_MEM        ptrdiff_t
+#define LUAI_UINT32     unsigned int
+#define LUAI_INT32      int
+#define LUAI_MAXINT32   INT_MAX
+#define LUAI_UMEM       size_t
+#define LUAI_MEM        ptrdiff_t
 #else
 /* 16-bit ints */
+#define LUAI_UINT32     unsigned long
+#define LUAI_INT32      long
+#define LUAI_MAXINT32   LONG_MAX
+#define LUAI_UMEM       unsigned long
+#define LUAI_MEM        long
+#endif
+#define LUAI_UINT32     unsigned long
+#define LUAI_INT32      long
+#define LUAI_MAXINT32   LONG_MAX
+#define LUAI_UMEM       unsigned long
+#define LUAI_MEM        long
+#endif
 /*
 …
 ** exhausting memory.
 */
+#define LUAI_MAXCALLS   20000
+#define LUAI_MAXCALLS   20000
 /*
 …
 ** functions to consume unlimited stack space.
 */
+#define LUAI_MCS_AUX    ((int)(INT_MAX / (4*sizeof(LUA_NUMBER))))
+#define LUAI_MAXCSTACK  (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX)
+#define LUAI_MCS_AUX    ((int)(INT_MAX / (4*sizeof(LUA_NUMBER))))
+#define LUAI_MAXCSTACK  (LUAI_MCS_AUX > SHRT_MAX ? SHRT_MAX : LUAI_MCS_AUX)
 /*
 …
 */
 /*
@@ LUAI_MAXCCALLS is the maximum depth for nested C calls (short) and
 @* syntactical nested non-terminals in a program.
 */
+#define LUAI_MAXCCALLS          200
+#define LUAI_MAXCCALLS      200
 /*
 …
 @* (must be smaller than 250).
 */
+#define LUAI_MAXVARS            200
+#define LUAI_MAXVARS        200
 /*
 …
 @* (must be smaller than 250).
 */
+#define LUAI_MAXUPVALUES        60
+#define LUAI_MAXUPVALUES    60
 /*
@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
 */
 #define LUAL_BUFFERSIZE         512 /*BUFSIZ*/
+#define LUAL_BUFFERSIZE     512 /*BUFSIZ*/
 /* }================================================================== */
 /*
 …
 //#define LUA_NUMBER_DOUBLE
 #define LUA_NUMBER      int
+#define LUA_NUMBER      int
 /*
 …
 @* over a number.
 */
+#define LUAI_UACNUMBER  int
+#define LUAI_UACNUMBER  int
 /*
 …
@@ lua_str2number converts a string to a number.
 */
+#define LUA_NUMBER_SCAN         "%d"
+#define LUA_NUMBER_FMT          "%d"
+#define lua_number2str(s,n)     sprintf((s), LUA_NUMBER_FMT, (n))
+#define LUAI_MAXNUMBER2STR      15
+#define lua_str2number(s,p)     strtol((s), (p), 10)
+#define LUA_NUMBER_SCAN     "%d"
+#define LUA_NUMBER_FMT      "%d"
+#define lua_number2str(s,n) sprintf((s), LUA_NUMBER_FMT, (n))
+#define LUAI_MAXNUMBER2STR  15
+#define lua_str2number(s,p) strtol((s), (p), 10)
 /*
 …
 #if defined(LUA_CORE)
 //#include <math.h>
 #define luai_numadd(a,b)        ((a)+(b))
 #define luai_numsub(a,b)        ((a)-(b))
 #define luai_nummul(a,b)        ((a)*(b))
 #define luai_numdiv(a,b)        ((a)/(b))
 #define luai_nummod(a,b)        ((a)%(b))
 #define luai_numpow(a,b)        (luai_ipow(a,b))
 #define luai_numunm(a)          (-(a))
 #define luai_numeq(a,b)         ((a)==(b))
 #define luai_numlt(a,b)         ((a)<(b))
 #define luai_numle(a,b)         ((a)<=(b))
 #define luai_numisnan(a)        (!luai_numeq((a), (a)))
+#define luai_numadd(a,b)    ((a)+(b))
+#define luai_numsub(a,b)    ((a)-(b))
+#define luai_nummul(a,b)    ((a)*(b))
+#define luai_numdiv(a,b)    ((a)/(b))
+#define luai_nummod(a,b)    ((a)%(b))
+#define luai_numpow(a,b)    (luai_ipow(a,b))
+#define luai_numunm(a)      (-(a))
+#define luai_numeq(a,b)     ((a)==(b))
+#define luai_numlt(a,b)     ((a)<(b))
+#define luai_numle(a,b)     ((a)<=(b))
+#define luai_numisnan(a)    (!luai_numeq((a), (a)))
 #endif
 …
 #define lua_number2int(i,d)   __asm fld d   __asm fistp i
 #define lua_number2integer(i,n)         lua_number2int(i, n)
+#define lua_number2integer(i,n)     lua_number2int(i, n)
 /* the next trick should work on any Pentium, but sometimes clashes
 …
 #define lua_number2int(i,d) \
   { volatile union luai_Cast u; u.l_d = (d) + 6755399441055744.0; (i) = u.l_l; }
+#define lua_number2integer(i,n)         lua_number2int(i, n)
+#endif
+#define lua_number2integer(i,n)     lua_number2int(i, n)
+#endif
 /* this option always works, but may be slow */
 …
 ** union.) Probably you do not need to change this.
 */
+#define LUAI_USER_ALIGNMENT_T   union { double u; void *s; long l; }
+#define LUAI_USER_ALIGNMENT_T   union { double u; void *s; long l; }
 /*
 …
 #if defined(__cplusplus)
 /* C++ exceptions */
 #define LUAI_THROW(L,c) throw(c)
 #define LUAI_TRY(L,c,a) try { a } catch(...) \
         { if ((c)->status == 0) (c)->status = -1; }
 #define luai_jmpbuf     int  /* dummy variable */
+#define LUAI_THROW(L,c) throw(c)
+#define LUAI_TRY(L,c,a) try { a } catch(...) \
+    { if ((c)->status == 0) (c)->status = -1; }
+#define luai_jmpbuf int  /* dummy variable */
 #elif defined(LUA_USE_ULONGJMP)
 /* in Unix, try _longjmp/_setjmp (more efficient) */
 #define LUAI_THROW(L,c) _longjmp((c)->b, 1)
 #define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
 #define luai_jmpbuf     jmp_buf
+#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
 #else
 /* default handling with long jumps */
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
+#endif
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
+#endif
 /*
 …
 ** CHANGE it if you need more captures. This limit is arbitrary.
 */
+#define LUA_MAXCAPTURES         32
+#define LUA_MAXCAPTURES     32
 /*
 …
 #if defined(LUA_USE_MKSTEMP)
 #include <unistd.h>
+#define LUA_TMPNAMBUFSIZE       32
+#define lua_tmpnam(b,e) { \
+        strcpy(b, "/tmp/lua_XXXXXX"); \
+        e = mkstemp(b); \
+        if (e != -1) close(e); \
+        e = (e == -1); }
+#else
+#define LUA_TMPNAMBUFSIZE       L_tmpnam
+#define lua_tmpnam(b,e)         { e = (tmpnam(b) == NULL); }
+#endif
+#endif
+#define LUA_TMPNAMBUFSIZE   32
+#define lua_tmpnam(b,e) { \
+    strcpy(b, "/tmp/lua_XXXXXX"); \
+    e = mkstemp(b); \
+    if (e != -1) close(e); \
+    e = (e == -1); }
+#else
+#define LUA_TMPNAMBUFSIZE   L_tmpnam
+#define lua_tmpnam(b,e)     { e = (tmpnam(b) == NULL); }
+#endif
+#endif
 /*
 …
 #if defined(LUA_USE_POPEN)
 #define lua_popen(L,c,m)        ((void)L, fflush(NULL), popen(c,m))
 #define lua_pclose(L,file)      ((void)L, (pclose(file) != -1))
+#define lua_popen(L,c,m)    ((void)L, fflush(NULL), popen(c,m))
+#define lua_pclose(L,file)  ((void)L, (pclose(file) != -1))
 #elif defined(LUA_WIN)
 #define lua_popen(L,c,m)        ((void)L, _popen(c,m))
 #define lua_pclose(L,file)      ((void)L, (_pclose(file) != -1))
 #else
 #define lua_popen(L,c,m)        ((void)((void)c, m),  \
                 luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
 #define lua_pclose(L,file)              ((void)((void)L, file), 0)
+#define lua_popen(L,c,m)    ((void)L, _popen(c,m))
+#define lua_pclose(L,file)  ((void)L, (_pclose(file) != -1))
+#else
+#define lua_popen(L,c,m)    ((void)((void)c, m),  \
+        luaL_error(L, LUA_QL("popen") " not supported"), (FILE*)0)
+#define lua_pclose(L,file)  ((void)((void)L, file), 0)
 #endif
 …
 ** a multiple of the maximum alignment required for your machine.
 */
+#define LUAI_EXTRASPACE         0
+#define LUAI_EXTRASPACE     0
 /*
 …
 ** extra when a thread is created/deleted/resumed/yielded.
 */
+#define luai_userstateopen(L)           ((void)L)
+#define luai_userstateclose(L)          ((void)L)
+#define luai_userstatethread(L,L1)      ((void)L)
+#define luai_userstatefree(L)           ((void)L)
+#define luai_userstateresume(L,n)       ((void)L)
+#define luai_userstateyield(L,n)        ((void)L)
+#define luai_userstateopen(L)       ((void)L)
+#define luai_userstateclose(L)      ((void)L)
+#define luai_userstatethread(L,L1)  ((void)L)
+#define luai_userstatefree(L)       ((void)L)
+#define luai_userstateresume(L,n)   ((void)L)
+#define luai_userstateyield(L,n)    ((void)L)
 /*
 …
 #if defined(LUA_USELONGLONG)
+#define LUA_INTFRMLEN           "ll"
+#define LUA_INTFRM_T            long long
+#else
+#define LUA_INTFRMLEN           "l"
+#define LUA_INTFRM_T            long
+#endif
+#define LUA_INTFRMLEN       "ll"
+#define LUA_INTFRM_T        long long
+#else
+#define LUA_INTFRMLEN       "l"
+#define LUA_INTFRM_T        long
+#endif
 /* =================================================================== */
 …
 */
+#endif
+#endif

trunk/include/lualib.h

-                      r515
+                      r1663
 */
 #ifndef lualib_h
 #define lualib_h
 …
 #include "lua.h"
+/* Key to file-handle type */
+#define LUA_FILEHANDLE  "FILE*"
+/* Key to file-handle type */
+#define LUA_FILEHANDLE          "FILE*"
+#define LUA_COLIBNAME   "coroutine"
+#define LUA_COLIBNAME   "coroutine"
 LUALIB_API int (luaopen_base) (lua_State *L);
 #define LUA_TABLIBNAME  "table"
+#define LUA_TABLIBNAME  "table"
 LUALIB_API int (luaopen_table) (lua_State *L);
 #define LUA_IOLIBNAME   "io"
+#define LUA_IOLIBNAME   "io"
 LUALIB_API int (luaopen_io) (lua_State *L);
 #define LUA_OSLIBNAME   "os"
+#define LUA_OSLIBNAME   "os"
 LUALIB_API int (luaopen_os) (lua_State *L);
 #define LUA_STRLIBNAME  "string"
+#define LUA_STRLIBNAME  "string"
 LUALIB_API int (luaopen_string) (lua_State *L);
 #define LUA_MATHLIBNAME "math"
+#define LUA_MATHLIBNAME "math"
 LUALIB_API int (luaopen_math) (lua_State *L);
 #define LUA_DBLIBNAME   "debug"
+#define LUA_DBLIBNAME   "debug"
 LUALIB_API int (luaopen_debug) (lua_State *L);
 #define LUA_LOADLIBNAME "package"
+#define LUA_LOADLIBNAME "package"
 LUALIB_API int (luaopen_package) (lua_State *L);
 /* open all previous libraries */
 LUALIB_API void (luaL_openlibs) (lua_State *L);
 #ifndef lua_assert
 #define lua_assert(x)   ((void)0)
+#define lua_assert(x)   ((void)0)
 #endif
 #endif

trunk/include/modelist.h

-                      r1620
+                      r1663
 #ifndef MODELIST_H
 #define MODELIST_H
 /*
 CHDK capture mode constants.
 WARNING: This file is used with gen_modelist_lua.sed to generate modelist.lua
 WARNING: These are used for platform independent script values.
+WARNING: These are used for platform independent script values.
 Changing order or inserting new values will break script compatibility.
 ADD NEW VALUES AT THE END!
 …
     MODE_AV                 ,
     MODE_M                  , // note, use only for true manual modes that allow direct control of Tv/Av
     MODE_PORTRAIT           ,
+    MODE_PORTRAIT           ,
     MODE_NIGHT_SCENE        , // "night scene" mode. Note, this can be a dail position, or under the scene menu (SCN_NIGHT_SCENE).
     MODE_LANDSCAPE          ,
 …
     MODE_LOWLIGHT           , // g11
     MODE_SCN_NOSTALGIC      , // s90
     MODE_SCN_SMART_SHUTTER    , // sx30/g12 (Smart Shutter, Smile detection mode)
     MODE_SCN_LOWLIGHT        , // sx30
+    MODE_SCN_SMART_SHUTTER  , // sx30/g12 (Smart Shutter, Smile detection mode)
+    MODE_SCN_LOWLIGHT       , // sx30
     MODE_SCN_SUPER_VIVID    , // sx30
     MODE_SCN_POSTER_EFFECT    , // sx30
+    MODE_SCN_POSTER_EFFECT  , // sx30
     MODE_SCN_FISHEYE        , // sx30
     MODE_SCN_MINIATURE        , // sx30
+    MODE_SCN_MINIATURE      , // sx30
     MODE_SCN_HDR            , // g12 (HDR scene mode)
     MODE_VIDEO_MINIATURE    , // g12 (miniature effect video mode)
     MODE_VIDEO_IFRAME_MOVIE , // sx220
     MODE_VIDEO_MOVIE_DIGEST    , // sx220 (the camera automatically record a short video clip (up to approximately 4 seconds) every time you shoot a still image.)
+    MODE_VIDEO_MOVIE_DIGEST , // sx220 (the camera automatically record a short video clip (up to approximately 4 seconds) every time you shoot
     MODE_SCN_HIGHSPEED_BURST, // sx220
     MODE_SCN_BEST_IMAGE        , // sx220
     MODE_SCN_TOY_CAMERA    , // sx220
     MODE_SCN_MONOCHROME    , // sx220
+    MODE_SCN_BEST_IMAGE     , // sx220
+    MODE_SCN_TOY_CAMERA     , // sx220
+    MODE_SCN_MONOCHROME     , // sx220
     MODE_SCN_WINK_SELF_TIMER, // sx30/g12 (Smart Shutter, Wink Self Timer mode)
     MODE_SCN_FACE_SELF_TIMER, // sx30/g12 (Smart Shutter, Face Self Timer mode)
     MODE_VIDEO_SUPER_SLOW   ,   // IXUS 310 HS Super Slow Motion Movie
+    MODE_VIDEO_SUPER_SLOW   , // IXUS 310 HS Super Slow Motion Movie
     MODE_SMART_SHUTTER      , // ixus1000_sd4500 - the following are not under SCN
     MODE_HIGHSPEED_BURST    ,
 …
     MODE_FIREWORK           , // ixus1000 end
     MODE_LIVE               , // A3300is
     MODE_DISCREET                        , // A3300is
+    MODE_DISCREET           , // A3300is
 };

trunk/include/platform.h

-                      r1661
+                      r1663
 #elif CAM_PROPSET == 3
     #include "propset3.h"
 #elif CAM_PROPSET == 2    // most digic3 cameras
+#elif CAM_PROPSET == 2      // most digic3 cameras
     #include "propset2.h"
 #elif CAM_PROPSET == 1    // most digic2 cameras
+#elif CAM_PROPSET == 1      // most digic2 cameras
     #include "propset1.h"
 #else
 …
 #endif
 #define MIN_DIST                CAMERA_MIN_DIST     // Defined in camera.h (can be overridden in platform_camera.h)
 #define MAX_DIST                CAMERA_MAX_DIST     // Defined in camera.h (can be overridden in platform_camera.h)
 #define INFINITY_DIST           0xFFFFFFFF          // Value to send to firmware to select 'infinity' focus
 #define MAX_DIST_HYPER_FOCAL    999999
+#define MIN_DIST                    CAMERA_MIN_DIST     // Defined in camera.h (can be overridden in platform_camera.h)
+#define MAX_DIST                    CAMERA_MAX_DIST     // Defined in camera.h (can be overridden in platform_camera.h)
+#define INFINITY_DIST               0xFFFFFFFF          // Value to send to firmware to select 'infinity' focus
+#define MAX_DIST_HYPER_FOCAL        999999
 //********************
 …
 //********************
 #define MODE_SCREEN_MASK        0x0C00
 #define MODE_SCREEN_OPENED      0x0400
 #define MODE_SCREEN_ROTATED     0x0800
+#define MODE_SCREEN_MASK            0x0C00
+#define MODE_SCREEN_OPENED          0x0400
+#define MODE_SCREEN_ROTATED         0x0800
 /* Keyboard repeat and initial delays */
 …
 #define KBD_INITIAL_DELAY 300
 // Video recording current status constants, see movie_status variable
 #define VIDEO_RECORD_NEVER_STARTED    0
 #define VIDEO_RECORD_STOPPED          1
 #define VIDEO_RECORD_IN_PROGRESS      4
 //Optical & digital zoom status constants, see zoom_status variable
 #define ZOOM_OPTICAL_MIN              1
 #define ZOOM_OPTICAL_MAX              2
 #define ZOOM_OPTICAL_MEDIUM           3
 #define ZOOM_OPTICAL_IN               4
 #define ZOOM_OPTICAL_OUT              5
 #define ZOOM_OPTICAL_REACHED_MIN      7
 #define ZOOM_DIGITAL_MAX              9
 #define ZOOM_DIGITAL_MEDIUM           10
 #define ZOOM_DIGITAL_IN               11
 #define ZOOM_DIGITAL_OUT              12
 #define ZOOM_DIGITAL_REACHED_MAX      13
 typedef struct {
     unsigned short hackmode; // platform independent mode values from MODE_xxx enum
     unsigned short canonmode; // PROPCASE_SHOOTING_MODE value
+// Video recording current status constants, see movie_status variable
+#define VIDEO_RECORD_NEVER_STARTED  0
+#define VIDEO_RECORD_STOPPED        1
+#define VIDEO_RECORD_IN_PROGRESS    4
+//Optical & digital zoom status constants, see zoom_status variable
+#define ZOOM_OPTICAL_MIN            1
+#define ZOOM_OPTICAL_MAX            2
+#define ZOOM_OPTICAL_MEDIUM         3
+#define ZOOM_OPTICAL_IN             4
+#define ZOOM_OPTICAL_OUT            5
+#define ZOOM_OPTICAL_REACHED_MIN    7
+#define ZOOM_DIGITAL_MAX            9
+#define ZOOM_DIGITAL_MEDIUM         10
+#define ZOOM_DIGITAL_IN             11
+#define ZOOM_DIGITAL_OUT            12
+#define ZOOM_DIGITAL_REACHED_MAX    13
+typedef struct {
+    unsigned short hackmode;   // platform independent mode values from MODE_xxx enum
+    unsigned short canonmode;  // PROPCASE_SHOOTING_MODE value
 } CapturemodeMap;
 typedef struct {
     short id; // hacks id
     short prop_id; // Canons id
+    short id;       // hacks id
+    short prop_id;  // Canons id
     char name[8];
     short shutter_dfs_value; // shutter speed to use dark frame substraction
 …
 typedef struct {
     short id; // hacks id
     short prop_id; // Canons id
+    short id;       // hacks id
+    short prop_id;  // Canons id
     char name[8];
     long usec;
 …
 typedef struct {
     short id; // hacks id
     short prop_id; // Canons id
+    short id;       // hacks id
+    short prop_id;  // Canons id
     char name[8];
 } ApertureSize;
 …
 #define SHOW_HALF      2
 typedef struct {
     short av96;
 …
     short iso_market;
     short bv96_measured;
     short bv96_seted;//Ev96_internal-Sv96
     short ev96_seted; //Tv96+Av96
     short ev96_measured; //Bv96+Sv96
     short dev96;// Ev96_external-Ev96_internal
     short dev96_canon;// Canon OverExposure
     int b; //average scene luminance
+    short bv96_seted;       //Ev96_internal-Sv96
+    short ev96_seted;       //Tv96+Av96
+    short ev96_measured;    //Bv96+Sv96
+    short dev96;            // Ev96_external-Ev96_internal
+    short dev96_canon;      // Canon OverExposure
+    int b;                  //average scene luminance
 } EXPO_TYPE;
 …
 long get_exposure_counter();
 long get_file_next_counter();
 #if defined(CAM_DATE_FOLDER_NAMING)
 void get_target_dir_name(char*);
+#if defined(CAM_DATE_FOLDER_NAMING)
+    void get_target_dir_name(char*);
 #else
 long get_target_dir_num();
+    long get_target_dir_num();
 #endif
 long get_target_file_num();
 …
 int shooting_get_user_tv_id();
 #if defined(CAM_DRAW_EXPOSITION)
 char* shooting_get_tv_str();
+    char* shooting_get_tv_str();
 #endif
 short shooting_get_tv96_from_shutter_speed(float t);
 …
 int shooting_get_user_av_id();
 #if defined(CAM_DRAW_EXPOSITION)
 char* shooting_get_av_str();
+    char* shooting_get_av_str();
 #endif
 void shooting_set_user_av_by_id(int v);
 …
 // returns 0 if in play, nonzero if rec
 int rec_mode_active(void);
+int rec_mode_active(void);
 // not used. Right now this is just to preserve code from earlier version of mode_get()
 …
 void reverse_bytes_order2(char* from, char* to, int count);
 // convert old version calls to new version (to minimise code changes)
 #define reverse_bytes_order(start, count) reverse_bytes_order2(start,start,count)
+#define reverse_bytes_order(start, count)   reverse_bytes_order2(start,start,count)
 void save_ext_for_dng(void);
 void change_ext_to_dng(void);
 …
 void  SetLogicalEventActive(unsigned event, unsigned state);
 void SetScriptMode(unsigned mode);
 /*
  call C function with argument list created at runtime.
 …
 #define started() debug_led(1)
 #define finished() debug_led(0)
 #ifdef CAM_CHDK_PTP
 …
 #ifdef OPT_EXMEM_MALLOC
 extern void exmem_malloc_init(void);
+    extern void exmem_malloc_init(void);
 #endif

trunk/include/propset4.h

-                      r1457
+                      r1663
 */
 #define PROPCASE_AF_LOCK                         11             // 0 = AF not locked, 1 = AF locked
+#define PROPCASE_AF_LOCK                         11     // 0 = AF not locked, 1 = AF locked
 #define PROPCASE_FLASH_SYNC_CURTAIN              64
 #define PROPCASE_SUBJECT_DIST2                   65
 …
 #define PROPCASE_SHOOTING_MODE                   49
 #define PROPCASE_QUALITY                         57
 #define PROPCASE_DIGITAL_ZOOM_MODE               91             // Digital Zoom Mode/State 0 = off/standard, 2 = 1.7x, 3 = 2.1x
 #define PROPCASE_DIGITAL_ZOOM_STATE              94             // Digital Zoom Mode/State 0 = Digital Zoom off, 1 = Digital Zoom on
+#define PROPCASE_DIGITAL_ZOOM_MODE               91     // Digital Zoom Mode/State 0 = off/standard, 2 = 1.7x, 3 = 2.1x
+#define PROPCASE_DIGITAL_ZOOM_STATE              94     // Digital Zoom Mode/State 0 = Digital Zoom off, 1 = Digital Zoom on
 #define PROPCASE_DIGITAL_ZOOM_POSITION           95
 #define PROPCASE_DRIVE_MODE                      102
 …
 // SX30 & G12 values
 #define PROPCASE_AE_LOCK                                                 3              // 0 = AE not locked, 1 = AE locked
 #define PROPCASE_AF_FRAME                                                8              // 1 = FlexiZone, 2 = Face AiAF / Tracking AF
 #define PROPCASE_CONTINUOUS_AF                                   12             // 0 = Continuous AF off, 1 = Continuous AF on
 #define PROPCASE_SERVO_AF                                                299    // 0 = Servo AF off, 1 = Servo AF on
+#define PROPCASE_AE_LOCK                         3       // 0 = AE not locked, 1 = AE locked
+#define PROPCASE_AF_FRAME                        8       // 1 = FlexiZone, 2 = Face AiAF / Tracking AF
+#define PROPCASE_CONTINUOUS_AF                   12      // 0 = Continuous AF off, 1 = Continuous AF on
+#define PROPCASE_SERVO_AF                        299     // 0 = Servo AF off, 1 = Servo AF on
 #define PROPCASE_METERING_MODE                   157
 #define PROPCASE_OPTICAL_ZOOM_POSITION           199
 …
 #define PROPCASE_EV_CORRECTION_2                 211
 #define PROPCASE_IS_FLASH_READY                  212
 #define PROPCASE_RESOLUTION                      222    // 0 = L, 1 = M1, 2 = M2, 4 = S, 7 = Low Light (G12)
+#define PROPCASE_RESOLUTION                      222     // 0 = L, 1 = M1, 2 = M2, 4 = S, 7 = Low Light (G12)
 #define PROPCASE_ORIENTATION_SENSOR              223
 #define PROPCASE_TIMER_MODE                      227

trunk/include/setjmp.h

-                      r515
+                      r1663
  * All else recovered by under/over(flow) handling.
  */
 #define _JBLEN  13
+#define _JBLEN  13
 #endif
 …
 /*
  * onsstack,sigmask,sp,pc,psl,d2-d7,a2-a6,
  * fp2-fp7      for 68881.
+ * fp2-fp7  for 68881.
  * All else recovered by under/over(flow) handling.
  */
 #define _JBLEN  34
+#define _JBLEN  34
 #endif
 …
  * All else recovered by under/over(flow) handling.
  */
 #define _JBLEN  9
+#define _JBLEN  9
 #endif

trunk/include/vxworks.h

-                      r875
+                      r1663
 /******************************************************************************/
 // Task control block
+struct task_t
+{
+    unsigned int unknown1[13];
+    char *name;
+    unsigned int options;
+    unsigned int state;
+    unsigned int priority;
+    unsigned int unknown2[12];
+    void *entry;
+    void *stack_base;
+    void *stack_limit;
+    void *stack_end;
+    unsigned int error_num;
+    unsigned int exit_code;
+    unsigned int unknown3[7];
+    void *task_std_fp[3];           // pointers to FILE structures
+    unsigned int task_std_fd[3];    // std file descriptors
+    unsigned int unknown4[24];
+struct task_t {
+    unsigned int    unknown1[13];
+    char            *name;
+    unsigned int    options;
+    unsigned int    state;
+    unsigned int    priority;
+    unsigned int    unknown2[12];
+    void            *entry;
+    void            *stack_base;
+    void            *stack_limit;
+    void            *stack_end;
+    unsigned int    error_num;
+    unsigned int    exit_code;
+    unsigned int    unknown3[7];
+    void            *task_std_fp[3];    // pointers to FILE structures
+    unsigned int    task_std_fd[3];     // std file descriptors
+    unsigned int    unknown4[24];
     context_t context;
     unsigned int unknown5[11];
+    unsigned int    unknown5[11];
 };
 typedef struct task_t task_t;
 /******************************************************************************/
 #endif

trunk/lib/armutil/callfunc.S

r864	r1663
69	69	LDMFD SP!, {R4-R5,LR}
70	70	BX LR
71

trunk/lib/lua/loslib.c

-                      r871
+                      r1663
 #ifndef CAM_DRYOS_2_3_R39
     setfield(L,"dev",st.st_dev);                /* device ID number */
 //    setfield(L,"ino",st.st_ino);              /* no inodes in fat, always -1 */
     setfield(L,"mode",st.st_mode);      /* file mode (see below) */
 …
     setfield(L,"size",st.st_size);      /* size of file, in bytes */
 #ifndef CAM_DRYOS_2_3_R39
         setfield(L,"atime",st.st_atime);        /* time of last access */
+    setfield(L,"atime",st.st_atime);    /* time of last access */
 #endif
     setfield(L,"mtime",st.st_mtime);    /* time of last modification */

trunk/lib/ubasic/camera_functions.c

r1428	r1663
450	450	}
451	451
452
453	452	int script_key_is_pressed( int keyid )
454	453	{
…	…
456	455	return 0;
457	456	}
458
459	457
460	458	int shot_histogram_get_range(int from, int to)

trunk/platform/a3300/platform_camera.h

r1656	r1663
74	74	#define CAM_VIDEO_QUALITY_ONLY 1
75	75
76		~~#define CAM_DETECT_SCREEN_ERASE 1~~
77
78	76	#define CAM_DATE_FOLDER_NAMING 1
79	77

trunk/platform/a410/lib.c

-                      r1226
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 94; //should be ok
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a410/platform_camera.h

r1656	r1663
73	73	#undef CAM_BRACKETING //no bracketing in fw
74	74	#define CAM_EXT_TV_RANGE 1
75		~~#define CAM_DETECT_SCREEN_ERASE 1~~
76	75	// #define CAM_NO_MEMPARTINFO 1
77	76	// #define CAM_MULTIPART 1

trunk/platform/a430/Makefile

r1641	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a430/lib.c

-                      r1628
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 108;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a450/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a450/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 111;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a460/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a460/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 111;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a530/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a540/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a540/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){ // from 710 added
  return 108; //seems to be ok
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a550/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a550/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 111;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a560/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a570/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a610/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a610/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 94;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a620/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a620/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 94;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a630/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a630/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 110;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a640/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a640/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 110;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a700/Makefile

-                      r515
+                      r1663
 kbd.o: kbd.c ../generic/kbd.c
 lib.o: lib.c ../generic/lib.c
+lib.o: lib.c
 main.o: main.c ../generic/main.c
 shooting.o: shooting.c ../generic/shooting.c
 …
         rm -f $(OBJS) libplatform.a

trunk/platform/a700/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 108;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/a710/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/a710/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 110;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/d10/platform_camera.h

r1658	r1663
45	45	#undef CAM_HAS_USER_TV_MODES
46	46	#define CAM_SHOW_OSD_IN_SHOOT_MENU 1
47		#define CAM_DETECT_SCREEN_ERASE 1
	47
48	48	// TODO this doesn't seem to be working
49	49	#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1

trunk/platform/g10/platform_camera.h

-                      r1658
+                      r1663
                                                     // Used to enabled bracketing in custom timer, required on many recent cameras
                                                     // see http://chdk.setepontos.com/index.php/topic,3994.405.html
+        #define CAM_DETECT_SCREEN_ERASE 1                               // http://chdk.setepontos.com/index.php?topic=6705.msg71062#msg71062
+    #define CAM_FIRMWARE_MEMINFO            1       // Use 'GetMemInfo' to get free memory size.
     #define CAM_USE_COLORED_ICONS               1       // Enable using the CHDK-DE colored icons.

trunk/platform/g12/platform_camera.h

r1656	r1663
47	47	#define CAM_UNCACHED_BIT 0x40000000 // S90 @FF8875FC(via ExMem.FreeCacheable)
48	48	#define CAM_SHOW_OSD_IN_SHOOT_MENU 1
49		~~#define CAM_DETECT_SCREEN_ERASE 1 // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus~~
50	49
51	50	#undef DEFAULT_RAW_EXT

trunk/platform/g7/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/g9/platform_camera.h

r1656	r1663
32	32	#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
33	33	#define CAM_HAS_JOGDIAL 1
34		~~// #define CAM_CONSOLE_LOG_ENABLED 1~~
35	34	#define CAM_BRACKETING 1
36	35	#define CAM_MULTIPART 1

trunk/platform/generic/lib.c

-                      r1023
+                      r1663
 #include "platform.h"
-void shutdown()
+{
-    volatile long *p = (void*)0xc02200a0;
-    asm(
-         "MRS     R1, CPSR\n"
-         "AND     R0, R1, #0x80\n"
-         "ORR     R1, R1, #0x80\n"
-         "MSR     CPSR_cf, R1\n"
-         :::"r1","r0");
-    *p = 0x44;
-    while(1);
+}
-#define LED_PR 0xc0220084
-void debug_led(int state)
+{
-    volatile long *p=(void*)LED_PR;
-    if (state)
-        p[0]=0x46;
-    else
-        p[0]=0x44;
+}
-#define LED_AF 0xc0220080
-void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
-  int leds[] = {12,16,4,8,4,0,4};
-  if(led < 4 || led > 10 || led == 6) return;
-  volatile long *p=(void*)LED_AF + leds[led-4];
-    if (state)
-        p[0]=0x46;
-    else
-        p[0]=0x44;
+}

trunk/platform/ixus1000_sd4500/platform_camera.h

r1656	r1663
122	122	#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
123	123
124		~~#define CAM_DETECT_SCREEN_ERASE 1 // http://chdk.setepontos.com/index.php?topic=6705.msg71062#msg71062~~
125
126	124	#define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // enable workaround for camera crash at startup when opening the conf / font files
127	125	// see http://chdk.setepontos.com/index.php?topic=6179.0

trunk/platform/ixus100_sd780/platform_camera.h

-                      r1656
+                      r1663
                                                 // Used to enabled bracketing in custom timer, required on many recent cameras
                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
-        #define CAM_DETECT_SCREEN_ERASE 1                       // http://chdk.setepontos.com/index.php?topic=6705.msg71062#msg71062
         #define REMOTE_SYNC_STATUS_LED  0xC0220128              // specifies an LED that turns on while camera waits for USB remote to sync

trunk/platform/ixus120_sd940/platform_camera.h

r1656	r1663
102	102	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
103	103
104		~~#define CAM_DETECT_SCREEN_ERASE 1 // http://chdk.setepontos.com/index.php?topic=6705.msg71062#msg71062~~
105
106	104	#define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons.
107	105

trunk/platform/ixus200_sd980/platform_camera.h

r1656	r1663
90	90	// see http://chdk.setepontos.com/index.php?topic=6179.0
91	91
92		// #define CAM_DATE_FOLDER_NAMING 0x100 //Value found in the last function, which is called in GetImageFolder. (first compare)
	92	#define CAM_DATE_FOLDER_NAMING 0x100 //Value found in the last function, which is called in GetImageFolder. (first compare)
93	93
94	94	#define CAM_DRIVE_MODE_FROM_TIMER_MODE 1 // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.

trunk/platform/ixus200_sd980/shooting.c

-                      r1632
+                      r1663
+}
+#if defined(CAM_DATE_FOLDER_NAMING)
+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';
+}
+#else
 long get_target_dir_num() {
         long n;
+    long n;
         n = get_file_next_counter();
         n = (n>>18)&0x3FF;
         return n;
+    n = get_file_next_counter();
+    n = (n>>18)&0x3FF;
+    return n;
+}
+#endif
 int circle_of_confusion = 5;

trunk/platform/ixus220_elph300hs/platform_camera.h

r1656	r1663
94	94
95	95	#define CAM_HAS_CMOS 1
96
97		~~#define CAM_DETECT_SCREEN_ERASE 1~~
98	96
99	97	#define REMOTE_SYNC_STATUS_LED 0xC0220130 // specifies an LED that turns on while camera waits for USB remote to sync

trunk/platform/ixus300_sd4000/kbd.c

-                      r1568
+                      r1663
+}
 // Base values in playback
+// Base values in Play Mode
 // physw_status[0] = 0x800C91F      // 1
 // physw_status[1] = 0xFFE          // 2 (Mode Switch: Auto)
 …
 // physw_status[2] 0x20000 SD-Card READONLY
 static KeyMap keymap[] = {
     { 0, KEY_UP         , 0x00000004 },    // finsig2
     { 0, KEY_DOWN       , 0x00000001 },    // finsig2
     { 0, KEY_LEFT       , 0x00000008 },    // finsig2
     { 0, KEY_RIGHT      , 0x00000002 },    // finsig2
     { 1, KEY_SET        , 0x00000040 },    // finsig2
     { 0, KEY_SHOOT_FULL , 0x00000900 },    // 0x00000800(KEY_SHOOT_FULL) + 0x00000100 (KEY_SHOOT_HALF), ToDo: still not shure if correct (related to problems with shoot_full?), finsig2
     { 0, KEY_SHOOT_FULL_ONLY , 0x00000800 },
     { 0, KEY_SHOOT_HALF , 0x00000100 },    // finsig2
     { 1, KEY_ZOOM_IN    , 0x00000010 },    // finsig2
     { 1, KEY_ZOOM_OUT   , 0x00000020 },    // finsig2
     { 1, KEY_MENU       , 0x00000080 },    // finsig2
+    { 0, KEY_UP         , 0x00000004 },
+    { 0, KEY_DOWN       , 0x00000001 },
+    { 0, KEY_LEFT       , 0x00000008 },
+    { 0, KEY_RIGHT      , 0x00000002 },
+    { 1, KEY_SET        , 0x00000040 },
+    { 0, KEY_SHOOT_FULL , 0x00000900 },   // 0x00000800 (KEY_SHOOT_FULL_ONLY) + 0x00000100 (KEY_SHOOT_HALF)
+    { 0, KEY_SHOOT_FULL_ONLY, 0x00000800 },
+    { 0, KEY_SHOOT_HALF , 0x00000100 },
+    { 1, KEY_ZOOM_IN    , 0x00000010 },
+    { 1, KEY_ZOOM_OUT   , 0x00000020 },
+    { 1, KEY_MENU       , 0x00000080 },
     { 0, KEY_PRINT      , 0x0000000C },   // ALT Key workaround: KEY_UP + KEY_LEFT (camera has no print key)
     { 0, 0, 0 }

trunk/platform/ixus300_sd4000/lib.c

r1642	r1663
48	48	//ROM:FF997634 CMP R4, #0x94 <---
49	49	int get_flash_params_count(void) {
50		return 148; // 0x94 = 148~~, finsig2~~
	50	return 148; // 0x94 = 148
51	51	}
52	52

trunk/platform/ixus300_sd4000/platform_camera.h

r1656	r1663
135	135
136	136	#define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // cameras intermittently crashing on startup with "ASSERT!! FsIoNotify.c Line 457 Task name: SpyTask" in ROMLOG, ToDo: working ?
137
138		~~#define CAM_DETECT_SCREEN_ERASE 1 // ToDo: CHDK OSD flicker more often, OSD redrawn is more reliable~~

trunk/platform/ixus300_sd4000/sub/100d/lib.c

-                      r1377
+                      r1663
 ***/
 long hook_raw_size() {
     return 0xF32880;    // 15935616, finsig2
+    return 0xF32880;    // 15935616
+}
 …
 // ROM:FF919AD4    LDR     R0, =0x40471000 <---
 void *vid_get_bitmap_fb() {
     return (void*)0x40471000;    // ROM:FF919AD4 or ROM:FFA347DC or ROM:FF85B154, finsig2
+    return (void*)0x40471000;    // ROM:FF919AD4 or ROM:FFA347DC or ROM:FF85B154
+}
 …
 ***/
 void *vid_get_viewport_fb() {
     return (void*)0x40587700;    // ROM:FFB25ED8 or ROM:FFB25DFC, finsig2
+    return (void*)0x40587700;    // ROM:FFB25ED8 or ROM:FFB25DFC
+}
 …
 // possible future use
 void *vid_get_viewport_fb_d() {
     return (void*)(*(int*)0x2AA4);    // ROM:FF874770 0x2A50 + 0x54, value changes between 0x404ef900 and 0x40f210a0 in playback, record ist always 0x40f210a0
+    return (void*)(*(int*)0x2AA4);    // ROM:FF874770 0x2A50 + 0x54
+}
 …
 // ROM:FFA04F84    ADR     R1, a9999       ; "9999"
 char *camera_jpeg_count_str() {
     return (char*)0xA15B8;    // finsig2
+    return (char*)0xA15B8;
+}

trunk/platform/ixus310_elph500hs/platform_camera.h

r1656	r1663
67	67	// stop the palette from overlapping the on screen buttons on each side
68	68	#undef CAM_DISP_ALT_TEXT // Turn off <ALT> at bottom of screen in Alt mode - changes button color instead
69		#define CAM_DETECT_SCREEN_ERASE 1 // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus
	69
70	70	#define CAM_TOUCHSCREEN_UI 1 // Enable touch screen U/I
71	71

trunk/platform/ixus40_sd300/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus50_sd400/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus55_sd450/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus60_sd600/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus60_sd600/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 90;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/ixus65_sd630/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus65_sd630/lib.c

-                      r515
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 90;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/ixus70_sd1000/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus750_sd550/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus750_sd550/sub/100h/lib.c

r1527	r1663
55	55	return (char*)0x72588;
56	56	}
57
58		~~void _EnterToCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S.~~
59		~~void _ExitFromCompensationEVF() {} // Dummy function. To be removed after stub is found. See stubs_entry_2.S.~~

trunk/platform/ixus750_sd550/sub/100h/stubs_entry_2.S

-                      r1181
+                      r1663
 #include "stubs_asm.h"
+#define NULL_SUB 0xFF8118C0
+NHSTUB(UniqueLedOn, 0xFF82df20)
+NHSTUB(UniqueLedOff, 0xFF82df64)
+NHSTUB(free, 0xFFAD6A08)
+NHSTUB(VbattGet, 0xFF82c54c)
+// Override stubs_entry.S
+NHSTUB(EnterToCompensationEVF,      NULL_SUB)
+NHSTUB(ExitFromCompensationEVF,     NULL_SUB)
+NHSTUB(VbattGet,                    0xFF82c54c)
+NHSTUB(WriteSDCard,                 0xFF87ED54)
+NHSTUB(free,                        0xFFAD6A08)
+NHSTUB(GetDrive_ClusterSize, 0xFF86F2EC)
+NHSTUB(GetDrive_TotalClusters, 0xFF86F328)
+NHSTUB(GetDrive_FreeClusters, 0xFF86F364)
+NHSTUB(WriteSDCard, 0xFF87ED54)
+NHSTUB(iosDevFind, 0xFFAD4B68)
+// These don't exist
+NHSTUB(SetZoomActuatorSpeedPercent, NULL_SUB)
+//null stubs
+NHSTUB(SetZoomActuatorSpeedPercent, 0xFF82e080)
+NHSTUB(GetBatteryTemperature, 0xFF82D5AC)
+NHSTUB(GetCCDTemperature, 0xFF82D598)
+NHSTUB(GetOpticalTemperature, 0xFF82D584)
+NHSTUB(PT_PlaySound, 0xFF957E18)
+//NHSTUB(EnterToCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c.
+//NHSTUB(ExitFromCompensationEVF, 0xFFFFFFFF) // Stub not found. When found, remove dummy function from lib.c.
+NHSTUB(DoAFLock, 0xff94ae54)
+NHSTUB(UnlockAF, 0xff94ae94)
+NHSTUB(SetScriptMode,0xFF95E63C) // by find_eventproc name @ 0xFF983394
+// Additional
+NHSTUB(SetScriptMode,               0xFF95E63C)
+NHSTUB(UniqueLedOn,                 0xFF82df20)
+NHSTUB(UniqueLedOff,                0xFF82df64)

trunk/platform/ixus75_sd750/Makefile

r560	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus800_sd700/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus850_sd800/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus900_sd900/Makefile

r959	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixus950_sd850/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixusizoom_sd30/Makefile

r621	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/ixusizoom_sd30/lib.c

-                      r621
+                      r1663
-#include "../generic/lib.c"
 int get_flash_params_count(void){
  return 90;
+}
+void shutdown()
+{
+    volatile long *p = (void*)0xc02200a0;
+    asm(
+         "MRS     R1, CPSR\n"
+         "AND     R0, R1, #0x80\n"
+         "ORR     R1, R1, #0x80\n"
+         "MSR     CPSR_cf, R1\n"
+         :::"r1","r0");
+    *p = 0x44;
+    while(1);
+}
+#define LED_PR 0xc0220084
+void debug_led(int state)
+{
+    volatile long *p=(void*)LED_PR;
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}
+#define LED_AF 0xc0220080
+void __attribute__((weak)) camera_set_led(int led, int state, int bright)
+{
+  int leds[] = {12,16,4,8,4,0,4};
+  if(led < 4 || led > 10 || led == 6) return;
+  volatile long *p=(void*)LED_AF + leds[led-4];
+    if (state)
+        p[0]=0x46;
+    else
+        p[0]=0x44;
+}

trunk/platform/s2is/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/s3is/Makefile

r515	r1663
14	14
15	15	kbd.o: kbd.c ../generic/kbd.c
16		lib.o: lib.c ~~../generic/lib.c~~
	16	lib.o: lib.c
17	17	main.o: main.c ../generic/main.c
18	18	shooting.o: shooting.c ../generic/shooting.c

trunk/platform/sx100is/platform_camera.h

r1656	r1663
59	59	#define CAM_MULTIPART 1
60	60	#define CAM_EXT_TV_RANGE 1
61		~~#define CAM_DETECT_SCREEN_ERASE 1~~
62	61
63	62	// #define REMOTE_SYNC_STATUS_LED 0xC0xxyyyy // specifies an LED that turns on while camera waits for USB remote to sync

trunk/platform/sx130is/lib.c

r1642	r1663
93	93	#include "lolevel.h"
94	94
95
96	95	/*
97	96	void vid_bitmap_refresh()

trunk/platform/sx130is/platform_camera.h

-                      r1656
+                      r1663
                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
-        #define CAM_DETECT_SCREEN_ERASE     1       // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus
     #define CAM_USE_COLORED_ICONS       1

trunk/platform/sx20/platform_camera.h

-                      r1658
+                      r1663
     #undef  CAMERA_MAX_DIST
     #define CAMERA_MAX_DIST                 66490   // Override max subject distance
-    #define CAM_DETECT_SCREEN_ERASE     1       // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus
 //      #define REMOTE_SYNC_STATUS_LED  0xC0xxyyyy              // specifies an LED that turns on while camera waits for USB remote to sync

trunk/platform/sx220hs/platform_camera.h

r1656	r1663
21	21	// don't override them again in here.
22	22
23		~~#define CAM_DETECT_SCREEN_ERASE 1~~
24	23	#define CAM_DISABLE_RAW_IN_LOW_LIGHT_MODE 1
25	24	#define DNG_VERT_RLE_BADPIXELS 1

trunk/platform/sx230hs/platform_camera.h

r1656	r1663
110	110	#define CAM_HAS_GPS 1
111	111
112		~~#define CAM_DETECT_SCREEN_ERASE 1~~
113	112
114	113	#define CAM_USE_COLORED_ICONS 1 // Enable using the CHDK-DE colored icons.

trunk/platform/sx30/platform_camera.h

r1658	r1663
39	39	#define CAM_UNCACHED_BIT 0x40000000
40	40	#define CAM_SHOW_OSD_IN_SHOOT_MENU 1
41		~~#define CAM_DETECT_SCREEN_ERASE 1 // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus~~
42	41
43	42	#undef DEFAULT_RAW_EXT

trunk/platform/sx40hs/platform_camera.h

r1658	r1663
42	42	#undef CAM_USE_ZOOM_FOR_MF
43	43	#define CAM_SHOW_OSD_IN_SHOOT_MENU 1
44		~~#define CAM_DETECT_SCREEN_ERASE 1 // Turn on guard pixels to detect screen erase and redraw CHDK buttons and menus~~
45	44
46	45	#undef DEFAULT_RAW_EXT

Context Navigation

Legend:

Download in other formats: