diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9b4ac1832a6b00e6dc66b0282796df7646767ea7..8496c521fe7b48ee0e50540ae24a38f50e87f1f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,25 @@
-image: ruby:2.3
-
-before_script:
-  - apt-get update -qq && apt-get install -y -qq libbluetooth-dev cmake valgrind qt4-default qtbase5-dev qt5-qmake qtbase5-dev-tools
-  - ln -s /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /bin/qmake-qt5 # QT hack
+image: bitcraze/builder
 
 stages:
   - build
-  - test
+  - unit_tests
+
+setup_job:
+  stage: build
+  script:
+    - pwd
+    - ls 
+    - git submodule sync
+    - git submodule update --init --recursive
 
 build_job:
   stage: build
   script:
-    - bash ci/ci-build.sh
+    - cd crazyflie_software/crazyflie-firmware-2021.06/
+    - make PLATFORM=cf2
 
-# run tests using the binary built before
-test_job:
-  stage: test
+unit_tests_job:
+  stage: unit_tests
   script:
-    - bash ci/ci-test.sh
+    - echo "TODO"
+  
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 2f4d2d15be193ea9dece01d4fbfeac72c5b5dc78..d1e2a6445231614e7a2be6f2d609676a7ec10b3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,21 +5,18 @@
 [submodule "wiki"]
 	path = wiki
 	url = ../MicroCART.wiki.git
-[submodule "crazyflie_software/crazyflie-firmware-2021.06/vendor/CMSIS"]
-	path = crazyflie_software/crazyflie-firmware-2021.06/vendor/CMSIS
-	url = https://github.com/ARM-software/CMSIS_5.git
 [submodule "crazyflie_software/crazyflie-firmware-2021.06/vendor/FreeRTOS"]
 	path = crazyflie_software/crazyflie-firmware-2021.06/vendor/FreeRTOS
 	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
+[submodule "crazyflie_software/crazyflie-firmware-2021.06/vendor/CMSIS"]
+	path = crazyflie_software/crazyflie-firmware-2021.06/vendor/CMSIS
+	url = https://github.com/ARM-software/CMSIS_5.git
 [submodule "crazyflie_software/crazyflie-firmware-2021.06/vendor/cmock"]
 	path = crazyflie_software/crazyflie-firmware-2021.06/vendor/cmock
-	url = https://github.com/throwtheswitch/cmock.git
+	url = https://github.com/ThrowTheSwitch/CMock.git
 [submodule "crazyflie_software/crazyflie-firmware-2021.06/vendor/libdw1000"]
 	path = crazyflie_software/crazyflie-firmware-2021.06/vendor/libdw1000
 	url = https://github.com/bitcraze/libdw1000.git
 [submodule "crazyflie_software/crazyflie-firmware-2021.06/vendor/unity"]
 	path = crazyflie_software/crazyflie-firmware-2021.06/vendor/unity
-	url = https://github.com/throwtheswitch/unity.git
-[submodule "crazyflie_software/MicroCART_Crazyflie_Firmware"]
-	path = crazyflie_software/MicroCART_Crazyflie_Firmware
-	url = ../MicroCART_Crazyflie_Firmware.git
+	url = https://github.com/ThrowTheSwitch/Unity.git
diff --git a/crazyflie_software/MicroCART_Crazyflie_Firmware b/crazyflie_software/MicroCART_Crazyflie_Firmware
deleted file mode 160000
index 401b9bfb4e17c0d736b104afe1a678dbab0cbe65..0000000000000000000000000000000000000000
--- a/crazyflie_software/MicroCART_Crazyflie_Firmware
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 401b9bfb4e17c0d736b104afe1a678dbab0cbe65
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/HEAD b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/HEAD
deleted file mode 100644
index 28e6198ed3c1359ebdce166b0e3c3f968d8e16cd..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-a096b497907ee0688bea24fb7f3be74bbb9c2ef6
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/config b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/config
deleted file mode 100644
index 8a7d2d53e91a34f07016a8052ebe50704421d308..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/config
+++ /dev/null
@@ -1,8 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-[remote "origin"]
-	url = git@github.com:bitcraze/crazyflie-firmware.git
-	fetch = +refs/heads/*:refs/remotes/origin/*
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/description b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/description
deleted file mode 100644
index 498b267a8c7812490d6479839c5577eaaec79d62..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/description
+++ /dev/null
@@ -1 +0,0 @@
-Unnamed repository; edit this file 'description' to name the repository.
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/applypatch-msg.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/applypatch-msg.sample
deleted file mode 100755
index a5d7b84a673458d14d9aab082183a1968c2c7492..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/applypatch-msg.sample
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message taken by
-# applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.  The hook is
-# allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "applypatch-msg".
-
-. git-sh-setup
-commitmsg="$(git rev-parse --git-path hooks/commit-msg)"
-test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"}
-:
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/commit-msg.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/commit-msg.sample
deleted file mode 100755
index b58d1184a9d43a39c0d95f32453efc78581877d6..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/commit-msg.sample
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to check the commit log message.
-# Called by "git commit" with one argument, the name of the file
-# that has the commit message.  The hook should exit with non-zero
-# status after issuing an appropriate message if it wants to stop the
-# commit.  The hook is allowed to edit the commit message file.
-#
-# To enable this hook, rename this file to "commit-msg".
-
-# Uncomment the below to add a Signed-off-by line to the message.
-# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
-# hook is more suited to it.
-#
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
-
-# This example catches duplicate Signed-off-by lines.
-
-test "" = "$(grep '^Signed-off-by: ' "$1" |
-	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
-	echo >&2 Duplicate Signed-off-by lines.
-	exit 1
-}
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/fsmonitor-watchman.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/fsmonitor-watchman.sample
deleted file mode 100755
index ef94fa293800b31e3982204f43b13785afebd9bd..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/fsmonitor-watchman.sample
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/perl
-
-use strict;
-use warnings;
-use IPC::Open2;
-
-# An example hook script to integrate Watchman
-# (https://facebook.github.io/watchman/) with git to speed up detecting
-# new and modified files.
-#
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
-#
-# To enable this hook, rename this file to "query-watchman" and set
-# 'git config core.fsmonitor .git/hooks/query-watchman'
-#
-my ($version, $time) = @ARGV;
-
-# Check the hook interface version
-
-if ($version == 1) {
-	# convert nanoseconds to seconds
-	# subtract one second to make sure watchman will return all changes
-	$time = int ($time / 1000000000) - 1;
-} else {
-	die "Unsupported query-fsmonitor hook version '$version'.\n" .
-	    "Falling back to scanning...\n";
-}
-
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
-	$git_work_tree = Win32::GetCwd();
-	$git_work_tree =~ tr/\\/\//;
-} else {
-	require Cwd;
-	$git_work_tree = Cwd::cwd();
-}
-
-my $retry = 1;
-
-launch_watchman();
-
-sub launch_watchman {
-
-	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
-	    or die "open2() failed: $!\n" .
-	    "Falling back to scanning...\n";
-
-	# In the query expression below we're asking for names of files that
-	# changed since $time but were not transient (ie created after
-	# $time but no longer exist).
-	#
-	# To accomplish this, we're using the "since" generator to use the
-	# recency index to select candidate nodes and "fields" to limit the
-	# output to file names only.
-
-	my $query = <<"	END";
-		["query", "$git_work_tree", {
-			"since": $time,
-			"fields": ["name"]
-		}]
-	END
-
-	print CHLD_IN $query;
-	close CHLD_IN;
-	my $response = do {local $/; <CHLD_OUT>};
-
-	die "Watchman: command returned no output.\n" .
-	    "Falling back to scanning...\n" if $response eq "";
-	die "Watchman: command returned invalid output: $response\n" .
-	    "Falling back to scanning...\n" unless $response =~ /^\{/;
-
-	my $json_pkg;
-	eval {
-		require JSON::XS;
-		$json_pkg = "JSON::XS";
-		1;
-	} or do {
-		require JSON::PP;
-		$json_pkg = "JSON::PP";
-	};
-
-	my $o = $json_pkg->new->utf8->decode($response);
-
-	if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
-		print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
-		$retry--;
-		qx/watchman watch "$git_work_tree"/;
-		die "Failed to make watchman watch '$git_work_tree'.\n" .
-		    "Falling back to scanning...\n" if $? != 0;
-
-		# Watchman will always return all files on the first query so
-		# return the fast "everything is dirty" flag to git and do the
-		# Watchman query just to get it over with now so we won't pay
-		# the cost in git to look up each individual file.
-		print "/\0";
-		eval { launch_watchman() };
-		exit 0;
-	}
-
-	die "Watchman: $o->{error}.\n" .
-	    "Falling back to scanning...\n" if $o->{error};
-
-	binmode STDOUT, ":utf8";
-	local $, = "\0";
-	print @{$o->{files}};
-}
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/post-update.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/post-update.sample
deleted file mode 100755
index ec17ec1939b7c3e86b7cb6c0c4de6b0818a7e75e..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/post-update.sample
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare a packed repository for use over
-# dumb transports.
-#
-# To enable this hook, rename this file to "post-update".
-
-exec git update-server-info
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-applypatch.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-applypatch.sample
deleted file mode 100755
index 4142082bcb939bbc17985a69ba748491ac6b62a5..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-applypatch.sample
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed
-# by applypatch from an e-mail message.
-#
-# The hook should exit with non-zero status after issuing an
-# appropriate message if it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-applypatch".
-
-. git-sh-setup
-precommit="$(git rev-parse --git-path hooks/pre-commit)"
-test -x "$precommit" && exec "$precommit" ${1+"$@"}
-:
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-commit.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-commit.sample
deleted file mode 100755
index 6a756416384c210ada2631f17862f5c01fffa478..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-commit.sample
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git commit" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message if
-# it wants to stop the commit.
-#
-# To enable this hook, rename this file to "pre-commit".
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
-	against=HEAD
-else
-	# Initial commit: diff against an empty tree object
-	against=$(git hash-object -t tree /dev/null)
-fi
-
-# If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
-
-# Redirect output to stderr.
-exec 1>&2
-
-# Cross platform projects tend to avoid non-ASCII filenames; prevent
-# them from being added to the repository. We exploit the fact that the
-# printable range starts at the space character and ends with tilde.
-if [ "$allownonascii" != "true" ] &&
-	# Note that the use of brackets around a tr range is ok here, (it's
-	# even required, for portability to Solaris 10's /usr/bin/tr), since
-	# the square bracket bytes happen to fall in the designated range.
-	test $(git diff --cached --name-only --diff-filter=A -z $against |
-	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
-then
-	cat <<\EOF
-Error: Attempt to add a non-ASCII file name.
-
-This can cause problems if you want to work with people on other platforms.
-
-To be portable it is advisable to rename the file.
-
-If you know what you are doing you can disable this check using:
-
-  git config hooks.allownonascii true
-EOF
-	exit 1
-fi
-
-# If there are whitespace errors, print the offending file names and fail.
-exec git diff-index --check --cached $against --
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-merge-commit.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-merge-commit.sample
deleted file mode 100755
index 399eab1924e39da570b389b0bef1ca713b3b05c3..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-merge-commit.sample
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to verify what is about to be committed.
-# Called by "git merge" with no arguments.  The hook should
-# exit with non-zero status after issuing an appropriate message to
-# stderr if it wants to stop the merge commit.
-#
-# To enable this hook, rename this file to "pre-merge-commit".
-
-. git-sh-setup
-test -x "$GIT_DIR/hooks/pre-commit" &&
-        exec "$GIT_DIR/hooks/pre-commit"
-:
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-push.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-push.sample
deleted file mode 100755
index 6187dbf4390fc6e28445dd3d988aefb9d1111988..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-push.sample
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# An example hook script to verify what is about to be pushed.  Called by "git
-# push" after it has checked the remote status, but before anything has been
-# pushed.  If this script exits with a non-zero status nothing will be pushed.
-#
-# This hook is called with the following parameters:
-#
-# $1 -- Name of the remote to which the push is being done
-# $2 -- URL to which the push is being done
-#
-# If pushing without using a named remote those arguments will be equal.
-#
-# Information about the commits which are being pushed is supplied as lines to
-# the standard input in the form:
-#
-#   <local ref> <local sha1> <remote ref> <remote sha1>
-#
-# This sample shows how to prevent push of commits where the log message starts
-# with "WIP" (work in progress).
-
-remote="$1"
-url="$2"
-
-z40=0000000000000000000000000000000000000000
-
-while read local_ref local_sha remote_ref remote_sha
-do
-	if [ "$local_sha" = $z40 ]
-	then
-		# Handle delete
-		:
-	else
-		if [ "$remote_sha" = $z40 ]
-		then
-			# New branch, examine all commits
-			range="$local_sha"
-		else
-			# Update to existing branch, examine new commits
-			range="$remote_sha..$local_sha"
-		fi
-
-		# Check for WIP commit
-		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
-		if [ -n "$commit" ]
-		then
-			echo >&2 "Found WIP commit in $local_ref, not pushing"
-			exit 1
-		fi
-	fi
-done
-
-exit 0
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-rebase.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-rebase.sample
deleted file mode 100755
index 6cbef5c370d8c3486ca85423dd70440c5e0a2aa2..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-rebase.sample
+++ /dev/null
@@ -1,169 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2006, 2008 Junio C Hamano
-#
-# The "pre-rebase" hook is run just before "git rebase" starts doing
-# its job, and can prevent the command from running by exiting with
-# non-zero status.
-#
-# The hook is called with the following parameters:
-#
-# $1 -- the upstream the series was forked from.
-# $2 -- the branch being rebased (or empty when rebasing the current branch).
-#
-# This sample shows how to prevent topic branches that are already
-# merged to 'next' branch from getting rebased, because allowing it
-# would result in rebasing already published history.
-
-publish=next
-basebranch="$1"
-if test "$#" = 2
-then
-	topic="refs/heads/$2"
-else
-	topic=`git symbolic-ref HEAD` ||
-	exit 0 ;# we do not interrupt rebasing detached HEAD
-fi
-
-case "$topic" in
-refs/heads/??/*)
-	;;
-*)
-	exit 0 ;# we do not interrupt others.
-	;;
-esac
-
-# Now we are dealing with a topic branch being rebased
-# on top of master.  Is it OK to rebase it?
-
-# Does the topic really exist?
-git show-ref -q "$topic" || {
-	echo >&2 "No such branch $topic"
-	exit 1
-}
-
-# Is topic fully merged to master?
-not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
-if test -z "$not_in_master"
-then
-	echo >&2 "$topic is fully merged to master; better remove it."
-	exit 1 ;# we could allow it, but there is no point.
-fi
-
-# Is topic ever merged to next?  If so you should not be rebasing it.
-only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
-only_next_2=`git rev-list ^master           ${publish} | sort`
-if test "$only_next_1" = "$only_next_2"
-then
-	not_in_topic=`git rev-list "^$topic" master`
-	if test -z "$not_in_topic"
-	then
-		echo >&2 "$topic is already up to date with master"
-		exit 1 ;# we could allow it, but there is no point.
-	else
-		exit 0
-	fi
-else
-	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
-	/usr/bin/perl -e '
-		my $topic = $ARGV[0];
-		my $msg = "* $topic has commits already merged to public branch:\n";
-		my (%not_in_next) = map {
-			/^([0-9a-f]+) /;
-			($1 => 1);
-		} split(/\n/, $ARGV[1]);
-		for my $elem (map {
-				/^([0-9a-f]+) (.*)$/;
-				[$1 => $2];
-			} split(/\n/, $ARGV[2])) {
-			if (!exists $not_in_next{$elem->[0]}) {
-				if ($msg) {
-					print STDERR $msg;
-					undef $msg;
-				}
-				print STDERR " $elem->[1]\n";
-			}
-		}
-	' "$topic" "$not_in_next" "$not_in_master"
-	exit 1
-fi
-
-<<\DOC_END
-
-This sample hook safeguards topic branches that have been
-published from being rewound.
-
-The workflow assumed here is:
-
- * Once a topic branch forks from "master", "master" is never
-   merged into it again (either directly or indirectly).
-
- * Once a topic branch is fully cooked and merged into "master",
-   it is deleted.  If you need to build on top of it to correct
-   earlier mistakes, a new topic branch is created by forking at
-   the tip of the "master".  This is not strictly necessary, but
-   it makes it easier to keep your history simple.
-
- * Whenever you need to test or publish your changes to topic
-   branches, merge them into "next" branch.
-
-The script, being an example, hardcodes the publish branch name
-to be "next", but it is trivial to make it configurable via
-$GIT_DIR/config mechanism.
-
-With this workflow, you would want to know:
-
-(1) ... if a topic branch has ever been merged to "next".  Young
-    topic branches can have stupid mistakes you would rather
-    clean up before publishing, and things that have not been
-    merged into other branches can be easily rebased without
-    affecting other people.  But once it is published, you would
-    not want to rewind it.
-
-(2) ... if a topic branch has been fully merged to "master".
-    Then you can delete it.  More importantly, you should not
-    build on top of it -- other people may already want to
-    change things related to the topic as patches against your
-    "master", so if you need further changes, it is better to
-    fork the topic (perhaps with the same name) afresh from the
-    tip of "master".
-
-Let's look at this example:
-
-		   o---o---o---o---o---o---o---o---o---o "next"
-		  /       /           /           /
-		 /   a---a---b A     /           /
-		/   /               /           /
-	       /   /   c---c---c---c B         /
-	      /   /   /             \         /
-	     /   /   /   b---b C     \       /
-	    /   /   /   /             \     /
-    ---o---o---o---o---o---o---o---o---o---o---o "master"
-
-
-A, B and C are topic branches.
-
- * A has one fix since it was merged up to "next".
-
- * B has finished.  It has been fully merged up to "master" and "next",
-   and is ready to be deleted.
-
- * C has not merged to "next" at all.
-
-We would want to allow C to be rebased, refuse A, and encourage
-B to be deleted.
-
-To compute (1):
-
-	git rev-list ^master ^topic next
-	git rev-list ^master        next
-
-	if these match, topic has not merged in next at all.
-
-To compute (2):
-
-	git rev-list master..topic
-
-	if this is empty, it is fully merged to "master".
-
-DOC_END
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-receive.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-receive.sample
deleted file mode 100755
index a1fd29ec14823d8bc4a8d1a2cfe35451580f5118..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/pre-receive.sample
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to make use of push options.
-# The example simply echoes all push options that start with 'echoback='
-# and rejects all pushes when the "reject" push option is used.
-#
-# To enable this hook, rename this file to "pre-receive".
-
-if test -n "$GIT_PUSH_OPTION_COUNT"
-then
-	i=0
-	while test "$i" -lt "$GIT_PUSH_OPTION_COUNT"
-	do
-		eval "value=\$GIT_PUSH_OPTION_$i"
-		case "$value" in
-		echoback=*)
-			echo "echo from the pre-receive-hook: ${value#*=}" >&2
-			;;
-		reject)
-			exit 1
-		esac
-		i=$((i + 1))
-	done
-fi
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/prepare-commit-msg.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/prepare-commit-msg.sample
deleted file mode 100755
index 10fa14c5ab0134436e2ae435138bf921eb477c60..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/prepare-commit-msg.sample
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to prepare the commit log message.
-# Called by "git commit" with the name of the file that has the
-# commit message, followed by the description of the commit
-# message's source.  The hook's purpose is to edit the commit
-# message file.  If the hook fails with a non-zero status,
-# the commit is aborted.
-#
-# To enable this hook, rename this file to "prepare-commit-msg".
-
-# This hook includes three examples. The first one removes the
-# "# Please enter the commit message..." help message.
-#
-# The second includes the output of "git diff --name-status -r"
-# into the message, just before the "git status" output.  It is
-# commented because it doesn't cope with --amend or with squashed
-# commits.
-#
-# The third example adds a Signed-off-by line to the message, that can
-# still be edited.  This is rarely a good idea.
-
-COMMIT_MSG_FILE=$1
-COMMIT_SOURCE=$2
-SHA1=$3
-
-/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
-
-# case "$COMMIT_SOURCE,$SHA1" in
-#  ,|template,)
-#    /usr/bin/perl -i.bak -pe '
-#       print "\n" . `git diff --cached --name-status -r`
-# 	 if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
-#  *) ;;
-# esac
-
-# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
-# if test -z "$COMMIT_SOURCE"
-# then
-#   /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
-# fi
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/update.sample b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/update.sample
deleted file mode 100755
index 80ba94135cc378364af9d3cb2450df48e51faf2c..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/hooks/update.sample
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# An example hook script to block unannotated tags from entering.
-# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
-#
-# To enable this hook, rename this file to "update".
-#
-# Config
-# ------
-# hooks.allowunannotated
-#   This boolean sets whether unannotated tags will be allowed into the
-#   repository.  By default they won't be.
-# hooks.allowdeletetag
-#   This boolean sets whether deleting tags will be allowed in the
-#   repository.  By default they won't be.
-# hooks.allowmodifytag
-#   This boolean sets whether a tag may be modified after creation. By default
-#   it won't be.
-# hooks.allowdeletebranch
-#   This boolean sets whether deleting branches will be allowed in the
-#   repository.  By default they won't be.
-# hooks.denycreatebranch
-#   This boolean sets whether remotely creating branches will be denied
-#   in the repository.  By default this is allowed.
-#
-
-# --- Command line
-refname="$1"
-oldrev="$2"
-newrev="$3"
-
-# --- Safety check
-if [ -z "$GIT_DIR" ]; then
-	echo "Don't run this script from the command line." >&2
-	echo " (if you want, you could supply GIT_DIR then run" >&2
-	echo "  $0 <ref> <oldrev> <newrev>)" >&2
-	exit 1
-fi
-
-if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
-	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
-	exit 1
-fi
-
-# --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
-
-# check for no description
-projectdesc=$(sed -e '1q' "$GIT_DIR/description")
-case "$projectdesc" in
-"Unnamed repository"* | "")
-	echo "*** Project description file hasn't been set" >&2
-	exit 1
-	;;
-esac
-
-# --- Check types
-# if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
-if [ "$newrev" = "$zero" ]; then
-	newrev_type=delete
-else
-	newrev_type=$(git cat-file -t $newrev)
-fi
-
-case "$refname","$newrev_type" in
-	refs/tags/*,commit)
-		# un-annotated tag
-		short_refname=${refname##refs/tags/}
-		if [ "$allowunannotated" != "true" ]; then
-			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
-			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
-			exit 1
-		fi
-		;;
-	refs/tags/*,delete)
-		# delete tag
-		if [ "$allowdeletetag" != "true" ]; then
-			echo "*** Deleting a tag is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/tags/*,tag)
-		# annotated tag
-		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
-		then
-			echo "*** Tag '$refname' already exists." >&2
-			echo "*** Modifying a tag is not allowed in this repository." >&2
-			exit 1
-		fi
-		;;
-	refs/heads/*,commit)
-		# branch
-		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
-			echo "*** Creating a branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/heads/*,delete)
-		# delete branch
-		if [ "$allowdeletebranch" != "true" ]; then
-			echo "*** Deleting a branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	refs/remotes/*,commit)
-		# tracking branch
-		;;
-	refs/remotes/*,delete)
-		# delete tracking branch
-		if [ "$allowdeletebranch" != "true" ]; then
-			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
-			exit 1
-		fi
-		;;
-	*)
-		# Anything else (is there anything else?)
-		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
-		exit 1
-		;;
-esac
-
-# --- Finished
-exit 0
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/index b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/index
deleted file mode 100644
index 2bd2766e759464b60349ffef3a202ed079b4f8c1..0000000000000000000000000000000000000000
Binary files a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/index and /dev/null differ
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/info/exclude b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/info/exclude
deleted file mode 100644
index a5196d1be8fb59edf8062bef36d3a602e0812139..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/info/exclude
+++ /dev/null
@@ -1,6 +0,0 @@
-# git ls-files --others --exclude-from=.git/info/exclude
-# Lines that start with '#' are comments.
-# For a project mostly in C, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/logs/HEAD b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/logs/HEAD
deleted file mode 100644
index 21f5b2366878307ec22b352a0b5d063f45a0986a..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/logs/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 a096b497907ee0688bea24fb7f3be74bbb9c2ef6 C-Glick <colton.glick@gmail.com> 1636680265 -0600	clone: from git@github.com:bitcraze/crazyflie-firmware.git
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/logs/refs/remotes/origin/HEAD b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/logs/refs/remotes/origin/HEAD
deleted file mode 100644
index f0bfa811ef59e4b31f7bc5b0aa2eaad273b95ef2..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/logs/refs/remotes/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-0000000000000000000000000000000000000000 46780e31ba6130668e57a904f47a32cff0f7ac90 C-Glick <colton.glick@gmail.com> 1636680265 -0600	clone: from git@github.com:bitcraze/crazyflie-firmware.git
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/objects/pack/pack-7eb8445b3d08fad3f9dae42d8e069454e79185dc.idx b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/objects/pack/pack-7eb8445b3d08fad3f9dae42d8e069454e79185dc.idx
deleted file mode 100644
index ba5aafa4d0f91f5b55c132dd42189aa027463ecb..0000000000000000000000000000000000000000
Binary files a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/objects/pack/pack-7eb8445b3d08fad3f9dae42d8e069454e79185dc.idx and /dev/null differ
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/objects/pack/pack-7eb8445b3d08fad3f9dae42d8e069454e79185dc.pack b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/objects/pack/pack-7eb8445b3d08fad3f9dae42d8e069454e79185dc.pack
deleted file mode 100644
index 8156b8ce398ef26accd3e09c6c76a93e0585a797..0000000000000000000000000000000000000000
Binary files a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/objects/pack/pack-7eb8445b3d08fad3f9dae42d8e069454e79185dc.pack and /dev/null differ
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/packed-refs b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/packed-refs
deleted file mode 100644
index 7b599cc82cef7044a8c07ef341b2d60e14d9894f..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/packed-refs
+++ /dev/null
@@ -1,80 +0,0 @@
-# pack-refs with: peeled fully-peeled sorted 
-f6e79bf4c5f93fcca33eb94df2cfdd8f8f80f1be refs/remotes/origin/2014.01
-04f7726ed8697234ab6e10a2e33efe07bb61c920 refs/remotes/origin/864-led-control
-476ea6875d691377020bbdadaf51f3755e3d9fa7 refs/remotes/origin/ataffanel/crtp-doc
-d59b88db74ba3ee76e435e611f8e8d545dafdb3a refs/remotes/origin/bam/hack_to_make_high_level_commander_to_the_right_thing
-e1d0b3d6b3a22b96f585b3fc8f63473ca7f0b913 refs/remotes/origin/bigmerge
-8220de016ba7ca869e51a4a0c6002ddbf4a5c72d refs/remotes/origin/bigquad
-c3cbaa03272701ec0aeb6740d0abf3e8f08171d5 refs/remotes/origin/brushless_driver
-f6637ad54fe55445ce0d574e89a6e275ad52e860 refs/remotes/origin/crazyflie2
-21f031d0df70572d5808c6c811a9891360fcbb77 refs/remotes/origin/dev-buzzer
-e9ff096bc9cab8ba61c62aaf71f1a36b892b1a5e refs/remotes/origin/dev-datacollection
-234c5cdee77a0f360e0f58de6f139412b1f3f242 refs/remotes/origin/dev-lighthouse-decoder
-60ae7f349f9f0c14bd71b75b140210f62760c6de refs/remotes/origin/dev-systemId
-1519b3d02ae2aa4fb9a779972a2ee467871b365b refs/remotes/origin/external_estimator
-905264fa521f5e47caa5c77004b424e5dc1a6e4c refs/remotes/origin/fix_doc_parser_2
-133c32695efab6081a7644b5058e3e5e43ef72b5 refs/remotes/origin/fix_doc_parser_3
-69dab0c978702b13c5c3ee67007a3a0ccb121d5f refs/remotes/origin/gaming
-e8cbbf354fa8271ff8110180f077a1c59e7fe65f refs/remotes/origin/gps_ublox_dev
-f57e17f459e1c48fc9a288c08426363f46bc0f65 refs/remotes/origin/jonasdn/730
-afee68a5eeca0f0b32a118205703ccdc4efcc109 refs/remotes/origin/jonasdn/freertos_rs_shim
-2019b5a71c7155dc098b2cb480c636aceaf10a59 refs/remotes/origin/jonasdn/kbuild
-bfbf59c8b1b5af192a69bfc3a0a7c45db80ab595 refs/remotes/origin/jonasdn/ninalink
-78aa0f82a39ac284677b378f9dfdb1d9f1935162 refs/remotes/origin/lighthouse_as_groundtruth
-46780e31ba6130668e57a904f47a32cff0f7ac90 refs/remotes/origin/master
-7ed4f890714b65d2206de4cf758d4c8965e483b2 refs/remotes/origin/neopixel_dev
-d6a850f5966ce7e1130eab7f79846b1766dc5c1c refs/remotes/origin/nina_uart2
-d6a850f5966ce7e1130eab7f79846b1766dc5c1c refs/remotes/origin/p2p_rate_limit
-506ab28402dd4a5db2ee7e029502ad26c911e16e refs/remotes/origin/persistent_param
-29ff9bb9f996b9b2bd0f62aec6540ecf220ae29b refs/remotes/origin/refactor-stab-types
-d81183b56676708efc96642e91c9767081f00f58 refs/remotes/origin/rik/nina-flashing
-37524f42e6e2b89585794ab2789055ffe49d45c0 refs/remotes/origin/rzr
-c46bee8598ab49a01a5756227ea0e36cea46928e refs/remotes/origin/sdcard-logging
-2d2e2b9a611c7333d0f3d80e3150541e4f5a2957 refs/remotes/origin/vl53l1
-78599382347223878a80412691c618594f9bf611 refs/remotes/origin/vl6180x
-d13e6782b992b94cd6e076f34de411f438502013 refs/tags/2013.11-beta1
-b7903474620abd95236983a2bdf7fcc4af3133ed refs/tags/2013.4
-98a8d83a8855888ce29c0a37483596c931b4b819 refs/tags/2014.01.0
-1ab92e55c44b4584cf688b79a249babc3bccce20 refs/tags/2014.12.0
-e8802095d2037c9a7f5353044b5530d91a98fd1f refs/tags/2014.12.1
-^29624e7f6e3bd955d925fabd8a9bbec38b3fb63c
-da0de56efedd7611b9b7eb8d25214ebe6be689b4 refs/tags/2015.08
-^6db320a1d3d6fc930d077fd8e09b5274fe06f256
-61e23e51d7d340392b147586ceb4673ada3570da refs/tags/2015.08.1
-02dd0d49962cf6e04539b91b52fee53327baf039 refs/tags/2015.1
-dad584cb81736dc0201b7b7f084db7344b64a633 refs/tags/2016.02
-^7aca3423e2aa148ee3c22cef4482c18854ab0d45
-e85a03c15820740dec0b12fc4fe40740522d1ec1 refs/tags/2016.09
-^83c188aa9f5192346cbf3287791cbe6b6cab7faa
-66e6cc6a67a9bb29d48070464b1e0c662b4e481e refs/tags/2017.04
-^c4148a09528ef8e9743af25bad2e5a869819aedb
-df11f2550b819a92b56a760f34ae78a65cc3a1f1 refs/tags/2017.05
-ab6d531c7ca70571720a50676cbc881fa2f91abc refs/tags/2017.06
-0ce5b7af482c9c57cc57df0be635b4ccb0c91e4a refs/tags/2018.01
-e250f667d6aec17f5fffeaad93f0ee9cddad2579 refs/tags/2018.01.1
-^6ee723ad11449e61835d224a4467391630b2e632
-47ee696b2d3c433801c96cca85ea7eabe6871449 refs/tags/2018.10
-29396c336340a2a486647cd8768a44666d204783 refs/tags/2018.12
-^a203d748e139b82854059423e04bed7b0992ebd8
-7b0041f2edb7218c64575c883105c701b03ed83b refs/tags/2019.01
-137fe5cc935fa784394a8d931cbad7417625206d refs/tags/2019.02
-^a1d5aac6f3e6f3691a270c81c5df9521a896c8c5
-af47883c3616adb07b2d6c5feb975d2944a245ba refs/tags/2019.09
-^0c26532c3934f7ae2c9e49aa9318ddb18586e194
-cc4d2204fffe4fa2128dba0140c4db5bf892d554 refs/tags/2020.02
-^e27cd170b7eb8be7ed1cbbc9f5622b469d335d97
-de9293fac4afb1ed65b18c106a38411d3996cdf3 refs/tags/2020.04
-b973dc6cc24e0660e008f84e8d885e11b4fd8b14 refs/tags/2020.06
-^e155cc88f34b80a46d0cef7a680ee4183cd4a01c
-d35c66c47f4f490a3a5ced9456d5d5d7d2f145fc refs/tags/2020.09
-^12cf59a535a859c260b00d0b558681be911e759a
-a944ab90a53f8dd134d73d08b46ec3b421131180 refs/tags/2021.01
-^b448553725634aa83d25b356a7de12ba61647377
-2193abf75bed3d907ff383ece255f4a82c29eaa3 refs/tags/2021.03
-^9b5900a2de9a383cf09448b1d1151566c4638e1c
-a096b497907ee0688bea24fb7f3be74bbb9c2ef6 refs/tags/2021.06
-595fc5c4c7ae80c2c1ad67ce0899c3a1e35a3c89 refs/tags/2021.06-rc1
-965a3430842d37930675324ac919dfc412d2d361 refs/tags/Production-V1
-f90e014df7b5634cf492b24b247a370f81da1fb8 refs/tags/Production-V2
-59eb42ee08612509dc94e1f996b33284ac0e77ab refs/tags/fridayhack-170505
-^1137b97e480d21705a56582b15e693712b1aa8f9
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/refs/remotes/origin/HEAD b/crazyflie_software/crazyflie-firmware-2021.06/.git-old/refs/remotes/origin/HEAD
deleted file mode 100644
index 6efe28fff834a94fbc20cac51fe9cd65ecc78d43..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.git-old/refs/remotes/origin/HEAD
+++ /dev/null
@@ -1 +0,0 @@
-ref: refs/remotes/origin/master
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.github-old/workflows/CI.yml b/crazyflie_software/crazyflie-firmware-2021.06/.github/workflows/CI.yml
similarity index 100%
rename from crazyflie_software/crazyflie-firmware-2021.06/.github-old/workflows/CI.yml
rename to crazyflie_software/crazyflie-firmware-2021.06/.github/workflows/CI.yml
diff --git a/crazyflie_software/crazyflie-firmware-2021.06/.gitmodules-old b/crazyflie_software/crazyflie-firmware-2021.06/.gitmodules-old
deleted file mode 100644
index d2d8aa2f8d32a5c8b77a99c4be53499ed22a3030..0000000000000000000000000000000000000000
--- a/crazyflie_software/crazyflie-firmware-2021.06/.gitmodules-old
+++ /dev/null
@@ -1,15 +0,0 @@
-[submodule "vendor/CMSIS"]
-	path = vendor/CMSIS
-	url = https://github.com/ARM-software/CMSIS_5.git
-[submodule "vendor/FreeRTOS"]
-	path = vendor/FreeRTOS
-	url = https://github.com/FreeRTOS/FreeRTOS-Kernel.git
-[submodule "vendor/cmock"]
-	path = vendor/cmock
-	url = https://github.com/throwtheswitch/cmock.git
-[submodule "vendor/libdw1000"]
-	path = vendor/libdw1000
-	url = https://github.com/bitcraze/libdw1000.git
-[submodule "vendor/unity"]
-	path = vendor/unity
-	url = https://github.com/throwtheswitch/unity.git