Actual diff between the code on the vehicle and in the repo, as on 26/8/2015. Diff needs to be created as the EOL character is different in both places.

actualDiff.md

The actual diff between the commits:

• https://github.com/icyflame/kraken_3.0/commit/48c4b897ccd52b57779bd5fb9f5f1ca6e1b41632
• https://github.com/auviitkgp/kraken_3.0/commit/de3e47d504ce9ee920c043ec5e182ffe9d3a4b51

gd --name-only --ignore-space-at-eol 48c4b897ccd52b57779bd5fb9f5f1ca6e1b41632 de3e47d504ce9ee920c043ec5e182ffe9d3a4b51 | clip
Scripts/launch/goKraken.launch
Scripts/testThrusters.sh
contributing.md
control_system_stack/absolute_rpy_publisher/src/main.py
control_system_stack/controller_basic/cfg/cpp/controller_basic/controllerConfig.h
control_system_stack/controller_basic/src/controller_basic/cfg/controllerConfig.py
control_system_stack/keyboard_control/src/temp.txt
control_system_stack/thruster_converter/src/thruster.cpp
gui_stack/gui_controller_loader/cfg/cpp/gui_controller_loader/paramsConfig.h
gui_stack/gui_controller_loader/src/gui_controller_loader/cfg/paramsConfig.py
hooks/formatAll.sh
mission_planner_stack/pose_server/src/DeadReckoning.cpp
mission_planner_stack/pose_server/src/KalmanEstimator.cpp
mission_planner_stack/pose_server/src/PoseServer.cpp
mission_planner_stack/pose_server_python/manifest.xml
mission_planner_stack/pose_server_python/src/kal5.py
mission_planner_stack/pose_server_python/src/kalman_estimator.py
mission_planner_stack/pose_server_python/src/main.py
sensor_stack/nqDVL/src/nqDVL.py
sensor_stack/seabotix/cfg/cpp/seabotix/k_changerConfig.h
sensor_stack/seabotix/manifest.xml
sensor_stack/seabotix/src/control.py
sensor_stack/seabotix/src/control_camera.py
sensor_stack/seabotix/src/depthCtrl.py
sensor_stack/seabotix/src/main-control.py
sensor_stack/seabotix/src/rumf.py
sensor_stack/seabotix/src/seabotix.py
sensor_stack/seabotix/src/seabotix/cfg/k_changerConfig.py
sensor_stack/seabotix/src/stopKraken.py
sensor_stack/seabotix/src/stopKraken1.py
sensor_stack/seabotix/src/surge.py
sensor_stack/seabotix/src/surgeControl-PID.py
sensor_stack/seabotix/src/surgeControl.py
sensor_stack/seabotix/src/test.py
sensor_stack/seabotix/src/testThrusters.py
sensor_stack/seabotix/src/yaw-control-with-twiddle/twiddle.py
sensor_stack/seabotix/src/yawAndDepthControl.py
sensor_stack/seabotix/src/yawControlOnVehicle.py
sensor_stack/sparton/src/sparton.py
simulator_stack/simulator_to_navpose/src/main.cpp
vision_stack/task_buoy/include/task_buoy/buoy_server.h
vision_stack/task_buoy/manifest.xml
vision_stack/task_buoy/src/buoy_client.cpp
vision_stack/task_buoy/src/buoy_server.cpp
vision_stack/task_buoy/src/newbuoy.cpp
vision_stack/task_buoy/src/oldbuoy.cpp
vision_stack/task_buoy/threshold.th
vision_stack/task_buoy/threshold2.th
vision_stack/task_marker/src/marker_client.cpp
vision_stack/task_marker/src/marker_server.cpp