Merge branch 'master' of gitlab.informatik.hu-berlin.de:badenhop/Hochautomatisiertes-Fahren (7c569901) · Commits · Philipp Badenhoop / Hochautomatisiertes-Fahren

Commit 7c569901 authored 6 years ago by

Phuc Tran Truong

Browse files

Merge branch 'master' of gitlab.informatik.hu-berlin.de:badenhop/Hochautomatisiertes-Fahren

parents 9af64e4a 03bf5a39

Branches

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/app/stangsel/src/stangsel.c 1 addition, 0 deletions

...rung/vehicle_ecu_sw/quellcode/app/stangsel/src/stangsel.c
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/app/stm/src/stm.c 7 additions, 1 deletion

...U/02_lieferung/vehicle_ecu_sw/quellcode/app/stm/src/stm.c
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/app/vehspdctrl/src/vehspdctrl.c 1 addition, 0 deletions

.../vehicle_ecu_sw/quellcode/app/vehspdctrl/src/vehspdctrl.c
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/dev/servo/src/servo.c 1 addition, 0 deletions

..._lieferung/vehicle_ecu_sw/quellcode/dev/servo/src/servo.c
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/obj/app/mavlink/src/mavlink.o 0 additions, 0 deletions

...ng/vehicle_ecu_sw/quellcode/obj/app/mavlink/src/mavlink.o
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/obj/app/stangsel/src/stangsel.o 0 additions, 0 deletions

.../vehicle_ecu_sw/quellcode/obj/app/stangsel/src/stangsel.o
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/obj/app/stm/src/stm.o 0 additions, 0 deletions

..._lieferung/vehicle_ecu_sw/quellcode/obj/app/stm/src/stm.o
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/obj/app/vehspdctrl/src/vehspdctrl.o 0 additions, 0 deletions

...icle_ecu_sw/quellcode/obj/app/vehspdctrl/src/vehspdctrl.o
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/obj/dev/servo/src/servo.o 0 additions, 0 deletions

...ferung/vehicle_ecu_sw/quellcode/obj/dev/servo/src/servo.o
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.bin 0 additions, 0 deletions

...system - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.bin
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.elf 0 additions, 0 deletions

...system - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.elf
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.hex 6686 additions, 6685 deletions

...system - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.hex
attachments/Austausch Assystem - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.map 729 additions, 728 deletions

...system - HU/02_lieferung/vehicle_ecu_sw/quellcode/vlx.map
modules/build.sh 3 additions, 3 deletions

modules/build.sh
modules/catkin_ws/src/PC2CarLib/CMakeLists.txt 0 additions, 3 deletions

modules/catkin_ws/src/PC2CarLib/CMakeLists.txt
modules/catkin_ws/src/VeloxProtocolLib/CMakeLists.txt 167 additions, 26 deletions

modules/catkin_ws/src/VeloxProtocolLib/CMakeLists.txt
modules/catkin_ws/src/VeloxProtocolLib/VeloxProtocolLibConfig.cmake.in 12 additions, 0 deletions

...n_ws/src/VeloxProtocolLib/VeloxProtocolLibConfig.cmake.in
modules/catkin_ws/src/VeloxProtocolLib/VeloxProtocolLibConfigVersion.cmake.in 11 additions, 0 deletions

...c/VeloxProtocolLib/VeloxProtocolLibConfigVersion.cmake.in
modules/catkin_ws/src/VeloxProtocolLib/include/Velox.h 0 additions, 21 deletions

modules/catkin_ws/src/VeloxProtocolLib/include/Velox.h
modules/catkin_ws/src/VeloxProtocolLib/include/VeloxProtocolLib/Connection.h 120 additions, 0 deletions

...rc/VeloxProtocolLib/include/VeloxProtocolLib/Connection.h

with 7738 additions and 7467 deletions

Please register or to comment