zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://code.google.com/p/ardupilot-mega

mission-4.1.18
Jason Short 14 years ago
parent
b948e0f02b 80d5c6ac15
commit
9bcbe70e59
4 changed files with 11 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ArduCopter/GCS_Mavlink.pde
  2. 1
      ArduPlane/GCS_Mavlink.pde
  3. 2
      Tools/ArduTracker/APM_Config.h.reference
  4. 13
      libraries/AP_Common/Arduino.mk

1
ArduCopter/GCS_Mavlink.pde
Unescape View File

@ -51,6 +51,7 @@ GCS_MAVLINK::update(void)
// receive new packets // receive new packets
mavlink_message_t msg; mavlink_message_t msg;
mavlink_status_t status; mavlink_status_t status;
status.packet_rx_drop_count = 0;
// process received bytes // process received bytes
while(comm_get_available(chan)) while(comm_get_available(chan))

1
ArduPlane/GCS_Mavlink.pde
Unescape View File

@ -51,6 +51,7 @@ GCS_MAVLINK::update(void)
// receive new packets // receive new packets
mavlink_message_t msg; mavlink_message_t msg;
mavlink_status_t status; mavlink_status_t status;
status.packet_rx_drop_count = 0;
// process received bytes // process received bytes
while(comm_get_available(chan)) while(comm_get_available(chan))

2
Tools/ArduTracker/APM_Config.h.reference
Unescape View File

@ -2,7 +2,7 @@
// Example and reference ArduPilot Mega configuration file // 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. // supported by the ArduPilot Mega software.
// //
// Most of these options are just that - optional. You should create // Most of these options are just that - optional. You should create

13
libraries/AP_Common/Arduino.mk
Unescape View File

@ -124,7 +124,7 @@ ifeq ($(ARDUINO),)
# #
ifeq ($(SYSTYPE),Darwin) ifeq ($(SYSTYPE),Darwin)
# use Spotlight to find Arduino.app # 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))) ARDUINOS := $(addsuffix /Contents/Resources/Java,$(shell mdfind -literal $(ARDUINO_QUERY)))
ifeq ($(ARDUINOS),) ifeq ($(ARDUINOS),)
$(error ERROR: Spotlight cannot find Arduino on your system.) $(error ERROR: Spotlight cannot find Arduino on your system.)
@ -205,10 +205,11 @@ DEPFLAGS = -MD -MT $@
CXXOPTS = -mcall-prologues -ffunction-sections -fdata-sections -fno-exceptions CXXOPTS = -mcall-prologues -ffunction-sections -fdata-sections -fno-exceptions
COPTS = -mcall-prologues -ffunction-sections -fdata-sections COPTS = -mcall-prologues -ffunction-sections -fdata-sections
ASOPTS = -assembler-with-cpp ASOPTS = -assembler-with-cpp
LISTOPTS = -adhlns=$(@:.o=.lst)
CXXFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS) CXXFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(CXXOPTS)
CFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(OPTFLAGS) $(DEPFLAGS) $(COPTS) CFLAGS = -g -mmcu=$(MCU) $(DEFINES) -Wa,$(LISTOPTS) $(OPTFLAGS) $(DEPFLAGS) $(COPTS)
ASFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(DEPFLAGS) $(ASOPTS) ASFLAGS = -g -mmcu=$(MCU) $(DEFINES) $(LISTOPTS) $(DEPFLAGS) $(ASOPTS)
LDFLAGS = -g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP) LDFLAGS = -g -mmcu=$(MCU) $(OPTFLAGS) -Wl,--gc-sections -Wl,-Map -Wl,$(SKETCHMAP)
LIBS = -lm LIBS = -lm
@ -320,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) UPLOAD_SPEED := $(shell grep $(BOARD).upload.speed $(BOARDFILE) | cut -d = -f 2)
# This simply does not work, so hardcode it to the correct value # 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 := $(shell grep $(BOARD).upload.protocol $(BOARDFILE) | cut -d = -f 2)
UPLOAD_PROTOCOL := arduino ifeq ($(UPLOAD_PROTOCOL),)
UPLOAD_PROTOCOL := arduino
endif
ifeq ($(MCU),) ifeq ($(MCU),)
$(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE)) $(error ERROR: Could not locate board $(BOARD) in $(BOARDFILE))

Write Preview
Loading…
Cancel
Save