Assembla home | Assembla project page
 

Changeset 474

Show
Ignore:
Timestamp:
08/10/08 15:48:10 (2 years ago)
Author:
Jucifer
Message:

+ Lua scripts now try to call restore() when interrupted (auj)
- applied reyalp's patches: a540-modes-2 and lua-warnings-1
- added a few more checks for synchable remote related stuff
- fixed finnish.lng a bit (Mikko70)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/juciphox/CHDK/LANG/Finnish.lng

    r471 r474  
    6161 
    626245 "Avaa skripti tiedosto..." 
    63 46 "Skriptin jatkamisviive (.1s)" 
     6346 "Skriptin jatkoviive (.1s)" 
    646447 "Nykyinen skripti" 
    656548 "Skriptin parametrit" 
    …… 
    500500385 "Raw @ Sports ei k��" 
    501501386 "Raw @ purske ei k��" 
    502 387 "Raw @ EV haaruikointi ei k��" 
     502387 "Raw @ EV haarukointi ei k��" 
    503503388 "Raw @ ajastin ei k��" 
    504504 
    …… 
    514514399 "Kauko-ohjattu zoomaus" 
    515515400 "Zoomin odotusviive 0.1s" 
     516401 "K�nistys�i" 

  • branches/juciphox/core/kbd.c

    r473 r474  
    237237} 
    238238 
     239static void wait_and_end(void) 
     240{ 
     241        script_console_add_line("PRESS SHUTTER TO CLOSE"); 
     242 
     243        // We're not running any more, but we have scheduled stuff that 
     244        // needs to finish. So keep the script marked as running, but don't 
     245        // call any more scripting functions. 
     246        state_kbd_script_run = 3;        
     247} 
    239248 
    240249static void script_start( int autostart ) 
    …… 
    263272      if( !lua_script_start(state_ubasic_script) ) { 
    264273    script_print_screen_end(); 
     274    wait_and_end(); 
    265275    return; 
    266276      } 
    …… 
    408418    } 
    409419 
    410     if( L ) { 
    411                 int top; 
    412                 if (state_lua_kbd_first_call_to_resume) 
    413                 { 
    414                         state_lua_kbd_first_call_to_resume = 0; 
    415                         top = 0; 
    416                 } 
    417                 else 
    418                 { 
    419                         top = lua_gettop(Lt); 
    420                 } 
    421        Lres = lua_resume( Lt, top ); 
    422  
    423       if (Lres != LUA_YIELD && Lres != 0) { 
    424         script_console_add_line( lua_tostring( Lt, -1 ) ); 
    425       } 
    426  
    427       if (Lres != LUA_YIELD) { 
    428         script_console_add_line(lang_str(LANG_CONSOLE_TEXT_FINISHED)); 
    429         script_end(); 
    430       }     
    431     }  
    432     else { 
    433       ubasic_run(); 
    434       if (ubasic_finished()) { 
    435         script_console_add_line(lang_str(LANG_CONSOLE_TEXT_FINISHED)); 
    436         script_end(); 
    437       }     
     420        if (state_kbd_script_run != 3) 
     421        { 
     422                if( L ) { 
     423                        int top; 
     424                        if (state_lua_kbd_first_call_to_resume) 
     425                        { 
     426                                state_lua_kbd_first_call_to_resume = 0; 
     427                                top = 0; 
     428                        } 
     429                        else 
     430                        { 
     431                                top = lua_gettop(Lt); 
     432                        } 
     433                   Lres = lua_resume( Lt, top ); 
     434  
     435                  if (Lres != LUA_YIELD && Lres != 0) { 
     436                script_console_add_line( lua_tostring( Lt, -1 ) ); 
     437                wait_and_end(); 
     438                return; 
     439                  } 
     440  
     441                  if (Lres != LUA_YIELD) { 
     442                        script_console_add_line(lang_str(LANG_CONSOLE_TEXT_FINISHED)); 
     443                script_end(); 
     444                  }     
     445                }  
     446                else { 
     447                  ubasic_run(); 
     448                  if (ubasic_finished()) { 
     449                script_console_add_line(lang_str(LANG_CONSOLE_TEXT_FINISHED)); 
     450                script_end(); 
     451                  }     
     452        } 
    438453    } 
    439454} 
    …… 
    548563unsigned int drmode; 
    549564 
    550    if(conf.ricoh_ca1_mode) 
     565   if(conf.ricoh_ca1_mode && conf.remote_enable) 
    551566  { 
    552567        drmode = shooting_get_drive_mode(); 
    …… 
    588603        if (kbd_is_key_pressed(conf.alt_mode_button)) 
    589604        { 
    590                 if (conf.ricoh_ca1_mode) conf.synch_enable=1; 
     605                if (conf.ricoh_ca1_mode && conf.remote_enable) conf.synch_enable=1; 
    591606                key_pressed = 1; 
    592607                kbd_key_release_all();           
    …… 
    640655                        { 
    641656                                script_start(0); 
    642                         } else if (L || state_kbd_script_run == 2) 
     657                        } else if (state_kbd_script_run == 2 || state_kbd_script_run == 3) 
    643658                        { 
    644659                                script_console_add_line(lang_str(LANG_CONSOLE_TEXT_INTERRUPTED)); 
    645660                                script_end(); 
    646                         } else 
     661                        } else if (L) 
     662                        { 
     663                            state_kbd_script_run = 2; 
     664                            lua_getglobal(Lt, "restore"); 
     665                            if (lua_isfunction(Lt, -1)) 
     666                                { 
     667                                if (lua_pcall( Lt, 0, 0, 0 )) 
     668                                { 
     669                                    script_console_add_line( lua_tostring( Lt, -1 ) ); 
     670                                } 
     671                            } 
     672                            script_console_add_line(lang_str(LANG_CONSOLE_TEXT_INTERRUPTED)); 
     673                            script_end(); 
     674                        } 
     675                        else 
    647676                        { 
    648677                            state_kbd_script_run = 2; 
    …… 
    662691 
    663692#ifndef SYNCHABLE_REMOTE_NOT_ENABLED 
    664 if(conf.ricoh_ca1_mode) 
     693if(conf.ricoh_ca1_mode && conf.remote_enable) 
    665694{ 
    666695 

  • branches/juciphox/core/luascript.c

    r472 r474  
    623623{ 
    624624  int which = (luaL_checknumber( L, 1 )); 
    625   int temp; 
     625  int temp = -100; // do something insane if users passes bad value 
    626626  switch (which) 
    627627  { 

  • branches/juciphox/doc/version.txt

    r473 r474  
    55 
    66log 
     7 
     8474 / 0.2.7 
     9Jucifer 
     10 
     11+ Lua scripts now try to call restore() when interrupted (auj) 
     12- applied reyalp's patches: a540-modes-2 and lua-warnings-1 
     13- added a few more checks for synchable remote related stuff 
     14- fixed finnish.lng a bit (Mikko70) 
     15 
    716 
    817 

  • branches/juciphox/include/luaconf.h

    r416 r474  
    184184#elif defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 302) && \ 
    185185      defined(__ELF__) 
     186/* reyalp: hidden is irrelevant if not dynamically linked*/ 
     187#if defined(HDK_VERSION) 
     188#define LUAI_FUNC       extern 
     189#else 
    186190#define LUAI_FUNC       __attribute__((visibility("hidden"))) extern 
     191#endif 
    187192#define LUAI_DATA       LUAI_FUNC 
    188193 

  • branches/juciphox/include/platform.h

    r473 r474  
    2727MODE_VIDEO_MY_COLORS    , 
    2828MODE_VIDEO_COLOR_ACCENT , 
     29MODE_VIDEO_COLOR_SWAP   , 
    2930MODE_STITCH             , 
    3031MODE_MY_COLORS          , 
    …… 
    3839MODE_SCN_FIREWORK       , 
    3940MODE_SCN_COLOR_ACCENT   , 
     41MODE_SCN_COLOR_SWAP     , 
    4042MODE_VIDEO_HIRES        , 
    4143MODE_SCN_AQUARIUM       , 

  • branches/juciphox/platform/a450/kbd.c

    r463 r474  
    5151tick2 = tick; 
    5252static long usb_physw[3]; 
    53  if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
    54 //   if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                      // synch mode enable so wait for USB to disconnect 
     53 if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
     54//   if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                      // synch mode enable so wait for USB to disconnect 
    5555  { 
    5656// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6060        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6161// ------ add by Masuji SUTO (end)   -------------- 
    62 if(conf.ricoh_ca1_mode) 
     62if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6363  { 
    6464        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/a460/kbd.c

    r463 r474  
    5151tick2 = tick; 
    5252static long usb_physw[3]; 
    53 if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                    
     53if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                    
    5454                                         // synch mode enable so wait for USB to disconnect 
    5555  { 
    …… 
    6161        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6262// ------ add by Masuji SUTO (end)   -------------- 
    63 if(conf.ricoh_ca1_mode) 
     63if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6464{ 
    6565        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/a540/main.c

    r338 r474  
    4242        int canonmode; 
    4343} modemap[] = { 
    44     { MODE_AUTO,               6  }, 
    45     { MODE_P,                  1  }, 
    46     { MODE_TV,                 3  }, 
    47     { MODE_AV,                 2  }, 
    48     { MODE_M,                  0  }, 
    49     { MODE_PORTRAIT,           9  }, 
    50     { MODE_NIGHT,              8  }, 
    51     { MODE_LANDSCAPE,          7  }, 
    52     { MODE_VIDEO_STD,          18 }, 
    53     { MODE_STITCH,             5  }, 
    54     { MODE_MY_COLORS,          4  }, 
    55     { MODE_SCN_WATER,          13 }, 
    56     { MODE_SCN_NIGHT,          15 }, 
    57     { MODE_SCN_CHILD,          16 }, 
    58     { MODE_SCN_PARTY,          14 }, 
    59     { MODE_SCN_GRASS,          10 }, 
    60     { MODE_SCN_SNOW,           11 }, 
    61     { MODE_SCN_BEACH,          12 }, 
    62     { MODE_SCN_FIREWORK,       17 } 
     44    { MODE_M,                  32769 }, 
     45    { MODE_AV,                 32770 }, 
     46    { MODE_TV,                 32771 }, 
     47    { MODE_P,                  32772 }, 
     48    { MODE_AUTO,               32768 }, 
     49    { MODE_PORTRAIT,           32781 }, 
     50    { MODE_LANDSCAPE,          32780 }, 
     51    { MODE_NIGHT,              32782 }, // "night scene" on dial, different from "night snapshot" under "scene" below 
     52    { MODE_STITCH,             33290 }, 
     53    { MODE_SCN_NIGHT,          16395 }, // "night snapshot" 
     54    { MODE_SCN_KIDS_PETS,      16399 }, // "kids and pets" 
     55    { MODE_SCN_INDOOR,         16400 }, // "indoor" 
     56    { MODE_SCN_FOLIAGE,        16401 }, // "foliage" 
     57    { MODE_SCN_SNOW,           16402 }, // "snow" 
     58    { MODE_SCN_BEACH,          16403 }, // "beach" 
     59    { MODE_SCN_FIREWORK,       16404 }, // "fireworks" 
     60    { MODE_SCN_WATER,          16405 }, // "under water" (should this be AQUARIUM ?) 
     61    { MODE_SCN_COLOR_ACCENT,   16920 }, // "color accent" 
     62    { MODE_SCN_COLOR_SWAP,     16921 }, // "color swap" 
     63    { MODE_VIDEO_STD,          2593  }, 
     64    { MODE_VIDEO_SPEED,        2594  }, // "fast frame rate" 
     65    { MODE_VIDEO_COMPACT,      2595  }, // "compact" 
     66    { MODE_VIDEO_COLOR_ACCENT, 2591  }, // "color accent" 
     67    { MODE_VIDEO_COLOR_SWAP,   2592  }, // "color swap" 
    6368}; 
    6469#define MODESCNT (sizeof(modemap)/sizeof(modemap[0])) 
    …… 
    7176  //  mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 
    7277     
    73     _GetPropertyCase(0, &t, 4); 
     78    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7479    for (i=0; i<MODESCNT; ++i) { 
    7580        if (modemap[i].canonmode == t) { 
    …… 
    7984    return (mode); 
    8085} 
    81  
     86/* // seems to be added from ewavr's svn; although not yet used, might become useful... 
    8287int is_mode_photo(){ //from 710 added 
    8388 int m=mode_get(); 
    …… 
    8691                   (m&MODE_SHOOTING_MASK)==MODE_VIDEO_MY_COLORS || (m&MODE_SHOOTING_MASK)==MODE_VIDEO_COLOR_ACCENT); 
    8792 } 
     93*/ 

  • branches/juciphox/platform/a550/kbd.c

    r463 r474  
    5454tick2 = tick; 
    5555static long usb_physw[3]; 
    56       if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                    
    57  //  if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       // synch mode enable so wait for USB to disconnect 
     56      if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                    
     57 //  if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       // synch mode enable so wait for USB to disconnect 
    5858  { 
    5959 
    …… 
    6464        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6565// ------ add by Masuji SUTO (end)   -------------- 
    66 if(conf.ricoh_ca1_mode) 
     66if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6767{ 
    6868        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/a560/kbd.c

    r463 r474  
    5555static long usb_physw[3]; 
    5656   
    57      if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                   
    58 //  if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                    // synch mode enable so wait for USB to disconnect 
     57     if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                   
     58//  if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                    // synch mode enable so wait for USB to disconnect 
    5959  { 
    6060 
    …… 
    6666// ------ add by Masuji SUTO (end)   -------------- 
    6767 
    68 if(conf.ricoh_ca1_mode) 
     68if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6969{ 
    7070        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/a570/kbd.c

    r463 r474  
    5757static long usb_physw[3]; 
    5858                                         
    59   if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       // synch mode enable so wait for USB to disconnect 
     59  if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       // synch mode enable so wait for USB to disconnect 
    6060  { 
    6161// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6565        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6666// ------ add by Masuji SUTO (end)   -------------- 
    67 if(conf.ricoh_ca1_mode)                       //ricoh_ca1_mode 
     67if(conf.ricoh_ca1_mode && conf.remote_enable)                 //ricoh_ca1_mode 
    6868{ 
    6969        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/a650/kbd.c

    r471 r474  
    5858tick2 = tick; 
    5959static long usb_physw[3]; 
    60    if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
    61 // if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       // synch mode enable so wait for USB to disconnect 
     60   if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
     61// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       // synch mode enable so wait for USB to disconnect 
    6262  { 
    6363 
    …… 
    6868        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6969// ------ add by Masuji SUTO (end)   -------------- 
    70 if(conf.ricoh_ca1_mode) 
     70if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7171{ 
    7272        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/a720/kbd.c

    r471 r474  
    5757tick2 = tick; 
    5858static long usb_physw[3]; 
    59 if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                      
    60 // if (conf.synch_enable)                                         // synch mode enable so wait for USB to disconnect 
     59if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                      
     60// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable)                                         // synch mode enable so wait for USB to disconnect 
    6161  { 
    6262// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6767// ------ add by Masuji SUTO (end)   -------------- 
    6868 
    69 if(conf.ricoh_ca1_mode) 
     69if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7070{ 
    7171        if(shooting_get_drive_mode() ==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                   //continuous-shooting mode 

  • branches/juciphox/platform/g7/kbd.c

    r463 r474  
    5555tick2 = tick; 
    5656static long usb_physw[3]; 
    57    if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
    58 // if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))   // synch mode enable so wait for USB to disconnect 
     57   if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
     58// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))   // synch mode enable so wait for USB to disconnect 
    5959  { 
    6060// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6565// ------ add by Masuji SUTO (end)   -------------- 
    6666 
    67 if(conf.ricoh_ca1_mode) 
     67if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6868{ 
    6969        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/generic/kbd.c

    r463 r474  
    8383tick2 = tick; 
    8484 
    85  if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
    86  
    87 // if(conf.synch_enable)                                              // synch mode enable so wait for USB to disconnect 
     85 if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
     86 
     87// if(conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable)                                              // synch mode enable so wait for USB to disconnect 
    8888  { 
    89 if(conf.ricoh_ca1_mode) 
     89if(conf.ricoh_ca1_mode && conf.remote_enable) 
    9090{ 
    9191   nMode=0; 
    …… 
    9797 
    9898 
    99 if(conf.ricoh_ca1_mode) 
     99if(conf.ricoh_ca1_mode && conf.remote_enable) 
    100100    { 
    101101        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/ixus55_sd450/kbd.c

    r463 r474  
    5858tick2 = tick; 
    5959 
    60  if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
     60 if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
    6161 
    6262  { 
    63 if(conf.ricoh_ca1_mode) 
     63if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6464{ 
    6565   nMode=0; 
    …… 
    7171 
    7272 
    73 if(conf.ricoh_ca1_mode) 
     73if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7474    { 
    7575        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 
    …… 
    186186tick2 = tick; 
    187187static long usb_physw[3]; 
    188    if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
    189 // if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))   // synch mode enable so wait for USB to disconnect 
     188   if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
     189// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))   // synch mode enable so wait for USB to disconnect 
    190190  { 
    191191 
    …… 
    197197// ------ add by Masuji SUTO (end)   -------------- 
    198198 
    199 if(conf.ricoh_ca1_mode) 
     199if(conf.ricoh_ca1_mode && conf.remote_enable) 
    200200{ 
    201201        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/ixus70_sd1000/kbd.c

    r463 r474  
    5656static long usb_physw[3]; 
    5757                                         
    58  if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) // synch mode enable so wait for USB to disconnect 
     58 if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) // synch mode enable so wait for USB to disconnect 
    5959  { 
    6060// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6565// ------ add by Masuji SUTO (end)   -------------- 
    6666 
    67 if(conf.ricoh_ca1_mode) 
     67if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6868{ 
    6969        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/ixus850_sd800/kbd.c

    r463 r474  
    5555tick2 = tick; 
    5656static long usb_physw[3]; 
    57   if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                        
    58 // if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     57  if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                        
     58// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    5959  { 
    6060// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6565// ------ add by Masuji SUTO (end)   -------------- 
    6666 
    67 if(conf.ricoh_ca1_mode) 
     67if(conf.ricoh_ca1_mode && conf.remote_enable) 
    6868{ 
    6969        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/ixus860_sd870/kbd.c

    r471 r474  
    5959tick2 = tick; 
    6060static long usb_physw[3]; 
    61    if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
    62 // if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     61   if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))                                       
     62// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    6363  { 
    6464// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6868        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6969// ------ add by Masuji SUTO (end)   -------------- 
    70 if(conf.ricoh_ca1_mode) 
     70if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7171{ 
    7272        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/ixus950_sd850/kbd.c

    r463 r474  
    5959static long usb_physw[3]; 
    6060                                         
    61 if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     61if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    6262  { 
    6363// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6767        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    6868// ------ add by Masuji SUTO (end)   -------------- 
    69 if(conf.ricoh_ca1_mode) 
     69if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7070{ 
    7171        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/ixus960_sd950/kbd.c

    r463 r474  
    6161 
    6262 
    63 if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
    64 // if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     63if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) 
     64// if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    6565  { 
    6666// ------ add by Masuji SUTO (start) -------------- 
    …… 
    7070        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    7171// ------ add by Masuji SUTO (end)   -------------- 
    72 if(conf.ricoh_ca1_mode) 
     72if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7373{ 
    7474        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/s2is/kbd.c

    r463 r474  
    6363tick = get_tick_count(); 
    6464tick2 = tick; 
    65 if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     65if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    6666 
    6767  { 
    …… 
    7272        if((x[2]&USB_MASK)==USB_MASK) nMode=1; 
    7373// ------ add by Masuji SUTO (end)   -------------- 
    74 if(conf.ricoh_ca1_mode)                       //ricoh_ca1_mode 
     74if(conf.ricoh_ca1_mode && conf.remote_enable)                 //ricoh_ca1_mode 
    7575{ 
    7676        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/s3is/kbd.c

    r463 r474  
    5959tick2 = tick; 
    6060 
    61 if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     61if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    6262  { 
    6363// ------ add by Masuji SUTO (start) -------------- 
    …… 
    6767        if((x[USB_REG]&USB_MASK)==USB_MASK) nMode=1; 
    6868// ------ add by Masuji SUTO (end)   -------------- 
    69 if(conf.ricoh_ca1_mode)                       //ricoh_ca1_mode 
     69if(conf.ricoh_ca1_mode && conf.remote_enable)                 //ricoh_ca1_mode 
    7070{ 
    7171        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/s5is/kbd.c

    r471 r474  
    136136tick2 = tick; 
    137137static long usb_physw[3]; 
    138 if (conf.synch_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
     138if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING)))  // synch mode enable so wait for USB to disconnect 
    139139  { 
    140140// ------ add by Masuji SUTO (start) -------------- 
    …… 
    144144        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    145145// ------ add by Masuji SUTO (end)   -------------- 
    146      if(conf.ricoh_ca1_mode) 
     146     if(conf.ricoh_ca1_mode && conf.remote_enable) 
    147147     { 
    148148        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/platform/tx1/kbd.c

    r471 r474  
    6262static long usb_physw[3]; 
    6363                                         
    64  if (conf.synch_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) // synch mode enable so wait for USB to disconnect 
     64 if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) // synch mode enable so wait for USB to disconnect 
    6565  { 
    6666 
    …… 
    7171        if((usb_physw[2] & USB_MASK)==USB_MASK) nMode=1; 
    7272// ------ add by Masuji SUTO (end)   -------------- 
    73   if(conf.ricoh_ca1_mode) 
     73  if(conf.ricoh_ca1_mode && conf.remote_enable) 
    7474{ 
    7575        if(shooting_get_drive_mode()==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING){                    //continuous-shooting mode 

  • branches/juciphox/version.inc

    r473 r474  
    1 BUILD_NUMBER := 0.2.6 
     1BUILD_NUMBER := 0.2.7