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

..

Browse Source
This commit is contained in:
backuppc
2026-01-14 15:29:38 +09:00
parent 5801137d63
commit d5516f9708
17 changed files with 605 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Cs_HMI/Project/StateMachine/_TMDisplay.cs
View File

@@ -59,10 +59,11 @@ namespace Project
panTopMenu.Enabled == false) panTopMenu.Enabled = true;
//배터리정보표시
lbBat.VLevel = PUB.BMS.Current_Level;
lbBat.Volt = PUB.BMS.Current_Volt;
lbBat.MaxA = PUB.BMS.Current_MaxAmp;
lbBat.CurA = PUB.BMS.Current_Amp;
var bmsinfo = PUB.BMS.BMSInformation;
lbBat.VLevel = bmsinfo.rsoc;
lbBat.Volt = bmsinfo.packVoltage;
lbBat.MaxA = bmsinfo.fullCapacity;
lbBat.CurA = bmsinfo.remainingCapacity;
lbBat.IsOpen = PUB.BMS.IsOpen;
//쓰레드로인해서 메인에서 진행하게한다. SPS는 메인쓰레드에서 진행 됨
@@ -174,8 +175,8 @@ namespace Project
var tsIdle = VAR.TIME.RUN(eVarTime.ChargeStart);
lbIDLE.ProgressMax = 100;// PUB.setting.ChargeMaxLevel;
lbIDLE.ProgressMin = 0;
lbIDLE.Text = $"{PUB.BMS.Current_Level:N0}%";
lbIDLE.ProgressValue = (float)PUB.BMS.Current_Level;
lbIDLE.Text = $"{PUB.BMS.BMSInformation.rsoc}%";
lbIDLE.ProgressValue = (float)PUB.BMS.BMSInformation.rsoc;
}
else
{
@@ -184,8 +185,8 @@ namespace Project
var tsIdle = VAR.TIME.RUN(eVarTime.ChargeStart);
lbIDLE.ProgressMax = PUB.setting.ChargeMaxLevel;
lbIDLE.ProgressMin = 0;
lbIDLE.Text = $"({PUB.BMS.Current_Level:N0}/{PUB.setting.ChargeMaxLevel})%";
lbIDLE.ProgressValue = (float)PUB.BMS.Current_Level;
lbIDLE.Text = $"({PUB.BMS.BMSInformation.rsoc}/{PUB.setting.ChargeMaxLevel})%";
lbIDLE.ProgressValue = (float)PUB.BMS.BMSInformation.rsoc;
//}
//else
//{
@@ -380,7 +381,7 @@ namespace Project
/// </summary>
void Update_BatteryWarnSpeak()
{
if (PUB.BMS == null || PUB.BMS.Current_Level > 40) return;
if (PUB.BMS == null || PUB.BMS.BMSInformation.rsoc > 40) return;
//가동중이거나 수동모드에서는 메세지 알림한다
if (PUB.AGV.system1.agv_run || VAR.BOOL[eVarBool.FLAG_AUTORUN] == false)
@@ -605,7 +606,7 @@ namespace Project
{
//남은 충전시간 계산
string msg = string.Empty;
if (PUB.BMS.Current_Level < PUB.setting.ChargeEmergencyLevel)
if (PUB.BMS.BMSInformation.rsoc < PUB.setting.ChargeEmergencyLevel)
{
msg = $"충전 진행 중(이동 불가)\n저전압으로 인해 사용이 불가 합니다";
}