소스 검색

Exapasion 기능 개선/ ALL MULTI SET 기능 개선 /CRC 16 Function 추가

YJ 5 년 전
부모
커밋
5a3efe1057

BIN
.vs/Jdas_Mbic/v15/.suo


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-shm


BIN
.vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-wal


+ 170 - 0
Jdas_Mbic/Function/CRC16.cs

@@ -0,0 +1,170 @@
1
+using System;
2
+using System.Collections.Generic;
3
+using System.Linq;
4
+using System.Text;
5
+using System.Threading.Tasks;
6
+
7
+namespace Jdas_Mbic.Function
8
+{
9
+    class CRC16
10
+    {
11
+        enum Bluecell_CrcIndex_p
12
+        {
13
+            Bluecell_Header = 0,
14
+            Bluecell_Type,
15
+            Bluecell_Length,
16
+            Bluecell_CrcIndex,
17
+            Bluecell_data,
18
+        }
19
+
20
+        private readonly ushort[] Table_CRC16 = {
21
+            0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
22
+            0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
23
+            0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
24
+            0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
25
+            0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
26
+            0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
27
+            0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
28
+            0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
29
+            0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
30
+            0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
31
+            0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
32
+            0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
33
+            0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
34
+            0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
35
+            0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
36
+            0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
37
+            0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
38
+            0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
39
+            0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
40
+            0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
41
+            0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
42
+            0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
43
+            0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
44
+            0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
45
+            0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
46
+            0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
47
+            0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
48
+            0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
49
+            0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
50
+            0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
51
+            0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
52
+            0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
53
+        };
54
+        const int POLYNOMIAL = 0x131; // P(x) = x^8 + x^5 + x^4 + 1 = 100110001
55
+        public enum EtError
56
+        {
57
+            CHECKSUM_ERROR = 0,
58
+            NO_ERROR
59
+        }
60
+        //-----------------------------------------------
61
+        //UART CRC üũ �Լ�
62
+        //-----------------------------------------------
63
+        public ushort CRC16_Generate(byte[] buf_ptr, int len)
64
+        {
65
+            byte dt = 0;
66
+            ushort crc16 = 0;
67
+            ushort index = 4;
68
+            len *= 8;
69
+            for (crc16 = (ushort)0x0000; len >= 8; len -= 8)
70
+            {
71
+                crc16 = (ushort)(Table_CRC16[(crc16 >> 8) ^ (ushort)(buf_ptr[index++])] ^ (crc16 << 8));
72
+            }
73
+
74
+            if (len != 0)
75
+            {
76
+                dt = (byte)(buf_ptr[index] << 8);
77
+
78
+                while (len != 0)
79
+                {
80
+                    len--;
81
+
82
+                    if (((crc16 ^ dt) & ((ushort)1 << 15)) != 0)
83
+                    {
84
+                        crc16 = (ushort)(crc16 << 1);
85
+                        crc16 = (ushort)(crc16 ^ 0x1021);
86
+                    }
87
+                    else
88
+                    {
89
+                        crc16 = (ushort)(crc16 << 1);
90
+                    }
91
+                    dt = (byte)(dt << 1);
92
+                }
93
+            }
94
+            return (crc16);
95
+        }
96
+
97
+        public EtError CRC16_Check(byte[] buf_ptr, int len, ushort checksum)
98
+        {
99
+            byte dt = 0;
100
+            ushort crc16 = 0;
101
+            ushort index = 4;
102
+
103
+            len *= 8;
104
+            for (crc16 = (ushort)0x0000; len >= 8; len -= 8, index++)
105
+            {
106
+                crc16 = (ushort)(Table_CRC16[(crc16 >> 8) ^ (ushort)(buf_ptr[index])] ^ (crc16 << 8));
107
+            }
108
+
109
+            if (len != 0)
110
+            {
111
+                dt = (byte)(buf_ptr[index] << 8);
112
+
113
+                while (len != 0)
114
+                {
115
+                    len--;
116
+
117
+                    if (((crc16 ^ dt) & ((ushort)1 << 15)) != 0)
118
+                    {
119
+                        crc16 = (ushort)(crc16 << 1);
120
+                        crc16 = (ushort)(crc16 ^ 0x1021);
121
+                    }
122
+                    else
123
+                    {
124
+                        crc16 = (ushort)(crc16 << 1);
125
+                    }
126
+                    dt = (byte)(dt << 1);
127
+                }
128
+            }
129
+            return (crc16 == checksum ? EtError.CHECKSUM_ERROR : EtError.NO_ERROR);
130
+        }
131
+        public bool STH30_CheckCrc(byte[] data, byte nbrOfBytes, byte checksum)
132
+        {
133
+            byte bit;        // bit mask
134
+            int crc = 0xFF; // calculated checksum
135
+            byte byteCtr;    // byte counter
136
+            byte index = 1;
137
+
138
+            // calculates 8-Bit checksum with given polynomial
139
+            for (byteCtr = 0; byteCtr < nbrOfBytes; byteCtr++)
140
+            {
141
+                crc ^= (data[index++]);
142
+                for (bit = 8; bit > 0; --bit)
143
+                {
144
+                    if (Convert.ToBoolean(crc & 0x80)) { crc = (crc << 1) ^ POLYNOMIAL; }
145
+                    else crc = (crc << 1);
146
+                }
147
+            }
148
+            if (crc != checksum) return false;
149
+            else return true;
150
+        }
151
+        public byte STH30_CreateCrc(byte[] data, byte nbrOfBytes)
152
+        {
153
+            byte bit;        // bit mask
154
+            int crc = 0xFF; // calculated checksum
155
+            byte byteCtr;    // byte counter
156
+            byte index = (int)Bluecell_CrcIndex_p.Bluecell_Type;
157
+            // calculates 8-Bit checksum with given polynomial
158
+            for (byteCtr = 0; byteCtr < nbrOfBytes; byteCtr++)
159
+            {
160
+                crc ^= (data[index++]);
161
+                for (bit = 8; bit > 0; --bit)
162
+                {
163
+                    if (Convert.ToBoolean(crc & 0x80)) { crc = (crc << 1) ^ POLYNOMIAL; }
164
+                    else crc = (crc << 1);
165
+                }
166
+            }
167
+            return (byte)crc;
168
+        }
169
+    }
170
+}

+ 1 - 0
Jdas_Mbic/Jdas_Mbic.csproj

@@ -47,6 +47,7 @@
47 47
     <Reference Include="System.Xml" />
48 48
   </ItemGroup>
49 49
   <ItemGroup>
50
+    <Compile Include="Function\CRC16.cs" />
50 51
     <Compile Include="Main.cs">
51 52
       <SubType>Form</SubType>
52 53
     </Compile>

+ 22 - 16
Jdas_Mbic/Main.Designer.cs

@@ -111,7 +111,7 @@
111 111
             this.comboBox_Port = new System.Windows.Forms.ComboBox();
112 112
             this.cmBaudRate = new System.Windows.Forms.Label();
113 113
             this.comboBox_baudrate = new System.Windows.Forms.ComboBox();
114
-            this.tabPage_Setting = new System.Windows.Forms.TabPage();
114
+            this.tabPage_Table = new System.Windows.Forms.TabPage();
115 115
             this.groupBox6 = new System.Windows.Forms.GroupBox();
116 116
             this.label31 = new System.Windows.Forms.Label();
117 117
             this.label30 = new System.Windows.Forms.Label();
@@ -134,6 +134,7 @@
134 134
             this.Column_DB = new System.Windows.Forms.DataGridViewTextBoxColumn();
135 135
             this.Column_Offset = new System.Windows.Forms.DataGridViewTextBoxColumn();
136 136
             this.serialPort_JdasMbic = new System.IO.Ports.SerialPort(this.components);
137
+            this.timer_JdasMbic = new System.Windows.Forms.Timer(this.components);
137 138
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
138 139
             this.tabControl1.SuspendLayout();
139 140
             this.tabPage_Main.SuspendLayout();
@@ -179,7 +180,7 @@
179 180
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_G_RX)).BeginInit();
180 181
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_RX)).BeginInit();
181 182
             this.groupBox9.SuspendLayout();
182
-            this.tabPage_Setting.SuspendLayout();
183
+            this.tabPage_Table.SuspendLayout();
183 184
             this.groupBox6.SuspendLayout();
184 185
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).BeginInit();
185 186
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_MultiOffset)).BeginInit();
@@ -200,7 +201,7 @@
200 201
             // tabControl1
201 202
             // 
202 203
             this.tabControl1.Controls.Add(this.tabPage_Main);
203
-            this.tabControl1.Controls.Add(this.tabPage_Setting);
204
+            this.tabControl1.Controls.Add(this.tabPage_Table);
204 205
             this.tabControl1.Location = new System.Drawing.Point(12, 12);
205 206
             this.tabControl1.Name = "tabControl1";
206 207
             this.tabControl1.SelectedIndex = 0;
@@ -1198,18 +1199,18 @@
1198 1199
             this.comboBox_baudrate.TabIndex = 91;
1199 1200
             this.comboBox_baudrate.Text = "115200";
1200 1201
             // 
1201
-            // tabPage_Setting
1202
+            // tabPage_Table
1202 1203
             // 
1203
-            this.tabPage_Setting.Controls.Add(this.groupBox6);
1204
-            this.tabPage_Setting.Controls.Add(this.groupBox3);
1205
-            this.tabPage_Setting.Controls.Add(this.dataGridView_TableSetting);
1206
-            this.tabPage_Setting.Location = new System.Drawing.Point(4, 22);
1207
-            this.tabPage_Setting.Name = "tabPage_Setting";
1208
-            this.tabPage_Setting.Padding = new System.Windows.Forms.Padding(3);
1209
-            this.tabPage_Setting.Size = new System.Drawing.Size(910, 384);
1210
-            this.tabPage_Setting.TabIndex = 1;
1211
-            this.tabPage_Setting.Text = "Setting";
1212
-            this.tabPage_Setting.UseVisualStyleBackColor = true;
1204
+            this.tabPage_Table.Controls.Add(this.groupBox6);
1205
+            this.tabPage_Table.Controls.Add(this.groupBox3);
1206
+            this.tabPage_Table.Controls.Add(this.dataGridView_TableSetting);
1207
+            this.tabPage_Table.Location = new System.Drawing.Point(4, 22);
1208
+            this.tabPage_Table.Name = "tabPage_Table";
1209
+            this.tabPage_Table.Padding = new System.Windows.Forms.Padding(3);
1210
+            this.tabPage_Table.Size = new System.Drawing.Size(910, 384);
1211
+            this.tabPage_Table.TabIndex = 1;
1212
+            this.tabPage_Table.Text = "Table";
1213
+            this.tabPage_Table.UseVisualStyleBackColor = true;
1213 1214
             // 
1214 1215
             // groupBox6
1215 1216
             // 
@@ -1442,6 +1443,10 @@
1442 1443
             this.Column_Offset.Name = "Column_Offset";
1443 1444
             this.Column_Offset.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1444 1445
             // 
1446
+            // timer_JdasMbic
1447
+            // 
1448
+            this.timer_JdasMbic.Tick += new System.EventHandler(this.timer1_Tick);
1449
+            // 
1445 1450
             // JdasMbic
1446 1451
             // 
1447 1452
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1502,7 +1507,7 @@
1502 1507
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_RX)).EndInit();
1503 1508
             this.groupBox9.ResumeLayout(false);
1504 1509
             this.groupBox9.PerformLayout();
1505
-            this.tabPage_Setting.ResumeLayout(false);
1510
+            this.tabPage_Table.ResumeLayout(false);
1506 1511
             this.groupBox6.ResumeLayout(false);
1507 1512
             this.groupBox6.PerformLayout();
1508 1513
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown11)).EndInit();
@@ -1598,7 +1603,7 @@
1598 1603
         public System.Windows.Forms.ComboBox comboBox_Port;
1599 1604
         private System.Windows.Forms.Label cmBaudRate;
1600 1605
         private System.Windows.Forms.ComboBox comboBox_baudrate;
1601
-        private System.Windows.Forms.TabPage tabPage_Setting;
1606
+        private System.Windows.Forms.TabPage tabPage_Table;
1602 1607
         private System.Windows.Forms.DataGridView dataGridView_TableSetting;
1603 1608
         private System.Windows.Forms.GroupBox groupBox6;
1604 1609
         private System.Windows.Forms.Label label31;
@@ -1621,6 +1626,7 @@
1621 1626
         private System.Windows.Forms.DataGridViewTextBoxColumn Column_DB;
1622 1627
         private System.Windows.Forms.DataGridViewTextBoxColumn Column_Offset;
1623 1628
         private System.IO.Ports.SerialPort serialPort_JdasMbic;
1629
+        private System.Windows.Forms.Timer timer_JdasMbic;
1624 1630
     }
1625 1631
 }
1626 1632
 

+ 6 - 9
Jdas_Mbic/Main.cs

@@ -193,12 +193,6 @@ namespace Jdas_Mbic
193 193
             dataGridView_TableSetting.GetCellCount(DataGridViewElementStates.Selected);
194 194
             if (selectedCellCount > 0)
195 195
             {
196
-                if (dataGridView_TableSetting.AreAllCellsSelected(true))
197
-                {
198
-                    MessageBox.Show("All cells are selected", "Selected Cells");
199
-                }
200
-                else
201
-                {
202 196
                     System.Text.StringBuilder sb =
203 197
                         new System.Text.StringBuilder();
204 198
 
@@ -215,7 +209,6 @@ namespace Jdas_Mbic
215 209
 
216 210
                     // sb.Append("Total: " + selectedCellCount.ToString());
217 211
                    // MessageBox.Show(sb.ToString(), "Selected Cells");
218
-                }
219 212
             }
220 213
             return Tmplist;
221 214
         }
@@ -245,10 +238,10 @@ namespace Jdas_Mbic
245 238
 
246 239
             Result = (MaxVal - MinVal) / Count;
247 240
 
248
-            for (int i = 1; i < Count; i++)
241
+            for (int i = 0; i < (Count  - 1); i++)
249 242
             {
250 243
                 Tmpdata = Convert.ToDouble(dataGridView_TableSetting[1, TmpList[0] + i].Value);
251
-                dataGridView_TableSetting[1, TmpList[0] + i].Value = string.Format("{0:0.0}",Math.Round(Tmpdata + Result, 1));
244
+                dataGridView_TableSetting[1, TmpList[0] + (i + 1) ].Value = string.Format("{0:0.0}",Math.Round(Tmpdata + Result, 1));
252 245
             }
253 246
 
254 247
            /* for (int i = 0; i < TmpList.Count; i++)
@@ -511,5 +504,9 @@ namespace Jdas_Mbic
511 504
             catch { try { SendMessage(this.Handle, WM_SETREDRAW, true, 0); } catch { return; } }
512 505
         }
513 506
 
507
+        private void timer1_Tick(object sender, EventArgs e)
508
+        {
509
+
510
+        }
514 511
     }
515 512
 }

+ 9 - 0
Jdas_Mbic/Main.resx

@@ -1264,7 +1264,16 @@
1264 1264
   <metadata name="Column_Offset.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
1265 1265
     <value>True</value>
1266 1266
   </metadata>
1267
+  <metadata name="Column_DB.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
1268
+    <value>True</value>
1269
+  </metadata>
1270
+  <metadata name="Column_Offset.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
1271
+    <value>True</value>
1272
+  </metadata>
1267 1273
   <metadata name="serialPort_JdasMbic.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1268 1274
     <value>17, 17</value>
1269 1275
   </metadata>
1276
+  <metadata name="timer_JdasMbic.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
1277
+    <value>177, 17</value>
1278
+  </metadata>
1270 1279
 </root>

BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.pdb


BIN
Jdas_Mbic/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.Form1.resources


+ 1 - 1
Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
1
-52bc1d32047500c14d078d367e1e5253e3a2481a
1
+e6ab130e68daffa7e26893f0ba4481efd3304b65

+ 2 - 1
Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.FileListAbsolute.txt

@@ -2,7 +2,6 @@ D:\C#\Jdas_Mbic\Jdas_Mbic\bin\Debug\Jdas_Mbic.exe.config
2 2
 D:\C#\Jdas_Mbic\Jdas_Mbic\bin\Debug\Jdas_Mbic.exe
3 3
 D:\C#\Jdas_Mbic\Jdas_Mbic\bin\Debug\Jdas_Mbic.pdb
4 4
 D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.csprojAssemblyReference.cache
5
-D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.Form1.resources
6 5
 D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.Properties.Resources.resources
7 6
 D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.csproj.GenerateResource.cache
8 7
 D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.csproj.CoreCompileInputs.cache
@@ -19,3 +18,5 @@ G:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.csproj.CoreCompileInputs.cache
19 18
 G:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.exe
20 19
 G:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.pdb
21 20
 G:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.Terminal.resources
21
+D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.JdasMbic.resources
22
+D:\C#\Jdas_Mbic\Jdas_Mbic\obj\Debug\Jdas_Mbic.Terminal.resources

BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.GenerateResource.cache


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.pdb