From 4e7975cea974d36ec1df90a9021cbb551e513793 Mon Sep 17 00:00:00 2001
From: Christophe De Wagter <dewagter@gmail.com>
Date: Tue, 24 Sep 2013 17:06:01 +0200
Subject: [PATCH] [ArDrone] Fix breaking autoconfig

---
 conf/Makefile.omap | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/conf/Makefile.omap b/conf/Makefile.omap
index e567d0c314..9cc359d7cd 100644
--- a/conf/Makefile.omap
+++ b/conf/Makefile.omap
@@ -81,6 +81,38 @@ load upload program: $(OBJDIR)/$(TARGET).elf
 	# Kill the application
 	-echo "killall -9 $(TARGET).elf" | telnet $(HOST)
 
+	# Make the target dir and edit the config
+	-{ 												\
+	  echo "mkdir -p $(TARGET_DIR)";				\
+	} | telnet $(HOST)
+
+	# Upload the drivers and new application
+	{																								\
+	  echo "binary";																				\
+	  echo "put $(PAPARAZZI_SRC)/sw/ext/ardrone2_drivers/cdc-acm.ko /$(SUB_DIR)/cdc-acm.ko";		\
+	  echo "put $(OBJDIR)/$(TARGET).elf /$(SUB_DIR)/$(TARGET).elf";									\
+	  echo "quit";																					\
+	} | ftp -n $(HOST)
+
+	# Upload the modules and start the application
+	-{ 															\
+	  echo "insmod $(TARGET_DIR)/cdc-acm.ko";					\
+	  echo "chmod 777 $(TARGET_DIR)/$(TARGET).elf";				\
+	  echo "$(TARGET_DIR)/$(TARGET).elf > /dev/null 2>&1 &";	\
+	} | telnet $(HOST)
+
+ifeq ($(ARDRONE2_REBOOT),1)
+	-{ 										\
+	  echo "reboot";						\
+	} | telnet $(HOST)
+endif
+
+# Program the device and start it.
+load2 upload2 program2: $(OBJDIR)/$(TARGET).elf
+
+	# Kill the application
+	-echo "killall -9 $(TARGET).elf" | telnet $(HOST)
+
 	# Make the target dir and edit the config
 	-{ 												\
 	  echo "mkdir -p $(TARGET_DIR)";				\
@@ -111,7 +143,7 @@ load upload program: $(OBJDIR)/$(TARGET).elf
 	  echo "chmod 777 $(TARGET_DIR)/$(TARGET).elf";				\
 	  echo "$(TARGET_DIR)/$(TARGET).elf > /dev/null 2>&1 &";	\
 	} | telnet $(HOST)
-	
+
 ifeq ($(ARDRONE2_REBOOT),1)
 	-{ 										\
 	  echo "reboot";						\
@@ -119,6 +151,8 @@ ifeq ($(ARDRONE2_REBOOT),1)
 endif
 
 
+
+
 # Link: create ELF output file from object files.
 .SECONDARY : $(OBJDIR)/$(TARGET).elf
 .PRECIOUS :   $(OBJ_C_OMAP) $(OBJ_CPP_OMAP)
@@ -140,6 +174,7 @@ $(OBJDIR)/%.o : %.cpp $(OBJDIR)/../Makefile.ac
 	$(Q)test -d $(dir $@) || mkdir -p $(dir $@)
 	$(Q)$(CXX) -c $(CXXFLAGS) $< -o $@
 
+
 # Listing of phony targets.
 .PHONY : all build elf clean clean_list