From c3800747e09987b95b3bd03e779707b5a93ef28d Mon Sep 17 00:00:00 2001 From: Kerry Wang Date: Fri, 8 Apr 2022 15:41:47 -0400 Subject: [PATCH] initialize new analog cell fcn to 1 instead of 0 --- .gitignore | 1 + GUIDesign.c | 11 ++++++ GUIDesign.cds | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ GUIDesign.prj | 20 +++++----- 4 files changed, 124 insertions(+), 10 deletions(-) create mode 100644 GUIDesign.cds diff --git a/.gitignore b/.gitignore index f4c3002..b7236e2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ # LabWindows build files cvibuild.GUIDesign/ +cvidistkit.adwinGUI Save Converter *.exe # LabWindows workspace diff --git a/GUIDesign.c b/GUIDesign.c index bbb4f5f..92ec52b 100644 --- a/GUIDesign.c +++ b/GUIDesign.c @@ -783,6 +783,17 @@ void SaveArrays(char savedname[500], int csize) } struct AnalogTableValues NewAnalogTable[21][41][15] = {0}; + // initialize fcn to 1 + for (int i = 0; i < 21; i++) + { + for (int j = 0; j < 41; j ++) + { + for (int k = 0; k < 15; k++) + { + NewAnalogTable[i][j][k].fcn = 1; + } + } + } for (int col = 0; col < NUMBEROFCOLUMNS + 1; col++) { for (int channel = 0; channel < NUMBERANALOGCHANNELS + 1; channel++) diff --git a/GUIDesign.cds b/GUIDesign.cds new file mode 100644 index 0000000..016b76a --- /dev/null +++ b/GUIDesign.cds @@ -0,0 +1,102 @@ + + + + workspacedir + + + workspacedir + + + + + + + + + + + + + + + + + 1 + + + + + + + + + activeXsup + + false + false + + install.exe + + MINOS_WIN7_SP1 + + true + silent + merge + false + msgrte.txt + false + + + + + + + {07298686-C518-4981-9AE1-6E62273BF43A} + {0FFFDCED-4232-4312-BBDB-179F9FDAB7EA} + {10C707D2-DE6B-4908-8FD5-C3ACC763C12C} + {192594FE-5397-4F45-8137-A5C487CE3849} + {1C79B8BD-F5F8-4825-8BC8-78098A726AE1} + {28B285EA-90C8-4C3A-94C0-B0196A3FEF07} + {39CB13EF-8677-4FF8-942D-20021AFD7AB6} + {3F36AC37-CC28-4780-AF19-D80ACEDE0323} + {41BDEA25-514E-4BDA-AC47-186E97C9D3F7} + {43C6873A-8548-4944-AF22-8B1C3312A070} + {4C351C60-5ECC-4920-AEB6-DFE60EA14283} + {539F08CF-F2FD-482C-A5ED-65FD2620789D} + {62418E99-C730-4D5D-96B2-B4DDB810A652} + {64ECB814-3A6A-4E48-9D2F-D6C2EDD725B7} + {655826D6-553F-4DD9-A3D4-BA853FC88F77} + {67CFC7DD-BF77-4D45-9AE9-742AA8658AE7} + {69586F66-56DA-43BD-BB8E-A6DAE9A4DF6D} + {7B66645D-2C18-4DB8-8D3B-A783E386708E} + {866E5D39-AB76-4536-B1CA-554BC66A1900} + {88DFF01E-7C87-4E35-B194-CB7A2E32FA6D} + {9905478F-5785-468A-A35A-D84325D61EB8} + {A12FB799-41BF-4A9A-98F2-2FE4F333B718} + {A59D9F6E-27DE-410C-9820-9D844DC78D05} + {AFC999BB-F270-46EF-B748-AE755EC75322} + {B524884D-C3AC-417A-939E-34A16118A14C} + {C0A9F5E2-DCD5-44C1-8B03-C560F4C06D6C} + {C1771155-665A-4C7F-B85D-D4AACF786223} + {C18DA001-CF46-48A5-8DDB-322EA6DBFB4F} + {D8F71C3E-C0AE-4D69-920E-7D927C950A1A} + {DCCB918E-584B-4FAF-BDA4-EF5A7B90C4C1} + {E0FBECD8-D116-47B8-8839-AA2A039EBD46} + {EDEDDCAE-21E6-4A82-9B58-8E6337386685} + {EFC648C5-F3BC-4096-9AFE-23121EF06828} + {F2EEE63A-0DCA-41BF-A243-4E4C0DFA38A4} + + + + + 0.000000000000000 + 0.236136500000055 + 1.048632750000081 + 2.158680000000013 + 7.846131249999992 + 10.833714000000079 + 151.620297749999963 + + diff --git a/GUIDesign.prj b/GUIDesign.prj index 98833e8..542ec63 100644 --- a/GUIDesign.prj +++ b/GUIDesign.prj @@ -323,21 +323,21 @@ Comments = "" Comments Ex = "" Company Name = "U of T" Company Name Ex = "U of T" -File Description = "GUIDesign (Release x86)" +File Description = "convert (Release x86)" File Description Ex = "%application (%rel_dbg %arch)" File Version = "1.0.2.3" File Version Ex = "1.0.2.3" -Internal Name = "GUIDesign" +Internal Name = "convert" Internal Name Ex = "%basename" Legal Copyright = "Copyright © U of T, 2004" Legal Copyright Ex = "Copyright © U of T, 2004" Legal Trademarks = "" Legal Trademarks Ex = "" -Original Filename = "GUIDesign.exe" +Original Filename = "convert.exe" Original Filename Ex = "%filename" Private Build = "" Private Build Ex = "" -Product Name = "Dept. of Physics, College of William and Mary GUIDesign" +Product Name = "Dept. of Physics, College of William and Mary convert" Product Name Ex = "%company %application" Product Version = "10.2.3" Product Version Ex = "10.2.3" @@ -562,8 +562,8 @@ Executable File_Debug Rel Path = "GUIDesign_dbg.exe" Executable File_Debug = "/c/Users/labadmin/Desktop/adwinGUI/GUIDesign_dbg.exe" Executable File_Release Is Rel = True Executable File_Release Rel To = "Project" -Executable File_Release Rel Path = "GUIDesign.exe" -Executable File_Release = "/c/Users/labadmin/Desktop/adwinGUI/GUIDesign.exe" +Executable File_Release Rel Path = "convert.exe" +Executable File_Release = "/c/Users/labadmin/Desktop/adwinGUI/convert.exe" Executable File_Debug64 Is Rel = True Executable File_Debug64 Rel To = "Project" Executable File_Debug64 Rel Path = "GUIDesign.exe" @@ -581,21 +581,21 @@ Comments = "" Comments Ex = "" Company Name = "U of T" Company Name Ex = "U of T" -File Description = "GUIDesign (Release x86)" +File Description = "convert (Release x86)" File Description Ex = "%application (%rel_dbg %arch)" File Version = "1.0.2.3" File Version Ex = "1.0.2.3" -Internal Name = "GUIDesign" +Internal Name = "convert" Internal Name Ex = "%basename" Legal Copyright = "Copyright © U of T, 2004" Legal Copyright Ex = "Copyright © U of T, 2004" Legal Trademarks = "" Legal Trademarks Ex = "" -Original Filename = "GUIDesign.exe" +Original Filename = "convert.exe" Original Filename Ex = "%filename" Private Build = "" Private Build Ex = "" -Product Name = "Dept. of Physics, College of William and Mary GUIDesign" +Product Name = "Dept. of Physics, College of William and Mary convert" Product Name Ex = "%company %application" Product Version = "10.2.3" Product Version Ex = "10.2.3"