diff --git a/BatCharging.Model/客户端发送/CMD5.cs b/BatCharging.Model/客户端发送/CMD5.cs index b218ed9..af098ad 100644 --- a/BatCharging.Model/客户端发送/CMD5.cs +++ b/BatCharging.Model/客户端发送/CMD5.cs @@ -22,6 +22,32 @@ namespace BatCharging.Model public byte value3 { get; set; } /// /// 起始命令地址 + /// 1-----预留 + /// 2-----停止充电 + /// 3-----预留 + /// 4-----充电控制方式 + /// 5-----预留 + /// 6-----预留 + /// 7-----电阻模式输出电压 + /// 8-----电阻模式输出电流 + /// 9-----充电模式 + /// 10----取消预约充电 + /// 11----设备重启 + /// 12----进入升级模式 + /// 13----进入正常应用模式 + /// 14----立即上报一次签到106 报文 + /// 15----立即上报一次桩状态信息 104 报文 + /// 16----扫描支付成功 + /// 17----实时充电(限制)最大充电功率 + /// 18----负载类型 + /// 19----绝缘检测 + /// 20----模块类型 + /// 21----本地计费 + /// 22----刷卡密码输入流程 + /// 23----充电暂停服务 + /// 24----输出电压较准 + /// 25----离线时默认限功率 + /// 26----充电机限电流 /// public UInt32 value4 { get; set; } /// diff --git a/BatCharging.Service/发送方法/ChargerSendCMD.cs b/BatCharging.Service/发送方法/ChargerSendCMD.cs index 8635f78..6e0bfe6 100644 --- a/BatCharging.Service/发送方法/ChargerSendCMD.cs +++ b/BatCharging.Service/发送方法/ChargerSendCMD.cs @@ -47,21 +47,16 @@ namespace BatCharging.Service { List lstContent = new List(); - lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD1.value1)); - lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD1.value2)); + lstContent.AddRange(BitConverter.GetBytes(CMD1.value1)); + lstContent.AddRange(BitConverter.GetBytes(CMD1.value2)); lstContent.Add(CMD1.value3); - lstContent.AddRange(ByteUtils.Int32ToByteArray((int)CMD1.value4)); - + lstContent.AddRange(BitConverter.GetBytes(CMD1.value4)); + lstContent.Add(CMD1.value5); + lstContent.AddRange(BitConverter.GetBytes(CMD1.value6)); if (CMD1.value3 == 1) { - lstContent.Add(CMD1.value5); - lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD1.value6)); lstContent.AddRange(CMD1.value7); } - else - { - - } results = lstContent.ToArray(); } @@ -104,18 +99,14 @@ namespace BatCharging.Service { List lstContent = new List(); - lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD.value1)); - lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD.value2)); + lstContent.AddRange(BitConverter.GetBytes(CMD.value1)); + lstContent.AddRange(BitConverter.GetBytes(CMD.value2)); lstContent.Add(CMD.value3); - lstContent.AddRange(ByteUtils.Int32ToByteArray((int)CMD.value4)); + lstContent.AddRange(BitConverter.GetBytes(CMD.value4)); + lstContent.AddRange(BitConverter.GetBytes(CMD.value5)); if (CMD.value3 == 1) { - lstContent.AddRange(ByteUtils.Int16ToByteArray((short)CMD.value5)); lstContent.AddRange(CMD.value6); - } - else - { - } results = lstContent.ToArray(); } @@ -133,8 +124,6 @@ namespace BatCharging.Service model.CMD = 5; model.checksumDomain = 0x01; - - model.dataDomain = GetRCMD5DataInfo(cMD5); //数据域 model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度 @@ -163,11 +152,8 @@ namespace BatCharging.Service lstContent.Add(CMD.value3); lstContent.AddRange(BitConverter.GetBytes(CMD.value4)); lstContent.Add(CMD.value5); - if (CMD.value3 == 1) - { - lstContent.AddRange(BitConverter.GetBytes(CMD.value4)); - lstContent.AddRange(CMD.value7); - } + lstContent.AddRange(BitConverter.GetBytes(CMD.value6)); + lstContent.AddRange(CMD.value7); results = lstContent.ToArray(); } return results; @@ -668,7 +654,7 @@ namespace BatCharging.Service lstContent.AddRange(BitConverter.GetBytes(CMD.value01)); lstContent.AddRange(BitConverter.GetBytes(CMD.value02)); lstContent.AddRange(BitConverter.GetBytes(CMD.value03)); - lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value04,32)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value04, 32)); lstContent.AddRange(BitConverter.GetBytes(CMD.value05)); lstContent.AddRange(BitConverter.GetBytes(CMD.value06)); lstContent.AddRange(BitConverter.GetBytes(CMD.value07)); @@ -1483,76 +1469,76 @@ namespace BatCharging.Service { List lstContent = new List(); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute1)); + lstContent.Add(CMD.startHour1); + lstContent.Add(CMD.startMinute1); + lstContent.Add(CMD.endHour1); + lstContent.Add(CMD.endMinute1); lstContent.AddRange(BitConverter.GetBytes(CMD.rate1)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute2)); + lstContent.Add(CMD.startHour2); + lstContent.Add(CMD.startMinute2); + lstContent.Add(CMD.endHour2); + lstContent.Add(CMD.endMinute2); lstContent.AddRange(BitConverter.GetBytes(CMD.rate2)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute3)); + lstContent.Add(CMD.startHour3); + lstContent.Add(CMD.startMinute3); + lstContent.Add(CMD.endHour3); + lstContent.Add(CMD.endMinute3); lstContent.AddRange(BitConverter.GetBytes(CMD.rate3)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute4)); + lstContent.Add(CMD.startHour4); + lstContent.Add(CMD.startMinute4); + lstContent.Add(CMD.endHour4); + lstContent.Add(CMD.endMinute4); lstContent.AddRange(BitConverter.GetBytes(CMD.rate4)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute5)); + lstContent.Add(CMD.startHour5); + lstContent.Add(CMD.startMinute5); + lstContent.Add(CMD.endHour5); + lstContent.Add(CMD.endMinute5); lstContent.AddRange(BitConverter.GetBytes(CMD.rate5)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute6)); + lstContent.Add(CMD.startHour6); + lstContent.Add(CMD.startMinute6); + lstContent.Add(CMD.endHour6); + lstContent.Add(CMD.endMinute6); lstContent.AddRange(BitConverter.GetBytes(CMD.rate6)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute7)); + lstContent.Add(CMD.startHour7); + lstContent.Add(CMD.startMinute7); + lstContent.Add(CMD.endHour7); + lstContent.Add(CMD.endMinute7); lstContent.AddRange(BitConverter.GetBytes(CMD.rate7)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute8)); + lstContent.Add(CMD.startHour8); + lstContent.Add(CMD.startMinute8); + lstContent.Add(CMD.endHour8); + lstContent.Add(CMD.endMinute8); lstContent.AddRange(BitConverter.GetBytes(CMD.rate8)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute9)); + lstContent.Add(CMD.startHour9); + lstContent.Add(CMD.startMinute9); + lstContent.Add(CMD.endHour9); + lstContent.Add(CMD.endMinute9); lstContent.AddRange(BitConverter.GetBytes(CMD.rate9)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute10)); + lstContent.Add(CMD.startHour10); + lstContent.Add(CMD.startMinute10); + lstContent.Add(CMD.endHour10); + lstContent.Add(CMD.endMinute10); lstContent.AddRange(BitConverter.GetBytes(CMD.rate10)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute11)); + lstContent.Add(CMD.startHour11); + lstContent.Add(CMD.startMinute11); + lstContent.Add(CMD.endHour11); + lstContent.Add(CMD.endMinute11); lstContent.AddRange(BitConverter.GetBytes(CMD.rate11)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startHour12)); - lstContent.AddRange(BitConverter.GetBytes(CMD.startMinute12)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endHour12)); - lstContent.AddRange(BitConverter.GetBytes(CMD.endMinute12)); + lstContent.Add(CMD.startHour12); + lstContent.Add(CMD.startMinute12); + lstContent.Add(CMD.endHour12); + lstContent.Add(CMD.endMinute12); lstContent.AddRange(BitConverter.GetBytes(CMD.rate12)); results = lstContent.ToArray(); diff --git a/Monitor.ChargeTest/FrmChargeResult.cs b/Monitor.ChargeTest/FrmChargeResult.cs index f385dbd..61e0603 100644 --- a/Monitor.ChargeTest/FrmChargeResult.cs +++ b/Monitor.ChargeTest/FrmChargeResult.cs @@ -245,7 +245,7 @@ namespace Monitor.ChargeTest /// private void button15_Click(object sender, EventArgs e) { - byte type = 0;//0-查询 1-设置 + byte type = 1;//0-查询 1-设置 uint startAddress = 1;//设置/查询参数启始地址 byte[] setData = new byte[8];//设置数据 setData[0] = 0;