Mercurial > hg > fxanalyse
changeset 28:1e4ecf64b485
Remove references to unused DDSBes
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Tue, 02 Oct 2012 17:51:27 +0200 |
| parents | 419db63a9949 |
| children | 585c60175bd5 |
| files | FXAnalyse.c FXAnalyse.h |
| diffstat | 2 files changed, 139 insertions(+), 231 deletions(-) [+] |
line wrap: on
line diff
--- a/FXAnalyse.c Tue Oct 02 16:51:57 2012 +0200 +++ b/FXAnalyse.c Tue Oct 02 17:51:27 2012 +0200 @@ -57,7 +57,6 @@ Plot_Data PlotCh1, PlotCh2, PlotCh3, PlotCh4, PlotMath1, PlotMath2, PlotMath3, PlotMath4, PlotMath5 ; Allan_Data AllanCh1, AllanCh2, AllanCh3, AllanCh4, AllanMath1, AllanMath2, AllanMath3, AllanMath4, AllanMath5 ; -DDSBes_Data DDSBes ; DDS4xAD9912_Data DDS4xAD9912 ; muParserHandle_t MathParser1, MathParser2, MathParser3, MathParser4, MathParser5 ; @@ -211,7 +210,6 @@ mupDefineVar( * pMathParser, "Ch2", &Ch2); mupDefineVar( * pMathParser, "Ch3", &Ch3); mupDefineVar( * pMathParser, "Ch4", &Ch4); - mupDefineVar( * pMathParser, "DDS_Frep", &(DDSBes.Frequency)); mupDefineVar( * pMathParser, "DDS1", &(DDS4xAD9912.Frequency1)); mupDefineVar( * pMathParser, "DDS2", &(DDS4xAD9912.Frequency2)); mupDefineVar( * pMathParser, "DDS3", &(DDS4xAD9912.Frequency3)); @@ -264,14 +262,6 @@ DisplayPanel (MainPanel); - // Initialyze the DDS Besancon Output - - DDSBes_Initialize(&DDSBes) ; - DDSBes_SetClockFrequency(&DDSBes, DDSBESCLOCK) ; // Peut etre passer tout ca dans DDSBes-Initialize ? - DDSBes_SetAmplitude(&DDSBes, 4095) ; - GetCtrlVal(MainPanel, PANEL_DDSFREPOUT,&initfreqDDS) ; - DDSBes_SetFrequency(&DDSBes, initfreqDDS) ; - // Initialize the quadruple AD9959 DDS (Fox board interface) DDS4xAD9912_Reset(&DDS4xAD9912) ; @@ -296,9 +286,8 @@ GetCtrlVal(MainPanel, PANEL_N3CHOICE, &N3) ; - initMathParser(&MathParser1) ; - mupDefineVar(MathParser1, "DDS", &(DDSBes.Frequency)); - GetCtrlVal(MainPanel, PANEL_MATHSTRING1, MathString1) ; + initMathParser(&MathParser1); + GetCtrlVal(MainPanel, PANEL_MATHSTRING1, MathString1); mupSetExpr(MathParser1, MathString1); initMathParser(&MathParser2) ; @@ -375,7 +364,6 @@ { case EVENT_COMMIT: QuitUserInterface (0); - DDSBes_Close(&DDSBes); mupRelease(MathParser1); mupRelease(MathParser2); mupRelease(MathParser3); @@ -398,7 +386,6 @@ switch (event) { case EVENT_CLOSE: QuitUserInterface (0); - DDSBes_Close(&DDSBes); mupRelease(MathParser1); mupRelease(MathParser2); mupRelease(MathParser3); @@ -408,14 +395,6 @@ { case VAL_RIGHT_ARROW_VKEY : ActiveControl = GetActiveCtrl(panel); - if (ActiveControl==PANEL_DDSFREPOUT || ActiveControl==PANEL_DDSFREPSTEP) { - GetCtrlIndex(MainPanel, PANEL_DDSFREPSTEP, &StepIndex); - if (StepIndex<14){ - SetCtrlIndex(MainPanel, PANEL_DDSFREPSTEP, ++StepIndex) ; - GetCtrlVal(MainPanel, PANEL_DDSFREPSTEP, &Step); - SetCtrlAttribute(MainPanel, PANEL_DDSFREPOUT, ATTR_INCR_VALUE, Step) ; - }; - }; if (ActiveControl==PANEL_DDS1 || ActiveControl==PANEL_DDS1STEP) { GetCtrlIndex(MainPanel, PANEL_DDS1STEP, &StepIndex); if (StepIndex<14){ @@ -451,14 +430,6 @@ break; case VAL_LEFT_ARROW_VKEY : ActiveControl = GetActiveCtrl(panel); - if (ActiveControl==PANEL_DDSFREPOUT || ActiveControl==PANEL_DDSFREPSTEP) { - GetCtrlIndex(MainPanel, PANEL_DDSFREPSTEP, &StepIndex); - if (StepIndex>0){ - SetCtrlIndex(MainPanel, PANEL_DDSFREPSTEP, --StepIndex) ; - GetCtrlVal(MainPanel, PANEL_DDSFREPSTEP, &Step); - SetCtrlAttribute(MainPanel, PANEL_DDSFREPOUT, ATTR_INCR_VALUE, Step) ; - }; - }; if (ActiveControl==PANEL_DDS1 || ActiveControl==PANEL_DDS1STEP) { GetCtrlIndex(MainPanel, PANEL_DDS1STEP, &StepIndex); if (StepIndex>0){ @@ -492,9 +463,6 @@ }; }; break; - case VAL_F1_VKEY : - SetActiveCtrl(MainPanel, PANEL_DDSFREPOUT); - break; case VAL_F2_VKEY : SetActiveCtrl(MainPanel, PANEL_DDS1); break; @@ -1705,22 +1673,27 @@ int CVICALLBACK CB_ChangeDDSOut (int panel, int control, int event, void *callbackData, int eventData1, int eventData2) { - double Frequency ; + double frequency ; - switch (event) - { + switch (event) { case EVENT_COMMIT: - GetCtrlVal(MainPanel, control, &Frequency) ; - if (control==PANEL_DDSFREPOUT) { DDSBes_SetFrequency(&DDSBes, Frequency) ;} - if (control==PANEL_DDS1) { DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency);} - if (control==PANEL_DDS2) { DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, Frequency);} - if (control==PANEL_DDS3) { DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, Frequency);} - if (control==PANEL_DDS4) { DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, Frequency);} - case EVENT_RIGHT_CLICK: - - break; + GetCtrlVal(MainPanel, control, &frequency); - } + switch (control) { + case PANEL_DDS1: + DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, frequency); + break; + case PANEL_DDS2: + DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, frequency); + break; + case PANEL_DDS3: + DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, frequency); + break; + case PANEL_DDS4: + DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, frequency); + break; + } + } return 0; } @@ -1732,31 +1705,12 @@ switch (event) { case EVENT_COMMIT: - GetCtrlVal(MainPanel, control, &Step) ; - if (control==PANEL_DDSFREPSTEP) { SetCtrlAttribute(panel, PANEL_DDSFREPOUT, ATTR_INCR_VALUE, Step) ;} - if (control==PANEL_DDS1STEP) { SetCtrlAttribute(panel, PANEL_DDS1, ATTR_INCR_VALUE, Step) ;} - if (control==PANEL_DDS2STEP) { SetCtrlAttribute(panel, PANEL_DDS2, ATTR_INCR_VALUE, Step) ;} - if (control==PANEL_DDS3STEP) { SetCtrlAttribute(panel, PANEL_DDS3, ATTR_INCR_VALUE, Step) ;} - if (control==PANEL_DDS4STEP) { SetCtrlAttribute(panel, PANEL_DDS4, ATTR_INCR_VALUE, Step) ;} - break; - case EVENT_RIGHT_CLICK: - + GetCtrlVal(MainPanel, control, &Step); + if (control==PANEL_DDS1STEP) { SetCtrlAttribute(panel, PANEL_DDS1, ATTR_INCR_VALUE, Step); } + if (control==PANEL_DDS2STEP) { SetCtrlAttribute(panel, PANEL_DDS2, ATTR_INCR_VALUE, Step); } + if (control==PANEL_DDS3STEP) { SetCtrlAttribute(panel, PANEL_DDS3, ATTR_INCR_VALUE, Step); } + if (control==PANEL_DDS4STEP) { SetCtrlAttribute(panel, PANEL_DDS4, ATTR_INCR_VALUE, Step); } break; - - } - return 0; -} - -int CVICALLBACK CB_ChangeDDSAmpli (int panel, int control, int event, - void *callbackData, int eventData1, int eventData2) -{ - unsigned short int Amplitude ; - - switch (event) - { - case EVENT_COMMIT: - GetCtrlVal(MainPanel, control, &Amplitude) ; - if (control==PANEL_DDSFREPAMP) { DDSBes_SetAmplitude(&DDSBes, Amplitude) ;} case EVENT_RIGHT_CLICK: break; @@ -1815,43 +1769,6 @@ return 0; } - -int CVICALLBACK CB_OnPlus275k (int panel, int control, int event, - void *callbackData, int eventData1, int eventData2) -{ - double Frequency ; - - switch (event) - { - case EVENT_COMMIT: - GetCtrlVal(MainPanel, PANEL_DDSFREPOUT, &Frequency); - Frequency += 275000.0; - DDSBes_SetFrequency(&DDSBes, Frequency); - SetCtrlVal(MainPanel, PANEL_DDSFREPOUT, Frequency); - break; - } - return 0; -} - - -int CVICALLBACK CB_OnMinus275k (int panel, int control, int event, - void *callbackData, int eventData1, int eventData2) -{ - double Frequency ; - - switch (event) - { - case EVENT_COMMIT: - GetCtrlVal(MainPanel, PANEL_DDSFREPOUT, &Frequency); - Frequency -= 275000.0; - DDSBes_SetFrequency(&DDSBes, Frequency); - SetCtrlVal(MainPanel, PANEL_DDSFREPOUT, Frequency); - break; - } - return 0; -} - - int CVICALLBACK CB_OnPlus10k (int panel, int control, int event, void *callbackData, int eventData1, int eventData2) {
--- a/FXAnalyse.h Tue Oct 02 16:51:57 2012 +0200 +++ b/FXAnalyse.h Tue Oct 02 17:51:27 2012 +0200 @@ -64,126 +64,119 @@ #define PANEL_FREQ1 8 /* control type: numeric, callback function: (none) */ #define PANEL_CHECKBOX_DDSSRALLAN 9 /* control type: radioButton, callback function: (none) */ #define PANEL_CHECKBOX_DDSHGALLAN 10 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_DDSFREPALLAN 11 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_DDSSRPLOT 12 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_MATH1ALLAN 13 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_DDSHGPLOT 14 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_FREQ4ALLAN 15 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_DDSFREPPLOT 16 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_FREQ3ALLAN 17 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_FREQ4PLOT 18 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_FREQ2ALLAN 19 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_FREQ3PLOT 20 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_CORRFREQU 21 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_FREQ1ALLAN 22 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_FREQ2PLOT 23 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH1PLOT 24 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_FREQ1PLOT 25 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_TIMER 26 /* control type: timer, callback function: CB_OnTimer */ -#define PANEL_DDS2 27 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_TEXTMSG 28 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_2 29 /* control type: textMsg, callback function: (none) */ -#define PANEL_SLOPETIME 30 /* control type: numeric, callback function: CB_ChangeSlopeTime */ -#define PANEL_DDS1 31 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_SPLITTER 32 /* control type: splitter, callback function: (none) */ -#define PANEL_CHANGENDIV 33 /* control type: numeric, callback function: CB_OnChangeNdiv */ -#define PANEL_DDSFREPOUT 34 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N3CHOICE 35 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N3CALCULUS 36 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_N1CHOICE 37 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N2CHOICE 38 /* control type: numeric, callback function: CB_ChangeN */ -#define PANEL_N2CALCULUS 39 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_DDS4STEP 40 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDS3STEP 41 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDS2STEP 42 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_CURRENT_FREQUENCY 43 /* control type: numeric, callback function: (none) */ -#define PANEL_CENTERFREQUENCY 44 /* control type: numeric, callback function: (none) */ -#define PANEL_SLOPETOCANCEL 45 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH4 46 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH5 47 /* control type: numeric, callback function: (none) */ -#define PANEL_MATH3 48 /* control type: numeric, callback function: (none) */ -#define PANEL_CHECKBOX_MATH5PLOT 49 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH4PLOT 50 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH4ALLAN 51 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_DDS1STEP 52 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_TEXTMSG_15 53 /* control type: textMsg, callback function: (none) */ -#define PANEL_CHECKBOX_MATH5ALLAN 54 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_CHECKBOX_MATH3PLOT 55 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH5SAVE 56 /* control type: radioButton, callback function: (none) */ -#define PANEL_CHECKBOX_MATH3SAVE_2 57 /* control type: radioButton, callback function: CB_OnSaveSr */ -#define PANEL_CHECKBOX_MATH3ALLAN 58 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_DDSFREPSTEP 59 /* control type: ring, callback function: CB_ChangeDDSStep */ -#define PANEL_DDSFREPAMP 60 /* control type: numeric, callback function: CB_ChangeDDSAmpli */ -#define PANEL_MATHSTRING4 61 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_17 62 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATH2 63 /* control type: numeric, callback function: (none) */ -#define PANEL_SPLITTER_15 64 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_12 65 /* control type: splitter, callback function: (none) */ -#define PANEL_CHECKBOX_MATH2PLOT 66 /* control type: radioButton, callback function: CB_OnFreqPlot */ -#define PANEL_CHECKBOX_MATH3SAVE 67 /* control type: radioButton, callback function: CB_OnSaveHg */ -#define PANEL_CHECKBOX_MATH2SAVE 68 /* control type: radioButton, callback function: CB_OnSaveOpt */ -#define PANEL_CHECKBOX_MATH2ALLAN 69 /* control type: radioButton, callback function: CB_OnAllanPlot */ -#define PANEL_TEXTMSG_7 70 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING3 71 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_MATH1 72 /* control type: numeric, callback function: (none) */ -#define PANEL_SPLITTER_6 73 /* control type: splitter, callback function: (none) */ -#define PANEL_TEXTMSG_18 74 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_6 75 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_8 76 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_19 77 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING1 78 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_9 79 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_10 80 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING2 81 /* control type: string, callback function: CB_ChangeMath */ -#define PANEL_TEXTMSG_16 82 /* control type: textMsg, callback function: (none) */ -#define PANEL_SPLITTER_11 83 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_16 84 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_9 85 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_3 86 /* control type: splitter, callback function: (none) */ -#define PANEL_MINUS10KDDS1 87 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS4 88 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS3 89 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_MINUS10KDDS2 90 /* control type: command, callback function: CB_OnMinus10k */ -#define PANEL_PLUS10KDDS4 91 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_MINUS275K 92 /* control type: command, callback function: CB_OnMinus275k */ -#define PANEL_PLUS10KDDS3 93 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS1 94 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS10KDDS2 95 /* control type: command, callback function: CB_OnPlus10k */ -#define PANEL_PLUS275K 96 /* control type: command, callback function: CB_OnPlus275k */ -#define PANEL_TEXTMSG_11 97 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATHSTRING5 98 /* control type: textBox, callback function: CB_ChangeMath */ -#define PANEL_SPLITTER_8 99 /* control type: splitter, callback function: (none) */ -#define PANEL_MJD 100 /* control type: numeric, callback function: (none) */ -#define PANEL_UTC 101 /* control type: numeric, callback function: (none) */ -#define PANEL_TIME 102 /* control type: string, callback function: (none) */ -#define PANEL_DATE 103 /* control type: string, callback function: (none) */ -#define PANEL_CHECKBOX_MATH3AUTOSAV 104 /* control type: radioButton, callback function: CB_OnAutoSaveSr */ -#define PANEL_CHECKBOX_MATH2AUTOSAV 105 /* control type: radioButton, callback function: CB_OnAutoSaveHg */ -#define PANEL_CHOOSESAVEFILE 106 /* control type: command, callback function: OnChooseSaveFile */ -#define PANEL_SPLITTER_14 107 /* control type: splitter, callback function: (none) */ -#define PANEL_SPLITTER_13 108 /* control type: splitter, callback function: (none) */ -#define PANEL_DDS4 109 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_SPLITTER_2 110 /* control type: splitter, callback function: (none) */ -#define PANEL_DDS3 111 /* control type: numeric, callback function: CB_ChangeDDSOut */ -#define PANEL_N1CALCULUS 112 /* control type: command, callback function: CB_OnNCalculus */ -#define PANEL_FINDSIGN3 113 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN3 114 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN2 115 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN2 116 /* control type: numeric, callback function: (none) */ -#define PANEL_FINDSIGN1 117 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN1 118 /* control type: numeric, callback function: (none) */ -#define PANEL_FIND10K3 119 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_FIND275K2 120 /* control type: command, callback function: CB_OnFind275K */ -#define PANEL_RESETSLOPE 121 /* control type: command, callback function: CB_OnResetSlope */ -#define PANEL_CHECKBOX_STOPIFAUTODE 122 /* control type: radioButton, callback function: CB_OnAutoStopSlopeCancellingIfDelock */ -#define PANEL_CHECKBOX_RECENTER 123 /* control type: radioButton, callback function: CB_OnReCentering */ -#define PANEL_CHECKBOX_KEEPSLOPE 124 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_KEEP 125 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_STARTCANCEL 126 /* control type: textButton, callback function: CB_OnStartSlopeCancelling */ -#define PANEL_LED1 127 /* control type: LED, callback function: (none) */ -#define PANEL_LED2 128 /* control type: LED, callback function: (none) */ -#define PANEL_SLOPE_REFERENCE 129 /* control type: ring, callback function: CB_OnSlopeReference */ -#define PANEL_ESTIMATE_N3 130 /* control type: command, callback function: CB_OnEstimateN */ +#define PANEL_CHECKBOX_DDSSRPLOT 11 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_MATH1ALLAN 12 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_DDSHGPLOT 13 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_FREQ4ALLAN 14 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_FREQ3ALLAN 15 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_FREQ4PLOT 16 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_FREQ2ALLAN 17 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_FREQ3PLOT 18 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_CORRFREQU 19 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_CHECKBOX_FREQ1ALLAN 20 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_FREQ2PLOT 21 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH1PLOT 22 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_FREQ1PLOT 23 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_TIMER 24 /* control type: timer, callback function: CB_OnTimer */ +#define PANEL_DDS2 25 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_TEXTMSG 26 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_2 27 /* control type: textMsg, callback function: (none) */ +#define PANEL_SLOPETIME 28 /* control type: numeric, callback function: CB_ChangeSlopeTime */ +#define PANEL_DDS1 29 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_SPLITTER 30 /* control type: splitter, callback function: (none) */ +#define PANEL_CHANGENDIV 31 /* control type: numeric, callback function: CB_OnChangeNdiv */ +#define PANEL_N3CHOICE 32 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N3CALCULUS 33 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_N1CHOICE 34 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N2CHOICE 35 /* control type: numeric, callback function: CB_ChangeN */ +#define PANEL_N2CALCULUS 36 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_DDS4STEP 37 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDS3STEP 38 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_DDS2STEP 39 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_CURRENT_FREQUENCY 40 /* control type: numeric, callback function: (none) */ +#define PANEL_CENTERFREQUENCY 41 /* control type: numeric, callback function: (none) */ +#define PANEL_SLOPETOCANCEL 42 /* control type: numeric, callback function: CB_SetSlope */ +#define PANEL_MATH4 43 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH5 44 /* control type: numeric, callback function: (none) */ +#define PANEL_MATH3 45 /* control type: numeric, callback function: (none) */ +#define PANEL_CHECKBOX_MATH5PLOT 46 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH4PLOT 47 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH4ALLAN 48 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_DDS1STEP 49 /* control type: ring, callback function: CB_ChangeDDSStep */ +#define PANEL_TEXTMSG_15 50 /* control type: textMsg, callback function: (none) */ +#define PANEL_CHECKBOX_MATH5ALLAN 51 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_CHECKBOX_MATH3PLOT 52 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH5SAVE 53 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_MATH3SAVE_2 54 /* control type: radioButton, callback function: CB_OnSaveSr */ +#define PANEL_CHECKBOX_MATH3ALLAN 55 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_MATHSTRING4 56 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_17 57 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATH2 58 /* control type: numeric, callback function: (none) */ +#define PANEL_SPLITTER_15 59 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_12 60 /* control type: splitter, callback function: (none) */ +#define PANEL_CHECKBOX_MATH2PLOT 61 /* control type: radioButton, callback function: CB_OnFreqPlot */ +#define PANEL_CHECKBOX_MATH3SAVE 62 /* control type: radioButton, callback function: CB_OnSaveHg */ +#define PANEL_CHECKBOX_MATH2SAVE 63 /* control type: radioButton, callback function: CB_OnSaveOpt */ +#define PANEL_CHECKBOX_MATH2ALLAN 64 /* control type: radioButton, callback function: CB_OnAllanPlot */ +#define PANEL_TEXTMSG_7 65 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING3 66 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_MATH1 67 /* control type: numeric, callback function: (none) */ +#define PANEL_SPLITTER_6 68 /* control type: splitter, callback function: (none) */ +#define PANEL_TEXTMSG_18 69 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_6 70 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_8 71 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_19 72 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING1 73 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_9 74 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_10 75 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING2 76 /* control type: string, callback function: CB_ChangeMath */ +#define PANEL_TEXTMSG_16 77 /* control type: textMsg, callback function: (none) */ +#define PANEL_SPLITTER_11 78 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_16 79 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_9 80 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_3 81 /* control type: splitter, callback function: (none) */ +#define PANEL_MINUS10KDDS1 82 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS4 83 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS3 84 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_MINUS10KDDS2 85 /* control type: command, callback function: CB_OnMinus10k */ +#define PANEL_PLUS10KDDS4 86 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS3 87 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS1 88 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_PLUS10KDDS2 89 /* control type: command, callback function: CB_OnPlus10k */ +#define PANEL_TEXTMSG_11 90 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATHSTRING5 91 /* control type: textBox, callback function: CB_ChangeMath */ +#define PANEL_SPLITTER_8 92 /* control type: splitter, callback function: (none) */ +#define PANEL_MJD 93 /* control type: numeric, callback function: (none) */ +#define PANEL_UTC 94 /* control type: numeric, callback function: (none) */ +#define PANEL_TIME 95 /* control type: string, callback function: (none) */ +#define PANEL_DATE 96 /* control type: string, callback function: (none) */ +#define PANEL_CHECKBOX_MATH3AUTOSAV 97 /* control type: radioButton, callback function: CB_OnAutoSaveSr */ +#define PANEL_CHECKBOX_MATH2AUTOSAV 98 /* control type: radioButton, callback function: CB_OnAutoSaveHg */ +#define PANEL_CHOOSESAVEFILE 99 /* control type: command, callback function: OnChooseSaveFile */ +#define PANEL_SPLITTER_14 100 /* control type: splitter, callback function: (none) */ +#define PANEL_SPLITTER_13 101 /* control type: splitter, callback function: (none) */ +#define PANEL_DDS4 102 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_SPLITTER_2 103 /* control type: splitter, callback function: (none) */ +#define PANEL_DDS3 104 /* control type: numeric, callback function: CB_ChangeDDSOut */ +#define PANEL_N1CALCULUS 105 /* control type: command, callback function: CB_OnNCalculus */ +#define PANEL_FINDSIGN3 106 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN3 107 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN2 108 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN2 109 /* control type: numeric, callback function: (none) */ +#define PANEL_FINDSIGN1 110 /* control type: command, callback function: CB_OnFindSign */ +#define PANEL_SIGN1 111 /* control type: numeric, callback function: (none) */ +#define PANEL_FIND10K3 112 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND275K2 113 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_RESETSLOPE 114 /* control type: command, callback function: CB_OnResetSlope */ +#define PANEL_CHECKBOX_STOPIFAUTODE 115 /* control type: radioButton, callback function: CB_OnAutoStopSlopeCancellingIfDelock */ +#define PANEL_CHECKBOX_RECENTER 116 /* control type: radioButton, callback function: CB_OnReCentering */ +#define PANEL_CHECKBOX_KEEPSLOPE 117 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_CHECKBOX_KEEP 118 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_STARTCANCEL 119 /* control type: textButton, callback function: CB_OnStartSlopeCancelling */ +#define PANEL_LED1 120 /* control type: LED, callback function: (none) */ +#define PANEL_LED2 121 /* control type: LED, callback function: (none) */ +#define PANEL_SLOPE_REFERENCE 122 /* control type: ring, callback function: CB_OnSlopeReference */ +#define PANEL_ESTIMATE_N3 123 /* control type: command, callback function: CB_OnEstimateN */ /* Menu Bars, Menus, and Menu Items: */ @@ -193,7 +186,6 @@ /* Callback Prototypes: */ -int CVICALLBACK CB_ChangeDDSAmpli(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ChangeDDSOut(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ChangeDDSStep(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ChangeMath(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -214,14 +206,12 @@ int CVICALLBACK CB_OnFreqPlot(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnIntegrationTime(int panel, int control, 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_OnMinus275k(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_OnPlus275k(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnReCentering(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_OnSaveHg(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -234,6 +224,7 @@ int CVICALLBACK CB_OnStartSlopeCancelling(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnStop(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnTimer(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_SetSlope(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK OnChooseSaveFile(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK QuitCallback(int panel, int control, int event, void *callbackData, int eventData1, int eventData2);