Changeset 461 for branches/juciphox/lib/ubasic/ubasic.c

Timestamp:

08/01/08 19:52:37 (5 years ago)

Author:

phyrephox

Message:

+ new OSD Element - Temperature

• Enabled by default (optical temperature)
• set in OSD Menu to either show optical, ccd, battery or ALL temps at once
• position can edited in OSD Layout editor
• thread about temperature: ​http://chdk.setepontos.com/index.php/topic,2021.0.html

+ video quality control added. when enabled (in video overrides), by the use of the up/down button you can increase or decrease movie quality OR bitrate (depends on what you enabled in the video override menu) - WHILE you are recording!

• changed Fast video control so that it isnt enabled at default, only works on a few cameras (pause and unpause movie by pressing left/right while recording) - needs further development
• when using fast video control switch and the pause function now the remaining time calculation is reset, so it reflects the change in bitrate faster
• changed a few default conf values (symbols now enabled at default, because symbol file now is served together with binary)

+ introduced new versioning system: 0.10 now, X.10 will be major release (and probably without bugs, with proper documentation, scripts, optimized etc), 0.X0 will be something like "new features, a bit ironing out etc", 0.1X will be just bugfixes and really small changes
+ added vers.req to svn, will be included in zipfile when autobuilded, will definitly be useful...
+ wrote two sample readmes, one for dryos, one for vxworks, they are included in the batch-zip-complete archives, in respect to OS version. these are just drafts, need input from you. yeah you heard me, from YOU!
+ added version.txt that will also be included in said archive, reflecting latest changes. it is not cleaned up as of now, probably never will be, but gives a rough overview over latest development
+ added ubasic statement case/select switch by CHDKLover from here: ​http://chdk.setepontos.com/index.php/topic,1995.0.html as of now i chose the "safe" method, the multi statement, due to people not reacting. hopefully they test it in this build so we can decide on one option!

• renamed get_movie_state to get_movie_status in ubasic

+ added command get_temperature (example: "get_temperature 0", 0 returns optical, 1 returns CCD and 2 returns battery temp)
+ added a few grids from the wiki
+ changed makefile bigtime: now with new command batch-zip-complete you now have an environment to compile a complete CHDK archive for each cam including binaries, readmes (according to OS), scripts, version history and so on. it is planned that the archive will be crammed with useful information (readmes, howtos - into the books folder), grids, scripts (working ones, universal ones, and also code fragments that will serve as examples), curves, symbols, fonts (copyright!?) and so on. as of now i just added a few of these, and some dummy texts so that zip file will accept the folders. again i need YOU to help on developing a good structure and good scripts, readmes and so on. with this build, people no longer need to sift through the wiki or the forum to find all the good stuff. at least i do hope so.

• changed random command, now you can supply two values min & max.

example: "playsound random 3 6" will play the sounds 3,4,5,6 in random order (if repeated in a while loop)

+ added ewavrs sx100 patch from here: ​http://tools.assembla.com/chdk/changeset/460 (adjustable alt button)
+ added new command playsound. can and should be used from ubasic, via "playsound 0", where 0 is the startup sound. there are sounds ranging from 0 to 7, 7 being a nasty long beep. the first few sounds can only be played if they are NOT muted by the camera, the other beeps will be played though (cam must be unmuted though, didnt test it with the nasty error beep though i gotta admit). this feature will lead to many more features, for example anti theft protection together with DGs Disco lights ;)

0 = startup sound, 1 = shutter sound, 2 = button press sound, 3 = selftimer, 4 = short beep, 5 = af confirmation, 6 = error beep, 7 = long beeeeeeeeeeeeeeeeeeep (nasty!)

• adjusted makefile.inc so that all cameras are in it now (defaulted to my s3is by the way, not that it should matter)

• adjusted memisosize on ixus860. soon gonna adjust the size of all cams, we're getting low on space ;)
• adjusted videotables on ixus860 (see patch from ewavr ​http://tools.assembla.com/chdk/changeset/455

+ added whoever's fix for ixus950's touchwheel behaviour from here: ​http://chdk.setepontos.com/index.php/topic,2024.0.html

• lng files (german & english), also copied to new folder CHDK\LANG (for gmake batch-zip-complete)

thanks to Ewavr, Hacki, reyalp, ljl, jucifer and all the guys hanging out in the irc chan ;)

ps: i hope i didnt forget anything or anyone.

p.p.s: introducing with this build we might actually have an autobuild server... wait and see in the forums...

File:

• branches/juciphox/lib/ubasic/ubasic.c (modified) (8 diffs)

branches/juciphox/lib/ubasic/ubasic.c

@@ -75 +75 @@
 static int if_stack_ptr;
 
+struct select_state {
+  int select_value;
+  short case_run;
+};
+#define MAX_SELECT_STACK_DEPTH 4
+static struct select_state select_stack[MAX_SELECT_STACK_DEPTH];
+static int select_stack_ptr;
+
+
+
 #define MAX_WHILE_STACK_DEPTH 4
 static short while_stack[MAX_WHILE_STACK_DEPTH];
@@ -244 +254 @@
   case TOKENIZER_RANDOM:
     accept(TOKENIZER_RANDOM);
+    int min = expr();
+    int max = expr();
     srand((int)shooting_get_bv96()+(unsigned short)stat_get_vbatt()+get_tick_count());
     ubasic_camera_sleep(rand()%10);
-    r = rand();
-   break;
-  case TOKENIZER_GET_MOVIESTATE:
-    accept(TOKENIZER_GET_MOVIESTATE);
+    r = min + rand()%(max-min+1);
+  break;
+  case TOKENIZER_GET_MOVIE_STATUS:
+    accept(TOKENIZER_GET_MOVIE_STATUS);
     r = movie_status;
    break;
@@ -260 +272 @@
     r = shooting_get_prop(PROPCASE_FOCUS_MODE);
    break;
-  case TOKENIZER_GET_DISPLAY_MODE:
+        case TOKENIZER_GET_DISPLAY_MODE:
     accept(TOKENIZER_GET_DISPLAY_MODE);
     r = shooting_get_prop(PROPCASE_DISPLAY_MODE);
@@ -409 +421 @@
     else r = -1;
     break;
+  case TOKENIZER_GET_TEMPERATURE:
+    accept(TOKENIZER_GET_TEMPERATURE);
+    int temp = expr();
+    switch (temp)
+    {
+        case 0:
+                r = get_optical_temp(); 
+                break;
+        case 1:
+                r = get_ccd_temp(); 
+                break;
+        case 2:
+                r = get_battery_temp();
+                break;
+  }
+    break;
  case TOKENIZER_GET_RAW:
     accept(TOKENIZER_GET_RAW);
@@ -765 +793 @@
 }
 /*---------------------------------------------------------------------------*/
+
+/*---------------------------------------------------------------------------*/
+/* SELECT-STATEMENT                                                          */
+
+static void
+dec_select_stack(void)
+{
+  if(select_stack_ptr > 0) {
+      select_stack_ptr--;
+  } else {
+    DEBUG_PRINTF("select_statement: SELECT-Stack fail\n");
+    ended = 1;
+    ubasic_error = UBASIC_E_UNKNOWN_ERROR;  //besser neuer Fehler UBASIC_E_SELECT_STACK_EXHAUSTED,
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+end_select(void)
+{
+  if(select_stack_ptr > 0) {
+    accept(TOKENIZER_END_SELECT);
+    accept(TOKENIZER_CR);
+    dec_select_stack();
+  } else {
+    DEBUG_PRINTF("ubasic.c: end_select(): end_select without select-statement\n");
+    ended = 1;
+    ubasic_error = UBASIC_E_PARSE;
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+case_statement(void)
+{
+  int select_value, case_value_1, case_value_2, case_value_eq;
+  short case_run, case_goto = 0, case_gosub = 0;
+  
+  accept(TOKENIZER_CASE);
+  if(select_stack_ptr > 0) {
+    select_value = select_stack[select_stack_ptr - 1].select_value;
+    case_run = select_stack[select_stack_ptr - 1].case_run;
+  
+    if (!case_run) {
+      case_value_1 = expr();
+      case_value_eq = (select_value == case_value_1);
+      if (case_value_eq) { DEBUG_PRINTF("case_statement: case_value_eq %d, case_value %d\n", case_value_eq, case_value_1); }  
+
+      if(tokenizer_token() == TOKENIZER_TO) {
+        accept(TOKENIZER_TO);
+        case_value_2 = expr();
+        if (case_value_1 < case_value_2) {
+          case_value_eq = ((select_value >= case_value_1) && (select_value <= case_value_2));
+          DEBUG_PRINTF("case_statement: case_value %d to %d\n", case_value_1, case_value_2);
+        } else {
+          case_value_eq = ((select_value >= case_value_2) && (select_value <= case_value_1));
+          DEBUG_PRINTF("case_statement: case_value %d to %d\n", case_value_2, case_value_1);
+        }
+      } else if (tokenizer_token() == TOKENIZER_COMMA) {
+        do {
+          accept(TOKENIZER_COMMA);
+          if (case_value_eq) {
+            case_value_2 = expr();
+          } else {
+            case_value_1 = expr();
+            case_value_eq = (select_value == case_value_1);
+          }
+        } while (tokenizer_token() == TOKENIZER_COMMA);
+        DEBUG_PRINTF("case_statement: case_value_eq %d, case_value_comma %d\n", case_value_eq, case_value_1);
+      }
+      
+      accept(TOKENIZER_SEMICOLON);
+      if (case_value_eq) {
+        case_goto = (tokenizer_token() == TOKENIZER_GOTO);
+        case_gosub = (tokenizer_token() == TOKENIZER_GOSUB);
+        statement();
+        DEBUG_PRINTF("case_statement: case execute\n");
+        case_run = 1;
+        select_stack[select_stack_ptr - 1].case_run = case_run;
+      } else {
+        DEBUG_PRINTF("case_statement: case jump; case_run: %d\n", case_run);
+        accept_cr();
+      }
+    } else {accept_cr();}
+    if (case_goto) { dec_select_stack(); } else {
+      if (!case_gosub) {
+        if ((tokenizer_token() != TOKENIZER_CASE) && (tokenizer_token() != TOKENIZER_CASE_ELSE) && 
+           (tokenizer_token() != TOKENIZER_END_SELECT)) {
+           DEBUG_PRINTF("ubasic.c: select_statement(): don't found case, case_else or end_select\n");
+           ended = 1;
+           ubasic_error = UBASIC_E_PARSE;
+        } else { 
+          if (tokenizer_token() == TOKENIZER_END_SELECT) { end_select(); }
+        }
+      }  
+    }
+  } else {
+    DEBUG_PRINTF("case_statement: SELECT-Stack fail\n");
+    ended = 1;
+    ubasic_error = UBASIC_E_UNKNOWN_ERROR;  //besser neuer Fehler UBASIC_E_SELECT_STACK_EXHAUSTED,
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+case_else_statement(void)
+{
+  short case_goto = 0, case_gosub = 0;
+  
+  accept(TOKENIZER_CASE_ELSE);
+  if(select_stack_ptr > 0) {
+    if (!select_stack[select_stack_ptr - 1].case_run) {
+      case_goto = (tokenizer_token() == TOKENIZER_GOTO); 
+      case_gosub = (tokenizer_token() == TOKENIZER_GOSUB); 
+      statement();
+      DEBUG_PRINTF("case_else_statement: case_else execute\n");
+    } else {
+      DEBUG_PRINTF("case_else_statement: case_else jump; case_run: %d\n", select_stack[select_stack_ptr - 1].case_run);
+      accept_cr();
+    }
+    if (case_goto) { dec_select_stack(); } else { 
+      if (!case_gosub) {
+        if (tokenizer_token() != TOKENIZER_END_SELECT) {
+          DEBUG_PRINTF("ubasic.c: select_statement(): don't found end_select\n");
+          ended = 1;
+          ubasic_error = UBASIC_E_PARSE;
+        } else { end_select(); }
+      }
+    }
+  } else {
+    DEBUG_PRINTF("case_else_statement: SELECT-Stack fault\n");
+    ended = 1;
+    ubasic_error = UBASIC_E_UNKNOWN_ERROR;  //besser neuer Fehler UBASIC_E_SELECT_STACK_EXHAUSTED,
+  }
+}
+/*---------------------------------------------------------------------------*/
+static void
+select_statement(void)
+{
+ 
+  int select_value;
+  
+  accept(TOKENIZER_SELECT);
+  select_value = expr();  
+  accept(TOKENIZER_CR);
+  
+  if(select_stack_ptr < MAX_SELECT_STACK_DEPTH) {
+    select_stack[select_stack_ptr].select_value = select_value;
+    select_stack[select_stack_ptr].case_run = 0;
+    DEBUG_PRINTF("select_statement: new select, value %d\n",select_stack[select_stack_ptr].select_value);
+    select_stack_ptr++;
+    if (tokenizer_token() != TOKENIZER_CASE) {
+      DEBUG_PRINTF("ubasic.c: select_statement(): don't found case-statement\n");
+      ended = 1;
+      ubasic_error = UBASIC_E_PARSE;
+    }
+    //NEU f?r diekten "case"-befehl
+    else { case_statement(); }
+    //---------------------------
+  } else {
+    DEBUG_PRINTF("select_statement: SELECT-stack depth exceeded\n");
+    ended = 1;
+    ubasic_error = UBASIC_E_UNKNOWN_ERROR;  //besser neuer Fehler UBASIC_E_SELECT_STACK_EXHAUSTED,
+  }
+}
+/* SELECT-STATEMENT END                                                      */
+
 /*---------------------------------------------------------------------------*/
 static void
@@ -1283 +1475 @@
 }
 
+static void play_sound_statement()
+{
+    int to;
+    accept(TOKENIZER_PLAY_SOUND);
+    to = expr();
+    play_sound(to);
+    accept_cr();
+}
 static void set_shutter_speed_statement()
 {
@@ -1887 +2087 @@
     set_tv96_statement();
     break;  
+  case TOKENIZER_PLAY_SOUND:
+    play_sound_statement();
+    break;  
   case TOKENIZER_SET_SHUTTER_SPEED:
     set_shutter_speed_statement();
@@ -1993 +2196 @@
     endif_statement();
     break;
+  case TOKENIZER_SELECT:
+    select_statement();
+    break;
+  case TOKENIZER_CASE:
+    case_statement();
+    break;
+  case TOKENIZER_CASE_ELSE:
+    case_else_statement();
+    break;
   case TOKENIZER_GOTO:
     goto_statement();