Selaa lähdekoodia

mbic Crc check version

PYJ 5 vuotta sitten
vanhempi
commit
36396d95c1
65 muutettua tiedostoa jossa 2211 lisäystä ja 1068 poistoa
  1. BIN
      .vs/Jdas_Mbic/v15/.suo
  2. BIN
      .vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide
  3. BIN
      .vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-shm
  4. BIN
      .vs/Jdas_Mbic/v15/Server/sqlite3/storage.ide-wal
  5. 19 1
      Jdas_Mbic/Debug.cs
  6. 53 93
      Jdas_Mbic/Func/Bluecell_BootProtocol.cs
  7. 15 7
      Jdas_Mbic/Func/Crc16.cs
  8. 60 12
      Jdas_Mbic/Func/Data_Handler.cs
  9. 6 5
      Jdas_Mbic/Func/Serial.cs
  10. 4 4
      Jdas_Mbic/Func/Update_Serial.cs
  11. 1138 535
      Jdas_Mbic/Main.Designer.cs
  12. 907 406
      Jdas_Mbic/Main.cs
  13. 5 1
      Jdas_Mbic/Program.cs
  14. BIN
      Jdas_Mbic/bin/Debug/ATT_DL1.xls
  15. BIN
      Jdas_Mbic/bin/Debug/ATT_DL2.xls
  16. BIN
      Jdas_Mbic/bin/Debug/ATT_DL3.xls
  17. BIN
      Jdas_Mbic/bin/Debug/ATT_DL4.xls
  18. BIN
      Jdas_Mbic/bin/Debug/ATT_UL1.xls
  19. BIN
      Jdas_Mbic/bin/Debug/ATT_UL2.xls
  20. BIN
      Jdas_Mbic/bin/Debug/ATT_UL3.xls
  21. BIN
      Jdas_Mbic/bin/Debug/ATT_UL4.xls
  22. BIN
      Jdas_Mbic/bin/Debug/DET_DL1.xls
  23. BIN
      Jdas_Mbic/bin/Debug/DET_DL2.xls
  24. BIN
      Jdas_Mbic/bin/Debug/DET_DL3.xls
  25. BIN
      Jdas_Mbic/bin/Debug/DET_DL4.xls
  26. BIN
      Jdas_Mbic/bin/Debug/DET_UL1.xls
  27. BIN
      Jdas_Mbic/bin/Debug/DET_UL2.xls
  28. BIN
      Jdas_Mbic/bin/Debug/DET_UL3.xls
  29. BIN
      Jdas_Mbic/bin/Debug/DET_UL4.xls
  30. BIN
      Jdas_Mbic/bin/Debug/FileName.bin
  31. BIN
      Jdas_Mbic/bin/Debug/Jdas_Mbic.exe
  32. BIN
      Jdas_Mbic/bin/Debug/Jdas_Mbic.pdb
  33. BIN
      Jdas_Mbic/bin/Debug/Jdas_Mbic0.4 - 복사본.exe
  34. BIN
      Jdas_Mbic/bin/Debug/Jdas_Mbic0.4.exe
  35. BIN
      Jdas_Mbic/bin/Debug/Jdas_Mbic_0.3.exe
  36. BIN
      Jdas_Mbic/bin/Debug/Jdas_Mbic_200630_1.exe
  37. BIN
      Jdas_Mbic/bin/Debug/MBIC.zip
  38. BIN
      Jdas_Mbic/bin/Debug/MBIC_0.0.2.binary
  39. BIN
      Jdas_Mbic/bin/Debug/STM32F103ZET_JDASMBIC.binary - 바로 가기.lnk
  40. BIN
      Jdas_Mbic/bin/Debug/TEMP_DL1.xls
  41. BIN
      Jdas_Mbic/bin/Debug/TEMP_DL2.xls
  42. BIN
      Jdas_Mbic/bin/Debug/TEMP_DL3.xls
  43. BIN
      Jdas_Mbic/bin/Debug/TEMP_DL4.xls
  44. BIN
      Jdas_Mbic/bin/Debug/TEMP_UL1.xls
  45. BIN
      Jdas_Mbic/bin/Debug/TEMP_UL2.xls
  46. BIN
      Jdas_Mbic/bin/Debug/TEMP_UL3.xls
  47. BIN
      Jdas_Mbic/bin/Debug/TEMP_UL4.xls
  48. BIN
      Jdas_Mbic/bin/Debug/Untitled1
  49. BIN
      Jdas_Mbic/bin/Debug/jhfs-mbic-nrdas-v00.00.01.mbc
  50. BIN
      Jdas_Mbic/bin/Release/Jdas_Mbic.exe
  51. 3 3
      Jdas_Mbic/bin/Release/Jdas_Mbic.exe.config
  52. BIN
      Jdas_Mbic/bin/Release/Jdas_Mbic.pdb
  53. BIN
      Jdas_Mbic/bin/Release/Jdas_Mbic_0.2.exe
  54. BIN
      Jdas_Mbic/obj/Debug/DesignTimeResolveAssemblyReferences.cache
  55. BIN
      Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.GenerateResource.cache
  56. BIN
      Jdas_Mbic/obj/Debug/Jdas_Mbic.csproj.ResolveComReference.cache
  57. BIN
      Jdas_Mbic/obj/Debug/Jdas_Mbic.exe
  58. BIN
      Jdas_Mbic/obj/Debug/Jdas_Mbic.pdb
  59. BIN
      Jdas_Mbic/obj/Release/Jdas_Mbic.JdasMbic.resources
  60. 1 1
      Jdas_Mbic/obj/Release/Jdas_Mbic.csproj.CoreCompileInputs.cache
  61. BIN
      Jdas_Mbic/obj/Release/Jdas_Mbic.csproj.GenerateResource.cache
  62. BIN
      Jdas_Mbic/obj/Release/Jdas_Mbic.csproj.ResolveComReference.cache
  63. BIN
      Jdas_Mbic/obj/Release/Jdas_Mbic.csprojAssemblyReference.cache
  64. BIN
      Jdas_Mbic/obj/Release/Jdas_Mbic.exe
  65. BIN
      Jdas_Mbic/obj/Release/Jdas_Mbic.pdb

BIN
.vs/Jdas_Mbic/v15/.suo


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


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


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


+ 19 - 1
Jdas_Mbic/Debug.cs

@@ -59,6 +59,12 @@ namespace Jdas_Mbic
59 59
                 tbReceived.AppendText(text);
60 60
                 tbReceived.SelectionStart = tbReceived.Text.Length;//맨 마지막 선택... 
61 61
                 tbReceived.ScrollToCaret();
62
+                /****
63
+                  *메모리 누수 방지용 코드
64
+                  */
65
+                System.GC.Collect(0, GCCollectionMode.Forced);
66
+                System.GC.WaitForFullGCComplete();
67
+
62 68
             }
63 69
             catch { try { SendMessage(this.Handle, WM_SETREDRAW, true, 0); } catch { return; } }
64 70
         }
@@ -100,6 +106,7 @@ namespace Jdas_Mbic
100 106
 #endif
101 107
         public void Data_Recv_Hex(byte[] text)
102 108
         {
109
+ 
103 110
             if (checkBoxRecv.Checked == false)
104 111
                 return;
105 112
 
@@ -142,6 +149,12 @@ namespace Jdas_Mbic
142 149
                 tbReceived.ScrollToCaret();
143 150
             }
144 151
             catch { try { SendMessage(this.Handle, WM_SETREDRAW, true, 0); } catch { return; } }
152
+            /****
153
+              *메모리 누수 방지용 코드
154
+              */
155
+            System.GC.Collect(0, GCCollectionMode.Forced);
156
+            System.GC.WaitForFullGCComplete();
157
+
145 158
 
146 159
         }
147 160
         public void Data_Send(byte[] text,int count)
@@ -189,9 +202,14 @@ namespace Jdas_Mbic
189 202
                 tbReceived.ScrollToCaret();
190 203
             }
191 204
             finally { }
205
+            /****
206
+              *메모리 누수 방지용 코드
207
+              */
208
+            System.GC.Collect(0, GCCollectionMode.Forced);
209
+            System.GC.WaitForFullGCComplete();
192 210
 
193 211
         }
194
-    
212
+
195 213
         public void Serial_ClassSet(object serial)
196 214
         {
197 215
             this.serial = (Serial)serial;

+ 53 - 93
Jdas_Mbic/Func/Bluecell_BootProtocol.cs

@@ -31,7 +31,8 @@ namespace Jdas_Mbic
31 31
     {
32 32
         Bluecell_Header = 0,
33 33
         Bluecell_Type,
34
-        Bluecell_Length,
34
+        Bluecell_Length_H,
35
+        Bluecell_Length_L,
35 36
         Bluecell_CrcIndex,
36 37
         Bluecell_data,
37 38
     }
@@ -42,84 +43,7 @@ namespace Jdas_Mbic
42 43
         TYPE_BLUECELL_SAVE  = 3,
43 44
         TYPE_BLUECELL_ACK   = 4,
44 45
     };
45
-    struct BLUESTATUS_st
46
-    {
47
-        byte bluecell_header;
48
-        byte bluecell_type;
49
-        byte bluecell_length;    
50
-        byte bluecell_crcindex;        
51
-        byte Selftest0;
52
-        byte Selftest1;
53
-        byte Selftest2;
54
-        byte Selftest3;    
55
-        byte ATT_DL1_PATH;    
56
-        byte ATT_DL2_PATH;    
57
-        byte ATT_DL3_PATH;    
58
-        byte ATT_DL4_PATH;        
59
-        byte ATT_UL1_PATH;        
60
-        byte ATT_UL2_PATH;        
61
-        byte ATT_UL3_PATH;        
62
-        byte ATT_UL4_PATH;
63
-        byte ATT_DL1_H;    
64
-        byte ATT_DL1_L;        
65
-        byte ATT_DL2_H;    
66
-        byte ATT_DL2_L;        
67
-        byte ATT_DL3_H;    
68
-        byte ATT_DL3_L;        
69
-        byte ATT_DL4_H;    
70
-        byte ATT_DL4_L;        
71
-        byte ATT_UL1_H;    
72
-        byte ATT_UL1_L;        
73
-        byte ATT_UL2_H;    
74
-        byte ATT_UL2_L;        
75
-        byte ATT_UL3_H;    
76
-        byte ATT_UL3_L;        
77
-        byte ATT_UL4_H;
78
-        byte ATT_UL4_L;
79
-        byte DET_DL1_IN_H;
80
-        byte DET_DL1_IN_L;    
81
-        byte DET_DL2_IN_H;
82
-        byte DET_DL2_IN_L;    
83
-        byte DET_DL3_IN_H;
84
-        byte DET_DL3_IN_L;    
85
-        byte DET_DL4_IN_H;
86
-        byte DET_DL4_IN_L;    
87
-        byte DET_UL1_IN_H;
88
-        byte DET_UL1_IN_L;    
89
-        byte DET_UL2_IN_H;
90
-        byte DET_UL2_IN_L;    
91
-        byte DET_UL3_IN_H;
92
-        byte DET_UL3_IN_L;    
93
-        byte DET_UL4_IN_H;
94
-        byte DET_UL4_IN_L;        
95
-        byte DET_TEMP_H;            
96
-        byte DET_TEMP_L;
97
-        byte ATT_AGC1_ONOFF;
98
-        byte ATT_ALC1_ONOFF;
99
-        byte ATT_AGC2_ONOFF;
100
-        byte ATT_ALC2_ONOFF;
101
-        byte ATT_AGC3_ONOFF;
102
-        byte ATT_ALC3_ONOFF;
103
-        byte ATT_AGC4_ONOFF;
104
-        byte ATT_ALC4_ONOFF;
105
-        byte ATT_AGC1_H;
106
-        byte ATT_AGC1_L;
107
-        byte ATT_ALC1_H;
108
-        byte ATT_ALC1_L;
109
-        byte ATT_AGC2_H;
110
-        byte ATT_AGC2_L;
111
-        byte ATT_ALC2_H;
112
-        byte ATT_ALC2_L;
113
-        byte ATT_AGC3_H;
114
-        byte ATT_AGC3_L;
115
-        byte ATT_ALC3_H;
116
-        byte ATT_ALC3_L;
117
-        byte ATT_AGC4_H;
118
-        byte ATT_AGC4_L;
119
-        byte ATT_ALC4_H;
120
-        byte ATT_ALC4_L;
121
-        byte bluecell_crc;        
122
-    };
46
+   
123 47
     enum MBICProt_st
124 48
     {
125 49
         MBIC_PREAMBLE_0 = 0,
@@ -222,9 +146,38 @@ namespace Jdas_Mbic
222 146
             Bluecell_ATT_UL2_USER,
223 147
             Bluecell_ATT_UL3_USER,
224 148
             Bluecell_ATT_UL4_USER,
149
+            BLuecell_ATT_ALC1,
150
+            BLuecell_ATT_ALC2,
151
+            BLuecell_ATT_ALC3,
152
+            BLuecell_ATT_ALC4,
153
+            Bluecell_BankSelect,
154
+            
225 155
 
226 156
         };
227 157
 
158
+       
159
+       
160
+       
161
+       
162
+       
163
+       
164
+       
165
+       
166
+       
167
+       
168
+       
169
+       
170
+       
171
+       
172
+       
173
+       
174
+       
175
+       
176
+       
177
+       
178
+       
179
+       
180
+       
228 181
         Serial serial;
229 182
         /*bluecell Header*/
230 183
         public const byte Bluecell_Header0 = 0x42;//ASCII : B
@@ -238,8 +191,8 @@ namespace Jdas_Mbic
238 191
         Crc16 crc16 = new Crc16();
239 192
         public const byte BLUECELL_HEADER = 0xBE;
240 193
         public const byte BLUECELL_TAILER = 0xEB;
241
-        const byte BLUECELL_RESET_LENGTH = 6;
242
-        const byte BLUECELL_FIX_DATA_LENGTH = 3;
194
+        const byte BLUECELL_RESET_LENGTH = 9;
195
+        const byte BLUECELL_FIX_DATA_LENGTH = 4;
243 196
 
244 197
         const byte MBIC_HEADER_SIZE = 22;
245 198
         const byte MBIC_PREAMBLE0 = 0x16;
@@ -263,7 +216,8 @@ namespace Jdas_Mbic
263 216
         public byte[] MBIC_HeaderMergeFunction(byte[] data, int Length)
264 217
         {
265 218
             byte[] ret = new byte[data.Length + 22 + 3];
266
-            UInt16 CRCData = crc16.CRC16_Generate(data, data.Length);
219
+            UInt16 CRCData = 0;
220
+         //   UInt16 CRCData = crc16.CRC16_Generate(data, data.Length);
267 221
             /*
268 222
              TAIL
269 223
              */
@@ -313,28 +267,34 @@ namespace Jdas_Mbic
313 267
 
314 268
         public void Bluecell_Reset(object serial)
315 269
         {
316
-            this.serial = (Serial)serial;
270
+            UInt16 Length = (BLUECELL_RESET_LENGTH - BLUECELL_FIX_DATA_LENGTH);
317 271
             byte[] temp_buf = new byte[BLUECELL_RESET_LENGTH];
272
+            UInt16 CRCRET = crc16.CRC16_Generate(temp_buf, Length);
273
+            this.serial = (Serial)serial;
318 274
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header]       = BLUECELL_HEADER;
319 275
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type]         = (byte)Bluecell_Prot_t.TYPE_BLUECELL_RESET;
320
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length]       = BLUECELL_RESET_LENGTH - BLUECELL_FIX_DATA_LENGTH;
321
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex]     = (byte)Bluecell_ProtIndex_p.Bluecell_data;
322
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data]         = crc16.STH30_CreateCrc(temp_buf, BLUECELL_RESET_LENGTH - 3);
323
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1]     = BLUECELL_TAILER;
276
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_H]     = Convert.ToByte(Length & 0x00FF << 8);
277
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_L]     = Convert.ToByte(Length & 0x00FF);
278
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data] = 0;
279
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1]     = Convert.ToByte(CRCRET & 0xFF00 >> 8);
280
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1]     = Convert.ToByte(CRCRET & 0x00FF);
281
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 2]     = BLUECELL_TAILER;
324 282
             this.serial.Serial_DataSend(temp_buf, temp_buf.Length);
325 283
         }
326 284
         public void Bluecell_RF_Status_Req(object serial)
327 285
         {
328 286
             Crc16 crc16 = new Crc16();
329 287
             this.serial = (Serial)serial;
330
-            byte[] temp_buf = new byte[7];
331
-
288
+            byte[] temp_buf = new byte[8];
289
+            byte[] MBIC_DATA = { 0x16, 0x16, 0x16, 0x16, 0x00, 0xf0, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x14, 0x06, 0x09, 0x00, 0x0c, 0x28, 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x03 };
290
+            //this.serial.Serial_DataSend(MBIC_DATA, MBIC_DATA.Length);
291
+            //return;
332 292
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Header] = BLUECELL_HEADER;
333 293
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Type] = (int)DATATYPE.Bluecell_StatusReq;
334
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length] = Convert.ToByte(temp_buf.Length - 3);
335
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_CrcIndex] = Convert.ToByte(temp_buf.Length - 2);
336
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 0] = Convert.ToByte((crc16.CRC16_Generate(temp_buf, temp_buf[2]) & 0xFF00) >> 8);
337
-            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1] = Convert.ToByte((crc16.CRC16_Generate(temp_buf, temp_buf[2]) & 0x00FF));
294
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_H] = 0;//Convert.ToByte(temp_buf.Length - 4);
295
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_L] = Convert.ToByte(temp_buf.Length - 4);
296
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 0] = Convert.ToByte((crc16.CRC16_Generate(temp_buf, temp_buf.Length - 4) & 0xFF00) >> 8);
297
+            temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 1] = Convert.ToByte((crc16.CRC16_Generate(temp_buf, temp_buf.Length - 4) & 0x00FF));
338 298
             //Convert.ToByte((Updatedata.Length & 0xFF00) >> 8);
339 299
             temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data + 2] = BLUECELL_TAILER;
340 300
             this.serial.Serial_DataSend(temp_buf, temp_buf.Length);

+ 15 - 7
Jdas_Mbic/Func/Crc16.cs

@@ -133,18 +133,26 @@ namespace Jdas_Mbic
133 133
         public bool CRC16_Check(byte[] buf_ptr, int len, UInt16 checksum)
134 134
         {
135 135
             UInt16 crc = 0;
136
-            for (UInt32 counter = 0; counter < len; counter++)
137
-                crc = (UInt16)((crc << 8) ^ crc16_tab[(UInt32)(((crc >> 8) ^ buf_ptr[counter]) & 0x00FF)]);
136
+            bool ret = false;
137
+            UInt16[] data = new UInt16[1024];
138
+            
139
+            for (UInt32 counter = 1; counter <= len; counter++)
140
+            {
141
+                data[counter - 1] = crc = (UInt16)((crc << 8) ^ crc16_tab[(UInt32)(((crc >> 8) ^ buf_ptr[counter]) & 0x00FF)]);
142
+                
143
+            }
144
+            if (crc == checksum)
145
+                ret = true;
138 146
 
139
-            return (crc == checksum ? false : true);
147
+            return ret;
140 148
         }
141 149
         public UInt16 CRC16_Generate(byte[] buf_ptr, int len)
142 150
         {
143
-            UInt16 crc = 0;
144
-            for (UInt32 counter = 0; counter < len; counter++)
145
-                crc = (UInt16)((crc << 8) ^ crc16_tab[(UInt32)(((crc >> 8) ^ buf_ptr[counter]) & 0x00FF)]);
151
+            UInt32 crc = 0;
152
+            for (UInt32 counter = 1; counter <= len; counter++)
153
+                crc = (UInt32)(((crc << 8) ^ crc16_tab[(UInt32)(((crc >> 8) ^ buf_ptr[counter]) & 0x00FF)] ));
146 154
             //    printf("len : %d \r\n",len);
147
-            return crc;
155
+            return Convert.ToUInt16(crc & 0xFFFF);
148 156
         }
149 157
 
150 158
 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 60 - 12
Jdas_Mbic/Func/Data_Handler.cs


+ 6 - 5
Jdas_Mbic/Func/Serial.cs

@@ -180,15 +180,15 @@ namespace Jdas_Mbic
180 180
             System.GC.Collect(0, GCCollectionMode.Forced);
181 181
             System.GC.WaitForFullGCComplete();
182 182
         }
183
-        public Boolean Serial_PortOpen(ref Button Btn_Portonoff,ref ComboBox cb)
183
+        public byte Serial_PortOpen(ref Button Btn_Portonoff,ref ComboBox cb)
184 184
         {
185
-            Boolean ret = false;
185
+            byte ret = 0;
186 186
             try
187 187
             {
188 188
                 if (serialPort.IsOpen) { //When the port is open
189 189
                     serialPort.Close();
190 190
                     Btn_Portonoff.Text = "Port Open";
191
-                    ret = true;
191
+                    ret = 1;
192 192
                 }
193 193
                 else//When the port is close
194 194
                 {
@@ -204,14 +204,15 @@ namespace Jdas_Mbic
204 204
                     else
205 205
                     {
206 206
                         MessageBox.Show("Port is not set");
207
-                        ret = true;
207
+                        ret = 1;
208 208
                     }
209 209
                 }
210
+               
210 211
             }
211 212
             catch
212 213
             {
213 214
                 MessageBox.Show("already port open " + Serial_Name);
214
-               
215
+                ret = 2;
215 216
             }
216 217
             return ret;
217 218
         }

+ 4 - 4
Jdas_Mbic/Func/Update_Serial.cs

@@ -256,7 +256,7 @@ namespace Jdas_Mbic
256 256
        // private JdasMbic JdasMbic = new JdasMbic();    // Teminal Text Wnd Open
257 257
        
258 258
         Crc16 crc = new Crc16();
259
-        static public int MBIC_SendingCnt = 0;
259
+       // static public int MBIC_SendingCnt = 0;
260 260
         static int MBIC_SendingIndex = 0;
261 261
         public void MBIC_FirmwareUpdateSend(ref Serial serial,byte[] data)
262 262
         {
@@ -265,13 +265,13 @@ namespace Jdas_Mbic
265 265
             int reminder = data.Length % 1024;
266 266
             
267 267
             byte[] SendArray = new byte[1061];//1024 + 22 + 3 + 12
268
-            MBIC_SendingCnt++;
268
+            //MBIC_SendingCnt++;
269 269
 
270 270
             //if (MBIC_SendingCnt <= cnt)
271 271
             if (Length - MBIC_SendingIndex >= 1024)
272 272
             {
273 273
                 Array.Copy(data, MBIC_SendingIndex, SendArray, 12, 1024);
274
-                MBIC_SendingIndex = MBIC_SendingCnt * 1024 ;
274
+                MBIC_SendingIndex += 1024 ;
275 275
                 //SendArray = 
276 276
                 SendArray[0] = Convert.ToByte((Length & 0xFF000000) >> 24);
277 277
                 SendArray[1] = Convert.ToByte((Length & 0x00FF0000) >> 16);
@@ -319,7 +319,7 @@ namespace Jdas_Mbic
319 319
                 SendArray[(int)MBICProt_st.MBIC_HEADERCHECKSUM_0] = crc.Chksum_Create(SendArray);
320 320
 
321 321
                 serial.Serial_DataSend(SendArray, reminder + 22 + 12 + 3);
322
-                MBIC_SendingCnt = 0;
322
+               // MBIC_SendingCnt = 0;
323 323
                 MBIC_SendingIndex = 0;
324 324
             }
325 325
         }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1138 - 535
Jdas_Mbic/Main.Designer.cs


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 907 - 406
Jdas_Mbic/Main.cs


+ 5 - 1
Jdas_Mbic/Program.cs

@@ -16,7 +16,11 @@ namespace Jdas_Mbic
16 16
         {
17 17
             Application.EnableVisualStyles();
18 18
             Application.SetCompatibleTextRenderingDefault(false);
19
-            Application.Run(new JdasMbic());
19
+            try
20
+            {
21
+                Application.Run(new JdasMbic());
22
+            }
23
+            catch { }
20 24
         }
21 25
     }
22 26
 }

BIN
Jdas_Mbic/bin/Debug/ATT_DL1.xls


BIN
Jdas_Mbic/bin/Debug/ATT_DL2.xls


BIN
Jdas_Mbic/bin/Debug/ATT_DL3.xls


BIN
Jdas_Mbic/bin/Debug/ATT_DL4.xls


BIN
Jdas_Mbic/bin/Debug/ATT_UL1.xls


BIN
Jdas_Mbic/bin/Debug/ATT_UL2.xls


BIN
Jdas_Mbic/bin/Debug/ATT_UL3.xls


BIN
Jdas_Mbic/bin/Debug/ATT_UL4.xls


BIN
Jdas_Mbic/bin/Debug/DET_DL1.xls


BIN
Jdas_Mbic/bin/Debug/DET_DL2.xls


BIN
Jdas_Mbic/bin/Debug/DET_DL3.xls


BIN
Jdas_Mbic/bin/Debug/DET_DL4.xls


BIN
Jdas_Mbic/bin/Debug/DET_UL1.xls


BIN
Jdas_Mbic/bin/Debug/DET_UL2.xls


BIN
Jdas_Mbic/bin/Debug/DET_UL3.xls


BIN
Jdas_Mbic/bin/Debug/DET_UL4.xls


BIN
Jdas_Mbic/bin/Debug/FileName.bin


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic.pdb


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic0.4 - 복사본.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic0.4.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic_0.3.exe


BIN
Jdas_Mbic/bin/Debug/Jdas_Mbic_200630_1.exe


BIN
Jdas_Mbic/bin/Debug/MBIC.zip


BIN
Jdas_Mbic/bin/Debug/MBIC_0.0.2.binary


BIN
Jdas_Mbic/bin/Debug/STM32F103ZET_JDASMBIC.binary - 바로 가기.lnk


BIN
Jdas_Mbic/bin/Debug/TEMP_DL1.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_DL2.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_DL3.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_DL4.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_UL1.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_UL2.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_UL3.xls


BIN
Jdas_Mbic/bin/Debug/TEMP_UL4.xls


BIN
Jdas_Mbic/bin/Debug/Untitled1


BIN
Jdas_Mbic/bin/Debug/jhfs-mbic-nrdas-v00.00.01.mbc


BIN
Jdas_Mbic/bin/Release/Jdas_Mbic.exe


+ 3 - 3
Jdas_Mbic/bin/Release/Jdas_Mbic.exe.config

@@ -1,6 +1,6 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
1
+<?xml version="1.0" encoding="utf-8"?>
2 2
 <configuration>
3 3
     <startup> 
4
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
4
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
5 5
     </startup>
6
-</configuration>
6
+</configuration>

BIN
Jdas_Mbic/bin/Release/Jdas_Mbic.pdb


BIN
Jdas_Mbic/bin/Release/Jdas_Mbic_0.2.exe


BIN
Jdas_Mbic/obj/Debug/DesignTimeResolveAssemblyReferences.cache


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


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


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.exe


BIN
Jdas_Mbic/obj/Debug/Jdas_Mbic.pdb


BIN
Jdas_Mbic/obj/Release/Jdas_Mbic.JdasMbic.resources


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

@@ -1 +1 @@
1
-a0e135a49a434b394a1b2ba0915f88a4bd649a39
1
+95e1a81e0f614a0b53c0f1bb982a476768c2eb15

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


BIN
Jdas_Mbic/obj/Release/Jdas_Mbic.csproj.ResolveComReference.cache


BIN
Jdas_Mbic/obj/Release/Jdas_Mbic.csprojAssemblyReference.cache


BIN
Jdas_Mbic/obj/Release/Jdas_Mbic.exe


BIN
Jdas_Mbic/obj/Release/Jdas_Mbic.pdb