Commit 09367004 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

synced to framepars

parents fab3f26f 2e959354

src/drivers/elphel/pgm_functions.c

+17 −6
Original line number Original line Diff line number Diff line
@@ -731,7 +731,7 @@ typedef union { 




  camsync_mode.en =       1;

  camsync_mode.en =       1;

  camsync_mode.en_set =   1;

  camsync_mode.en_set =   1;

  camsync_mode.ext =      0;

  camsync_mode.ext =      1; // 0;

  camsync_mode.ext_set =  1;

  camsync_mode.ext_set =  1;

  camsync_mode.trig =     0;

  camsync_mode.trig =     0;

  camsync_mode.trig_set = 1;

  camsync_mode.trig_set = 1;
@@ -2496,7 +2496,18 @@ int pgm_focusmode (int sensor_port, ///< sensor port number (0..3 
 * TODO: 393 reimplement

 * TODO: 393 reimplement

 * Was for 353: can not use sequencer as data is more than 24 bit wide

 * Was for 353: can not use sequencer as data is more than 24 bit wide

 * In NC393  P_TRIG_DELAY and P_XMIT_TIMESTAMP are per-channel, other parameters are common (Last modified takes control).

 * In NC393  P_TRIG_DELAY and P_XMIT_TIMESTAMP are per-channel, other parameters are common (Last modified takes control).

 * Master channel is set to the current channels when any of the common parameters is set */

 * Master channel is set to the current channels when any of the common parameters is set

 * P_TRIG_OUT (outputs):

 * off:      0x55555

 * external: 0x56555

 * internal: 0x65555

 * both:     0x66555

 * P_TRIG_IN (inputs):

 * off:      0x55555

 * external: 0x95555

 * internal: 0x59555

 * both:     0x99555

 */

int pgm_trigseq    (int sensor_port,               ///< sensor port number (0..3)

int pgm_trigseq    (int sensor_port,               ///< sensor port number (0..3)

                    struct sensor_t * sensor,      ///< sensor static parameters (capabilities)

                    struct sensor_t * sensor,      ///< sensor static parameters (capabilities)

                    struct framepars_t * thispars, ///< sensor current parameters

                    struct framepars_t * thispars, ///< sensor current parameters

src/include/uapi/elphel/c313a.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -913,10 +913,10 @@ struct framepars_t { 
        unsigned long modsince32;     ///< parameters modified after this frame super index - non-zero elements in in mod[31]  (bit 31 is not used)

        unsigned long modsince32;     ///< parameters modified after this frame super index - non-zero elements in in mod[31]  (bit 31 is not used)

        unsigned long mod[31];        ///< modified parameters - each bit corresponds to one element in in par[960] (bit 31 is not used)

        unsigned long mod[31];        ///< modified parameters - each bit corresponds to one element in in par[960] (bit 31 is not used)

        unsigned long mod32;          ///< super index - non-zero elements in in mod[31]  (bit 31 is not used)

        unsigned long mod32;          ///< super index - non-zero elements in in mod[31]  (bit 31 is not used)

        unsigned long needproc[31];   ///< FIXME: unused ( but total size should be 1024, increase pars[927] if removed)

        unsigned long needproc32;     ///< FIXME: unused ( but total size should be 1024, increase pars[927] if removed)

};

};





//        unsigned long needproc[31];   ///< FIXME: REMOVE parameters "modified and not yet processed" (some do not need any processing)

//        unsigned long needproc32;     ///< FIXME: REMOVE parameters "modified and not yet processed" frame super index - non-zero elements in in mod[31]  (bit 31 is not used)