Mercurial > hg > fxanalyse

diff FXAnalyse.c @ 27:419db63a9949

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove two global variables
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Tue, 02 Oct 2012 16:51:57 +0200
parents 4bb197635664
children 1e4ecf64b485
line wrap: on
line diff
--- a/FXAnalyse.c	Tue Oct 02 16:31:32 2012 +0200
+++ b/FXAnalyse.c	Tue Oct 02 16:51:57 2012 +0200
@@ -111,7 +111,6 @@
 
 double FrequencyDDSBes=0.0,FrequencyDDSBesInit=0.0;
 double FrequencyDDS3=0.0,FrequencyDDS3Init=0.0;
-double DeltaFrep275=0.0,DeltaFrep10=0.0; ;
 double DDSBesChanged1=FALSE,DDSBesChanged2=FALSE;
 
 double DeltaDDS3=0.0,Delta10K_Plus=0.0,Delta10K_Minus=0.0;
@@ -846,7 +845,7 @@
 									Slope_Ch4slope_1 = 0.0;
 
 									// frep positive step
-									DDS4xAD9912_FrequencyRampe(&DDS4xAD9912,1, FrequDDS1,(FrequDDS1+DeltakHz_1*1000), Step1/Ndiv );
+									DDS4xAD9912_FrequencyRampe(&DDS4xAD9912,1, FrequDDS1,(FrequDDS1+DeltakHz_1*1000), Step1/Ndiv);
 									SetCtrlVal(MainPanel, PANEL_DDS1, (FrequDDS1+DeltakHz_1*1000));
 									DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, (FrequDDS1+DeltakHz_1*1000));
 								
@@ -867,8 +866,7 @@
 									break;
 								}
 								
-								DeltaFrep275 = 275000 - Ch4;
-								double fDDS2 = FrequencyDDSBesInit + (DeltaFrep275);
+								double fDDS2 = FrequencyDDSBesInit + 275000 - Ch4;
 								SetCtrlVal(MainPanel, PANEL_DDS2, fDDS2) ;
 								DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, fDDS2);
 								
@@ -1012,8 +1010,8 @@
 												{
 												nDDSChange=0;
 													
-												DeltaFrep275=275000-Ch4;
-												DeltaFrep10=10000-Ch2;
+												double DeltaFrep275 = 275000-Ch4;
+												double DeltaFrep10 = 10000-Ch2;
 												DeltaDDS3= DeltaDDS3 +(DeltaFrep10);
 												FrequencyDDSBes=FrequencyDDSBesInit+(DeltaFrep275);
 												FrequencyDDS3=FrequencyDDS3Init+DeltaDDS3;
@@ -1073,8 +1071,8 @@
 												nDDSChange=0;
 										
 												
-												DeltaFrep275=275000-Ch4;
-												DeltaFrep10=10000-Ch2;
+												double DeltaFrep275=275000-Ch4;
+												double DeltaFrep10=10000-Ch2;
 												DeltaDDS3 = DeltaDDS3+(DeltaFrep10) ;
 												FrequencyDDSBes=FrequencyDDSBes+(DeltaFrep275) ;
 												FrequencyDDS3=FrequencyDDS3+DeltaDDS3 ;