Merge branch 'master' of http://192.168.11.65:3000/chojy/INT69DC_7C

INT69DC_7C/Forms/FormIOTest.cs

@@ -22,6 +22,7 @@ namespace INT69DC_7C.Forms
         private Color ColorIOStatusOff;
 
         private Collection<Label> CollectionInputLabel;
+        private Collection<Label> CollectionInputLabel1;
         private Collection<SmartLabel> CollectionInputLabelName;
         private Collection<SmartButton> CollectionOutputButton;
         #endregion
@@ -121,6 +122,25 @@ namespace INT69DC_7C.Forms
             this.CollectionInputLabel.Add(this.labelInput15);
             this.CollectionInputLabel.Add(this.labelInput16);
 
+            this.CollectionInputLabel1 = new Collection<Label>();
+            this.CollectionInputLabel1.Clear();
+            this.CollectionInputLabel1.Add(this.labelInput17);
+            this.CollectionInputLabel1.Add(this.labelInput18);
+            this.CollectionInputLabel1.Add(this.labelInput19);
+            this.CollectionInputLabel1.Add(this.labelInput20);
+            this.CollectionInputLabel1.Add(this.labelInput21);
+            this.CollectionInputLabel1.Add(this.labelInput22);
+            this.CollectionInputLabel1.Add(this.labelInput23);
+            this.CollectionInputLabel1.Add(this.labelInput24);
+            this.CollectionInputLabel1.Add(this.labelInput25);
+            this.CollectionInputLabel1.Add(this.labelInput26);
+            this.CollectionInputLabel1.Add(this.labelInput27);
+            this.CollectionInputLabel1.Add(this.labelInput28);
+            this.CollectionInputLabel1.Add(this.labelInput29);
+            this.CollectionInputLabel1.Add(this.labelInput30);
+            this.CollectionInputLabel1.Add(this.labelInput31);
+            this.CollectionInputLabel1.Add(this.labelInput32);
+
             this.CollectionInputLabelName = new Collection<SmartLabel>();
             this.CollectionInputLabelName.Clear();
             this.CollectionInputLabelName.Add(this.labelInputName1);
@@ -139,6 +159,22 @@ namespace INT69DC_7C.Forms
             this.CollectionInputLabelName.Add(this.labelInputName14);
             this.CollectionInputLabelName.Add(this.labelInputName15);
             this.CollectionInputLabelName.Add(this.labelInputName16);
+            this.CollectionInputLabelName.Add(this.labelInputName17);
+            this.CollectionInputLabelName.Add(this.labelInputName18);
+            this.CollectionInputLabelName.Add(this.labelInputName19);
+            this.CollectionInputLabelName.Add(this.labelInputName20);
+            this.CollectionInputLabelName.Add(this.labelInputName21);
+            this.CollectionInputLabelName.Add(this.labelInputName22);
+            this.CollectionInputLabelName.Add(this.labelInputName23);
+            this.CollectionInputLabelName.Add(this.labelInputName24);
+            this.CollectionInputLabelName.Add(this.labelInputName25);
+            this.CollectionInputLabelName.Add(this.labelInputName26);
+            this.CollectionInputLabelName.Add(this.labelInputName27);
+            this.CollectionInputLabelName.Add(this.labelInputName28);
+            this.CollectionInputLabelName.Add(this.labelInputName29);
+            this.CollectionInputLabelName.Add(this.labelInputName30);
+            this.CollectionInputLabelName.Add(this.labelInputName31);
+            this.CollectionInputLabelName.Add(this.labelInputName32);
 
             this.CollectionOutputButton = new Collection<SmartButton>();
             this.CollectionOutputButton.Clear();
@@ -203,6 +239,14 @@ namespace INT69DC_7C.Forms
             for (int i = 0; i < values.Count; i++)
                 this.SetlabelOnOff(this.CollectionInputLabel[i], values[i] == "1" ? true : false);
         }
+        public void UpdateInputRead1(Collection<string> values)
+        {
+            if (values.Count == 0 || values == null)
+                return;
+
+            for (int i = 0; i < values.Count; i++)
+                this.SetlabelOnOff(this.CollectionInputLabel1[i], values[i] == "1" ? true : false);
+        }
 
         public void DisplayRefresh()
         {

INT69DC_7C/Forms/FormInformation.cs

@@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms
         }
         private void DefaultSetting()
         {
-            this.labelDisplayVer.Text = "11.2.1";
+            this.labelDisplayVer.Text = "11.4.0";
             if(this.ParentForm.SystemConfig.EquipmentMode == 7)
                 this.labelTitleMainboardName.Text = "INT68M-2A";
             else

INT69DC_7C/Forms/FormMain.cs

@@ -115,6 +115,7 @@ namespace INT69DC_7C.Forms
         // Collection
         private Collection<int> CollectionGraphData;                    // 판정설정 그래프 데이터
         private Collection<string> CollectionIOTest_InputData;          // IO Test Input 데이터 취합
+        private Collection<string> CollectionIOTest_InputData1;         // IO Test Input1 데이터 취합 확장보드
         private Collection<string> CollectionZeroParameterRange;        // 자동영점 - 범위
         private Collection<string> CollectionZeroParameterTime;         // 자동영점 - 시간
         private Collection<string> CollectionZeroParameterVariates;     // 자동영점 - 변량
@@ -316,6 +317,7 @@ namespace INT69DC_7C.Forms
             this.CollectionWeightDataTest = new Collection<WeightData>();
             this.CollectionGraphData = new Collection<int>();
             this.CollectionIOTest_InputData = new Collection<string>();
+            this.CollectionIOTest_InputData1 = new Collection<string>();
             this.CollectionZeroParameterRange = new Collection<string>();
             this.CollectionZeroParameterTime = new Collection<string>();
             this.CollectionZeroParameterVariates = new Collection<string>();
@@ -333,6 +335,7 @@ namespace INT69DC_7C.Forms
             this.CollectionWeightDataTest.Clear();
             this.CollectionGraphData.Clear();
             this.CollectionIOTest_InputData.Clear();
+            this.CollectionIOTest_InputData1.Clear();
             this.CollectionZeroParameterRange.Clear();
             this.CollectionZeroParameterTime.Clear();
             this.CollectionZeroParameterVariates.Clear();
@@ -374,6 +377,7 @@ namespace INT69DC_7C.Forms
             for (int i = 0; i < 16; i++)
             {
                 this.CollectionIOTest_InputData.Add("0");
+                this.CollectionIOTest_InputData1.Add("0");
             }
 
             for (int i = 0; i < 12; i++)
@@ -1218,6 +1222,10 @@ namespace INT69DC_7C.Forms
                     if ((ret = this.ReceiveCommandST0(lane, receiveData)) != 0)
                         return ret;
                     break;
+                case "ST1":
+                    if ((ret = this.ReceiveCommandST1(lane, receiveData)) != 0)
+                        return ret;
+                    break;
                 default:
                     break;
             }
@@ -5602,6 +5610,30 @@ namespace INT69DC_7C.Forms
 
             return ret;
         }
+        // IO테스트1-IN
+        private int ReceiveCommandST1(string lane, string receiveData)
+        {
+            int ret = 0;
+
+            switch (lane)
+            {
+                case "0":
+                    #region Value Assign
+                    for (int i = 0; i < 16; i++)
+                        this.CollectionIOTest_InputData1[i] = receiveData.Substring(i, 1);
+                    #endregion
+                    if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormIOTest)
+                    {
+                        if (this.ChildFormIOTest != null)
+                            this.ChildFormIOTest.UpdateInputRead1(this.CollectionIOTest_InputData1);
+                    }
+                    break;
+                default:
+                    break;
+            }
+
+            return ret;
+        }
         #endregion
 
         #region SystemConfiguration File

INT69DC_7C/Forms/FormMenu.cs

@@ -495,21 +495,23 @@ namespace INT69DC_7C.Forms
                     break;
                 case DataStore.UserGroup.NotLogin:
                     #region NotLogin
-                    this.buttonInformation.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInformation;
+                    // true
-                    this.buttonDataBackup.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuDataBackup;
+                    this.buttonInformation.Enabled = true;
-                    this.buttonConfiguration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuConfiguration;
+                    this.buttonDataBackup.Enabled = true;
-                    this.buttonCommunication.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCommunication;
+                    this.buttonConfiguration.Enabled = true;
-                    this.buttonCalibration.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuCalibration;
+                    this.buttonCommunication.Enabled = true;
+                    this.buttonCalibration.Enabled = true;
 
-                    this.buttonSysConfig.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuSystem;
+                    this.buttonSysConfig.Enabled = true;
-                    this.buttonMotorSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuMotor;
+                    this.buttonMotorSetting.Enabled = true;
-                    this.buttonUpdate.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuUpdate;
+                    this.buttonUpdate.Enabled = true;
-                    this.buttonFactoryInitialize.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuInitialization;
+                    this.buttonFactoryInitialize.Enabled = true;
-                    this.buttonIOTest.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuIOTest;
+                    this.buttonIOTest.Enabled = true;
-
-                    this.buttonEquipmentSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuEquipment;
-                    this.buttonTimeSetting.Enabled = this.ParentForm.CurrentUserGroup.NotLogin.IsMenuTime;
 
+                    this.buttonEquipmentSetting.Enabled = true;
+                    this.buttonTimeSetting.Enabled = true;
+                    
+                    // false
                     this.buttonEquipmentTest.Visible = false;
                     this.buttonOptionSetting.Visible = false;
                     this.buttonUser.Enabled = false;

INT69DC_7C/Forms/FormUserEditor.cs

@@ -613,10 +613,22 @@ namespace INT69DC_7C.Forms
         }
         private void UpdateSelectUserDisplay(UserItem item)
         {
+            string pass = "";
             this.SetEnableID(false);
 
+            // ID
             this.labelID.Text = item.ID;
-            this.labelPassword.Text = item.Password;
+            // Password
+            if (this.SelectedUserItem.IsFirstPassword == 1)
+                this.labelPassword.Text = item.Password;
+            else
+            {
+                for (int i = 0; i < item.Password.Length; i++)
+                    pass = pass + '*';
+
+                this.labelPassword.Text = pass;
+            }
+            
             this.UpdateAccessRightDisplay(item.ActiveLevel);
             this.buttonSave.Visible = false;
 
@@ -1055,7 +1067,7 @@ namespace INT69DC_7C.Forms
         private void labelPassword_Click(object sender, EventArgs e)
         {
             string value = "";
-            DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text);
+            DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.SelectedUserItem.Password);
             if (keyboard.ShowDialog() == DialogResult.OK)
             {
                 value = keyboard.RetStringValue;
@@ -1258,12 +1270,19 @@ namespace INT69DC_7C.Forms
             }
             else if (index > 0)
             {
-                this.SetEnablePassword(false);
 
                 if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString())
+                {
+                    this.SetEnablePassword(true);
                     this.buttonDelete.Visible = false;
+                    this.buttonResetPW.Visible = false;
+                }
                 else
+                {
+                    this.SetEnablePassword(false);
                     this.buttonDelete.Visible = true;
+                    this.buttonResetPW.Visible = true;
+                }
 
                 UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString());
             }

INT69DC_7C/Version.txt

@@ -15,6 +15,25 @@
 	멀티형 8,10,12열 컨베어/스틱 계량기
 */
 
+@ Ver 11.4.0 by LSJ
+	- 2024.08.20
+	- Ver 11.3.0 Modify
+	- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
+	- FormMenu 
+	  UpdateDisplayMenuAccess()
+	   NotLogin 수정
+
+@ Ver 11.3.0 by LSJ
+	- 2024.08.14
+	- Ver 11.2.1 Modify
+	- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
+	- IO 확장보드 적용
+	  CW-DIO32
+	  IO 테스트 추가
+	  
+	  ReceiveCommandST0()
+	  16 -> 32 확장
+
 @ Ver 11.2.1 by CJY
 	- 2024.08.05
 	- Ver 11.2.0 Modify