Changeset 464

Timestamp:

08/04/08 22:34:51 (2 years ago)

Author:

phyrephox

Message:

+ added syscurves.cfv
+ added eggtimer example script thx to gehtnix from german forum
+ in osd menu you can now set new option: Hide on Display. Means: When you press the display button to cycle through the original canon display states (symbols on, symbols off, evf, display off), CHDK symbols are now hidden when canon symbols are hidden as well (this does not work in EVF, as the propertycase does not update).
+ visual feedback during fast_video_quality changes - now when you enable fast_video_quality_control, you can see in OSD the quality/bitrate that you change via up/down

*makefile.inc (added ixus960)
* updated/added finnish, english, german langfiles* changed default conf values again: shootdelay (from 11 to 0), remote_enable from 1 to 0, renamed hide_osd_in_playback
* small cosmetic change: splash screen color now is red, to distinguish our beta build from the trunk. this is likely to get changed someday anyhow. adds a little spice though ;)
* fixed a bug in CHDKLovers select/case statement, got a diff from him (thanks!)

as always, code is ugly but should work.

Files:

• branches/juciphox/CHDK/CURVES/syscurves.CVF (added)
• branches/juciphox/CHDK/LANG/Finnish.lng (added)
• branches/juciphox/CHDK/LANG/english.lng (modified) (1 diff)
• branches/juciphox/CHDK/LANG/german.lng (modified) (1 diff)
• branches/juciphox/CHDK/SCRIPTS/examples (added)
• branches/juciphox/CHDK/SCRIPTS/examples/eggtimer.bas (added)
• branches/juciphox/core/conf.c (modified) (4 diffs)
• branches/juciphox/core/gui.c (modified) (7 diffs)
• branches/juciphox/core/gui_lang.c (modified) (1 diff)
• branches/juciphox/core/gui_osd.c (modified) (1 diff)
• branches/juciphox/include/conf.h (modified) (1 diff)
• branches/juciphox/lib/ubasic/ubasic.c (modified) (12 diffs)
• branches/juciphox/makefile.inc (modified) (1 diff)
• branches/juciphox/platform/s3is/sub/100a/stubs_entry_2.S (modified) (1 diff)
• branches/juciphox/version.inc (modified) (1 diff)

branches/juciphox/CHDK/LANG/english.lng

@@ -469 +469 @@
-342 "Disable Overrides"
-343 "  Include AutoIso & Bracketing?"
-Playback
+
-345 "Disable @ Video Rec?"
-346 "Show remaining videotime?"

branches/juciphox/CHDK/LANG/german.lng

@@ -463 +463 @@
-
-343 "    Inkl. AutoIso & Bracket?"
-Wiedergabe
+
-345 "    Aus bei Videoaufn.?"
-

branches/juciphox/core/conf.c

@@ -128 +128 @@
-    CONF_INFO(  1, conf.show_osd,               CONF_DEF_VALUE, i:1, NULL),
-    CONF_INFO(  2, conf.save_raw,               CONF_DEF_VALUE, i:0, NULL),
-11
+0
-    CONF_INFO(  4, conf.show_histo,             CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(  5, conf.ubasic_vars,            CONF_DEF_PTR,   ptr:&def_ubasic_vars, NULL),
@@ -248 +248 @@
-    
-    CONF_INFO(120, conf.script_startup,         CONF_DEF_VALUE, i:0, NULL),
-1
+0
-    
-    CONF_INFO(122, conf.values_show_canon_overexposure, CONF_DEF_VALUE, i:0, NULL),
@@ -311 +311 @@
-    CONF_INFO(172, conf.override_disable,       CONF_DEF_VALUE, i:2, NULL),
-    CONF_INFO(173, conf.override_disable_all,   CONF_DEF_VALUE, i:1, NULL),
-_in_playback
+
-    CONF_INFO(175, conf.save_raw_in_video,      CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(176, conf.show_movie_time,        CONF_DEF_VALUE, i:3, NULL),
@@ -345 +345 @@
-    CONF_INFO(206, conf.remote_zoom_enable,     CONF_DEF_VALUE, i:0, NULL),
-    CONF_INFO(207, conf.zoom_timeout,           CONF_DEF_VALUE, i:5, NULL),
-
+
+
-};
-#define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))

branches/juciphox/core/gui.c

@@ -177 +177 @@
-//static const char* gui_tv_enum(int change, int arg);
-const char* gui_user_menu_show_enum(int change, int arg);
+static const char* gui_hide_osd_enum(int change, int arg);
-static const char* gui_show_clock_enum(int change, int arg);
-static const char* gui_clock_format_enum(int change, int arg);
@@ -591 +592 @@
-static CMenuItem osd_submenu_items[] = {
-    {0x5c,LANG_MENU_OSD_SHOW,                MENUITEM_BOOL,      &conf.show_osd },
-BOOL,      &conf.hide_osd_in_playback
+ENUM,      (int*)gui_hide_osd_enum
-    {0x81,LANG_MENU_VIS_MENU_CENTER,         MENUITEM_BOOL,         &conf.menu_center },
-    {0x81,LANG_MENU_SELECT_FIRST_ENTRY,         MENUITEM_BOOL,      &conf.menu_select_first_entry },       
@@ -1073 +1074 @@
-
-    return modes[conf.show_clock];
+}
+
+const char* gui_hide_osd_enum(int change, int arg) {
+    static const char* modes[]={ "Don't", "In Playback", "On Disp Press", "both"};
+
+    conf.hide_osd+=change;
+    if (conf.hide_osd<0)
+        conf.hide_osd=(sizeof(modes)/sizeof(modes[0]))-1;
+    else if (conf.hide_osd>=(sizeof(modes)/sizeof(modes[0])))
+        conf.hide_osd=0;
+
+    return modes[conf.hide_osd];
-}
-
@@ -2186 +2199 @@
-
-
-!conf.hide_osd_in_playback 
+ !((conf.hide_osd == 1) || (conf.hide_osd == 3)) )) && !(((conf.hide_osd == 2) || (conf.hide_osd == 3))&& (shooting_get_prop(PROPCASE_DISPLAY_MODE) == 1
-        gui_batt_draw_osd();
-        gui_space_draw_osd();
-    }
-    
-!conf.hide_osd_in_playback 
+ !((conf.hide_osd == 1) || (conf.hide_osd == 3)) )) && !(((conf.hide_osd == 2) || (conf.hide_osd == 3))&& (shooting_get_prop(PROPCASE_DISPLAY_MODE) == 1
-        gui_osd_draw_clock();
-            }
@@ -2199 +2212 @@
-    }
- 
-!conf.hide_osd_in_playback ))
+ !((conf.hide_osd == 1) || (conf.hide_osd == 3)) )) && !(((conf.hide_osd == 2) || (conf.hide_osd == 3))&& (shooting_get_prop(PROPCASE_DISPLAY_MODE) == 1)) 
-        gui_osd_draw_temp();
-      }
@@ -2205 +2218 @@
- {
- gui_osd_draw_movie_time_left();
+ 
+ if ((movie_status > 1) && (conf.fast_movie_quality_control==1)){
+    if (conf.video_mode == 0 )
+        {
+    gui_print_osd_state_string_chr("Bitrate: ",gui_video_bitrate_enum(0,0));
+        }
+        else
+                {
+        gui_print_osd_state_string_int("Quality: ",conf.video_quality);
+    }
- }
+}
- 
-!conf.hide_osd_in_playback 
+ !((conf.hide_osd == 1) || (conf.hide_osd == 3)) )) && !(((conf.hide_osd == 2) || (conf.hide_osd == 3))&& (shooting_get_prop(PROPCASE_DISPLAY_MODE) == 1
-       gui_osd_draw_ev();
- }
@@ -2414 +2438 @@
-        "Camera: " PLATFORM " - " PLATFORMSUB };
-    int i, l;
-
+
+
+
-
-    gui_splash_mode = (mode_get()&MODE_MASK);

branches/juciphox/core/gui_lang.c

@@ -453 +453 @@
-"342 \"Disable Overrides\"\n"
-"343 \"  Include AutoIso & Bracketing?\"\n"
-in Playback
+OSD
-"345 \"Disable @ Video Rec?\"\n"
-"346 \"Show remaining videotime?\"\n"

branches/juciphox/core/gui_osd.c

@@ -947 +947 @@
-    min = (time_left % 3600) / 60;
-    sec = (time_left % 3600) % 60;
-
+
-       if (elapsed<1)
-   {

branches/juciphox/include/conf.h

@@ -26 +26 @@
-
-    int show_osd;
-_in_playback
+
-    int show_osd_in_review;
-    int script_shoot_delay;

branches/juciphox/lib/ubasic/ubasic.c

@@ -82 +82 @@
-static struct select_state select_stack[MAX_SELECT_STACK_DEPTH];
-static int select_stack_ptr;
-
-
-
-#define MAX_WHILE_STACK_DEPTH 4
@@ -810 +808 @@
-/*---------------------------------------------------------------------------*/
-static void
-
+_statement
-{
-  if(select_stack_ptr > 0) {
@@ -817 +815 @@
-    dec_select_stack();
-  } else {
-
+_statement
-    ended = 1;
-    ubasic_error = UBASIC_E_PARSE;
@@ -828 +826 @@
-  int select_value, case_value_1, case_value_2, case_value_eq;
-  short case_run, case_goto = 0, case_gosub = 0;
+  int cur_ln, gosub_ln;
-  
-  accept(TOKENIZER_CASE);
@@ -866 +865 @@
-        case_goto = (tokenizer_token() == TOKENIZER_GOTO);
-        case_gosub = (tokenizer_token() == TOKENIZER_GOSUB);
+//GOSUB - save curr linenumber
+        cur_ln = tokenizer_line_number();
+//GOSUB
-        statement();
+//GOSUB  - save new linenumber, reset to curr linenumber
+      if (case_gosub) { 
+        gosub_ln = tokenizer_line_number();
+        jump_line(cur_ln+1);
+        DEBUG_PRINTF("case_statement: GOSUB: toLN=%d, nextLN=%d\n", gosub_ln, cur_ln+1);
+      }
+//GOSUB
-        DEBUG_PRINTF("case_statement: case execute\n");
-        case_run = 1;
@@ -875 +884 @@
-      }
-    } else {accept_cr();}
+//REM
+    while ((tokenizer_token() == TOKENIZER_REM) && (!case_goto)) {statement();}
+//REM
-    if (case_goto) { dec_select_stack(); } else {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-      }  
+//GOSUB        
-    }
-  } else {
@@ -898 +915 @@
-{
-  short case_goto = 0, case_gosub = 0;
+  int cur_ln, gosub_ln;
-  
-  accept(TOKENIZER_CASE_ELSE);
@@ -904 +922 @@
-      case_goto = (tokenizer_token() == TOKENIZER_GOTO); 
-      case_gosub = (tokenizer_token() == TOKENIZER_GOSUB); 
+//GOSUB - save curr linenumber
+      cur_ln = tokenizer_line_number();
+//GOSUB
-      statement();
+//GOSUB  - save new linenumber, reset to curr linenumber
+      if (case_gosub) { 
+        gosub_ln = tokenizer_line_number();
+        jump_line(cur_ln+1);
+        DEBUG_PRINTF("case_else_statement: GOSUB: toLN=%d, nextLN=%d\n", gosub_ln, cur_ln+1);
+      }
+//GOSUB
-      DEBUG_PRINTF("case_else_statement: case_else execute\n");
-    } else {
@@ -910 +938 @@
-      accept_cr();
-    }
+//REM
+    while ((tokenizer_token() == TOKENIZER_REM) && (!case_goto)) {statement();}
+//REM
-    if (case_goto) { dec_select_stack(); } else { 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-  } else {
@@ -935 +973 @@
-  select_value = expr();  
-  accept(TOKENIZER_CR);
+//REM
+    while (tokenizer_token() == TOKENIZER_REM) {statement();}
+//REM
-  
-  if(select_stack_ptr < MAX_SELECT_STACK_DEPTH) {
@@ -946 +987 @@
-      ubasic_error = UBASIC_E_PARSE;
-    }
-    //NEU f?r diekten "case"-befehl
-    else { case_statement(); }
-    //---------------------------
-  } else {
-    DEBUG_PRINTF("select_statement: SELECT-stack depth exceeded\n");
@@ -956 +995 @@
-}
-/* SELECT-STATEMENT END                                                      */
-
-/*---------------------------------------------------------------------------*/
-static void

branches/juciphox/makefile.inc

@@ -151 +151 @@
-#PLATFORMSUB=101b
-
+#PLATFORM=ixus960_sd950
+#PLATFORM=100d
-
-include $(topdir)version.inc

branches/juciphox/platform/s3is/sub/100a/stubs_entry_2.S

@@ -26 +26 @@
-NHSTUB(GetOpticalTemperature, 0xFF82D354)
-NHSTUB(PT_PlaySound, 0xFF986518)
-//NHSTUB(PT_PlaySound, 0xFFB3163C) //alternate adress ewavr found, the other one is easier to find

branches/juciphox/version.inc

@@ -1 @@
-0
+1