Heisig_GmbH/Uniper_PLC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitlab.cmblu.net:sps-allgemein/uniblu into develop

Browse Source 
# Conflicts:
#	PLC/PLC.tmc
#	Uniper.tsproj
This commit is contained in:
Markus Neukirch
2025-08-04 18:15:08 +02:00
parent e2a44b0d37 dacce53625
commit 6f357a3913
4 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
PLC/PLC.tmc
View File

File diff suppressed because one or more lines are too long

3
PLC/POUs/FB_String.TcPOU
View File

@@ -412,7 +412,7 @@ HandleErrors();
CASE _iState OF CASE _iState OF
0: // Idle 0: // Idle
// Start in normal mode // Start in normal mode
IF xEnable AND xAllModulesInAutoMode AND xRepairSwitchOk AND (NOT _xErrorInternal) THEN IF (xEnable OR xStartBalancing) AND xAllModulesInAutoMode AND xRepairSwitchOk AND (NOT _xErrorInternal) THEN
_xEnable := TRUE; _xEnable := TRUE;
CASE eOperationMode OF CASE eOperationMode OF
@@ -424,6 +424,7 @@ CASE _iState OF
E_STRING_OPERATING_MODE.BALANCING: E_STRING_OPERATING_MODE.BALANCING:
_xStartBalancing := TRUE; _xStartBalancing := TRUE;
_xReleaseLimitErrorsInternal := FALSE; _xReleaseLimitErrorsInternal := FALSE;
_xEnable := FALSE;
_iState := 7; _iState := 7;
// Safety check mode // Safety check mode

2
PLC/POUs/FB_Unit.TcPOU
View File

@@ -996,7 +996,7 @@ CASE _iState OF
_iState := 1000; _iState := 1000;
END_IF END_IF
IF (NOT xEnable) THEN IF (NOT xEnable) AND NOT xStartBalancing THEN
_iState := 51; _iState := 51;
END_IF END_IF

2
Uniper.tsproj
View File

@@ -269,7 +269,7 @@
</System> </System>
<Plc> <Plc>
<Project GUID="{9AE64910-5EB2-4866-93FD-EFE059C38C36}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" CopyTmcToTarget="true" CopyTpyToTarget="false" SymbolicMapping="true"> <Project GUID="{9AE64910-5EB2-4866-93FD-EFE059C38C36}" Name="PLC" PrjFilePath="PLC\PLC.plcproj" TmcFilePath="PLC\PLC.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" CopyTmcToTarget="true" CopyTpyToTarget="false" SymbolicMapping="true">
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{64CB4C75-7104-EEA4-3FBC-05991E35D8D7}" TmcPath="PLC\PLC.tmc"> <Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcHash="{07E9B518-2512-A373-B429-1E1430A84C16}" TmcPath="PLC\PLC.tmc">
<Name>PLC Instance</Name> <Name>PLC Instance</Name>
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID> <CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
<Vars VarGrpType="2" AreaNo="1"> <Vars VarGrpType="2" AreaNo="1">