..
This commit is contained in:
@@ -471,7 +471,7 @@ namespace Project
|
||||
|
||||
if (tagStr == "XBE") tbPortXBE.Text = newPort;
|
||||
else if (tagStr == "AGV") tbPortAGV.Text = newPort;
|
||||
// else if (tagStr == "PLC") tbPortPLC.Text = newPort;
|
||||
// else if (tagStr == "PLC") tbPortPLC.Text = newPort;
|
||||
else if (tagStr == "BAT") tbportBMS.Text = newPort;
|
||||
|
||||
}
|
||||
@@ -511,7 +511,7 @@ namespace Project
|
||||
}
|
||||
try
|
||||
{
|
||||
if (PUB.mplayer.SoundLocation.isEmpty()==false) PUB.mplayer.Stop();
|
||||
if (PUB.mplayer.SoundLocation.isEmpty() == false) PUB.mplayer.Stop();
|
||||
PUB.mplayer.SoundLocation = tbMusic.Text;// (new Uri(tbMusic.Text));
|
||||
PUB.mplayer.Play();
|
||||
PUB.bPlayMusic = true;
|
||||
@@ -535,14 +535,14 @@ namespace Project
|
||||
if (this.tbPortAGV.Text == "COM21")
|
||||
{
|
||||
this.tbPortAGV.Text = "COM11";
|
||||
// this.tbPortPLC.Text = "COM6";
|
||||
// this.tbPortPLC.Text = "COM6";
|
||||
this.tbportBMS.Text = "COM15";
|
||||
this.tbPortXBE.Text = "COM18";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.tbPortAGV.Text = "COM21";
|
||||
// this.tbPortPLC.Text = "COM31";
|
||||
// this.tbPortPLC.Text = "COM31";
|
||||
this.tbportBMS.Text = "COM41";
|
||||
this.tbPortXBE.Text = "COM51";
|
||||
}
|
||||
@@ -615,35 +615,35 @@ namespace Project
|
||||
private void button7_Click(object sender, EventArgs e)
|
||||
{
|
||||
var value = tbagvaddr.Text.PadLeft(4, '0');
|
||||
if (PUB.AGV.AGVCommand("SAD", value))
|
||||
if (PUB.AGV.AGVCommand("SAD", value) == arDev.eNarumiCommandResult.Success)
|
||||
{
|
||||
PUB.setting.AGV_ADDRESS = value;
|
||||
PUB.setting.Save();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void button5_Click(object sender, EventArgs e)
|
||||
{
|
||||
var value = tbagvpanid.Text.PadLeft(4, '0');
|
||||
if (PUB.AGV.AGVCommand("SPN", value))
|
||||
if (PUB.AGV.AGVCommand("SPN", value) == arDev.eNarumiCommandResult.Success)
|
||||
{
|
||||
PUB.setting.AGV_PANID = value;
|
||||
PUB.setting.Save();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void button6_Click(object sender, EventArgs e)
|
||||
{
|
||||
var value = tbagvchannel.Text.PadLeft(4, '0');
|
||||
if (PUB.AGV.AGVCommand("SCH", value))
|
||||
if (PUB.AGV.AGVCommand("SCH", value) == arDev.eNarumiCommandResult.Success)
|
||||
{
|
||||
PUB.setting.AGV_CHANNEL = value;
|
||||
PUB.setting.Save();
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void tbagvaddr_Click(object sender, EventArgs e)
|
||||
@@ -659,7 +659,7 @@ namespace Project
|
||||
{
|
||||
var value = (ushort)vcGDS.Value;
|
||||
var rlt = PUB.AGV.TurnGDSCenterScope(value);
|
||||
if (rlt == false) UTIL.MsgE("Error");
|
||||
if (rlt != arDev.eNarumiCommandResult.Success) UTIL.MsgE($"Error\n{rlt}");
|
||||
else UTIL.MsgI("OK");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user