Mercurial > hg > fxanalyse

diff FXAnalyse.c @ 180:8faada7e4faf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove DDS frequency +10 kHz and -10 kHz buttons
author Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date Fri, 21 Feb 2014 18:42:16 +0100
parents 75e37ba8c417
children 791ca26fee6a
line wrap: on
line diff
--- a/FXAnalyse.c	Fri Feb 21 18:38:45 2014 +0100
+++ b/FXAnalyse.c	Fri Feb 21 18:42:16 2014 +0100
@@ -1463,86 +1463,6 @@
 	return 0;
 }
 
-int CVICALLBACK CB_OnPlus10k (int panel, int control, int event,
-		void *callbackData, int eventData1, int eventData2)
-{
-	double Frequency ;
-
-	switch (event)
-	{
-		case EVENT_COMMIT:
-			switch (control)
-			{
-				case PANEL_PLUS10KDDS1:
-					GetCtrlVal(MainPanel, PANEL_DDS1, &Frequency);
-					Frequency += 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency);	
-					SetCtrlVal(MainPanel, PANEL_DDS1, Frequency);
-					break;
-				case PANEL_PLUS10KDDS2:
-					GetCtrlVal(MainPanel, PANEL_DDS2, &Frequency);
-					Frequency += 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, Frequency);	
-					SetCtrlVal(MainPanel, PANEL_DDS2, Frequency);
-					break;
-				case PANEL_PLUS10KDDS3:
-					GetCtrlVal(MainPanel, PANEL_DDS3, &Frequency);
-					Frequency += 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, Frequency);	
-					SetCtrlVal(MainPanel, PANEL_DDS3, Frequency);
-					break;
-				case PANEL_PLUS10KDDS4:
-					GetCtrlVal(MainPanel, PANEL_DDS4, &Frequency);
-					Frequency += 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, Frequency);	
-					SetCtrlVal(MainPanel, PANEL_DDS4, Frequency);
-					break;
-			}
-			break;
-	}
-	return 0;
-}
-
-int CVICALLBACK CB_OnMinus10k (int panel, int control, int event,
-		void *callbackData, int eventData1, int eventData2)
-{
-	double Frequency;
-	
-	switch (event)
-	{
-		case EVENT_COMMIT:
-			switch (control)
-			{
-				case PANEL_MINUS10KDDS1:
-					GetCtrlVal(MainPanel, PANEL_DDS1, &Frequency);
-					Frequency -= 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency);
-					SetCtrlVal(MainPanel, PANEL_DDS1, Frequency);
-					break;
-				case PANEL_MINUS10KDDS2:
-					GetCtrlVal(MainPanel, PANEL_DDS2, &Frequency);
-					Frequency -= 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, Frequency);	
-					SetCtrlVal(MainPanel, PANEL_DDS2, Frequency);
-					break;
-				case PANEL_MINUS10KDDS3:
-					GetCtrlVal(MainPanel, PANEL_DDS3, &Frequency);
-					Frequency -= 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, Frequency);	
-					SetCtrlVal(MainPanel, PANEL_DDS3, Frequency);
-					break;
-				case PANEL_MINUS10KDDS4:
-					GetCtrlVal(MainPanel, PANEL_DDS4, &Frequency);
-					Frequency -= 10000.0;
-					DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, Frequency);
-					SetCtrlVal(MainPanel, PANEL_DDS4, Frequency);
-					break;
-			}
-			break;
-	}
-	return 0;
-}
-
 int CVICALLBACK CB_OnAcceptN (int panel, int control, int event,
 		void *callbackData, int eventData1, int eventData2)
 {