Mercurial > hg > fxanalyse
changeset 180:8faada7e4faf
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 | c96f5f64c946 |
| files | FXAnalyse.c FXAnalyse.h FXAnalyse.uir |
| diffstat | 3 files changed, 52 insertions(+), 142 deletions(-) [+] |
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) {
--- a/FXAnalyse.h Fri Feb 21 18:38:45 2014 +0100 +++ b/FXAnalyse.h Fri Feb 21 18:42:16 2014 +0100 @@ -89,66 +89,58 @@ #define PANEL_MATHSTRING1 53 /* control type: string, callback function: CB_ChangeMath */ #define PANEL_MATHSTRING2 54 /* control type: string, callback function: CB_ChangeMath */ #define PANEL_TEXTMSG_16 55 /* control type: textMsg, callback function: (none) */ -#define PANEL_MINUS10KDDS1 56 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS4 57 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS3 58 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS2 59 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_PLUS10KDDS4 60 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS3 61 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS1 62 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS2 63 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_MATHSTRING5 64 /* control type: textBox, callback function: CB_ChangeMath */ -#define PANEL_UTC 65 /* control type: numeric, callback function: (none) */ -#define PANEL_TIME 66 /* control type: string, callback function: (none) */ -#define PANEL_DDS4 67 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_DDS3 68 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N1CALCULUS 69 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_FINDSIGN3 70 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN3 71 /* control type: numeric, callback function: CB_Sign3 */ -#define PANEL_FINDSIGN2 72 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN2 73 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN1 74 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN1 75 /* control type: numeric, callback function: (none) */ -#define PANEL_FIND10K3 76 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_FIND275K2 77 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_RESETSLOPE 78 /* control type: command, callback function: CB_OnResetSlope */ -#define PANEL_CHECKBOX_STOPIFAUTODE 79 /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */ -#define PANEL_CHECKBOX_KEEPSLOPE 80 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_KEEP 81 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_SLOPE_REFERENCE 82 /* control type: ring, callback function: CB_OnSlopeReference */ -#define PANEL_ESTIMATE_N2 83 /* control type: command, callback function: CB_OnEstimateN */ -#define PANEL_ESTIMATE_N3 84 /* control type: command, callback function: CB_OnEstimateN */ -#define PANEL_INVERT_SLOPE_SIGN 85 /* control type: radioButton, callback function: CB_InvertSlopeSign */ -#define PANEL_RECENTER 86 /* control type: LED, callback function: CB_RecenterEnable */ -#define PANEL_MEASURE_SLOPE 87 /* control type: LED, callback function: CB_MeasureSlope */ -#define PANEL_SLOPE_MEASURED 88 /* control type: numeric, callback function: (none) */ -#define PANEL_RESET_DEDRIFT_DDS 89 /* control type: command, callback function: CB_ResetDedriftDDS */ -#define PANEL_SAVE_RAW 90 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_SHOWLOG 91 /* control type: radioButton, callback function: CB_ShowLog */ -#define PANEL_SLOPEX2 92 /* control type: radioButton, callback function: CB_SlopeX2 */ -#define PANEL_SAVE_DDS 93 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_DECORATION_2 94 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_8 95 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION 96 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_3 97 /* control type: deco, callback function: (none) */ -#define PANEL_TEXTMSG_6 98 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_22 99 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_21 100 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_7 101 /* control type: textMsg, callback function: (none) */ -#define PANEL_DECORATION_4 102 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_7 103 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_6 104 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_5 105 /* control type: deco, callback function: (none) */ -#define PANEL_TEXTMSG_20 106 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_19 107 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATH4 108 /* control type: string, callback function: (none) */ -#define PANEL_MATH5 109 /* control type: string, callback function: (none) */ -#define PANEL_MATH3 110 /* control type: string, callback function: (none) */ -#define PANEL_MATH2 111 /* control type: string, callback function: (none) */ -#define PANEL_MATH1 112 /* control type: string, callback function: (none) */ -#define PANEL_RECENTER_SR 113 /* control type: radioButton, callback function: CB_RecenterChannel */ -#define PANEL_RECENTER_HG 114 /* control type: radioButton, callback function: CB_RecenterChannel */ -#define PANEL_RECENTER_LO 115 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_MATHSTRING5 56 /* control type: textBox, callback function: CB_ChangeMath */ +#define PANEL_UTC 57 /* control type: numeric, callback function: (none) */ +#define PANEL_TIME 58 /* control type: string, callback function: (none) */ +#define PANEL_DDS4 59 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_DDS3 60 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_N1CALCULUS 61 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_FINDSIGN3 62 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN3 63 /* control type: numeric, callback function: CB_Sign3 */ +#define PANEL_FINDSIGN2 64 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN2 65 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN1 66 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN1 67 /* control type: numeric, callback function: (none) */ +#define PANEL_FIND10K3 68 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND275K2 69 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_RESETSLOPE 70 /* control type: command, callback function: CB_OnResetSlope */ +#define PANEL_CHECKBOX_STOPIFAUTODE 71 /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */ +#define PANEL_CHECKBOX_KEEPSLOPE 72 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_CHECKBOX_KEEP 73 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_SLOPE_REFERENCE 74 /* control type: ring, callback function: CB_OnSlopeReference */ +#define PANEL_ESTIMATE_N2 75 /* control type: command, callback function: CB_OnEstimateN */ +#define PANEL_ESTIMATE_N3 76 /* control type: command, callback function: CB_OnEstimateN */ +#define PANEL_INVERT_SLOPE_SIGN 77 /* control type: radioButton, callback function: CB_InvertSlopeSign */ +#define PANEL_RECENTER 78 /* control type: LED, callback function: CB_RecenterEnable */ +#define PANEL_MEASURE_SLOPE 79 /* control type: LED, callback function: CB_MeasureSlope */ +#define PANEL_SLOPE_MEASURED 80 /* control type: numeric, callback function: (none) */ +#define PANEL_RESET_DEDRIFT_DDS 81 /* control type: command, callback function: CB_ResetDedriftDDS */ +#define PANEL_SAVE_RAW 82 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_SHOWLOG 83 /* control type: radioButton, callback function: CB_ShowLog */ +#define PANEL_SLOPEX2 84 /* control type: radioButton, callback function: CB_SlopeX2 */ +#define PANEL_SAVE_DDS 85 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_DECORATION_2 86 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_8 87 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION 88 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_3 89 /* control type: deco, callback function: (none) */ +#define PANEL_TEXTMSG_6 90 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_22 91 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_21 92 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_7 93 /* control type: textMsg, callback function: (none) */ +#define PANEL_DECORATION_4 94 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_7 95 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_6 96 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_5 97 /* control type: deco, callback function: (none) */ +#define PANEL_TEXTMSG_20 98 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_19 99 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATH4 100 /* control type: string, callback function: (none) */ +#define PANEL_MATH5 101 /* control type: string, callback function: (none) */ +#define PANEL_MATH3 102 /* control type: string, callback function: (none) */ +#define PANEL_MATH2 103 /* control type: string, callback function: (none) */ +#define PANEL_MATH1 104 /* control type: string, callback function: (none) */ +#define PANEL_RECENTER_SR 105 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_HG 106 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_LO 107 /* control type: radioButton, callback function: CB_RecenterChannel */ /* Control Arrays: */ @@ -181,13 +173,11 @@ int CVICALLBACK CB_OnFindSign(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnFreqPlot(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnLoggingPanelEvent(int panel, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK CB_OnMinus10k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNCalculus(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNEstimate(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNEstimateCancel(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNEstimateSet(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnNStop(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK CB_OnPlus10k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnResetSlope(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnSlopeReference(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStart(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);