Assembla home | Assembla project page
 

Changeset 472

Show
Ignore:
Timestamp:
08/07/08 19:07:24 (2 years ago)
Author:
Jucifer
Message:

- Lua/md_detect_motion(): optionalized the rest of parameters (some default values are the same as in fudgey's MD scripts)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/juciphox/core/luascript.c

    r471 r472  
    406406static int luaCB_md_detect_motion( lua_State* L ) 
    407407{ 
    408   int columns = (luaL_checknumber(L,1)); 
    409   int rows = (luaL_checknumber(L,2)); 
    410   int pixel_measure_mode = (luaL_checknumber(L,3)); 
    411   int detection_timeout = (luaL_checknumber(L,4)); 
    412   int measure_interval = (luaL_checknumber(L,5)); 
    413   int threshold = (luaL_checknumber(L,6)); 
     408  int columns = (luaL_optnumber(L,1,6)); 
     409  int rows = (luaL_optnumber(L,2,4)); 
     410  int pixel_measure_mode = (luaL_optnumber(L,3,1)); 
     411  int detection_timeout = (luaL_optnumber(L,4,10000)); 
     412  int measure_interval = (luaL_optnumber(L,5,7)); 
     413  int threshold = (luaL_optnumber(L,6,10)); 
    414414  int draw_grid = (luaL_optnumber(L,7,1)); 
    415415   // arg 8 is the return value in ubasic. We 
     
    420420  int clipping_region_column2 = (luaL_optnumber(L,12,0)); 
    421421  int clipping_region_row2 = (luaL_optnumber(L,13,0)); 
    422   int parameters = (luaL_optnumber(L,14,0)); 
    423   int pixels_step = (luaL_optnumber(L,15,4)); 
     422  int parameters = (luaL_optnumber(L,14,1)); 
     423  int pixels_step = (luaL_optnumber(L,15,6)); 
    424424  int msecs_before_trigger = (luaL_optnumber(L,16,0)); 
    425425  ubasic_set_variable(0, 0); 
  • branches/juciphox/doc/version.txt

    r471 r472  
    11first version of a history file. will be automated and cleaned hopefully soon. 
     2 
     3revision / version 
     4author 
     5 
     6log 
     7 
     8 
     9 
     10 
     11 
     12472 
     13Jucifer 
     14 
     15- Lua/md_detect_motion(): optionalized the rest of parameters (some default values are the same as in fudgey's MD scripts) 
     16 
     17 
    218 
    319471 / 0.2.5 
     
    2743+ added Fahrenheit conversion of the temperature. Kicks in when you enable the 12h clock format, there is NO extra menu item 
    2844 
    29 Revision: 468, version 0.2.3 
    30 Author: Jucifer 
    31 Message: 
     45 
     46 
     47468 / 0.2.3 
     48Jucifer 
    3249 
    3350- added reyalp's scripting commands "peek" (read the contents of a memory address) and bitwise operations (bitand, bitor, bitxor, bitshl, bitshri, bitshru, bitnot) to Lua 
     
    3552 
    3653 
    37 Revision: 467, version 0.2.2 
    38 Author: Jucifer 
    39 Message: 
     54 
     55467 / 0.2.2 
     56Jucifer 
    4057 
    4158- adding missing scripting commands to Lua  
     
    4360 
    4461 
    45 Revision: 466 
    46 Author: Jucifer 
    47 Message: 
     62466 
     63Jucifer 
    4864 
    4965- moved syscurves.CVF to where it's loaded from 
     
    5167 
    5268 
    53 Revision: 464, version 0.2.1 
    54 Author: PhyrePhoX 
    55 Message: 
    56  
     69464 / 0.2.1 
     70PhyrePhoX 
    5771 
    5872+ added syscurves.cfv 
     
    6983as always, code is ugly but should work.  
    7084 
    71 Revision: 463, version 0.2.0 
    72 Author: Jucifer 
    73 Message: 
     85 
     86 
     87463 / 0.2.0 
     88Jucifer 
    7489 
    7590- changed version numbering 
     
    8196 
    8297 
    83 Revision: 461, version 0.10 
    84 Author: PhyrePhoX 
    85 Message: 
     98461 / 0.10 
     99PhyrePhoX 
    86100 
    87101+ new OSD Element - Temperature 
     
    122136ps: i hope i didnt forget anything or anyone. 
    123137 
    124 Revision: 459 
    125 Author: Jucifer 
     138 
     139 
     140459 
     141Jucifer 
    126142Date: 21:03:58, Freitag, 25. Juli 2008 
    127 Message: 
     143 
    128144+ added beta ixus60_sd600 support (Novex, danielmewes, http://chdk.setepontos.com/index.php/topic,1215.msg11116.html#msg11116) 
    129145- modified ixus950's lib.c (whoever, http://chdk.setepontos.com/index.php/topic,405.msg18448.html#msg18448) 
    130146 
    131147 
    132 Revision: 457 
    133 Author: phyrephox 
     148457 
     149phyrephox 
    134150Date: 16:47:49, Freitag, 25. Juli 2008 
    135 Message: 
     151 
    136152* renamed CHDK.CFG to CCHDK.CFG ("collaborative CHDK") to end conflicts when you switch from branch to trunk or vice versa. 
    137153* fixed bug in "fast switch" for movie recording, now you can decrease bitrate smoothly 
     
    146162 
    147163 
    148 Revision: 453 
    149 Author: phyrephox 
     164 
     165453 
     166phyrephox 
    150167Date: 02:10:40, Mittwoch, 23. Juli 2008 
    151 Message: 
     168 
    152169* added video_overrides, SDHC & touchwheel "patch" from mil22 from here: http://chdk.setepontos.com/index.php/topic,1962.msg18265.html#msg18265 
    153170 -> needs a bit ironing out (supposedly bitrate setting is fubared) 
     
    165182   
    166183 
    167 Revision: 452 
    168 Author: Jucifer 
     184452 
     185Jucifer 
    169186Date: 11:58:25, Sonntag, 20. Juli 2008 
    170 Message: 
     187 
    171188- modified a540's lib.c (yvesson) 
    172 ---- 
    173  
    174 Revision: 451 
    175 Author: phyrephox 
     189 
     190 
     191 
     192451 
     193phyrephox 
    176194Date: 19:49:34, Samstag, 19. Juli 2008 
    177 Message: 
     195 
    178196+ added beta ixus750_sd550 support ( from http://chdk.setepontos.com/index.php/topic,1888.0.html with modifications by Hacki and a small modification regarding movie_status) 
    179197* changed some default conf.c values (clock is now showing as default, zooming during video is now enabled by default, symbols & synch disabled by default) 
    180198* fixed a bug in raw_exceptions (didnt work in digic III cams with the timer mode) 
    181199 
    182 Revision: 450 
    183 Author: Jucifer 
     200 
     201 
     202450 
     203Jucifer 
    184204Date: 12:23:11, Samstag, 19. Juli 2008 
    185 Message: 
     205 
    186206- modified ixus860's lib.c (chris07, http://chdk.setepontos.com/index.php/topic,405.msg17875.html#msg17875) 
    187207 
    188 Revision: 449 
    189 Author: Jucifer 
     208 
     209 
     210449 
     211Jucifer 
    190212Date: 17:10:58, Donnerstag, 17. Juli 2008 
    191 Message: 
     213 
    192214- modified OSD to include the new curve options 
    193215 
    194216 
    195 Revision: 448 
    196 Author: Jucifer 
     217 
     218448 
     219Jucifer 
    197220Date: 20:29:39, Mittwoch, 16. Juli 2008 
    198 Message: 
     221 
    199222- modified remote-related menus 
    200223 
    201224- gui_menu.c: if first menu item is selected when submenu is opened and the item is text or separator, select next item 
    202225 
    203 Revision: 447 
    204 Author: Jucifer 
     226 
     227 
     228447 
     229Jucifer 
    205230Date: 10:44:42, Montag, 14. Juli 2008 
    206 Message: 
     231 
    207232- updated toinech's custom JPEG processing (http://chdk.setepontos.com/index.php/topic,932.msg17419.html#msg17419) 
    208233 
    209 Revision: 446 
    210 Author: phyrephox 
     234 
     235 
     236446 
     237phyrephox 
    211238Date: 02:40:15, Montag, 14. Juli 2008 
    212 Message: 
     239 
    213240fixed small error 
    214241 
    215 Revision: 445 
    216 Author: phyrephox 
     242 
     243 
     244445 
     245phyrephox 
    217246Date: 01:55:37, Montag, 14. Juli 2008 
    218 Message: 
     247 
    219248Includes revisions 441-444 from ewavr to trunk 
    220249 
     
    222251* fixed remaining_video time in gui_osd.c 
    223252 
    224 Revision: 440 
    225 Author: Jucifer 
     253 
     254 
     255440 
     256Jucifer 
    226257Date: 23:31:25, Donnerstag, 10. Juli 2008 
    227 Message: 
     258 
    228259+ guessed some usb remote related stuff for sx100 (now compiles) 
    229260 
    230 Revision: 439 
    231 Author: Jucifer 
     261 
     262 
     263439 
     264Jucifer 
    232265Date: 22:30:29, Sonntag, 6. Juli 2008 
    233 Message: 
     266 
    234267- copied a fix from trunk 
    235268 
    236 Revision: 438 
    237 Author: Jucifer 
     269 
     270 
     271438 
     272Jucifer 
    238273Date: 22:24:30, Sonntag, 6. Juli 2008 
    239 Message: 
     274 
    240275- applied fudgey's disable script parameter list sorting (http://chdk.setepontos.com/index.php/topic,1865.msg16886.html#msg16886) 
    241276 
    242 Revision: 437 
    243 Author: phyrephox 
     277 
     278 
     279437 
     280phyrephox 
    244281Date: 16:13:53, Donnerstag, 10. Juli 2008 
    245 Message: 
    246282 
    247283+ RAW Exceptions: Disable RAW in Sportsmode, Burstmode (continious), EV Bracketing, Timer 
     
    261297 
    262298 
    263 Revision: 435 
    264 Author: Jucifer 
     299 
     300435 
     301Jucifer 
    265302Date: 13:06:12, Sonntag, 6. Juli 2008 
    266 Message: 
     303 
    267304- updated Bg~'s memory viewer patch (http://chdk.setepontos.com/index.php/topic,1829.msg16814.html#msg16814) 
    268305- updated stuff from trunk 
    269306 
    270 Revision: 434 
    271 Author: Jucifer 
     307 
     308 
     309434 
     310Jucifer 
    272311Date: 14:59:17, Mittwoch, 9. Juli 2008 
    273 Message: 
     312 
    274313re-committing old revisions 434-439 
    275314 
     
    284323 
    285324 
    286 Revision: 432 
    287 Author: Jucifer 
     325 
     326432 
     327Jucifer 
    288328Date: 19:37:55, Samstag, 5. Juli 2008 
    289 Message: 
     329 
    290330- updated curves.c (toinech, http://chdk.setepontos.com/index.php/topic,932.msg16700.html#msg16700) 
    291331- patched gui_debug.c to continuously update memory viewer (Bg~, http://chdk.setepontos.com/index.php/topic,1829.msg16614.html#msg16614) 
     
    293333- fixed platform/a720/sub/100c/lib.c (vid_get_viewport_live_fb()) (http://chdk.setepontos.com/index.php/topic,405.msg16620.html#msg16620) 
    294334 
    295 Revision: 431 
    296 Author: Jucifer 
     335 
     336 
     337431 
     338Jucifer 
    297339Date: 14:03:01, Donnerstag, 3. Juli 2008 
    298 Message: 
     340 
    299341- quick fix for interrupting Lua scripts without hanging the cam 
    300342 
     
    302344 
    303345 
    304 Revision: 430 
    305 Author: Jucifer 
     346430 
     347Jucifer 
    306348Date: 11:45:55, Dienstag, 1. Juli 2008 
    307 Message: 
     349 
    308350(I really should always double check everything...) 
    309351 
    310352 
    311 Revision: 429 
    312 Author: Jucifer 
     353 
     354429 
     355Jucifer 
    313356Date: 11:39:28, Dienstag, 1. Juli 2008 
    314 Message: 
     357 
    315358- changed s5is motion detection speedup implementation (hopefully it'll work on both, 101a and 101b) 
    316359 
    317360 
    318 Revision: 428 
    319 Author: Jucifer 
     361 
     362428 
     363Jucifer 
    320364Date: 16:24:57, Montag, 30. Juni 2008 
    321 Message: 
     365 
    322366+ added cyril42e's script parameter sets (r5) 
    323367 
    324368 
    325 Revision: 427 
    326 Author: Jucifer 
     369 
     370427 
     371Jucifer 
    327372Date: 18:27:10, Sonntag, 29. Juni 2008 
    328 Message: 
     373 
    329374- Updated stuff from the two last trunk commits. 
    330375 
     
    333378 
    334379 
    335 Revision: 424 
    336 Author: Jucifer 
     380 
     381424 
     382Jucifer 
    337383Date: 09:30:51, Mittwoch, 18. Juni 2008 
    338 Message: 
     384 
    339385+ added cyril42e's "display zebra only when necessary" and "don't show script params if no param" tweaks, http://chdk.setepontos.com/index.php/topic,1687.msg15345.html#msg15345 
    340386 
    341 Revision: 423 
    342 Author: Jucifer 
     387423 
     388Jucifer 
    343389Date: 21:59:29, Dienstag, 17. Juni 2008 
    344 Message: 
     390 
    345391- have to kbd_release_all() after all, when running an autostart script (some buttons are pressed on startup?) 
    346392 
    347393 
    348 Revision: 421 
    349 Author: Jucifer 
     394 
     395421 
     396Jucifer 
    350397Date: 21:44:04, Sonntag, 15. Juni 2008 
    351 Message: 
     398 
    352399+ added the missing get_raw_nr line to trunk/lib/ubasic/tokenizer.c 
    353400 
     
    355402 
    356403 
    357 Revision: 420 
    358 Author: Jucifer 
     404 
     405420 
     406Jucifer 
    359407Date: 19:06:36, Sonntag, 15. Juni 2008 
    360 Message: 
     408 
    361409still fixing kbd_process() 
    362410 
    363411 
    364 Revision: 419 
    365 Author: Jucifer 
     412 
     413419 
     414Jucifer 
    366415Date: 15:15:19, Sonntag, 15. Juni 2008 
    367 Message: 
     416 
    368417- some Lua fixes 
    369418 
    370419 
    371 Revision: 418 
    372 Author: Jucifer 
     420 
     421418 
     422Jucifer 
    373423Date: 12:19:59, Sonntag, 15. Juni 2008 
    374 Message: 
     424 
    375425kbd_process() should now have the remote code in right place 
    376426 
    377427 
    378 Revision: 417 
    379 Author: Jucifer 
     428 
     429417 
     430Jucifer 
    380431Date: 23:44:25, Samstag, 14. Juni 2008 
    381 Message: 
     432 
    382433+ added cyril42e's script restoring (script jumps to label "restore" on interrupt) and alt-button fix, http://chdk.setepontos.com/index.php/topic,1687.msg15345.html#msg15345 
    383434 
     
    387438 
    388439 
    389 Revision: 416 
    390 Author: Jucifer 
     440 
     441416 
     442Jucifer 
    391443Date: 21:24:03, Donnerstag, 12. Juni 2008 
    392 Message: 
     444 
    393445(pretty much from http://chdk.setepontos.com/index.php/topic,688.0.html:) 
    394446 
     
    450502 
    451503 
    452 Revision: 412 
    453 Author: phyrephox 
     504 
     505412 
     506phyrephox 
    454507Date: 23:52:06, Samstag, 7. Juni 2008 
    455 Message: 
     508 
    456509Branch time. 
    457510This branch will be the playground of Jucifer and me (PhyrePhoX) - although others can join in on the fun :) 
     
    462515Lot of these new features can and will be merged with the official trunk.  
    463516 
     517