comparison FXAnalyse.c @ 184:12df3a2b18de

Do not reset dedrift DDS at program initialization
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Fri, 21 Feb 2014 18:42:30 +0100
parents 791ca26fee6a
children 89e092681ba7
comparison
equal deleted inserted replaced
183:791ca26fee6a 184:12df3a2b18de
431 rv = Ini_GetDouble(configuration, "AD9956", "clock", &clock); 431 rv = Ini_GetDouble(configuration, "AD9956", "clock", &clock);
432 if (! rv) 432 if (! rv)
433 return -1; 433 return -1;
434 434
435 // dedrift DDS 435 // dedrift DDS
436 DDSFox_Initialize(&DDS1xAD9956, host, port, dedrift.freq0); 436 DDSFox_Init(&DDS1xAD9956, host, port);
437 437
438 // AD9912 configuration parameters 438 // AD9912 configuration parameters
439 rv = Ini_GetStringIntoBuffer(configuration, "AD9912", "host", host, sizeof(host)); 439 rv = Ini_GetStringIntoBuffer(configuration, "AD9912", "host", host, sizeof(host));
440 if (! rv) 440 if (! rv)
441 return -1; 441 return -1;
1950 dedrift.enabled = FALSE; 1950 dedrift.enabled = FALSE;
1951 SetCtrlVal(panel, PANEL_MEASURE_SLOPE, 0); 1951 SetCtrlVal(panel, PANEL_MEASURE_SLOPE, 0);
1952 dedrift.applied = 0.0; 1952 dedrift.applied = 0.0;
1953 SetCtrlVal(panel, PANEL_SLOPE_APPLIED, dedrift.applied); 1953 SetCtrlVal(panel, PANEL_SLOPE_APPLIED, dedrift.applied);
1954 // reset DDS 1954 // reset DDS
1955 DDSFox_Reset(&DDS1xAD9956); 1955 DDSFox_Reset(&DDS1xAD9956, dedrift.freq0);
1956 DDSFox_SetProfile(&DDS1xAD9956);
1957 DDSFox_SetDiv(&DDS1xAD9956, 1);
1958 DDSFox_Set(&DDS1xAD9956, dedrift.freq0, 0.0);
1959 break; 1956 break;
1960 } 1957 }
1961 return 0; 1958 return 0;
1962 } 1959 }
1963 1960