Amkor/ENIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of file://k4fs3201n/k4bpartcenter$/Repository/K4/ENIG_AGV

Browse Source
This commit is contained in:
backuppc
2026-01-14 17:38:18 +09:00
parent b4da1cca00 48acb5b7b7
commit 0396c61517
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cs_HMI/Project/Class/EEMStatus.cs
View File

@@ -121,8 +121,8 @@ public static partial class EEMStatus
var file = System.IO.Path.Combine(path, $"{DateTime.Now.ToString("HHmmssfff")}_BMS_INF.sql"); var file = System.IO.Path.Combine(path, $"{DateTime.Now.ToString("HHmmssfff")}_BMS_INF.sql");
var sql = "insert into AGV_Shuttle_BMS(MCID,wdate,info_volt,info_current,info_capa,info_level,info_temp1,info_temp2,soc,cycle,protection,balance) " + var sql = "insert into AGV_Shuttle_BMS(MCID,wdate,info_volt,info_current,info_capa,info_level,info_temp1,info_temp2,soc,cycle,protection,balance,watt) " +
$"values('{mcid}','{timestr}',{data.packVoltage},{data.current},{data.fullCapacity},{data.RawLevel},{data.ntcTemp[0]},{data.ntcTemp[1]},{data.rsoc},{data.cycleCount},{data.raw_protection},{data.fullBalance})"; $"values('{mcid}','{timestr}',{data.packVoltage},{data.current},{data.fullCapacity},{data.RawLevel},{data.ntcTemp[0]},{data.ntcTemp[1]},{data.rsoc},{data.cycleCount},{data.raw_protection},{data.fullBalance},{data.watt})";
System.IO.File.WriteAllText(file, sql, System.Text.Encoding.Default); System.IO.File.WriteAllText(file, sql, System.Text.Encoding.Default);
LastBMSIFTime = DateTime.Now; LastBMSIFTime = DateTime.Now;

9
Cs_HMI/Project/Device/BMS.cs
View File

@@ -25,7 +25,8 @@ namespace arDev
get get
{ {
if (Voltage.Any() == false) return 0f; if (Voltage.Any() == false) return 0f;
return Math.Abs(Voltage.Max() - Voltage.Min()); var value = Math.Abs(Voltage.Max() - Voltage.Min());
return value * 1000f;
} }
} }
} }
@@ -71,7 +72,7 @@ namespace arDev
protectionStatus = new BMSProtectionStatus(); protectionStatus = new BMSProtectionStatus();
mosfetStatus = new BMSMosfetStatus(); mosfetStatus = new BMSMosfetStatus();
productionDate = new DateTime(); productionDate = new DateTime();
ntcTemp = new float[] { 0f,0f}; ntcTemp = new float[] { 0f, 0f };
} }
public void Clear() public void Clear()
@@ -435,8 +436,8 @@ namespace arDev
//250620 jwlee 추가 //250620 jwlee 추가
newinfo.ntcCount = LastReceiveBuffer[offset + 22]; //센서갯수 newinfo.ntcCount = LastReceiveBuffer[offset + 22]; //센서갯수
int temp1 = (LastReceiveBuffer[offset + 23] << 8) | LastReceiveBuffer[24]; int temp1 = (LastReceiveBuffer[offset + 23] << 8) | LastReceiveBuffer[offset + 24];
int temp2 = (LastReceiveBuffer[offset + 25] << 8) | LastReceiveBuffer[36]; int temp2 = (LastReceiveBuffer[offset + 25] << 8) | LastReceiveBuffer[offset + 26];
var Current_temp1 = (temp1 - 2731) / 10f; var Current_temp1 = (temp1 - 2731) / 10f;
var Current_temp2 = (temp2 - 2731) / 10f; var Current_temp2 = (temp2 - 2731) / 10f;
newinfo.ntcTemp = new float[] { (temp1 - 2731) / 10f, (temp2 - 2731) / 10f }; newinfo.ntcTemp = new float[] { (temp1 - 2731) / 10f, (temp2 - 2731) / 10f };

10
Cs_HMI/Project/ViewForm/fBms.cs
View File

@@ -70,10 +70,14 @@ namespace Project.ViewForm
else if (PUB.BMS.IsValid == false) else if (PUB.BMS.IsValid == false)
this.lbCycle.Text = "데이터가 유효하지 않습니다"; this.lbCycle.Text = "데이터가 유효하지 않습니다";
else else
this.lbCycle.Text = $"Cell Average:{volt.Average},Delta:{volt.Delta},Cycle({data.cycleCount})"; this.lbCycle.Text = $"Average:{volt.Average:N2}v, Delta:{volt.Delta:N0}, Cycle({data.cycleCount})";
this.arLabel1.Text = $"{data.rsoc}%"; this.arLabel1.Text = $"{data.rsoc}%";
this.arLabel1.Sign = $"{data.packVoltage}v, {data.watt}w";// PUB.BMS.Current_Volt.ToString() + "v"; this.arLabel1.Sign = $"{data.packVoltage}v, {data.watt:N0}w";// PUB.BMS.Current_Volt.ToString() + "v";
this.cv1.Text = volt.Voltage[0].ToString("N3") + "v";
if (data.watt < 0) this.arLabel1.SignColor = Color.Tomato;
else this.arLabel1.SignColor = Color.Lime;
this.cv1.Text = volt.Voltage[0].ToString("N3") + "v";
this.cv2.Text = volt.Voltage[1].ToString("N3") + "v"; this.cv2.Text = volt.Voltage[1].ToString("N3") + "v";
this.cv3.Text = volt.Voltage[2].ToString("N3") + "v"; this.cv3.Text = volt.Voltage[2].ToString("N3") + "v";
this.cv4.Text = volt.Voltage[3].ToString("N3") + "v"; this.cv4.Text = volt.Voltage[3].ToString("N3") + "v";