Merge branch 'feature/ManualModeSwitch' into develop

Browse Source

# Conflicts:
#	PLC/PLC.tmc
#	PLC/POUs/FB_String.TcPOU
#	PLC/POUs/MAIN.TcPOU
#	Uniper.tsproj

...

This commit is contained in:

Matthias Heisig

2024-08-30 14:32:11 +02:00

parent 08d2ffd136 112f7cb7d9

commit 5e94ba4868

8 changed files with 686 additions and 1367 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

935

PLC/PLC.tmc

File diff suppressed because one or more lines are too long