Mercurial > hg > fxanalyse
diff FXAnalyse.h @ 199:111610d871af
Show error state in main user inteface panel
| author | Daniele Nicolodi <daniele.nicolodi@obspm.fr> |
|---|---|
| date | Mon, 31 Mar 2014 17:03:37 +0200 |
| parents | d841dfb30b0b |
| children | fefe921a9784 |
line wrap: on
line diff
--- a/FXAnalyse.h Mon Mar 31 17:03:37 2014 +0200 +++ b/FXAnalyse.h Mon Mar 31 17:03:37 2014 +0200 @@ -96,51 +96,53 @@ #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_SIGN3 63 /* control type: numeric, callback function: CB_BeatnoteSign */ #define PANEL_FINDSIGN2 64 /* control type: command, callback function: CB_OnFindSign */ -#define PANEL_SIGN2 65 /* control type: numeric, callback function: (none) */ +#define PANEL_SIGN2 65 /* control type: numeric, callback function: CB_BeatnoteSign */ #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 */ +#define PANEL_SIGN1 67 /* control type: numeric, callback function: CB_BeatnoteSign */ +#define PANEL_FIND10K3_2 68 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND10K3 69 /* control type: command, callback function: CB_OnFind275K */ +#define PANEL_FIND275K2 70 /* control type: command, callback function: CB_OnFind275K */ +#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_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 */ /* Control Arrays: */ @@ -155,6 +157,7 @@ /* Callback Prototypes: */ +int CVICALLBACK CB_BeatnoteSign(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); @@ -190,8 +193,8 @@ int CVICALLBACK CB_ResetDedriftDDS(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CB_SaveData(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 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_Sign3(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);