markusro/damaris-backends
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Wiki Activity

Fixed accidentally removed else test, ADC was never setted

Browse Source
This commit is contained in:
astromech 2017-02-06 22:05:00 +01:00
parent 2dcee09192
commit e4b4309711
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/Spectrum-MI40xxSeries/Spectrum-MI40xxSeries.cpp
View File

@ -142,7 +142,7 @@ if (name == NULL) { FreeLibrary(spectrum_driver_dll); \
/* print lines with useful information: */ /* print lines with useful information: */
fprintf(stderr, "Spectrum MI40xx series board with %d byte memory\n", memory_size); fprintf(stderr, "Spectrum MI40xx series board with %d byte memory\n", memory_size);
fprintf(stderr, fprintf(stderr,
" impedance set to %g Ohm\n expecting trigger on id=%d ttls=0x%lx\n external clock frequency set to %g Hz\n", " impedance set to %g Ohm\n expecting trigger on id=%d ttl=0x%lx\n external clock frequency is %f Hz\n",
impedance, impedance,
t_line.id, t_line.id,
t_line.ttls.to_ulong(), t_line.ttls.to_ulong(),
@ -178,12 +178,13 @@ void SpectrumMI40xxSeries::collect_config_recursive(state_sequent& exp, Spectrum
settings.data_structure=where_to_append; settings.data_structure=where_to_append;
collect_config_recursive(*a_sequence, settings); collect_config_recursive(*a_sequence, settings);
settings.data_structure=tmp_structure; settings.data_structure=tmp_structure;
//} /* end working on sequence */ } /* end working on sequence */
//else { else {
// found a state, not a sequence // found a state, not a sequence
settings.timeout+=a_state->length; settings.timeout+=a_state->length;
#if SPC_DEBUG #if SPC_DEBUG
fprintf(stderr,"SETTINGS %e %e\n",settings.timeout,a_state->length); fprintf(stderr,"SETTINGS %e %e\n",settings.timeout, a_state->length);
#endif #endif
// collect analogin sections in state // collect analogin sections in state
std::list<analogin*> inputs; std::list<analogin*> inputs;
@ -533,6 +534,7 @@ void SpectrumMI40xxSeries::set_daq(state & exp) {
/* nothing to do! */ /* nothing to do! */
if (sampleno==0) { if (sampleno==0) {
fprintf(stderr, "oops, no sample number\n");
delete conf; delete conf;
effective_settings=NULL; effective_settings=NULL;
return; return;