From d08f6036c9f018c52fdd2978db8fb02f36b025a8 Mon Sep 17 00:00:00 2001 From: Kerry Wang Date: Fri, 24 Sep 2021 12:55:48 -0400 Subject: [PATCH] Removed nonfunctional code --- GUIDesign.c | 54 ++--------- GUIDesign.h | 256 +++++++++++++++++++++++++------------------------- GUIDesign.uir | Bin 121688 -> 121420 bytes 3 files changed, 138 insertions(+), 172 deletions(-) diff --git a/GUIDesign.c b/GUIDesign.c index 6d36384..8a58348 100644 --- a/GUIDesign.c +++ b/GUIDesign.c @@ -726,28 +726,6 @@ void BuildUpdateList(double TMatrix[], struct AnalogTableValues AMat[NUMBERANALO ResetToZeroAtEnd[i - 1] = AChName[i].resettozero; // printf("Analog Chn = %d, Reset-to-zero = %d \n", i, ResetToZeroAtEnd[i-1]); } - digchannelsum = 0; - for (int i = 1; i <= 16; i++) - { - if (DChName[i].resettolow == TRUE) - { - digchannelsum += 2 ^ (i - 1); - } - } - // ResetToZeroAtEnd[101]=digchannelsum;// lower 16 digital channels - digchannelsum = 0; - for (int i = 17; i <= NUMBERDIGITALCHANNELS; i++) - { - if (DChName[i].resettolow == TRUE) - { - digchannelsum += 2 ^ (i - 17); - } - } - // ResetToZeroAtEnd[102]=digchannelsum;// digital channels 17-24 - //ResetToZeroAtEnd[25]=0;// lower 16 digital channels - //ResetToZeroAtEnd[26]=0;// digital channels 17-24 - // ResetToZeroAtEnd[27]=0;// master override....if ==1 then reset none - // if(checkresettozero==0) { ResetToZeroAtEnd[27]=1;} SetData_Long(4, ResetToZeroAtEnd, 1, NUMBERANALOGCHANNELS); // done evaluating channels that are reset to zero (low) @@ -759,8 +737,6 @@ void BuildUpdateList(double TMatrix[], struct AnalogTableValues AMat[NUMBERANALO // more debug info tstop = clock(); timeused = tstop - tstart; - t = Start_Process(processnum); - tstop = clock(); sprintf(buff, "Time to transfer and start ADwin: %d", timeused); GetMenuBarAttribute(menuHandle, MENU_PREFS_STREAM_SETTINGS, ATTR_CHECKED, &StreamSettings); @@ -865,13 +841,10 @@ void OptimizeTimeLoop(int *UpdateNum, int count, int *newcount) // This routine compresses the updatenum list by replacing long strings of 0 with a single line. // i.e. if we see 2000 zero's in a row, just write -2000 instead. - int i = 0, k = 0; // i is the counter through the original UpdateNum list - int j = 0; // t is the counter through the NewUpdateNum list - int t = 0; + int i = 1; // i is the counter through the original UpdateNum list + int t = 1; // t is the counter through the NewUpdateNum list int LowZeroThreshold, HighZeroThreshold; int numberofzeros; - i = 1; - t = 1; LowZeroThreshold = 0; // minimum number of consecutive zero's to encounter before optimizing HighZeroThreshold = 100000; // maximum number of consecutive zero's to optimize // We do not want to exceed the counter on the ADwin @@ -886,7 +859,7 @@ void OptimizeTimeLoop(int *UpdateNum, int count, int *newcount) } else // found a 0 { // now we need to scan to find the # of zeros - j = 1; + int j = 1; while (((i + j) < (count + 1)) && (UpdateNum[i + j] == 0)) { j++; @@ -896,7 +869,7 @@ void OptimizeTimeLoop(int *UpdateNum, int count, int *newcount) numberofzeros = j; if (numberofzeros <= LowZeroThreshold) { - for (k = 1; k <= numberofzeros; k++) + for (int k = 1; k <= numberofzeros; k++) { UpdateNum[t] = 0; t++; @@ -2276,15 +2249,7 @@ void CVICALLBACK BOOTADWIN_CALLBACK(int menuBar, int menuItem, void *callbackDat Boot("C:\\ADWIN\\ADWIN11.BTL", 0); processnum = Load_Process("TransferData_May25_2012.TB1"); //Updated May 25, 2012 - Seth Aubin } -//********************************************************************************************************* -void CVICALLBACK BOOTLOAD_CALLBACK(int menuBar, int menuItem, void *callbackData, - int panel) -{ - int ischecked = 0; - GetMenuBarAttribute(menuHandle, MENU_FILE_BOOTLOAD, ATTR_CHECKED, &ischecked); - SetMenuBarAttribute(menuHandle, MENU_FILE_BOOTLOAD, ATTR_CHECKED, abs(ischecked - 1)); -} //********************************************************************************************** void CVICALLBACK CLEARPANEL_CALLBACK(int menuBar, int menuItem, void *callbackData, int panel) @@ -2998,9 +2963,9 @@ void CVICALLBACK RESETZERO_CALLBACK(int int menuItem, void *callbackData, int panel) { - int ischecked = 0; - GetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, &ischecked); - SetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, abs(ischecked - 1)); + int checked = 0; + GetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, &checked); + SetMenuBarAttribute(menuHandle, MENU_SETTINGS_RESETZERO, ATTR_CHECKED, abs(checked - 1)); } //*********************************************************************************************** void SaveLastGuiSettings(void) @@ -3270,10 +3235,9 @@ void CVICALLBACK SHOWARRAY_CALLBACK(int menuBar, int menuItem, void *callbackDat void CVICALLBACK DDS_OFF_CALLBACK(int menuBar, int menuItem, void *callbackData, int panel) { - int i = 0, j = 0; - for (j = 0; j < NUMBEROFPAGES; j++) + for (int j = 0; j < NUMBEROFPAGES; j++) { - for (i = 0; i < NUMBEROFCOLUMNS; i++) + for (int i = 0; i < NUMBEROFCOLUMNS; i++) { ddstable[i][j].is_stop = TRUE; } diff --git a/GUIDesign.h b/GUIDesign.h index 13d29e9..03dfbb0 100644 --- a/GUIDesign.h +++ b/GUIDesign.h @@ -1,6 +1,5 @@ /**************************************************************************/ /* LabWindows/CVI User Interface Resource (UIR) Include File */ -/* Copyright (c) National Instruments 2006. All Rights Reserved. */ /* */ /* WARNING: Do not add to, delete from, or otherwise modify the contents */ /* of this include file. */ @@ -14,139 +13,142 @@ /* Panels and Controls: */ -#define PANEL 1 -#define PANEL_CHECKBOX_10 2 -#define PANEL_CHECKBOX_9 3 -#define PANEL_CHECKBOX_8 4 -#define PANEL_CHECKBOX_7 5 -#define PANEL_CHECKBOX_6 6 -#define PANEL_CHECKBOX_5 7 -#define PANEL_CHECKBOX_4 8 -#define PANEL_CHECKBOX_3 9 -#define PANEL_CHECKBOX_2 10 -#define PANEL_CHECKBOX 11 -#define PANEL_LABEL_6 12 -#define PANEL_LABEL_7 13 -#define PANEL_LABEL_8 14 -#define PANEL_LABEL_9 15 -#define PANEL_LABEL_5 16 -#define PANEL_LABEL_4 17 -#define PANEL_LABEL_3 18 -#define PANEL_LABEL_2 19 -#define PANEL_LABEL_1 20 -#define PANEL_LABEL_10 21 -#define PANEL_TIMETABLE 22 /* callback function: TIMETABLE_CALLBACK */ -#define PANEL_ANALOGTABLE 23 /* callback function: ANALOGTABLE_CALLBACK */ -#define PANEL_TB_SHOWPHASE10 24 /* callback function: TOGGLE10_CALLBACK */ -#define PANEL_TB_SHOWPHASE9 25 /* callback function: TOGGLE9_CALLBACK */ -#define PANEL_DIGTABLE 26 /* callback function: DIGTABLE_CALLBACK */ -#define PANEL_TB_SHOWPHASE8 27 /* callback function: TOGGLE8_CALLBACK */ -#define PANEL_TB_SHOWPHASE7 28 /* callback function: TOGGLE7_CALLBACK */ -#define PANEL_TB_SHOWPHASE6 29 /* callback function: TOGGLE6_CALLBACK */ -#define PANEL_TB_SHOWPHASE5 30 /* callback function: TOGGLE5_CALLBACK */ -#define PANEL_TB_SHOWPHASE4 31 /* callback function: TOGGLE4_CALLBACK */ -#define PANEL_TB_SHOWPHASE3 32 /* callback function: TOGGLE3_CALLBACK */ -#define PANEL_TB_SHOWPHASE2 33 /* callback function: TOGGLE2_CALLBACK */ -#define PANEL_TB_SHOWPHASE1 34 /* callback function: TOGGLE1_CALLBACK */ -#define PANEL_CMD_SCAN 35 /* callback function: CMD_SCAN_CALLBACK */ -#define PANEL_CMD_RUN 36 /* callback function: CMD_RUN_CALLBACK */ -#define PANEL_DEBUG 37 -#define PANEL_TOGGLEREPEAT 38 -#define PANEL_CMDSTOP 39 /* callback function: CMDSTOP_CALLBACK */ -#define PANEL_TGL_NUMERICTABLE 40 /* callback function: TGLNUMERIC_CALLBACK */ -#define PANEL_DISPLAYDIAL 41 /* callback function: DISPLAYDIAL_CALLBACK */ -#define PANEL_TBL_ANALOGUNITS 42 -#define PANEL_TBL_DIGNAMES 43 -#define PANEL_TBL_ANAMES 44 -#define PANEL_TIMER 45 /* callback function: TIMER_CALLBACK */ -#define PANEL_NUM_INSERTIONCOL 46 /* callback function: NUM_INSERTIONCOL_CALLBACK */ -#define PANEL_NUM_INSERTIONPAGE 47 /* callback function: NUM_INSERTIONPAGE_CALLBACK */ -#define PANEL_NUM_DDS3_OFFSET 48 -#define PANEL_NUM_DDS2_OFFSET 49 -#define PANEL_NUM_DDS_OFFSET 50 -#define PANEL_SCAN_TABLE 51 -#define PANEL_CANVAS_END 52 -#define PANEL_CANVAS_START 53 -#define PANEL_DECORATION 54 -#define PANEL_NUM_LOOP_REPS 55 -#define PANEL_NUM_LOOPCOL2 56 -#define PANEL_NUM_LOOPPAGE2 57 -#define PANEL_NUM_LOOPCOL1 58 -#define PANEL_NUM_LOOPPAGE1 59 -#define PANEL_SWITCH_LOOP 60 /* callback function: SWITCH_LOOP_CALLBACK */ -#define PANEL_DECORATION_2 61 -#define PANEL_CANVAS_LOOPLINE 62 -#define PANEL_Looping 63 - -#define SUBPANEL1 2 -#define SUBPANEL1_TEXTBOX 2 - -#define SUBPANEL2 3 -#define SUBPANEL2_NUM_SCANITER 2 -#define SUBPANEL2_NUM_SCANSTEP 3 -#define SUBPANEL2_NUM_SCANVAL 4 +#define PANEL 1 +#define PANEL_CHECKBOX_10 2 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_9 3 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_8 4 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_7 5 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_6 6 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_5 7 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_4 8 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_3 9 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX_2 10 /* control type: radioButton, callback function: (none) */ +#define PANEL_CHECKBOX 11 /* control type: radioButton, callback function: (none) */ +#define PANEL_LABEL_6 12 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_7 13 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_8 14 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_9 15 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_5 16 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_4 17 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_3 18 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_2 19 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_1 20 /* control type: table, callback function: (none) */ +#define PANEL_LABEL_10 21 /* control type: table, callback function: (none) */ +#define PANEL_TIMETABLE 22 /* control type: table, callback function: TIMETABLE_CALLBACK */ +#define PANEL_ANALOGTABLE 23 /* control type: table, callback function: ANALOGTABLE_CALLBACK */ +#define PANEL_TB_SHOWPHASE10 24 /* control type: textButton, callback function: TOGGLE10_CALLBACK */ +#define PANEL_TB_SHOWPHASE9 25 /* control type: textButton, callback function: TOGGLE9_CALLBACK */ +#define PANEL_DIGTABLE 26 /* control type: table, callback function: DIGTABLE_CALLBACK */ +#define PANEL_TB_SHOWPHASE8 27 /* control type: textButton, callback function: TOGGLE8_CALLBACK */ +#define PANEL_TB_SHOWPHASE7 28 /* control type: textButton, callback function: TOGGLE7_CALLBACK */ +#define PANEL_TB_SHOWPHASE6 29 /* control type: textButton, callback function: TOGGLE6_CALLBACK */ +#define PANEL_TB_SHOWPHASE5 30 /* control type: textButton, callback function: TOGGLE5_CALLBACK */ +#define PANEL_TB_SHOWPHASE4 31 /* control type: textButton, callback function: TOGGLE4_CALLBACK */ +#define PANEL_TB_SHOWPHASE3 32 /* control type: textButton, callback function: TOGGLE3_CALLBACK */ +#define PANEL_TB_SHOWPHASE2 33 /* control type: textButton, callback function: TOGGLE2_CALLBACK */ +#define PANEL_TB_SHOWPHASE1 34 /* control type: textButton, callback function: TOGGLE1_CALLBACK */ +#define PANEL_CMD_SCAN 35 /* control type: command, callback function: CMD_SCAN_CALLBACK */ +#define PANEL_CMD_RUN 36 /* control type: command, callback function: CMD_RUN_CALLBACK */ +#define PANEL_DEBUG 37 /* control type: listBox, callback function: (none) */ +#define PANEL_TOGGLEREPEAT 38 /* control type: textButton, callback function: (none) */ +#define PANEL_CMDSTOP 39 /* control type: command, callback function: CMDSTOP_CALLBACK */ +#define PANEL_TGL_NUMERICTABLE 40 /* control type: textButton, callback function: TGLNUMERIC_CALLBACK */ +#define PANEL_DISPLAYDIAL 41 /* control type: slide, callback function: DISPLAYDIAL_CALLBACK */ +#define PANEL_TBL_ANALOGUNITS 42 /* control type: table, callback function: (none) */ +#define PANEL_TBL_DIGNAMES 43 /* control type: table, callback function: (none) */ +#define PANEL_TBL_ANAMES 44 /* control type: table, callback function: (none) */ +#define PANEL_TIMER 45 /* control type: timer, callback function: TIMER_CALLBACK */ +#define PANEL_NUM_INSERTIONCOL 46 /* control type: numeric, callback function: NUM_INSERTIONCOL_CALLBACK */ +#define PANEL_NUM_INSERTIONPAGE 47 /* control type: numeric, callback function: NUM_INSERTIONPAGE_CALLBACK */ +#define PANEL_NUM_DDS3_OFFSET 48 /* control type: numeric, callback function: (none) */ +#define PANEL_NUM_DDS2_OFFSET 49 /* control type: numeric, callback function: (none) */ +#define PANEL_NUM_DDS_OFFSET 50 /* control type: numeric, callback function: (none) */ +#define PANEL_SCAN_TABLE 51 /* control type: table, callback function: (none) */ +#define PANEL_CANVAS_END 52 /* control type: canvas, callback function: (none) */ +#define PANEL_CANVAS_START 53 /* control type: canvas, callback function: (none) */ +#define PANEL_DECORATION 54 /* control type: deco, callback function: (none) */ +#define PANEL_NUM_LOOP_REPS 55 /* control type: numeric, callback function: (none) */ +#define PANEL_NUM_LOOPCOL2 56 /* control type: numeric, callback function: (none) */ +#define PANEL_NUM_LOOPPAGE2 57 /* control type: numeric, callback function: (none) */ +#define PANEL_NUM_LOOPCOL1 58 /* control type: numeric, callback function: (none) */ +#define PANEL_NUM_LOOPPAGE1 59 /* control type: numeric, callback function: (none) */ +#define PANEL_SWITCH_LOOP 60 /* control type: binary, callback function: SWITCH_LOOP_CALLBACK */ +#define PANEL_DECORATION_2 61 /* control type: deco, callback function: (none) */ +#define PANEL_CANVAS_LOOPLINE 62 /* control type: canvas, callback function: (none) */ +#define PANEL_Looping 63 /* control type: textMsg, callback function: (none) */ + +#define SUBPANEL1 2 +#define SUBPANEL1_TEXTBOX 2 /* control type: textBox, callback function: (none) */ + +#define SUBPANEL2 3 +#define SUBPANEL2_NUM_SCANITER 2 /* control type: numeric, callback function: (none) */ +#define SUBPANEL2_NUM_SCANSTEP 3 /* control type: numeric, callback function: (none) */ +#define SUBPANEL2_NUM_SCANVAL 4 /* control type: numeric, callback function: (none) */ + + + /* Control Arrays: */ + + /* (no control arrays in the resource file) */ /* Menu Bars, Menus, and Menu Items: */ -#define MENU 1 -#define MENU_FILE 2 -#define MENU_FILE_LOADSET 3 /* callback function: MENU_CALLBACK */ -#define MENU_FILE_SAVESET 4 /* callback function: MENU_CALLBACK */ -#define MENU_FILE_BOOTLOAD 5 /* callback function: BOOTLOAD_CALLBACK */ -#define MENU_FILE_MENU_EXPORT_CHANNEL 6 /* callback function: CONFIG_EXPORT_CALLBACK */ -#define MENU_FILE_MENU_EXPORT_PANEL 7 /* callback function: EXPORT_PANEL_CALLBACK */ -#define MENU_FILE_QuitCallback 8 /* callback function: EXIT */ -#define MENU_SETTINGS 9 -#define MENU_SETTINGS_ANALOG 10 /* callback function: ANALOGSET_CALLBACK */ -#define MENU_SETTINGS_DIGITAL 11 /* callback function: DIGITALSET_CALLBACK */ -#define MENU_SETTINGS_DDSSETUP 12 /* callback function: DDSSETUP_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT 13 -#define MENU_SETTINGS_CONTROLTEXT_SUBMEN 14 -#define MENU_SETTINGS_CONTROLTEXT_TITLE1 15 /* callback function: TITLE1_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE2 16 /* callback function: TITLE2_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE3 17 /* callback function: TITLE3_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE4 18 /* callback function: TITLE4_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE5 19 /* callback function: TITLE5_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE6 20 /* callback function: TITLE6_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE7 21 /* callback function: TITLE7_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE8 22 /* callback function: TITLE8_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLE9 23 /* callback function: TITLE9_CALLBACK */ -#define MENU_SETTINGS_CONTROLTEXT_TITLEX 24 /* callback function: TITLEX_CALLBACK */ -#define MENU_SETTINGS_DEBUG 25 /* callback function: MENU_DEBUG_CALLBACK */ -#define MENU_SETTINGS_BOOTADWIN 26 /* callback function: BOOTADWIN_CALLBACK */ -#define MENU_SETTINGS_CLEARPANEL 27 /* callback function: CLEARPANEL_CALLBACK */ -#define MENU_SETTINGS_RESETZERO 28 /* callback function: RESETZERO_CALLBACK */ -#define MENU_SETTINGS_RESETZERO_SUBMENU 29 -#define MENU_SETTINGS_RESETZERO_SETLOW 30 /* callback function: MENU_ALLLOW_CALLBACK */ -#define MENU_SETTINGS_RESETZERO_HOLD 31 /* callback function: MENU_HOLD_CALLBACK */ -#define MENU_SETTINGS_RESETZERO_BYCHNL 32 /* callback function: MENU_BYCHANNEL_CALLBACK */ -#define MENU_SETTINGS_SCANSETTING 33 /* callback function: SCANSETTING_CALLBACK */ -#define MENU_SETTINGS_NOTECHECK 34 /* callback function: NOTECHECK_CALLBACK */ -#define MENU_EDITMATRIX 35 -#define MENU_EDITMATRIX_INSERTCOLUMN 36 /* callback function: INSERTCOLUMN_CALLBACK */ -#define MENU_EDITMATRIX_DELETECOLUMN 37 /* callback function: DELETECOLUMN_CALLBACK */ -#define MENU_EDITMATRIX_COPYCOLUMN 38 /* callback function: COPYCOLUMN_CALLBACK */ -#define MENU_EDITMATRIX_PASTECOLUMN 39 /* callback function: PASTECOLUMN_CALLBACK */ -#define MENU_UPDATEPERIOD 40 -#define MENU_UPDATEPERIOD_SETGD5 41 /* callback function: SETGD5_CALLBACK */ -#define MENU_UPDATEPERIOD_SETGD10 42 /* callback function: SETGD10_CALLBACK */ -#define MENU_UPDATEPERIOD_SETGD100 43 /* callback function: SETGD100_CALLBACK */ -#define MENU_UPDATEPERIOD_SETGD1000 44 /* callback function: SETGD1000_CALLBACK */ -#define MENU_PREFS 45 -#define MENU_PREFS_COMPRESSION 46 /* callback function: COMPRESSION_CALLBACK */ -#define MENU_PREFS_SIMPLETIMING 47 /* callback function: SIMPLETIMING_CALLBACK */ -#define MENU_PREFS_SHOWARRAY 48 /* callback function: SHOWARRAY_CALLBACK */ -#define MENU_PREFS_DDS_OFF 49 /* callback function: DDS_OFF_CALLBACK */ -#define MENU_PREFS_STREAM_SETTINGS 50 /* callback function: STREAM_CALLBACK */ - - - /* Callback Prototypes: */ +#define MENU 1 +#define MENU_FILE 2 +#define MENU_FILE_LOADSET 3 /* callback function: MENU_CALLBACK */ +#define MENU_FILE_SAVESET 4 /* callback function: MENU_CALLBACK */ +#define MENU_FILE_MENU_EXPORT_CHANNEL 5 /* callback function: CONFIG_EXPORT_CALLBACK */ +#define MENU_FILE_MENU_EXPORT_PANEL 6 /* callback function: EXPORT_PANEL_CALLBACK */ +#define MENU_FILE_QuitCallback 7 /* callback function: EXIT */ +#define MENU_SETTINGS 8 +#define MENU_SETTINGS_ANALOG 9 /* callback function: ANALOGSET_CALLBACK */ +#define MENU_SETTINGS_DIGITAL 10 /* callback function: DIGITALSET_CALLBACK */ +#define MENU_SETTINGS_DDSSETUP 11 /* callback function: DDSSETUP_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT 12 +#define MENU_SETTINGS_CONTROLTEXT_SUBMENU 13 +#define MENU_SETTINGS_CONTROLTEXT_TITLE1 14 /* callback function: TITLE1_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE2 15 /* callback function: TITLE2_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE3 16 /* callback function: TITLE3_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE4 17 /* callback function: TITLE4_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE5 18 /* callback function: TITLE5_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE6 19 /* callback function: TITLE6_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE7 20 /* callback function: TITLE7_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE8 21 /* callback function: TITLE8_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLE9 22 /* callback function: TITLE9_CALLBACK */ +#define MENU_SETTINGS_CONTROLTEXT_TITLEX 23 /* callback function: TITLEX_CALLBACK */ +#define MENU_SETTINGS_DEBUG 24 /* callback function: MENU_DEBUG_CALLBACK */ +#define MENU_SETTINGS_BOOTADWIN 25 /* callback function: BOOTADWIN_CALLBACK */ +#define MENU_SETTINGS_CLEARPANEL 26 /* callback function: CLEARPANEL_CALLBACK */ +#define MENU_SETTINGS_RESETZERO 27 /* callback function: RESETZERO_CALLBACK */ +#define MENU_SETTINGS_RESETZERO_SUBMENU 28 +#define MENU_SETTINGS_RESETZERO_SETLOW 29 /* callback function: MENU_ALLLOW_CALLBACK */ +#define MENU_SETTINGS_RESETZERO_HOLD 30 /* callback function: MENU_HOLD_CALLBACK */ +#define MENU_SETTINGS_RESETZERO_BYCHNL 31 /* callback function: MENU_BYCHANNEL_CALLBACK */ +#define MENU_SETTINGS_SCANSETTING 32 /* callback function: SCANSETTING_CALLBACK */ +#define MENU_SETTINGS_NOTECHECK 33 /* callback function: NOTECHECK_CALLBACK */ +#define MENU_EDITMATRIX 34 +#define MENU_EDITMATRIX_INSERTCOLUMN 35 /* callback function: INSERTCOLUMN_CALLBACK */ +#define MENU_EDITMATRIX_DELETECOLUMN 36 /* callback function: DELETECOLUMN_CALLBACK */ +#define MENU_EDITMATRIX_COPYCOLUMN 37 /* callback function: COPYCOLUMN_CALLBACK */ +#define MENU_EDITMATRIX_PASTECOLUMN 38 /* callback function: PASTECOLUMN_CALLBACK */ +#define MENU_UPDATEPERIOD 39 +#define MENU_UPDATEPERIOD_SETGD5 40 /* callback function: SETGD5_CALLBACK */ +#define MENU_UPDATEPERIOD_SETGD10 41 /* callback function: SETGD10_CALLBACK */ +#define MENU_UPDATEPERIOD_SETGD100 42 /* callback function: SETGD100_CALLBACK */ +#define MENU_UPDATEPERIOD_SETGD1000 43 /* callback function: SETGD1000_CALLBACK */ +#define MENU_PREFS 44 +#define MENU_PREFS_COMPRESSION 45 /* callback function: COMPRESSION_CALLBACK */ +#define MENU_PREFS_SIMPLETIMING 46 /* callback function: SIMPLETIMING_CALLBACK */ +#define MENU_PREFS_SHOWARRAY 47 /* callback function: SHOWARRAY_CALLBACK */ +#define MENU_PREFS_DDS_OFF 48 /* callback function: DDS_OFF_CALLBACK */ +#define MENU_PREFS_STREAM_SETTINGS 49 /* callback function: STREAM_CALLBACK */ + + + /* Callback Prototypes: */ void CVICALLBACK ANALOGSET_CALLBACK(int menubar, int menuItem, void *callbackData, int panel); int CVICALLBACK ANALOGTABLE_CALLBACK(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); void CVICALLBACK BOOTADWIN_CALLBACK(int menubar, int menuItem, void *callbackData, int panel); -void CVICALLBACK BOOTLOAD_CALLBACK(int menubar, int menuItem, void *callbackData, int panel); void CVICALLBACK CLEARPANEL_CALLBACK(int menubar, int menuItem, void *callbackData, int panel); int CVICALLBACK CMD_RUN_CALLBACK(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); int CVICALLBACK CMD_SCAN_CALLBACK(int panel, int control, int event, void *callbackData, int eventData1, int eventData2); @@ -209,4 +211,4 @@ int CVICALLBACK TOGGLE9_CALLBACK(int panel, int control, int event, void *callb #ifdef __cplusplus } -#endif +#endif \ No newline at end of file diff --git a/GUIDesign.uir b/GUIDesign.uir index 2a0e78e857c9c8464b8057f92b36411912b14255..71ffd15809fd28bf3105e9d2c556472829fd5027 100644 GIT binary patch delta 7406 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