Changeset 928 for trunk/core/conf.c

Timestamp:

08/29/10 09:47:13 (3 years ago)

Author:

fe50

Message:

New edge overlay, rewritten zebra, SX20 stuff

Note:

• some of this (edge overlay, zebra) affects ALL cameras !
• since there are changes in the CHDK configuration, it's recommended to use a new config file (i.e. to rename/delete the cchdk.cfg file)

• new edge overlay by ultimA, from ​http://chdk.setepontos.com/index.php/topic,650.msg54368.html#msg54368 & ​http://chdk.setepontos.com/index.php/topic,5583.0.html
• rewritten zebra to save ram & avoid flickerig, by f_m_b, from the SX20 porting thread
• SX20 1.02d fixes for darkframe subtraction and USB remote
• SX20 1.02d now can be powered on directly in record mode by holding the button down for ~1s
• SX20: games & other stuff enabled again since new zebra needs less memory

The SX20 1.02D now is enabled in the main makefile for the autobuild server

File:

• trunk/core/conf.c (modified) (4 diffs)

trunk/core/conf.c

@@ -139 +139 @@
          shooting_video_bitrate_change(conf.video_bitrate);
         }
-        conf.edge_overlay_lock = 0; // reset it because otherwise this feature cant be used at startup (when buffer is empty) - needs workaround other than this!
+        conf.edge_overlay_pano = 0; // reset it because otherwise this feature cant be used at startup (when buffer is empty) - needs workaround other than this!
 }
 
@@ -344 +344 @@
     CONF_INFO(186, conf.curve_enable,           CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(187, conf.edge_overlay_enable,    CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(188, conf.edge_overlay_thresh,    CONF_DEF_VALUE, i:40, NULL),
+    CONF_INFO(188, conf.edge_overlay_thresh,    CONF_DEF_VALUE, i:60, NULL),
     CONF_INFO(189, conf.edge_overlay_color,     CONF_DEF_VALUE, cl:0x66, NULL),
     CONF_INFO(190, conf.synch_enable,           CONF_DEF_VALUE, i:0, NULL),
@@ -379 +379 @@
     CONF_INFO(221, conf.clear_zoom_override,         CONF_DEF_VALUE, i:1, NULL),                        
     CONF_INFO(222, conf.edge_overlay_play,    CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(223, conf.edge_overlay_lock,              CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(223, conf.edge_overlay_pano,              CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(224, conf.edge_overlay_zoom,                CONF_DEF_VALUE, i:1, NULL),
     CONF_INFO(225, conf.raw_cache,              CONF_DEF_VALUE, i:0, NULL),
@@ -397 +397 @@
         CONF_INFO(239, conf.debug_propcase_page,     CONF_DEF_VALUE, i:0, NULL),
         CONF_INFO(240, conf.debug_misc_vals_show,     CONF_DEF_VALUE, i:0, NULL),
+        CONF_INFO(241, conf.edge_overlay_filter,     CONF_DEF_VALUE, i:0, NULL),
+        CONF_INFO(242, conf.edge_overlay_show,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(243, conf.edge_overlay_pano_overlap,   CONF_DEF_VALUE, i:30, NULL),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))