..
This commit is contained in:
@@ -12,6 +12,7 @@ using Microsoft.Speech.Synthesis;
|
||||
using Microsoft.Speech;
|
||||
using COMM;
|
||||
using System.CodeDom;
|
||||
using AR;
|
||||
|
||||
namespace Project
|
||||
{
|
||||
@@ -31,7 +32,7 @@ namespace Project
|
||||
public fMain()
|
||||
{
|
||||
InitializeComponent();
|
||||
COMM.VAR.Init(128);
|
||||
VAR.Init(128);
|
||||
PUB.initCore();
|
||||
this.KeyDown += (s1, e1) =>
|
||||
{
|
||||
@@ -186,15 +187,15 @@ namespace Project
|
||||
VAR.BOOL.PropertyChanged += BOOL_PropertyChanged;
|
||||
|
||||
|
||||
///모터용 pLC
|
||||
PUB.PLC = new arDev.FakePLC();
|
||||
PUB.PLC.ValueChanged += PLC_DioChanged;
|
||||
PUB.PLC.FlagChanged += PLC_FlagChanged;
|
||||
PUB.PLC.Message += PLC_Message;
|
||||
/////모터용 pLC
|
||||
//PUB.PLC = new arDev.FakePLC();
|
||||
//PUB.PLC.ValueChanged += PLC_DioChanged;
|
||||
//PUB.PLC.FlagChanged += PLC_FlagChanged;
|
||||
//PUB.PLC.Message += PLC_Message;
|
||||
|
||||
//지그비통신
|
||||
PUB.XBE = new Device.Xbee();
|
||||
PUB.XBE.Message += Xbee_Message;
|
||||
//PUB.XBE.Message += Xbee_Message;
|
||||
//HWState.setTitle(1, 3, Pub.setting.Port_Xbee);
|
||||
//HWState.setTitle(1, 0, Pub.setting.Address_RFID);
|
||||
|
||||
@@ -294,63 +295,7 @@ namespace Project
|
||||
|
||||
#endregion
|
||||
|
||||
string last_xbee_tx = "";
|
||||
string last_xbee_rx = "";
|
||||
|
||||
DateTime lasttime_xbee_tx = DateTime.Now;
|
||||
DateTime lasttime_xbee_rx = DateTime.Now;
|
||||
private void Xbee_Message(object sender, arDev.arRS232.MessageEventArgs e)
|
||||
{
|
||||
if (e.MsgType == arDev.arRS232.MessageType.Error) PUB.logcal.AddE("xbee err : " + e.Message);
|
||||
else if (e.MsgType == arDev.arRS232.MessageType.Normal) PUB.logcal.Add("xbe", e.Message);
|
||||
else if (e.MsgType == arDev.arRS232.MessageType.Recv)
|
||||
{
|
||||
var datastr = System.Text.Encoding.Default.GetString(e.Data, 1, e.Data.Length - 2);
|
||||
var val = datastr.Substring(datastr.Length - 1);
|
||||
var kitno = datastr.Substring(0, datastr.Length - 1);
|
||||
|
||||
if (last_xbee_rx.Equals(e.Message) == false)
|
||||
{
|
||||
PUB.logcal.Add("xbe-rx", e.Message);
|
||||
last_xbee_rx = e.Message;
|
||||
lasttime_xbee_rx = DateTime.Now;
|
||||
}
|
||||
else
|
||||
{
|
||||
var ts = DateTime.Now - lasttime_xbee_rx;
|
||||
if (ts.TotalSeconds > 30)
|
||||
{
|
||||
PUB.logcal.Add("xbe-rx", e.Message);
|
||||
last_xbee_rx = e.Message;
|
||||
lasttime_xbee_rx = DateTime.Now;
|
||||
}
|
||||
}
|
||||
|
||||
PUB.log.Add($"콜버튼:{kitno} 값:{val} 수신");
|
||||
//PUB.XBE.NewMsgEvent(kitno[0], val[0]);
|
||||
}
|
||||
else if (e.MsgType == arDev.arRS232.MessageType.Send)
|
||||
{
|
||||
if (last_xbee_tx.Equals(e.Message) == false)
|
||||
{
|
||||
PUB.logcal.Add("xbe-tx", e.Message);
|
||||
last_xbee_tx = e.Message;
|
||||
lasttime_xbee_tx = DateTime.Now;
|
||||
}
|
||||
else
|
||||
{
|
||||
var ts = DateTime.Now - lasttime_xbee_tx;
|
||||
if (ts.TotalSeconds > 30)
|
||||
{
|
||||
PUB.logcal.Add("xbe-tx", e.Message);
|
||||
last_xbee_tx = e.Message;
|
||||
lasttime_xbee_tx = DateTime.Now;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else PUB.logcal.Add("XBEE", $"Rx:{e.Message}");
|
||||
}
|
||||
|
||||
private void CtlPos1_ItemClick(object sender, CtlPos.ItemClickEventArgs e)
|
||||
{
|
||||
if (VAR.BOOL[eVarBool.FLAG_CHARGEONM] == true)
|
||||
@@ -1005,7 +950,7 @@ namespace Project
|
||||
|
||||
private void btChargeM_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (COMM.VAR.BOOL[eVarBool.FLAG_CHARGEONM])
|
||||
if (VAR.BOOL[eVarBool.FLAG_CHARGEONM])
|
||||
{
|
||||
var dlg = Util.MsgQ("수동 충전을 해제 할까요?");
|
||||
if (dlg != DialogResult.Yes) return;
|
||||
|
||||
Reference in New Issue
Block a user