# HG changeset patch # User Daniele Nicolodi # Date 1351518504 -3600 # Node ID 94cb4b29bb470046cf6cc834f1448d093ec6c3ed # Parent 64a7a1d3d75ccd2dcd08bc2a741353839bdc0613 Use cleaned up AD9956 DDS driver functionalities diff -r 64a7a1d3d75c -r 94cb4b29bb47 FXAnalyse.c --- a/FXAnalyse.c Mon Oct 29 14:48:14 2012 +0100 +++ b/FXAnalyse.c Mon Oct 29 14:48:24 2012 +0100 @@ -138,26 +138,6 @@ double CenteringTimeBegin10K = 0.0; -int DDSFox_Set(DDSParameter *DDS, double Frequency, double SweepRate) -{ - DDS->Frequency = Frequency; - DDS->SweepRate = SweepRate; - - DDSFox_SetFreq(DDS); - DDSFox_SetDf(DDS); - - return 0; -} - - -int DDSFox_SetSweepRate(DDSParameter *DDS, double SweepRate) -{ - DDS->SweepRate = SweepRate; - DDSFox_SetDf(DDS); - return 0; -} - - muParserHandle_t initMathParser() { muParserHandle_t parser = mupCreate(); @@ -231,14 +211,7 @@ DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, frequency); // initialyze 1x AD9956 DDS box - strcpy(DDS1xAD9956.ip, "145.238.205.58"); - DDS1xAD9956.Port = 6665; - DDS1xAD9956.Profil = 7; // configuration profile: single freq=0, sweep=7 - DDS1xAD9956.Clock = 200000000; - DDS1xAD9956.Frequency = DEDRIFT_DDS_FREQUENCY; - DDS1xAD9956.Delta_T = 0.01; - DDS1xAD9956.SweepRate = 0.0; - DDS_Initialize(&DDS1xAD9956); + DDSFox_Initialize(&DDS1xAD9956, "145.238.205.58", 6665, DEDRIFT_DDS_FREQUENCY); Ch1 = Ch2 = Ch3 = Ch4 = 0.0;