fix
This commit is contained in:
@@ -87,24 +87,26 @@ namespace Project
|
||||
|
||||
#region "Communication"
|
||||
|
||||
[Category("Commnunication Setting"), DisplayName("XBee PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
[Browsable(false), Category("Commnunication Setting"), DisplayName("XBee PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public string Port_XBE { get; set; }
|
||||
|
||||
[Category("Commnunication Setting"), DisplayName("RFID PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
[Browsable(false), Category("Commnunication Setting"), DisplayName("RFID PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public string Port_AGV { get; set; }
|
||||
|
||||
[Category("Commnunication Setting"), DisplayName("Xbee ID"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public byte XBE_ID { get; set; }
|
||||
|
||||
|
||||
[Category("Commnunication Setting"), DisplayName("BMS PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
[Browsable(false), Category("Commnunication Setting"), DisplayName("BMS PortName"), Editor(typeof(MyUITypeEditor), typeof(UITypeEditor))]
|
||||
public string Port_BAT { get; set; }
|
||||
|
||||
public int ChargerID { get; set; }
|
||||
|
||||
[Browsable(false)]
|
||||
public int Baud_AGV { get; set; }
|
||||
[Browsable(false)]
|
||||
public int Baud_BAT { get; set; }
|
||||
//public int Baud_PLC { get; set; }
|
||||
[Browsable(false)]
|
||||
public int Baud_XBE { get; set; }
|
||||
|
||||
//public int QueryInterval_BAT { get; set; }
|
||||
@@ -219,6 +221,8 @@ namespace Project
|
||||
#region "AGV"
|
||||
|
||||
public bool AutoModeOffAndClearPosition { get; set; }
|
||||
|
||||
[Browsable(false)]
|
||||
public string musicfile { get; set; }
|
||||
|
||||
/// <summary>
|
||||
@@ -235,8 +239,11 @@ namespace Project
|
||||
//public double ChargeLimitLow { get; set; }
|
||||
//public double ChargeLimitHigh { get; set; }
|
||||
|
||||
[Browsable(false)]
|
||||
public string AGV_PANID { get; set; }
|
||||
[Browsable(false)]
|
||||
public string AGV_CHANNEL { get; set; }
|
||||
[Browsable(false)]
|
||||
public string AGV_ADDRESS { get; set; }
|
||||
|
||||
public int SCK { get; set; }
|
||||
@@ -269,31 +276,19 @@ namespace Project
|
||||
public int PID_DS { get; set; }
|
||||
|
||||
public double WheelSpeedCharge { get; set; }
|
||||
|
||||
//public byte MotorUpTime { get; set; }
|
||||
//public double AlignSensorThreshold { get; set; }
|
||||
// public byte BalanceThreshold { get; set; }
|
||||
// public byte BalanceThresholdUp { get; set; }
|
||||
// public byte MarkSensorThreshold { get; set; }
|
||||
//public Boolean Opt_LidarStop { get; set; }
|
||||
//public Boolean Opt_SlowUp { get; set; }
|
||||
//public Boolean Opt_Magnet { get; set; }
|
||||
public byte HomePositionValue { get; set; }
|
||||
public byte HomeKitNo { get; set; }
|
||||
|
||||
|
||||
//public Single interval_bms { get; set; }
|
||||
public Single interval_xbe { get; set; }
|
||||
public int interval_bms { get; set; }
|
||||
//public byte interval_iostate { get; set; }
|
||||
//public Boolean Enable_AutoZDnUp { get; set; }
|
||||
public int doorSoundTerm { get; set; }
|
||||
|
||||
[Browsable(false)]
|
||||
public int musicvol { get; set; }
|
||||
|
||||
public bool Enable_Music { get; set; }
|
||||
#endregion
|
||||
|
||||
[Category("Report"),
|
||||
[Category("Report"), Browsable(false),
|
||||
Description("상태기록시 장비 식별코드(4자리)"),
|
||||
DisplayName("M/C ID")]
|
||||
public string MCID { get; set; }
|
||||
@@ -349,8 +344,8 @@ namespace Project
|
||||
TAG_F3_F4 = 9650;
|
||||
TAG_F4_F5 = 9750;
|
||||
}
|
||||
|
||||
if(TAG_F4_F5 == 0)
|
||||
|
||||
if (TAG_F4_F5 == 0)
|
||||
{
|
||||
TAG_F4_F5 = 9750;
|
||||
TAGF5B = 9800;
|
||||
@@ -368,10 +363,7 @@ namespace Project
|
||||
if (ChargeStartLevel == 0) ChargeStartLevel = 85;
|
||||
if (ChargeMaxLevel == 0) ChargeMaxLevel = 85;
|
||||
if (ChargeEmergencyLevel == 0) ChargeEmergencyLevel = 30;
|
||||
|
||||
if (interval_bms == 0) interval_bms = 1000;
|
||||
//충전은 대기상태 5분이 경과하면 진행한다
|
||||
|
||||
if (interval_bms == 0) interval_bms = 10;
|
||||
|
||||
//충전은 10분간격으로 재시도 한다
|
||||
if (ChargeRetryTerm == 0) ChargeRetryTerm = 600;
|
||||
@@ -379,7 +371,7 @@ namespace Project
|
||||
if (ChargeSearchTime == 0) ChargeSearchTime = 25;
|
||||
//최대 충전진행 시간(기본 1시간)
|
||||
if (ChargeMaxTime == 0) ChargeMaxTime = 3600;
|
||||
// if (interval_iostate == 0 || interval_iostate == 255) interval_iostate = 100;
|
||||
// if (interval_iostate == 0 || interval_iostate == 255) interval_iostate = 100;
|
||||
if (ZSpeed == 0) ZSpeed = 20;
|
||||
if (interval_xbe == 0) interval_xbe = 5.0f;
|
||||
if (HomePositionValue == 0) HomePositionValue = 4;
|
||||
@@ -419,7 +411,7 @@ namespace Project
|
||||
|
||||
|
||||
if (string.IsNullOrEmpty(Port_AGV)) Port_AGV = "COM1";
|
||||
// if (string.IsNullOrEmpty(Port_PLC)) Port_PLC = "COM2";
|
||||
// if (string.IsNullOrEmpty(Port_PLC)) Port_PLC = "COM2";
|
||||
if (string.IsNullOrEmpty(Port_XBE)) Port_XBE = "COM4";
|
||||
if (string.IsNullOrEmpty(Port_BAT)) Port_BAT = "COM7";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user