Changeset 497

Timestamp:

09/02/08 23:44:06 (2 years ago)

Author:

phyrephox

Message:

+ added dutch language file
+ added ubasic command: get_time. can be fed with 0 (returns seconds), 1 (minute), 2 (hour),3 (day) 4 (month) 5 (year) - command also exists in lua, though must be fed with CHARS
+ added ubasic command: get_mode - returns 0 in record mode, 1 in playback mode, it's that simple. useful for shutting of scripts that are meant to be run in a certain mode (like 99% of all available scripts). - someone needs to port that to lua, as i javent played around with that yet!
+ added ubasic commands: get_quality, get_resolution (return quality and resolution regardless of OS) & set_quality,set_resolution - for possible values see http://chdk.wikia.com/wiki/PropertyCase (basically for quality you can 0-2, 2 being the worst, resolution can be set between 0 and 8, see the wiki) - needs porting to lua as well.
* changed 2 default settings in the conf: now "Hide OSD in playback" is enabled at default, also "disable saving raw while recording video" is enabled at default(S-eries)
* fixed some newline related warnings at compile time

Author's comment: Now everything should be at hand to be able to create true universal scripts. i'm thinking for example of fudgeys motion detection one, should run on digic II and III now, also on cams with and without moviebutton - all the commands are there. who is willing to write such a script? also please add the get_mode check in the beginning.

Files:

• branches/juciphox/CHDK/LANG/dutch.lng (added)
• branches/juciphox/core/conf.c (modified) (1 diff)
• branches/juciphox/doc/version.txt (modified) (1 diff)
• branches/juciphox/include/platform.h (modified) (2 diffs)
• branches/juciphox/lib/ubasic/tokenizer.c (modified) (2 diffs)
• branches/juciphox/lib/ubasic/tokenizer.h (modified) (3 diffs)
• branches/juciphox/lib/ubasic/ubasic.c (modified) (5 diffs)
• branches/juciphox/platform/sx100is/sub/100c/movie_rec.c (modified) (1 diff)
• branches/juciphox/version.inc (modified) (1 diff)

branches/juciphox/core/conf.c

@@ -319 +319 @@
-    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),
-0
-0
+1
+1
-    CONF_INFO(176, conf.show_movie_time,        CONF_DEF_VALUE, i:3, NULL),
-    CONF_INFO(177, conf.show_movie_refresh,     CONF_DEF_VALUE, i:1, NULL),

branches/juciphox/doc/version.txt

@@ -5 +5 @@
-
-log
+
+0.5.0 / PP
+
++ added dutch language file
++ added ubasic command: get_time. can be fed with 0 (returns seconds), 1 (minute), 2 (hour),3 (day) 4 (month) 5 (year) - command also exists in lua, though must be fed with CHARS
++ added ubasic command: get_mode - returns 0 in record mode, 1 in playback mode, it's that simple. useful for shutting of scripts that are meant to be run in a certain mode (like 99% of all available scripts).  - someone needs to port that to lua, as i javent played around with that yet!
++ added ubasic commands: get_quality, get_resolution (return quality and resolution regardless of OS) & set_quality,set_resolution - for possible values see http://chdk.wikia.com/wiki/PropertyCase (basically for quality you can 0-2, 2 being the worst, resolution can be set between 0 and 8, see the wiki) - needs porting to lua as well.
+* changed 2 default settings in the conf: now "Hide OSD in playback" is enabled at default, also "disable saving raw while recording video" is enabled at default(S-eries)
+* fixed some newline related warnings at compile time
+
+Author's comment: Now everything should be at hand to be able to create true universal scripts. i'm thinking for example of fudgeys motion detection one, should run on digic II and III now, also on cams with and without moviebutton - all the commands are there. who is willing to write such a script? also please add the get_mode check in the beginning.
+
-
-0.4.3 / PP

branches/juciphox/include/platform.h

@@ -108 +108 @@
- #define PROPCASE_SHOOTING_MODE                                 49
- #define PROPCASE_IS_MODE                                           145
+ #define PROPCASE_QUALITY                                       57
+ #define PROPCASE_RESOLUTION                                    218
- #define PROPCASE_EV_CORRECTION_1                               107
- #define PROPCASE_EV_CORRECTION_2                               207
@@ -141 +143 @@
- #define PROPCASE_SHOOTING_MODE                                 0
- #define PROPCASE_IS_MODE                                       229
+ #define PROPCASE_QUALITY                                       23
+ #define PROPCASE_RESOLUTION                                    24
- #define PROPCASE_EV_CORRECTION_1                               25
- #define PROPCASE_EV_CORRECTION_2                               26

branches/juciphox/lib/ubasic/tokenizer.c

@@ -119 +119 @@
-  {"get_jpg_count",           TOKENIZER_GET_JPG_COUNT},
-  {"get_movie_status",        TOKENIZER_GET_MOVIE_STATUS},
+  {"get_mode",                                  TOKENIZER_GET_MODE},  // Returns 0 in recordmode, 1 in playmode
-  {"get_near_limit",          TOKENIZER_GET_NEAR_LIMIT},
-  {"get_propset",             TOKENIZER_GET_PROPSET},
-  {"get_prop",                TOKENIZER_GET_PROP},
+  {"get_quality",             TOKENIZER_GET_QUALITY},
-  {"get_raw_count",           TOKENIZER_GET_RAW_COUNT},
-  {"get_raw_nr",              TOKENIZER_GET_RAW_NR},
-  {"get_raw",                 TOKENIZER_GET_RAW},
+  {"get_resolution",          TOKENIZER_GET_RESOLUTION},
-  {"get_sv96",                TOKENIZER_GET_SV96},
-  {"get_temperature",         TOKENIZER_GET_TEMPERATURE},
-  {"get_tick_count",          TOKENIZER_GET_TICK_COUNT},
+  {"get_time",                                  TOKENIZER_GET_TIME},
-  {"get_tv96",                TOKENIZER_GET_TV96},
-  {"get_user_av_id",          TOKENIZER_GET_USER_AV_ID},
@@ -154 +158 @@
-  {"set_nd_filter",           TOKENIZER_SET_ND_FILTER},
-  {"set_prop",                TOKENIZER_SET_PROP},
+  {"set_quality",                TOKENIZER_SET_QUALITY},
-  {"set_raw_nr",              TOKENIZER_SET_RAW_NR},
-  {"set_raw",                 TOKENIZER_SET_RAW},
-
+
+
-  {"set_sv96",                    TOKENIZER_SET_SV96},
-  {"set_tv96_direct",         TOKENIZER_SET_TV96_DIRECT},

branches/juciphox/lib/ubasic/tokenizer.h

@@ -110 +110 @@
-  TOKENIZER_GET_DAY_SECONDS,
-  TOKENIZER_GET_TICK_COUNT,
+  TOKENIZER_GET_TIME,
-  TOKENIZER_GET_ZOOM,
-  TOKENIZER_SET_ZOOM,
@@ -161 +162 @@
-  TOKENIZER_RANDOM,
-  TOKENIZER_GET_MOVIE_STATUS,
+  TOKENIZER_GET_MODE,
-  TOKENIZER_PLAY_SOUND,
-  TOKENIZER_GET_DISPLAY_MODE,
@@ -180 +182 @@
-  TOKENIZER_GET_TEMPERATURE,
-  TOKENIZER_SET_MOVIE_STATUS,
+  TOKENIZER_GET_RESOLUTION,
+  TOKENIZER_GET_QUALITY,
+  TOKENIZER_SET_RESOLUTION,
+  TOKENIZER_SET_QUALITY,
-  
-} ubasic_token;

branches/juciphox/lib/ubasic/ubasic.c

@@ -217 +217 @@
-    accept(TOKENIZER_GET_TICK_COUNT);
-    r = shooting_get_tick_count();     
+   break;
+ case TOKENIZER_GET_MODE:
+    accept(TOKENIZER_GET_MODE);
+    r = ((mode_get()&MODE_MASK) == MODE_PLAY)?1:0;    
-   break;
- case TOKENIZER_GET_RAW_NR:
@@ -294 +298 @@
-    r = shooting_get_prop(PROPCASE_EV_CORRECTION_1);
-   break;
+  case TOKENIZER_GET_RESOLUTION:
+    accept(TOKENIZER_GET_RESOLUTION);
+    r = shooting_get_prop(PROPCASE_RESOLUTION);
+   break;
+  case TOKENIZER_GET_QUALITY:
+    accept(TOKENIZER_GET_QUALITY);
+    r = shooting_get_prop(PROPCASE_QUALITY);
+   break;
-  case TOKENIZER_GET_ORIENTATION_SENSOR:
-    accept(TOKENIZER_GET_ORIENTATION_SENSOR);
@@ -445 +457 @@
-  }
-    break;
+  case TOKENIZER_GET_TIME:
+    accept(TOKENIZER_GET_TIME);
+          unsigned long t2 = time(NULL);
+          int time = expr();
+          static struct tm *ttm;
+          ttm = localtime(&t2);
+  if (time==0) r = ttm->tm_sec;
+  else if (time==1) r = ttm->tm_min;
+  else if (time==2) r = ttm->tm_hour;
+  else if (time==3) r = ttm->tm_mday;
+  else if (time==4) r = ttm->tm_mon+1;
+  else if (time==5) r = 1900+ttm->tm_year;
+ break;
- case TOKENIZER_GET_RAW:
-    accept(TOKENIZER_GET_RAW);
@@ -1699 +1724 @@
-}
-
+static void set_resolution_statement()
+{
+    int to;
+    accept(TOKENIZER_SET_RESOLUTION);
+    to = expr();
+                shooting_set_prop(PROPCASE_RESOLUTION, to);
+    accept_cr();
+}
+
+static void set_quality_statement()
+{
+    int to;
+    accept(TOKENIZER_SET_QUALITY);
+    to = expr();
+                shooting_set_prop(PROPCASE_QUALITY, to);
+    accept_cr();
+}
+
+
-static void set_focus_statement()
-{
@@ -2216 +2260 @@
-        set_movie_status_statement();
-   break;
+   case TOKENIZER_SET_RESOLUTION:
+        set_resolution_statement();
+   break;
+   case TOKENIZER_SET_QUALITY:
+        set_quality_statement();
+   break;
-
-  case TOKENIZER_WAIT_CLICK:

branches/juciphox/platform/sx100is/sub/100c/movie_rec.c

@@ -1959 +1959 @@
-
-long CompressionRateTable[]={0x60, 0x5D, 0x5A, 0x57, 0x54, 0x51, 0x4D, 0x48, 0x42, 0x3B, 0x32, 0x29, 0x22, 0x1D, 0x17, 0x14, 0x10, 0xE, 0xB, 9, 7, 6, 5, 4, 3, 2, 1};
+
-                                                        

branches/juciphox/version.inc

@@ -1 @@
-4.3
+5.0