Revert "change - Timer完善 增加 等待加入多綫程"

This reverts commit e00504ce9a.
master
wangsr 1 year ago
parent e06d8c8d68
commit be5c0bc9a1

@ -28,7 +28,6 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
this.FOR_MOTOR = new System.Windows.Forms.GroupBox(); this.FOR_MOTOR = new System.Windows.Forms.GroupBox();
this.Alarm = new System.Windows.Forms.Label(); this.Alarm = new System.Windows.Forms.Label();
this.Run = new System.Windows.Forms.Label(); this.Run = new System.Windows.Forms.Label();
@ -127,7 +126,6 @@
this.Running_VFD = new System.Windows.Forms.Label(); this.Running_VFD = new System.Windows.Forms.Label();
this.DmChange_FOR_MOTOR_S = new System.Windows.Forms.ListBox(); this.DmChange_FOR_MOTOR_S = new System.Windows.Forms.ListBox();
this.DmChange_FOR_MOTOR_VFD = new System.Windows.Forms.ListBox(); this.DmChange_FOR_MOTOR_VFD = new System.Windows.Forms.ListBox();
this.ValueTimer = new System.Windows.Forms.Timer(this.components);
this.FOR_MOTOR.SuspendLayout(); this.FOR_MOTOR.SuspendLayout();
this.FOR_MOTOR_S_TO_T.SuspendLayout(); this.FOR_MOTOR_S_TO_T.SuspendLayout();
this.FOR_MOTOR_VFD.SuspendLayout(); this.FOR_MOTOR_VFD.SuspendLayout();
@ -1130,12 +1128,6 @@
this.DmChange_FOR_MOTOR_VFD.TabIndex = 5; this.DmChange_FOR_MOTOR_VFD.TabIndex = 5;
this.DmChange_FOR_MOTOR_VFD.SelectedIndexChanged += new System.EventHandler(this.DmChange_FOR_MOTOR_VFD_SelectedIndexChanged); this.DmChange_FOR_MOTOR_VFD.SelectedIndexChanged += new System.EventHandler(this.DmChange_FOR_MOTOR_VFD_SelectedIndexChanged);
// //
// ValueTimer
//
this.ValueTimer.Enabled = true;
this.ValueTimer.Interval = 1000;
this.ValueTimer.Tick += new System.EventHandler(this.ValueTimer_Tick);
//
// ElectronicMachineryStateMonitor // ElectronicMachineryStateMonitor
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@ -1259,6 +1251,5 @@
private System.Windows.Forms.Label Alarm_VFD; private System.Windows.Forms.Label Alarm_VFD;
private System.Windows.Forms.Label VVVF_OK_VFD; private System.Windows.Forms.Label VVVF_OK_VFD;
private System.Windows.Forms.Label Running_VFD; private System.Windows.Forms.Label Running_VFD;
private System.Windows.Forms.Timer ValueTimer;
} }
} }

@ -172,12 +172,5 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ElectronicMach
SetSpeed_M_VFD.Text = GetDataToString(dmName, "_SetSpeedM"); SetSpeed_M_VFD.Text = GetDataToString(dmName, "_SetSpeedM");
ACT_Speed_VFD.Text = GetDataToString(dmName, "_ACTSpeed"); ACT_Speed_VFD.Text = GetDataToString(dmName, "_ACTSpeed");
} }
private void ValueTimer_Tick(object sender, EventArgs e)
{
StateMonitor_FOR_MOTOR(DmName_FOR_MOTOR);
StateMonitor_FOR_MOTOR_S(DmName_FOR_MOTOR_S);
StateMonitor_FOR_MOTOR_VFD(DmName_FOR_MOTOR_VFD);
}
} }
} }

@ -117,7 +117,4 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="ValueTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root> </root>

@ -23,8 +23,6 @@ namespace Mesnac.Action.ChemicalWeighing.EngineeringDebuggingMode.ValveStateMoni
public ValveStateMonitor() public ValveStateMonitor()
{ {
InitializeComponent(); InitializeComponent();
StateMonitor_D(DmName_D);
StateMonitor_S(DmName_S);
} }

@ -153,6 +153,9 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath> <HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Office.Interop.Excel">
<HintPath>..\Microsoft.Office.Interop.Excel.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" /> <Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

@ -42,7 +42,7 @@ namespace Mesnac.Action.ChemicalWeighing.Test
// dbHelper.CommandText = sql; // dbHelper.CommandText = sql;
ElectronicMachineryStateMonitor Form = new ElectronicMachineryStateMonitor(); ValveStateMonitor Form = new ValveStateMonitor();
Form.Show(); Form.Show();

Loading…
Cancel
Save