chojy
/
INT69DC_7C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
DESKTOP-999R8N3\CJY 2024-09-03 16:03:16 +09:00
parent 0a64fc1647 7f59f9b69c
commit 4816823981
3 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INT69DC_7C/Forms/FormInformation.cs
View File

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

59
INT69DC_7C/Forms/FormMain.cs
View File

@ -9971,12 +9971,15 @@ namespace INT69DC_7C.Forms
public void IntegratedTransmission(Collection<WeightData> datas)
{
#region ATPC
bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData);
if (this.SystemConfig.IsAlarmTotalPassCntEnable == true)
{
bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(datas);
if (result == true)
this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard);
if (result == true)
this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard);
this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt);
this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt);
}
#endregion
#region COM3
@ -10014,7 +10017,7 @@ namespace INT69DC_7C.Forms
#endregion
// DataBackup
this.TrackingInspectionData(this.CollectionWeightData);
this.TrackingInspectionData(datas);
}
public void IntegratedTransmissionCheck(Collection<WeightData> datas)
{
@ -11968,51 +11971,7 @@ namespace INT69DC_7C.Forms
{
this.timerTimeOutTransmission.Enabled = false;
#region ATPC
bool result = this.CurrentAlarmTotalPassCnt.SetCountStic2(this.CollectionWeightData);
if (result == true)
this.TransferData(CommunicationCommand.AlarmPulseNG, CommunicationID.MainBoard);
this.ChildFormMainDisplay.UpdateAlarmTotalPassCountDisplay(this.CurrentAlarmTotalPassCnt);
#endregion
#region COM3
switch (this.SystemConfig.Serial3Mode)
{
case 2:
this.UartCom3Write(this.Protocol_OPT2_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData));
break;
case 3:
this.UartCom3Write(this.Protocol_OPT3_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem));
break;
case 6:
this.UartCom3Write(this.Protocol_OPT5_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem));
break;
default:
break;
}
#endregion
#region Ethernet
switch (this.SystemConfig.EthernetMode)
{
case 1:
this.SendEthernetData(this.Protocol_OPT2_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData));
break;
case 2:
this.SendEthernetData(this.Protocol_OPT3_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem));
break;
case 4:
this.SendEthernetData(this.Protocol_OPT5_NotStxEtx_1(this.SystemConfig, this.CollectionWeightData, this.CurrentProductItem));
break;
default:
break;
}
#endregion
// DataBackup
this.TrackingInspectionData(this.CollectionWeightData);
this.IntegratedTransmission(this.CollectionWeightData);
foreach (WeightData data in this.CollectionWeightData)
data.IsUpdate = false;

9
INT69DC_7C/Version.txt
View File

@ -15,9 +15,16 @@
멀티형 8,10,12열 컨베어/스틱 계량기
*/
@ Ver 11.4.2 by LSJ
- 2024.08.27
- Ver 11.4.1 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- 정량알람카운트 버그 수정 (ATPC)
스틱2 모드 일때 기능 OFF 안되는 문제점 수정 (항상 ON 상태임)
@ Ver 11.4.1 by CJY
- 2024.08.21
- Ver 11.3.0 Modify
- Ver 11.4.0 Modify
- Framework : SmartX Framework V3.1.1(update: 2019.03.21)
- (버그수정)단순 로그인 시, 자동 로그아웃 기능 실행되는 버그 수정