From f79d4caeffa3d9031fdfe3b39597c25753660f0b Mon Sep 17 00:00:00 2001 From: Mike Smith Date: Wed, 14 Sep 2011 22:39:34 -0700 Subject: [PATCH 1/4] Add options to generate assembly listings for all of the compiled files. This is a possible starting point for a tool to analyse the call graph and stack usage of APM. It's also interesting by itself. --- libraries/AP_Common/Arduino.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk index f84f06a237..894a92388c 100644 --- a/libraries/AP_Common/Arduino.mk +++ b/libraries/AP_Common/Arduino.mk @@ -205,10 +205,11 @@ DEPFLAGS = -MD -MT $@ CXXOPTS = -mcall-prologues -ffunction-sections -fdata-sections -fno-exceptions COPTS = -mcall-prologues -ffunction-sections -fdata-sections ASOPTS = -assembler-with-cpp +LISTOPTS = -adhlns=$(@:.o=.lst) -CXXFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS) -CFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(OPTFLAGS) $(DEPFLAGS) $(COPTS) -ASFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(DEPFLAGS) $(ASOPTS) +CXXFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS) +CFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(COPTS) +ASFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(LISTOPTS) $(DEPFLAGS) $(ASOPTS) LDFLAGS = -g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP) LIBS = -lm From c6eae87f8af042e8687b5685a8772b40bcf9efdb Mon Sep 17 00:00:00 2001 From: Michael Oborne Date: Thu, 15 Sep 2011 18:26:59 +0800 Subject: [PATCH 2/4] fix remote error value --- ArduCopter/GCS_Mavlink.pde | 1 + ArduPlane/GCS_Mavlink.pde | 1 + 2 files changed, 2 insertions(+) diff --git a/ArduCopter/GCS_Mavlink.pde b/ArduCopter/GCS_Mavlink.pde index 261b591986..9dd7ee4a32 100644 --- a/ArduCopter/GCS_Mavlink.pde +++ b/ArduCopter/GCS_Mavlink.pde @@ -51,6 +51,7 @@ GCS_MAVLINK::update(void) // receive new packets mavlink_message_t msg; mavlink_status_t status; + status.packet_rx_drop_count = 0; // process received bytes while(comm_get_available(chan)) diff --git a/ArduPlane/GCS_Mavlink.pde b/ArduPlane/GCS_Mavlink.pde index db34c15389..b37ecb791f 100644 --- a/ArduPlane/GCS_Mavlink.pde +++ b/ArduPlane/GCS_Mavlink.pde @@ -51,6 +51,7 @@ GCS_MAVLINK::update(void) // receive new packets mavlink_message_t msg; mavlink_status_t status; + status.packet_rx_drop_count = 0; // process received bytes while(comm_get_available(chan)) From 45c4872e6de39df6c78f37588343f26f8c328809 Mon Sep 17 00:00:00 2001 From: Janne M Date: Thu, 15 Sep 2011 22:38:22 +0300 Subject: [PATCH 3/4] Issue #415: Modified spotlight search string. Added UPLOAD_PROTOCOL parameter to makefile to use different programmer. --- libraries/AP_Common/Arduino.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Common/Arduino.mk b/libraries/AP_Common/Arduino.mk index 894a92388c..be6928f17c 100644 --- a/libraries/AP_Common/Arduino.mk +++ b/libraries/AP_Common/Arduino.mk @@ -124,7 +124,7 @@ ifeq ($(ARDUINO),) # ifeq ($(SYSTYPE),Darwin) # use Spotlight to find Arduino.app - ARDUINO_QUERY = 'kMDItemKind == Application && kMDItemDisplayName == Arduino.app' + ARDUINO_QUERY = 'kMDItemKind == Application && kMDItemFSName == Arduino.app' ARDUINOS := $(addsuffix /Contents/Resources/Java,$(shell mdfind -literal $(ARDUINO_QUERY))) ifeq ($(ARDUINOS),) $(error ERROR: Spotlight cannot find Arduino on your system.) @@ -321,7 +321,9 @@ HARDWARE_CORE := $(shell grep $(BOARD).build.core $(BOARDFILE) | cut -d = -f 2) UPLOAD_SPEED := $(shell grep $(BOARD).upload.speed $(BOARDFILE) | cut -d = -f 2) # This simply does not work, so hardcode it to the correct value #UPLOAD_PROTOCOL := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2) -UPLOAD_PROTOCOL := arduino +ifeq ($(UPLOAD_PROTOCOL),) + UPLOAD_PROTOCOL := arduino +endif ifeq ($(MCU),) $(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE)) From 185bfc232a0fb0518868cc5469ae45d105875cf2 Mon Sep 17 00:00:00 2001 From: analoguedevices Date: Fri, 16 Sep 2011 08:13:33 +0000 Subject: [PATCH 4/4] comment change to test Git pull --- Tools/ArduTracker/APM_Config.h.reference | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/ArduTracker/APM_Config.h.reference b/Tools/ArduTracker/APM_Config.h.reference index 0964e16769..3eb4c9c3c4 100644 --- a/Tools/ArduTracker/APM_Config.h.reference +++ b/Tools/ArduTracker/APM_Config.h.reference @@ -2,7 +2,7 @@ // Example and reference ArduPilot Mega configuration file // ======================================================= // -// This file contains documentation and examples for configuration options +// This file contains documentation and examples of configuration options // supported by the ArduPilot Mega software. // // Most of these options are just that - optional. You should create