Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8ccc8df4 由 LN
选项

界面调整

1 个父辈 a9fb410f
全部展开
内嵌 并排
正在显示 23 个修改的文件 包含 227 行增加 和 50 行删除
DeviceLibrary/theMachine/MainMachine _BtnProcess.cs
...@@ -34,7 +34,7 @@ namespace DeviceLibrary ...@@ -34,7 +34,7 @@ namespace DeviceLibrary
lastSuddenStop = false; lastSuddenStop = false;
ProcessMsgEvent?.Invoke(Msg.get()); ProcessMsgEvent?.Invoke(Msg.get());
StringStartOut("按下复位按钮");
} }
void Run_BTN() void Run_BTN()
{ {
......
DeviceLibrary/theMachine/MainMachine_String.cs
...@@ -463,13 +463,19 @@ namespace DeviceLibrary ...@@ -463,13 +463,19 @@ namespace DeviceLibrary
case MoveStep.StringOut_Released: case MoveStep.StringOut_Released:
ServerCM.storeStatus = StoreStatus.StoreOnline; ServerCM.storeStatus = StoreStatus.StoreOnline;
if (StringState == StringStateE.Full) if (StringState == StringStateE.Full)
{ {
//if (ConfigHelper.Config.Get("OpenStringDoorAfterOutStoreEnd", true))
// StringDoorOpen(StringMoveInfo);
Msg.add(crc.GetString(L.string_full_takeout, "料串已满请取出"), MsgLevel.info);//0427 Msg.add(crc.GetString(L.string_full_takeout, "料串已满请取出"), MsgLevel.info);//0427
} }
else else
{
Msg.add(crc.GetString(L.wait_string_take, "等待料串被取走"), MsgLevel.info); Msg.add(crc.GetString(L.wait_string_take, "等待料串被取走"), MsgLevel.info);
}
//如果收到reset信号
//打开折叠门，
//线体转动，等待料串离开
if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW))
{ {
StringMoveInfo.NextMoveStep(MoveStep.Wait); StringMoveInfo.NextMoveStep(MoveStep.Wait);
...@@ -479,6 +485,45 @@ namespace DeviceLibrary ...@@ -479,6 +485,45 @@ namespace DeviceLibrary
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000)); StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
} }
break; break;
// StringOut11_OpenDoor,
//StringOut12_LineRun,
//StringOut13_WaitLeave,
//StringOut14_WaitTime,
//StringOut15_CloseDoor,
case MoveStep.StringOut11_OpenDoor:
StringMoveInfo.NextMoveStep(MoveStep.StringOut12_LineRun);
StringMoveInfo.log($"线体开始反转");
Line.LineRun("o", true, 999);
break;
case MoveStep.StringOut12_LineRun:
StringMoveInfo.NextMoveStep(MoveStep.StringOut13_WaitLeave);
StringMoveInfo.log($"等待料串离开");
Line.LineRun("o", true, 999);
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StringBack_Check, IO_VALUE.LOW));
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StringFront_Check, IO_VALUE.LOW));
break;
case MoveStep.StringOut13_WaitLeave:
StringMoveInfo.NextMoveStep(MoveStep.StringOut14_WaitTime);
StringMoveInfo.log($"料串已离开，停止线体，等待2秒后关闭折叠门");
Line.LineStop("o");
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
break;
case MoveStep.StringOut14_WaitTime:
StringMoveInfo.NextMoveStep(MoveStep.StringOut15_CloseDoor);
StringMoveInfo.log($"料串已离开，关闭折叠门");
CloseDoor(StringMoveInfo);
break;
case MoveStep.StringOut15_CloseDoor:
StringMoveInfo.NextMoveStep(MoveStep.Wait);
LastStringState = StringStateE.None;
StringState = StringStateE.None;
StringMoveInfo.log($"料串已离开");
StringMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
break;
case MoveStep.StringOut_05: case MoveStep.StringOut_05:
if (Setting_Init.Disable_StringDoor || IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH)) if (Setting_Init.Disable_StringDoor || IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH))
{ {
...@@ -519,6 +564,19 @@ namespace DeviceLibrary ...@@ -519,6 +564,19 @@ namespace DeviceLibrary
} }
} }
bool StringStartOut(string msg)
{
if (StringMoveInfo.IsStep(MoveStep.StringOut_Released))
{
StringMoveInfo.NextMoveStep(MoveStep.StringOut11_OpenDoor);
StringMoveInfo.log($"{msg}，料串开始离开，打开折叠门");
OpenDoor(StringMoveInfo);
return true;
}
return false;
}
string StringProcessState() string StringProcessState()
{ {
string state = ""; string state = "";
......
DeviceLibrary/theMachine/MoveStep.cs
...@@ -77,7 +77,14 @@ namespace DeviceLibrary ...@@ -77,7 +77,14 @@ namespace DeviceLibrary
StringOut_01, StringOut_01,
StringOut_02, StringOut_02,
StringOut_03, StringOut_03,
StringOut_Released, StringOut_Released,
StringOut11_OpenDoor,
StringOut12_LineRun,
StringOut13_WaitLeave,
StringOut14_WaitTime,
StringOut15_CloseDoor,
StringOut_05, StringOut_05,
StringOut_06, StringOut_06,
StringOut_07, StringOut_07,
......
TheMachine/FrmMain.Designer.cs → TheMachine/Form1.Designer.cs
 
namespace TheMachine namespace TheMachine
{ {
partial class FrmMain partial class Form1
{ {
/// <summary> /// <summary>
/// 必需的设计器变量。 /// 必需的设计器变量。
...@@ -29,7 +29,7 @@ namespace TheMachine ...@@ -29,7 +29,7 @@ namespace TheMachine
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.设备操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.设备操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启用调试模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用调试模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......
TheMachine/FrmMain.cs → TheMachine/Form1.cs
...@@ -19,9 +19,9 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; ...@@ -19,9 +19,9 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
namespace TheMachine namespace TheMachine
{ {
public partial class FrmMain : Form public partial class Form1 : Form
{ {
public FrmMain() public Form1()
{ {
CheckForIllegalCrossThreadCalls = false; CheckForIllegalCrossThreadCalls = false;
crc.OpenResourceLog = true; crc.OpenResourceLog = true;
......
TheMachine/Program.cs
...@@ -49,7 +49,7 @@ namespace TheMachine ...@@ -49,7 +49,7 @@ namespace TheMachine
Config.LoadMyConfig(new Setting_Init().GetType()); Config.LoadMyConfig(new Setting_Init().GetType());
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FrmMain()); Application.Run(new Form1());
} }
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
......
TheMachine/TheMachine.csproj
...@@ -104,11 +104,11 @@ ...@@ -104,11 +104,11 @@
<Compile Include="AxisControl.Designer.cs"> <Compile Include="AxisControl.Designer.cs">
<DependentUpon>AxisControl.cs</DependentUpon> <DependentUpon>AxisControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmMain.cs"> <Compile Include="Form1.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmMain.Designer.cs"> <Compile Include="Form1.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="IOControls.cs"> <Compile Include="IOControls.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
...@@ -209,8 +209,8 @@ ...@@ -209,8 +209,8 @@
<DependentUpon>AxisControl.cs</DependentUpon> <DependentUpon>AxisControl.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmMain.resx"> <EmbeddedResource Include="Form1.resx">
<DependentUpon>FrmMain.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="IOControls.resx"> <EmbeddedResource Include="IOControls.resx">
<DependentUpon>IOControls.cs</DependentUpon> <DependentUpon>IOControls.cs</DependentUpon>
...@@ -274,15 +274,15 @@ ...@@ -274,15 +274,15 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<None Include="resources\en-US.lngres"> <Content Include="resources\en-US.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
<None Include="resources\ja-JP.lngres"> <Content Include="resources\ja-JP.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
<None Include="resources\zh-CN.lngres"> <Content Include="resources\zh-CN.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
......
TheMachine/resources/en-US.lngres
...@@ -432,3 +432,21 @@ comOpenFail 串口{0}打开失败 Serial port {0} open failed ...@@ -432,3 +432,21 @@ comOpenFail 串口{0}打开失败 Serial port {0} open failed
shengbosensor 声波传感器 Acoustic Sensors shengbosensor 声波传感器 Acoustic Sensors
yalisensor 压力传感器 Pressure sensors yalisensor 压力传感器 Pressure sensors
shengboError 声波感应器误差过大，请检查后重新复位 Acoustic sensor error is too large, please check and reset shengboError 声波感应器误差过大，请检查后重新复位 Acoustic sensor error is too large, please check and reset
Form1_tabc_tabP1_pnl_btn_stop_Text 停止 Stop
Form1_menuStrip1_Text menuStrip1 menuStrip1
Res0031.cbc9a6e9 温湿度超限30分钟 Temperature and Humidity Exceeded for 30 Minutes
ledstate_THOutRange 温湿度超限 Temperature and Humidity Out of Range
Form1_tabc_tab_io_Text IO Debugging IO Debugging
Form1_tabc_tab_axis_Text Servo Debugging Servo Debugging
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRTest_Text 旋转轴循环 Rotational Axis Cycle
Form1_tabc_tab_axis__AxisControl_panel1_button1_Text 停止 Stop
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRStop_Text 旋转轴停止 Rotational Axis Stop
Form1_tabc_tab_axis__AxisControl_panel1_btnGree_Text 流动绿 Flowing Green
Form1_tabc_tab_axis__AxisControl_panel1_btnYellow_Text 流动黄 Flowing Yellow
Form1_tabc_tab_axis__AxisControl_panel1_btnChangeColor_Text 切换颜色 Switch Color
FlipDoor_L_Axis 左翻转托盘 Left Flip Tray
FlipDoor_R_Axis 右翻转托盘 Right Flip Tray
StringDoor_Axis 料串口折叠门 String Folding Door
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号 Detection Signal
Res0001 设备未启动 Device Not Started
TheMachine/resources/ja-JP.lngres
...@@ -435,3 +435,21 @@ shengbosensor 声波传感器 音響センサー ...@@ -435,3 +435,21 @@ shengbosensor 声波传感器 音響センサー
yalisensor 压力传感器 圧力センサー yalisensor 压力传感器 圧力センサー
shengboError 声波感应器误差过大，请检查后重新复位 音響センサーのエラーが大きすぎます shengboError 声波感应器误差过大，请检查后重新复位 音響センサーのエラーが大きすぎます
Form1_tabc_tabP1_pnl_btn_stop_Text 停止 停止
Form1_menuStrip1_Text menuStrip1 menuStrip1
Res0031.cbc9a6e9 温湿度超限30分钟 温湿度超限30分間
ledstate_THOutRange 温湿度超限 温湿度超限
Form1_tabc_tab_io_Text IO Debugging IOデバッグ
Form1_tabc_tab_axis_Text Servo Debugging Servoデバッグ
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRTest_Text 旋转轴循环 旋回軸をループさせる
Form1_tabc_tab_axis__AxisControl_panel1_button1_Text 停止 停止
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRStop_Text 旋转轴停止 旋回軸を停止させる
Form1_tabc_tab_axis__AxisControl_panel1_btnGree_Text 流动绿 流れる緑
Form1_tabc_tab_axis__AxisControl_panel1_btnYellow_Text 流动黄 流れる黄色
Form1_tabc_tab_axis__AxisControl_panel1_btnChangeColor_Text 切换颜色 色を切り替える
FlipDoor_L_Axis 左翻转托盘 左フリップドア
FlipDoor_R_Axis 右翻转托盘 右フリップドア
StringDoor_Axis 料串口折叠门 ストリングドア
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号 検出信号
Res0001 设备未启动 デバイスは始まっていません
TheMachine/resources/zh-CN.lngres
...@@ -419,3 +419,22 @@ comOpenFail 串口{0}打开失败 串口{0}打开失败 ...@@ -419,3 +419,22 @@ comOpenFail 串口{0}打开失败 串口{0}打开失败
shengbosensor 声波传感器 声波传感器 shengbosensor 声波传感器 声波传感器
yalisensor 压力传感器 压力传感器 yalisensor 压力传感器 压力传感器
shengboError 声波感应器误差过大，请检查后重新复位 声波感应器误差过大，请检查后重新复位 shengboError 声波感应器误差过大，请检查后重新复位 声波感应器误差过大，请检查后重新复位
Form1_tabc_tabP1_pnl_btn_stop_Text 停止
Form1_menuStrip1_Text menuStrip1
Res0031.cbc9a6e9 温湿度超限30分钟
ledstate_THOutRange 温湿度超限
Form1_tabc_tab_io_Text IO Debugging
Form1_tabc_tab_axis_Text Servo Debugging
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRTest_Text 旋转轴循环
Form1_tabc_tab_axis__AxisControl_panel1_button1_Text 停止
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRStop_Text 旋转轴停止
Form1_tabc_tab_axis__AxisControl_panel1_btnGree_Text 流动绿
Form1_tabc_tab_axis__AxisControl_panel1_btnYellow_Text 流动黄
Form1_tabc_tab_axis__AxisControl_panel1_btnChangeColor_Text 切换颜色
FlipDoor_L_Axis 左翻转托盘
FlipDoor_R_Axis 右翻转托盘
StringDoor_Axis 料串口折叠门
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号
Res0001 设备未启动
TheMachineNView/FrmMain.Designer.cs → TheMachineNView/Form1.Designer.cs
 
namespace TheMachineNView namespace TheMachineNView
{ {
partial class FrmMain partial class Form1
{ {
/// <summary> /// <summary>
/// 必需的设计器变量。 /// 必需的设计器变量。
...@@ -29,7 +29,7 @@ namespace TheMachineNView ...@@ -29,7 +29,7 @@ namespace TheMachineNView
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmMain)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.设备操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.设备操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启用调试模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用调试模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......
TheMachineNView/FrmMain.cs → TheMachineNView/Form1.cs
...@@ -19,9 +19,9 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel; ...@@ -19,9 +19,9 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.StartPanel;
namespace TheMachineNView namespace TheMachineNView
{ {
public partial class FrmMain : Form public partial class Form1 : Form
{ {
public FrmMain() public Form1()
{ {
CheckForIllegalCrossThreadCalls = false; CheckForIllegalCrossThreadCalls = false;
crc.OpenResourceLog = true; crc.OpenResourceLog = true;
......
TheMachineNView/Program.cs
...@@ -49,7 +49,7 @@ namespace TheMachineNView ...@@ -49,7 +49,7 @@ namespace TheMachineNView
Config.LoadMyConfig(new Setting_Init().GetType()); Config.LoadMyConfig(new Setting_Init().GetType());
Application.EnableVisualStyles(); Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false); Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FrmMain()); Application.Run(new Form1());
} }
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
......
TheMachineNView/SettingControl.Designer.cs
...@@ -134,11 +134,13 @@ namespace TheMachineNView ...@@ -134,11 +134,13 @@ namespace TheMachineNView
// //
// uC_LedConfig1 // uC_LedConfig1
// //
this.uC_LedConfig1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.uC_LedConfig1.AutoScroll = true; this.uC_LedConfig1.AutoScroll = true;
this.uC_LedConfig1.Config = null; this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Location = new System.Drawing.Point(0, 203); this.uC_LedConfig1.Location = new System.Drawing.Point(0, 203);
this.uC_LedConfig1.Name = "uC_LedConfig1"; this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(694, 427); this.uC_LedConfig1.Size = new System.Drawing.Size(679, 427);
this.uC_LedConfig1.TabIndex = 9; this.uC_LedConfig1.TabIndex = 9;
this.uC_LedConfig1.Tag = "not"; this.uC_LedConfig1.Tag = "not";
// //
...@@ -161,7 +163,7 @@ namespace TheMachineNView ...@@ -161,7 +163,7 @@ namespace TheMachineNView
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.tp); this.Controls.Add(this.tp);
this.Name = "SettingControl"; this.Name = "SettingControl";
this.Size = new System.Drawing.Size(700, 908); this.Size = new System.Drawing.Size(682, 908);
this.Load += new System.EventHandler(this.SettingControl_Load); this.Load += new System.EventHandler(this.SettingControl_Load);
this.tp.ResumeLayout(false); this.tp.ResumeLayout(false);
this.tp.PerformLayout(); this.tp.PerformLayout();
......
TheMachineNView/TheMachineNView.csproj
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>false</Deterministic> <Deterministic>false</Deterministic>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl> <PublishUrl>publish\</PublishUrl>
<Install>true</Install> <Install>true</Install>
<InstallFrom>Disk</InstallFrom> <InstallFrom>Disk</InstallFrom>
...@@ -25,7 +26,6 @@ ...@@ -25,7 +26,6 @@
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup> </PropertyGroup>
...@@ -104,11 +104,11 @@ ...@@ -104,11 +104,11 @@
<Compile Include="AxisControl.Designer.cs"> <Compile Include="AxisControl.Designer.cs">
<DependentUpon>AxisControl.cs</DependentUpon> <DependentUpon>AxisControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmMain.cs"> <Compile Include="Form1.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
<Compile Include="FrmMain.Designer.cs"> <Compile Include="Form1.Designer.cs">
<DependentUpon>FrmMain.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="IOControls.cs"> <Compile Include="IOControls.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
...@@ -203,8 +203,8 @@ ...@@ -203,8 +203,8 @@
<DependentUpon>AxisControl.cs</DependentUpon> <DependentUpon>AxisControl.cs</DependentUpon>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmMain.resx"> <EmbeddedResource Include="Form1.resx">
<DependentUpon>FrmMain.cs</DependentUpon> <DependentUpon>Form1.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="IOControls.resx"> <EmbeddedResource Include="IOControls.resx">
<DependentUpon>IOControls.cs</DependentUpon> <DependentUpon>IOControls.cs</DependentUpon>
...@@ -265,15 +265,15 @@ ...@@ -265,15 +265,15 @@
<DependentUpon>Settings.settings</DependentUpon> <DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput> <DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile> </Compile>
<None Include="resources\en-US.lngres"> <Content Include="resources\en-US.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
<None Include="resources\ja-JP.lngres"> <Content Include="resources\ja-JP.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
<None Include="resources\zh-CN.lngres"> <Content Include="resources\zh-CN.lngres">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
......
TheMachineNView/UC/UC_LedConfig.Designer.cs
...@@ -42,22 +42,22 @@ namespace TheMachineNView ...@@ -42,22 +42,22 @@ namespace TheMachineNView
this.tableLayoutPanel1.AutoSize = true; this.tableLayoutPanel1.AutoSize = true;
this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single; this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
this.tableLayoutPanel1.ColumnCount = 4; this.tableLayoutPanel1.ColumnCount = 4;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 40F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 34F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 22F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 33F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 33F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel1.Size = new System.Drawing.Size(573, 312); this.tableLayoutPanel1.Size = new System.Drawing.Size(601, 363);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// button_reset // button_reset
// //
this.button_reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button_reset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button_reset.Location = new System.Drawing.Point(8, 321); this.button_reset.Location = new System.Drawing.Point(8, 372);
this.button_reset.Name = "button_reset"; this.button_reset.Name = "button_reset";
this.button_reset.Size = new System.Drawing.Size(162, 34); this.button_reset.Size = new System.Drawing.Size(162, 34);
this.button_reset.TabIndex = 1; this.button_reset.TabIndex = 1;
...@@ -68,7 +68,7 @@ namespace TheMachineNView ...@@ -68,7 +68,7 @@ namespace TheMachineNView
// button_save // button_save
// //
this.button_save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button_save.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button_save.Location = new System.Drawing.Point(176, 321); this.button_save.Location = new System.Drawing.Point(176, 372);
this.button_save.Name = "button_save"; this.button_save.Name = "button_save";
this.button_save.Size = new System.Drawing.Size(162, 34); this.button_save.Size = new System.Drawing.Size(162, 34);
this.button_save.TabIndex = 1; this.button_save.TabIndex = 1;
...@@ -83,7 +83,7 @@ namespace TheMachineNView ...@@ -83,7 +83,7 @@ namespace TheMachineNView
this.Controls.Add(this.button_reset); this.Controls.Add(this.button_reset);
this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.tableLayoutPanel1);
this.Name = "UC_LedConfig"; this.Name = "UC_LedConfig";
this.Size = new System.Drawing.Size(585, 362); this.Size = new System.Drawing.Size(613, 413);
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
......
TheMachineNView/positionTool/FrmPositionTool.Designer.cs
...@@ -196,10 +196,10 @@ ...@@ -196,10 +196,10 @@
this.ioStatusControl1.IOName = "检测信号"; this.ioStatusControl1.IOName = "检测信号";
this.ioStatusControl1.IOValue = 0; this.ioStatusControl1.IOValue = 0;
this.ioStatusControl1.isCanClick = false; this.ioStatusControl1.isCanClick = false;
this.ioStatusControl1.Location = new System.Drawing.Point(421, 89); this.ioStatusControl1.Location = new System.Drawing.Point(477, 22);
this.ioStatusControl1.Margin = new System.Windows.Forms.Padding(4); this.ioStatusControl1.Margin = new System.Windows.Forms.Padding(4);
this.ioStatusControl1.Name = "ioStatusControl1"; this.ioStatusControl1.Name = "ioStatusControl1";
this.ioStatusControl1.Size = new System.Drawing.Size(267, 31); this.ioStatusControl1.Size = new System.Drawing.Size(137, 95);
this.ioStatusControl1.TabIndex = 279; this.ioStatusControl1.TabIndex = 279;
// //
// btnAbsMove // btnAbsMove
......
TheMachineNView/resources/en-US.lngres
...@@ -432,3 +432,21 @@ comOpenFail 串口{0}打开失败 Serial port {0} open failed ...@@ -432,3 +432,21 @@ comOpenFail 串口{0}打开失败 Serial port {0} open failed
shengbosensor 声波传感器 Acoustic Sensors shengbosensor 声波传感器 Acoustic Sensors
yalisensor 压力传感器 Pressure sensors yalisensor 压力传感器 Pressure sensors
shengboError 声波感应器误差过大，请检查后重新复位 Acoustic sensor error is too large, please check and reset shengboError 声波感应器误差过大，请检查后重新复位 Acoustic sensor error is too large, please check and reset
Form1_tabc_tabP1_pnl_btn_stop_Text 停止 Stop
Form1_menuStrip1_Text menuStrip1 menuStrip1
Res0031.cbc9a6e9 温湿度超限30分钟 Temperature and Humidity Exceeded for 30 Minutes
ledstate_THOutRange 温湿度超限 Temperature and Humidity Out of Range
Form1_tabc_tab_io_Text IO Debugging IO Debugging
Form1_tabc_tab_axis_Text Servo Debugging Servo Debugging
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRTest_Text 旋转轴循环 Rotational Axis Cycle
Form1_tabc_tab_axis__AxisControl_panel1_button1_Text 停止 Stop
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRStop_Text 旋转轴停止 Rotational Axis Stop
Form1_tabc_tab_axis__AxisControl_panel1_btnGree_Text 流动绿 Flowing Green
Form1_tabc_tab_axis__AxisControl_panel1_btnYellow_Text 流动黄 Flowing Yellow
Form1_tabc_tab_axis__AxisControl_panel1_btnChangeColor_Text 切换颜色 Switch Color
FlipDoor_L_Axis 左翻转托盘 Left Flip Tray
FlipDoor_R_Axis 右翻转托盘 Right Flip Tray
StringDoor_Axis 料串口折叠门 String Folding Door
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号 Detection Signal
Res0001 设备未启动 Device Not Started
\ No newline at end of file \ No newline at end of file
TheMachineNView/resources/ja-JP.lngres
...@@ -435,3 +435,21 @@ shengbosensor 声波传感器 音響センサー ...@@ -435,3 +435,21 @@ shengbosensor 声波传感器 音響センサー
yalisensor 压力传感器 圧力センサー yalisensor 压力传感器 圧力センサー
shengboError 声波感应器误差过大，请检查后重新复位 音響センサーのエラーが大きすぎます shengboError 声波感应器误差过大，请检查后重新复位 音響センサーのエラーが大きすぎます
Form1_tabc_tabP1_pnl_btn_stop_Text 停止 停止
Form1_menuStrip1_Text menuStrip1 menuStrip1
Res0031.cbc9a6e9 温湿度超限30分钟 温湿度超限30分間
ledstate_THOutRange 温湿度超限 温湿度超限
Form1_tabc_tab_io_Text IO Debugging IOデバッグ
Form1_tabc_tab_axis_Text Servo Debugging Servoデバッグ
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRTest_Text 旋转轴循环 旋回軸をループさせる
Form1_tabc_tab_axis__AxisControl_panel1_button1_Text 停止 停止
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRStop_Text 旋转轴停止 旋回軸を停止させる
Form1_tabc_tab_axis__AxisControl_panel1_btnGree_Text 流动绿 流れる緑
Form1_tabc_tab_axis__AxisControl_panel1_btnYellow_Text 流动黄 流れる黄色
Form1_tabc_tab_axis__AxisControl_panel1_btnChangeColor_Text 切换颜色 色を切り替える
FlipDoor_L_Axis 左翻转托盘 左フリップドア
FlipDoor_R_Axis 右翻转托盘 右フリップドア
StringDoor_Axis 料串口折叠门 ストリングドア
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号 検出信号
Res0001 设备未启动 デバイスは始まっていません
TheMachineNView/resources/zh-CN.lngres
...@@ -419,3 +419,22 @@ comOpenFail 串口{0}打开失败 串口{0}打开失败 ...@@ -419,3 +419,22 @@ comOpenFail 串口{0}打开失败 串口{0}打开失败
shengbosensor 声波传感器 声波传感器 shengbosensor 声波传感器 声波传感器
yalisensor 压力传感器 压力传感器 yalisensor 压力传感器 压力传感器
shengboError 声波感应器误差过大，请检查后重新复位 声波感应器误差过大，请检查后重新复位 shengboError 声波感应器误差过大，请检查后重新复位 声波感应器误差过大，请检查后重新复位
Form1_tabc_tabP1_pnl_btn_stop_Text 停止
Form1_menuStrip1_Text menuStrip1
Res0031.cbc9a6e9 温湿度超限30分钟
ledstate_THOutRange 温湿度超限
Form1_tabc_tab_io_Text IO Debugging
Form1_tabc_tab_axis_Text Servo Debugging
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRTest_Text 旋转轴循环
Form1_tabc_tab_axis__AxisControl_panel1_button1_Text 停止
Form1_tabc_tab_axis__AxisControl_panel1_btnAxisRStop_Text 旋转轴停止
Form1_tabc_tab_axis__AxisControl_panel1_btnGree_Text 流动绿
Form1_tabc_tab_axis__AxisControl_panel1_btnYellow_Text 流动黄
Form1_tabc_tab_axis__AxisControl_panel1_btnChangeColor_Text 切换颜色
FlipDoor_L_Axis 左翻转托盘
FlipDoor_R_Axis 右翻转托盘
StringDoor_Axis 料串口折叠门
FrmPositionTool_groupBox6_groupBox1_ioStatusControl1_label1_Text 检测信号
Res0001 设备未启动
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!