Temp Table 안들어가는 문제 수정 /

Temp Shutdown 기능 추가
MBIC File Make 할 때 Version 3자리 전부 수정 할 수 있도록 변경

Jdas_Mbic/Func/Bluecell_BootProtocol.cs

@@ -162,6 +162,7 @@ namespace Jdas_Mbic
             Bluecell_UL_Det_Path2_Offset,
             Bluecell_UL_Det_Path3_Offset,
             Bluecell_UL_Det_Path4_Offset,
+            Bluecell_Temp_Shutdown_Path_ON_OFF,
         };
 
        

Jdas_Mbic/Hidden.cs

@@ -293,13 +293,19 @@ namespace Jdas_Mbic
             else
             {
                 Length = Convert.ToByte(JdasMbic.ATT_TableMaxLength - 4);
+
                 temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_H] = Convert.ToByte((Length & 0xFF00) >> 8);
                 temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_Length_L] = Convert.ToByte((Length & 0x00FF));
-                for (i = 0; i < dataGridView_TableSetting.RowCount; i++)
+                //for (i = 0; i < dataGridView_TableSetting.RowCount; i++)
+                for (i = 0; i < 0x40; i++)
                 {
-                    attret = Convert.ToByte(Convert.ToSByte(Convert.ToDouble(dataGridView_TableSetting[1, i].Value) * 2) & 0xFF);
+                    try
+                    {
+                        attret = Convert.ToByte(Convert.ToSByte(Convert.ToDouble(dataGridView_TableSetting[1, i].Value) * 2) & 0xFF);
 
-                    temp_buf[(int)(Bluecell_ProtIndex_p.Bluecell_data + 1) + i] = (attret);
+                        temp_buf[(int)(Bluecell_ProtIndex_p.Bluecell_data + 1) + i] = (attret);
+                    }
+                    catch { }
                 }
 
                 for (a = i; a < i + 30; a++)

Jdas_Mbic/MBIC_DownLoadWnc.cs

@@ -86,7 +86,7 @@ namespace Jdas_Mbic
         private void button_DownloadStart_Click(object sender, EventArgs e)
         {
             byte[] tempdata = new byte[1027];
-            string MBIC_HeaderFileName = "jhfs-mbic-nrdas-v00.00." + this.main.numericUpDown_Version.Text + ".mbc";
+            string MBIC_HeaderFileName = "jhfs-mbic-nrdas-v00.00." + this.main.numericUpDown_Version3.Text + ".mbc";
             char[] tempchardata;
             int TotalFrame = 0;
             UInt32 Crcret = 0;

Jdas_Mbic/Main.Designer.cs

@@ -102,6 +102,8 @@
             this.button1 = new System.Windows.Forms.Button();
             this.button_FactorySet = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.label10 = new System.Windows.Forms.Label();
+            this.button_TempShutdown = new System.Windows.Forms.Button();
             this.textBox_UL4_TableOffset = new System.Windows.Forms.TextBox();
             this.textBox_UL2_TableOffset = new System.Windows.Forms.TextBox();
             this.textBox_DL4_TableOffset = new System.Windows.Forms.TextBox();
@@ -131,7 +133,7 @@
             this.button_SelfTest1 = new System.Windows.Forms.Button();
             this.button_SelfTest3 = new System.Windows.Forms.Button();
             this.panel_Serial = new System.Windows.Forms.Panel();
-            this.numericUpDown_Version = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown_Version3 = new System.Windows.Forms.NumericUpDown();
             this.label1 = new System.Windows.Forms.Label();
             this.pictureBox_R_TX = new System.Windows.Forms.PictureBox();
             this.pictureBox_G_TX = new System.Windows.Forms.PictureBox();
@@ -296,6 +298,8 @@
             this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
             this.label3 = new System.Windows.Forms.Label();
             this.numericUpDown2 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown_Version2 = new System.Windows.Forms.NumericUpDown();
+            this.numericUpDown_Version1 = new System.Windows.Forms.NumericUpDown();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ShutdownUL3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ShutdownDL3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_ALC3)).BeginInit();
@@ -330,7 +334,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_MASK)).BeginInit();
             this.panel1.SuspendLayout();
             this.panel_Serial.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_TX)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_G_TX)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_RX)).BeginInit();
@@ -413,6 +417,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_TempHigh_Alarm_OFF)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version1)).BeginInit();
             this.SuspendLayout();
             // 
             // textBox_FRBT_TIME
@@ -1278,7 +1284,7 @@
             this.comboBox_Port.Location = new System.Drawing.Point(5, 27);
             this.comboBox_Port.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.comboBox_Port.Name = "comboBox_Port";
-            this.comboBox_Port.Size = new System.Drawing.Size(91, 23);
+            this.comboBox_Port.Size = new System.Drawing.Size(94, 23);
             this.comboBox_Port.TabIndex = 88;
             // 
             // cmBaudRate
@@ -1312,7 +1318,7 @@
             this.comboBox_baudrate.Location = new System.Drawing.Point(4, 78);
             this.comboBox_baudrate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.comboBox_baudrate.Name = "comboBox_baudrate";
-            this.comboBox_baudrate.Size = new System.Drawing.Size(91, 23);
+            this.comboBox_baudrate.Size = new System.Drawing.Size(94, 23);
             this.comboBox_baudrate.TabIndex = 91;
             this.comboBox_baudrate.Text = "115200";
             // 
@@ -1507,6 +1513,8 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.label10);
+            this.panel1.Controls.Add(this.button_TempShutdown);
             this.panel1.Controls.Add(this.textBox_UL4_TableOffset);
             this.panel1.Controls.Add(this.textBox_UL2_TableOffset);
             this.panel1.Controls.Add(this.textBox_DL4_TableOffset);
@@ -1618,6 +1626,25 @@
             this.panel1.Size = new System.Drawing.Size(1136, 895);
             this.panel1.TabIndex = 159;
             // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(429, 132);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(96, 15);
+            this.label10.TabIndex = 180;
+            this.label10.Text = "Temp Shutdown";
+            // 
+            // button_TempShutdown
+            // 
+            this.button_TempShutdown.Location = new System.Drawing.Point(575, 127);
+            this.button_TempShutdown.Name = "button_TempShutdown";
+            this.button_TempShutdown.Size = new System.Drawing.Size(75, 23);
+            this.button_TempShutdown.TabIndex = 179;
+            this.button_TempShutdown.Text = "OFF";
+            this.button_TempShutdown.UseVisualStyleBackColor = true;
+            this.button_TempShutdown.Click += new System.EventHandler(this.button_PATH_Ctrl_Click);
+            // 
             // textBox_UL4_TableOffset
             // 
             this.textBox_UL4_TableOffset.Location = new System.Drawing.Point(1030, 741);
@@ -1853,7 +1880,9 @@
             // 
             this.panel_Serial.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.panel_Serial.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panel_Serial.Controls.Add(this.numericUpDown_Version);
+            this.panel_Serial.Controls.Add(this.numericUpDown_Version1);
+            this.panel_Serial.Controls.Add(this.numericUpDown_Version2);
+            this.panel_Serial.Controls.Add(this.numericUpDown_Version3);
             this.panel_Serial.Controls.Add(this.label_BankSel);
             this.panel_Serial.Controls.Add(this.label1);
             this.panel_Serial.Controls.Add(this.button_FirmwareUpdate);
@@ -1875,16 +1904,16 @@
             this.panel_Serial.Controls.Add(this.pictureBox_G_RX);
             this.panel_Serial.Location = new System.Drawing.Point(0, 165);
             this.panel_Serial.Name = "panel_Serial";
-            this.panel_Serial.Size = new System.Drawing.Size(124, 729);
+            this.panel_Serial.Size = new System.Drawing.Size(127, 729);
             this.panel_Serial.TabIndex = 154;
             this.panel_Serial.Paint += new System.Windows.Forms.PaintEventHandler(this.panel_Serial_Paint);
             // 
-            // numericUpDown_Version
+            // numericUpDown_Version3
             // 
-            this.numericUpDown_Version.Location = new System.Drawing.Point(25, 539);
-            this.numericUpDown_Version.Name = "numericUpDown_Version";
-            this.numericUpDown_Version.Size = new System.Drawing.Size(69, 23);
-            this.numericUpDown_Version.TabIndex = 151;
+            this.numericUpDown_Version3.Location = new System.Drawing.Point(87, 516);
+            this.numericUpDown_Version3.Name = "numericUpDown_Version3";
+            this.numericUpDown_Version3.Size = new System.Drawing.Size(37, 23);
+            this.numericUpDown_Version3.TabIndex = 151;
             // 
             // label1
             // 
@@ -2235,7 +2264,7 @@
             // 
             // button_Carrier
             // 
-            this.button_Carrier.Location = new System.Drawing.Point(575, 96);
+            this.button_Carrier.Location = new System.Drawing.Point(575, 98);
             this.button_Carrier.Name = "button_Carrier";
             this.button_Carrier.Size = new System.Drawing.Size(75, 23);
             this.button_Carrier.TabIndex = 8;
@@ -2245,13 +2274,13 @@
             // 
             // button_LedTest
             // 
-            this.button_LedTest.Location = new System.Drawing.Point(490, 73);
+            this.button_LedTest.Location = new System.Drawing.Point(575, 72);
             this.button_LedTest.Name = "button_LedTest";
             this.button_LedTest.Size = new System.Drawing.Size(75, 23);
             this.button_LedTest.TabIndex = 7;
             this.button_LedTest.Text = "LED TEST";
             this.button_LedTest.UseVisualStyleBackColor = true;
-            this.button_LedTest.Click += new System.EventHandler(this.button_LedTest_Click);
+            this.button_LedTest.Click += new System.EventHandler(this.button_PATH_Ctrl_Click);
             // 
             // textBox_CardType
             // 
@@ -3517,6 +3546,20 @@
             0,
             -2147483648});
             // 
+            // numericUpDown_Version2
+            // 
+            this.numericUpDown_Version2.Location = new System.Drawing.Point(45, 516);
+            this.numericUpDown_Version2.Name = "numericUpDown_Version2";
+            this.numericUpDown_Version2.Size = new System.Drawing.Size(37, 23);
+            this.numericUpDown_Version2.TabIndex = 151;
+            // 
+            // numericUpDown_Version1
+            // 
+            this.numericUpDown_Version1.Location = new System.Drawing.Point(3, 516);
+            this.numericUpDown_Version1.Name = "numericUpDown_Version1";
+            this.numericUpDown_Version1.Size = new System.Drawing.Size(37, 23);
+            this.numericUpDown_Version1.TabIndex = 151;
+            // 
             // JdasMbic
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -3570,7 +3613,7 @@
             this.panel1.PerformLayout();
             this.panel_Serial.ResumeLayout(false);
             this.panel_Serial.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_TX)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_G_TX)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_R_RX)).EndInit();
@@ -3670,6 +3713,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox_TempHigh_Alarm_OFF)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown_Version1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -3941,7 +3986,11 @@
         private System.Windows.Forms.Label label_TableOffset;
         private System.Windows.Forms.Label label9;
         public System.Windows.Forms.Timer timer_JdasMbic;
-        public System.Windows.Forms.NumericUpDown numericUpDown_Version;
+        public System.Windows.Forms.NumericUpDown numericUpDown_Version3;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Button button_TempShutdown;
+        public System.Windows.Forms.NumericUpDown numericUpDown_Version1;
+        public System.Windows.Forms.NumericUpDown numericUpDown_Version2;
     }
 }
 

Jdas_Mbic/Main.cs

@@ -934,7 +934,7 @@ namespace Jdas_Mbic
             DL_Det_ALL_Offset,
             UL_Det_Path_Offset1,
             UL_Det_Path_Offset2,
-            UL_Det_Path_Offset3,
+            Path_TempShutdown_Set,
             UL_Det_Path_Offset4,
             bluecell_crc_H,
             bluecell_crc_L,
@@ -1105,7 +1105,7 @@ namespace Jdas_Mbic
                 this.Invoke(new StringSend(TextBox_Text_Set), textBox_FRBT_Status, "RUNNING");// = false;
             }
 
-                if (buf[(int)BluecellReqIndex.Carrier_ON_OFF] == 0)
+             if (buf[(int)BluecellReqIndex.Carrier_ON_OFF] == 0)
             {
                 this.Invoke(new StringSend(Button_Text_Set), button_Carrier, "OFF");// = false;
                 this.Invoke(new StringSend(TextBox_Text_Set), textBox1_Carrier, "OFF");// = false;
@@ -1115,7 +1115,14 @@ namespace Jdas_Mbic
                 this.Invoke(new StringSend(Button_Text_Set), button_Carrier, "ON");// = false;
                 this.Invoke(new StringSend(TextBox_Text_Set), textBox1_Carrier, "ON");// = false;
             }
-
+            if (buf[(int)BluecellReqIndex.Path_TempShutdown_Set] == 0)
+            {
+                this.Invoke(new StringSend(Button_Text_Set), button_TempShutdown, "OFF");// = false;
+            }
+            else
+            {
+                this.Invoke(new StringSend(Button_Text_Set), button_TempShutdown, "ON");// = false;
+            }
             if (buf[(int)BluecellReqIndex.Selftest1] == 0)
             {
                 this.Invoke(new StringSend(Button_Text_Set), button_SelfTest1, "OFF");// = false;
@@ -1907,20 +1914,7 @@ namespace Jdas_Mbic
             this.Invoke(new StringSend(TextBox_Text_Set), textBox_DL4_TableOffset, ((sbyte)AttData).ToString());
 
 
-            AttData = (short)(buf[(int)BluecellReqIndex.UL_Det_Path_Offset1]);
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_UL1_TableOffset, ((sbyte)AttData).ToString());
-
-
-            AttData = (sbyte)(buf[(int)BluecellReqIndex.UL_Det_Path_Offset2]);
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_UL2_TableOffset, ((sbyte)AttData).ToString());
-
-
-            AttData = (sbyte)(buf[(int)BluecellReqIndex.UL_Det_Path_Offset3]);
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_UL3_TableOffset, ((sbyte)AttData).ToString());
-
-            AttData = (sbyte)(buf[(int)BluecellReqIndex.UL_Det_Path_Offset4]);
-            this.Invoke(new StringSend(TextBox_Text_Set), textBox_UL4_TableOffset, ((sbyte)AttData).ToString());
-
+         
 
             AttData = (short)(((buf[(int)BluecellReqIndex.DLI_Level_High_Threshold_H] << 8) & 0xFF00) | (buf[(int)BluecellReqIndex.DLI_Level_High_Threshold_L] & 0x00FF));
             AttData = Convert.ToInt16(AttData * 0.1);
@@ -2050,18 +2044,18 @@ namespace Jdas_Mbic
             adcdata = adcdata * 3.3 / 4095;
             adcdata = (adcdata - 0.5) * 100;
 #else
-            adcdata = (buf[(int)BluecellReqIndex.DET_TEMP]);
+            adcdata = (sbyte)(buf[(int)BluecellReqIndex.DET_TEMP]);
 #endif
 
             this.Invoke(new StringSend(Label_Text_Set), label_Temp, adcdata.ToString("N2") + "°C");
             adcdata = 0;
             //string tmp = Convert.ToInt32(buf[(int)BluecellReqIndex.CPUVERSION3],16).ToString();
-
-            string version = Convert.ToString(buf[(int)BluecellReqIndex.CPUVERSION1])
-                             + "."
-                             + Convert.ToString(buf[(int)BluecellReqIndex.CPUVERSION2])
+            char pad = '0';
+            string version = Convert.ToString(buf[(int)BluecellReqIndex.CPUVERSION1]).PadLeft(2,pad)
                              + "."
-                             + Convert.ToInt32(buf[(int)BluecellReqIndex.CPUVERSION3]).ToString("X");
+                             + Convert.ToString(buf[(int)BluecellReqIndex.CPUVERSION2]).PadLeft(2, pad)
+            + "."
+                             + Convert.ToInt32(buf[(int)BluecellReqIndex.CPUVERSION3]).ToString("X").PadLeft(2, pad);
             //Convert.ToInt32(buf[(int)BluecellReqIndex.CPUVERSION3], 16).ToString();
             //adcdata += (buf[(int)BluecellReqIndex.CPUVERSION2])/10;
             //adcdata += (buf[(int)BluecellReqIndex.CPUVERSION3]);
@@ -2145,8 +2139,9 @@ namespace Jdas_Mbic
 
         public const byte DET_TableMaxLength = 160 + 1+ 6 + 2; // Header + Type + Length + CRCINDEX + TableIndex + .....    +  CRC
         public const byte ATT_TableMaxLength = 96 + 1 +  6 + 2; // Header + Type + Length + CRCINDEX + TableIndex + .....    +  CRC
+        public const byte Temp_TableMaxLength = 96 + 1 + 6 + 2; // Header + Type + Length + CRCINDEX + TableIndex + .....    +  CRC
+
 
-        
         const byte TableGetMaxLength =  1 + 7 + 1;
 
 
@@ -2663,9 +2658,9 @@ namespace Jdas_Mbic
             string hex = Convert.ToString(int.Parse(dec, 16).ToUpper();*/
             string hex = "24";
             string dec = Convert.ToInt32(hex, 10).ToString();
+            char pad = '0';
 
-
-            string MBIC_HeaderFileName = "jhfs-mbic-nrdas-v00.00." + numericUpDown_Version.Text + ".mbc";
+            string MBIC_HeaderFileName = "jhfs-mbic-nrdas-v"+ numericUpDown_Version1.Text.PadLeft(2,pad)+ "." + numericUpDown_Version2.Text.PadLeft(2, pad) + "." + numericUpDown_Version3.Text.PadLeft(2, pad) + ".mbc";
             //현재 사용자 바탕화면 경로
 
             string localpath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
@@ -2707,9 +2702,9 @@ namespace Jdas_Mbic
                 }
                 MBIC_Add_BootLoader_DataArray[9] = 0x20; //file type : MBIC 0x20
                 MBIC_Add_BootLoader_DataArray[10] = 0x00; //file type : CPU 0x00
-                MBIC_Add_BootLoader_DataArray[11] = 0x00;//version
-                MBIC_Add_BootLoader_DataArray[12] = 0x00;//version
-                MBIC_Add_BootLoader_DataArray[13] = Convert.ToByte(numericUpDown_Version.Text,16);//version
+                MBIC_Add_BootLoader_DataArray[11] = Convert.ToByte(numericUpDown_Version1.Text, 16);//version
+                MBIC_Add_BootLoader_DataArray[12] = Convert.ToByte(numericUpDown_Version2.Text, 16);//version
+                MBIC_Add_BootLoader_DataArray[13] = Convert.ToByte(numericUpDown_Version3.Text,16);//version
 
                 tempchardata = MBIC_HeaderFileName.ToCharArray();
                 for (i = 14; i < 14 + tempchardata.Length + 12; i++) // Total 41byte Filename
@@ -2954,6 +2949,13 @@ namespace Jdas_Mbic
                 case "button_Carrier":
                     datatype = DATATYPE.Bluecell_CarrierOnOff;
                     break;
+                case "button_TempShutdown":
+                    datatype = DATATYPE.Bluecell_Temp_Shutdown_Path_ON_OFF;
+                    break;
+                case "button_LedTest":
+                    datatype = DATATYPE.Bluecell_LED_TEST;
+                    temp_buf[(int)Bluecell_ProtIndex_p.Bluecell_data] = 1;
+                    break;
                 default:
                     MessageBox.Show("잘 못된 값 입니다. 확인 부탁드립니다.");
                     return;