From eef2619091ec834058c556150c3b266a4a250b49 Mon Sep 17 00:00:00 2001
From: Tamas Nepusz <ntamas@gmail.com>
Date: Fri, 22 Jan 2021 19:46:06 +0100
Subject: [PATCH 1/3] fix: sys.canfly variable should start from 'true' until
 we detect that the USB cable is connected

---
 src/hal/src/pm_stm32f4.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hal/src/pm_stm32f4.c b/src/hal/src/pm_stm32f4.c
index e70dbd78a2..d869f0fa2e 100644
--- a/src/hal/src/pm_stm32f4.c
+++ b/src/hal/src/pm_stm32f4.c
@@ -315,6 +315,8 @@ void pmTask(void *param)
   pmSetChargeState(charge500mA);
   systemWaitStart();
 
+  systemSetCanFly(true);
+
   while(1)
   {
     vTaskDelay(100);

From 37b9b1712b75a968cf362ab4341afdfa9e9c1bd0 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Tue, 2 Mar 2021 18:20:09 -0500
Subject: [PATCH 2/3] .gitmodules: Remove unused branch and clean

---
 .gitmodules | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index cba2e68b9b..c944f41c59 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,16 +1,15 @@
+[submodule "vendor/CMSIS"]
+	path = vendor/CMSIS
+	url = https://github.com/ARM-software/CMSIS.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
+	url = https://github.com/bitcraze/libdw1000.git
 [submodule "vendor/unity"]
 	path = vendor/unity
 	url = https://github.com/throwtheswitch/unity.git
-[submodule "vendor/cmock"]
-	path = vendor/cmock
-	url = https://github.com/throwtheswitch/cmock.git
-[submodule "vendor/CMSIS"]
-	path = vendor/CMSIS
-	url = https://github.com/ARM-software/CMSIS
-[submodule "vendor/FreeRTOS"]
-	path = vendor/FreeRTOS
-	url = https://github.com/FreeRTOS/FreeRTOS-Kernel
-	branch = V10.2.1-convergence-FreeRTOS-Source

From 4e1ebdad9bb8018b09b021f87e6ffbfc25564b23 Mon Sep 17 00:00:00 2001
From: "Issam E. Maghni" <issam.e.maghni@mailbox.org>
Date: Wed, 3 Mar 2021 14:13:30 -0500
Subject: [PATCH 3/3] eprintf: Argument fmt should be constant

---
 src/utils/interface/eprintf.h | 4 ++--
 src/utils/src/eprintf.c       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/utils/interface/eprintf.h b/src/utils/interface/eprintf.h
index 812b3e630b..adfd59a4e6 100644
--- a/src/utils/interface/eprintf.h
+++ b/src/utils/interface/eprintf.h
@@ -29,7 +29,7 @@ typedef int (*putc_t)(int c);
  * @param[in] ... Parameters to print
  * @return the number of character printed
  */
-int eprintf(putc_t putcf, char * fmt, ...) 
+int eprintf(putc_t putcf, const char * fmt, ...)
     __attribute__ (( format(printf, 2, 3) ));
 
 /**
@@ -39,6 +39,6 @@ int eprintf(putc_t putcf, char * fmt, ...)
  * @param[in] ap Parameters to print
  * @return the number of character printed
  */
-int evprintf(putc_t putcf, char * fmt, va_list ap);
+int evprintf(putc_t putcf, const char * fmt, va_list ap);
 
 #endif //__EPRINTF_H__
diff --git a/src/utils/src/eprintf.c b/src/utils/src/eprintf.c
index a825c04637..c7ba68b0e2 100644
--- a/src/utils/src/eprintf.c
+++ b/src/utils/src/eprintf.c
@@ -151,7 +151,7 @@ static int itoa16(putc_t putcf, uint64_t num, int width, char padChar)
   return len;
 }
 
-static int handleLongLong(putc_t putcf, char** fmt, unsigned long long int val, int width, char padChar)
+static int handleLongLong(putc_t putcf, const char** fmt, unsigned long long int val, int width, char padChar)
 {
   int len = 0;
 
@@ -176,7 +176,7 @@ static int handleLongLong(putc_t putcf, char** fmt, unsigned long long int val,
   return len;
 }
 
-static int handleLong(putc_t putcf, char** fmt, unsigned long int val, int width, char padChar)
+static int handleLong(putc_t putcf, const char** fmt, unsigned long int val, int width, char padChar)
 {
   int len = 0;
 
@@ -201,7 +201,7 @@ static int handleLong(putc_t putcf, char** fmt, unsigned long int val, int width
   return len;
 }
 
-int evprintf(putc_t putcf, char * fmt, va_list ap)
+int evprintf(putc_t putcf, const char * fmt, va_list ap)
 {
   int len=0;
   float num;
@@ -305,7 +305,7 @@ int evprintf(putc_t putcf, char * fmt, va_list ap)
   return len;
 }
 
-int eprintf(putc_t putcf, char * fmt, ...)
+int eprintf(putc_t putcf, const char * fmt, ...)
 {
   va_list ap;
   int len;