Commit [r39]  Maximize  Restore  History

Merge SBSI with Trunk

michielstikkel 2020-02-03

Browse code at this revision

Parent: [r38]

Child: [r40]

<< < 1 2 3 4 (Page 4 of 4)
removed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/SendCommand
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/GVL_In_Outputs/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/IO/Light_PRG/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Library Manager/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/NVL/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Symbols/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/Communication/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/MainTask/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/Task20ms/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/VISU_TASK/svnobj
removed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/IOClient
removed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/PuzzleClient
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualisation_Vtem/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Hatch/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Laser_Puzzle/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Lights/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Slidingdoor/svnobj
changed /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_VTEM_Test/svnobj
changed /branches/SBSI/Project Settings/svnobj
copied /trunk/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/SendCommand_1 -> /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/SendCommand_1
copied /trunk/Main_Escape_PLC/Plc Logic/Application/Puzzle/BalastTank_PRG -> /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Puzzle/BalastTank_PRG
copied /trunk/Main_Escape_PLC/Plc Logic/Application/Types/Client -> /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/Client
copied /trunk/Main_Escape_PLC/Plc Logic/Application/Types/IOClient_1 -> /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/IOClient_1
copied /trunk/Main_Escape_PLC/Plc Logic/Application/Types/PuzzleClient_1 -> /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/PuzzleClient_1
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/SendCommand
File was removed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/GVL_In_Outputs/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/IO/Light_PRG/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Library Manager/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/NVL/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Symbols/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/Communication/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/MainTask/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/Task20ms/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Task Configuration/VISU_TASK/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/IOClient
File was removed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/PuzzleClient
File was removed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualisation_Vtem/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Hatch/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Laser_Puzzle/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Lights/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_Slidingdoor/svnobj
Binary file was changed.
/branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Visualization_VTEM_Test/svnobj
Binary file was changed.
/branches/SBSI/Project Settings/svnobj
Binary file was changed.
/trunk/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/SendCommand_1 to /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Function Blocks/Puzzle/VtemStateMachine/SendCommand_1
File was copied.
/trunk/Main_Escape_PLC/Plc Logic/Application/Puzzle/BalastTank_PRG to /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Puzzle/BalastTank_PRG
File was copied.
/trunk/Main_Escape_PLC/Plc Logic/Application/Types/Client to /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/Client
File was copied.
/trunk/Main_Escape_PLC/Plc Logic/Application/Types/IOClient_1 to /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/IOClient_1
File was copied.
/trunk/Main_Escape_PLC/Plc Logic/Application/Types/PuzzleClient_1 to /branches/SBSI/Main_Escape_PLC/Plc Logic/Application/Types/PuzzleClient_1
File was copied.
<< < 1 2 3 4 (Page 4 of 4)