Day 3 - Revision history

Florian: /* LESSONS LEARNED */

2018-08-07T19:35:44Z

‎LESSONS LEARNED

Florian at 20:42, 6 August 2018

2018-08-06T20:42:44Z

Florian at 09:56, 6 August 2018

2018-08-06T09:56:51Z

Florian at 08:35, 6 August 2018

2018-08-06T08:35:40Z

Michael: Created page with "#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment usi..."

2018-08-06T07:08:53Z

Created page with "#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment usi..."

New page

#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment using Eclipse Oxygen]

@@ Line 19: / Line 19: @@
 To fix head detached state:
-# <code>git checkout <original-branch></code> e.g. release/kinetic/mavlink
+# <code>git checkout <original-branch></code> e.g. release/kinetic/mavlink --> <code>Previous HEAD position was fdea82a...</code>
-# <code>git merge <your-temporary-branch-number-from-head-detached></code> e.g. HEAD detached from 2ad55e0 --> <code>2ad55e0</code>
+# <code>git merge <your-temporary-branch-number-from-head-detached></code> with head position number from point 1
 # <code>git push</code>

← Older revision		Revision as of 20:42, 6 August 2018
Line 2:		Line 2:
	#* <code>catkin config -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_ARG1=-std=c++11 -D__cplusplus=201103L -D__GXX_EXPERIMENTAL_CXX0X__=1</code>		#* <code>catkin config -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_ARG1=-std=c++11 -D__cplusplus=201103L -D__GXX_EXPERIMENTAL_CXX0X__=1</code>
	#* <code>bash -i -c "eclipse"</code>		#* <code>bash -i -c "eclipse"</code>
		+	# Discussed messages and nodes design
		+	# Switched back to QtCreator for new bambi ros package, because we noticed the catkin build tool support (not <code>catkin_make</code>)
		+	# Refactored bambi repository!
		+	#* Created submodules for mavlink and mavros
		+	#* Checked it in as whole catkin workspace
		+	#* PROVIDED developer setup shell script (!)
		+
		+	= LESSONS LEARNED =
		+
		+	In a submodule we are initially detached from the original repository, i.e. <code>git push</code> will not push to the originating remote repository (which makes actually sense, since we are in a submodule and won't necessary change the original repository (we are formally not working on them). So any commit in the submodule will result in a <code>HEAD DETACHED</code> state.
		+
		+	If we anyhow want to commit to the main repository of the submodule we have to checkout first:
		+
		+	# <code>git checkout <original-branch></code> e.g. release/kinetic/mavlink
		+
		+	To fix head detached state:
		+
		+	# <code>git checkout <original-branch></code> e.g. release/kinetic/mavlink
		+	# <code>git merge <your-temporary-branch-number-from-head-detached></code> e.g. HEAD detached from 2ad55e0 --> <code>2ad55e0</code>
		+	# <code>git push</code>

← Older revision		Revision as of 09:56, 6 August 2018
Line 1:		Line 1:
	#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment using Eclipse Oxygen]		#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment using Eclipse Oxygen]
		+	#* <code>catkin config -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_ARG1=-std=c++11 -D__cplusplus=201103L -D__GXX_EXPERIMENTAL_CXX0X__=1</code>
	#* <code>bash -i -c "eclipse"</code>		#* <code>bash -i -c "eclipse"</code>

← Older revision		Revision as of 08:35, 6 August 2018
Line 1:		Line 1:
	#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment using Eclipse Oxygen]		#[https://www.ethz.ch/content/dam/ethz/special-interest/mavt/robotics-n-intelligent-systems/rsl-dam/ROS2017/how_to_setup_developer_pc.pdf Setup ROS development environment using Eclipse Oxygen]
		+	#* <code>bash -i -c "eclipse"</code>