Mercurial > hg > fxanalyse
diff FXAnalyse.h @ 232:52f882f39c16
Implement correction proportional to frequency in dedrift code
Reorganize code and options handling
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Mon, 27 Oct 2014 18:08:17 +0100 |
| parents | a2f99632a80c |
| children | b3581a75a0b7 |
line wrap: on
line diff
--- a/FXAnalyse.h Mon Oct 27 18:03:35 2014 +0100 +++ b/FXAnalyse.h Mon Oct 27 18:08:17 2014 +0100 @@ -109,44 +109,45 @@ #define PANEL_ADJUST_DDS3 69 /* control type: command, callback function: CB_AdjustDDSFreq */ #define PANEL_ADJUST_DDS2 70 /* control type: command, callback function: CB_AdjustDDSFreq */ #define PANEL_RESETSLOPE 71 /* control type: command, callback function: CB_OnResetSlope */ -#define PANEL_CHECKBOX_STOPIFAUTODE 72 /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */ -#define PANEL_CHECKBOX_KEEPSLOPE 73 /* control type: radioButton, callback function: CB_OnCROX */ -#define PANEL_CHECKBOX_KEEP 74 /* control type: radioButton, callback function: CB_OnCROX */ +#define PANEL_DEDRIFT_STOP_ON_UNLOC 72 /* control type: radioButton, callback function: CB_OnStopSlopeCancellingOnUnlocked */ +#define PANEL_DEDRIFT_KEEP_SLOPE 73 /* control type: radioButton, callback function: CB_OnDedriftSettingsChange */ +#define PANEL_DEDRIFT_KEEP_FREQ 74 /* control type: radioButton, callback function: CB_OnDedriftSettingsChange */ #define PANEL_SLOPE_REFERENCE 75 /* control type: ring, callback function: CB_OnSlopeReference */ #define PANEL_ESTIMATE_N2 76 /* control type: command, callback function: cb_onEstimateN */ #define PANEL_ESTIMATE_N3 77 /* control type: command, callback function: cb_onEstimateN */ -#define PANEL_INVERT_SLOPE_SIGN 78 /* control type: radioButton, callback function: CB_InvertSlopeSign */ -#define PANEL_RECENTER 79 /* control type: LED, callback function: CB_RecenterEnable */ -#define PANEL_MEASURE_SLOPE 80 /* control type: LED, callback function: CB_MeasureSlope */ -#define PANEL_SLOPE_MEASURED 81 /* control type: numeric, callback function: (none) */ -#define PANEL_RESET_DEDRIFT_DDS 82 /* control type: command, callback function: CB_ResetDedriftDDS */ -#define PANEL_SAVE_RAW 83 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_SHOWLOG 84 /* control type: radioButton, callback function: CB_ShowLog */ -#define PANEL_SLOPEX2 85 /* control type: radioButton, callback function: CB_SlopeX2 */ -#define PANEL_SAVE_DDS 86 /* control type: radioButton, callback function: CB_SaveData */ -#define PANEL_DECORATION_2 87 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_8 88 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION 89 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_3 90 /* control type: deco, callback function: (none) */ -#define PANEL_TEXTMSG_6 91 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_22 92 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_21 93 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_7 94 /* control type: textMsg, callback function: (none) */ -#define PANEL_DECORATION_4 95 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_7 96 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_6 97 /* control type: deco, callback function: (none) */ -#define PANEL_DECORATION_5 98 /* control type: deco, callback function: (none) */ -#define PANEL_TEXTMSG_20 99 /* control type: textMsg, callback function: (none) */ -#define PANEL_TEXTMSG_19 100 /* control type: textMsg, callback function: (none) */ -#define PANEL_MATH4 101 /* control type: string, callback function: (none) */ -#define PANEL_MATH5 102 /* control type: string, callback function: (none) */ -#define PANEL_MATH3 103 /* control type: string, callback function: (none) */ -#define PANEL_MATH2 104 /* control type: string, callback function: (none) */ -#define PANEL_MATH1 105 /* control type: string, callback function: (none) */ -#define PANEL_RECENTER_SR 106 /* control type: radioButton, callback function: CB_RecenterChannel */ -#define PANEL_RECENTER_HG 107 /* control type: radioButton, callback function: CB_RecenterChannel */ -#define PANEL_RECENTER_LO 108 /* control type: radioButton, callback function: CB_RecenterChannel */ -#define PANEL_ERROR 109 /* control type: LED, callback function: CB_ShowError */ +#define PANEL_DEDRIFT_PROPORTIONAL 78 /* control type: radioButton, callback function: CB_OnDedriftSettingsChange */ +#define PANEL_DEDRIFT_INVERT_SIGN 79 /* control type: radioButton, callback function: CB_InvertSlopeSign */ +#define PANEL_RECENTER 80 /* control type: LED, callback function: CB_RecenterEnable */ +#define PANEL_MEASURE_SLOPE 81 /* control type: LED, callback function: CB_MeasureSlope */ +#define PANEL_SLOPE_MEASURED 82 /* control type: numeric, callback function: (none) */ +#define PANEL_RESET_DEDRIFT_DDS 83 /* control type: command, callback function: CB_ResetDedriftDDS */ +#define PANEL_SAVE_RAW 84 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_SHOWLOG 85 /* control type: radioButton, callback function: CB_ShowLog */ +#define PANEL_DEDRIFT_DOUBLE_CORR 86 /* control type: radioButton, callback function: CB_OnDedriftSettingsChange */ +#define PANEL_SAVE_DDS 87 /* control type: radioButton, callback function: CB_SaveData */ +#define PANEL_DECORATION_2 88 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_8 89 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION 90 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_3 91 /* control type: deco, callback function: (none) */ +#define PANEL_TEXTMSG_6 92 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_22 93 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_21 94 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_7 95 /* control type: textMsg, callback function: (none) */ +#define PANEL_DECORATION_4 96 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_7 97 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_6 98 /* control type: deco, callback function: (none) */ +#define PANEL_DECORATION_5 99 /* control type: deco, callback function: (none) */ +#define PANEL_TEXTMSG_20 100 /* control type: textMsg, callback function: (none) */ +#define PANEL_TEXTMSG_19 101 /* control type: textMsg, callback function: (none) */ +#define PANEL_MATH4 102 /* control type: string, callback function: (none) */ +#define PANEL_MATH5 103 /* control type: string, callback function: (none) */ +#define PANEL_MATH3 104 /* control type: string, callback function: (none) */ +#define PANEL_MATH2 105 /* control type: string, callback function: (none) */ +#define PANEL_MATH1 106 /* control type: string, callback function: (none) */ +#define PANEL_RECENTER_SR 107 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_HG 108 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_RECENTER_LO 109 /* control type: radioButton, callback function: CB_RecenterChannel */ +#define PANEL_ERROR 110 /* control type: LED, callback function: CB_ShowError */ /* Control Arrays: */ @@ -174,7 +175,7 @@ int CVICALLBACK CB_OnAcceptN(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnAllanPlot(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_OnChangeNdiv(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK CB_OnCROX(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); +int CVICALLBACK CB_OnDedriftSettingsChange(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK cb_onEstimateN(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK cb_onEstimateNChange(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK cb_onEstimateNClose(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -201,7 +202,6 @@ int CVICALLBACK CB_SetSlope(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ShowError(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_ShowLog(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); -int CVICALLBACK CB_SlopeX2(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_SrDatalogger(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);