release 2834

Added altitude to navigation screen.
Added MAVLINK_RADIO_STATUS messaged decoder.
Moved mavlink settings to the model menu.
Added scaling factor for the RC rssi value.

TODO.txt

@@ -1,5 +0,0 @@
-TODO list (no particular order)
-
-- DSM2 channel order (Cam)
-- Variometer (rate as cm/sec)
-- Trace telemetry data

TinyApp/Common_Define.h

@@ -1,206 +0,0 @@
-
-
-/*****************************************************************************/
-#define TWI_CMD_PAGEUPDATE        	0x01	// TWI Command to program a flash page
-#define TWI_CMD_EXECUTEAPP        	0x02	// TWI Command to jump to the application program
-#define TWI_CMD_SETREAD_ADDRESS			0x03	// TWI Command to set address to read from
-#define TWI_CMD_WRITE_DATA         	0x04	// TWI Command send data to the application
-
-#define TWI_CMD_REBOOT							0x55	// TWI Command to restart back in the bootloader
-
-#define TWI_SUBCMD_SETDATETIME     	0x74	// TWI Command to set the date and time
-//#define TWI_CMD_BVERSION          	0x04	// TWI Command to get the bootloader revision identifier
-//#define TWI_CMD_ERASEFLASH        	0x05	// TWI Command to erase the entire application section of flash memory
-//#define TWI_CMD_GETERRCONDN             0x07    // TWI Command to get Error condition
-
-/*****************************************************************************/
-
-
-//#define BOOT_SETTLE_DELAY         	100	// Debounce delay for the boot pin in MCU cycles
-//#define SLAVE_ADDRESS             	0xb0	// The address identifier of this slave device on the TWI (I2C) bus
-#define INTVECT_PAGE_ADDRESS      	0x000	// The location of the start of the interrupt vector table address
-
-
-
-// Select the communcation interfacing type: TWI or USI
-/*#if defined(__ATTINY25__)   | defined(__ATTINY25V__) | \
-    defined(__ATTINY45__)   | defined(__ATTINY45V__) | \
-    defined(__ATTINY85__)   | defined(__ATTINY85V__) | \
-    defined(__ATTINY24__)   | defined(__ATTINY24A__) | \
-    defined(__ATTINY44__)   | defined(__ATTINY44A__) | \
-    defined(__ATTINY84__)   | defined(__ATTINY84A__) | \
-    defined(__ATTINY2313__) | defined(__ATTINY2313A__) | \
-    defined(__ATTINY4313__) | defined(__ATTINY4313A__) | \
-    defined(__ATTINY261__)  | defined(__ATTINY261A__) | \
-    defined(__ATTINY461__)  | defined(__ATTINY461A__) | \
-    defined(__ATTINY861__)  | defined(__ATTINY861A__) | \
-    defined(__ATTINY43U__)  | \
-    defined(__ATTINY87__)   | \
-    defined(__ATTINY167__)
-    #define __USI__  // set the communication type as USI
-#endif */
-
-#define __USI__  // set the communication type as USI
-
-
-/*#if defined(__ATTINY48__) | defined(__ATTINY88__) | \
-    defined(__ATMEGA48A__) | defined(__ATMEGA48PA__) | \
-    defined(__ATMEGA48__)
-    #define __TWI__
-#endif */     
-
-/***************************************************************/
-
-
-// Page size selection for the controller with 2K flash
-/*#if defined(__ATTINY25__)   | defined(__ATTINY25V__) | \
-    defined(__ATTINY24__)   | defined(__ATTINY24A__) | \
-    defined(__ATTINY2313__) | defined(__ATTINY2313A__) | \
-    defined(__ATTINY261__)  | defined(__ATTINY261A__)
-
-    // The flash memory page size for these devices
-    #define PAGE_SIZE 32 
-
-    // Page 32, the start of bootloader section
-    #define BOOT_PAGE_ADDRESS 0X0400  
-
-    // 2KB of flash divided by pages of size 32 bytes
-    #define TOTAL_NO_OF_PAGES  64    
-    
-    // The number of pages being used for bootloader code
-    #define BOOTLOADER_PAGES          	(TOTAL_NO_OF_PAGES - BOOT_PAGE_ADDRESS/PAGE_SIZE)	
- 
-    // For bounds check during page write/erase operation to protect the bootloader code from being corrupted
-    #define LAST_PAGE_NO_TO_BE_ERASED 	(TOTAL_NO_OF_PAGES - BOOTLOADER_PAGES)	
-#endif */
-
-// Page size selection for the controller with 4K flash
-
-/*#if defined(__ATTINY45__)   | defined(__ATTINY45V__) | \
-    defined(__ATTINY44__)   | defined(__ATTINY44A__) | \
-    defined(__ATTINY4313__) | defined(__ATTINY4313A__) | \
-    defined(__ATTINY461__)  | defined(__ATTINY461A__) | \
-    defined(__ATTINY43U__)  | \
-    defined(__ATTINY48__)   | \
-    defined(__ATMEGA48__) | \
-    defined(__ATMEGA48A__) | defined(__ATMEGA48PA__)
-          
-    // The flash memory page size for these devices
-    #define PAGE_SIZE 64      
-    
-    // Page 48, the start of bootloader section
-    #define BOOT_PAGE_ADDRESS 0X0C00   
-    
-    // 4KB of flash divided by pages of size 64 bytes
-    #define TOTAL_NO_OF_PAGES  64    
-
-    // The number of pages being used for bootloader code
-    #define BOOTLOADER_PAGES          	(TOTAL_NO_OF_PAGES - BOOT_PAGE_ADDRESS/PAGE_SIZE)	
-
-  // For bounds check during page write/erase operation to protect the bootloader code from being corrupted
-   #define LAST_PAGE_NO_TO_BE_ERASED 	(TOTAL_NO_OF_PAGES - BOOTLOADER_PAGES)	
-#endif */
-
-
-// Page size selection for the controller with 8K flash
-/*#if defined(__ATTINY85__)   | defined(__ATTINY85V__) | \
-    defined(__ATTINY84__)   | defined(__ATTINY84A__) | \
-    defined(__ATTINY861__)  | defined(__ATTINY861A__) | \
-    defined(__ATTINY87__)   | \
-    defined(__ATTINY88__)
-      
-    // The flash memory page size for these devices
-    #define PAGE_SIZE 64      
-
-    // Page 112, the start of bootloader section
-    #define BOOT_PAGE_ADDRESS 0X1C00   
-  
-    // 8KB of flash divided by pages of size 64 bytes
-    #define TOTAL_NO_OF_PAGES  128    
-    
-    // The number of pages being used for bootloader code
-    #define BOOTLOADER_PAGES          	(TOTAL_NO_OF_PAGES - BOOT_PAGE_ADDRESS/PAGE_SIZE)	
-
-//    // For bounds check during page write/erase operation to protect the bootloader code from being corrupted
-//    #define LAST_PAGE_NO_TO_BE_ERASED 	(TOTAL_NO_OF_PAGES - BOOTLOADER_PAGES)	
-//#endif*/
-
-// Page size selection for the controller with 16K flash   
-//#if defined(__ATTINY167__) 
-
-// The flash memory page size for Atiny167
-#define PAGE_SIZE 128
-
-// Page 120, the start of bootloader section
-#define BOOT_PAGE_ADDRESS 0X3800  
-
-// 16KB of flash divided by pages of size 128 bytes
-#define TOTAL_NO_OF_PAGES  128   
-
-// The number of pages being used for bootloader code
-#define BOOTLOADER_PAGES          	(TOTAL_NO_OF_PAGES - BOOT_PAGE_ADDRESS/PAGE_SIZE)	
-
-// For bounds check during page write/erase operation to protect the bootloader code from being corrupted
-#define LAST_PAGE_NO_TO_BE_ERASED 	(TOTAL_NO_OF_PAGES - BOOTLOADER_PAGES)	
-
-//#endif   
-
-
- /*****************************************************************************/
- /*****************************************************************************/
-// Select the correct Bit name of to SELFPROGRAMming
-/*#if defined(__ATTINY48__) | defined(__ATTINY48A__) | \
-    defined(__ATTINY88__) | defined(__ATTINY88A__) | \
-    defined(__ATMEGA48__) | \
-    defined(__ATMEGA48A__) | defined(__ATMEGA48PA__)
-      
-    #define SELFPROGEN     SELFPRGEN
-
-#endif */
- /*****************************************************************************/
- /*****************************************************************************/
-/*#if defined(__ATTINY25__)   | defined(__ATTINY25V__) | \
-    defined(__ATTINY45__)   | defined(__ATTINY45V__) | \
-    defined(__ATTINY85__)   | defined(__ATTINY85V__) | \
-    defined(__ATTINY87__)   | defined(__ATTINY167__) */
-    
-#define SELFPROGEN SPMEN
-
-//#endif
-
- /*****************************************************************************/
- /*****************************************************************************/
-
-
-#define WDT_TIMEOUT_8s      		( _BV( WDP3 ) | _BV( WDP0 ) )	        // Watchdog timeout for inactivity in the boot section
-#define WDT_TIMEOUT_16ms    		0	// Watchdog timeout for system reset (cleanup) before jump to application
-#define WDT_TIMEOUT_min     		WDT_TIMEOUT_16ms	                // The minimum watchdog reset time interval for jump to application
-
-
-/*****************************************************************************/
-/*****************************************************************************/
-
-#define STATUSMASK_SPMBUSY 			0x01	// The mask bit for SPM busy status code
-#define STATUSMASK_BLSCERR      0x02    // The mask bit for attempt to override bootloader section
-#define STATUSMASK_TWIABORT     0x04    // The mask bit for indicating TWI abort fn called
-#define STATUSMASK_SLTR_BUSY    0x08    // The mask bit for slave transmit
-#define STATUSMASK_SLRBAA_BUSY  0x10    // The mask bit for slave receive and ack
-#define STATUSMASK_SLRBAN_BUSY  0x20    // The mask bit for slave receive and Nack
-#define STATUSMASK_EEPROM_BUSY  0x40    // The mask bit for EEPROM busy
-#define STATUSMASK_BOOTLOADER   0x80    // The mask bit for bootloader operations
-/*****************************************************************************/
-/*****************************************************************************/
-
-#define EEMEM_ADDR_AVERSION 0x05	// The address in EEPROM where application revision identifier will be stored
-#define BVERSION 						0x96	// This bootloader revision identifier
-
-
-//static void UpdatePage (uint16_t);  
-
-#ifndef _BV
-#define _BV( __BIT_POSITION__ ) ( 1 << __BIT_POSITION__ )
-#endif
-
-//#ifdef _BV
-//#warning _BV now stands defined
-//#endif

TinyApp/Makefile

@@ -1,624 +0,0 @@
-# Hey Emacs, this is a -*- makefile -*-
-#----------------------------------------------------------------------------
-# WinAVR Makefile
-#
-# On command line:
-#
-# make all = Make software.
-#
-# make clean = Clean out built project files.
-#
-# make coff = Convert ELF to AVR COFF.
-#
-# make extcoff = Convert ELF to AVR Extended COFF.
-#
-# make program = Download the hex file to the device, using avrdude.
-#                Please customize the avrdude settings below first!
-#
-# make debug = Start either simulavr or avarice as specified for debugging,
-#              with avr-gdb or avr-insight as the front end for debugging.
-#
-# make filename.s = Just compile filename.c into the assembler code only.
-#
-# make filename.i = Create a preprocessed source file for use in submitting
-#                   bug reports to the GCC project.
-#
-# To rebuild project do "make clean" then "make all".
-#----------------------------------------------------------------------------
-
-
-# MCU name
-MCU = attiny167
-
-
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#     Typical values are:
-#         F_CPU =  1000000
-#         F_CPU =  1843200
-#         F_CPU =  2000000
-#         F_CPU =  3686400
-#         F_CPU =  4000000
-#         F_CPU =  7372800
-#         F_CPU =  8000000
-#         F_CPU = 11059200
-#         F_CPU = 14745600
-#         F_CPU = 16000000
-#         F_CPU = 18432000
-#         F_CPU = 20000000
-F_CPU = 8000000
-
-
-# Output format. (can be srec, ihex, binary)
-FORMAT = ihex
-
-
-# Target file name (without extension).
-TARGET = TinyApp
-
-
-# Object files directory
-#     To put object files in current directory, use a dot (.), do NOT make
-#     this an empty or blank macro!
-OBJDIR = .
-
-
-# List C source files here. (C dependencies are automatically generated.)
-SRC = $(TARGET).c
-
-
-# List C++ source files here. (C dependencies are automatically generated.)
-CPPSRC =
-
-
-# List Assembler source files here.
-#     Make them always end in a capital .S.  Files ending in a lowercase .s
-#     will not be considered source files but generated files (assembler
-#     output from the compiler), and will be deleted upon "make clean"!
-#     Even though the DOS/Win* filesystem matches both .s and .S the same,
-#     it will preserve the spelling of the filenames, and gcc itself does
-#     care about how the name is spelled on its command-line.
-ASRC =
-
-
-# Optimization level, can be [0, 1, 2, 3, s].
-#     0 = turn off optimization. s = optimize for size.
-#     (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
-OPT = s
-
-
-# Debugging format.
-#     Native formats for AVR-GCC's -g are dwarf-2 [default] or stabs.
-#     AVR Studio 4.10 requires dwarf-2.
-#     AVR [Extended] COFF format requires stabs, plus an avr-objcopy run.
-#DEBUG = stabs
-DEBUG = dwarf-2
-
-
-# List any extra directories to look for include files here.
-#     Each directory must be seperated by a space.
-#     Use forward slashes for directory separators.
-#     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = c:\progs\iccv7avr\include
-
-
-# Compiler flag to set the C Standard level.
-#     c89   = "ANSI" C
-#     gnu89 = c89 plus GCC extensions
-#     c99   = ISO C99 standard (not yet fully implemented)
-#     gnu99 = c99 plus GCC extensions
-CSTANDARD = -std=gnu99
-
-
-# Place -D or -U options here for C sources
-CDEFS = -DF_CPU=$(F_CPU)UL
-
-
-# Place -D or -U options here for ASM sources
-ADEFS = -DF_CPU=$(F_CPU)
-
-
-# Place -D or -U options here for C++ sources
-CPPDEFS = -DF_CPU=$(F_CPU)UL
-#CPPDEFS += -D__STDC_LIMIT_MACROS
-#CPPDEFS += -D__STDC_CONSTANT_MACROS
-
-
-
-#---------------- Compiler Options C ----------------
-#  -g*:          generate debugging information
-#  -O*:          optimization level
-#  -f...:        tuning, see GCC manual and avr-libc documentation
-#  -Wall...:     warning level
-#  -Wa,...:      tell GCC to pass this to the assembler.
-#    -adhlns...: create assembler listing
-CFLAGS = -g$(DEBUG)
-CFLAGS += $(CDEFS)
-CFLAGS += -O$(OPT)
-CFLAGS += -funsigned-char
-CFLAGS += -funsigned-bitfields
-CFLAGS += -fpack-struct
-CFLAGS += -fshort-enums
-CFLAGS += -Wall
-CFLAGS += -Wno-main
-CFLAGS += -Wstrict-prototypes
-#CFLAGS += -mshort-calls
-#CFLAGS += -fno-unit-at-a-time
-#CFLAGS += -Wundef
-#CFLAGS += -Wunreachable-code
-#CFLAGS += -Wsign-compare
-CFLAGS += -Wa,-adlns=$(<:%.c=$(OBJDIR)/%.lst)
-CFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
-CFLAGS += $(CSTANDARD)
-# Next line dumps rtl file
-#CFLAGS += -dr
-#CFLAGS += -Wa,-adhlns=$(<:%.c=$(OBJDIR)/%.lst)
-
-
-#---------------- Compiler Options C++ ----------------
-#  -g*:          generate debugging information
-#  -O*:          optimization level
-#  -f...:        tuning, see GCC manual and avr-libc documentation
-#  -Wall...:     warning level
-#  -Wa,...:      tell GCC to pass this to the assembler.
-#    -adhlns...: create assembler listing
-CPPFLAGS = -g$(DEBUG)
-CPPFLAGS += $(CPPDEFS)
-CPPFLAGS += -O$(OPT)
-CPPFLAGS += -funsigned-char
-CPPFLAGS += -funsigned-bitfields
-CPPFLAGS += -fpack-struct
-CPPFLAGS += -fshort-enums
-CPPFLAGS += -fno-exceptions
-CPPFLAGS += -Wall
-CFLAGS += -Wundef
-#CPPFLAGS += -mshort-calls
-#CPPFLAGS += -fno-unit-at-a-time
-#CPPFLAGS += -Wstrict-prototypes
-#CPPFLAGS += -Wunreachable-code
-#CPPFLAGS += -Wsign-compare
-CPPFLAGS += -Wa,-adlns=$(<:%.cpp=$(OBJDIR)/%.lst)
-CPPFLAGS += $(patsubst %,-I%,$(EXTRAINCDIRS))
-#CPPFLAGS += $(CSTANDARD)
-#CPPFLAGS += -Wa,-adhlns=$(<:%.cpp=$(OBJDIR)/%.lst)
-
-
-#---------------- Assembler Options ----------------
-#  -Wa,...:   tell GCC to pass this to the assembler.
-#  -adhlns:   create listing
-#  -gstabs:   have the assembler create line number information; note that
-#             for use in COFF files, additional information about filenames
-#             and function names needs to be present in the assembler source
-#             files -- see avr-libc docs [FIXME: not yet described there]
-#  -listing-cont-lines: Sets the maximum number of continuation lines of hex
-#       dump that will be displayed for a given single line of source input.
-ASFLAGS = $(ADEFS) -Wa,-adhlns=$(<:%.S=$(OBJDIR)/%.lst),-gstabs,--listing-cont-lines=100
-
-
-#---------------- Library Options ----------------
-# Minimalistic printf version
-PRINTF_LIB_MIN = -Wl,-u,vfprintf -lprintf_min
-
-# Floating point printf version (requires MATH_LIB = -lm below)
-PRINTF_LIB_FLOAT = -Wl,-u,vfprintf -lprintf_flt
-
-# If this is left blank, then it will use the Standard printf version.
-PRINTF_LIB =
-#PRINTF_LIB = $(PRINTF_LIB_MIN)
-#PRINTF_LIB = $(PRINTF_LIB_FLOAT)
-
-
-# Minimalistic scanf version
-SCANF_LIB_MIN = -Wl,-u,vfscanf -lscanf_min
-
-# Floating point + %[ scanf version (requires MATH_LIB = -lm below)
-SCANF_LIB_FLOAT = -Wl,-u,vfscanf -lscanf_flt
-
-# If this is left blank, then it will use the Standard scanf version.
-SCANF_LIB =
-#SCANF_LIB = $(SCANF_LIB_MIN)
-#SCANF_LIB = $(SCANF_LIB_FLOAT)
-
-
-MATH_LIB = -lm
-
-
-# List any extra directories to look for libraries here.
-#     Each directory must be seperated by a space.
-#     Use forward slashes for directory separators.
-#     For a directory that has spaces, enclose it in quotes.
-EXTRALIBDIRS =
-
-
-
-#---------------- External Memory Options ----------------
-
-# 64 KB of external RAM, starting after internal RAM (ATmega128!),
-# used for variables (.data/.bss) and heap (malloc()).
-#EXTMEMOPTS = -Wl,-Tdata=0x801100,--defsym=__heap_end=0x80ffff
-
-# 64 KB of external RAM, starting after internal RAM (ATmega128!),
-# only used for heap (malloc()).
-#EXTMEMOPTS = -Wl,--section-start,.data=0x801100,--defsym=__heap_end=0x80ffff
-
-EXTMEMOPTS =
-
-
-
-#---------------- Linker Options ----------------
-#  -Wl,...:     tell GCC to pass this to linker.
-#    -Map:      create map file
-#    --cref:    add cross reference to  map file
-LDFLAGS = -Wl,-Map=$(TARGET).map,--cref
-LDFLAGS += $(EXTMEMOPTS)
-LDFLAGS += $(patsubst %,-L%,$(EXTRALIBDIRS))
-LDFLAGS += $(PRINTF_LIB) $(SCANF_LIB) $(MATH_LIB)
-LDFLAGS += -Wl,--section-start=.text=0x00D0
-LDFLAGS += -Wl,--section-start=.vectors=0x0080
-LDFLAGS += -T avr3-167.ld
-LDFLAGS += -N
-
-
-
-#---------------- Programming Options (avrdude) ----------------
-
-# Programming hardware: alf avr910 avrisp bascom bsd
-# dt006 pavr picoweb pony-stk200 sp12 stk200 stk500
-#
-# Type: avrdude -c ?
-# to get a full listing.
-#
-AVRDUDE_PROGRAMMER = stk500
-
-# com1 = serial port. Use lpt1 to connect to parallel port.
-AVRDUDE_PORT = com3
-
-AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
-#AVRDUDE_WRITE_EEPROM = -U eeprom:w:$(TARGET).eep
-
-
-# Uncomment the following if you want avrdude's erase cycle counter.
-# Note that this counter needs to be initialized first using -Yn,
-# see avrdude manual.
-#AVRDUDE_ERASE_COUNTER = -y
-
-# Uncomment the following if you do /not/ wish a verification to be
-# performed after programming the device.
-#AVRDUDE_NO_VERIFY = -V
-
-# Increase verbosity level.  Please use this when submitting bug
-# reports about avrdude. See <http://savannah.nongnu.org/projects/avrdude>
-# to submit bug reports.
-#AVRDUDE_VERBOSE = -v -v
-
-AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
-AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
-AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
-AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
-
-
-
-#---------------- Debugging Options ----------------
-
-# For simulavr only - target MCU frequency.
-DEBUG_MFREQ = $(F_CPU)
-
-# Set the DEBUG_UI to either gdb or insight.
-# DEBUG_UI = gdb
-DEBUG_UI = insight
-
-# Set the debugging back-end to either avarice, simulavr.
-DEBUG_BACKEND = avarice
-#DEBUG_BACKEND = simulavr
-
-# GDB Init Filename.
-GDBINIT_FILE = __avr_gdbinit
-
-# When using avarice settings for the JTAG
-JTAG_DEV = /dev/com1
-
-# Debugging port used to communicate between GDB / avarice / simulavr.
-DEBUG_PORT = 4242
-
-# Debugging host used to communicate between GDB / avarice / simulavr, normally
-#     just set to localhost unless doing some sort of crazy debugging when
-#     avarice is running on a different computer.
-DEBUG_HOST = localhost
-
-
-
-#============================================================================
-
-
-# Define programs and commands.
-SHELL = sh
-CC = avr-gcc
-OBJCOPY = avr-objcopy
-OBJDUMP = avr-objdump
-SIZE = avr-size
-AR = avr-ar rcs
-NM = avr-nm
-AVRDUDE = avrdude
-REMOVE = rm -f
-REMOVEDIR = rm -rf
-COPY = cp
-WINSHELL = cmd
-
-
-# Define Messages
-# English
-MSG_ERRORS_NONE = Errors: none
-MSG_BEGIN = -------- begin --------
-MSG_END = --------  end  --------
-MSG_SIZE_BEFORE = Size before:
-MSG_SIZE_AFTER = Size after:
-MSG_COFF = Converting to AVR COFF:
-MSG_EXTENDED_COFF = Converting to AVR Extended COFF:
-MSG_FLASH = Creating load file for Flash:
-MSG_EEPROM = Creating load file for EEPROM:
-MSG_EXTENDED_LISTING = Creating Extended Listing:
-MSG_SYMBOL_TABLE = Creating Symbol Table:
-MSG_LINKING = Linking:
-MSG_COMPILING = Compiling C:
-MSG_COMPILING_CPP = Compiling C++:
-MSG_ASSEMBLING = Assembling:
-MSG_CLEANING = Cleaning project:
-MSG_CREATING_LIBRARY = Creating library:
-
-
-
-
-# Define all object files.
-OBJ = $(SRC:%.c=$(OBJDIR)/%.o) $(CPPSRC:%.cpp=$(OBJDIR)/%.o) $(ASRC:%.S=$(OBJDIR)/%.o)
-
-# Define all listing files.
-LST = $(SRC:%.c=$(OBJDIR)/%.lst) $(CPPSRC:%.cpp=$(OBJDIR)/%.lst) $(ASRC:%.S=$(OBJDIR)/%.lst)
-
-
-# Compiler flags to generate dependency files.
-GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
-
-
-# Combine all necessary flags and optional flags.
-# Add target processor to flags.
-ALL_CFLAGS = -mmcu=$(MCU) -I. $(CFLAGS) $(GENDEPFLAGS)
-ALL_CPPFLAGS = -mmcu=$(MCU) -I. -x c++ $(CPPFLAGS) $(GENDEPFLAGS)
-ALL_ASFLAGS = -mmcu=$(MCU) -I. -x assembler-with-cpp $(ASFLAGS)
-
-
-
-
-
-# Default target.
-all: begin gccversion sizebefore build sizeafter end
-
-# Change the build target to build a HEX file or a library.
-build: elf hex eep lss sym bin
-#build: lib
-
-
-elf: $(TARGET).elf
-hex: $(TARGET).hex
-bin: $(TARGET).bin
-eep: $(TARGET).eep
-lss: $(TARGET).lss
-sym: $(TARGET).sym
-LIBNAME=lib$(TARGET).a
-lib: $(LIBNAME)
-
-
-
-# Eye candy.
-# AVR Studio 3.x does not check make's exit code but relies on
-# the following magic strings to be generated by the compile job.
-begin:
-	@echo
-	@echo $(MSG_BEGIN)
-
-end:
-	@echo $(MSG_END)
-	@echo
-
-
-# Display size of file.
-HEXSIZE = $(SIZE) --target=$(FORMAT) $(TARGET).hex
-ELFSIZE = $(SIZE) --mcu=$(MCU) --format=avr $(TARGET).elf
-
-sizebefore:
-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_BEFORE); $(ELFSIZE); \
-	2>/dev/null; echo; fi
-
-sizeafter:
-	@if test -f $(TARGET).elf; then echo; echo $(MSG_SIZE_AFTER); $(ELFSIZE); \
-	2>/dev/null; echo; fi
-
-
-
-# Display compiler version information.
-gccversion :
-	@$(CC) --version
-
-
-
-# Program the device.
-program: $(TARGET).hex $(TARGET).eep
-	$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE_EEPROM)
-
-
-# Generate avr-gdb config/init file which does the following:
-#     define the reset signal, load the target file, connect to target, and set
-#     a breakpoint at main().
-gdb-config:
-	@$(REMOVE) $(GDBINIT_FILE)
-	@echo define reset >> $(GDBINIT_FILE)
-	@echo SIGNAL SIGHUP >> $(GDBINIT_FILE)
-	@echo end >> $(GDBINIT_FILE)
-	@echo file $(TARGET).elf >> $(GDBINIT_FILE)
-	@echo target remote $(DEBUG_HOST):$(DEBUG_PORT)  >> $(GDBINIT_FILE)
-ifeq ($(DEBUG_BACKEND),simulavr)
-	@echo load  >> $(GDBINIT_FILE)
-endif
-	@echo break main >> $(GDBINIT_FILE)
-
-debug: gdb-config $(TARGET).elf
-ifeq ($(DEBUG_BACKEND), avarice)
-	@echo Starting AVaRICE - Press enter when "waiting to connect" message displays.
-	@$(WINSHELL) /c start avarice --jtag $(JTAG_DEV) --erase --program --file \
-	$(TARGET).elf $(DEBUG_HOST):$(DEBUG_PORT)
-	@$(WINSHELL) /c pause
-
-else
-	@$(WINSHELL) /c start simulavr --gdbserver --device $(MCU) --clock-freq \
-	$(DEBUG_MFREQ) --port $(DEBUG_PORT)
-endif
-	@$(WINSHELL) /c start avr-$(DEBUG_UI) --command=$(GDBINIT_FILE)
-
-
-
-
-# Convert ELF to COFF for use in debugging / simulating in AVR Studio or VMLAB.
-COFFCONVERT = $(OBJCOPY) --debugging
-COFFCONVERT += --change-section-address .data-0x800000
-COFFCONVERT += --change-section-address .bss-0x800000
-COFFCONVERT += --change-section-address .noinit-0x800000
-COFFCONVERT += --change-section-address .eeprom-0x810000
-
-
-
-coff: $(TARGET).elf
-	@echo
-	@echo $(MSG_COFF) $(TARGET).cof
-	$(COFFCONVERT) -O coff-avr $< $(TARGET).cof
-
-
-extcoff: $(TARGET).elf
-	@echo
-	@echo $(MSG_EXTENDED_COFF) $(TARGET).cof
-	$(COFFCONVERT) -O coff-ext-avr $< $(TARGET).cof
-
-
-
-# Create final output files (.hex, .eep) from ELF output file.
-%.hex: %.elf
-	@echo
-	@echo $(MSG_FLASH) $@
-	$(OBJCOPY) -O $(FORMAT) -R .eeprom $< $@
-
-%.bin: %.elf
-	$(OBJCOPY) -O binary $< $@
-
-%.eep: %.elf
-	@echo
-	@echo $(MSG_EEPROM) $@
-	-$(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" \
-	--change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) $< $@ || exit 0
-
-# Create extended listing file from ELF output file.
-%.lss: %.elf
-	@echo
-	@echo $(MSG_EXTENDED_LISTING) $@
-	$(OBJDUMP) -h -S $< > $@
-
-# Create a symbol table from ELF output file.
-%.sym: %.elf
-	@echo
-	@echo $(MSG_SYMBOL_TABLE) $@
-	$(NM) -n $< > $@
-
-
-
-# Create library from object files.
-.SECONDARY : $(TARGET).a
-.PRECIOUS : $(OBJ)
-%.a: $(OBJ)
-	@echo
-	@echo $(MSG_CREATING_LIBRARY) $@
-	$(AR) $@ $(OBJ)
-
-
-# Link: create ELF output file from object files.
-.SECONDARY : $(TARGET).elf
-.PRECIOUS : $(OBJ)
-%.elf: $(OBJ)
-	@echo
-	@echo $(MSG_LINKING) $@
-	$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS)
-
-
-# Compile: create object files from C source files.
-$(OBJDIR)/%.o : %.c
-	@echo
-	@echo $(MSG_COMPILING) $<
-	$(CC) -c $(ALL_CFLAGS) $< -o $@
-
-
-# Compile: create object files from C++ source files.
-$(OBJDIR)/%.o : %.cpp
-	@echo
-	@echo $(MSG_COMPILING_CPP) $<
-	$(CC) -c $(ALL_CPPFLAGS) $< -o $@
-
-
-# Compile: create assembler files from C source files.
-%.s : %.c
-	$(CC) -S $(ALL_CFLAGS) $< -o $@
-
-
-# Compile: create assembler files from C++ source files.
-%.s : %.cpp
-	$(CC) -S $(ALL_CPPFLAGS) $< -o $@
-
-
-# Assemble: create object files from assembler source files.
-$(OBJDIR)/%.o : %.S
-	@echo
-	@echo $(MSG_ASSEMBLING) $<
-	$(CC) -c $(ALL_ASFLAGS) $< -o $@
-
-
-# Create preprocessed source for use in sending a bug report.
-%.i : %.c
-	$(CC) -E -mmcu=$(MCU) -I. $(CFLAGS) $< -o $@
-
-
-# Target: clean project.
-clean: begin clean_list end
-
-clean_list :
-	@echo
-	@echo $(MSG_CLEANING)
-	$(REMOVE) $(TARGET).bin
-	$(REMOVE) $(TARGET).hex
-	$(REMOVE) $(TARGET).eep
-	$(REMOVE) $(TARGET).cof
-	$(REMOVE) $(TARGET).elf
-	$(REMOVE) $(TARGET).map
-	$(REMOVE) $(TARGET).sym
-	$(REMOVE) $(TARGET).lss
-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.o)
-	$(REMOVE) $(SRC:%.c=$(OBJDIR)/%.lst)
-	$(REMOVE) $(SRC:.c=.s)
-	$(REMOVE) $(SRC:.c=.d)
-	$(REMOVE) $(SRC:.c=.i)
-	$(REMOVEDIR) .dep
-
-
-# Create object files directory
-$(shell mkdir $(OBJDIR) 2>/dev/null)
-
-
-# Include the dependency files.
--include $(shell mkdir .dep 2>/dev/null) $(wildcard .dep/*)
-
-
-# Listing of phony targets.
-.PHONY : all begin finish end sizebefore sizeafter gccversion \
-build elf hex eep lss sym coff extcoff \
-clean clean_list program debug gdb-config
-
-
-
-

TinyApp/USI_TWI_Slave.h

@@ -1,174 +0,0 @@
-#ifdef __USI__
-
- /****************************************************************************/
-static void USI_TWI_SLAVE_Init( void );
-static void USI_TWI_SLAVE_Abort(void);
-static void USI_TWI_SLAVE_ReadAndProcessPacket(void);
-static void USI_TWI_SLAVE_Process_Start_Condition(void);
-void USI_TWI_SLAVE_Process_Overflow_Condition(void);
- 
-//  void prog_buffer_set_byte(uint8_t );
- 
-//   uint8_t bootloader_exit;
-uint8_t Run_boot ;
-  
- 
-#define TRUE                1
-#define FALSE               0
-
- // TWI write states.
-#define USI_TWI_SLAVE_WRITE_ADDR_HI_BYTE              (0x00)
-#define USI_TWI_SLAVE_WRITE_ADDR_LO_BYTE              (0x01)
-#define USI_TWI_SLAVE_WRITE_DATA_BYTE                 (0x02)
-  
-// TWI overflow states.
-#define USI_TWI_SLAVE_OVERFLOW_STATE_NONE             (0x00)
-#define USI_TWI_SLAVE_OVERFLOW_STATE_ACK_PR_RX        (0x01)
-#define USI_TWI_SLAVE_OVERFLOW_STATE_DATA_RX          (0x02)
-#define USI_TWI_SLAVE_OVERFLOW_STATE_ACK_PR_TX        (0x03)
-#define USI_TWI_SLAVE_OVERFLOW_STATE_PR_ACK_TX        (0x04)
-#define USI_TWI_SLAVE_OVERFLOW_STATE_DATA_TX          (0x05)
-  
-// newly added .. 
-#define USI_TWI_SLAVE_OVERFLOW_STATE_CMD_RX                 (0x06) 
-#define USI_TWI_SLAVE_OVERFLOW_STATE_DATA_TX_AVERSION       (0x07) 
-#define USI_TWI_SLAVE_OVERFLOW_STATE_DATA_TX_BVERSION       (0x08) 
-#define USI_TWI_SLAVE_OVERFLOW_STATE_DATA_TX_GETERRCONDN    (0x09) 
-  
-
-  
-//////////////////////////////////////////////////////////////////////
- //  typedef     unsigned char       uint8_t;
-
-//////////////////////////////////////////////////////////////////
-///////////////// Driver Buffer Definitions //////////////////////
-//////////////////////////////////////////////////////////////////
-// 1,2,4,8,16,32,64,128 or 256 bytes are allowed buffer sizes
-
-#define TWI_RX_BUFFER_SIZE  (16)
-#define TWI_RX_BUFFER_MASK ( TWI_RX_BUFFER_SIZE - 1 )
-
-#if ( TWI_RX_BUFFER_SIZE & TWI_RX_BUFFER_MASK )
-        #error TWI RX buffer size is not a power of 2
-#endif
-
-// 1,2,4,8,16,32,64,128 or 256 bytes are allowed buffer sizes
-
-#define TWI_TX_BUFFER_SIZE  (16)
-#define TWI_TX_BUFFER_MASK ( TWI_TX_BUFFER_SIZE - 1 )
-
-#if ( TWI_TX_BUFFER_SIZE & TWI_TX_BUFFER_MASK )
-        #error TWI TX buffer size is not a power of 2
-#endif
-
-
-
-#define USI_SLAVE_CHECK_ADDRESS                (0x00)
-#define USI_SLAVE_SEND_DATA                    (0x01)
-#define USI_SLAVE_REQUEST_REPLY_FROM_SEND_DATA (0x02)
-#define USI_SLAVE_CHECK_REPLY_FROM_SEND_DATA   (0x03)
-#define USI_SLAVE_REQUEST_DATA                 (0x04)
-#define USI_SLAVE_GET_DATA_AND_SEND_ACK        (0x05)
- 
- 
- //////////////////////////////////////////////////////////////////////////
-
- 
-/*#if defined(__ATTINY2313__) | defined(__ATTINY2313A__) | \
-    defined(__ATTINY4313__) | defined(__ATTINY4313A__) */
-
-//    #define DDR_USI             DDRB
-//    #define PORT_USI            PORTB
-//    #define PIN_USI             PINB
-//    #define PORT_USI_SDA        PORTB5
-//    #define PORT_USI_SCL        PORTB7
-//    #define PIN_USI_SDA         PINB5
-//    #define PIN_USI_SCL         PINB7
-//    #define USI_START_COND_INT  USISIF
-//    #define USI_START_VECTOR    USI_STRT_vect
-//    #define USI_OVERFLOW_VECTOR USI_OVF_vect
-//#endif
- 
-/*#if defined(__ATTINY25__) | defined(__ATTINY25V__) | \
-//    defined(__ATTINY45__) | defined(__ATTINY45V__) | \
-//    defined(__ATTINY85__) | defined(__ATTINY85V__) */
-//    #define DDR_USI             DDRB
-//    #define PORT_USI            PORTB
-//    #define PIN_USI             PINB
-//    #define PORT_USI_SDA        PORTB0
-//    #define PORT_USI_SCL        PORTB2
-//    #define PIN_USI_SDA         PINB0
-//    #define PIN_USI_SCL         PINB2
-//    #define USI_START_COND_INT  USICIF
-//    #define USI_START_VECTOR    USI_START_vect
-//    #define USI_OVERFLOW_VECTOR USI_OVF_vect 
-//#endif
-
-/*#if defined(__ATTINY24__) | defined(__ATTINY24A__) | \
-    defined(__ATTINY44__) | defined(__ATTINY44A__) | \
-    defined(__ATTINY84__) | defined(__ATTINY84V__) */
-
-//    #define DDR_USI             DDRA
-//    #define PORT_USI            PORTA
-//    #define PIN_USI             PINA
-//    #define PORT_USI_SDA        PORTA6
-//    #define PORT_USI_SCL        PORTA4
-//    #define PIN_USI_SDA         PINA6
-//    #define PIN_USI_SCL         PINA4
-//    #define USI_START_COND_INT  USISIF
-//    #define USI_START_VECTOR    USI_START_vect
-//    #define USI_OVERFLOW_VECTOR USI_OVF_vect
-//#endif
- 
-
-/*#if defined(__ATTINY261__) | defined(__ATTINY261A__) | \
-    defined(__ATTINY461__) | defined(__ATTINY461A__) | \
-     defined(__ATTINY861A__) | defined(__ATTINY861A__) */
-
-//     #define DDR_USI             DDRB
-//     #define PORT_USI            PORTB
-//     #define PIN_USI             PINB
-//     #define PORT_USI_SDA        PORTB0
-//     #define PORT_USI_SCL        PORTB2
-//     #define PIN_USI_SDA         PINB0
-//     #define PIN_USI_SCL         PINB2
-//     #define USI_START_COND_INT  USISIF
-//     #define USI_START_VECTOR    USI_START_vect
-//     #define USI_OVERFLOW_VECTOR USI_OVF_vect
-//#endif
-
-
-//#if defined(__ATTINY43U__) 
-//     #define DDR_USI             DDRB
-//     #define PORT_USI            PORTB
-//     #define PIN_USI             PINB
-//     #define PORT_USI_SDA        PORTB4
-//     #define PORT_USI_SCL        PORTB6
-//     #define PIN_USI_SDA         PINB4
-//     #define PIN_USI_SCL         PINB6
-//     #define USI_START_COND_INT  USISIF
-//     #define USI_START_VECTOR    USI_START_vect
-//     #define USI_OVERFLOW_VECTOR USI_OVF_vect
-//#endif
-
-
-//#if defined(__ATTINY87__) | defined(__ATTINY167__) 
-
-    #define DDR_USI             DDRB
-    #define PORT_USI            PORTB
-    #define PIN_USI             PINB
-    #define PORT_USI_SDA        PORTB0
-    #define PORT_USI_SCL        PORTB2
-    #define PIN_USI_SDA         PINB0
-    #define PIN_USI_SCL         PINB2
-    #define USI_START_COND_INT  USISIF
-    #define USI_START_VECTOR    USI_START_vect
-    #define USI_OVERFLOW_VECTOR USI_OVF_vect
-//#endif
-
-
-
-
-
-#endif
- 

TinyApp/avr3-167.ld

@@ -1,231 +0,0 @@
-/* Default linker script, for normal executables */
-OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
-OUTPUT_ARCH(avr:3)
-MEMORY
-{
-  text      (rx)   : ORIGIN = 0, LENGTH = 16K
-  data      (rw!x) : ORIGIN = 0x800060, LENGTH = 0xffa0
-  eeprom    (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
-  fuse      (rw!x) : ORIGIN = 0x820000, LENGTH = 1K
-  lock      (rw!x) : ORIGIN = 0x830000, LENGTH = 1K
-  signature (rw!x) : ORIGIN = 0x840000, LENGTH = 1K
-}
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rel.init      : { *(.rel.init)		}
-  .rela.init     : { *(.rela.init)	}
-  .rel.text      :
-    {
-      *(.rel.text)
-      *(.rel.text.*)
-      *(.rel.gnu.linkonce.t*)
-    }
-  .rela.text     :
-    {
-      *(.rela.text)
-      *(.rela.text.*)
-      *(.rela.gnu.linkonce.t*)
-    }
-  .rel.fini      : { *(.rel.fini)		}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.rodata    :
-    {
-      *(.rel.rodata)
-      *(.rel.rodata.*)
-      *(.rel.gnu.linkonce.r*)
-    }
-  .rela.rodata   :
-    {
-      *(.rela.rodata)
-      *(.rela.rodata.*)
-      *(.rela.gnu.linkonce.r*)
-    }
-  .rel.data      :
-    {
-      *(.rel.data)
-      *(.rel.data.*)
-      *(.rel.gnu.linkonce.d*)
-    }
-  .rela.data     :
-    {
-      *(.rela.data)
-      *(.rela.data.*)
-      *(.rela.gnu.linkonce.d*)
-    }
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  /* Internal text space or external memory.  */
-  .vectors :
-  {
-    *(.vectors)
-    KEEP(*(.vectors))
-  }
-  .text   :
-  {
-    /* For data that needs to reside in the lower 64k of progmem.  */
-    *(.progmem.gcc*)
-    *(.progmem*)
-    . = ALIGN(2);
-     __trampolines_start = . ;
-    /* The jump trampolines for the 16-bit limited relocs will reside here.  */
-    *(.trampolines)
-    *(.trampolines*)
-     __trampolines_end = . ;
-    /* For future tablejump instruction arrays for 3 byte pc devices.
-       We don't relax jump/call instructions within these sections.  */
-    *(.jumptables)
-    *(.jumptables*)
-    /* For code that needs to reside in the lower 128k progmem.  */
-    *(.lowtext)
-    *(.lowtext*)
-     __ctors_start = . ;
-     *(.ctors)
-     __ctors_end = . ;
-     __dtors_start = . ;
-     *(.dtors)
-     __dtors_end = . ;
-    KEEP(SORT(*)(.ctors))
-    KEEP(SORT(*)(.dtors))
-    /* From this point on, we don't bother about wether the insns are
-       below or above the 16 bits boundary.  */
-    *(.init0)  /* Start here after reset.  */
-    KEEP (*(.init0))
-    *(.init1)
-    KEEP (*(.init1))
-    *(.init2)  /* Clear __zero_reg__, set up stack pointer.  */
-    KEEP (*(.init2))
-    *(.init3)
-    KEEP (*(.init3))
-    *(.init4)  /* Initialize data and BSS.  */
-    KEEP (*(.init4))
-    *(.init5)
-    KEEP (*(.init5))
-    *(.init6)  /* C++ constructors.  */
-    KEEP (*(.init6))
-    *(.init7)
-    KEEP (*(.init7))
-    *(.init8)
-    KEEP (*(.init8))
-    *(.init9)  /* Call main().  */
-    KEEP (*(.init9))
-    *(.text)
-    . = ALIGN(2);
-    *(.text.*)
-    . = ALIGN(2);
-    *(.fini9)  /* _exit() starts here.  */
-    KEEP (*(.fini9))
-    *(.fini8)
-    KEEP (*(.fini8))
-    *(.fini7)
-    KEEP (*(.fini7))
-    *(.fini6)  /* C++ destructors.  */
-    KEEP (*(.fini6))
-    *(.fini5)
-    KEEP (*(.fini5))
-    *(.fini4)
-    KEEP (*(.fini4))
-    *(.fini3)
-    KEEP (*(.fini3))
-    *(.fini2)
-    KEEP (*(.fini2))
-    *(.fini1)
-    KEEP (*(.fini1))
-    *(.fini0)  /* Infinite loop after program termination.  */
-    KEEP (*(.fini0))
-     _etext = . ;
-  }  > text
-  .data	  : AT (ADDR (.text) + SIZEOF (.text))
-  {
-     PROVIDE (__data_start = .) ;
-    *(.data)
-    *(.data*)
-    *(.rodata)  /* We need to include .rodata here if gcc is used */
-    *(.rodata*) /* with -fdata-sections.  */
-    *(.gnu.linkonce.d*)
-    . = ALIGN(2);
-     _edata = . ;
-     PROVIDE (__data_end = .) ;
-  }  > data
-  .bss   : AT (ADDR (.bss))
-  {
-     PROVIDE (__bss_start = .) ;
-    *(.bss)
-    *(.bss*)
-    *(COMMON)
-     PROVIDE (__bss_end = .) ;
-  }  > data
-   __data_load_start = LOADADDR(.data);
-   __data_load_end = __data_load_start + SIZEOF(.data);
-  /* Global data not cleared after reset.  */
-  .noinit  :
-  {
-     PROVIDE (__noinit_start = .) ;
-    *(.noinit*)
-     PROVIDE (__noinit_end = .) ;
-     _end = . ;
-     PROVIDE (__heap_start = .) ;
-  }  > data
-  .eeprom  :
-  {
-    *(.eeprom*)
-     __eeprom_end = . ;
-  }  > eeprom
-  .fuse  :
-  {
-    KEEP(*(.fuse))
-    KEEP(*(.lfuse))
-    KEEP(*(.hfuse))
-    KEEP(*(.efuse))
-  }  > fuse
-  .lock  :
-  {
-    KEEP(*(.lock*))
-  }  > lock
-  .signature  :
-  {
-    KEEP(*(.signature*))
-  }  > signature
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) *(.gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-}

applets/ersky9x/CoProc/Makefile

@@ -1,234 +0,0 @@
-# ----------------------------------------------------------------------------
-#         ATMEL Microcontroller Software Support 
-# ----------------------------------------------------------------------------
-# Copyright (c) 2011, Atmel Corporation
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the disclaimer below.
-#
-# Atmel's name may not be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
-# DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ----------------------------------------------------------------------------
-
-#   Makefile for compiling the applet-serial flash project
-
-# Chip & board used for compilation
-# (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
-CHIP  = atsam3s4
-BOARD = atsam3s4_ek
-DYN = OFF
-
-# Makefile for compiling applet-serialflash applet.
-
-ifeq (atsam3s4,$(CHIP))
-BOARD_DIR = at91sam3s4-ek
-endif
-
-ifeq (atsam3s2,$(CHIP))
-BOARD_DIR = at91sam3s2-ek
-endif
-
-ifeq (sam9g15,$(CHIP))
-BOARD =sam9g15_ek
-BOARD_DIR = at91sam9g15-ek
-endif
-
-ifeq (sam9g25,$(CHIP))
-BOARD =sam9g25_ek
-BOARD_DIR = at91sam9g25-ek
-endif
-
-ifeq (sam9g35,$(CHIP))
-BOARD =sam9g35_ek
-BOARD_DIR = at91sam9g35-ek
-endif
-
-ifeq (sam9x25,$(CHIP))
-BOARD =sam9x25_ek
-BOARD_DIR = at91sam9x25-ek
-endif
-
-ifeq (sam9x35,$(CHIP))
-BOARD =sam9x35_ek
-BOARD_DIR = at91sam9x35-ek
-endif
-
-# Defines which are the available memory targets for the AT91SAM3S-EK board.
-MEMORIES = sram
-
-# Trace level used for compilation
-# (can be overriden by adding TRACE_LEVEL=#number to the command-line)
-# TRACE_LEVEL_DEBUG      5
-# TRACE_LEVEL_INFO       4
-# TRACE_LEVEL_WARNING    3
-# TRACE_LEVEL_ERROR      2
-# TRACE_LEVEL_FATAL      1
-# TRACE_LEVEL_NO_TRACE   0
-
-# Info traces allowed by default
-TR_LEV = 0
-
-# Optimization level, put in comment for debugging
-OPTIMIZATION = -Os
-
-# Output file basename
-OUTPUT = applet-coprocessor-$(CHIP)
-
-# Output directories
-BIN = bin
-OBJ = obj
-
-#-------------------------------------------------------------------------------
-#		Tools
-#-------------------------------------------------------------------------------
-
-# Tool suffix when cross-compiling
-CROSS_COMPILE = arm-none-eabi-
-
-# Libraries
-LIBRARIES = ../../libraries
-# Chip library directory
-CHIP_LIB = $(LIBRARIES)/libchip_atsam3s
-# Board library directory
-BOARD_LIB = $(LIBRARIES)/libboard_atsam3s-ek
-# Spiflash library directory
-#SPIFLASH_LIB = $(LIBRARIES)/libspiflash
-
-# ISP directory
-ISP = ..
-# tcl_lib directory
-
-#INSTALLDIR = "../../../../tcl_lib/$(BOARD_DIR)/"
-
-LIBS = -Wl,--start-group -lgcc -lc -Wl,--end-group
-
-#-lchip_$(CHIP)_gcc_rel -lboard_$(BOARD)_gcc_rel -lspiflash_gcc_rel -Wl,--end-group
-
-LIB_PATH = -L$(CHIP_LIB)/lib
-LIB_PATH += -L$(BOARD_LIB)/lib
-#LIB_PATH += -L$(SPIFLASH_LIB)/lib
-#LIB_PATH+=-L=/lib
-#LIB_PATH+=-L=/../lib/gcc/arm-none-eabi/4.4.1
-
-# Compilation tools
-AR = $(CROSS_COMPILE)ar
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
-SIZE = $(CROSS_COMPILE)size
-STRIP = $(CROSS_COMPILE)strip
-OBJCOPY = $(CROSS_COMPILE)objcopy
-GDB = $(CROSS_COMPILE)gdb
-NM = $(CROSS_COMPILE)nm
-CLSS = $(CROSS_COMPILE)objdump
-
-# Flags
-INCLUDES  = -I$(CHIP_LIB)
-INCLUDES += -I$(BOARD_LIB)
-INCLUDES += -I$(SPIFLASH_LIB)
-INCLUDES += -I$(LIBRARIES)
-
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int
-CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
-CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused
-CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef
-CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-CFLAGS += -Wsign-compare -Waggregate-return -Wstrict-prototypes
-CFLAGS += -Wmissing-prototypes -Wmissing-declarations
-CFLAGS += -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations
-CFLAGS += -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wlong-long
-CFLAGS += -Wunreachable-code
-CFLAGS += -Wcast-align
-#CFLAGS += -Wmissing-noreturn
-#CFLAGS += -Wconversion
-
-# To reduce application size use only integer printf function.
-CFLAGS += -Dprintf=iprintf
-TRACE_LEVEL = 4
-#CFLAGS += -DTRACE_LEVEL=$(TR_LEV)
- #-DDYN_TRACES
-# -mlong-calls  -Wall
-CFLAGS += -ffunction-sections  -D$(MEMORIES)
-#CFLAGS += -DNDEBUG
-CFLAGS += -mthumb -g -gdwarf-2 $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDYN_TRACES
-ASFLAGS = -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-LDFLAGS= -nostartfiles -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=entry -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols
-LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
-
-#-------------------------------------------------------------------------------
-#		Files
-#-------------------------------------------------------------------------------
-
-# Directories where source files can be found
-
-VPATH += ../..
-VPATH += $(ISP)/common
-
-
-# Objects built from Asm source files
-//ASM_OBJECTS = applet_cstartup.o
-
-# Objects built from C source files
-C_OBJECTS += main.o
-C_OBJECTS += applet_cstartup.o
-
-# Append OBJ and BIN directories to output filename
-OUTPUT := $(BIN)/$(OUTPUT)
-
-#-------------------------------------------------------------------------------
-#		Rules
-#-------------------------------------------------------------------------------
-
-all: $(BIN) $(OBJ) $(MEMORIES)
-
-$(BIN) $(OBJ):
-	mkdir $@
-
-define RULES
-C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS))
-ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
-
-$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
-	$(CC) $(LIB_PATH) $(LDFLAGS) $(LD_OPTIONAL) -T"$(BOARD_LIB)/resources/gcc/$(CHIP)/$$@_samba.lds" -Wl,-Map,$(OUTPUT).map -o $(OUTPUT).elf $$^ $(LIBS) 
-	$(NM) $(OUTPUT).elf >$(OUTPUT).elf.txt 
-	$(OBJCOPY) -O binary $(OUTPUT).elf $(OUTPUT).bin 
-	$(SIZE) $$^ $(OUTPUT).elf 
-	$(CLSS) -h -S $(OUTPUT).elf >$(OUTPUT).lss
-#	@[ -e $(INSTALLDIR) ] || mkdir $(INSTALLDIR)
-#	@cp -f $(OUTPUT).bin $(INSTALLDIR)
-	
-$$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
-	$(CC) $(CFLAGS) -D$(1) -c -o $$@ $$<
-
-$$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
-	$(CC) $(ASFLAGS) -D$(1) -c -o $$@ $$<
-
-debug_$(1): $(1)
-	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
-endef
-
-$(foreach MEMORY, $(MEMORIES), $(eval $(call RULES,$(MEMORY))))
-
-clean:
-	-del $(OBJ)\*.o $(BIN)\*.bin $(BIN)\*.elf $(BIN)\*.map
-
-# Create extended listing file from ELF output file.
-%.lss: %.elf
-	@echo
-	@echo $(MSG_EXTENDED_LISTING) $@
-	$(OBJDUMP) -h -S $< > $@

applets/ersky9x/common/applet.h

@@ -1,101 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2008, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-#ifndef APPLET_H
-#define APPLET_H
-
-/*----------------------------------------------------------------------------
- *        Global definitions
- *----------------------------------------------------------------------------*/
-
-/** Refers to the Version of SAM-BA */
-#define SAM_BA_APPLETS_VERSION  "2.11"
-
-/** Applet initialization command code.*/
-#define APPLET_CMD_INIT              0x00
-/** Applet full erase command code.*/
-#define APPLET_CMD_FULL_ERASE        0x01
-/** Applet write command code.*/
-#define APPLET_CMD_WRITE             0x02
-/** Applet read command code.*/
-#define APPLET_CMD_READ              0x03
-/** Applet read command code.*/
-#define APPLET_CMD_LOCK              0x04
-/** Applet read command code.*/
-#define APPLET_CMD_UNLOCK            0x05
-/** Applet set/clear GPNVM command code.*/
-#define APPLET_CMD_GPNVM             0x06
-/** Applet set security bit command code.*/
-#define APPLET_CMD_SECURITY          0x07
-/** Applet buffer erase command code.*/
-#define APPLET_CMD_BUFFER_ERASE      0x08
-/** Applet binary page command code for Dataflash.*/
-#define APPLET_CMD_BINARY_PAGE       0x09
-/** List Bad Blocks of a Nandflash*/
-#define APPLET_CMD_LIST_BAD_BLOCKS   0x10
-/** Tag a Nandflash Block*/
-#define APPLET_CMD_TAG_BLOCK         0x11
-/** Read the Unique ID bits (on SAM3)*/
-#define APPLET_CMD_READ_UNIQUE_ID    0x12
-/** Applet blocks erase command code. */
-#define APPLET_CMD_ERASE_BLOCKS      0x13
-/** Applet batch full erase command code. */
-#define APPLET_CMD_BATCH_ERASE       0x14
-
-/** Operation was successful.*/
-#define APPLET_SUCCESS          0x00
-/** Device unknown.*/
-#define APPLET_DEV_UNKNOWN      0x01
-/** Write operation failed.*/
-#define APPLET_WRITE_FAIL       0x02
-/** Read operation failed.*/
-#define APPLET_READ_FAIL        0x03
-/** Protect operation failed.*/
-#define APPLET_PROTECT_FAIL     0x04
-/** Unprotect operation failed.*/
-#define APPLET_UNPROTECT_FAIL   0x05
-/** Erase operation failed.*/
-#define APPLET_ERASE_FAIL       0x06
-/** No device defined in board.h*/
-#define APPLET_NO_DEV           0x07
-/** Read / write address is not aligned*/
-#define APPLET_ALIGN_ERROR      0x08
-/** Read / write found bad block*/
-#define APPLET_BAD_BLOCK        0x09
-/** Applet failure.*/
-#define APPLET_FAIL             0x0f
-
-
-/** Communication link identification*/
-#define USB_COM_TYPE            0x00
-#define DBGU_COM_TYPE           0x01
-#define JTAG_COM_TYPE           0x02
-
-#endif //#ifndef APPLET_H
-

applets/ersky9x/common/applet_cstartup.c

@@ -1,128 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2011, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-#include "board.h"
-#include "board_lowlevel.h"
-typedef void( *IntFunc )( void );
-/*----------------------------------------------------------------------------
- *        Prototypes
- *----------------------------------------------------------------------------*/
-/** Stack top */
-extern unsigned long _sstack;
-
-/** Initialize segments*/
-extern unsigned int _sidata;
-extern unsigned int _sdata, _edata;
-extern unsigned int _szero, _ezero;
-
-/** Default link entry */
-extern int main(int argc, char **argv);
-
-/** Reset entry */
-void ResetException(void) ;//__attribute__((__interrupt__));
-
-/** Exception Table */
-__attribute__((section(".isr_vector")))
-//IntFunc exception_table[] = {
-//__attribute__ ((section(".vectors"), used))
-void (* const gVectors[])(void) =
-{ 
-     /* Configure Initial Stack Pointer, using linker-generated symbols */
-    (void (*)(void))((unsigned long)&_sstack),
-//    /*(IntFunc)&*/_sstack,
-    ResetException,  /* Initial PC, set to entry point  */
-    (unsigned int) 0 /*NMIException*/,
-    (unsigned int) 0 /*HardFaultException*/,
-    (unsigned int) 0 /*MemManageException*/,
-    (unsigned int) 0 /*BusFaultException*/,
-    (unsigned int) 0 /*UsageFaultException*/,
-    0, 0, 0, 0,             /* Reserved */
-    (unsigned int) 0 /*SVCHandler*/,
-    (unsigned int) 0 /*DebugMonitor*/,
-    0,                      /* Reserved */
-    (unsigned int) 0 /*PendSVC*/,
-    (unsigned int) 0 /*SysTickHandler*/,
-    /*
-    :
-    */
-};
-
-/** Applet Mailbox and initialization flag */
-#define MAILBOX_SIZE 32
-__attribute__((section(".mailbox")))
-unsigned int mailbox[MAILBOX_SIZE];
-volatile unsigned int isInitialized = 0;
-
-/*----------------------------------------------------------------------------
- *         Reset Handler
- *----------------------------------------------------------------------------*/
-
-/**
- * \brief  This is the code that gets called on processor reset. To initialize the
- * device. And call the main() routine.
- *
- */
-__attribute__ ((section(".text"), used))
-void ResetException(void)
-{
-    unsigned int *pSrc, *pDest;
-//    { asm volatile ("cpsid i"); }
-
-	// Initialize data
-    // Zero fill bss
-    if (isInitialized == 0) {
-        pSrc = &_sidata;
-        for(pDest = &_sdata; pDest < &_edata;) {
-
-            *(pDest ++) = *(pSrc ++);
-        }
-
-        for (pDest = &_szero; pDest < &_ezero;) {
-
-            *(pDest ++) = 0;
-        }
-        isInitialized = 1;
-    }
-
-    /* LowLevelInit(); */
-
-    /* Save original SP. */
-    __asm("mov r4, sp");
-    /* Change SP to current stack point. */
-    __asm("ldr r5, =_sstack");
-    __asm(" mov sp, r5");
-    main(1, (char**)mailbox);
-    /* Restore previous SP point. */
-    __asm("mov sp, r4");
-}
-

applets/ersky9x/common/board_lowlevel.h

@@ -1,46 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * Interface for the low-level initialization function.
- *
- */
-
-#ifndef BOARD_LOWLEVEL_H
-#define BOARD_LOWLEVEL_H
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-extern void LowLevelInit( void ) ;
-
-#endif /* BOARD_LOWLEVEL_H */
-

applets/ersky9x/serialFlash/Makefile

@@ -1,235 +0,0 @@
-# ----------------------------------------------------------------------------
-#         ATMEL Microcontroller Software Support 
-# ----------------------------------------------------------------------------
-# Copyright (c) 2011, Atmel Corporation
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# - Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the disclaimer below.
-#
-# Atmel's name may not be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
-# DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ----------------------------------------------------------------------------
-
-#   Makefile for compiling the applet-serial flash project
-
-# Chip & board used for compilation
-# (can be overriden by adding CHIP=chip and BOARD=board to the command-line)
-CHIP  = atsam3s4
-BOARD = atsam3s4_ek
-DYN = OFF
-
-# Makefile for compiling applet-serialflash applet.
-
-ifeq (atsam3s4,$(CHIP))
-BOARD_DIR = at91sam3s4-ek
-endif
-
-ifeq (atsam3s2,$(CHIP))
-BOARD_DIR = at91sam3s2-ek
-endif
-
-ifeq (sam9g15,$(CHIP))
-BOARD =sam9g15_ek
-BOARD_DIR = at91sam9g15-ek
-endif
-
-ifeq (sam9g25,$(CHIP))
-BOARD =sam9g25_ek
-BOARD_DIR = at91sam9g25-ek
-endif
-
-ifeq (sam9g35,$(CHIP))
-BOARD =sam9g35_ek
-BOARD_DIR = at91sam9g35-ek
-endif
-
-ifeq (sam9x25,$(CHIP))
-BOARD =sam9x25_ek
-BOARD_DIR = at91sam9x25-ek
-endif
-
-ifeq (sam9x35,$(CHIP))
-BOARD =sam9x35_ek
-BOARD_DIR = at91sam9x35-ek
-endif
-
-# Defines which are the available memory targets for the AT91SAM3S-EK board.
-MEMORIES = sram
-
-# Trace level used for compilation
-# (can be overriden by adding TRACE_LEVEL=#number to the command-line)
-# TRACE_LEVEL_DEBUG      5
-# TRACE_LEVEL_INFO       4
-# TRACE_LEVEL_WARNING    3
-# TRACE_LEVEL_ERROR      2
-# TRACE_LEVEL_FATAL      1
-# TRACE_LEVEL_NO_TRACE   0
-
-# Info traces allowed by default
-TR_LEV = 0
-
-# Optimization level, put in comment for debugging
-OPTIMIZATION = -Os
-
-# Output file basename
-OUTPUT = applet-serialflash-$(CHIP)
-
-# Output directories
-BIN = bin
-OBJ = obj
-
-#-------------------------------------------------------------------------------
-#		Tools
-#-------------------------------------------------------------------------------
-
-# Tool suffix when cross-compiling
-CROSS_COMPILE = arm-none-eabi-
-
-# Libraries
-LIBRARIES = ../../libraries
-# Chip library directory
-CHIP_LIB = $(LIBRARIES)/libchip_atsam3s
-# Board library directory
-BOARD_LIB = $(LIBRARIES)/libboard_atsam3s-ek
-# Spiflash library directory
-#SPIFLASH_LIB = $(LIBRARIES)/libspiflash
-
-# ISP directory
-ISP = ..
-# tcl_lib directory
-
-#INSTALLDIR = "../../../../tcl_lib/$(BOARD_DIR)/"
-
-LIBS = -Wl,--start-group -lgcc -lc -Wl,--end-group
-
-#-lchip_$(CHIP)_gcc_rel -lboard_$(BOARD)_gcc_rel -lspiflash_gcc_rel -Wl,--end-group
-
-LIB_PATH = -L$(CHIP_LIB)/lib
-LIB_PATH += -L$(BOARD_LIB)/lib
-#LIB_PATH += -L$(SPIFLASH_LIB)/lib
-#LIB_PATH+=-L=/lib
-#LIB_PATH+=-L=/../lib/gcc/arm-none-eabi/4.4.1
-
-# Compilation tools
-AR = $(CROSS_COMPILE)ar
-CC = $(CROSS_COMPILE)gcc
-LD = $(CROSS_COMPILE)ld
-SIZE = $(CROSS_COMPILE)size
-STRIP = $(CROSS_COMPILE)strip
-OBJCOPY = $(CROSS_COMPILE)objcopy
-GDB = $(CROSS_COMPILE)gdb
-NM = $(CROSS_COMPILE)nm
-CLSS = $(CROSS_COMPILE)objdump
-
-# Flags
-INCLUDES  = -I$(CHIP_LIB)
-INCLUDES += -I$(BOARD_LIB)
-INCLUDES += -I$(SPIFLASH_LIB)
-INCLUDES += -I$(LIBRARIES)
-
-CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wformat=2 -Wimplicit-int
-CFLAGS += -Werror-implicit-function-declaration -Wmain -Wparentheses
-CFLAGS += -Wsequence-point -Wreturn-type -Wswitch -Wtrigraphs -Wunused
-CFLAGS += -Wuninitialized -Wunknown-pragmas -Wfloat-equal -Wundef
-CFLAGS += -Wshadow -Wpointer-arith -Wbad-function-cast -Wwrite-strings
-CFLAGS += -Wsign-compare -Waggregate-return -Wstrict-prototypes
-CFLAGS += -Wmissing-prototypes -Wmissing-declarations
-CFLAGS += -Wformat -Wmissing-format-attribute -Wno-deprecated-declarations
-CFLAGS += -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wlong-long
-CFLAGS += -Wunreachable-code
-CFLAGS += -Wcast-align
-#CFLAGS += -Wmissing-noreturn
-#CFLAGS += -Wconversion
-
-# To reduce application size use only integer printf function.
-CFLAGS += -Dprintf=iprintf
-TRACE_LEVEL = 4
-#CFLAGS += -DTRACE_LEVEL=$(TR_LEV)
- #-DDYN_TRACES
-# -mlong-calls  -Wall
-CFLAGS += -ffunction-sections  -D$(MEMORIES)
-#CFLAGS += -DNDEBUG
-CFLAGS += -mthumb -g -gdwarf-2 $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -DTRACE_LEVEL=$(TRACE_LEVEL) -DDYN_TRACES
-ASFLAGS = -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP) -D__ASSEMBLY__
-LDFLAGS= -nostartfiles -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=entry -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols
-LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats
-
-#-------------------------------------------------------------------------------
-#		Files
-#-------------------------------------------------------------------------------
-
-# Directories where source files can be found
-
-VPATH += ../..
-VPATH += $(ISP)/common
-
-
-# Objects built from Asm source files
-//ASM_OBJECTS = applet_cstartup.o
-
-# Objects built from C source files
-C_OBJECTS += main.o
-C_OBJECTS += applet_cstartup.o
-
-# Append OBJ and BIN directories to output filename
-OUTPUT := $(BIN)/$(OUTPUT)
-
-#-------------------------------------------------------------------------------
-#		Rules
-#-------------------------------------------------------------------------------
-
-all: $(BIN) $(OBJ) $(MEMORIES)
-
-$(BIN) $(OBJ):
-	mkdir $@
-
-define RULES
-C_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(C_OBJECTS))
-ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
-
-$(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))
-	$(CC) $(LIB_PATH) $(LDFLAGS) $(LD_OPTIONAL) -T"$(BOARD_LIB)/resources/gcc/$(CHIP)/$$@_samba.lds" -Wl,-Map,$(OUTPUT).map -o $(OUTPUT).elf $$^ $(LIBS) 
-	$(NM) $(OUTPUT).elf >$(OUTPUT).elf.txt 
-	$(OBJCOPY) -O binary $(OUTPUT).elf $(OUTPUT).bin 
-	$(SIZE) $$^ $(OUTPUT).elf 
-	$(CLSS) -h -S $(OUTPUT).elf >$(OUTPUT).lss
-#	@[ -e $(INSTALLDIR) ] || mkdir $(INSTALLDIR)
-#	@cp -f $(OUTPUT).bin $(INSTALLDIR)
-	
-$$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)
-	$(CC) $(CFLAGS) -D$(1) -c -o $$@ $$<
-
-$$(ASM_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.S Makefile $(OBJ) $(BIN)
-	$(CC) $(ASFLAGS) -D$(1) -c -o $$@ $$<
-
-debug_$(1): $(1)
-	$(GDB) -x "$(BOARD_LIB)/resources/gcc/$(BOARD)_$(1).gdb" -ex "reset" -readnow -se $(OUTPUT)-$(1).elf
-endef
-
-$(foreach MEMORY, $(MEMORIES), $(eval $(call RULES,$(MEMORY))))
-
-clean:
-	-del $(OBJ)\*.o $(BIN)\*.bin $(BIN)\*.elf $(BIN)\*.map
-
-# Create extended listing file from ELF output file.
-%.lss: %.elf
-	@echo
-	@echo $(MSG_EXTENDED_LISTING) $@
-	$(OBJDUMP) -h -S $< > $@
-

applets/ersky9x/serialFlash/main.c

@@ -1,971 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2011, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
- 
-#include "../common/applet.h"
-#include <board.h>
-//#include "libspiflash.h"
-#include <string.h>
-
-#undef DYN_TRACES
-#define DYN_TRACES 0
-
-
-
-/*----------------------------------------------------------------------------
- *        Internal definitions
- *----------------------------------------------------------------------------*/
-
-/** SPI clock frequency in Hz. */
-#define SPCK    8000000
-
-
-/** Stack size in SRAM */
-#define STACK_SIZE 0x100
-
-/** Last erased sector id, this will avoid to erase if the block is already erased. */
-//static unsigned short lastErasedBlock = 0xFFFF;
-
-/** Indicate the farthest memory offset ever erase, if current write address is less
- than the address, the related block should be erase again before write. */
-//static uint32_t writtenAddress = 0;
-
-
-/** Max size of data we can tranfsert in one shot */
-#define MAX_COUNT 0x6000
-
-/** Chip select value used to select the AT25 chip. */
-#define SPI_CS          0
-/** SPI peripheral pins to configure to access the serial flash. */
-#define SPI_PINS        PINS_SPI0, PIN_SPI0_NPCS0
-
-/*----------------------------------------------------------------------------
- *        Types
- *----------------------------------------------------------------------------*/
-/** Structure for storing parameters for each command that can be performed by
-the applet. */
-struct _Mailbox {
-
-    /** Command send to the monitor to be executed. */
-    uint32_t command;
-    /** Returned status, updated at the end of the monitor execution.*/
-    uint32_t status;
-
-    /** Input Arguments in the argument area*/
-    union {
-
-        /** Input arguments for the Init command.*/
-        struct {
-
-            /** Communication link used.*/
-            uint32_t comType;
-            /**Trace level.*/
-            uint32_t traceLevel;
-            /** Serial flash index.*/
-            uint32_t at25Idx;
-
-        } inputInit;
-
-        /** Output arguments for the Init command.*/
-        struct {
-
-            /** Memory size.*/
-            uint32_t memorySize;
-            /** Buffer address.*/
-            uint32_t bufferAddress;
-            /** Buffer size.*/
-            uint32_t bufferSize;
-
-        } outputInit;
-
-        /** Input arguments for the Write command.*/
-        struct {
-
-            /** Buffer address.*/
-            uint32_t bufferAddr;
-            /** Buffer size.*/
-            uint32_t bufferSize;
-            /** Memory offset.*/
-            uint32_t memoryOffset;
-
-        } inputWrite;
-
-        /** Output arguments for the Write command.*/
-        struct {
-
-            /** Bytes written.*/
-            uint32_t bytesWritten;
-
-            uint32_t bufferSize;		// temp
-            /** Memory offset.*/
-            uint32_t memoryOffset;	// temp
-						uint32_t debug1 ;
-						uint32_t debug2 ;
-
-        } outputWrite;
-
-        /** Input arguments for the Read command.*/
-        struct {
-
-            /** Buffer address. */
-            uint32_t bufferAddr;
-            /** Buffer size.*/
-            uint32_t bufferSize;
-            /** Memory offset.*/
-            uint32_t memoryOffset;
-
-        } inputRead;
-
-        /** Output arguments for the Read command.*/
-        struct {
-
-            /** Bytes read.*/
-            uint32_t bytesRead;
-
-        } outputRead;
-
-        /** Input arguments for the Full Erase command.*/
-        // NONE
-
-        /** Output arguments for the Full Erase command.*/
-        // NONE
-        /** Input arguments for the Buffer Erase command.*/
-        struct {
-
-            /** Memory offset to be erase.*/
-            uint32_t memoryOffset;
-
-        } inputBufferErase;
-
-        /** Output arguments for the Buffer Erase command.*/
-        struct {
-
-            /** Memory offset to be erase.*/
-            uint32_t bytesErased;
-
-        } outputBufferErase;
-    } argument;
-};
-
-/*----------------------------------------------------------------------------
- *        Global variables
- *----------------------------------------------------------------------------*/
-
-/** End of program space (code + data). */
-extern int end;
-extern int _sstack;
-/*----------------------------------------------------------------------------
- *        Local variables
- *----------------------------------------------------------------------------*/
-/** Global DMA driver instance for all DMA transfers in application. */
-//static sDmad dmad;
-
-/** SPI driver instance. */
-//static Spid spid;
-
-/** Serial flash driver instance. */
-//static At25 at25;
-
-/** Pins to configure for the application. */
-//static Pin pins[] = {SPI_PINS};
-
-/** Size of one page in the serial flash, in bytes.  */
-static uint32_t pageSize;
-
-/** Size of one block in the serial flash, in bytes.  */
-static uint32_t blockSize;
-
-/**Size of the buffer used for read/write operations in bytes. */
-static uint32_t bufferSize;
-
-/** Depending on DYN_TRACES, dwTraceLevel is a modifable runtime variable or a define */
-uint32_t dwTraceLevel;
-
-uint32_t Spi_init_done = 0 ;
-struct _Mailbox *Pmailbox = 0 ;
-
-uint8_t Spi_tx_buf[24] ;
-uint8_t Spi_rx_buf[24] ;
-
-uint8_t Block_buffer[4096] ;
-
-/*----------------------------------------------------------------------------
- *         Global functions
- *----------------------------------------------------------------------------*/
-
-
-uint32_t  eeprom_write_one( uint8_t byte, uint8_t count ) ;
-uint32_t eeprom_read_status( void ) ;
-void eeprom_write_enable( void ) ;
-void eeprom_wait_busy( void ) ;
-uint32_t spi_operation( register uint8_t *tx, register uint8_t *rx, register uint32_t count ) ;
-void init_spi( void ) ;
-uint32_t unprotect_eeprom( void ) ;
-uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count ) ;
-uint32_t eeprom_block_erased( register uint8_t *p) ;
-uint32_t eeprom_page_erased( register uint8_t *p) ;
-void AT25D_Read( uint8_t *BufferAddr, uint32_t size, uint32_t memoryOffset) ;
-void AT25D_Write( uint8_t *BufferAddr, uint32_t size, uint32_t memoryOffset ) ;
-uint32_t AT25D_EraseBlock( uint32_t memoryOffset ) ;
-//uint32_t min( uint32_t a, uint32_t b ) ;
-
-
-uint32_t eeprom_write_one( uint8_t byte, uint8_t count )
-{
-	register Spi *spiptr ;
-	register uint32_t result ;
-	
-	spiptr = SPI ;
-	spiptr->SPI_CR = 1 ;								// Enable
-	(void) spiptr->SPI_RDR ;		// Dump any rx data
-	
-	spiptr->SPI_TDR = byte ;
-
-	result = 0 ; 
-	while( ( spiptr->SPI_SR & SPI_SR_RDRF ) == 0 )
-	{
-		// wait for received
-		if ( ++result > 10000 )
-		{
-			break ;				
-		}
-	}
-	if ( count == 0 )
-	{
-		spiptr->SPI_CR = 2 ;								// Disable
-		return spiptr->SPI_RDR ;
-	}
-	(void) spiptr->SPI_RDR ;		// Dump the rx data
-	spiptr->SPI_TDR = 0 ;
-	result = 0 ; 
-	while( ( spiptr->SPI_SR & SPI_SR_RDRF ) == 0 )
-	{
-		// wait for received
-		if ( ++result > 10000 )
-		{
-			break ;				
-		}
-	}
-	spiptr->SPI_CR = 2 ;								// Disable
-	return spiptr->SPI_RDR ;
-}
-
-
-uint32_t eeprom_read_status()
-{
-	return eeprom_write_one( 5, 1 ) ;
-}
-
-
-void eeprom_write_enable()
-{
-	eeprom_write_one( 6, 0 ) ;
-}
-
-void eeprom_wait_busy()
-{
-	register uint32_t x ;
-	register uint32_t y ;
-	
-	y = 0 ;
-	do
-	{
-		y += 1 ;
-		if ( y > 1000000 )
-		{
-			break ;			
-		}
-		x = eeprom_read_status() ;
-	} while ( x & 1 ) ;
-  
-	Pmailbox->argument.outputWrite.debug2 = y ;
-}
-
-uint32_t spi_operation( register uint8_t *tx, register uint8_t *rx, register uint32_t count )
-{
-	register Spi *spiptr ;
-	register uint32_t result ;
-
-//  PMC->PMC_PCER0 |= 0x00200000L ;		// Enable peripheral clock to SPI
-
-	result = 0 ; 
-	spiptr = SPI ;
-	spiptr->SPI_CR = 1 ;								// Enable
-	(void) spiptr->SPI_RDR ;		// Dump any rx data
-	while( count )
-	{
-		result = 0 ;
-		while( ( spiptr->SPI_SR & SPI_SR_TXEMPTY ) == 0 )
-		{
-			// wait
-			if ( ++result > 10000 )
-			{
-				result = 0xFFFF ;
-				break ;				
-			}
-		}
-		if ( result > 10000 )
-		{
-			break ;
-		}
-//		if ( count == 1 )
-//		{
-//			spiptr->SPI_CR = SPI_CR_LASTXFER ;		// LastXfer bit
-//		}
-		spiptr->SPI_TDR = *tx++ ;
-		result = 0 ;
-		while( ( spiptr->SPI_SR & SPI_SR_RDRF ) == 0 )
-		{
-			// wait for received
-			if ( ++result > 10000 )
-			{
-				result = 0x2FFFF ;
-				break ;				
-			}
-		}
-		if ( result > 10000 )
-		{
-			break ;
-		}
-		*rx++ = spiptr->SPI_RDR ;
-		count -= 1 ;
-	}
-	if ( result <= 10000 )
-	{
-		result = 0 ;
-	}
-	spiptr->SPI_CR = 2 ;								// Disable
-
-// Power save
-//  PMC->PMC_PCER0 &= ~0x00200000L ;		// Disable peripheral clock to SPI
-
-	return result ;
-}
-
-uint32_t spi_PDC_action( register uint8_t *command, register uint8_t *tx, register uint8_t *rx, register uint32_t comlen, register uint32_t count )
-{
-	register Spi *spiptr ;
-//	register uint32_t result ;
-	register uint32_t condition ;
-	static uint8_t discard_rx_command[4] ;
-
-//  PMC->PMC_PCER0 |= 0x00200000L ;		// Enable peripheral clock to SPI
-
-//	Spi_complete = 0 ;
-	if ( comlen > 4 )
-	{
-//		Spi_complete = 1 ;
-		return 0x4FFFF ;		
-	}
-	condition = SPI_SR_TXEMPTY ;
-	spiptr = SPI ;
-	spiptr->SPI_CR = 1 ;				// Enable
-	(void) spiptr->SPI_RDR ;		// Dump any rx data
-	(void) spiptr->SPI_SR ;			// Clear error flags
-	spiptr->SPI_RPR = (uint32_t)discard_rx_command ;
-	spiptr->SPI_RCR = comlen ;
-	if ( rx )
-	{
-		spiptr->SPI_RNPR = (uint32_t)rx ;
-		spiptr->SPI_RNCR = count ;
-		condition = SPI_SR_RXBUFF ;
-	}
-	spiptr->SPI_TPR = (uint32_t)command ;
-	spiptr->SPI_TCR = comlen ;
-	if ( tx )
-	{
-		spiptr->SPI_TNPR = (uint32_t)tx ;
-	}
-	else
-	{
-		spiptr->SPI_TNPR = (uint32_t)rx ;
-	}
-	spiptr->SPI_TNCR = count ;
-
-	spiptr->SPI_PTCR = SPI_PTCR_RXTEN | SPI_PTCR_TXTEN ;	// Start transfers
-
-	// Wait for things to get started, avoids early interrupt
-	for ( count = 0 ; count < 1000 ; count += 1 )
-	{
-		if ( ( spiptr->SPI_SR & SPI_SR_TXEMPTY ) == 0 )
-		{
-			break ;			
-		}
-	}
-	
-	count = 0 ;
-	while( ( spiptr->SPI_SR & condition ) == 0 )
-	{
-		if ( ++count > 1000000 )
-		{
-			break ;			
-		}
-	}
-	
-	spiptr->SPI_CR = 2 ;				// Disable
-	(void) spiptr->SPI_RDR ;		// Dump any rx data
-	(void) spiptr->SPI_SR ;			// Clear error flags
-	spiptr->SPI_PTCR = SPI_PTCR_RXTDIS | SPI_PTCR_TXTDIS ;	// Stop tramsfers
-
-	if ( count > 1000000 )
-	{
-		return 1 ;
-	}
-	return 0 ;
-}
-
-
-uint32_t unprotect_eeprom()
-{
- 	register uint8_t *p ;
-
-	eeprom_write_enable() ;
-		
-	p = Spi_tx_buf ;
-	*p = 0x39 ;		// Unprotect sector command
-	*(p+1) = 0 ;
-	*(p+2) = 0 ;
-	*(p+3) = 0 ;		// 3 bytes address
-
-	return spi_operation( p, Spi_rx_buf, 4 ) ;
-}
-
-
-
-
-
-
-void init_spi()
-{
-	register Pio *pioptr ;
-	register Spi *spiptr ;
-	register uint32_t timer ;
-	register uint8_t *p ;
-	uint8_t spi_buf[4] ;
-
-	if ( !Spi_init_done)
-	{
-  	PMC->PMC_PCER0 |= 0x00200000L ;		// Enable peripheral clock to SPI
-  	/* Configure PIO */
-		pioptr = PIOA ;
-  	pioptr->PIO_ABCDSR[0] &= ~0x00007800 ;	// Peripheral A bits 14,13,12,11
-  	pioptr->PIO_ABCDSR[1] &= ~0x00007800 ;	// Peripheral A
-  	pioptr->PIO_PDR = 0x00007800 ;					// Assign to peripheral
-	
-		spiptr = SPI ;
-		timer = ( 64000000 / 3000000 ) << 8 ;
-		spiptr->SPI_MR = 0x14000011 ;				// 0001 0100 0000 0000 0000 0000 0001 0001 Master
-		spiptr->SPI_CSR[0] = 0x01180009 | timer ;		// 0000 0001 0001 1000 xxxx xxxx 0000 1001
-	//	NVIC_EnableIRQ(SPI_IRQn) ;
-
-		p = spi_buf ;
-		
-	//	*p = 0x39 ;		// Unprotect sector command
-	//	*(p+1) = 0 ;
-	//	*(p+2) = 0 ;
-	//	*(p+3) = 0 ;		// 3 bytes address
-
-	//	spi_operation( p, spi_buf, 4 ) ;
-	
-		eeprom_write_enable() ;
-
-		*p = 1 ;		// Write status register command
-		*(p+1) = 0 ;
-		spi_operation( p, spi_buf, 2 ) ;
-		Spi_init_done = 1 ;
-	}
-
-}
-
-uint32_t eeprom_block_erased( register uint8_t *p)
-{
-	register uint32_t x ;
-	register uint32_t result ;
-
-	result = 1 ;
-
-	for ( x = 0 ; x < 4096 ; x += 1 )
-	{
-		if ( *p++ != 0xFF )
-		{
-			result = 0 ;			
-			break ;
-		}		
-	}
-	return result ;
-}
-
-uint32_t eeprom_page_erased( register uint8_t *p)
-{
-	register uint32_t x ;
-	register uint32_t result ;
-
-	result = 1 ;
-
-	for ( x = 0 ; x < 256 ; x += 1 )
-	{
-		if ( *p++ != 0xFF )
-		{
-			result = 0 ;			
-			break ;
-		}		
-	}
-	return result ;
-}
-
-
-void AT25D_Read( uint8_t *BufferAddr, uint32_t size, uint32_t memoryOffset)
-{
-	register uint8_t *p ;
-	
-	p = Spi_tx_buf ;
-	*p = 3 ;		// Read command
-	*(p+1) = memoryOffset >> 16 ;
-	*(p+2) = memoryOffset >> 8 ;
-	*(p+3) = memoryOffset ;		// 3 bytes address
-	
-	spi_PDC_action( p, 0, BufferAddr, 4, size ) ;
-}
-
-void AT25D_Write( uint8_t *BufferAddr, uint32_t size, uint32_t memoryOffset )
-{
-	register uint8_t *p ;
-	
-	eeprom_write_enable() ;
-	
-	p = Spi_tx_buf ;
-	*p = 2 ;		// Write command
-	*(p+1) = memoryOffset >> 16 ;
-	*(p+2) = memoryOffset >> 8 ;
-	*(p+3) = memoryOffset ;		// 3 bytes address
-		 
-	spi_PDC_action( p, BufferAddr, 0, 4, size ) ;
-
-	eeprom_wait_busy() ;
-
-}
-
-uint32_t AT25D_EraseBlock( uint32_t memoryOffset )
-{
-	register uint8_t *p ;
-	register uint32_t x ;
-	
-	eeprom_write_enable() ;
-	p = Spi_tx_buf ;
-	*p = 0x20 ;		// Block Erase command
-	*(p+1) = memoryOffset >> 16 ;
-	*(p+2) = memoryOffset >> 8 ;
-	*(p+3) = memoryOffset ;		// 3 bytes address
-	x = spi_operation( p, Spi_rx_buf, 4 ) ;
-
-	eeprom_wait_busy() ;
-	return x ;
-}
-
-//uint32_t min( uint32_t a, uint32_t b )
-//{
-//	if ( a < b )
-//	{
-//		return a ;
-//	}
-//	return b ;
-//}
-
-/**
- * \brief Applet main entry. This function decodes received command and executes it.
- * \param argc  always 1
- * \param argv  Address of the argument area.
-*/
-
-int main(int argc, char **argv)
-{
-    struct _Mailbox *pMailbox = (struct _Mailbox *) argv;
-    Pmailbox = pMailbox ;
-    /* Communication type with SAM-BA GUI. */
-//    uint8_t comType;
-
-//    uint32_t jedecId;
-    uint32_t bytesToWrite, bytesToRead, bufferAddr, startMemoryOffset, memoryOffset, packetSize;
-    /* index on read/write buffer */
-    uint8_t *pBuffer;
-    /* Temporary buffer used for non block aligned read/write */
-//    uint32_t tempBufferAddr;
-    /* Offset in destination buffer during buffer copy */
-//    uint32_t bufferOffset;
-    
-    uint32_t block_address ;
-    uint32_t x ;
-    /* INIT */  
-    /* Save communication link type */
-//    comType = pMailbox->argument.inputInit.comType;
-		
-    init_spi() ;
-
-    if (pMailbox->command == APPLET_CMD_INIT)
-    {
-#if (DYN_TRACES == 1)
-        dwTraceLevel = pMailbox->argument.inputInit.traceLevel;
-#endif
-
-//        TRACE_INFO("-- SerialFlash AT25/AT26 applet %s --\n\r", SAM_BA_APPLETS_VERSION);
-//        TRACE_INFO("-- %s\n\r", BOARD_NAME);
-//        TRACE_INFO("-- Compiled: %s %s --\n\r", __DATE__, __TIME__);
-        /* Configure pins */
-//        PIO_Configure(pins, PIO_LISTSIZE(pins));
-        /* Initialize DMA driver instance with polling mode */
-//        DMAD_Initialize( &dmad, 1 );
-        
-        /* Initialize the SPI and serial flash */
-				init_spi() ;
-
-
-
-//        SPID_Configure(&spid, SPI0, ID_SPI0, &dmad);
-//        AT25_Configure(&at25, &spid, SPI_CS, 1);
-//        TRACE_INFO("SPI and AT25/AT25 drivers initialized\n\r");
-        pMailbox->argument.outputInit.bufferAddress = (uint32_t) &end ;
-        /* Read the JEDEC ID of the device to identify it */
-//        jedecId = AT25D_ReadJedecId(&at25);
-//        if (AT25_FindDevice(&at25, jedecId) == 0) {
-//            pMailbox->status = APPLET_DEV_UNKNOWN;
-//            pMailbox->argument.outputInit.bufferSize = 0;
-//            pMailbox->argument.outputInit.memorySize = 0;
-//            TRACE_INFO("Device Unknown\n\r");
-//            goto exit;
-//        }
-//        else {
-            /* Get device parameters */
-            pMailbox->status = APPLET_SUCCESS;
-            pageSize = 256 ;
-//            pageSize = AT25_PageSize(&at25);
-            blockSize = 4096 ;
-//            blockSize = AT25_BlockSize(&at25);
-
-            /* Program page */
-//            if (AT25_ManId(&at25) == SST_SPI_FLASH) {
-                /* SST Flash write is slower, we reduce buffer size to avoid USB timeout */
-//                bufferSize = 10 * pageSize;
-//            }
-//            else {
-                bufferSize = 2 * blockSize;
-//            }
-            /* integer number of pages can be contained in each buffer */
-            bufferSize -= bufferSize % pageSize; 
-            if ( bufferSize < pageSize) {
-  //              TRACE_INFO("No enought memory to load buffer.\n\r");
-                goto exit;
-            } 
-            pMailbox->argument.outputInit.bufferSize = bufferSize;
-            pMailbox->argument.outputInit.memorySize = 128*4096;
-//            TRACE_INFO("%s blockSize : 0x%lx bufferAddr : 0x%lx\n\r",
-//                   "sky9x", blockSize, pMailbox->argument.outputInit.bufferAddress);
-//        }
-    }
-
-    // ----------------------------------------------------------
-    // WRITE:
-    // ----------------------------------------------------------
-    else if (pMailbox->command == APPLET_CMD_WRITE)
-		{
-        startMemoryOffset = pMailbox->argument.inputWrite.memoryOffset;
-        memoryOffset      = startMemoryOffset;
-        bufferAddr        = pMailbox->argument.inputWrite.bufferAddr;
-//        tempBufferAddr    = bufferAddr + bufferSize;
-        bytesToWrite      = pMailbox->argument.inputWrite.bufferSize;
-//        TRACE_INFO("WRITE at offset: 0x%lx buffer at : 0x%lx of: 0x%lx Bytes\n\r",
-//               memoryOffset, bufferAddr, bytesToWrite);
-        /* Check word alignment */
-        if (memoryOffset % 4) {
-
-            pMailbox->status = APPLET_ALIGN_ERROR;
-            goto exit;
-        }
-
-				unprotect_eeprom() ;
-//        if (AT25D_Unprotect(&at25)) {
-
-//            TRACE_INFO("Can not unprotect the flash\n\r");
-//            pMailbox->status = APPLET_UNPROTECT_FAIL;
-//            goto exit;
-//        }
-
-        pBuffer = (uint8_t *) bufferAddr;
-
-				block_address = memoryOffset &0xFFFFF000 ;		// 4k boundary
-        AT25D_Read( Block_buffer, 4096, block_address ) ;	// read block to write to
-				// Check to see if it is blank
-				x = eeprom_block_erased( Block_buffer ) ;
-				if ( x == 0 )
-				{
-					AT25D_EraseBlock( block_address ) ;
-				}
-
-				if (bytesToWrite)
-				{
-					uint32_t bytes_to_copy ;
-					uint32_t i ;
-					uint32_t j ;
-					uint8_t *s ;
-					uint8_t *dest ;
-
-					dest = Block_buffer + (memoryOffset & 0x0FFF ) ;
-					s = pBuffer ;
-					bytes_to_copy = 4096 - ( memoryOffset - block_address ) ;
-					if ( bytes_to_copy > bytesToWrite )
-					{
-						bytes_to_copy = bytesToWrite ;
-					}
-					for ( i = 0 ; i < bytes_to_copy ; i += 1 )
-					{
-						*dest++ = *s++ ;						
-					}
-					memoryOffset += bytes_to_copy ;
-					bytesToWrite -= bytes_to_copy ;
-					s = Block_buffer ;
-					j = 0 ;
-					for ( i = 0 ; i < 16 ; i += 1 )		// pages in block
-					{
-						j <<= 1 ;
-						x = eeprom_page_erased( s ) ;
-						if ( x == 0 )				// Not blank
-						{
-            	AT25D_Write( s, 256, block_address ) ;
-							j |= 1 ;
-						}						
-						s += 256 ;
-						block_address += 256 ;
-					}
-		  pMailbox->argument.outputWrite.debug1 = j ;
-				}
-
-
-//        if ((memoryOffset % pageSize) != 0) {
-
-//            /*  We are not page aligned, retrieve first page content to update it*/
-//            if (memoryOffset < writtenAddress) {
-//                lastErasedBlock = 0xFFFF;
-//            }
-//            /*  Flush temp buffer */
-//            memset((uint32_t *)tempBufferAddr, 0xFF, pageSize);
-
-//            bufferOffset = (memoryOffset % pageSize);
-//            packetSize = pageSize - bufferOffset;
-//            memoryOffset -= bufferOffset;
-//            /*  Read page to be updated*/
-//            AT25D_Read( (uint8_t *) tempBufferAddr, pageSize, memoryOffset);
-//            /* Fill retrieved page with data to be programmed */
-//            memcpy((uint8_t *)(tempBufferAddr + bufferOffset), pBuffer, packetSize);
-
-//             if (((memoryOffset / blockSize) > lastErasedBlock) || (lastErasedBlock == 0xFFFF)) {
-//                /* Erase the block to be updated */
-////                AT25D_EraseBlock( memoryOffset);
-//                lastErasedBlock = (memoryOffset / blockSize);
-//            }
-
-//            /*  Write the page contents */
-////            AT25D_Write( (uint8_t *) tempBufferAddr, pageSize, memoryOffset);
-//            bytesToWrite = (bytesToWrite > packetSize) ? (bytesToWrite - packetSize) : 0;
-//            pBuffer += packetSize;
-//            memoryOffset += pageSize;
-//            writtenAddress = memoryOffset;
-//        }
-
-//        /*  If it remains more than one page to write */
-//        while (bytesToWrite >= pageSize)
-//				{
-//            if (memoryOffset < writtenAddress)
-//						{
-//                lastErasedBlock = 0xFFFF;
-//            }
-//             if (((memoryOffset / blockSize) > lastErasedBlock) || (lastErasedBlock == 0xFFFF)) {
-//                 /* Erase the block to be updated */
-////                AT25D_EraseBlock( memoryOffset);
-//                 lastErasedBlock = (memoryOffset / blockSize);
-//            }
-//            /*  Write the page contents */
-//            AT25D_Write( (uint8_t *) pBuffer, pageSize, memoryOffset);
-//            pBuffer += pageSize;
-//            memoryOffset += pageSize;
-//            bytesToWrite -= pageSize;
-//            writtenAddress = memoryOffset;
-//        }
-
-//        /*  Write remaining data */
-//        if (bytesToWrite > 0) {
-
-//            /*  Read previous content of page */
-//            AT25D_Read( (uint8_t *) tempBufferAddr, pageSize, memoryOffset);
-//            /*  Fill retrieved block with data to be programmed */
-//            memcpy((uint8_t *)tempBufferAddr, pBuffer, bytesToWrite);
-//            if (((memoryOffset / blockSize) > lastErasedBlock) || (lastErasedBlock == 0xFFFF)) {
-//                 /*  Erase the block to be updated */
-////                AT25D_EraseBlock( memoryOffset);
-//                 lastErasedBlock = (memoryOffset / blockSize);
-//            }
-//            /*  Write the page contents */;
-////            AT25D_Write( (uint8_t *) tempBufferAddr, pageSize, memoryOffset);
-//            writtenAddress = memoryOffset + bytesToWrite;
-//            /*  No more bytes to write */
-//            bytesToWrite = 0;
-//        }
-
-////        TRACE_INFO("WRITE return byte written : 0x%lx Bytes\n\r",
-////               pMailbox->argument.inputWrite.bufferSize - bytesToWrite);
-
-        pMailbox->argument.outputWrite.bytesWritten = pMailbox->argument.inputWrite.bufferSize - bytesToWrite;
-//        pMailbox->argument.outputWrite.bytesWritten = bytesToWrite;
-        pMailbox->status = APPLET_SUCCESS;
-    }
-
-//    // ----------------------------------------------------------
-//    // READ:
-//    // ----------------------------------------------------------
-    else if (pMailbox->command == APPLET_CMD_READ)
-		{
-        memoryOffset = pMailbox->argument.inputRead.memoryOffset;
-        bufferAddr   = pMailbox->argument.inputRead.bufferAddr;
-        bytesToRead  = pMailbox->argument.inputRead.bufferSize;
-
-//        TRACE_INFO("READ at offset: 0x%lx buffer at : 0x%lx of: 0x%lx Bytes\n\r",
-//               memoryOffset, bufferAddr, bytesToRead);
-        /*  Check word alignment */
-        if (memoryOffset % 4) {
-
-            pMailbox->status = APPLET_ALIGN_ERROR;
-            goto exit;
-        }
-        pBuffer = (uint8_t *) bufferAddr;
-
-        /* Read packet after packets */
-        while (((uint32_t)pBuffer < (bufferAddr + bufferSize)) && (bytesToRead > 0))
-				{
-				    packetSize = bytesToRead ;
-						if ( packetSize > MAX_COUNT )
-						{
-							packetSize = MAX_COUNT ;					
-						}
-            AT25D_Read( pBuffer, packetSize, memoryOffset);
-            pBuffer += packetSize;
-            bytesToRead -= packetSize;
-            memoryOffset += packetSize;
-        }
-
-//        TRACE_INFO("READ return byte read : 0x%lx Bytes\n\r",
-//               pMailbox->argument.inputRead.bufferSize - bytesToRead);
-
-        pMailbox->argument.outputRead.bytesRead = pMailbox->argument.inputRead.bufferSize - bytesToRead;
-        pMailbox->status = APPLET_SUCCESS;
-    }
-
-//    // ----------------------------------------------------------
-//    // FULL ERASE:
-//    // ----------------------------------------------------------
-    else if (pMailbox->command == APPLET_CMD_FULL_ERASE)
-		{
-            pMailbox->status = APPLET_ERASE_FAIL;
-//        TRACE_INFO("FULL ERASE\n\r");
-
-//				unprotect_eeprom() ;
-
-//        /* Unprotected the flash */
-////        if (AT25D_Unprotect(&at25)) {
-
-////            TRACE_INFO("Can not unprotect the flash\n\r");
-////            pMailbox->status = APPLET_UNPROTECT_FAIL;
-////            goto exit;
-////        }
-
-//        TRACE_INFO("Flash unprotected\n\r");
-
-//        /* Erase the chip */
-//        TRACE_INFO("Chip is being erased...\n\r");
-
-////        if (AT25D_EraseChip()) {
-
-//				// NOT IMPLEMENTED (YET?)
-
-//            TRACE_INFO("Erasing error\n\r");
-//            pMailbox->status = APPLET_ERASE_FAIL;
-//            goto exit;
-////        }
-
-//        TRACE_INFO("Full Erase achieved\n\r");
-//        pMailbox->status = APPLET_SUCCESS;
-    }
-//    // ----------------------------------------------------------
-//    // BUFFER ERASE:
-//    // ----------------------------------------------------------
-    else if (pMailbox->command == APPLET_CMD_BUFFER_ERASE)
-		{
-
-//        TRACE_INFO("BUFFER ERASE \n\r");
-         /*  Unprotected the flash */
-				unprotect_eeprom() ;
-        
-//				if (AT25D_Unprotect(&at25)) {
-
-//            TRACE_INFO("Can not unprotect the flash\n\r");
-//            pMailbox->status = APPLET_UNPROTECT_FAIL;
-//            goto exit;
-//        }
-
-         memoryOffset = pMailbox->argument.inputBufferErase.memoryOffset;
-
-       if (AT25D_EraseBlock( memoryOffset))
-			 {
-            pMailbox->status = APPLET_ERASE_FAIL;
-//            TRACE_INFO("Block erasing error\n\r");
-            goto exit;
-       }
-        pMailbox->argument.outputBufferErase.bytesErased = 4096;
-
-//        TRACE_INFO("Buffer Erase achieved\n\r");
-        pMailbox->status = APPLET_SUCCESS;
-    }
-exit:
-    /* Acknowledge the end of command */
-//    TRACE_INFO("\tEnd of applet (command : %lx --- status : %lx)\n\r", pMailbox->command, pMailbox->status);
-
-    /*  Notify the host application of the end of the command processing */
-    pMailbox->command = ~(pMailbox->command);
-    /* Send ACK character */
-//    if (comType == DBGU_COM_TYPE)
-//		{
-         /* Wait for the transmitter to be ready */
-//        while ( (DBGU->DBGU_SR & DBGU_SR_TXEMPTY) == 0 ) ;
-        /* Send character */
-//         DBGU->DBGU_THR= 0x06 ;
-//    }
-    return 0;
-}
-

applets/libraries/libboard_atsam3s-ek/board.h

@@ -1,734 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2011, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \page sam3s_ek_board_desc SAM3S-EK - Board Description
- *
- * \section Purpose
- *
- * A file is dedicated to descibe the AT91SAM3S-EK board.
- *
- * \section Contents
- *
- *  - For AT91SAM3S-EK information, see \subpage sam3s_ek_board_info.
- *  - For operating frequency information, see \subpage sam3s_ek_opfreq.
- *  - For using portable PIO definitions, see \subpage sam3s_ek_piodef.
- *  - For on-board memories, see \subpage sam3s_ek_mem.
- *  - Several USB definitions are included here, see \subpage sam3s_ek_usb.
- *  - For External components, see \subpage sam3s_ek_extcomp.
- *  - For Individual chip definition, see \subpage sam3s_ek_chipdef.
- *
- * To get more software details and the full list of parameters related to the
- * SAM3S-EK board configuration, please have a look at the source file:
- * \ref board.h\n
- *
- * \section Usage
- *
- *  - The code for booting the board is provided by board_cstartup_xxx.c and
- *    board_lowlevel.c.
- *  - For using board PIOs, board characteristics (clock, etc.) and external
- *    components, see board.h.
- *  - For manipulating memories, see board_memories.h.
- *
- * This file can be used as a template and modified to fit a custom board, with
- * specific PIOs usage or memory connections.
- */
-
-/**
- *  \file board.h
- *
- *  Definition of AT91SAM3S-EK characteristics, AT91SAM3S-dependant PIOs and
- *  external components interfacing.
- */
-
-#ifndef _BOARD_
-#define _BOARD_
-
-/*----------------------------------------------------------------------------
- *        Headers
- *----------------------------------------------------------------------------*/
-
-#include <chip.h>
-
-
-//#include <include/at45d.h>
-//#include <include/at45_spi.h>
-#include <include/board_lowlevel.h>
-//#include <include/board_memories.h>
-//#include <include/hamming.h>
-//#include <include/math.h>
-//#include <include/uart_console.h>
-
-/*----------------------------------------------------------------------------
- *        Definitions
- *----------------------------------------------------------------------------*/
-
-/*----------------------------------------------------------------------------*/
-/**
- * \page sam3s_ek_board_info "SAM3S-EK - Board informations"
- * This page lists several definition related to the board description.
- *
- * \section Definitions
- * - \ref BOARD_NAME
- */
-
-/** Name of the board */
-#define BOARD_NAME "ATSAM3S-EK"
-/** Board definition */
-#define atsam3sek
-/** Family definition (already defined) */
-#define atsam3s
-/** Core definition */
-#define cortexm3
-
-/*
-#define BOARD_REV_A
-*/
-#define BOARD_REV_B
-
-/*----------------------------------------------------------------------------*/
-/**
- *  \page sam3s_ek_opfreq "SAM3S-EK - Operating frequencies"
- *  This page lists several definition related to the board operating frequency
- *  (when using the initialization done by board_lowlevel.c).
- *
- *  \section Definitions
- *  - \ref BOARD_MAINOSC
- *  - \ref BOARD_MCK
- */
-
-/** Frequency of the board main oscillator */
-#define BOARD_MAINOSC           12000000
-
-/** Master clock frequency (when using board_lowlevel.c) */
-// #define BOARD_MCK               64000000
-
-/*----------------------------------------------------------------------------*/
-/**
- * \page sam3s_ek_piodef "SAM3S-EK - PIO definitions"
- * This pages lists all the pio definitions contained in board.h. The constants
- * are named using the following convention: PIN_* for a constant which defines
- * a single Pin instance (but may include several PIOs sharing the same
- * controller), and PINS_* for a list of Pin instances.
- *
- * ADC
- * - \ref PIN_ADC0_AD0
- * - \ref PIN_ADC0_AD1
- * - \ref PIN_ADC0_AD2
- * - \ref PIN_ADC0_AD3
- * - \ref PIN_ADC0_AD4
- * - \ref PIN_ADC0_AD5
- * - \ref PIN_ADC0_AD6
- * - \ref PIN_ADC0_AD7
- * - \ref PINS_ADC
- *
- * UART
- * - \ref PINS_UART
- *
- * EBI
- * - \ref PIN_EBI_DATA_BUS
- * - \ref PIN_EBI_NRD
- * - \ref PIN_EBI_NWE
- * - \ref PIN_EBI_NCS0
- * - \ref PIN_EBI_PSRAM_ADDR_BUS
- * - \ref PIN_EBI_PSRAM_NBS
- * - \ref PIN_EBI_A1
- * - \ref PIN_EBI_NCS1
- * - \ref PIN_EBI_LCD_RS
- *
- * LEDs
- * - \ref PIN_LED_0
- * - \ref PIN_LED_1
- * - \ref PIN_LED_2
- * - \ref PINS_LEDS
- *
- * MCI
- * - \ref PINS_MCI
- *
- * Push buttons
- * - \ref PIN_PUSHBUTTON_1
- * - \ref PIN_PUSHBUTTON_2
- * - \ref PINS_PUSHBUTTONS
- * - \ref PUSHBUTTON_BP1
- * - \ref PUSHBUTTON_BP2
- *
- * PWMC
- * - \ref PIN_PWMC_PWMH0
- * - \ref PIN_PWMC_PWML0
- * - \ref PIN_PWMC_PWMH1
- * - \ref PIN_PWMC_PWML1
- * - \ref PIN_PWMC_PWMH2
- * - \ref PIN_PWMC_PWML2
- * - \ref PIN_PWMC_PWMH3
- * - \ref PIN_PWMC_PWML3
- * - \ref PIN_PWM_LED0
- * - \ref PIN_PWM_LED1
- * - \ref PIN_PWM_LED2
- * - \ref CHANNEL_PWM_LED0
- * - \ref CHANNEL_PWM_LED1
- * - \ref CHANNEL_PWM_LED2
- *
- * SPI
- * - \ref PIN_SPI_MISO
- * - \ref PIN_SPI_MOSI
- * - \ref PIN_SPI_SPCK
- * - \ref PINS_SPI
- * - \ref PIN_SPI_NPCS0_PA11
- *
- * SSC
- * - \ref PIN_SSC_TD
- * - \ref PIN_SSC_TK
- * - \ref PIN_SSC_TF
- * - \ref PINS_SSC_CODEC
- *
- * PCK0
- * - \ref PIN_PCK0
- *
- * PIO PARALLEL CAPTURE
- * - \ref PIN_PIODCEN1
- * - \ref PIN_PIODCEN2
- *
- * TWI
- * - \ref TWI_V3XX
- * - \ref PIN_TWI_TWD0
- * - \ref PIN_TWI_TWCK0
- * - \ref PINS_TWI0
- * - \ref PIN_TWI_TWD1
- * - \ref PIN_TWI_TWCK1
- * - \ref PINS_TWI1
- *
- * USART0
- * - \ref PIN_USART0_RXD
- * - \ref PIN_USART0_TXD
- * - \ref PIN_USART0_CTS
- * - \ref PIN_USART0_RTS
- * - \ref PIN_USART0_SCK
- *
- * USB
- * - \ref PIN_USB_VBUS
- *
- * NandFlash
- * - \ref PIN_EBI_NANDOE
- * - \ref PIN_EBI_NANDWE
- * - \ref PIN_EBI_NANDCLE
- * - \ref PIN_EBI_NANDALE
- * - \ref PIN_EBI_NANDIO
- * - \ref BOARD_NF_CE_PIN
- * - \ref BOARD_NF_RB_PIN
- * - \ref PINS_NANDFLASH
- *
- * QTouch
- * PIO definitions for Slider
- * \ref SLIDER_IOMASK_SNS
- * \ref SLIDER_IOMASK_SNSK
- * \ref PINS_SLIDER_SNS
- * \ref PINS_SLIDER_SNSK
- *
- * PIO definitions for keys
- * \ref KEY_IOMASK_SNS
- * \ref KEY_IOMASK_SNSK
- * \ref PINS_KEY_SNS
- * \ref PINS_KEY_SNSK
- *
- * PIOS for QTouch
- * \ref PINS_QTOUCH
- */
-
-/** ADC_AD0 pin definition. */
-#define PIN_ADC0_AD0 {1 << 21, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD1 pin definition. */
-#define PIN_ADC0_AD1 {1 << 30, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD2 pin definition. */
-#define PIN_ADC0_AD2 {1 << 3, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD3 pin definition. */
-#define PIN_ADC0_AD3 {1 << 4, PIOB, ID_PIOB, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD4 pin definition. */
-#define PIN_ADC0_AD4 {1 << 15, PIOC, ID_PIOC, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD5 pin definition. */
-#define PIN_ADC0_AD5 {1 << 16, PIOC, ID_PIOC, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD6 pin definition. */
-#define PIN_ADC0_AD6 {1 << 17, PIOC, ID_PIOC, PIO_INPUT, PIO_DEFAULT}
-/** ADC_AD7 pin definition. */
-#define PIN_ADC0_AD7 {1 << 18, PIOC, ID_PIOC, PIO_INPUT, PIO_DEFAULT}
-
-/** Pins ADC */
-#define PINS_ADC PIN_ADC0_AD0, PIN_ADC0_AD1, PIN_ADC0_AD2, PIN_ADC0_AD3, PIN_ADC0_AD4, PIN_ADC0_AD5, PIN_ADC0_AD6, PIN_ADC0_AD7
-
-/** Startup time max, return from Idle mode (in µs) */
-#define ADC_STARTUP_TIME_MAX       15
-/** Track and hold Acquisition Time min (in ns) */
-#define ADC_TRACK_HOLD_TIME_MIN  1200
-/** ADC clock frequence */
-#define BOARD_ADC_FREQ     (6000000)
-
-/** UART pins (UTXD0 and URXD0) definitions, PA9,10. */
-#define PINS_UART  {0x00000600, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-
-/** EBI Data Bus pins */
-#define PIN_EBI_DATA_BUS            {0xFF,    PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI NRD pin */
-#define PIN_EBI_NRD                 {1 << 11, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI NWE pin */
-#define PIN_EBI_NWE                 {1 << 8,  PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI NCS0 pin */
-#define PIN_EBI_NCS0                {1 << 20, PIOB, ID_PIOB, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI pins for PSRAM address bus */
-#define PIN_EBI_PSRAM_ADDR_BUS      {0x3f00fff, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI pins for PSRAM NBS pins */
-#define PIN_EBI_PSRAM_NBS           {1 << 7, PIOB, ID_PIOB, PIO_PERIPH_B, PIO_PULLUP}, \
-                                    {1 << 15, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI A1 pin */
-#define PIN_EBI_A1                  {1 << 19, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** EBI NCS1 pin */
-#define PIN_EBI_NCS1                {1 << 15, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP} /* LCD CS pin */
-/** EBI pin for LCD RS */
-#define PIN_EBI_LCD_RS              {1 << 19, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP} /* LCD RS pin */
-
-#define LED_BLUE      0
-#define LED_GREEN     1
-#define LED_RED       2
-
-#ifdef BOARD_REV_A
-/** LED #0 pin definition (BLUE). */
-#define PIN_LED_0   {PIO_PC20, PIOC, ID_PIOC, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LED #1 pin definition (GREEN). */
-#define PIN_LED_1   {PIO_PC21, PIOC, ID_PIOC, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LED #2 pin definition (RED). */
-#define PIN_LED_2   {PIO_PC22, PIOC, ID_PIOC, PIO_OUTPUT_1, PIO_DEFAULT}
-#endif
-
-#ifdef BOARD_REV_B
-/** LED #0 pin definition (BLUE). */
-#define PIN_LED_0   {PIO_PA19, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LED #1 pin definition (GREEN). */
-#define PIN_LED_1   {PIO_PA20, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT}
-/** LED #2 pin definition (RED). */
-#define PIN_LED_2   {PIO_PC20, PIOC, ID_PIOC, PIO_OUTPUT_1, PIO_DEFAULT}
-
-#endif
-
-/** List of all LEDs definitions. */
-#define PINS_LEDS   PIN_LED_0, PIN_LED_1, PIN_LED_2
-
-/** MCI pins definition. */
-#define PINS_MCI   {0x3fUL << 26, PIOA, ID_PIOA, PIO_PERIPH_C, PIO_PULLUP}
-/** MCI pin Card Detect. */
-#ifdef BOARD_REV_A
-#define PIN_MCI_CD {PIO_PA15, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-#endif
-
-#ifdef BOARD_REV_B
-#define PIN_MCI_CD {PIO_PA6, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-#endif
-
-/** Push button #0 definition. Attributes = pull-up + debounce + interrupt on rising edge. */
-#define PIN_PUSHBUTTON_1    {PIO_PB3, PIOB, ID_PIOB, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_IT_RISE_EDGE}
-/** Push button #1 definition. Attributes = pull-up + debounce + interrupt on falling edge. */
-#define PIN_PUSHBUTTON_2    {PIO_PC12, PIOC, ID_PIOC, PIO_INPUT, PIO_PULLUP | PIO_DEBOUNCE | PIO_IT_FALL_EDGE}
-/** List of all push button definitions. */
-#define PINS_PUSHBUTTONS    PIN_PUSHBUTTON_1, PIN_PUSHBUTTON_2
-
-/** Push button #1 index. */
-#define PUSHBUTTON_BP1   0
-/** Push button #2 index. */
-#define PUSHBUTTON_BP2   1
-
-/** Simulated joystick LEFT index. */
-#define JOYSTICK_LEFT       0
-/** Simulated joystick RIGHT index. */
-#define JOYSTICK_RIGHT      1
-
-/** PWMC PWM0 pin definition: Output High. */
-#define PIN_PWMC_PWMH0  {PIO_PC18B_PWMH0, PIOC, ID_PIOC, PIO_PERIPH_B, PIO_DEFAULT}
-/** PWMC PWM0 pin definition: Output Low. */
-#define PIN_PWMC_PWML0  {PIO_PA19B_PWML0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/** PWMC PWM1 pin definition: Output High. */
-#define PIN_PWMC_PWMH1  {PIO_PC19B_PWMH1, PIOC, ID_PIOC, PIO_PERIPH_B, PIO_DEFAULT}
-/** PWMC PWM1 pin definition: Output Low. */
-#define PIN_PWMC_PWML1  {PIO_PA20B_PWML1, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-/** PWMC PWM2 pin definition: Output High. */
-#define PIN_PWMC_PWMH2  {PIO_PC20B_PWMH2, PIOC, ID_PIOC, PIO_PERIPH_B, PIO_DEFAULT}
-/** PWMC PWM2 pin definition: Output Low. */
-#define PIN_PWMC_PWML2  {PIO_PA16C_PWML2, PIOA, ID_PIOA, PIO_PERIPH_C, PIO_DEFAULT}
-/** PWMC PWM3 pin definition: Output High. */
-#define PIN_PWMC_PWMH3  {PIO_PC21B_PWMH3, PIOC, ID_PIOC, PIO_PERIPH_B, PIO_DEFAULT}
-/** PWMC PWM3 pin definition: Output Low. */
-#define PIN_PWMC_PWML3  {PIO_PA15C_PWML3, PIOA, ID_PIOA, PIO_PERIPH_C, PIO_DEFAULT}
-/** PWM pins definition for LED0 */
-#define PIN_PWM_LED0 PIN_PWMC_PWMH0, PIN_PWMC_PWML0
-/** PWM pins definition for LED1 */
-#define PIN_PWM_LED1 PIN_PWMC_PWMH1, PIN_PWMC_PWML1
-/** PWM pins definition for LED2 */
-#define PIN_PWM_LED2 PIN_PWMC_PWMH2, PIN_PWMC_PWML2
-/** PWM channel for LED0 */
-#define CHANNEL_PWM_LED0 0
-/** PWM channel for LED1 */
-#define CHANNEL_PWM_LED1 1
-/** PWM channel for LED2 */
-#define CHANNEL_PWM_LED2 2
-
-/** SPI MISO pin definition. */
-#define PIN_SPI_MISO    {PIO_PA12A_MISO, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** SPI MOSI pin definition. */
-#define PIN_SPI_MOSI    {PIO_PA13A_MOSI, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** SPI SPCK pin definition. */
-#define PIN_SPI_SPCK    {PIO_PA14A_SPCK, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** SPI chip select pin definition. */
-#define PIN_SPI_NPCS0_PA11  {PIO_PA11A_NPCS0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** List of SPI pin definitions (MISO, MOSI & SPCK). */
-#define PINS_SPI        PIN_SPI_MISO, PIN_SPI_MOSI, PIN_SPI_SPCK
-
-/** SSC pin Transmitter Data (TD) */
-#define PIN_SSC_TD      {PIO_PA17A_TD, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** SSC pin Transmitter Clock (TK) */
-#define PIN_SSC_TK      {PIO_PA16A_TK, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** SSC pin Transmitter FrameSync (TF) */
-#define PIN_SSC_TF      {PIO_PA15A_TF, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** SSC pins definition for codec. */
-#define PINS_SSC_CODEC  PIN_SSC_TD, PIN_SSC_TK, PIN_SSC_TF
-
-/** PCK0 */
-#define PIN_PCK0        {PIO_PA6B_PCK0, PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-#define PIN_PCK1        {PIO_PA17B_PCK1,PIOA, ID_PIOA, PIO_PERIPH_B, PIO_DEFAULT}
-
-/** PIO PARALLEL CAPTURE */
-/** Parallel Capture Mode Data Enable1 */
-#define PIN_PIODCEN1    PIO_PA15
-/** Parallel Capture Mode Data Enable2 */
-#define PIN_PIODCEN2    PIO_PA16
-
-/** TWI ver 3.xx */
-#define TWI_V3XX
-/** TWI0 data pin */
-#define PIN_TWI_TWD0   {PIO_PA3A_TWD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** TWI0 clock pin */
-#define PIN_TWI_TWCK0  {PIO_PA4A_TWCK0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** TWI0 pins */
-#define PINS_TWI0      PIN_TWI_TWD0, PIN_TWI_TWCK0
-/** TWI1 data pin */
-#define PIN_TWI_TWD1   {PIO_PB4A_TWD1, PIOB, ID_PIOB, PIO_PERIPH_A, PIO_DEFAULT}
-/** TWI1 clock pin */
-#define PIN_TWI_TWCK1  {PIO_PB5A_TWCK1, PIOB, ID_PIOB, PIO_PERIPH_A, PIO_DEFAULT}
-/** TWI1 pins */
-#define PINS_TWI1      PIN_TWI_TWD1, PIN_TWI_TWCK1
-
-/** USART0 pin RX */
-#define PIN_USART0_RXD    {PIO_PA5A_RXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART0 pin TX */
-#define PIN_USART0_TXD    {PIO_PA6A_TXD0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART0 pin CTS */
-#define PIN_USART0_CTS    {PIO_PA8A_CTS0, PIOB, ID_PIOB, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART0 pin RTS */
-#define PIN_USART0_RTS    {PIO_PA7A_RTS0, PIOB, ID_PIOB, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART0 pin SCK */
-#define PIN_USART0_SCK    {PIO_PA2B_SCK0, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-
-/** USART1 pin RX */
-#define PIN_USART1_RXD    {PIO_PA21A_RXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART1 pin TX */
-#define PIN_USART1_TXD    {PIO_PA22A_TXD1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART1 pin CTS */
-#define PIN_USART1_CTS    {PIO_PA25A_CTS1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART1 pin RTS */
-#define PIN_USART1_RTS    {PIO_PA24A_RTS1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-/** USART1 pin ENABLE */
-#define PIN_USART1_EN     {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/** USART1 pin SCK */
-#define PIN_USART1_SCK    {PIO_PA23A_SCK1, PIOA, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT}
-
-/** USB VBus monitoring pin definition. */
-#ifdef BOARD_REV_A
-#define PIN_USB_VBUS    {PIO_PC23, PIOC, ID_PIOC, PIO_INPUT, PIO_PULLUP}
-#endif
-
-#ifdef BOARD_REV_B
-#define PIN_USB_VBUS    {PIO_PC21, PIOC, ID_PIOC, PIO_INPUT, PIO_PULLUP}
-#endif
-
-/** NandFlash pins definition: OE. */
-#define PIN_EBI_NANDOE          {PIO_PC9,  PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** NandFlash pins definition: WE. */
-#define PIN_EBI_NANDWE          {PIO_PC10, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** NandFlash pins definition: CLE. */
-#define PIN_EBI_NANDCLE         {PIO_PC17, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** NandFlash pins definition: ALE. */
-#define PIN_EBI_NANDALE         {PIO_PC16, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-/** NandFlash pins definition: DATA. */
-#define PIN_EBI_NANDIO          {0x000000FF, PIOC, ID_PIOC, PIO_PERIPH_A, PIO_PULLUP}
-
-/** Nandflash chip enable pin definition. */
-#define BOARD_NF_CE_PIN         {PIO_PC14, PIOC, ID_PIOC, PIO_OUTPUT_1, PIO_DEFAULT}
-
-/** Nandflash controller peripheral pins definition. */
-#define PINS_NANDFLASH          PIN_EBI_NANDIO, BOARD_NF_CE_PIN, PIN_EBI_NANDOE, \
-                                PIN_EBI_NANDWE, PIN_EBI_NANDCLE, PIN_EBI_NANDALE
-
-/* PIO definitions for Slider */
-#define SLIDER_IOMASK_SNS   (uint32_t)(PIO_PA0 | PIO_PA2 | PIO_PA4)
-#define SLIDER_IOMASK_SNSK  (uint32_t)(PIO_PA1 | PIO_PA3 | PIO_PA5)
-#define PINS_SLIDER_SNS     {SLIDER_IOMASK_SNS,  PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-#define PINS_SLIDER_SNSK    {SLIDER_IOMASK_SNSK, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-
-/* PIO definitions for keys */
-#define KEY_IOMASK_SNS   (uint32_t)(PIO_PC22 | PIO_PC24 | PIO_PC26 | PIO_PC28 | PIO_PC30)
-#define KEY_IOMASK_SNSK  (uint32_t)(PIO_PC23 | PIO_PC25 | PIO_PC27 | PIO_PC29 | PIO_PC31)
-#define PINS_KEY_SNS     {KEY_IOMASK_SNS,  PIOC, ID_PIOC, PIO_INPUT, PIO_DEFAULT}
-#define PINS_KEY_SNSK    {KEY_IOMASK_SNSK, PIOC, ID_PIOC, PIO_INPUT, PIO_DEFAULT}
-
-/* PIOS for QTouch */
-#define PINS_QTOUCH     PINS_SLIDER_SNS, PINS_SLIDER_SNSK, PINS_KEY_SNS, PINS_KEY_SNSK
-
-
-/*----------------------------------------------------------------------------*/
-/**
- * \page sam3s_ek_usb "SAM3S-EK - USB device"
- *
- * \section Definitions
- * - \ref BOARD_USB_BMATTRIBUTES
- * - \ref CHIP_USB_UDP
- * - \ref CHIP_USB_PULLUP_INTERNAL
- * - \ref CHIP_USB_NUMENDPOINTS
- * - \ref CHIP_USB_ENDPOINTS_MAXPACKETSIZE
- * - \ref CHIP_USB_ENDPOINTS_BANKS
- */
-
-/** USB attributes configuration descriptor (bus or self powered, remote wakeup) */
-#define BOARD_USB_BMATTRIBUTES              USBConfigurationDescriptor_SELFPOWERED_RWAKEUP
-
-/** Indicates chip has an UDP Full Speed. */
-#define CHIP_USB_UDP
-
-/** Indicates chip has an internal pull-up. */
-#define CHIP_USB_PULLUP_INTERNAL
-
-/** Number of USB endpoints */
-#define CHIP_USB_NUMENDPOINTS 8
-
-/** Endpoints max paxcket size */
-#define CHIP_USB_ENDPOINTS_MAXPACKETSIZE(i) \
-   ((i == 0) ? 64 : \
-   ((i == 1) ? 64 : \
-   ((i == 2) ? 64 : \
-   ((i == 3) ? 64 : \
-   ((i == 4) ? 512 : \
-   ((i == 5) ? 512 : \
-   ((i == 6) ? 64 : \
-   ((i == 7) ? 64 : 0 ))))))))
-
-/** Endpoints Number of Bank */
-#define CHIP_USB_ENDPOINTS_BANKS(i) \
-   ((i == 0) ? 1 : \
-   ((i == 1) ? 2 : \
-   ((i == 2) ? 2 : \
-   ((i == 3) ? 1 : \
-   ((i == 4) ? 2 : \
-   ((i == 5) ? 2 : \
-   ((i == 6) ? 2 : \
-   ((i == 7) ? 2 : 0 ))))))))
-
-/*----------------------------------------------------------------------------*/
-/**
- * \page sam3s_ek_extcomp "SAM3S-EK - External components"
- * This page lists the definitions related to external on-board components
- * located in the board.h file for the AT91SAM3S-EK.
- *
- * SD Card
- * - \ref BOARD_SD_PINS
- * - \ref BOARD_SD_PIN_CD
- *
- * LCD
- * - \ref BOARD_LCD_ILI9325
- * - \ref BOARD_LCD_PINS
- * - \ref BOARD_BACKLIGHT_PIN
- * - \ref BOARD_LCD_BASE
- * - \ref BOARD_LCD_RS
- * - \ref BOARD_LCD_WIDTH
- * - \ref BOARD_LCD_HEIGHT
- *
- * TouchScreen
- * - \ref BOARD_TSC_ADS7843
- * - \ref PIN_TCS_IRQ
- * - \ref PIN_TCS_BUSY
- * - \ref BOARD_TSC_SPI_BASE
- * - \ref BOARD_TSC_SPI_ID
- * - \ref BOARD_TSC_SPI_PINS
- * - \ref BOARD_TSC_NPCS
- * - \ref BOARD_TSC_NPCS_PIN
- *
- * SmartCard
- * - \ref SMARTCARD_CONNECT_PIN
- * - \ref PIN_ISO7816_RSTMC
- * - \ref PINS_ISO7816
- */
-
-/** MCI pins that shall be configured to access the SD card. */
-#define BOARD_SD_PINS               PINS_MCI
-/** MCI Card Detect pin. */
-#define BOARD_SD_PIN_CD             PIN_MCI_CD
-
-/** Indicates board has an ILI9325 external component to manage LCD. */
-#define BOARD_LCD_ILI9325
-
-/** LCD pins definition. */
-#define BOARD_LCD_PINS              PIN_EBI_DATA_BUS, PIN_EBI_NRD, PIN_EBI_NWE, PIN_EBI_NCS1, PIN_EBI_LCD_RS
-/** Backlight pin definition. */
-#define BOARD_BACKLIGHT_PIN         {PIO_PC13, PIOC, ID_PIOC, PIO_OUTPUT_0, PIO_DEFAULT}
-/** Define ILI9325 base address. */
-#define BOARD_LCD_BASE              0x61000000
-/** Define ILI9325 register select signal. */
-#define BOARD_LCD_RS                (1 << 1)
-/** Display width in pixels. */
-#define BOARD_LCD_WIDTH             240
-/** Display height in pixels. */
-#define BOARD_LCD_HEIGHT            320
-
-/** Indicates board has an ADS7843 external component to manage Touch Screen */
-#define BOARD_TSC_ADS7843
-
-/** Touchscreen controller IRQ pin definition. */
-#ifdef BOARD_REV_A
-#define PIN_TSC_IRQ  {PIO_PA4, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-#define PIN_TSC_IRQ_WUP_ID (1 << 3)
-/** Touchscreen controller Busy pin definition. */
-#define PIN_TSC_BUSY {PIO_PA5, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-#endif
-
-#ifdef BOARD_REV_B
-#define PIN_TSC_IRQ  {PIO_PA16, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-#define PIN_TSC_IRQ_WUP_ID (1 << 15)
-/** Touchscreen controller Busy pin definition. */
-#define PIN_TSC_BUSY {PIO_PA17, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP}
-#endif
-
-/** Base address of SPI peripheral connected to the touchscreen controller. */
-#define BOARD_TSC_SPI_BASE         SPI
-/** Identifier of SPI peripheral connected to the touchscreen controller. */
-#define BOARD_TSC_SPI_ID           ID_SPI
-/** Pins of the SPI peripheral connected to the touchscreen controller. */
-#define BOARD_TSC_SPI_PINS         PINS_SPI
-/** Chip select connected to the touchscreen controller. */
-#define BOARD_TSC_NPCS             0
-/** Chip select pin connected to the touchscreen controller. */
-#define BOARD_TSC_NPCS_PIN         PIN_SPI_NPCS0_PA11
-
-/// Smartcard detection pin
-//#define SMARTCARD_CONNECT_PIN {1 << 13, PIOA, ID_PIOA, PIO_INPUT, PIO_DEFAULT}
-
-/// PIN used for reset the smartcard
-#define PIN_ISO7816_RSTMC       {1 << 11, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}
-/// Pins used for connect the smartcard
-#define PINS_ISO7816            PIN_USART1_TXD, PIN_USART1_SCK, PIN_ISO7816_RSTMC
-
-/*----------------------------------------------------------------------------*/
-/**
- * \page sam3s_ek_mem "SAM3S-EK - Memories"
- * This page lists definitions related to internal & external on-board memories.
- *
- * \section SRAM
- * - \ref AT91C_ISRAM
- * - \ref AT91C_ISRAM_SIZE
- *
- * \section Flash
- * - \ref AT91C_IFLASH_SIZE
- * - \ref AT91C_IFLASH_PAGE_SIZE
- * - \ref AT91C_IFLASH_NB_OF_PAGES
- * - \ref AT91C_IFLASH_LOCK_REGION_SIZE
- * - \ref AT91C_IFLASH_NB_OF_LOCK_BITS
- *
- * \section NandFlash
- * - \ref BOARD_NF_COMMAND_ADDR
- * - \ref BOARD_NF_ADDRESS_ADDR
- * - \ref BOARD_NF_DATA_ADDR
- *
- * \section NorFlash
- * - \ref BOARD_NORFLASH_ADDR
- * - \ref BOARD_NORFLASH_DFT_BUS_SIZE
- */
-
-/** Address for transferring command bytes to the nandflash. */
-#define BOARD_NF_COMMAND_ADDR   0x60400000
-/** Address for transferring address bytes to the nandflash. */
-#define BOARD_NF_ADDRESS_ADDR   0x60200000
-/** Address for transferring data bytes to the nandflash. */
-#define BOARD_NF_DATA_ADDR      0x60000000
-
-/** Address for transferring command bytes to the norflash. */
-#define BOARD_NORFLASH_ADDR     0x63000000
-/** Default NOR bus size after power up reset */
-#define BOARD_NORFLASH_DFT_BUS_SIZE 8
-
-/*----------------------------------------------------------------------------*/
-/**
- * \page sam3s_ek_chipdef "SAM3S-EK - Individual chip definition"
- * This page lists the definitions related to different chip's definition
- * located in the board.h file for the SAM3S-EK.
- *
- * \section USART
- * - \ref BOARD_PIN_USART_RXD
- * - \ref BOARD_PIN_USART_TXD
- * - \ref BOARD_PIN_USART_CTS
- * - \ref BOARD_PIN_USART_RTS
- * - \ref BOARD_PIN_USART_EN
- * - \ref BOARD_USART_BASE
- * - \ref BOARD_ID_USART
- */
-
-/** Rtc */
-#define BOARD_RTC_ID                ID_RTC
-
-/** TWI ID for EEPROM application to use */
-#define BOARD_ID_TWI_EEPROM         ID_TWI1
-/** TWI ID for SLAVE application to use */
-#define BOARD_ID_TWI_SLAVE          ID_TWI1
-/** TWI Base for TWI EEPROM application to use */
-#define BOARD_BASE_TWI_EEPROM       TWI1
-/** TWI Base for TWI SLAVE application to use */
-#define BOARD_BASE_TWI_SLAVE        TWI1
-/** TWI pins for EEPROM application to use */
-#define BOARD_PINS_TWI_EEPROM       PINS_TWI1
-/** TWI pins for TWI SLAVE application to use */
-#define BOARD_PINS_TWI_SLAVE        PINS_TWI1
-
-/** USART RX pin for application */
-#define BOARD_PIN_USART_RXD        PIN_USART1_RXD
-/** USART TX pin for application */
-#define BOARD_PIN_USART_TXD        PIN_USART1_TXD
-/** USART CTS pin for application */
-#define BOARD_PIN_USART_CTS        PIN_USART1_CTS
-/** USART RTS pin for application */
-#define BOARD_PIN_USART_RTS        PIN_USART1_RTS
-/** USART ENABLE pin for application */
-#define BOARD_PIN_USART_EN         PIN_USART1_EN
-/** USART Base for application */
-#define BOARD_USART_BASE           USART1
-/** USART ID for application */
-#define BOARD_ID_USART             ID_USART1
-
-#endif /* #ifndef _BOARD_ */
-

applets/libraries/libboard_atsam3s-ek/include/board_lowlevel.h

@@ -1,46 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/**
- * \file
- *
- * Interface for the low-level initialization function.
- *
- */
-
-#ifndef BOARD_LOWLEVEL_H
-#define BOARD_LOWLEVEL_H
-
-/*----------------------------------------------------------------------------
- *        Exported functions
- *----------------------------------------------------------------------------*/
-extern void LowLevelInit( void ) ;
-
-#endif /* BOARD_LOWLEVEL_H */
-

applets/libraries/libboard_atsam3s-ek/resources/gcc/atsam3s1/sram.lds

@@ -1,81 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      Linker script for running in internal SRAM on the AT91SAM3S1
- *----------------------------------------------------------------------------*/
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(ResetException)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-    sram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x00004000 /* sram, 16K */
-}
-
-SECTIONS
-{
-    .fixed :
-    {
-        . = ALIGN(4);
-        _sfixed = .;
-        KEEP(*(.vectors))
-        *(.text*)
-        *(.ramfunc)
-        *(.rodata*)
-        *(.glue_7)
-        *(.glue_7t)
-        . = ALIGN(4);
-        _efixed = .;            /* End of text section */
-    } > sram
-
-    .relocate : AT (_efixed)
-    {
-        . = ALIGN(4);
-        _srelocate = .;
-        *(.data)
-        . = ALIGN(4);
-        _erelocate = .;
-    } >sram
-
-    .bss (NOLOAD) : {
-        . = ALIGN(4);
-        _szero = .;
-        *(.bss)
-        . = ALIGN(4);
-        _ezero = .;
-    } >sram
-
-    /* Stack in the end of SRAM */
-    _estack = 0x20003FFC;
-
-}
-end = .;

applets/libraries/libboard_atsam3s-ek/resources/gcc/atsam3s1/sram_samba.lds

@@ -1,91 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      Linker script for running in internal SRAM on the AT91SAM3S1
- *----------------------------------------------------------------------------*/
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(entry)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-    romcodesram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x0800
-    sram (W!RX) : ORIGIN = 0x20000800, LENGTH = 0x00003800 /* sram, 16K - sizeof(romcodesram) */
-}
-
-/* Entry point */
-/*ENTRY (ResetException)*/
-
-SECTIONS
-{
-    /* startup code in the .isr_vector */
-    .text :
-    {
-        . = ALIGN(4);
-        _stext = .;
-        KEEP(*(.isr_vector .isr_vector.*))
-        *(.mailbox)
-        *(.text .text.*)
-        *(.rodata .rodata.*)
-        *(.glue_7)
-        *(.glue_7t)
-        *(.gcc_except_table)
-        *(.rodata .rodata*)
-        *(.gnu.linkonce.r.*)
-        . = ALIGN(4);
-        _etext = .;
-    } > sram
-
-    /* data */
-    .data :
-    {
-        . = ALIGN(4);
-        _sidata = .;
-        _sdata = .;
-
-        *(.data)
-        *(.data.*)
-        . = ALIGN(4);
-        _edata = .;
-    } > sram
-
-    .bss (NOLOAD) : {
-        _szero = .;
-        *(.bss)
-        . = ALIGN(4);
-        _ezero = .;
-    } >sram
-
-    /* Stack in SRAM */
-    _sstack = 0x20003FFC;
-}
-end = .;

applets/libraries/libboard_atsam3s-ek/resources/gcc/atsam3s2/sram.lds

@@ -1,81 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      Linker script for running in internal SRAM on the AT91SAM3S2
- *----------------------------------------------------------------------------*/
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(ResetException)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-    sram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x00008000 /* sram, 32K */
-}
-
-SECTIONS
-{
-    .fixed :
-    {
-        . = ALIGN(4);
-        _sfixed = .;
-        KEEP(*(.vectors))
-        *(.text*)
-        *(.ramfunc)
-        *(.rodata*)
-        *(.glue_7)
-        *(.glue_7t)
-        . = ALIGN(4);
-        _efixed = .;            /* End of text section */
-    } > sram
-
-    .relocate : AT (_efixed)
-    {
-        . = ALIGN(4);
-        _srelocate = .;
-        *(.data)
-        . = ALIGN(4);
-        _erelocate = .;
-    } >sram
-
-    .bss (NOLOAD) : {
-        . = ALIGN(4);
-        _szero = .;
-        *(.bss)
-        . = ALIGN(4);
-        _ezero = .;
-    } >sram
-
-    /* Stack in the end of SRAM */
-    _estack = 0x20007FFC;
-
-}
-end = .;

applets/libraries/libboard_atsam3s-ek/resources/gcc/atsam3s2/sram_samba.lds

@@ -1,91 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      Linker script for running in internal SRAM on the AT91SAM3S2
- *----------------------------------------------------------------------------*/
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(entry)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-    romcodesram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x0800
-    sram (W!RX) : ORIGIN = 0x20000800, LENGTH = 0x00007800 /* sram, 32K - sizeof(romcodesram) */
-}
-
-/* Entry point */
-/*ENTRY (ResetException)*/
-
-SECTIONS
-{
-    /* startup code in the .isr_vector */
-    .text :
-    {
-        . = ALIGN(4);
-        _stext = .;
-        KEEP(*(.isr_vector .isr_vector.*))
-        *(.mailbox)
-        *(.text .text.*)
-        *(.rodata .rodata.*)
-        *(.glue_7)
-        *(.glue_7t)
-        *(.gcc_except_table)
-        *(.rodata .rodata*)
-        *(.gnu.linkonce.r.*)
-        . = ALIGN(4);
-        _etext = .;
-    } > sram
-
-    /* data */
-    .data :
-    {
-        . = ALIGN(4);
-        _sidata = .;
-        _sdata = .;
-
-        *(.data)
-        *(.data.*)
-        . = ALIGN(4);
-        _edata = .;
-    } > sram
-
-    .bss (NOLOAD) : {
-        _szero = .;
-        *(.bss)
-        . = ALIGN(4);
-        _ezero = .;
-    } >sram
-
-    /* Stack in SRAM */
-    _sstack = 0x20007FFC;
-}
-end = .;

applets/libraries/libboard_atsam3s-ek/resources/gcc/atsam3s4/sram.lds

@@ -1,215 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      Linker script for running in internal SRAM on the AT91SAM3S4
- *----------------------------------------------------------------------------*/
-
-OUTPUT_FORMAT ("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-ENTRY(_start)
-SEARCH_DIR(.)
-GROUP(-lgcc -lc -lcs3 -lcs3unhosted -lcs3micro)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-    sram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x0000C000 /* sram, 48K */
-}
-
-/* These force the linker to search for particular symbols from
- * the start of the link process and thus ensure the user's
- * overrides are picked up
- */
-EXTERN(__cs3_reset_generic_m)
-INCLUDE atsam3s.inc
-EXTERN(__cs3_interrupt_vector_micro)
-EXTERN(__cs3_start_c main __cs3_stack __cs3_heap_end)
-
-PROVIDE(__cs3_heap_start = _end);
-PROVIDE(__cs3_heap_end = __cs3_region_start_ram + __cs3_region_size_ram);
-PROVIDE(__cs3_region_num = (__cs3_regions_end - __cs3_regions) / 20);
-PROVIDE(__cs3_stack = __cs3_region_start_ram + __cs3_region_size_ram);
-
-SECTIONS
-{
-
-  .text :
-  {
-    CREATE_OBJECT_SYMBOLS
-    __cs3_region_start_ram = .;
-    *(.cs3.region-head.ram)
-    ASSERT (. == __cs3_region_start_ram, ".cs3.region-head.ram not permitted");
-    __cs3_interrupt_vector = __cs3_interrupt_vector_micro;
-    *(.cs3.interrupt_vector)
-    /* Make sure we pulled in an interrupt vector.  */
-    ASSERT (. != __cs3_interrupt_vector_micro, "No interrupt vector");
-
-    _start = __cs3_reset_generic_m;
-    __cs3_reset = __cs3_reset_generic_m;
-    *(.cs3.reset)
-    /* Make sure we pulled in some reset code.  */
-    ASSERT (. != __cs3_reset, "No reset code");
-
-    *(.text .text.* .gnu.linkonce.t.*)
-    *(.plt)
-    *(.gnu.warning)
-    *(.glue_7t) *(.glue_7) *(.vfp11_veneer)
-
-    *(.ARM.extab* .gnu.linkonce.armextab.*)
-    *(.gcc_except_table)
-  } >ram
-  .eh_frame_hdr : ALIGN (4)
-  {
-    KEEP (*(.eh_frame_hdr))
-  } >ram
-  .eh_frame : ALIGN (4)
-  {
-    KEEP (*(.eh_frame))
-  } >ram
-  /* .ARM.exidx is sorted, so has to go in its own output section.  */
-  __exidx_start = .;
-  .ARM.exidx :
-  {
-    *(.ARM.exidx* .gnu.linkonce.armexidx.*)
-  } >ram
-  __exidx_end = .;
-  .rodata : ALIGN (4)
-  {
-    *(.rodata .rodata.* .gnu.linkonce.r.*)
-
-    . = ALIGN(4);
-    KEEP(*(.init))
-
-    . = ALIGN(4);
-    __preinit_array_start = .;
-    KEEP (*(.preinit_array))
-    __preinit_array_end = .;
-
-    . = ALIGN(4);
-    __init_array_start = .;
-    KEEP (*(SORT(.init_array.*)))
-    KEEP (*(.init_array))
-    __init_array_end = .;
-
-    . = ALIGN(4);
-    KEEP(*(.fini))
-
-    . = ALIGN(4);
-    __fini_array_start = .;
-    KEEP (*(.fini_array))
-    KEEP (*(SORT(.fini_array.*)))
-    __fini_array_end = .;
-
-    . = ALIGN(0x4);
-    KEEP (*crtbegin.o(.ctors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))
-    KEEP (*(SORT(.ctors.*)))
-    KEEP (*crtend.o(.ctors))
-
-    . = ALIGN(0x4);
-    KEEP (*crtbegin.o(.dtors))
-    KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))
-    KEEP (*(SORT(.dtors.*)))
-    KEEP (*crtend.o(.dtors))
-
-    . = ALIGN(4);
-    __cs3_regions = .;
-    LONG (0)
-    LONG (__cs3_region_init_ram)
-    LONG (__cs3_region_start_ram)
-    LONG (__cs3_region_init_size_ram)
-    LONG (__cs3_region_zero_size_ram)
-    __cs3_regions_end = .;
-
-    . = ALIGN (8);
-    _etext = .;
-  } >ram
-
-  .data : ALIGN (8)
-  {
-
-    KEEP(*(.jcr))
-    *(.got.plt) *(.got)
-    *(.shdata)
-    *(.data .data.* .gnu.linkonce.d.*)
-    . = ALIGN (8);
-    *(.ram)
-    _edata = .;
-  } >ram
-  .bss :
-  {
-    *(.shbss)
-    *(.bss .bss.* .gnu.linkonce.b.*)
-    *(COMMON)
-    . = ALIGN (8);
-    *(.ram.b)
-    _end = .;
-    __end = .;
-  } >ram
-  __cs3_region_init_ram = __cs3_region_start_ram;
-  __cs3_region_init_size_ram = _edata - __cs3_region_start_ram;
-  __cs3_region_zero_size_ram = _end - _edata;
-  /* Default to 1M of heap */
-  __cs3_region_size_ram = ALIGN (1024) - __cs3_region_start_ram + 1M;
-
-  .stab 0 (NOLOAD) : { *(.stab) }
-  .stabstr 0 (NOLOAD) : { *(.stabstr) }
-  /* DWARF debug sections.
-   * Symbols in the DWARF debugging sections are relative to the beginning
-   * of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* DWARF 2.1 */
-  .debug_ranges   0 : { *(.debug_ranges) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-  .note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
-  .ARM.attributes 0 : { KEEP (*(.ARM.attributes)) }
-  /DISCARD/ : { *(.note.GNU-stack) }
-}
-/* checksum: 576d003e2604ff7a1b02791267 */

applets/libraries/libboard_atsam3s-ek/resources/gcc/atsam3s4/sram_samba.lds

@@ -1,91 +0,0 @@
-/* ----------------------------------------------------------------------------
- *         ATMEL Microcontroller Software Support
- * ----------------------------------------------------------------------------
- * Copyright (c) 2009, Atmel Corporation
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the disclaimer below.
- *
- * Atmel's name may not be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * DISCLAIMER: THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
- * DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
- * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
- * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * ----------------------------------------------------------------------------
- */
-
-/*------------------------------------------------------------------------------
- *      Linker script for running in internal SRAM on the AT91SAM3S4
- *----------------------------------------------------------------------------*/
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(entry)
-
-/* Memory Spaces Definitions */
-MEMORY
-{
-    romcodesram (W!RX) : ORIGIN = 0x20000000, LENGTH = 0x01000
-    sram (W!RX) : ORIGIN = 0x20001000, LENGTH = 0x0000B000 /* sram, 48K - sizeof(romcodesram) */
-}
-
-/* Entry point */
-/*ENTRY (ResetException)*/
-
-SECTIONS
-{
-    /* startup code in the .isr_vector */
-    .text :
-    {
-        . = ALIGN(4);
-        _stext = .;
-        KEEP(*(.isr_vector .isr_vector.*))
-        *(.mailbox)
-        *(.text .text.*)
-        *(.rodata .rodata.*)
-        *(.glue_7)
-        *(.glue_7t)
-        *(.gcc_except_table)
-        *(.rodata .rodata*)
-        *(.gnu.linkonce.r.*)
-        . = ALIGN(4);
-        _etext = .;
-    } > sram
-
-    /* data */
-    .data :
-    {
-        . = ALIGN(4);
-        _sidata = .;
-        _sdata = .;
-
-        *(.data)
-        *(.data.*)
-        . = ALIGN(4);
-        _edata = .;
-    } > sram
-
-    .bss (NOLOAD) : {
-        _szero = .;
-        *(.bss)
-        . = ALIGN(4);
-        _ezero = .;
-    } >sram
-
-    /* Stack in SRAM */
-    _sstack = 0x2000BFFC;
-}
-end = .;

applets/libraries/libchip_atsam3s/chip.h

@@ -1,63 +0,0 @@
-#ifndef _LIB_ATSAM3S_
-#define _LIB_ATSAM3S_
-
-/*
- * Peripherals registers definitions
- */
-#if defined atsam3s4
-    #include <include/ATSAM3S4.h>
-#elif defined atsam3s2
-    #include <include/ATSAM3S2.h>
-#elif defined atsam3s1
-    #include <include/ATSAM3S1.h>
-#else
-    #warning Library does not support the specified chip, specifying atsam3s4.
-    #define atsam3s4
-    #include <include/ATSAM3S4.h>
-#endif
-
-
-/* Define attribute */
-#if defined   ( __CC_ARM   ) /* Keil µVision 4 */
-    #define WEAK __attribute__ ((weak))
-#elif defined ( __ICCARM__ ) /* IAR Ewarm 5.41+ */
-    #define WEAK __weak
-#elif defined (  __GNUC__  ) /* GCC CS3 2009q3-68 */
-    #define WEAK __attribute__ ((weak))
-#endif
-
-/* Define NO_INIT attribute */
-#if defined   ( __CC_ARM   )
-    #define NO_INIT
-#elif defined ( __ICCARM__ )
-    #define NO_INIT __no_init
-#elif defined (  __GNUC__  )
-    #define NO_INIT
-#endif
-
-/*
- * Core
- */
-
-/*
- * Peripherals
- */
-//#include <include/async.h>
-//#include <include/efc.h>
-//#include <include/flashd.h>
-//#include <include/pio.h>
-//#include <include/pmc.h>
-//#include <include/spi.h>
-//#include <include/spi_pdc.h>
-//#include <include/twi.h>
-//#include <include/twid.h>
-//#include <include/usart.h>
-
-/*
-#include <USBD_Config.h>
-*/
-
-//#include <include/trace.h>
-//#include <include/wdt.h>
-
-#endif /* _LIB_ATSAM3S_ */

changelog.txt

@@ -1,235 +0,0 @@
-******************************************
-CHANGELOG: 07-05-2012  BSS
-AutoSwitch feature added
-Mix Warning was not so regular (sometime 2 ticks instead of 3)
-
-******************************************
-CHANGELOG: 06-05-2012  BSS
-FW options now stored in a byte of the EEPROM
-[Arm] getSwitch() problem with Custom Switches
-
-******************************************
-CHANGELOG: 05-05-2012  BSS
-[FrSky] Speed in Gauges configuration was buggy
-[FrSky] We stored Min Speed instead of Max Speed
-
-******************************************
-CHANGELOG: 04-05-2012  BSS
-Momentary Switches in Function Switches
-
-******************************************
-CHANGELOG: 03-05-2012  BSS
-[Arm] Audio / Haptic refactoring
-[Arm] Timer blocked at 10:55
-[V4] SDcard menu reworked
-
-******************************************
-CHANGELOG: 02-05-2012  BSS
-[V4/Arm] Problem in Models Move
-[stock] Flash saving (840bytes)
-
-******************************************
-CHANGELOG: 01-05-2012  BSS
-[FrSky] GPS distance bug fix
-
-******************************************
-CHANGELOG: 29-04-2012  BSS
-[V4/Arm] EEPROM marked as dirty on reboot 
-
-******************************************
-CHANGELOG: 27-04-2012  BSS
-Vario feature added
-New EEPROM format 205
-[FrSky] Telemetry offset for A1/A2 on 12bits
-[V4] Models with empty name bug when SDcard backup  
-
-******************************************
-CHANGELOG: 26-04-2012  BSS
-[Arm] 32Channels 9Phases 64Mixes 32Expos 32VSwitches 32FSwitches
-
-******************************************
-CHANGELOG: 23-04-2012  BSS
-[V4] SDcard Models storage implemented
-
-******************************************
-CHANGELOG: 20-04-2012  BSS
-[Stock] 400bytes flash saving
-
-******************************************
-CHANGELOG: 15-03-2012  BSS
-FAAST option in protocol to enable startPulses before the splash screen
-Telemetry configurable screen
-Confirmation before applying templates
-Used channels cleaned before applying a template
-
-******************************************
-CHANGELOG: 14-03-2012  BSS
-Potscroll option added
-
-******************************************
-
-Version 364:
-
-******************************************
-CHANGELOG: 04-03-2012  BSS
-New EEPROM format 205
-Introduction of differential in Mixers
-Introduction of Switches as Mixer Source (FULL now removed)
-Negative curves in Mixers
-Optimizations in Mixer
-Extended chars for localization
-Swedish translations
-Beep length updated
-
-******************************************
-CHANGELOG: 01-03-2012  BSS
-Feature "Use THR trim as a slider" now finished
-[FrSky] Jitter (2us) introduced by last optimization removed
-Trim parameter in Mixer is OFF if the source is not a stick
-GPS distance fixed
-
-******************************************
-
-Version 304:
-
-******************************************
-CHANGELOG: 28-02-2012  BSS
-Flash saving (600bytes)
-[FrSky] NO DATA displayed on the status line when nothing received
-Sticks/Pots center beep now more accurate
-Beeps length for center beep and inactivity reduced
-Vibration when MIN/MID/MAX trim position reached  
-
-******************************************
-CHANGELOG: 27-02-2012  BSS
-Flash saving (idea from er9x)
-Trims2Offsets function removed
-A "Safety CHxx" function is not applied when it is currently edited
-The Stick Mode needs confirmation before being applied
-
-******************************************
-
-Version 288:
-
-******************************************
-CHANGELOG: 24-02-2012  BSS
-Throttle Trace bug solved when using P1-P3
-New way of dealing with recursive mixers in Flight Phases (with FadeIn / FadeOut)
-
-******************************************
-CHANGELOG: 23-02-2012  BSS
-PXX updates + optimizations pulled from er9x
-FrSky TELEMETRY menu is now moved to [DOWN long]
-Optimizations
-
-******************************************
-CHANGELOG: 22-02-2012  BSS
-Blades count may now be 4
-V4: New mixers/expos fields inflight modifiable through RE1
-
-******************************************
-CHANGELOG: 21-02-2012  BSS
-V4: Logs format ported from gruvin9x 
-
-******************************************
-CHANGELOG: 20-02-2012  BSS
-Last GPS coords displayed even when streaming stops (model lost)
-
-******************************************
-CHANGELOG: 19-02-2012  BSS
-V4: Inflight fields modification through RE1 feature added 
-
-******************************************
-CHANGELOG: 17-02-2012  BSS
-RSSI thresholds on a per model basis
-Flash Saving
-FrSky Hub variometer + cells voltage fix
-
-******************************************
-CHANGELOG: 16-02-2012  BSS
-Beeper mode splitted from Beeper length
-Haptic redesigned
-No FrSky alarms when Tx asked to be quiet
-Flash Saving
-
-******************************************
-CHANGELOG: 14-02-2012  BSS
-Blades count configuration for RPMs
-Instant trim bug fixed for stick modes != RETA
-
-******************************************
-CHANGELOG: 1O-02-2012  BSS
-Copyright updated
-GPS distance and speed bug fixes
-
-******************************************
-
-Version 232:
-
-******************************************
-CHANGELOG: 09-02-2012  BSS
-Multiplier added for telemetry A1/A2 => 204.0v!
-GPS distance added
-
-******************************************
-CHANGELOG: 08-02-2012  BSS
-Telemetry bars screen
-Add individual cell voltages from FrSky Hub 2.0
-New units for A1/A2
-
-******************************************
-CHANGELOG: 06-02-2012  BSS
-Flash saving
-Telemetry screens redesigned
-
-******************************************
-
-Version 213:
-
-******************************************
-CHANGELOG: 05-02-2012  BSS
-Add GPS speed display, with max speed
-GPS screen redesigned
-
-******************************************
-
-Version 205:
-
-******************************************
-CHANGELOG: 04-02-2012  BSS
-New way of configuring A1 and A2 using Range and Offset
-Named sounds in Func Switches
-Haptic only sounds skipped when HAPTIC option disable
-
-******************************************
-CHANGELOG: 03-02-2012  BSS
-Safety switches screen removed (moved to Func Switches)
- 
-******************************************
-CHANGELOG: 02-02-2012  BSS
-French translations updated
-AUDIO optimizations
-
-******************************************
-CHANGELOG: 01-02-2012  BSS
-AUDIO and HAPTIC may be enabled separately
-AUDIO bug fixes
-
-******************************************
-CHANGELOG: 31-01-2012  BSS
-HAPTIC now working
-
-******************************************
-CHANGELOG: 29-01-2012  BSS
-Inactivity timer reset on Keys and Trims press
-
-******************************************
-CHANGELOG: 28-01-2012  BSS
-New splash
-
-******************************************
-CHANGELOG: 27-01-2012  BSS
-NMEA and ARDUPILOT ported from er9x
-
-
- 

releasenotes-9x.txt

@@ -0,0 +1,138 @@
+<SVN CURRENT>
+
+<h2>2834 / 2013-10-29</h2>
+
+<h2>2768 / 2013-09-20</h2>
+[all]
+<ul>
+<li>Name badly displayed after SD Model Restore</li>
+</ul>
+
+[stock]
+<ul>
+<li>Custom switches not working when comparing a timer with a value (stock only without telemetry mod)</li>
+</ul>
+
+[sky9x/gruvin]
+<ul>
+<li>Fixes in logging function</li>
+<li>Confirmation Popup before SD Format</li>
+</ul>
+
+<h2>2751 / 2013-09-01</h2>
+[all]
+<ul>
+<li>Fixes in translations (FR, IT, PT)</li>
+</ul>
+
+<h2>2746 / 2013-08-30</h2>
+[all]
+<ul>
+<li>Limits are now [-125:0] and [0:125] instead of [-125:25] and [-25:125]</li>
+<li>INPUTS instead of STICKS for BL activation</li>
+<li>Curves presets bug fix</li>
+</ul>
+
+[stock]
+<ul>
+<li>Fix bug with Battery calibration</li>
+<li>14051 can be used for THR and AIL connections (telemetry)</li>
+<li>CH1 PPM output was truncated</li>
+</ul>
+
+[sky9x]
+<ul>
+<li>Flight mode sound files now are read from: /SOUNDS/(lang)/modelname/fpname-ON.wav and /SOUNDS/(lang)/modelname/fpname-OFF.wav</li>
+</ul>
+
+<h2>2688 / 2013-07-28</h2>
+[stock]
+<ul>
+<li>Fix bug with imperial units</li>
+</ul>
+
+[gruvin9x]
+<ul>
+<li>Fix bug with imperial units</li>
+<li>Fix small bug with SOMO 14D </li>
+<li>Telemetry logs renamed modelname-yyyy-mm-dd.csv</li>
+</ul>
+
+[sky9x]
+<ul>
+<li>Telemetry logs renamed modelname-yyyy-mm-dd.csv</li>
+</ul>
+
+<h2>2647 / 2013-07-21</h2>
+[all]
+<ul>
+<li>Some bug fixes</li>
+<li>Better fonts</li>
+</ul>
+
+<h2>2491 / 2013-06-24</h2>
+[all]
+<ul>
+<li>PlaySound has now a repeat argument</li>
+<li>FAI mode added (disable telemetry other than A1/A2/RSSI for contests)</li>
+<li>Delays now also apply to 3POS switch!</li>
+<li>RSSI alarms default thresholds now 45 / 42 </li>
+</ul>
+
+[stock]
+<ul>
+<li>Flash savings</li>
+<li>Vario sink tones removed</li>
+<li>Audio files renumbered (see here) </li>
+</ul>
+
+[sky9x]
+<ul>
+<li>Audio mixer: several sounds can now be played simulataneously, and beeps won't interrupt and clear voice alerts anymore. Note that sound files now need to have sampling rates of either 8, 16 or 32kHz and may need to be replaced. </li>
+</ul>
+
+<h2>2413 / 2013-05-22</h2>
+[all]
+<ul>
+<li>Calibration screen automatically appears following an EEPROM format</li>
+<li>Wraparound in popup menus </li>
+</ul>
+
+[stock]
+<ul>
+<li>More options supported (novario / nogps / nogauges)</li>
+<li>Flash savings</li>
+<li>Mavlink huge rework by Rienk! </li>
+</ul>
+
+[sky9x]
+<ul>
+<li>Audio language can now be selected in the general settings! Note that the sound files need to be moved to subfolders of the SOUNDS folder (SOUNDS/en for English, same with it, fr, de, pt, se, cz)</li>
+<li>More settings for the 2nd PPM port</li>
+</ul>
+
+<h2>2215 / 2013-04-05</h2>
+[all]
+<ul>
+<li>New option AUTOSOURCE to automatically select the stick / pot / switch which is moved when editing a Mix source </li>
+</ul>
+
+[stock]
+<ul>
+<li>All prompts renumbered to have the "custom" prompts starting at 0 and to be able to use PlayTrack?(GVAR) with Adjust(GVAR) to play tracks sequences </li>
+</ul>
+
+[gruvin9x]
+<ul>
+<li>Possibility to have both BEEPER and SPEAKER enable in the same time </li>
+</ul>
+
+[sky9x]
+<ul>
+<li>Fixed a bug with audio stopped until next reboot in BackgroundMusic with no track selected</li>
+<li>Imperial is now an option selectable in the menus</li>
+<li>Possibility to have both BEEPER and SPEAKER enable in the same time</li>
+<li>New menu in Main Views / Telemetry Views</li>
+<li>Vario sounds improved!</li>
+<li>SD Folders renamed. "9XSOUNDS" becomes "SOUNDS", don't forget to updateyour cards!</li>
+</ul>

releasenotes-taranis.txt

@@ -0,0 +1,79 @@
+<SVN CURRENT>
+
+<h2>2834 / 2013-10-29</h2>
+
+<h2>2768 / 2013-09-20</h2>
+<ul>
+<li>SD card format confirmation popup</li>
+<li>Name badly displayed after SD Model Restore</li>
+<li>Model image not reloaded after Copy/Move/Delete/Restore</li>
+</ul>
+
+<h2>2751 / 2013-09-01</h2>
+<ul>
+<li>Fixes in translations (FR, IT, PT)</li>
+</ul>
+
+<h2>2746 / 2013-08-30</h2>
+<ul>
+<li>Rx voltage was not displayed on main screen if VFAS or CELLS chosen!</li>
+<li>GVARS can now refer to the GVAR of another phase</li>
+<li>Vario and Altitude bug fixes</li>
+<li>INPUTS instead of STICKS for BL activation</li>
+<li>PPM_UNIT=PREC0 / US taken into account in channels view</li>
+<li>DJT removed and receiver number hidden from PXX settings when proto != D16</li>
+<li>Limits are now [-125:0] and [0:125] instead of [-125:25] and [-25:125]</li>
+<li>Curves presets bug fix</li>
+<li>Flight mode sound files now are read from: /SOUNDS/(lang)/modelname/fpname-ON.wav and /SOUNDS/(lang)/modelname/fpname-OFF.wav</li>
+</ul>
+
+<h2>2688 / 2013-07-28</h2>
+<ul>
+<li>Telemetry logs renamed modelname-yyyy-mm-dd.csv</li>
+</ul>
+
+<h2>2667 / 2013-07-25 (Taranis only)</h2>
+<ul>
+<li>Brightness adjustment added</li>
+<li>Remove units from SWR</li>
+<li>Copy/Cut/Paste of custom functions</li>
+<li>Copy/Cut/Paste of custom switches</li>
+<li>Translations fixes</li>
+</ul>
+
+<h2>2647 / 2013-07-21</h2>
+<ul>
+<li>Negative timer display fix.</li>
+</ul>
+
+<h2>2604 / 2013-07-13 (Taranis only)</h2>
+<ul>
+<li>Contrast adjustment added</li>
+</ul>
+
+<h2>2590 / 2013-07-08 (Taranis only)</h2>
+<ul>
+<li>First official release version!</li>
+</ul>
+
+<h2>2491 / 2013-06-24</h2>
+[all]
+<ul>
+<li>PlaySound has now a repeat argument</li>
+<li>FAI mode added (disable telemetry other than A1/A2/RSSI for contests)</li>
+<li>Delays now also apply to 3POS switch!</li>
+<li>RSSI alarms default thresholds now 45 / 42</li>
+</ul>
+
+<h2>2413 / 2013-05-22</h2>
+[all]
+<ul>
+<li>Calibration screen automatically appears following an EEPROM format</li>
+<li>Wraparound in popup menus</li>
+</ul>
+
+<h2>2215 / 2012-04-05</h2>
+[all]
+<ul>
+<li>New option AUTOSOURCE to automatically select the stick / pot / switch which is moved when editing a Mix source</li>
+</ul>

src/FatFs/00readme.txt

@@ -1,4 +1,4 @@
-FatFs Module Source Files R0.09                        (C)ChaN, 2011
+FatFs Module Source Files R0.09b                       (C)ChaN, 2013
 
 
 FILES
@@ -7,7 +7,8 @@ FILES
   ff.h       Common include file for FatFs and application module.
   ff.c       FatFs module.
   diskio.h   Common include file for FatFs and disk I/O module.
-  integer.h  Alternative type definitions for integer variables.
+  diskio.c   An example of glue function to attach existing disk I/O module to FatFs.
+  integer.h  Integer type definitions for FatFs.
   option     Optional external functions.
 
   Low level disk I/O module is not included in this archive because the FatFs
@@ -23,7 +24,7 @@ AGREEMENTS
  small embedded systems. This is a free software and is opened for education,
  research and commercial developments under license policy of following trems.
 
-  Copyright (C) 2011, ChaN, all right reserved.
+  Copyright (C) 2012, ChaN, all right reserved.
 
  * The FatFs module is a free software and there is NO WARRANTY.
  * No restriction on use. You can use, modify and redistribute it for
@@ -128,3 +129,10 @@ REVISION HISTORY
 
   Sep 06,'11 R0.09     f_mkfs() supports multiple partition to finish the multiple partition feature.
                        Added f_fdisk(). (_MULTI_PARTITION = 2)
+
+  Aug 27,'12 R0.09a    Fixed assertion failure due to OS/2 EA on FAT12/16.
+                       Changed f_open() and f_opendir() reject null object pointer to avoid crash.
+                       Changed option name _FS_SHARE to _FS_LOCK.
+
+  Jan 23,'13 R0.09b    Added f_getlabel() and f_setlabel(). (_USE_LABEL == 1)
+

src/FatFs/diskio.h

@@ -1,11 +1,16 @@
 /*-----------------------------------------------------------------------
-/  Low level disk interface modlue include file
+/  Low level disk interface modlue include file   (C)ChaN, 2013
 /-----------------------------------------------------------------------*/
 
-#ifndef _DISKIO
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
 
-#define _READONLY	0	/* 1: Remove write functions */
-#define _USE_IOCTL	1	/* 1: Use disk_ioctl fucntion */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define _USE_WRITE	1	/* 1: Enable disk_write function */
+#define _USE_IOCTL	1	/* 1: Enable disk_ioctl fucntion */
 
 #include "integer.h"
 
@@ -26,26 +31,15 @@ typedef enum {
 /*---------------------------------------*/
 /* Prototypes for disk control functions */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-int assign_drives (int, int);
-DSTATUS disk_initialize (BYTE);
-DSTATUS disk_status (BYTE);
-DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
-#if	_READONLY == 0
-DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
-#endif
-DRESULT disk_ioctl (BYTE, BYTE, void*);
-
-#ifdef __cplusplus
-}
-#endif
+DSTATUS disk_initialize (BYTE pdrv);
+DSTATUS disk_status (BYTE pdrv);
+DRESULT disk_read (BYTE pdrv, BYTE*buff, DWORD sector, BYTE count);
+DRESULT disk_write (BYTE pdrv, const BYTE* buff, DWORD sector, BYTE count);
+DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
 
 
 /* Disk Status Bits (DSTATUS) */
-
 #define STA_NOINIT		0x01	/* Drive not initialized */
 #define STA_NODISK		0x02	/* No medium in the drive */
 #define STA_PROTECT		0x04	/* Write protected */
@@ -53,17 +47,18 @@ DRESULT disk_ioctl (BYTE, BYTE, void*);
 
 /* Command code for disk_ioctrl fucntion */
 
-/* Generic command (defined for FatFs) */
+/* Generic command (used by FatFs) */
 #define CTRL_SYNC			0	/* Flush disk cache (for write functions) */
 #define GET_SECTOR_COUNT	1	/* Get media size (for only f_mkfs()) */
 #define GET_SECTOR_SIZE		2	/* Get sector size (for multiple sector size (_MAX_SS >= 1024)) */
 #define GET_BLOCK_SIZE		3	/* Get erase block size (for only f_mkfs()) */
 #define CTRL_ERASE_SECTOR	4	/* Force erased a block of sectors (for only _USE_ERASE) */
 
-/* Generic command */
+/* Generic command (not used by FatFs) */
 #define CTRL_POWER			5	/* Get/Set power status */
 #define CTRL_LOCK			6	/* Lock/Unlock media removal */
 #define CTRL_EJECT			7	/* Eject media */
+#define CTRL_FORMAT			8	/* Create physical format on the media */
 
 /* MMC/SDC specific ioctl command */
 #define MMC_GET_TYPE		10	/* Get card type */
@@ -77,9 +72,17 @@ DRESULT disk_ioctl (BYTE, BYTE, void*);
 #define ATA_GET_MODEL		21	/* Get model name */
 #define ATA_GET_SN			22	/* Get serial number */
 
-/* NAND specific ioctl command */
-#define NAND_FORMAT			30	/* Create physical format */
+
+/* MMC card type flags (MMC_GET_TYPE) */
+#define CT_MMC		0x01		/* MMC ver 3 */
+#define CT_SD1		0x02		/* SD ver 1 */
+#define CT_SD2		0x04		/* SD ver 2 */
+#define CT_SDC		(CT_SD1|CT_SD2)	/* SD */
+#define CT_BLOCK	0x08		/* Block addressing */
 
 
-#define _DISKIO
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/FatFs/ff.h

@@ -1,11 +1,11 @@
 /*---------------------------------------------------------------------------/
-/  FatFs - FAT file system module include file  R0.09     (C)ChaN, 2011
+/  FatFs - FAT file system module include file  R0.09b    (C)ChaN, 2013
 /----------------------------------------------------------------------------/
 / FatFs module is a generic FAT file system module for small embedded systems.
 / This is a free software that opened for education, research and commercial
-/ developments under license policy of following trems.
+/ developments under license policy of following terms.
 /
-/  Copyright (C) 2011, ChaN, all right reserved.
+/  Copyright (C) 2013, ChaN, all right reserved.
 /
 / * The FatFs module is a free software and there is NO WARRANTY.
 / * No restriction on use. You can use, modify and redistribute it for
@@ -15,7 +15,7 @@
 /----------------------------------------------------------------------------*/
 
 #ifndef _FATFS
-#define _FATFS	6502	/* Revision ID */
+#define _FATFS	82786	/* Revision ID */
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,9 +41,9 @@ extern PARTITION VolToPart[];	/* Volume - Partition resolution table */
 #define LD2PD(vol) (VolToPart[vol].pd)	/* Get physical drive number */
 #define LD2PT(vol) (VolToPart[vol].pt)	/* Get partition index */
 
-#else						/* Single partition configuration */
-#define LD2PD(vol) (vol)	/* Each logical drive is bound to the same physical drive number */
-#define LD2PT(vol) 0		/* Always mounts the 1st partition or in SFD */
+#else							/* Single partition configuration */
+#define LD2PD(vol) (BYTE)(vol)	/* Each logical drive is bound to the same physical drive number */
+#define LD2PT(vol) 0			/* Always mounts the 1st partition or in SFD */
 
 #endif
 
@@ -99,6 +99,7 @@ typedef struct {
 #endif
 	DWORD	n_fatent;		/* Number of FAT entries (= number of clusters + 2) */
 	DWORD	fsize;			/* Sectors per FAT */
+	DWORD	volbase;		/* Volume start sector */
 	DWORD	fatbase;		/* FAT start sector */
 	DWORD	dirbase;		/* Root directory start sector (FAT32:Cluster#) */
 	DWORD	database;		/* Data start sector */
@@ -111,24 +112,24 @@ typedef struct {
 /* File object structure (FIL) */
 
 typedef struct {
-	FATFS*	fs;				/* Pointer to the owner file system object */
-	WORD	id;				/* Owner file system mount ID */
+	FATFS*	fs;				/* Pointer to the related file system object (**do not change order**) */
+	WORD	id;				/* Owner file system mount ID (**do not change order**) */
 	BYTE	flag;			/* File status flags */
 	BYTE	pad1;
-	DWORD	fptr;			/* File read/write pointer (0 on file open) */
+	DWORD	fptr;			/* File read/write pointer (0ed on file open) */
 	DWORD	fsize;			/* File size */
-	DWORD	sclust;			/* File start cluster (0 when fsize==0) */
-	DWORD	clust;			/* Current cluster */
-	DWORD	dsect;			/* Current data sector */
+	DWORD	sclust;			/* File data start cluster (0:no data cluster, always 0 when fsize is 0) */
+	DWORD	clust;			/* Current cluster of fpter */
+	DWORD	dsect;			/* Current data sector of fpter */
 #if !_FS_READONLY
 	DWORD	dir_sect;		/* Sector containing the directory entry */
-	BYTE*	dir_ptr;		/* Ponter to the directory entry in the window */
+	BYTE*	dir_ptr;		/* Pointer to the directory entry in the window */
 #endif
 #if _USE_FASTSEEK
 	DWORD*	cltbl;			/* Pointer to the cluster link map table (null on file open) */
 #endif
-#if _FS_SHARE
-	UINT	lockid;			/* File lock ID (index of file semaphore table) */
+#if _FS_LOCK
+	UINT	lockid;			/* File lock ID (index of file semaphore table Files[]) */
 #endif
 #if !_FS_TINY
 	BYTE	buf[_MAX_SS];	/* File data read/write buffer */
@@ -140,8 +141,8 @@ typedef struct {
 /* Directory object structure (DIR) */
 
 typedef struct {
-	FATFS*	fs;				/* Pointer to the owner file system object */
-	WORD	id;				/* Owner file system mount ID */
+	FATFS*	fs;				/* Pointer to the owner file system object (**do not change order**) */
+	WORD	id;				/* Owner file system mount ID (**do not change order**) */
 	WORD	index;			/* Current read/write index number */
 	DWORD	sclust;			/* Table start cluster (0:Root dir) */
 	DWORD	clust;			/* Current cluster */
@@ -176,14 +177,14 @@ typedef struct {
 
 typedef enum {
 	FR_OK = 0,				/* (0) Succeeded */
-	FR_DISK_ERR,			/* (1) A hard error occured in the low level disk I/O layer */
+	FR_DISK_ERR,			/* (1) A hard error occurred in the low level disk I/O layer */
 	FR_INT_ERR,				/* (2) Assertion failed */
 	FR_NOT_READY,			/* (3) The physical drive cannot work */
 	FR_NO_FILE,				/* (4) Could not find the file */
 	FR_NO_PATH,				/* (5) Could not find the path */
 	FR_INVALID_NAME,		/* (6) The path name format is invalid */
-	FR_DENIED,				/* (7) Acces denied due to prohibited access or directory full */
-	FR_EXIST,				/* (8) Acces denied due to prohibited access */
+	FR_DENIED,				/* (7) Access denied due to prohibited access or directory full */
+	FR_EXIST,				/* (8) Access denied due to prohibited access */
 	FR_INVALID_OBJECT,		/* (9) The file/directory object is invalid */
 	FR_WRITE_PROTECTED,		/* (10) The physical drive is write protected */
 	FR_INVALID_DRIVE,		/* (11) The logical drive number is invalid */
@@ -191,7 +192,7 @@ typedef enum {
 	FR_NO_FILESYSTEM,		/* (13) There is no valid FAT volume */
 	FR_MKFS_ABORTED,		/* (14) The f_mkfs() aborted due to any parameter error */
 	FR_TIMEOUT,				/* (15) Could not get a grant to access the volume within defined period */
-	FR_LOCKED,				/* (16) The operation is rejected according to the file shareing policy */
+	FR_LOCKED,				/* (16) The operation is rejected according to the file sharing policy */
 	FR_NOT_ENOUGH_CORE,		/* (17) LFN working buffer could not be allocated */
 	FR_TOO_MANY_OPEN_FILES,	/* (18) Number of open files > _FS_SHARE */
 	FR_INVALID_PARAMETER	/* (19) Given parameter is invalid */
@@ -202,33 +203,35 @@ typedef enum {
 /*--------------------------------------------------------------*/
 /* FatFs module application interface                           */
 
-FRESULT f_mount (BYTE, FATFS*);						/* Mount/Unmount a logical drive */
-FRESULT f_open (FIL*, const TCHAR*, BYTE);			/* Open or create a file */
-FRESULT f_read (FIL*, void*, UINT, UINT*);			/* Read data from a file */
-FRESULT f_lseek (FIL*, DWORD);						/* Move file pointer of a file object */
-FRESULT f_close (FIL*);								/* Close an open file object */
-FRESULT f_opendir (DIR*, const TCHAR*);				/* Open an existing directory */
-FRESULT f_readdir (DIR*, FILINFO*);					/* Read a directory item */
-FRESULT f_stat (const TCHAR*, FILINFO*);			/* Get file status */
-FRESULT f_write (FIL*, const void*, UINT, UINT*);	/* Write data to a file */
-FRESULT f_getfree (const TCHAR*, DWORD*, FATFS**);	/* Get number of free clusters on the drive */
-FRESULT f_truncate (FIL*);							/* Truncate file */
-FRESULT f_sync (FIL*);								/* Flush cached data of a writing file */
-FRESULT f_unlink (const TCHAR*);					/* Delete an existing file or directory */
-FRESULT	f_mkdir (const TCHAR*);						/* Create a new directory */
-FRESULT f_chmod (const TCHAR*, BYTE, BYTE);			/* Change attriburte of the file/dir */
-FRESULT f_utime (const TCHAR*, const FILINFO*);		/* Change timestamp of the file/dir */
-FRESULT f_rename (const TCHAR*, const TCHAR*);		/* Rename/Move a file or directory */
-FRESULT f_chdrive (BYTE);							/* Change current drive */
-FRESULT f_chdir (const TCHAR*);						/* Change current directory */
-FRESULT f_getcwd (TCHAR*, UINT);					/* Get current directory */
-FRESULT f_forward (FIL*, UINT(*)(const BYTE*,UINT), UINT, UINT*);	/* Forward data to the stream */
-FRESULT f_mkfs (BYTE, BYTE, UINT);					/* Create a file system on the drive */
-FRESULT	f_fdisk (BYTE, const DWORD[], void*);		/* Divide a physical drive into some partitions */
-int f_putc (TCHAR, FIL*);							/* Put a character to the file */
-int f_puts (const TCHAR*, FIL*);					/* Put a string to the file */
-int f_printf (FIL*, const TCHAR*, ...);				/* Put a formatted string to the file */
-TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
+FRESULT f_mount (BYTE vol, FATFS* fs);								/* Mount/Unmount a logical drive */
+FRESULT f_open (FIL* fp, const TCHAR* path, BYTE mode);				/* Open or create a file */
+FRESULT f_read (FIL* fp, void* buff, UINT btr, UINT* br);			/* Read data from a file */
+FRESULT f_lseek (FIL* fp, DWORD ofs);								/* Move file pointer of a file object */
+FRESULT f_close (FIL* fp);											/* Close an open file object */
+FRESULT f_opendir (DIR* dj, const TCHAR* path);						/* Open an existing directory */
+FRESULT f_readdir (DIR* dj, FILINFO* fno);							/* Read a directory item */
+FRESULT f_stat (const TCHAR* path, FILINFO* fno);					/* Get file status */
+FRESULT f_write (FIL* fp, const void* buff, UINT btw, UINT* bw);	/* Write data to a file */
+FRESULT f_getfree (const TCHAR* path, DWORD* nclst, FATFS** fatfs);	/* Get number of free clusters on the drive */
+FRESULT f_truncate (FIL* fp);										/* Truncate file */
+FRESULT f_sync (FIL* fp);											/* Flush cached data of a writing file */
+FRESULT f_unlink (const TCHAR* path);								/* Delete an existing file or directory */
+FRESULT	f_mkdir (const TCHAR* path);								/* Create a new directory */
+FRESULT f_chmod (const TCHAR* path, BYTE value, BYTE mask);			/* Change attribute of the file/dir */
+FRESULT f_utime (const TCHAR* path, const FILINFO* fno);			/* Change times-tamp of the file/dir */
+FRESULT f_rename (const TCHAR* path_old, const TCHAR* path_new);	/* Rename/Move a file or directory */
+FRESULT f_chdrive (BYTE drv);										/* Change current drive */
+FRESULT f_chdir (const TCHAR* path);								/* Change current directory */
+FRESULT f_getcwd (TCHAR* buff, UINT len);							/* Get current directory */
+FRESULT	f_getlabel (const TCHAR* path, TCHAR* label, DWORD* sn);	/* Get volume label */
+FRESULT	f_setlabel (const TCHAR* label);							/* Set volume label */
+FRESULT f_forward (FIL* fp, UINT(*func)(const BYTE*,UINT), UINT btf, UINT* bf);	/* Forward data to the stream */
+FRESULT f_mkfs (BYTE vol, BYTE sfd, UINT au);						/* Create a file system on the drive */
+FRESULT	f_fdisk (BYTE pdrv, const DWORD szt[], void* work);			/* Divide a physical drive into some partitions */
+int f_putc (TCHAR c, FIL* fp);										/* Put a character to the file */
+int f_puts (const TCHAR* str, FIL* cp);								/* Put a string to the file */
+int f_printf (FIL* fp, const TCHAR* str, ...);						/* Put a formatted string to the file */
+TCHAR* f_gets (TCHAR* buff, int len, FIL* fp);						/* Get a string from the file */
 
 #define f_eof(fp) (((fp)->fptr == (fp)->fsize) ? 1 : 0)
 #define f_error(fp) (((fp)->flag & FA__ERROR) ? 1 : 0)
@@ -251,21 +254,21 @@ DWORD get_fattime (void);
 #endif
 
 /* Unicode support functions */
-#if _USE_LFN						/* Unicode - OEM code conversion */
-WCHAR ff_convert (WCHAR, UINT);		/* OEM-Unicode bidirectional conversion */
-WCHAR ff_wtoupper (WCHAR);			/* Unicode upper-case conversion */
-#if _USE_LFN == 3					/* Memory functions */
-void* ff_memalloc (UINT);			/* Allocate memory block */
-void ff_memfree (void*);			/* Free memory block */
+#if _USE_LFN							/* Unicode - OEM code conversion */
+WCHAR ff_convert (WCHAR chr, UINT dir);	/* OEM-Unicode bidirectional conversion */
+WCHAR ff_wtoupper (WCHAR chr);			/* Unicode upper-case conversion */
+#if _USE_LFN == 3						/* Memory functions */
+void* ff_memalloc (UINT msize);			/* Allocate memory block */
+void ff_memfree (void* mblock);			/* Free memory block */
 #endif
 #endif
 
 /* Sync functions */
 #if _FS_REENTRANT
-int ff_cre_syncobj (BYTE, _SYNC_t*);/* Create a sync object */
-int ff_req_grant (_SYNC_t);			/* Lock sync object */
-void ff_rel_grant (_SYNC_t);		/* Unlock sync object */
-int ff_del_syncobj (_SYNC_t);		/* Delete a sync object */
+int ff_cre_syncobj (BYTE vol, _SYNC_t* sobj);	/* Create a sync object */
+int ff_req_grant (_SYNC_t sobj);				/* Lock sync object */
+void ff_rel_grant (_SYNC_t sobj);				/* Unlock sync object */
+int ff_del_syncobj (_SYNC_t sobj);				/* Delete a sync object */
 #endif
 
 

src/FatFs/ffconf.h

@@ -1,5 +1,5 @@
 /*---------------------------------------------------------------------------/
-/  FatFs - FAT file system module configuration file  R0.09  (C)ChaN, 2011
+/  FatFs - FAT file system module configuration file  R0.09b (C)ChaN, 2013
 /----------------------------------------------------------------------------/
 /
 / CAUTION! Do not forget to make clean the project after any changes to
@@ -7,7 +7,7 @@
 /
 /----------------------------------------------------------------------------*/
 #ifndef _FFCONF
-#define _FFCONF 6502	/* Revision ID */
+#define _FFCONF 82786	/* Revision ID */
 
 #if defined(CPUARM) && !defined(SIMU)
 #ifdef __cplusplus
@@ -53,14 +53,17 @@ extern "C" {
 /* To enable f_mkfs function, set _USE_MKFS to 1 and set _FS_READONLY to 0 */
 
 
-#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */
-/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */
-
-
 #define	_USE_FASTSEEK	0	/* 0:Disable or 1:Enable */
 /* To enable fast seek feature, set _USE_FASTSEEK to 1. */
 
 
+#define _USE_LABEL	0	/* 0:Disable or 1:Enable */
+/* To enable volume label functions, set _USE_LAVEL to 1 */
+
+
+#define	_USE_FORWARD	0	/* 0:Disable or 1:Enable */
+/* To enable f_forward function, set _USE_FORWARD to 1 and set _FS_TINY to 1. */
+
 
 /*---------------------------------------------------------------------------/
 / Locale and Namespace Configurations
@@ -99,11 +102,11 @@ extern "C" {
 */
 
 #if defined(CPUARM)
-#define	_USE_LFN	2		/* 0 to 3 */
-#define _MAX_LFN        255             /* Maximum LFN length to handle (12 to 255) */
+  #define _USE_LFN	2		/* 0 to 3 */
+  #define _MAX_LFN      255             /* Maximum LFN length to handle (12 to 255) */
 #else
-#define _USE_LFN        1               /* 0 to 3 */
-#define _MAX_LFN        32              /* Maximum LFN length to handle (12 to 255) */
+  #define _USE_LFN      1               /* 0 to 3 */
+  #define _MAX_LFN      32              /* Maximum LFN length to handle (12 to 255) */
 #endif
 
 /* The _USE_LFN option switches the LFN support.
@@ -124,7 +127,7 @@ extern "C" {
 /  enable LFN feature and set _LFN_UNICODE to 1. */
 
 
-#define _FS_RPATH		2	/* 0 to 2 */
+#define _FS_RPATH	2	/* 0 to 2 */
 /* The _FS_RPATH option configures relative path feature.
 /
 /   0: Disable relative path feature and remove related functions.
@@ -134,7 +137,6 @@ extern "C" {
 /  Note that output of the f_readdir fnction is affected by this option. */
 
 
-
 /*---------------------------------------------------------------------------/
 / Physical Drive Configurations
 /----------------------------------------------------------------------------*/
@@ -151,7 +153,7 @@ extern "C" {
 /  and GET_SECTOR_SIZE command must be implememted to the disk_ioctl function. */
 
 
-#define	_MULTI_PARTITION	0	/* 0:Single partition, 1/2:Enable multiple partition */
+#define	_MULTI_PARTITION	0	/* 0:Single partition, 1:Enable multiple partition */
 /* When set to 0, each volume is bound to the same physical drive number and
 / it can mount only first primaly partition. When it is set to 1, each volume
 / is tied to the partitions listed in VolToPart[]. */
@@ -185,12 +187,13 @@ extern "C" {
 /  windows.h, ucos_ii.h and semphr.h, must be included prior to ff.h. */
 
 #if defined(CPUARM)
-#define _FS_REENTRANT		1	   /* 0:Disable or 1:Enable */
+  #define _FS_REENTRANT		1	   /* 0:Disable or 1:Enable */
+  #define _SYNC_t               unsigned char /*OS_MutexID*/       /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
 #else
-#define _FS_REENTRANT		0	   /* 0:Disable or 1:Enable */
+  #define _FS_REENTRANT		0	   /* 0:Disable or 1:Enable */
 #endif
+
 #define _FS_TIMEOUT		1000	   /* Timeout period in unit of time ticks */
-#define	_SYNC_t			OS_MutexID /* O/S dependent type of sync object. e.g. HANDLE, OS_EVENT*, ID and etc.. */
 
 /* The _FS_REENTRANT option switches the reentrancy (thread safe) of the FatFs module.
 /
@@ -199,10 +202,10 @@ extern "C" {
 /      ff_req_grant, ff_rel_grant, ff_del_syncobj and ff_cre_syncobj
 /      function must be added to the project. */
 
-#define	_FS_SHARE	0	/* 0:Disable or >=1:Enable */
 
-/* To enable file shareing feature, set _FS_SHARE to 1 or greater. The value
-   defines how many files can be opened simultaneously. */
+#define	_FS_LOCK	0	/* 0:Disable or >=1:Enable */
+/* To enable file lock control feature, set _FS_LOCK to 1 or greater.
+   The value defines how many files can be opened simultaneously. */
 
 
 #endif /* _FFCONFIG */

src/FatFs/option/cc932.c

@@ -3724,7 +3724,7 @@ const WCHAR sjis2uni[] = {
 
 
 WCHAR ff_convert (	/* Converted code, 0 means conversion error */
-	WCHAR	src,	/* Character code to be converted */
+	WCHAR	chr,	/* Character code to be converted */
 	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
@@ -3733,8 +3733,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 	int i, n, li, hi;
 
 
-	if (src <= 0x80) {	/* ASCII */
-		c = src;
+	if (chr <= 0x80) {	/* ASCII */
+		c = chr;
 	} else {
 #if !_TINY_TABLE
 		if (dir) {		/* OEMCP to unicode */
@@ -3747,8 +3747,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 		li = 0;
 		for (n = 16; n; n--) {
 			i = li + (hi - li) / 2;
-			if (src == p[i * 2]) break;
-			if (src > p[i * 2])
+			if (chr == p[i * 2]) break;
+			if (chr > p[i * 2])
 				li = i;
 			else
 				hi = i;
@@ -3760,15 +3760,15 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 			do {
 				c = *p;
 				p += 2;
-			} while (c && c != src);
+			} while (c && c != chr);
 			p -= 3;
 			c = *p;
 		} else {		/* Unicode to OEMCP */
 			li = 0; hi = sizeof(uni2sjis) / 4 - 1;
 			for (n = 16; n; n--) {
 				i = li + (hi - li) / 2;
-				if (src == uni2sjis[i * 2]) break;
-				if (src > uni2sjis[i * 2])
+				if (chr == uni2sjis[i * 2]) break;
+				if (chr > uni2sjis[i * 2])
 					li = i;
 				else
 					hi = i;

src/FatFs/option/cc936.c

@@ -10922,7 +10922,7 @@ const WCHAR oem2uni[] = {
 
 
 WCHAR ff_convert (	/* Converted code, 0 means conversion error */
-	WCHAR	src,	/* Character code to be converted */
+	WCHAR	chr,	/* Character code to be converted */
 	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
@@ -10931,8 +10931,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 	int i, n, li, hi;
 
 
-	if (src < 0x80) {	/* ASCII */
-		c = src;
+	if (chr < 0x80) {	/* ASCII */
+		c = chr;
 	} else {
 		if (dir) {		/* OEMCP to unicode */
 			p = oem2uni;
@@ -10944,8 +10944,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 		li = 0;
 		for (n = 16; n; n--) {
 			i = li + (hi - li) / 2;
-			if (src == p[i * 2]) break;
-			if (src > p[i * 2])
+			if (chr == p[i * 2]) break;
+			if (chr > p[i * 2])
 				li = i;
 			else
 				hi = i;

src/FatFs/option/cc949.c

@@ -8551,7 +8551,7 @@ const WCHAR oem2uni[] = {
 
 
 WCHAR ff_convert (	/* Converted code, 0 means conversion error */
-	WCHAR	src,	/* Character code to be converted */
+	WCHAR	chr,	/* Character code to be converted */
 	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
@@ -8560,8 +8560,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 	int i, n, li, hi;
 
 
-	if (src < 0x80) {	/* ASCII */
-		c = src;
+	if (chr < 0x80) {	/* ASCII */
+		c = chr;
 	} else {
 		if (dir) {		/* OEMCP to unicode */
 			p = oem2uni;
@@ -8573,8 +8573,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 		li = 0;
 		for (n = 16; n; n--) {
 			i = li + (hi - li) / 2;
-			if (src == p[i * 2]) break;
-			if (src > p[i * 2])
+			if (chr == p[i * 2]) break;
+			if (chr > p[i * 2])
 				li = i;
 			else
 				hi = i;

src/FatFs/option/cc950.c

@@ -6777,7 +6777,7 @@ const WCHAR oem2uni[] = {
 
 
 WCHAR ff_convert (	/* Converted code, 0 means conversion error */
-	WCHAR	src,	/* Character code to be converted */
+	WCHAR	chr,	/* Character code to be converted */
 	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
@@ -6786,8 +6786,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 	int i, n, li, hi;
 
 
-	if (src < 0x80) {	/* ASCII */
-		c = src;
+	if (chr < 0x80) {	/* ASCII */
+		c = chr;
 	} else {
 		if (dir) {		/* OEMCP to unicode */
 			p = oem2uni;
@@ -6799,8 +6799,8 @@ WCHAR ff_convert (	/* Converted code, 0 means conversion error */
 		li = 0;
 		for (n = 16; n; n--) {
 			i = li + (hi - li) / 2;
-			if (src == p[i * 2]) break;
-			if (src > p[i * 2])
+			if (chr == p[i * 2]) break;
+			if (chr > p[i * 2])
 				li = i;
 			else
 				hi = i;

src/FatFs/option/ccsbcs.c

@@ -1,5 +1,5 @@
 /*------------------------------------------------------------------------*/
-/* Unicode - Local code bidirectional converter  (C)ChaN, 2009            */
+/* Unicode - Local code bidirectional converter  (C)ChaN, 2012            */
 /* (SBCS code pages)                                                      */
 /*------------------------------------------------------------------------*/
 /*  437   U.S. (OEM)
@@ -68,7 +68,7 @@ const WCHAR Tbl[] = {	/*  CP720(0x80-0xFF) to Unicode conversion table */
 	0x256A, 0x2518, 0x250C, 0x2588, 0x2584, 0x258C, 0x2590, 0x2580,
 	0x0636, 0x0637, 0x0638, 0x0639, 0x063A, 0x0641, 0x00B5, 0x0642,
 	0x0643, 0x0644, 0x0645, 0x0646, 0x0647, 0x0648, 0x0649, 0x064A,
-	0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0xO650, 0x2248,
+	0x2261, 0x064B, 0x064C, 0x064D, 0x064E, 0x064F, 0x0650, 0x2248,
 	0x00B0, 0x2219, 0x00B7, 0x221A, 0x207F, 0x00B2, 0x25A0, 0x00A0
 };
 
@@ -499,23 +499,23 @@ const WCHAR Tbl[] = {	/*  CP1258(0x80-0xFF) to Unicode conversion table */
 
 
 WCHAR ff_convert (	/* Converted character, Returns zero on error */
-	WCHAR	src,	/* Character code to be converted */
+	WCHAR	chr,	/* Character code to be converted */
 	UINT	dir		/* 0: Unicode to OEMCP, 1: OEMCP to Unicode */
 )
 {
 	WCHAR c;
 
 
-	if (src < 0x80) {	/* ASCII */
-		c = src;
+	if (chr < 0x80) {	/* ASCII */
+		c = chr;
 
 	} else {
 		if (dir) {		/* OEMCP to Unicode */
-			c = (src >= 0x100) ? 0 : Tbl[src - 0x80];
+			c = (chr >= 0x100) ? 0 : Tbl[chr - 0x80];
 
 		} else {		/* Unicode to OEMCP */
 			for (c = 0; c < 0x80; c++) {
-				if (src == Tbl[c]) break;
+				if (chr == Tbl[c]) break;
 			}
 			c = (c + 0x80) & 0xFF;
 		}

src/FatFs/option/syscall.c

@@ -1,6 +1,6 @@
 /*------------------------------------------------------------------------*/
-/* Sample code of OS dependent controls for FatFs R0.08b                  */
-/* (C)ChaN, 2011                                                          */
+/* Sample code of OS dependent controls for FatFs                         */
+/* (C)ChaN, 2012                                                          */
 /*------------------------------------------------------------------------*/
 
 #include <stdlib.h>		/* ANSI memory controls */
@@ -14,27 +14,31 @@
 /* Create a Synchronization Object
 /*------------------------------------------------------------------------*/
 /* This function is called in f_mount function to create a new
-/  synchronization object, such as semaphore and mutex. When a zero is
+/  synchronization object, such as semaphore and mutex. When a FALSE is
 /  returned, the f_mount function fails with FR_INT_ERR.
 */
 
-int ff_cre_syncobj (	/* TRUE:Function succeeded, FALSE:Could not create due to any error */
+int ff_cre_syncobj (	/* 1:Function succeeded, 0:Could not create due to any error */
 	BYTE vol,			/* Corresponding logical drive being processed */
 	_SYNC_t *sobj		/* Pointer to return the created sync object */
 )
 {
 	int ret;
+//	static _SYNC_t sem[_VOLUMES];	/* FreeRTOS */
 
-	*sobj = CreateMutex(NULL, FALSE, NULL);	/* Win32 */
+
+	*sobj = CreateMutex(NULL, FALSE, NULL);		/* Win32 */
 	ret = (*sobj != INVALID_HANDLE_VALUE);
 
-//	*sobj = SyncObjects[vol];	/* uITRON (give a static sync object) */
-//	ret = 1;					/* The initial value of the semaphore must be 1. */
+//	*sobj = SyncObjects[vol];		/* uITRON (give a static created sync object) */
+//	ret = 1;						/* The initial value of the semaphore must be 1. */
 
-//	*sobj = OSMutexCreate(0, &err);			/* uC/OS-II */
+//	*sobj = OSMutexCreate(0, &err);	/* uC/OS-II */
 //	ret = (err == OS_NO_ERR);
 
-//	*sobj = xSemaphoreCreateMutex();		/* FreeRTOS */
+//  if (!sem[vol])					/* FreeRTOS */
+//		sem[vol] = xSemaphoreCreateMutex();
+//	*sobj = sem[vol];
 //	ret = (*sobj != NULL);
 
 	return ret;
@@ -46,15 +50,16 @@ int ff_cre_syncobj (	/* TRUE:Function succeeded, FALSE:Could not create due to a
 /* Delete a Synchronization Object                                        */
 /*------------------------------------------------------------------------*/
 /* This function is called in f_mount function to delete a synchronization
-/  object that created with ff_cre_syncobj function. When a zero is
+/  object that created with ff_cre_syncobj function. When a FALSE is
 /  returned, the f_mount function fails with FR_INT_ERR.
 */
 
-int ff_del_syncobj (	/* TRUE:Function succeeded, FALSE:Could not delete due to any error */
+int ff_del_syncobj (	/* 1:Function succeeded, 0:Could not delete due to any error */
 	_SYNC_t sobj		/* Sync object tied to the logical drive to be deleted */
 )
 {
-	BOOL ret;
+	int ret;
+
 
 	ret = CloseHandle(sobj);	/* Win32 */
 
@@ -74,7 +79,7 @@ int ff_del_syncobj (	/* TRUE:Function succeeded, FALSE:Could not delete due to a
 /* Request Grant to Access the Volume                                     */
 /*------------------------------------------------------------------------*/
 /* This function is called on entering file functions to lock the volume.
-/  When a zero is returned, the file function fails with FR_TIMEOUT.
+/  When a FALSE is returned, the file function fails with FR_TIMEOUT.
 */
 
 int ff_req_grant (	/* TRUE:Got a grant to access the volume, FALSE:Could not get a grant */
@@ -85,9 +90,9 @@ int ff_req_grant (	/* TRUE:Got a grant to access the volume, FALSE:Could not get
 
 	ret = (WaitForSingleObject(sobj, _FS_TIMEOUT) == WAIT_OBJECT_0);	/* Win32 */
 
-//	ret = (wai_sem(sobj) == E_OK);	/* uITRON */
+//	ret = (wai_sem(sobj) == E_OK);				/* uITRON */
 
-//	OSMutexPend(sobj, _FS_TIMEOUT, &err));			/* uC/OS-II */
+//	OSMutexPend(sobj, _FS_TIMEOUT, &err));		/* uC/OS-II */
 //	ret = (err == OS_NO_ERR);
 
 //	ret = (xSemaphoreTake(sobj, _FS_TIMEOUT) == pdTRUE);	/* FreeRTOS */
@@ -114,7 +119,6 @@ void ff_rel_grant (
 //	OSMutexPost(sobj);		/* uC/OS-II */
 
 //	xSemaphoreGive(sobj);	/* FreeRTOS */
-
 }
 
 #endif
@@ -130,10 +134,10 @@ void ff_rel_grant (
 */
 
 void* ff_memalloc (	/* Returns pointer to the allocated memory block */
-	UINT size		/* Number of bytes to allocate */
+	UINT msize		/* Number of bytes to allocate */
 )
 {
-	return malloc(size);
+	return malloc(msize);
 }
 
 
@@ -141,7 +145,7 @@ void* ff_memalloc (	/* Returns pointer to the allocated memory block */
 /* Free a memory block                                                    */
 /*------------------------------------------------------------------------*/
 
-void ff_memfree(
+void ff_memfree (
 	void* mblock	/* Pointer to the memory block to free */
 )
 {

src/FatFs/option/unicode.c

@@ -0,0 +1,17 @@
+#include "../ff.h"
+
+#if _USE_LFN != 0
+
+#if   _CODE_PAGE == 932
+#include "cc932.c"
+#elif _CODE_PAGE == 936
+#include "cc936.c"
+#elif _CODE_PAGE == 949
+#include "cc949.c"
+#elif _CODE_PAGE == 950
+#include "cc950.c"
+#else
+#include "ccsbcs.c"
+#endif
+
+#endif

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_ahrs.h

@@ -89,7 +89,7 @@ static inline uint16_t mavlink_msg_ahrs_pack(uint8_t system_id, uint8_t componen
  * @brief Pack a ahrs message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param omegaIx X gyro drift estimate rad/s
  * @param omegaIy Y gyro drift estimate rad/s
@@ -137,7 +137,7 @@ static inline uint16_t mavlink_msg_ahrs_pack_chan(uint8_t system_id, uint8_t com
 }
 
 /**
- * @brief Encode a ahrs struct into a message
+ * @brief Encode a ahrs struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -149,6 +149,20 @@ static inline uint16_t mavlink_msg_ahrs_encode(uint8_t system_id, uint8_t compon
 	return mavlink_msg_ahrs_pack(system_id, component_id, msg, ahrs->omegaIx, ahrs->omegaIy, ahrs->omegaIz, ahrs->accel_weight, ahrs->renorm_val, ahrs->error_rp, ahrs->error_yaw);
 }
 
+/**
+ * @brief Encode a ahrs struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param ahrs C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_ahrs_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_ahrs_t* ahrs)
+{
+	return mavlink_msg_ahrs_pack_chan(system_id, component_id, chan, msg, ahrs->omegaIx, ahrs->omegaIy, ahrs->omegaIz, ahrs->accel_weight, ahrs->renorm_val, ahrs->error_rp, ahrs->error_yaw);
+}
+
 /**
  * @brief Send a ahrs message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_ap_adc.h

@@ -84,7 +84,7 @@ static inline uint16_t mavlink_msg_ap_adc_pack(uint8_t system_id, uint8_t compon
  * @brief Pack a ap_adc message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param adc1 ADC output 1
  * @param adc2 ADC output 2
@@ -129,7 +129,7 @@ static inline uint16_t mavlink_msg_ap_adc_pack_chan(uint8_t system_id, uint8_t c
 }
 
 /**
- * @brief Encode a ap_adc struct into a message
+ * @brief Encode a ap_adc struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -141,6 +141,20 @@ static inline uint16_t mavlink_msg_ap_adc_encode(uint8_t system_id, uint8_t comp
 	return mavlink_msg_ap_adc_pack(system_id, component_id, msg, ap_adc->adc1, ap_adc->adc2, ap_adc->adc3, ap_adc->adc4, ap_adc->adc5, ap_adc->adc6);
 }
 
+/**
+ * @brief Encode a ap_adc struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param ap_adc C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_ap_adc_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_ap_adc_t* ap_adc)
+{
+	return mavlink_msg_ap_adc_pack_chan(system_id, component_id, chan, msg, ap_adc->adc1, ap_adc->adc2, ap_adc->adc3, ap_adc->adc4, ap_adc->adc5, ap_adc->adc6);
+}
+
 /**
  * @brief Send a ap_adc message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_data16.h

@@ -67,7 +67,7 @@ static inline uint16_t mavlink_msg_data16_pack(uint8_t system_id, uint8_t compon
  * @brief Pack a data16 message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param type data type
  * @param len data length
@@ -101,7 +101,7 @@ static inline uint16_t mavlink_msg_data16_pack_chan(uint8_t system_id, uint8_t c
 }
 
 /**
- * @brief Encode a data16 struct into a message
+ * @brief Encode a data16 struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -113,6 +113,20 @@ static inline uint16_t mavlink_msg_data16_encode(uint8_t system_id, uint8_t comp
 	return mavlink_msg_data16_pack(system_id, component_id, msg, data16->type, data16->len, data16->data);
 }
 
+/**
+ * @brief Encode a data16 struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param data16 C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_data16_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_data16_t* data16)
+{
+	return mavlink_msg_data16_pack_chan(system_id, component_id, chan, msg, data16->type, data16->len, data16->data);
+}
+
 /**
  * @brief Send a data16 message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_data32.h

@@ -67,7 +67,7 @@ static inline uint16_t mavlink_msg_data32_pack(uint8_t system_id, uint8_t compon
  * @brief Pack a data32 message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param type data type
  * @param len data length
@@ -101,7 +101,7 @@ static inline uint16_t mavlink_msg_data32_pack_chan(uint8_t system_id, uint8_t c
 }
 
 /**
- * @brief Encode a data32 struct into a message
+ * @brief Encode a data32 struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -113,6 +113,20 @@ static inline uint16_t mavlink_msg_data32_encode(uint8_t system_id, uint8_t comp
 	return mavlink_msg_data32_pack(system_id, component_id, msg, data32->type, data32->len, data32->data);
 }
 
+/**
+ * @brief Encode a data32 struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param data32 C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_data32_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_data32_t* data32)
+{
+	return mavlink_msg_data32_pack_chan(system_id, component_id, chan, msg, data32->type, data32->len, data32->data);
+}
+
 /**
  * @brief Send a data32 message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_data64.h

@@ -67,7 +67,7 @@ static inline uint16_t mavlink_msg_data64_pack(uint8_t system_id, uint8_t compon
  * @brief Pack a data64 message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param type data type
  * @param len data length
@@ -101,7 +101,7 @@ static inline uint16_t mavlink_msg_data64_pack_chan(uint8_t system_id, uint8_t c
 }
 
 /**
- * @brief Encode a data64 struct into a message
+ * @brief Encode a data64 struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -113,6 +113,20 @@ static inline uint16_t mavlink_msg_data64_encode(uint8_t system_id, uint8_t comp
 	return mavlink_msg_data64_pack(system_id, component_id, msg, data64->type, data64->len, data64->data);
 }
 
+/**
+ * @brief Encode a data64 struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param data64 C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_data64_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_data64_t* data64)
+{
+	return mavlink_msg_data64_pack_chan(system_id, component_id, chan, msg, data64->type, data64->len, data64->data);
+}
+
 /**
  * @brief Send a data64 message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_data96.h

@@ -67,7 +67,7 @@ static inline uint16_t mavlink_msg_data96_pack(uint8_t system_id, uint8_t compon
  * @brief Pack a data96 message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param type data type
  * @param len data length
@@ -101,7 +101,7 @@ static inline uint16_t mavlink_msg_data96_pack_chan(uint8_t system_id, uint8_t c
 }
 
 /**
- * @brief Encode a data96 struct into a message
+ * @brief Encode a data96 struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -113,6 +113,20 @@ static inline uint16_t mavlink_msg_data96_encode(uint8_t system_id, uint8_t comp
 	return mavlink_msg_data96_pack(system_id, component_id, msg, data96->type, data96->len, data96->data);
 }
 
+/**
+ * @brief Encode a data96 struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param data96 C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_data96_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_data96_t* data96)
+{
+	return mavlink_msg_data96_pack_chan(system_id, component_id, chan, msg, data96->type, data96->len, data96->data);
+}
+
 /**
  * @brief Send a data96 message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_digicam_configure.h

@@ -109,7 +109,7 @@ static inline uint16_t mavlink_msg_digicam_configure_pack(uint8_t system_id, uin
  * @brief Pack a digicam_configure message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -169,7 +169,7 @@ static inline uint16_t mavlink_msg_digicam_configure_pack_chan(uint8_t system_id
 }
 
 /**
- * @brief Encode a digicam_configure struct into a message
+ * @brief Encode a digicam_configure struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -181,6 +181,20 @@ static inline uint16_t mavlink_msg_digicam_configure_encode(uint8_t system_id, u
 	return mavlink_msg_digicam_configure_pack(system_id, component_id, msg, digicam_configure->target_system, digicam_configure->target_component, digicam_configure->mode, digicam_configure->shutter_speed, digicam_configure->aperture, digicam_configure->iso, digicam_configure->exposure_type, digicam_configure->command_id, digicam_configure->engine_cut_off, digicam_configure->extra_param, digicam_configure->extra_value);
 }
 
+/**
+ * @brief Encode a digicam_configure struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param digicam_configure C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_digicam_configure_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_digicam_configure_t* digicam_configure)
+{
+	return mavlink_msg_digicam_configure_pack_chan(system_id, component_id, chan, msg, digicam_configure->target_system, digicam_configure->target_component, digicam_configure->mode, digicam_configure->shutter_speed, digicam_configure->aperture, digicam_configure->iso, digicam_configure->exposure_type, digicam_configure->command_id, digicam_configure->engine_cut_off, digicam_configure->extra_param, digicam_configure->extra_value);
+}
+
 /**
  * @brief Send a digicam_configure message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_digicam_control.h

@@ -104,7 +104,7 @@ static inline uint16_t mavlink_msg_digicam_control_pack(uint8_t system_id, uint8
  * @brief Pack a digicam_control message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -161,7 +161,7 @@ static inline uint16_t mavlink_msg_digicam_control_pack_chan(uint8_t system_id,
 }
 
 /**
- * @brief Encode a digicam_control struct into a message
+ * @brief Encode a digicam_control struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -173,6 +173,20 @@ static inline uint16_t mavlink_msg_digicam_control_encode(uint8_t system_id, uin
 	return mavlink_msg_digicam_control_pack(system_id, component_id, msg, digicam_control->target_system, digicam_control->target_component, digicam_control->session, digicam_control->zoom_pos, digicam_control->zoom_step, digicam_control->focus_lock, digicam_control->shot, digicam_control->command_id, digicam_control->extra_param, digicam_control->extra_value);
 }
 
+/**
+ * @brief Encode a digicam_control struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param digicam_control C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_digicam_control_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_digicam_control_t* digicam_control)
+{
+	return mavlink_msg_digicam_control_pack_chan(system_id, component_id, chan, msg, digicam_control->target_system, digicam_control->target_component, digicam_control->session, digicam_control->zoom_pos, digicam_control->zoom_step, digicam_control->focus_lock, digicam_control->shot, digicam_control->command_id, digicam_control->extra_param, digicam_control->extra_value);
+}
+
 /**
  * @brief Send a digicam_control message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_fence_fetch_point.h

@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_fence_fetch_point_pack(uint8_t system_id, uin
  * @brief Pack a fence_fetch_point message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -105,7 +105,7 @@ static inline uint16_t mavlink_msg_fence_fetch_point_pack_chan(uint8_t system_id
 }
 
 /**
- * @brief Encode a fence_fetch_point struct into a message
+ * @brief Encode a fence_fetch_point struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -117,6 +117,20 @@ static inline uint16_t mavlink_msg_fence_fetch_point_encode(uint8_t system_id, u
 	return mavlink_msg_fence_fetch_point_pack(system_id, component_id, msg, fence_fetch_point->target_system, fence_fetch_point->target_component, fence_fetch_point->idx);
 }
 
+/**
+ * @brief Encode a fence_fetch_point struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param fence_fetch_point C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_fence_fetch_point_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_fence_fetch_point_t* fence_fetch_point)
+{
+	return mavlink_msg_fence_fetch_point_pack_chan(system_id, component_id, chan, msg, fence_fetch_point->target_system, fence_fetch_point->target_component, fence_fetch_point->idx);
+}
+
 /**
  * @brief Send a fence_fetch_point message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_fence_point.h

@@ -84,7 +84,7 @@ static inline uint16_t mavlink_msg_fence_point_pack(uint8_t system_id, uint8_t c
  * @brief Pack a fence_point message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -129,7 +129,7 @@ static inline uint16_t mavlink_msg_fence_point_pack_chan(uint8_t system_id, uint
 }
 
 /**
- * @brief Encode a fence_point struct into a message
+ * @brief Encode a fence_point struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -141,6 +141,20 @@ static inline uint16_t mavlink_msg_fence_point_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_fence_point_pack(system_id, component_id, msg, fence_point->target_system, fence_point->target_component, fence_point->idx, fence_point->count, fence_point->lat, fence_point->lng);
 }
 
+/**
+ * @brief Encode a fence_point struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param fence_point C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_fence_point_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_fence_point_t* fence_point)
+{
+	return mavlink_msg_fence_point_pack_chan(system_id, component_id, chan, msg, fence_point->target_system, fence_point->target_component, fence_point->idx, fence_point->count, fence_point->lat, fence_point->lng);
+}
+
 /**
  * @brief Send a fence_point message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_fence_status.h

@@ -74,7 +74,7 @@ static inline uint16_t mavlink_msg_fence_status_pack(uint8_t system_id, uint8_t
  * @brief Pack a fence_status message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param breach_status 0 if currently inside fence, 1 if outside
  * @param breach_count number of fence breaches
@@ -113,7 +113,7 @@ static inline uint16_t mavlink_msg_fence_status_pack_chan(uint8_t system_id, uin
 }
 
 /**
- * @brief Encode a fence_status struct into a message
+ * @brief Encode a fence_status struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -125,6 +125,20 @@ static inline uint16_t mavlink_msg_fence_status_encode(uint8_t system_id, uint8_
 	return mavlink_msg_fence_status_pack(system_id, component_id, msg, fence_status->breach_status, fence_status->breach_count, fence_status->breach_type, fence_status->breach_time);
 }
 
+/**
+ * @brief Encode a fence_status struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param fence_status C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_fence_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_fence_status_t* fence_status)
+{
+	return mavlink_msg_fence_status_pack_chan(system_id, component_id, chan, msg, fence_status->breach_status, fence_status->breach_count, fence_status->breach_type, fence_status->breach_time);
+}
+
 /**
  * @brief Send a fence_status message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_fenced_fetch_point.h

@@ -1,144 +0,0 @@
-// MESSAGE FENCED_FETCH_POINT PACKING
-
-#define MAVLINK_MSG_ID_FENCED_FETCH_POINT 161
-
-typedef struct __mavlink_fenced_fetch_point_t
-{
- uint8_t idx; ///< point index (first point is 1, 0 is for return point)
-} mavlink_fenced_fetch_point_t;
-
-#define MAVLINK_MSG_ID_FENCED_FETCH_POINT_LEN 1
-#define MAVLINK_MSG_ID_161_LEN 1
-
-
-
-#define MAVLINK_MESSAGE_INFO_FENCED_FETCH_POINT { \
-	"FENCED_FETCH_POINT", \
-	1, \
-	{  { "idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_fenced_fetch_point_t, idx) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a fenced_fetch_point message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param idx point index (first point is 1, 0 is for return point)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fenced_fetch_point_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t idx)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[1];
-	_mav_put_uint8_t(buf, 0, idx);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 1);
-#else
-	mavlink_fenced_fetch_point_t packet;
-	packet.idx = idx;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 1);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCED_FETCH_POINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 1, 33);
-}
-
-/**
- * @brief Pack a fenced_fetch_point message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param idx point index (first point is 1, 0 is for return point)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fenced_fetch_point_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t idx)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[1];
-	_mav_put_uint8_t(buf, 0, idx);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 1);
-#else
-	mavlink_fenced_fetch_point_t packet;
-	packet.idx = idx;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 1);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCED_FETCH_POINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 1, 33);
-}
-
-/**
- * @brief Encode a fenced_fetch_point struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param fenced_fetch_point C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_fenced_fetch_point_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_fenced_fetch_point_t* fenced_fetch_point)
-{
-	return mavlink_msg_fenced_fetch_point_pack(system_id, component_id, msg, fenced_fetch_point->idx);
-}
-
-/**
- * @brief Send a fenced_fetch_point message
- * @param chan MAVLink channel to send the message
- *
- * @param idx point index (first point is 1, 0 is for return point)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_fenced_fetch_point_send(mavlink_channel_t chan, uint8_t idx)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[1];
-	_mav_put_uint8_t(buf, 0, idx);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCED_FETCH_POINT, buf, 1, 33);
-#else
-	mavlink_fenced_fetch_point_t packet;
-	packet.idx = idx;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCED_FETCH_POINT, (const char *)&packet, 1, 33);
-#endif
-}
-
-#endif
-
-// MESSAGE FENCED_FETCH_POINT UNPACKING
-
-
-/**
- * @brief Get field idx from fenced_fetch_point message
- *
- * @return point index (first point is 1, 0 is for return point)
- */
-static inline uint8_t mavlink_msg_fenced_fetch_point_get_idx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Decode a fenced_fetch_point message into a struct
- *
- * @param msg The message to decode
- * @param fenced_fetch_point C-struct to decode the message contents into
- */
-static inline void mavlink_msg_fenced_fetch_point_decode(const mavlink_message_t* msg, mavlink_fenced_fetch_point_t* fenced_fetch_point)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	fenced_fetch_point->idx = mavlink_msg_fenced_fetch_point_get_idx(msg);
-#else
-	memcpy(fenced_fetch_point, _MAV_PAYLOAD(msg), 1);
-#endif
-}

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_fenced_point.h

@@ -1,210 +0,0 @@
-// MESSAGE FENCED_POINT PACKING
-
-#define MAVLINK_MSG_ID_FENCED_POINT 160
-
-typedef struct __mavlink_fenced_point_t
-{
- float lat; ///< Latitude of point
- float lng; ///< Longitude of point
- uint8_t idx; ///< point index (first point is 1, 0 is for return point)
- uint8_t count; ///< total number of points (for sanity checking)
-} mavlink_fenced_point_t;
-
-#define MAVLINK_MSG_ID_FENCED_POINT_LEN 10
-#define MAVLINK_MSG_ID_160_LEN 10
-
-
-
-#define MAVLINK_MESSAGE_INFO_FENCED_POINT { \
-	"FENCED_POINT", \
-	4, \
-	{  { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_fenced_point_t, lat) }, \
-         { "lng", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_fenced_point_t, lng) }, \
-         { "idx", NULL, MAVLINK_TYPE_UINT8_T, 0, 8, offsetof(mavlink_fenced_point_t, idx) }, \
-         { "count", NULL, MAVLINK_TYPE_UINT8_T, 0, 9, offsetof(mavlink_fenced_point_t, count) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a fenced_point message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param idx point index (first point is 1, 0 is for return point)
- * @param count total number of points (for sanity checking)
- * @param lat Latitude of point
- * @param lng Longitude of point
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fenced_point_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t idx, uint8_t count, float lat, float lng)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, lat);
-	_mav_put_float(buf, 4, lng);
-	_mav_put_uint8_t(buf, 8, idx);
-	_mav_put_uint8_t(buf, 9, count);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 10);
-#else
-	mavlink_fenced_point_t packet;
-	packet.lat = lat;
-	packet.lng = lng;
-	packet.idx = idx;
-	packet.count = count;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 10);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCED_POINT;
-	return mavlink_finalize_message(msg, system_id, component_id, 10, 225);
-}
-
-/**
- * @brief Pack a fenced_point message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param idx point index (first point is 1, 0 is for return point)
- * @param count total number of points (for sanity checking)
- * @param lat Latitude of point
- * @param lng Longitude of point
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_fenced_point_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t idx,uint8_t count,float lat,float lng)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, lat);
-	_mav_put_float(buf, 4, lng);
-	_mav_put_uint8_t(buf, 8, idx);
-	_mav_put_uint8_t(buf, 9, count);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 10);
-#else
-	mavlink_fenced_point_t packet;
-	packet.lat = lat;
-	packet.lng = lng;
-	packet.idx = idx;
-	packet.count = count;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 10);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_FENCED_POINT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 10, 225);
-}
-
-/**
- * @brief Encode a fenced_point struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param fenced_point C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_fenced_point_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_fenced_point_t* fenced_point)
-{
-	return mavlink_msg_fenced_point_pack(system_id, component_id, msg, fenced_point->idx, fenced_point->count, fenced_point->lat, fenced_point->lng);
-}
-
-/**
- * @brief Send a fenced_point message
- * @param chan MAVLink channel to send the message
- *
- * @param idx point index (first point is 1, 0 is for return point)
- * @param count total number of points (for sanity checking)
- * @param lat Latitude of point
- * @param lng Longitude of point
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_fenced_point_send(mavlink_channel_t chan, uint8_t idx, uint8_t count, float lat, float lng)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[10];
-	_mav_put_float(buf, 0, lat);
-	_mav_put_float(buf, 4, lng);
-	_mav_put_uint8_t(buf, 8, idx);
-	_mav_put_uint8_t(buf, 9, count);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCED_POINT, buf, 10, 225);
-#else
-	mavlink_fenced_point_t packet;
-	packet.lat = lat;
-	packet.lng = lng;
-	packet.idx = idx;
-	packet.count = count;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_FENCED_POINT, (const char *)&packet, 10, 225);
-#endif
-}
-
-#endif
-
-// MESSAGE FENCED_POINT UNPACKING
-
-
-/**
- * @brief Get field idx from fenced_point message
- *
- * @return point index (first point is 1, 0 is for return point)
- */
-static inline uint8_t mavlink_msg_fenced_point_get_idx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  8);
-}
-
-/**
- * @brief Get field count from fenced_point message
- *
- * @return total number of points (for sanity checking)
- */
-static inline uint8_t mavlink_msg_fenced_point_get_count(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  9);
-}
-
-/**
- * @brief Get field lat from fenced_point message
- *
- * @return Latitude of point
- */
-static inline float mavlink_msg_fenced_point_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field lng from fenced_point message
- *
- * @return Longitude of point
- */
-static inline float mavlink_msg_fenced_point_get_lng(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Decode a fenced_point message into a struct
- *
- * @param msg The message to decode
- * @param fenced_point C-struct to decode the message contents into
- */
-static inline void mavlink_msg_fenced_point_decode(const mavlink_message_t* msg, mavlink_fenced_point_t* fenced_point)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	fenced_point->lat = mavlink_msg_fenced_point_get_lat(msg);
-	fenced_point->lng = mavlink_msg_fenced_point_get_lng(msg);
-	fenced_point->idx = mavlink_msg_fenced_point_get_idx(msg);
-	fenced_point->count = mavlink_msg_fenced_point_get_count(msg);
-#else
-	memcpy(fenced_point, _MAV_PAYLOAD(msg), 10);
-#endif
-}

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_hwstatus.h

@@ -64,7 +64,7 @@ static inline uint16_t mavlink_msg_hwstatus_pack(uint8_t system_id, uint8_t comp
  * @brief Pack a hwstatus message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param Vcc board voltage (mV)
  * @param I2Cerr I2C error count
@@ -97,7 +97,7 @@ static inline uint16_t mavlink_msg_hwstatus_pack_chan(uint8_t system_id, uint8_t
 }
 
 /**
- * @brief Encode a hwstatus struct into a message
+ * @brief Encode a hwstatus struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -109,6 +109,20 @@ static inline uint16_t mavlink_msg_hwstatus_encode(uint8_t system_id, uint8_t co
 	return mavlink_msg_hwstatus_pack(system_id, component_id, msg, hwstatus->Vcc, hwstatus->I2Cerr);
 }
 
+/**
+ * @brief Encode a hwstatus struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param hwstatus C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_hwstatus_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_hwstatus_t* hwstatus)
+{
+	return mavlink_msg_hwstatus_pack_chan(system_id, component_id, chan, msg, hwstatus->Vcc, hwstatus->I2Cerr);
+}
+
 /**
  * @brief Send a hwstatus message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_limits_status.h

@@ -99,7 +99,7 @@ static inline uint16_t mavlink_msg_limits_status_pack(uint8_t system_id, uint8_t
  * @brief Pack a limits_status message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param limits_state state of AP_Limits, (see enum LimitState, LIMITS_STATE)
  * @param last_trigger time of last breach in milliseconds since boot
@@ -153,7 +153,7 @@ static inline uint16_t mavlink_msg_limits_status_pack_chan(uint8_t system_id, ui
 }
 
 /**
- * @brief Encode a limits_status struct into a message
+ * @brief Encode a limits_status struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -165,6 +165,20 @@ static inline uint16_t mavlink_msg_limits_status_encode(uint8_t system_id, uint8
 	return mavlink_msg_limits_status_pack(system_id, component_id, msg, limits_status->limits_state, limits_status->last_trigger, limits_status->last_action, limits_status->last_recovery, limits_status->last_clear, limits_status->breach_count, limits_status->mods_enabled, limits_status->mods_required, limits_status->mods_triggered);
 }
 
+/**
+ * @brief Encode a limits_status struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param limits_status C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_limits_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_limits_status_t* limits_status)
+{
+	return mavlink_msg_limits_status_pack_chan(system_id, component_id, chan, msg, limits_status->limits_state, limits_status->last_trigger, limits_status->last_action, limits_status->last_recovery, limits_status->last_clear, limits_status->breach_count, limits_status->mods_enabled, limits_status->mods_required, limits_status->mods_triggered);
+}
+
 /**
  * @brief Send a limits_status message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_meminfo.h

@@ -64,7 +64,7 @@ static inline uint16_t mavlink_msg_meminfo_pack(uint8_t system_id, uint8_t compo
  * @brief Pack a meminfo message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param brkval heap top
  * @param freemem free memory
@@ -97,7 +97,7 @@ static inline uint16_t mavlink_msg_meminfo_pack_chan(uint8_t system_id, uint8_t
 }
 
 /**
- * @brief Encode a meminfo struct into a message
+ * @brief Encode a meminfo struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -109,6 +109,20 @@ static inline uint16_t mavlink_msg_meminfo_encode(uint8_t system_id, uint8_t com
 	return mavlink_msg_meminfo_pack(system_id, component_id, msg, meminfo->brkval, meminfo->freemem);
 }
 
+/**
+ * @brief Encode a meminfo struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param meminfo C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_meminfo_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_meminfo_t* meminfo)
+{
+	return mavlink_msg_meminfo_pack_chan(system_id, component_id, chan, msg, meminfo->brkval, meminfo->freemem);
+}
+
 /**
  * @brief Send a meminfo message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_mount_configure.h

@@ -84,7 +84,7 @@ static inline uint16_t mavlink_msg_mount_configure_pack(uint8_t system_id, uint8
  * @brief Pack a mount_configure message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -129,7 +129,7 @@ static inline uint16_t mavlink_msg_mount_configure_pack_chan(uint8_t system_id,
 }
 
 /**
- * @brief Encode a mount_configure struct into a message
+ * @brief Encode a mount_configure struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -141,6 +141,20 @@ static inline uint16_t mavlink_msg_mount_configure_encode(uint8_t system_id, uin
 	return mavlink_msg_mount_configure_pack(system_id, component_id, msg, mount_configure->target_system, mount_configure->target_component, mount_configure->mount_mode, mount_configure->stab_roll, mount_configure->stab_pitch, mount_configure->stab_yaw);
 }
 
+/**
+ * @brief Encode a mount_configure struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param mount_configure C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_mount_configure_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_mount_configure_t* mount_configure)
+{
+	return mavlink_msg_mount_configure_pack_chan(system_id, component_id, chan, msg, mount_configure->target_system, mount_configure->target_component, mount_configure->mount_mode, mount_configure->stab_roll, mount_configure->stab_pitch, mount_configure->stab_yaw);
+}
+
 /**
  * @brief Send a mount_configure message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_mount_control.h

@@ -84,7 +84,7 @@ static inline uint16_t mavlink_msg_mount_control_pack(uint8_t system_id, uint8_t
  * @brief Pack a mount_control message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -129,7 +129,7 @@ static inline uint16_t mavlink_msg_mount_control_pack_chan(uint8_t system_id, ui
 }
 
 /**
- * @brief Encode a mount_control struct into a message
+ * @brief Encode a mount_control struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -141,6 +141,20 @@ static inline uint16_t mavlink_msg_mount_control_encode(uint8_t system_id, uint8
 	return mavlink_msg_mount_control_pack(system_id, component_id, msg, mount_control->target_system, mount_control->target_component, mount_control->input_a, mount_control->input_b, mount_control->input_c, mount_control->save_position);
 }
 
+/**
+ * @brief Encode a mount_control struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param mount_control C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_mount_control_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_mount_control_t* mount_control)
+{
+	return mavlink_msg_mount_control_pack_chan(system_id, component_id, chan, msg, mount_control->target_system, mount_control->target_component, mount_control->input_a, mount_control->input_b, mount_control->input_c, mount_control->save_position);
+}
+
 /**
  * @brief Send a mount_control message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_mount_status.h

@@ -79,7 +79,7 @@ static inline uint16_t mavlink_msg_mount_status_pack(uint8_t system_id, uint8_t
  * @brief Pack a mount_status message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -121,7 +121,7 @@ static inline uint16_t mavlink_msg_mount_status_pack_chan(uint8_t system_id, uin
 }
 
 /**
- * @brief Encode a mount_status struct into a message
+ * @brief Encode a mount_status struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -133,6 +133,20 @@ static inline uint16_t mavlink_msg_mount_status_encode(uint8_t system_id, uint8_
 	return mavlink_msg_mount_status_pack(system_id, component_id, msg, mount_status->target_system, mount_status->target_component, mount_status->pointing_a, mount_status->pointing_b, mount_status->pointing_c);
 }
 
+/**
+ * @brief Encode a mount_status struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param mount_status C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_mount_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_mount_status_t* mount_status)
+{
+	return mavlink_msg_mount_status_pack_chan(system_id, component_id, chan, msg, mount_status->target_system, mount_status->target_component, mount_status->pointing_a, mount_status->pointing_b, mount_status->pointing_c);
+}
+
 /**
  * @brief Send a mount_status message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_radio.h

@@ -89,7 +89,7 @@ static inline uint16_t mavlink_msg_radio_pack(uint8_t system_id, uint8_t compone
  * @brief Pack a radio message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param rssi local signal strength
  * @param remrssi remote signal strength
@@ -137,7 +137,7 @@ static inline uint16_t mavlink_msg_radio_pack_chan(uint8_t system_id, uint8_t co
 }
 
 /**
- * @brief Encode a radio struct into a message
+ * @brief Encode a radio struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -149,6 +149,20 @@ static inline uint16_t mavlink_msg_radio_encode(uint8_t system_id, uint8_t compo
 	return mavlink_msg_radio_pack(system_id, component_id, msg, radio->rssi, radio->remrssi, radio->txbuf, radio->noise, radio->remnoise, radio->rxerrors, radio->fixed);
 }
 
+/**
+ * @brief Encode a radio struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param radio C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_radio_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_radio_t* radio)
+{
+	return mavlink_msg_radio_pack_chan(system_id, component_id, chan, msg, radio->rssi, radio->remrssi, radio->txbuf, radio->noise, radio->remnoise, radio->rxerrors, radio->fixed);
+}
+
 /**
  * @brief Send a radio message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_rangefinder.h

@@ -64,7 +64,7 @@ static inline uint16_t mavlink_msg_rangefinder_pack(uint8_t system_id, uint8_t c
  * @brief Pack a rangefinder message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param distance distance in meters
  * @param voltage raw voltage if available, zero otherwise
@@ -97,7 +97,7 @@ static inline uint16_t mavlink_msg_rangefinder_pack_chan(uint8_t system_id, uint
 }
 
 /**
- * @brief Encode a rangefinder struct into a message
+ * @brief Encode a rangefinder struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -109,6 +109,20 @@ static inline uint16_t mavlink_msg_rangefinder_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_rangefinder_pack(system_id, component_id, msg, rangefinder->distance, rangefinder->voltage);
 }
 
+/**
+ * @brief Encode a rangefinder struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param rangefinder C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_rangefinder_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_rangefinder_t* rangefinder)
+{
+	return mavlink_msg_rangefinder_pack_chan(system_id, component_id, chan, msg, rangefinder->distance, rangefinder->voltage);
+}
+
 /**
  * @brief Send a rangefinder message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_sensor_offsets.h

@@ -114,7 +114,7 @@ static inline uint16_t mavlink_msg_sensor_offsets_pack(uint8_t system_id, uint8_
  * @brief Pack a sensor_offsets message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param mag_ofs_x magnetometer X offset
  * @param mag_ofs_y magnetometer Y offset
@@ -177,7 +177,7 @@ static inline uint16_t mavlink_msg_sensor_offsets_pack_chan(uint8_t system_id, u
 }
 
 /**
- * @brief Encode a sensor_offsets struct into a message
+ * @brief Encode a sensor_offsets struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -189,6 +189,20 @@ static inline uint16_t mavlink_msg_sensor_offsets_encode(uint8_t system_id, uint
 	return mavlink_msg_sensor_offsets_pack(system_id, component_id, msg, sensor_offsets->mag_ofs_x, sensor_offsets->mag_ofs_y, sensor_offsets->mag_ofs_z, sensor_offsets->mag_declination, sensor_offsets->raw_press, sensor_offsets->raw_temp, sensor_offsets->gyro_cal_x, sensor_offsets->gyro_cal_y, sensor_offsets->gyro_cal_z, sensor_offsets->accel_cal_x, sensor_offsets->accel_cal_y, sensor_offsets->accel_cal_z);
 }
 
+/**
+ * @brief Encode a sensor_offsets struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param sensor_offsets C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_sensor_offsets_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_sensor_offsets_t* sensor_offsets)
+{
+	return mavlink_msg_sensor_offsets_pack_chan(system_id, component_id, chan, msg, sensor_offsets->mag_ofs_x, sensor_offsets->mag_ofs_y, sensor_offsets->mag_ofs_z, sensor_offsets->mag_declination, sensor_offsets->raw_press, sensor_offsets->raw_temp, sensor_offsets->gyro_cal_x, sensor_offsets->gyro_cal_y, sensor_offsets->gyro_cal_z, sensor_offsets->accel_cal_x, sensor_offsets->accel_cal_y, sensor_offsets->accel_cal_z);
+}
+
 /**
  * @brief Send a sensor_offsets message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_set_mag_offsets.h

@@ -79,7 +79,7 @@ static inline uint16_t mavlink_msg_set_mag_offsets_pack(uint8_t system_id, uint8
  * @brief Pack a set_mag_offsets message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System ID
  * @param target_component Component ID
@@ -121,7 +121,7 @@ static inline uint16_t mavlink_msg_set_mag_offsets_pack_chan(uint8_t system_id,
 }
 
 /**
- * @brief Encode a set_mag_offsets struct into a message
+ * @brief Encode a set_mag_offsets struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -133,6 +133,20 @@ static inline uint16_t mavlink_msg_set_mag_offsets_encode(uint8_t system_id, uin
 	return mavlink_msg_set_mag_offsets_pack(system_id, component_id, msg, set_mag_offsets->target_system, set_mag_offsets->target_component, set_mag_offsets->mag_ofs_x, set_mag_offsets->mag_ofs_y, set_mag_offsets->mag_ofs_z);
 }
 
+/**
+ * @brief Encode a set_mag_offsets struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param set_mag_offsets C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_set_mag_offsets_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_set_mag_offsets_t* set_mag_offsets)
+{
+	return mavlink_msg_set_mag_offsets_pack_chan(system_id, component_id, chan, msg, set_mag_offsets->target_system, set_mag_offsets->target_component, set_mag_offsets->mag_ofs_x, set_mag_offsets->mag_ofs_y, set_mag_offsets->mag_ofs_z);
+}
+
 /**
  * @brief Send a set_mag_offsets message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_simstate.h

@@ -13,15 +13,15 @@ typedef struct __mavlink_simstate_t
  float xgyro; ///< Angular speed around X axis rad/s
  float ygyro; ///< Angular speed around Y axis rad/s
  float zgyro; ///< Angular speed around Z axis rad/s
- float lat; ///< Latitude in degrees
- float lng; ///< Longitude in degrees
+ int32_t lat; ///< Latitude in degrees * 1E7
+ int32_t lng; ///< Longitude in degrees * 1E7
 } mavlink_simstate_t;
 
 #define MAVLINK_MSG_ID_SIMSTATE_LEN 44
 #define MAVLINK_MSG_ID_164_LEN 44
 
-#define MAVLINK_MSG_ID_SIMSTATE_CRC 111
-#define MAVLINK_MSG_ID_164_CRC 111
+#define MAVLINK_MSG_ID_SIMSTATE_CRC 154
+#define MAVLINK_MSG_ID_164_CRC 154
 
 
 
@@ -37,8 +37,8 @@ typedef struct __mavlink_simstate_t
          { "xgyro", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_simstate_t, xgyro) }, \
          { "ygyro", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_simstate_t, ygyro) }, \
          { "zgyro", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_simstate_t, zgyro) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 36, offsetof(mavlink_simstate_t, lat) }, \
-         { "lng", NULL, MAVLINK_TYPE_FLOAT, 0, 40, offsetof(mavlink_simstate_t, lng) }, \
+         { "lat", NULL, MAVLINK_TYPE_INT32_T, 0, 36, offsetof(mavlink_simstate_t, lat) }, \
+         { "lng", NULL, MAVLINK_TYPE_INT32_T, 0, 40, offsetof(mavlink_simstate_t, lng) }, \
          } \
 }
 
@@ -58,12 +58,12 @@ typedef struct __mavlink_simstate_t
  * @param xgyro Angular speed around X axis rad/s
  * @param ygyro Angular speed around Y axis rad/s
  * @param zgyro Angular speed around Z axis rad/s
- * @param lat Latitude in degrees
- * @param lng Longitude in degrees
+ * @param lat Latitude in degrees * 1E7
+ * @param lng Longitude in degrees * 1E7
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro, float lat, float lng)
+						       float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro, int32_t lat, int32_t lng)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
 	char buf[MAVLINK_MSG_ID_SIMSTATE_LEN];
@@ -76,8 +76,8 @@ static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t comp
 	_mav_put_float(buf, 24, xgyro);
 	_mav_put_float(buf, 28, ygyro);
 	_mav_put_float(buf, 32, zgyro);
-	_mav_put_float(buf, 36, lat);
-	_mav_put_float(buf, 40, lng);
+	_mav_put_int32_t(buf, 36, lat);
+	_mav_put_int32_t(buf, 40, lng);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SIMSTATE_LEN);
 #else
@@ -109,7 +109,7 @@ static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t comp
  * @brief Pack a simstate message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param roll Roll angle (rad)
  * @param pitch Pitch angle (rad)
@@ -120,13 +120,13 @@ static inline uint16_t mavlink_msg_simstate_pack(uint8_t system_id, uint8_t comp
  * @param xgyro Angular speed around X axis rad/s
  * @param ygyro Angular speed around Y axis rad/s
  * @param zgyro Angular speed around Z axis rad/s
- * @param lat Latitude in degrees
- * @param lng Longitude in degrees
+ * @param lat Latitude in degrees * 1E7
+ * @param lng Longitude in degrees * 1E7
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
 							   mavlink_message_t* msg,
-						           float roll,float pitch,float yaw,float xacc,float yacc,float zacc,float xgyro,float ygyro,float zgyro,float lat,float lng)
+						           float roll,float pitch,float yaw,float xacc,float yacc,float zacc,float xgyro,float ygyro,float zgyro,int32_t lat,int32_t lng)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
 	char buf[MAVLINK_MSG_ID_SIMSTATE_LEN];
@@ -139,8 +139,8 @@ static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t
 	_mav_put_float(buf, 24, xgyro);
 	_mav_put_float(buf, 28, ygyro);
 	_mav_put_float(buf, 32, zgyro);
-	_mav_put_float(buf, 36, lat);
-	_mav_put_float(buf, 40, lng);
+	_mav_put_int32_t(buf, 36, lat);
+	_mav_put_int32_t(buf, 40, lng);
 
         memcpy(_MAV_PAYLOAD_NON_CONST(msg), buf, MAVLINK_MSG_ID_SIMSTATE_LEN);
 #else
@@ -169,7 +169,7 @@ static inline uint16_t mavlink_msg_simstate_pack_chan(uint8_t system_id, uint8_t
 }
 
 /**
- * @brief Encode a simstate struct into a message
+ * @brief Encode a simstate struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -181,6 +181,20 @@ static inline uint16_t mavlink_msg_simstate_encode(uint8_t system_id, uint8_t co
 	return mavlink_msg_simstate_pack(system_id, component_id, msg, simstate->roll, simstate->pitch, simstate->yaw, simstate->xacc, simstate->yacc, simstate->zacc, simstate->xgyro, simstate->ygyro, simstate->zgyro, simstate->lat, simstate->lng);
 }
 
+/**
+ * @brief Encode a simstate struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param simstate C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_simstate_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_simstate_t* simstate)
+{
+	return mavlink_msg_simstate_pack_chan(system_id, component_id, chan, msg, simstate->roll, simstate->pitch, simstate->yaw, simstate->xacc, simstate->yacc, simstate->zacc, simstate->xgyro, simstate->ygyro, simstate->zgyro, simstate->lat, simstate->lng);
+}
+
 /**
  * @brief Send a simstate message
  * @param chan MAVLink channel to send the message
@@ -194,12 +208,12 @@ static inline uint16_t mavlink_msg_simstate_encode(uint8_t system_id, uint8_t co
  * @param xgyro Angular speed around X axis rad/s
  * @param ygyro Angular speed around Y axis rad/s
  * @param zgyro Angular speed around Z axis rad/s
- * @param lat Latitude in degrees
- * @param lng Longitude in degrees
+ * @param lat Latitude in degrees * 1E7
+ * @param lng Longitude in degrees * 1E7
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
-static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro, float lat, float lng)
+static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll, float pitch, float yaw, float xacc, float yacc, float zacc, float xgyro, float ygyro, float zgyro, int32_t lat, int32_t lng)
 {
 #if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
 	char buf[MAVLINK_MSG_ID_SIMSTATE_LEN];
@@ -212,8 +226,8 @@ static inline void mavlink_msg_simstate_send(mavlink_channel_t chan, float roll,
 	_mav_put_float(buf, 24, xgyro);
 	_mav_put_float(buf, 28, ygyro);
 	_mav_put_float(buf, 32, zgyro);
-	_mav_put_float(buf, 36, lat);
-	_mav_put_float(buf, 40, lng);
+	_mav_put_int32_t(buf, 36, lat);
+	_mav_put_int32_t(buf, 40, lng);
 
 #if MAVLINK_CRC_EXTRA
     _mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_SIMSTATE, buf, MAVLINK_MSG_ID_SIMSTATE_LEN, MAVLINK_MSG_ID_SIMSTATE_CRC);
@@ -340,21 +354,21 @@ static inline float mavlink_msg_simstate_get_zgyro(const mavlink_message_t* msg)
 /**
  * @brief Get field lat from simstate message
  *
- * @return Latitude in degrees
+ * @return Latitude in degrees * 1E7
  */
-static inline float mavlink_msg_simstate_get_lat(const mavlink_message_t* msg)
+static inline int32_t mavlink_msg_simstate_get_lat(const mavlink_message_t* msg)
 {
-	return _MAV_RETURN_float(msg,  36);
+	return _MAV_RETURN_int32_t(msg,  36);
 }
 
 /**
  * @brief Get field lng from simstate message
  *
- * @return Longitude in degrees
+ * @return Longitude in degrees * 1E7
  */
-static inline float mavlink_msg_simstate_get_lng(const mavlink_message_t* msg)
+static inline int32_t mavlink_msg_simstate_get_lng(const mavlink_message_t* msg)
 {
-	return _MAV_RETURN_float(msg,  40);
+	return _MAV_RETURN_int32_t(msg,  40);
 }
 
 /**

src/GCS_MAVLink/include_v1.0/ardupilotmega/mavlink_msg_wind.h

@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_wind_pack(uint8_t system_id, uint8_t componen
  * @brief Pack a wind message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param direction wind direction that wind is coming from (degrees)
  * @param speed wind speed in ground plane (m/s)
@@ -105,7 +105,7 @@ static inline uint16_t mavlink_msg_wind_pack_chan(uint8_t system_id, uint8_t com
 }
 
 /**
- * @brief Encode a wind struct into a message
+ * @brief Encode a wind struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -117,6 +117,20 @@ static inline uint16_t mavlink_msg_wind_encode(uint8_t system_id, uint8_t compon
 	return mavlink_msg_wind_pack(system_id, component_id, msg, wind->direction, wind->speed, wind->speed_z);
 }
 
+/**
+ * @brief Encode a wind struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param wind C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_wind_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_wind_t* wind)
+{
+	return mavlink_msg_wind_pack_chan(system_id, component_id, chan, msg, wind->direction, wind->speed, wind->speed_z);
+}
+
 /**
  * @brief Send a wind message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/ardupilotmega/testsuite.h

@@ -738,8 +738,8 @@ static void mavlink_test_simstate(uint8_t system_id, uint8_t component_id, mavli
 	185.0,
 	213.0,
 	241.0,
-	269.0,
-	297.0,
+	963499336,
+	963499544,
 	};
 	mavlink_simstate_t packet1, packet2;
         memset(&packet1, 0, sizeof(packet1));

src/GCS_MAVLink/include_v1.0/ardupilotmega/version.h

@@ -5,7 +5,7 @@
 #ifndef MAVLINK_VERSION_H
 #define MAVLINK_VERSION_H
 
-#define MAVLINK_BUILD_DATE "Mon May 20 23:07:03 2013"
+#define MAVLINK_BUILD_DATE "Tue Aug 20 00:01:00 2013"
 #define MAVLINK_WIRE_PROTOCOL_VERSION "1.0"
 #define MAVLINK_MAX_DIALECT_PAYLOAD_SIZE 254
  

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_action.h

@@ -1,188 +0,0 @@
-// MESSAGE ACTION PACKING
-
-#define MAVLINK_MSG_ID_ACTION 10
-
-typedef struct __mavlink_action_t
-{
- uint8_t target; ///< The system executing the action
- uint8_t target_component; ///< The component executing the action
- uint8_t action; ///< The action id
-} mavlink_action_t;
-
-#define MAVLINK_MSG_ID_ACTION_LEN 3
-#define MAVLINK_MSG_ID_10_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_ACTION { \
-	"ACTION", \
-	3, \
-	{  { "target", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_action_t, target) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_action_t, target_component) }, \
-         { "action", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_action_t, action) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a action message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target The system executing the action
- * @param target_component The component executing the action
- * @param action The action id
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target, uint8_t target_component, uint8_t action)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, action);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 3);
-#else
-	mavlink_action_t packet;
-	packet.target = target;
-	packet.target_component = target_component;
-	packet.action = action;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION;
-	return mavlink_finalize_message(msg, system_id, component_id, 3, 60);
-}
-
-/**
- * @brief Pack a action message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target The system executing the action
- * @param target_component The component executing the action
- * @param action The action id
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target,uint8_t target_component,uint8_t action)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, action);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 3);
-#else
-	mavlink_action_t packet;
-	packet.target = target;
-	packet.target_component = target_component;
-	packet.action = action;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3, 60);
-}
-
-/**
- * @brief Encode a action struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param action C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_action_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_action_t* action)
-{
-	return mavlink_msg_action_pack(system_id, component_id, msg, action->target, action->target_component, action->action);
-}
-
-/**
- * @brief Send a action message
- * @param chan MAVLink channel to send the message
- *
- * @param target The system executing the action
- * @param target_component The component executing the action
- * @param action The action id
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_action_send(mavlink_channel_t chan, uint8_t target, uint8_t target_component, uint8_t action)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, action);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION, buf, 3, 60);
-#else
-	mavlink_action_t packet;
-	packet.target = target;
-	packet.target_component = target_component;
-	packet.action = action;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION, (const char *)&packet, 3, 60);
-#endif
-}
-
-#endif
-
-// MESSAGE ACTION UNPACKING
-
-
-/**
- * @brief Get field target from action message
- *
- * @return The system executing the action
- */
-static inline uint8_t mavlink_msg_action_get_target(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from action message
- *
- * @return The component executing the action
- */
-static inline uint8_t mavlink_msg_action_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field action from action message
- *
- * @return The action id
- */
-static inline uint8_t mavlink_msg_action_get_action(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a action message into a struct
- *
- * @param msg The message to decode
- * @param action C-struct to decode the message contents into
- */
-static inline void mavlink_msg_action_decode(const mavlink_message_t* msg, mavlink_action_t* action)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	action->target = mavlink_msg_action_get_target(msg);
-	action->target_component = mavlink_msg_action_get_target_component(msg);
-	action->action = mavlink_msg_action_get_action(msg);
-#else
-	memcpy(action, _MAV_PAYLOAD(msg), 3);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_action_ack.h

@@ -1,166 +0,0 @@
-// MESSAGE ACTION_ACK PACKING
-
-#define MAVLINK_MSG_ID_ACTION_ACK 9
-
-typedef struct __mavlink_action_ack_t
-{
- uint8_t action; ///< The action id
- uint8_t result; ///< 0: Action DENIED, 1: Action executed
-} mavlink_action_ack_t;
-
-#define MAVLINK_MSG_ID_ACTION_ACK_LEN 2
-#define MAVLINK_MSG_ID_9_LEN 2
-
-
-
-#define MAVLINK_MESSAGE_INFO_ACTION_ACK { \
-	"ACTION_ACK", \
-	2, \
-	{  { "action", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_action_ack_t, action) }, \
-         { "result", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_action_ack_t, result) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a action_ack message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param action The action id
- * @param result 0: Action DENIED, 1: Action executed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_ack_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t action, uint8_t result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, action);
-	_mav_put_uint8_t(buf, 1, result);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 2);
-#else
-	mavlink_action_ack_t packet;
-	packet.action = action;
-	packet.result = result;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION_ACK;
-	return mavlink_finalize_message(msg, system_id, component_id, 2, 219);
-}
-
-/**
- * @brief Pack a action_ack message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param action The action id
- * @param result 0: Action DENIED, 1: Action executed
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_action_ack_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t action,uint8_t result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, action);
-	_mav_put_uint8_t(buf, 1, result);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 2);
-#else
-	mavlink_action_ack_t packet;
-	packet.action = action;
-	packet.result = result;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 2);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_ACTION_ACK;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 2, 219);
-}
-
-/**
- * @brief Encode a action_ack struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param action_ack C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_action_ack_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_action_ack_t* action_ack)
-{
-	return mavlink_msg_action_ack_pack(system_id, component_id, msg, action_ack->action, action_ack->result);
-}
-
-/**
- * @brief Send a action_ack message
- * @param chan MAVLink channel to send the message
- *
- * @param action The action id
- * @param result 0: Action DENIED, 1: Action executed
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_action_ack_send(mavlink_channel_t chan, uint8_t action, uint8_t result)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[2];
-	_mav_put_uint8_t(buf, 0, action);
-	_mav_put_uint8_t(buf, 1, result);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION_ACK, buf, 2, 219);
-#else
-	mavlink_action_ack_t packet;
-	packet.action = action;
-	packet.result = result;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_ACTION_ACK, (const char *)&packet, 2, 219);
-#endif
-}
-
-#endif
-
-// MESSAGE ACTION_ACK UNPACKING
-
-
-/**
- * @brief Get field action from action_ack message
- *
- * @return The action id
- */
-static inline uint8_t mavlink_msg_action_ack_get_action(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field result from action_ack message
- *
- * @return 0: Action DENIED, 1: Action executed
- */
-static inline uint8_t mavlink_msg_action_ack_get_result(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Decode a action_ack message into a struct
- *
- * @param msg The message to decode
- * @param action_ack C-struct to decode the message contents into
- */
-static inline void mavlink_msg_action_ack_decode(const mavlink_message_t* msg, mavlink_action_ack_t* action_ack)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	action_ack->action = mavlink_msg_action_ack_get_action(msg);
-	action_ack->result = mavlink_msg_action_ack_get_result(msg);
-#else
-	memcpy(action_ack, _MAV_PAYLOAD(msg), 2);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_attitude.h

@@ -89,7 +89,7 @@ static inline uint16_t mavlink_msg_attitude_pack(uint8_t system_id, uint8_t comp
  * @brief Pack a attitude message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param roll Roll angle (rad, -pi..+pi)
@@ -137,7 +137,7 @@ static inline uint16_t mavlink_msg_attitude_pack_chan(uint8_t system_id, uint8_t
 }
 
 /**
- * @brief Encode a attitude struct into a message
+ * @brief Encode a attitude struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -149,6 +149,20 @@ static inline uint16_t mavlink_msg_attitude_encode(uint8_t system_id, uint8_t co
 	return mavlink_msg_attitude_pack(system_id, component_id, msg, attitude->time_boot_ms, attitude->roll, attitude->pitch, attitude->yaw, attitude->rollspeed, attitude->pitchspeed, attitude->yawspeed);
 }
 
+/**
+ * @brief Encode a attitude struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param attitude C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_attitude_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_attitude_t* attitude)
+{
+	return mavlink_msg_attitude_pack_chan(system_id, component_id, chan, msg, attitude->time_boot_ms, attitude->roll, attitude->pitch, attitude->yaw, attitude->rollspeed, attitude->pitchspeed, attitude->yawspeed);
+}
+
 /**
  * @brief Send a attitude message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_attitude_quaternion.h

@@ -94,7 +94,7 @@ static inline uint16_t mavlink_msg_attitude_quaternion_pack(uint8_t system_id, u
  * @brief Pack a attitude_quaternion message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param q1 Quaternion component 1
@@ -145,7 +145,7 @@ static inline uint16_t mavlink_msg_attitude_quaternion_pack_chan(uint8_t system_
 }
 
 /**
- * @brief Encode a attitude_quaternion struct into a message
+ * @brief Encode a attitude_quaternion struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -157,6 +157,20 @@ static inline uint16_t mavlink_msg_attitude_quaternion_encode(uint8_t system_id,
 	return mavlink_msg_attitude_quaternion_pack(system_id, component_id, msg, attitude_quaternion->time_boot_ms, attitude_quaternion->q1, attitude_quaternion->q2, attitude_quaternion->q3, attitude_quaternion->q4, attitude_quaternion->rollspeed, attitude_quaternion->pitchspeed, attitude_quaternion->yawspeed);
 }
 
+/**
+ * @brief Encode a attitude_quaternion struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param attitude_quaternion C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_attitude_quaternion_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_attitude_quaternion_t* attitude_quaternion)
+{
+	return mavlink_msg_attitude_quaternion_pack_chan(system_id, component_id, chan, msg, attitude_quaternion->time_boot_ms, attitude_quaternion->q1, attitude_quaternion->q2, attitude_quaternion->q3, attitude_quaternion->q4, attitude_quaternion->rollspeed, attitude_quaternion->pitchspeed, attitude_quaternion->yawspeed);
+}
+
 /**
  * @brief Send a attitude_quaternion message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_auth_key.h

@@ -59,7 +59,7 @@ static inline uint16_t mavlink_msg_auth_key_pack(uint8_t system_id, uint8_t comp
  * @brief Pack a auth_key message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param key key
  * @return length of the message in bytes (excluding serial stream start sign)
@@ -89,7 +89,7 @@ static inline uint16_t mavlink_msg_auth_key_pack_chan(uint8_t system_id, uint8_t
 }
 
 /**
- * @brief Encode a auth_key struct into a message
+ * @brief Encode a auth_key struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -101,6 +101,20 @@ static inline uint16_t mavlink_msg_auth_key_encode(uint8_t system_id, uint8_t co
 	return mavlink_msg_auth_key_pack(system_id, component_id, msg, auth_key->key);
 }
 
+/**
+ * @brief Encode a auth_key struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param auth_key C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_auth_key_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_auth_key_t* auth_key)
+{
+	return mavlink_msg_auth_key_pack_chan(system_id, component_id, chan, msg, auth_key->key);
+}
+
 /**
  * @brief Send a auth_key message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_battery_status.h

@@ -99,7 +99,7 @@ static inline uint16_t mavlink_msg_battery_status_pack(uint8_t system_id, uint8_
  * @brief Pack a battery_status message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param accu_id Accupack ID
  * @param voltage_cell_1 Battery voltage of cell 1, in millivolts (1 = 1 millivolt)
@@ -153,7 +153,7 @@ static inline uint16_t mavlink_msg_battery_status_pack_chan(uint8_t system_id, u
 }
 
 /**
- * @brief Encode a battery_status struct into a message
+ * @brief Encode a battery_status struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -165,6 +165,20 @@ static inline uint16_t mavlink_msg_battery_status_encode(uint8_t system_id, uint
 	return mavlink_msg_battery_status_pack(system_id, component_id, msg, battery_status->accu_id, battery_status->voltage_cell_1, battery_status->voltage_cell_2, battery_status->voltage_cell_3, battery_status->voltage_cell_4, battery_status->voltage_cell_5, battery_status->voltage_cell_6, battery_status->current_battery, battery_status->battery_remaining);
 }
 
+/**
+ * @brief Encode a battery_status struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param battery_status C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_battery_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_battery_status_t* battery_status)
+{
+	return mavlink_msg_battery_status_pack_chan(system_id, component_id, chan, msg, battery_status->accu_id, battery_status->voltage_cell_1, battery_status->voltage_cell_2, battery_status->voltage_cell_3, battery_status->voltage_cell_4, battery_status->voltage_cell_5, battery_status->voltage_cell_6, battery_status->current_battery, battery_status->battery_remaining);
+}
+
 /**
  * @brief Send a battery_status message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_boot.h

@@ -1,144 +0,0 @@
-// MESSAGE BOOT PACKING
-
-#define MAVLINK_MSG_ID_BOOT 1
-
-typedef struct __mavlink_boot_t
-{
- uint32_t version; ///< The onboard software version
-} mavlink_boot_t;
-
-#define MAVLINK_MSG_ID_BOOT_LEN 4
-#define MAVLINK_MSG_ID_1_LEN 4
-
-
-
-#define MAVLINK_MESSAGE_INFO_BOOT { \
-	"BOOT", \
-	1, \
-	{  { "version", NULL, MAVLINK_TYPE_UINT32_T, 0, 0, offsetof(mavlink_boot_t, version) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a boot message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param version The onboard software version
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_boot_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint32_t version)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint32_t(buf, 0, version);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 4);
-#else
-	mavlink_boot_t packet;
-	packet.version = version;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_BOOT;
-	return mavlink_finalize_message(msg, system_id, component_id, 4, 39);
-}
-
-/**
- * @brief Pack a boot message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param version The onboard software version
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_boot_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint32_t version)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint32_t(buf, 0, version);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 4);
-#else
-	mavlink_boot_t packet;
-	packet.version = version;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 4);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_BOOT;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 4, 39);
-}
-
-/**
- * @brief Encode a boot struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param boot C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_boot_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_boot_t* boot)
-{
-	return mavlink_msg_boot_pack(system_id, component_id, msg, boot->version);
-}
-
-/**
- * @brief Send a boot message
- * @param chan MAVLink channel to send the message
- *
- * @param version The onboard software version
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_boot_send(mavlink_channel_t chan, uint32_t version)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[4];
-	_mav_put_uint32_t(buf, 0, version);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BOOT, buf, 4, 39);
-#else
-	mavlink_boot_t packet;
-	packet.version = version;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_BOOT, (const char *)&packet, 4, 39);
-#endif
-}
-
-#endif
-
-// MESSAGE BOOT UNPACKING
-
-
-/**
- * @brief Get field version from boot message
- *
- * @return The onboard software version
- */
-static inline uint32_t mavlink_msg_boot_get_version(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint32_t(msg,  0);
-}
-
-/**
- * @brief Decode a boot message into a struct
- *
- * @param msg The message to decode
- * @param boot C-struct to decode the message contents into
- */
-static inline void mavlink_msg_boot_decode(const mavlink_message_t* msg, mavlink_boot_t* boot)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	boot->version = mavlink_msg_boot_get_version(msg);
-#else
-	memcpy(boot, _MAV_PAYLOAD(msg), 4);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_change_operator_control.h

@@ -72,7 +72,7 @@ static inline uint16_t mavlink_msg_change_operator_control_pack(uint8_t system_i
  * @brief Pack a change_operator_control message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System the GCS requests control for
  * @param control_request 0: request control of this MAV, 1: Release control of this MAV
@@ -109,7 +109,7 @@ static inline uint16_t mavlink_msg_change_operator_control_pack_chan(uint8_t sys
 }
 
 /**
- * @brief Encode a change_operator_control struct into a message
+ * @brief Encode a change_operator_control struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -121,6 +121,20 @@ static inline uint16_t mavlink_msg_change_operator_control_encode(uint8_t system
 	return mavlink_msg_change_operator_control_pack(system_id, component_id, msg, change_operator_control->target_system, change_operator_control->control_request, change_operator_control->version, change_operator_control->passkey);
 }
 
+/**
+ * @brief Encode a change_operator_control struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param change_operator_control C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_change_operator_control_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_change_operator_control_t* change_operator_control)
+{
+	return mavlink_msg_change_operator_control_pack_chan(system_id, component_id, chan, msg, change_operator_control->target_system, change_operator_control->control_request, change_operator_control->version, change_operator_control->passkey);
+}
+
 /**
  * @brief Send a change_operator_control message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_change_operator_control_ack.h

@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_change_operator_control_ack_pack(uint8_t syst
  * @brief Pack a change_operator_control_ack message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param gcs_system_id ID of the GCS this message 
  * @param control_request 0: request control of this MAV, 1: Release control of this MAV
@@ -105,7 +105,7 @@ static inline uint16_t mavlink_msg_change_operator_control_ack_pack_chan(uint8_t
 }
 
 /**
- * @brief Encode a change_operator_control_ack struct into a message
+ * @brief Encode a change_operator_control_ack struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -117,6 +117,20 @@ static inline uint16_t mavlink_msg_change_operator_control_ack_encode(uint8_t sy
 	return mavlink_msg_change_operator_control_ack_pack(system_id, component_id, msg, change_operator_control_ack->gcs_system_id, change_operator_control_ack->control_request, change_operator_control_ack->ack);
 }
 
+/**
+ * @brief Encode a change_operator_control_ack struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param change_operator_control_ack C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_change_operator_control_ack_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_change_operator_control_ack_t* change_operator_control_ack)
+{
+	return mavlink_msg_change_operator_control_ack_pack_chan(system_id, component_id, chan, msg, change_operator_control_ack->gcs_system_id, change_operator_control_ack->control_request, change_operator_control_ack->ack);
+}
+
 /**
  * @brief Send a change_operator_control_ack message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_command.h

@@ -1,298 +0,0 @@
-// MESSAGE COMMAND PACKING
-
-#define MAVLINK_MSG_ID_COMMAND 75
-
-typedef struct __mavlink_command_t
-{
- float param1; ///< Parameter 1, as defined by MAV_CMD enum.
- float param2; ///< Parameter 2, as defined by MAV_CMD enum.
- float param3; ///< Parameter 3, as defined by MAV_CMD enum.
- float param4; ///< Parameter 4, as defined by MAV_CMD enum.
- uint8_t target_system; ///< System which should execute the command
- uint8_t target_component; ///< Component which should execute the command, 0 for all components
- uint8_t command; ///< Command ID, as defined by MAV_CMD enum.
- uint8_t confirmation; ///< 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
-} mavlink_command_t;
-
-#define MAVLINK_MSG_ID_COMMAND_LEN 20
-#define MAVLINK_MSG_ID_75_LEN 20
-
-
-
-#define MAVLINK_MESSAGE_INFO_COMMAND { \
-	"COMMAND", \
-	8, \
-	{  { "param1", NULL, MAVLINK_TYPE_FLOAT, 0, 0, offsetof(mavlink_command_t, param1) }, \
-         { "param2", NULL, MAVLINK_TYPE_FLOAT, 0, 4, offsetof(mavlink_command_t, param2) }, \
-         { "param3", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_command_t, param3) }, \
-         { "param4", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_command_t, param4) }, \
-         { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 16, offsetof(mavlink_command_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 17, offsetof(mavlink_command_t, target_component) }, \
-         { "command", NULL, MAVLINK_TYPE_UINT8_T, 0, 18, offsetof(mavlink_command_t, command) }, \
-         { "confirmation", NULL, MAVLINK_TYPE_UINT8_T, 0, 19, offsetof(mavlink_command_t, confirmation) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a command message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param command Command ID, as defined by MAV_CMD enum.
- * @param confirmation 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- * @param param1 Parameter 1, as defined by MAV_CMD enum.
- * @param param2 Parameter 2, as defined by MAV_CMD enum.
- * @param param3 Parameter 3, as defined by MAV_CMD enum.
- * @param param4 Parameter 4, as defined by MAV_CMD enum.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_command_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t command, uint8_t confirmation, float param1, float param2, float param3, float param4)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_float(buf, 0, param1);
-	_mav_put_float(buf, 4, param2);
-	_mav_put_float(buf, 8, param3);
-	_mav_put_float(buf, 12, param4);
-	_mav_put_uint8_t(buf, 16, target_system);
-	_mav_put_uint8_t(buf, 17, target_component);
-	_mav_put_uint8_t(buf, 18, command);
-	_mav_put_uint8_t(buf, 19, confirmation);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 20);
-#else
-	mavlink_command_t packet;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.command = command;
-	packet.confirmation = confirmation;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_COMMAND;
-	return mavlink_finalize_message(msg, system_id, component_id, 20, 133);
-}
-
-/**
- * @brief Pack a command message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param command Command ID, as defined by MAV_CMD enum.
- * @param confirmation 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- * @param param1 Parameter 1, as defined by MAV_CMD enum.
- * @param param2 Parameter 2, as defined by MAV_CMD enum.
- * @param param3 Parameter 3, as defined by MAV_CMD enum.
- * @param param4 Parameter 4, as defined by MAV_CMD enum.
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_command_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t command,uint8_t confirmation,float param1,float param2,float param3,float param4)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_float(buf, 0, param1);
-	_mav_put_float(buf, 4, param2);
-	_mav_put_float(buf, 8, param3);
-	_mav_put_float(buf, 12, param4);
-	_mav_put_uint8_t(buf, 16, target_system);
-	_mav_put_uint8_t(buf, 17, target_component);
-	_mav_put_uint8_t(buf, 18, command);
-	_mav_put_uint8_t(buf, 19, confirmation);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 20);
-#else
-	mavlink_command_t packet;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.command = command;
-	packet.confirmation = confirmation;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 20);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_COMMAND;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 20, 133);
-}
-
-/**
- * @brief Encode a command struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param command C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_command_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_command_t* command)
-{
-	return mavlink_msg_command_pack(system_id, component_id, msg, command->target_system, command->target_component, command->command, command->confirmation, command->param1, command->param2, command->param3, command->param4);
-}
-
-/**
- * @brief Send a command message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param command Command ID, as defined by MAV_CMD enum.
- * @param confirmation 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- * @param param1 Parameter 1, as defined by MAV_CMD enum.
- * @param param2 Parameter 2, as defined by MAV_CMD enum.
- * @param param3 Parameter 3, as defined by MAV_CMD enum.
- * @param param4 Parameter 4, as defined by MAV_CMD enum.
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_command_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t command, uint8_t confirmation, float param1, float param2, float param3, float param4)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[20];
-	_mav_put_float(buf, 0, param1);
-	_mav_put_float(buf, 4, param2);
-	_mav_put_float(buf, 8, param3);
-	_mav_put_float(buf, 12, param4);
-	_mav_put_uint8_t(buf, 16, target_system);
-	_mav_put_uint8_t(buf, 17, target_component);
-	_mav_put_uint8_t(buf, 18, command);
-	_mav_put_uint8_t(buf, 19, confirmation);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_COMMAND, buf, 20, 133);
-#else
-	mavlink_command_t packet;
-	packet.param1 = param1;
-	packet.param2 = param2;
-	packet.param3 = param3;
-	packet.param4 = param4;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.command = command;
-	packet.confirmation = confirmation;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_COMMAND, (const char *)&packet, 20, 133);
-#endif
-}
-
-#endif
-
-// MESSAGE COMMAND UNPACKING
-
-
-/**
- * @brief Get field target_system from command message
- *
- * @return System which should execute the command
- */
-static inline uint8_t mavlink_msg_command_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  16);
-}
-
-/**
- * @brief Get field target_component from command message
- *
- * @return Component which should execute the command, 0 for all components
- */
-static inline uint8_t mavlink_msg_command_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  17);
-}
-
-/**
- * @brief Get field command from command message
- *
- * @return Command ID, as defined by MAV_CMD enum.
- */
-static inline uint8_t mavlink_msg_command_get_command(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  18);
-}
-
-/**
- * @brief Get field confirmation from command message
- *
- * @return 0: First transmission of this command. 1-255: Confirmation transmissions (e.g. for kill command)
- */
-static inline uint8_t mavlink_msg_command_get_confirmation(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  19);
-}
-
-/**
- * @brief Get field param1 from command message
- *
- * @return Parameter 1, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param1(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  0);
-}
-
-/**
- * @brief Get field param2 from command message
- *
- * @return Parameter 2, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param2(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  4);
-}
-
-/**
- * @brief Get field param3 from command message
- *
- * @return Parameter 3, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param3(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field param4 from command message
- *
- * @return Parameter 4, as defined by MAV_CMD enum.
- */
-static inline float mavlink_msg_command_get_param4(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Decode a command message into a struct
- *
- * @param msg The message to decode
- * @param command C-struct to decode the message contents into
- */
-static inline void mavlink_msg_command_decode(const mavlink_message_t* msg, mavlink_command_t* command)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	command->param1 = mavlink_msg_command_get_param1(msg);
-	command->param2 = mavlink_msg_command_get_param2(msg);
-	command->param3 = mavlink_msg_command_get_param3(msg);
-	command->param4 = mavlink_msg_command_get_param4(msg);
-	command->target_system = mavlink_msg_command_get_target_system(msg);
-	command->target_component = mavlink_msg_command_get_target_component(msg);
-	command->command = mavlink_msg_command_get_command(msg);
-	command->confirmation = mavlink_msg_command_get_confirmation(msg);
-#else
-	memcpy(command, _MAV_PAYLOAD(msg), 20);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_command_ack.h

@@ -64,7 +64,7 @@ static inline uint16_t mavlink_msg_command_ack_pack(uint8_t system_id, uint8_t c
  * @brief Pack a command_ack message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param command Command ID, as defined by MAV_CMD enum.
  * @param result See MAV_RESULT enum
@@ -97,7 +97,7 @@ static inline uint16_t mavlink_msg_command_ack_pack_chan(uint8_t system_id, uint
 }
 
 /**
- * @brief Encode a command_ack struct into a message
+ * @brief Encode a command_ack struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -109,6 +109,20 @@ static inline uint16_t mavlink_msg_command_ack_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_command_ack_pack(system_id, component_id, msg, command_ack->command, command_ack->result);
 }
 
+/**
+ * @brief Encode a command_ack struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param command_ack C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_command_ack_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_command_ack_t* command_ack)
+{
+	return mavlink_msg_command_ack_pack_chan(system_id, component_id, chan, msg, command_ack->command, command_ack->result);
+}
+
 /**
  * @brief Send a command_ack message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_command_long.h

@@ -109,7 +109,7 @@ static inline uint16_t mavlink_msg_command_long_pack(uint8_t system_id, uint8_t
  * @brief Pack a command_long message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param target_system System which should execute the command
  * @param target_component Component which should execute the command, 0 for all components
@@ -169,7 +169,7 @@ static inline uint16_t mavlink_msg_command_long_pack_chan(uint8_t system_id, uin
 }
 
 /**
- * @brief Encode a command_long struct into a message
+ * @brief Encode a command_long struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -181,6 +181,20 @@ static inline uint16_t mavlink_msg_command_long_encode(uint8_t system_id, uint8_
 	return mavlink_msg_command_long_pack(system_id, component_id, msg, command_long->target_system, command_long->target_component, command_long->command, command_long->confirmation, command_long->param1, command_long->param2, command_long->param3, command_long->param4, command_long->param5, command_long->param6, command_long->param7);
 }
 
+/**
+ * @brief Encode a command_long struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param command_long C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_command_long_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_command_long_t* command_long)
+{
+	return mavlink_msg_command_long_pack_chan(system_id, component_id, chan, msg, command_long->target_system, command_long->target_component, command_long->command, command_long->confirmation, command_long->param1, command_long->param2, command_long->param3, command_long->param4, command_long->param5, command_long->param6, command_long->param7);
+}
+
 /**
  * @brief Send a command_long message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_control_status.h

@@ -1,298 +0,0 @@
-// MESSAGE CONTROL_STATUS PACKING
-
-#define MAVLINK_MSG_ID_CONTROL_STATUS 52
-
-typedef struct __mavlink_control_status_t
-{
- uint8_t position_fix; ///< Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- uint8_t vision_fix; ///< Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- uint8_t gps_fix; ///< GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- uint8_t ahrs_health; ///< Attitude estimation health: 0: poor, 255: excellent
- uint8_t control_att; ///< 0: Attitude control disabled, 1: enabled
- uint8_t control_pos_xy; ///< 0: X, Y position control disabled, 1: enabled
- uint8_t control_pos_z; ///< 0: Z position control disabled, 1: enabled
- uint8_t control_pos_yaw; ///< 0: Yaw angle control disabled, 1: enabled
-} mavlink_control_status_t;
-
-#define MAVLINK_MSG_ID_CONTROL_STATUS_LEN 8
-#define MAVLINK_MSG_ID_52_LEN 8
-
-
-
-#define MAVLINK_MESSAGE_INFO_CONTROL_STATUS { \
-	"CONTROL_STATUS", \
-	8, \
-	{  { "position_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_control_status_t, position_fix) }, \
-         { "vision_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_control_status_t, vision_fix) }, \
-         { "gps_fix", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_control_status_t, gps_fix) }, \
-         { "ahrs_health", NULL, MAVLINK_TYPE_UINT8_T, 0, 3, offsetof(mavlink_control_status_t, ahrs_health) }, \
-         { "control_att", NULL, MAVLINK_TYPE_UINT8_T, 0, 4, offsetof(mavlink_control_status_t, control_att) }, \
-         { "control_pos_xy", NULL, MAVLINK_TYPE_UINT8_T, 0, 5, offsetof(mavlink_control_status_t, control_pos_xy) }, \
-         { "control_pos_z", NULL, MAVLINK_TYPE_UINT8_T, 0, 6, offsetof(mavlink_control_status_t, control_pos_z) }, \
-         { "control_pos_yaw", NULL, MAVLINK_TYPE_UINT8_T, 0, 7, offsetof(mavlink_control_status_t, control_pos_yaw) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a control_status message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param position_fix Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- * @param vision_fix Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- * @param gps_fix GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- * @param ahrs_health Attitude estimation health: 0: poor, 255: excellent
- * @param control_att 0: Attitude control disabled, 1: enabled
- * @param control_pos_xy 0: X, Y position control disabled, 1: enabled
- * @param control_pos_z 0: Z position control disabled, 1: enabled
- * @param control_pos_yaw 0: Yaw angle control disabled, 1: enabled
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_control_status_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t position_fix, uint8_t vision_fix, uint8_t gps_fix, uint8_t ahrs_health, uint8_t control_att, uint8_t control_pos_xy, uint8_t control_pos_z, uint8_t control_pos_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, position_fix);
-	_mav_put_uint8_t(buf, 1, vision_fix);
-	_mav_put_uint8_t(buf, 2, gps_fix);
-	_mav_put_uint8_t(buf, 3, ahrs_health);
-	_mav_put_uint8_t(buf, 4, control_att);
-	_mav_put_uint8_t(buf, 5, control_pos_xy);
-	_mav_put_uint8_t(buf, 6, control_pos_z);
-	_mav_put_uint8_t(buf, 7, control_pos_yaw);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 8);
-#else
-	mavlink_control_status_t packet;
-	packet.position_fix = position_fix;
-	packet.vision_fix = vision_fix;
-	packet.gps_fix = gps_fix;
-	packet.ahrs_health = ahrs_health;
-	packet.control_att = control_att;
-	packet.control_pos_xy = control_pos_xy;
-	packet.control_pos_z = control_pos_z;
-	packet.control_pos_yaw = control_pos_yaw;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CONTROL_STATUS;
-	return mavlink_finalize_message(msg, system_id, component_id, 8, 157);
-}
-
-/**
- * @brief Pack a control_status message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param position_fix Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- * @param vision_fix Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- * @param gps_fix GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- * @param ahrs_health Attitude estimation health: 0: poor, 255: excellent
- * @param control_att 0: Attitude control disabled, 1: enabled
- * @param control_pos_xy 0: X, Y position control disabled, 1: enabled
- * @param control_pos_z 0: Z position control disabled, 1: enabled
- * @param control_pos_yaw 0: Yaw angle control disabled, 1: enabled
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_control_status_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t position_fix,uint8_t vision_fix,uint8_t gps_fix,uint8_t ahrs_health,uint8_t control_att,uint8_t control_pos_xy,uint8_t control_pos_z,uint8_t control_pos_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, position_fix);
-	_mav_put_uint8_t(buf, 1, vision_fix);
-	_mav_put_uint8_t(buf, 2, gps_fix);
-	_mav_put_uint8_t(buf, 3, ahrs_health);
-	_mav_put_uint8_t(buf, 4, control_att);
-	_mav_put_uint8_t(buf, 5, control_pos_xy);
-	_mav_put_uint8_t(buf, 6, control_pos_z);
-	_mav_put_uint8_t(buf, 7, control_pos_yaw);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 8);
-#else
-	mavlink_control_status_t packet;
-	packet.position_fix = position_fix;
-	packet.vision_fix = vision_fix;
-	packet.gps_fix = gps_fix;
-	packet.ahrs_health = ahrs_health;
-	packet.control_att = control_att;
-	packet.control_pos_xy = control_pos_xy;
-	packet.control_pos_z = control_pos_z;
-	packet.control_pos_yaw = control_pos_yaw;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 8);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_CONTROL_STATUS;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 8, 157);
-}
-
-/**
- * @brief Encode a control_status struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param control_status C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_control_status_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_control_status_t* control_status)
-{
-	return mavlink_msg_control_status_pack(system_id, component_id, msg, control_status->position_fix, control_status->vision_fix, control_status->gps_fix, control_status->ahrs_health, control_status->control_att, control_status->control_pos_xy, control_status->control_pos_z, control_status->control_pos_yaw);
-}
-
-/**
- * @brief Send a control_status message
- * @param chan MAVLink channel to send the message
- *
- * @param position_fix Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- * @param vision_fix Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- * @param gps_fix GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- * @param ahrs_health Attitude estimation health: 0: poor, 255: excellent
- * @param control_att 0: Attitude control disabled, 1: enabled
- * @param control_pos_xy 0: X, Y position control disabled, 1: enabled
- * @param control_pos_z 0: Z position control disabled, 1: enabled
- * @param control_pos_yaw 0: Yaw angle control disabled, 1: enabled
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_control_status_send(mavlink_channel_t chan, uint8_t position_fix, uint8_t vision_fix, uint8_t gps_fix, uint8_t ahrs_health, uint8_t control_att, uint8_t control_pos_xy, uint8_t control_pos_z, uint8_t control_pos_yaw)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[8];
-	_mav_put_uint8_t(buf, 0, position_fix);
-	_mav_put_uint8_t(buf, 1, vision_fix);
-	_mav_put_uint8_t(buf, 2, gps_fix);
-	_mav_put_uint8_t(buf, 3, ahrs_health);
-	_mav_put_uint8_t(buf, 4, control_att);
-	_mav_put_uint8_t(buf, 5, control_pos_xy);
-	_mav_put_uint8_t(buf, 6, control_pos_z);
-	_mav_put_uint8_t(buf, 7, control_pos_yaw);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONTROL_STATUS, buf, 8, 157);
-#else
-	mavlink_control_status_t packet;
-	packet.position_fix = position_fix;
-	packet.vision_fix = vision_fix;
-	packet.gps_fix = gps_fix;
-	packet.ahrs_health = ahrs_health;
-	packet.control_att = control_att;
-	packet.control_pos_xy = control_pos_xy;
-	packet.control_pos_z = control_pos_z;
-	packet.control_pos_yaw = control_pos_yaw;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_CONTROL_STATUS, (const char *)&packet, 8, 157);
-#endif
-}
-
-#endif
-
-// MESSAGE CONTROL_STATUS UNPACKING
-
-
-/**
- * @brief Get field position_fix from control_status message
- *
- * @return Position fix: 0: lost, 2: 2D position fix, 3: 3D position fix 
- */
-static inline uint8_t mavlink_msg_control_status_get_position_fix(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field vision_fix from control_status message
- *
- * @return Vision position fix: 0: lost, 1: 2D local position hold, 2: 2D global position fix, 3: 3D global position fix 
- */
-static inline uint8_t mavlink_msg_control_status_get_vision_fix(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field gps_fix from control_status message
- *
- * @return GPS position fix: 0: no reception, 1: Minimum 1 satellite, but no position fix, 2: 2D position fix, 3: 3D position fix 
- */
-static inline uint8_t mavlink_msg_control_status_get_gps_fix(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Get field ahrs_health from control_status message
- *
- * @return Attitude estimation health: 0: poor, 255: excellent
- */
-static inline uint8_t mavlink_msg_control_status_get_ahrs_health(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  3);
-}
-
-/**
- * @brief Get field control_att from control_status message
- *
- * @return 0: Attitude control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_att(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  4);
-}
-
-/**
- * @brief Get field control_pos_xy from control_status message
- *
- * @return 0: X, Y position control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_pos_xy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  5);
-}
-
-/**
- * @brief Get field control_pos_z from control_status message
- *
- * @return 0: Z position control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_pos_z(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  6);
-}
-
-/**
- * @brief Get field control_pos_yaw from control_status message
- *
- * @return 0: Yaw angle control disabled, 1: enabled
- */
-static inline uint8_t mavlink_msg_control_status_get_control_pos_yaw(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  7);
-}
-
-/**
- * @brief Decode a control_status message into a struct
- *
- * @param msg The message to decode
- * @param control_status C-struct to decode the message contents into
- */
-static inline void mavlink_msg_control_status_decode(const mavlink_message_t* msg, mavlink_control_status_t* control_status)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	control_status->position_fix = mavlink_msg_control_status_get_position_fix(msg);
-	control_status->vision_fix = mavlink_msg_control_status_get_vision_fix(msg);
-	control_status->gps_fix = mavlink_msg_control_status_get_gps_fix(msg);
-	control_status->ahrs_health = mavlink_msg_control_status_get_ahrs_health(msg);
-	control_status->control_att = mavlink_msg_control_status_get_control_att(msg);
-	control_status->control_pos_xy = mavlink_msg_control_status_get_control_pos_xy(msg);
-	control_status->control_pos_z = mavlink_msg_control_status_get_control_pos_z(msg);
-	control_status->control_pos_yaw = mavlink_msg_control_status_get_control_pos_yaw(msg);
-#else
-	memcpy(control_status, _MAV_PAYLOAD(msg), 8);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_data_stream.h

@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_data_stream_pack(uint8_t system_id, uint8_t c
  * @brief Pack a data_stream message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param stream_id The ID of the requested data stream
  * @param message_rate The requested interval between two messages of this type
@@ -105,7 +105,7 @@ static inline uint16_t mavlink_msg_data_stream_pack_chan(uint8_t system_id, uint
 }
 
 /**
- * @brief Encode a data_stream struct into a message
+ * @brief Encode a data_stream struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -117,6 +117,20 @@ static inline uint16_t mavlink_msg_data_stream_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_data_stream_pack(system_id, component_id, msg, data_stream->stream_id, data_stream->message_rate, data_stream->on_off);
 }
 
+/**
+ * @brief Encode a data_stream struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param data_stream C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_data_stream_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_data_stream_t* data_stream)
+{
+	return mavlink_msg_data_stream_pack_chan(system_id, component_id, chan, msg, data_stream->stream_id, data_stream->message_rate, data_stream->on_off);
+}
+
 /**
  * @brief Send a data_stream message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_debug.h

@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_debug_pack(uint8_t system_id, uint8_t compone
  * @brief Pack a debug message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param ind index of debug variable
@@ -105,7 +105,7 @@ static inline uint16_t mavlink_msg_debug_pack_chan(uint8_t system_id, uint8_t co
 }
 
 /**
- * @brief Encode a debug struct into a message
+ * @brief Encode a debug struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -117,6 +117,20 @@ static inline uint16_t mavlink_msg_debug_encode(uint8_t system_id, uint8_t compo
 	return mavlink_msg_debug_pack(system_id, component_id, msg, debug->time_boot_ms, debug->ind, debug->value);
 }
 
+/**
+ * @brief Encode a debug struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param debug C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_debug_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_debug_t* debug)
+{
+	return mavlink_msg_debug_pack_chan(system_id, component_id, chan, msg, debug->time_boot_ms, debug->ind, debug->value);
+}
+
 /**
  * @brief Send a debug message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_debug_vect.h

@@ -77,7 +77,7 @@ static inline uint16_t mavlink_msg_debug_vect_pack(uint8_t system_id, uint8_t co
  * @brief Pack a debug_vect message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param name Name
  * @param time_usec Timestamp
@@ -117,7 +117,7 @@ static inline uint16_t mavlink_msg_debug_vect_pack_chan(uint8_t system_id, uint8
 }
 
 /**
- * @brief Encode a debug_vect struct into a message
+ * @brief Encode a debug_vect struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -129,6 +129,20 @@ static inline uint16_t mavlink_msg_debug_vect_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_debug_vect_pack(system_id, component_id, msg, debug_vect->name, debug_vect->time_usec, debug_vect->x, debug_vect->y, debug_vect->z);
 }
 
+/**
+ * @brief Encode a debug_vect struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param debug_vect C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_debug_vect_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_debug_vect_t* debug_vect)
+{
+	return mavlink_msg_debug_vect_pack_chan(system_id, component_id, chan, msg, debug_vect->name, debug_vect->time_usec, debug_vect->x, debug_vect->y, debug_vect->z);
+}
+
 /**
  * @brief Send a debug_vect message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_extended_message.h

@@ -1,188 +0,0 @@
-// MESSAGE EXTENDED_MESSAGE PACKING
-
-#define MAVLINK_MSG_ID_EXTENDED_MESSAGE 255
-
-typedef struct __mavlink_extended_message_t
-{
- uint8_t target_system; ///< System which should execute the command
- uint8_t target_component; ///< Component which should execute the command, 0 for all components
- uint8_t protocol_flags; ///< Retransmission / ACK flags
-} mavlink_extended_message_t;
-
-#define MAVLINK_MSG_ID_EXTENDED_MESSAGE_LEN 3
-#define MAVLINK_MSG_ID_255_LEN 3
-
-
-
-#define MAVLINK_MESSAGE_INFO_EXTENDED_MESSAGE { \
-	"EXTENDED_MESSAGE", \
-	3, \
-	{  { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 0, offsetof(mavlink_extended_message_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 1, offsetof(mavlink_extended_message_t, target_component) }, \
-         { "protocol_flags", NULL, MAVLINK_TYPE_UINT8_T, 0, 2, offsetof(mavlink_extended_message_t, protocol_flags) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a extended_message message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param protocol_flags Retransmission / ACK flags
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_extended_message_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, uint8_t protocol_flags)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, protocol_flags);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 3);
-#else
-	mavlink_extended_message_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.protocol_flags = protocol_flags;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_EXTENDED_MESSAGE;
-	return mavlink_finalize_message(msg, system_id, component_id, 3, 247);
-}
-
-/**
- * @brief Pack a extended_message message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param protocol_flags Retransmission / ACK flags
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_extended_message_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,uint8_t protocol_flags)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, protocol_flags);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 3);
-#else
-	mavlink_extended_message_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.protocol_flags = protocol_flags;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 3);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_EXTENDED_MESSAGE;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 3, 247);
-}
-
-/**
- * @brief Encode a extended_message struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param extended_message C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_extended_message_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_extended_message_t* extended_message)
-{
-	return mavlink_msg_extended_message_pack(system_id, component_id, msg, extended_message->target_system, extended_message->target_component, extended_message->protocol_flags);
-}
-
-/**
- * @brief Send a extended_message message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System which should execute the command
- * @param target_component Component which should execute the command, 0 for all components
- * @param protocol_flags Retransmission / ACK flags
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_extended_message_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, uint8_t protocol_flags)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[3];
-	_mav_put_uint8_t(buf, 0, target_system);
-	_mav_put_uint8_t(buf, 1, target_component);
-	_mav_put_uint8_t(buf, 2, protocol_flags);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_EXTENDED_MESSAGE, buf, 3, 247);
-#else
-	mavlink_extended_message_t packet;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-	packet.protocol_flags = protocol_flags;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_EXTENDED_MESSAGE, (const char *)&packet, 3, 247);
-#endif
-}
-
-#endif
-
-// MESSAGE EXTENDED_MESSAGE UNPACKING
-
-
-/**
- * @brief Get field target_system from extended_message message
- *
- * @return System which should execute the command
- */
-static inline uint8_t mavlink_msg_extended_message_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  0);
-}
-
-/**
- * @brief Get field target_component from extended_message message
- *
- * @return Component which should execute the command, 0 for all components
- */
-static inline uint8_t mavlink_msg_extended_message_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  1);
-}
-
-/**
- * @brief Get field protocol_flags from extended_message message
- *
- * @return Retransmission / ACK flags
- */
-static inline uint8_t mavlink_msg_extended_message_get_protocol_flags(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  2);
-}
-
-/**
- * @brief Decode a extended_message message into a struct
- *
- * @param msg The message to decode
- * @param extended_message C-struct to decode the message contents into
- */
-static inline void mavlink_msg_extended_message_decode(const mavlink_message_t* msg, mavlink_extended_message_t* extended_message)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	extended_message->target_system = mavlink_msg_extended_message_get_target_system(msg);
-	extended_message->target_component = mavlink_msg_extended_message_get_target_component(msg);
-	extended_message->protocol_flags = mavlink_msg_extended_message_get_protocol_flags(msg);
-#else
-	memcpy(extended_message, _MAV_PAYLOAD(msg), 3);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_file_transfer_dir_list.h

@@ -67,7 +67,7 @@ static inline uint16_t mavlink_msg_file_transfer_dir_list_pack(uint8_t system_id
  * @brief Pack a file_transfer_dir_list message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param transfer_uid Unique transfer ID
  * @param dir_path Directory path to list
@@ -101,7 +101,7 @@ static inline uint16_t mavlink_msg_file_transfer_dir_list_pack_chan(uint8_t syst
 }
 
 /**
- * @brief Encode a file_transfer_dir_list struct into a message
+ * @brief Encode a file_transfer_dir_list struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -113,6 +113,20 @@ static inline uint16_t mavlink_msg_file_transfer_dir_list_encode(uint8_t system_
 	return mavlink_msg_file_transfer_dir_list_pack(system_id, component_id, msg, file_transfer_dir_list->transfer_uid, file_transfer_dir_list->dir_path, file_transfer_dir_list->flags);
 }
 
+/**
+ * @brief Encode a file_transfer_dir_list struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param file_transfer_dir_list C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_file_transfer_dir_list_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_file_transfer_dir_list_t* file_transfer_dir_list)
+{
+	return mavlink_msg_file_transfer_dir_list_pack_chan(system_id, component_id, chan, msg, file_transfer_dir_list->transfer_uid, file_transfer_dir_list->dir_path, file_transfer_dir_list->flags);
+}
+
 /**
  * @brief Send a file_transfer_dir_list message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_file_transfer_res.h

@@ -64,7 +64,7 @@ static inline uint16_t mavlink_msg_file_transfer_res_pack(uint8_t system_id, uin
  * @brief Pack a file_transfer_res message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param transfer_uid Unique transfer ID
  * @param result 0: OK, 1: not permitted, 2: bad path / file name, 3: no space left on device
@@ -97,7 +97,7 @@ static inline uint16_t mavlink_msg_file_transfer_res_pack_chan(uint8_t system_id
 }
 
 /**
- * @brief Encode a file_transfer_res struct into a message
+ * @brief Encode a file_transfer_res struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -109,6 +109,20 @@ static inline uint16_t mavlink_msg_file_transfer_res_encode(uint8_t system_id, u
 	return mavlink_msg_file_transfer_res_pack(system_id, component_id, msg, file_transfer_res->transfer_uid, file_transfer_res->result);
 }
 
+/**
+ * @brief Encode a file_transfer_res struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param file_transfer_res C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_file_transfer_res_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_file_transfer_res_t* file_transfer_res)
+{
+	return mavlink_msg_file_transfer_res_pack_chan(system_id, component_id, chan, msg, file_transfer_res->transfer_uid, file_transfer_res->result);
+}
+
 /**
  * @brief Send a file_transfer_res message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_file_transfer_start.h

@@ -77,7 +77,7 @@ static inline uint16_t mavlink_msg_file_transfer_start_pack(uint8_t system_id, u
  * @brief Pack a file_transfer_start message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param transfer_uid Unique transfer ID
  * @param dest_path Destination path
@@ -117,7 +117,7 @@ static inline uint16_t mavlink_msg_file_transfer_start_pack_chan(uint8_t system_
 }
 
 /**
- * @brief Encode a file_transfer_start struct into a message
+ * @brief Encode a file_transfer_start struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -129,6 +129,20 @@ static inline uint16_t mavlink_msg_file_transfer_start_encode(uint8_t system_id,
 	return mavlink_msg_file_transfer_start_pack(system_id, component_id, msg, file_transfer_start->transfer_uid, file_transfer_start->dest_path, file_transfer_start->direction, file_transfer_start->file_size, file_transfer_start->flags);
 }
 
+/**
+ * @brief Encode a file_transfer_start struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param file_transfer_start C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_file_transfer_start_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_file_transfer_start_t* file_transfer_start)
+{
+	return mavlink_msg_file_transfer_start_pack_chan(system_id, component_id, chan, msg, file_transfer_start->transfer_uid, file_transfer_start->dest_path, file_transfer_start->direction, file_transfer_start->file_size, file_transfer_start->flags);
+}
+
 /**
  * @brief Send a file_transfer_start message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_global_position.h

@@ -1,276 +0,0 @@
-// MESSAGE GLOBAL_POSITION PACKING
-
-#define MAVLINK_MSG_ID_GLOBAL_POSITION 33
-
-typedef struct __mavlink_global_position_t
-{
- uint64_t usec; ///< Timestamp (microseconds since unix epoch)
- float lat; ///< Latitude, in degrees
- float lon; ///< Longitude, in degrees
- float alt; ///< Absolute altitude, in meters
- float vx; ///< X Speed (in Latitude direction, positive: going north)
- float vy; ///< Y Speed (in Longitude direction, positive: going east)
- float vz; ///< Z Speed (in Altitude direction, positive: going up)
-} mavlink_global_position_t;
-
-#define MAVLINK_MSG_ID_GLOBAL_POSITION_LEN 32
-#define MAVLINK_MSG_ID_33_LEN 32
-
-
-
-#define MAVLINK_MESSAGE_INFO_GLOBAL_POSITION { \
-	"GLOBAL_POSITION", \
-	7, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_global_position_t, usec) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_global_position_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_global_position_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_global_position_t, alt) }, \
-         { "vx", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_global_position_t, vx) }, \
-         { "vy", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_global_position_t, vy) }, \
-         { "vz", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_global_position_t, vz) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a global_position message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since unix epoch)
- * @param lat Latitude, in degrees
- * @param lon Longitude, in degrees
- * @param alt Absolute altitude, in meters
- * @param vx X Speed (in Latitude direction, positive: going north)
- * @param vy Y Speed (in Longitude direction, positive: going east)
- * @param vz Z Speed (in Altitude direction, positive: going up)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_global_position_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, float lat, float lon, float alt, float vx, float vy, float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 32);
-#else
-	mavlink_global_position_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GLOBAL_POSITION;
-	return mavlink_finalize_message(msg, system_id, component_id, 32, 147);
-}
-
-/**
- * @brief Pack a global_position message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since unix epoch)
- * @param lat Latitude, in degrees
- * @param lon Longitude, in degrees
- * @param alt Absolute altitude, in meters
- * @param vx X Speed (in Latitude direction, positive: going north)
- * @param vy Y Speed (in Longitude direction, positive: going east)
- * @param vz Z Speed (in Altitude direction, positive: going up)
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_global_position_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,float lat,float lon,float alt,float vx,float vy,float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 32);
-#else
-	mavlink_global_position_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 32);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GLOBAL_POSITION;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 32, 147);
-}
-
-/**
- * @brief Encode a global_position struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param global_position C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_global_position_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_global_position_t* global_position)
-{
-	return mavlink_msg_global_position_pack(system_id, component_id, msg, global_position->usec, global_position->lat, global_position->lon, global_position->alt, global_position->vx, global_position->vy, global_position->vz);
-}
-
-/**
- * @brief Send a global_position message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since unix epoch)
- * @param lat Latitude, in degrees
- * @param lon Longitude, in degrees
- * @param alt Absolute altitude, in meters
- * @param vx X Speed (in Latitude direction, positive: going north)
- * @param vy Y Speed (in Longitude direction, positive: going east)
- * @param vz Z Speed (in Altitude direction, positive: going up)
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_global_position_send(mavlink_channel_t chan, uint64_t usec, float lat, float lon, float alt, float vx, float vy, float vz)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[32];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, vx);
-	_mav_put_float(buf, 24, vy);
-	_mav_put_float(buf, 28, vz);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GLOBAL_POSITION, buf, 32, 147);
-#else
-	mavlink_global_position_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.vx = vx;
-	packet.vy = vy;
-	packet.vz = vz;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GLOBAL_POSITION, (const char *)&packet, 32, 147);
-#endif
-}
-
-#endif
-
-// MESSAGE GLOBAL_POSITION UNPACKING
-
-
-/**
- * @brief Get field usec from global_position message
- *
- * @return Timestamp (microseconds since unix epoch)
- */
-static inline uint64_t mavlink_msg_global_position_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field lat from global_position message
- *
- * @return Latitude, in degrees
- */
-static inline float mavlink_msg_global_position_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field lon from global_position message
- *
- * @return Longitude, in degrees
- */
-static inline float mavlink_msg_global_position_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field alt from global_position message
- *
- * @return Absolute altitude, in meters
- */
-static inline float mavlink_msg_global_position_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field vx from global_position message
- *
- * @return X Speed (in Latitude direction, positive: going north)
- */
-static inline float mavlink_msg_global_position_get_vx(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field vy from global_position message
- *
- * @return Y Speed (in Longitude direction, positive: going east)
- */
-static inline float mavlink_msg_global_position_get_vy(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field vz from global_position message
- *
- * @return Z Speed (in Altitude direction, positive: going up)
- */
-static inline float mavlink_msg_global_position_get_vz(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Decode a global_position message into a struct
- *
- * @param msg The message to decode
- * @param global_position C-struct to decode the message contents into
- */
-static inline void mavlink_msg_global_position_decode(const mavlink_message_t* msg, mavlink_global_position_t* global_position)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	global_position->usec = mavlink_msg_global_position_get_usec(msg);
-	global_position->lat = mavlink_msg_global_position_get_lat(msg);
-	global_position->lon = mavlink_msg_global_position_get_lon(msg);
-	global_position->alt = mavlink_msg_global_position_get_alt(msg);
-	global_position->vx = mavlink_msg_global_position_get_vx(msg);
-	global_position->vy = mavlink_msg_global_position_get_vy(msg);
-	global_position->vz = mavlink_msg_global_position_get_vz(msg);
-#else
-	memcpy(global_position, _MAV_PAYLOAD(msg), 32);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_global_position_int.h

@@ -12,7 +12,7 @@ typedef struct __mavlink_global_position_int_t
  int16_t vx; ///< Ground X Speed (Latitude), expressed as m/s * 100
  int16_t vy; ///< Ground Y Speed (Longitude), expressed as m/s * 100
  int16_t vz; ///< Ground Z Speed (Altitude), expressed as m/s * 100
- uint16_t hdg; ///< Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ uint16_t hdg; ///< Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
 } mavlink_global_position_int_t;
 
 #define MAVLINK_MSG_ID_GLOBAL_POSITION_INT_LEN 28
@@ -53,7 +53,7 @@ typedef struct __mavlink_global_position_int_t
  * @param vx Ground X Speed (Latitude), expressed as m/s * 100
  * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
  * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @param hdg Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @param hdg Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_global_position_int_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
@@ -99,7 +99,7 @@ static inline uint16_t mavlink_msg_global_position_int_pack(uint8_t system_id, u
  * @brief Pack a global_position_int message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param time_boot_ms Timestamp (milliseconds since system boot)
  * @param lat Latitude, expressed as * 1E7
@@ -109,7 +109,7 @@ static inline uint16_t mavlink_msg_global_position_int_pack(uint8_t system_id, u
  * @param vx Ground X Speed (Latitude), expressed as m/s * 100
  * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
  * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @param hdg Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @param hdg Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  * @return length of the message in bytes (excluding serial stream start sign)
  */
 static inline uint16_t mavlink_msg_global_position_int_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
@@ -153,7 +153,7 @@ static inline uint16_t mavlink_msg_global_position_int_pack_chan(uint8_t system_
 }
 
 /**
- * @brief Encode a global_position_int struct into a message
+ * @brief Encode a global_position_int struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -165,6 +165,20 @@ static inline uint16_t mavlink_msg_global_position_int_encode(uint8_t system_id,
 	return mavlink_msg_global_position_int_pack(system_id, component_id, msg, global_position_int->time_boot_ms, global_position_int->lat, global_position_int->lon, global_position_int->alt, global_position_int->relative_alt, global_position_int->vx, global_position_int->vy, global_position_int->vz, global_position_int->hdg);
 }
 
+/**
+ * @brief Encode a global_position_int struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param global_position_int C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_global_position_int_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_global_position_int_t* global_position_int)
+{
+	return mavlink_msg_global_position_int_pack_chan(system_id, component_id, chan, msg, global_position_int->time_boot_ms, global_position_int->lat, global_position_int->lon, global_position_int->alt, global_position_int->relative_alt, global_position_int->vx, global_position_int->vy, global_position_int->vz, global_position_int->hdg);
+}
+
 /**
  * @brief Send a global_position_int message
  * @param chan MAVLink channel to send the message
@@ -177,7 +191,7 @@ static inline uint16_t mavlink_msg_global_position_int_encode(uint8_t system_id,
  * @param vx Ground X Speed (Latitude), expressed as m/s * 100
  * @param vy Ground Y Speed (Longitude), expressed as m/s * 100
  * @param vz Ground Z Speed (Altitude), expressed as m/s * 100
- * @param hdg Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @param hdg Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
 
@@ -308,7 +322,7 @@ static inline int16_t mavlink_msg_global_position_int_get_vz(const mavlink_messa
 /**
  * @brief Get field hdg from global_position_int message
  *
- * @return Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @return Compass heading in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  */
 static inline uint16_t mavlink_msg_global_position_int_get_hdg(const mavlink_message_t* msg)
 {

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_global_position_setpoint_int.h

@@ -79,7 +79,7 @@ static inline uint16_t mavlink_msg_global_position_setpoint_int_pack(uint8_t sys
  * @brief Pack a global_position_setpoint_int message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param coordinate_frame Coordinate frame - valid values are only MAV_FRAME_GLOBAL or MAV_FRAME_GLOBAL_RELATIVE_ALT
  * @param latitude Latitude (WGS84), in degrees * 1E7
@@ -121,7 +121,7 @@ static inline uint16_t mavlink_msg_global_position_setpoint_int_pack_chan(uint8_
 }
 
 /**
- * @brief Encode a global_position_setpoint_int struct into a message
+ * @brief Encode a global_position_setpoint_int struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -133,6 +133,20 @@ static inline uint16_t mavlink_msg_global_position_setpoint_int_encode(uint8_t s
 	return mavlink_msg_global_position_setpoint_int_pack(system_id, component_id, msg, global_position_setpoint_int->coordinate_frame, global_position_setpoint_int->latitude, global_position_setpoint_int->longitude, global_position_setpoint_int->altitude, global_position_setpoint_int->yaw);
 }
 
+/**
+ * @brief Encode a global_position_setpoint_int struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param global_position_setpoint_int C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_global_position_setpoint_int_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_global_position_setpoint_int_t* global_position_setpoint_int)
+{
+	return mavlink_msg_global_position_setpoint_int_pack_chan(system_id, component_id, chan, msg, global_position_setpoint_int->coordinate_frame, global_position_setpoint_int->latitude, global_position_setpoint_int->longitude, global_position_setpoint_int->altitude, global_position_setpoint_int->yaw);
+}
+
 /**
  * @brief Send a global_position_setpoint_int message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_global_vision_position_estimate.h

@@ -89,7 +89,7 @@ static inline uint16_t mavlink_msg_global_vision_position_estimate_pack(uint8_t
  * @brief Pack a global_vision_position_estimate message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param usec Timestamp (microseconds, synced to UNIX time or since system boot)
  * @param x Global X position
@@ -137,7 +137,7 @@ static inline uint16_t mavlink_msg_global_vision_position_estimate_pack_chan(uin
 }
 
 /**
- * @brief Encode a global_vision_position_estimate struct into a message
+ * @brief Encode a global_vision_position_estimate struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -149,6 +149,20 @@ static inline uint16_t mavlink_msg_global_vision_position_estimate_encode(uint8_
 	return mavlink_msg_global_vision_position_estimate_pack(system_id, component_id, msg, global_vision_position_estimate->usec, global_vision_position_estimate->x, global_vision_position_estimate->y, global_vision_position_estimate->z, global_vision_position_estimate->roll, global_vision_position_estimate->pitch, global_vision_position_estimate->yaw);
 }
 
+/**
+ * @brief Encode a global_vision_position_estimate struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param global_vision_position_estimate C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_global_vision_position_estimate_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_global_vision_position_estimate_t* global_vision_position_estimate)
+{
+	return mavlink_msg_global_vision_position_estimate_pack_chan(system_id, component_id, chan, msg, global_vision_position_estimate->usec, global_vision_position_estimate->x, global_vision_position_estimate->y, global_vision_position_estimate->z, global_vision_position_estimate->roll, global_vision_position_estimate->pitch, global_vision_position_estimate->yaw);
+}
+
 /**
  * @brief Send a global_vision_position_estimate message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_gps_global_origin.h

@@ -69,7 +69,7 @@ static inline uint16_t mavlink_msg_gps_global_origin_pack(uint8_t system_id, uin
  * @brief Pack a gps_global_origin message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param latitude Latitude (WGS84), in degrees * 1E7
  * @param longitude Longitude (WGS84), in degrees * 1E7
@@ -105,7 +105,7 @@ static inline uint16_t mavlink_msg_gps_global_origin_pack_chan(uint8_t system_id
 }
 
 /**
- * @brief Encode a gps_global_origin struct into a message
+ * @brief Encode a gps_global_origin struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -117,6 +117,20 @@ static inline uint16_t mavlink_msg_gps_global_origin_encode(uint8_t system_id, u
 	return mavlink_msg_gps_global_origin_pack(system_id, component_id, msg, gps_global_origin->latitude, gps_global_origin->longitude, gps_global_origin->altitude);
 }
 
+/**
+ * @brief Encode a gps_global_origin struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param gps_global_origin C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_gps_global_origin_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gps_global_origin_t* gps_global_origin)
+{
+	return mavlink_msg_gps_global_origin_pack_chan(system_id, component_id, chan, msg, gps_global_origin->latitude, gps_global_origin->longitude, gps_global_origin->altitude);
+}
+
 /**
  * @brief Send a gps_global_origin message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_gps_local_origin_set.h

@@ -1,188 +0,0 @@
-// MESSAGE GPS_LOCAL_ORIGIN_SET PACKING
-
-#define MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET 49
-
-typedef struct __mavlink_gps_local_origin_set_t
-{
- int32_t latitude; ///< Latitude (WGS84), expressed as * 1E7
- int32_t longitude; ///< Longitude (WGS84), expressed as * 1E7
- int32_t altitude; ///< Altitude(WGS84), expressed as * 1000
-} mavlink_gps_local_origin_set_t;
-
-#define MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET_LEN 12
-#define MAVLINK_MSG_ID_49_LEN 12
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_LOCAL_ORIGIN_SET { \
-	"GPS_LOCAL_ORIGIN_SET", \
-	3, \
-	{  { "latitude", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_gps_local_origin_set_t, latitude) }, \
-         { "longitude", NULL, MAVLINK_TYPE_INT32_T, 0, 4, offsetof(mavlink_gps_local_origin_set_t, longitude) }, \
-         { "altitude", NULL, MAVLINK_TYPE_INT32_T, 0, 8, offsetof(mavlink_gps_local_origin_set_t, altitude) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_local_origin_set message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param latitude Latitude (WGS84), expressed as * 1E7
- * @param longitude Longitude (WGS84), expressed as * 1E7
- * @param altitude Altitude(WGS84), expressed as * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_local_origin_set_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 12);
-#else
-	mavlink_gps_local_origin_set_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET;
-	return mavlink_finalize_message(msg, system_id, component_id, 12, 14);
-}
-
-/**
- * @brief Pack a gps_local_origin_set message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param latitude Latitude (WGS84), expressed as * 1E7
- * @param longitude Longitude (WGS84), expressed as * 1E7
- * @param altitude Altitude(WGS84), expressed as * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_local_origin_set_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           int32_t latitude,int32_t longitude,int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 12);
-#else
-	mavlink_gps_local_origin_set_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 12);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 12, 14);
-}
-
-/**
- * @brief Encode a gps_local_origin_set struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_local_origin_set C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_local_origin_set_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_local_origin_set_t* gps_local_origin_set)
-{
-	return mavlink_msg_gps_local_origin_set_pack(system_id, component_id, msg, gps_local_origin_set->latitude, gps_local_origin_set->longitude, gps_local_origin_set->altitude);
-}
-
-/**
- * @brief Send a gps_local_origin_set message
- * @param chan MAVLink channel to send the message
- *
- * @param latitude Latitude (WGS84), expressed as * 1E7
- * @param longitude Longitude (WGS84), expressed as * 1E7
- * @param altitude Altitude(WGS84), expressed as * 1000
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_local_origin_set_send(mavlink_channel_t chan, int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[12];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET, buf, 12, 14);
-#else
-	mavlink_gps_local_origin_set_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_LOCAL_ORIGIN_SET, (const char *)&packet, 12, 14);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_LOCAL_ORIGIN_SET UNPACKING
-
-
-/**
- * @brief Get field latitude from gps_local_origin_set message
- *
- * @return Latitude (WGS84), expressed as * 1E7
- */
-static inline int32_t mavlink_msg_gps_local_origin_set_get_latitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  0);
-}
-
-/**
- * @brief Get field longitude from gps_local_origin_set message
- *
- * @return Longitude (WGS84), expressed as * 1E7
- */
-static inline int32_t mavlink_msg_gps_local_origin_set_get_longitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  4);
-}
-
-/**
- * @brief Get field altitude from gps_local_origin_set message
- *
- * @return Altitude(WGS84), expressed as * 1000
- */
-static inline int32_t mavlink_msg_gps_local_origin_set_get_altitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  8);
-}
-
-/**
- * @brief Decode a gps_local_origin_set message into a struct
- *
- * @param msg The message to decode
- * @param gps_local_origin_set C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_local_origin_set_decode(const mavlink_message_t* msg, mavlink_gps_local_origin_set_t* gps_local_origin_set)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_local_origin_set->latitude = mavlink_msg_gps_local_origin_set_get_latitude(msg);
-	gps_local_origin_set->longitude = mavlink_msg_gps_local_origin_set_get_longitude(msg);
-	gps_local_origin_set->altitude = mavlink_msg_gps_local_origin_set_get_altitude(msg);
-#else
-	memcpy(gps_local_origin_set, _MAV_PAYLOAD(msg), 12);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_gps_raw.h

@@ -1,320 +0,0 @@
-// MESSAGE GPS_RAW PACKING
-
-#define MAVLINK_MSG_ID_GPS_RAW 32
-
-typedef struct __mavlink_gps_raw_t
-{
- uint64_t usec; ///< Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- float lat; ///< Latitude in degrees
- float lon; ///< Longitude in degrees
- float alt; ///< Altitude in meters
- float eph; ///< GPS HDOP
- float epv; ///< GPS VDOP
- float v; ///< GPS ground speed
- float hdg; ///< Compass heading in degrees, 0..360 degrees
- uint8_t fix_type; ///< 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
-} mavlink_gps_raw_t;
-
-#define MAVLINK_MSG_ID_GPS_RAW_LEN 37
-#define MAVLINK_MSG_ID_32_LEN 37
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_RAW { \
-	"GPS_RAW", \
-	9, \
-	{  { "usec", NULL, MAVLINK_TYPE_UINT64_T, 0, 0, offsetof(mavlink_gps_raw_t, usec) }, \
-         { "lat", NULL, MAVLINK_TYPE_FLOAT, 0, 8, offsetof(mavlink_gps_raw_t, lat) }, \
-         { "lon", NULL, MAVLINK_TYPE_FLOAT, 0, 12, offsetof(mavlink_gps_raw_t, lon) }, \
-         { "alt", NULL, MAVLINK_TYPE_FLOAT, 0, 16, offsetof(mavlink_gps_raw_t, alt) }, \
-         { "eph", NULL, MAVLINK_TYPE_FLOAT, 0, 20, offsetof(mavlink_gps_raw_t, eph) }, \
-         { "epv", NULL, MAVLINK_TYPE_FLOAT, 0, 24, offsetof(mavlink_gps_raw_t, epv) }, \
-         { "v", NULL, MAVLINK_TYPE_FLOAT, 0, 28, offsetof(mavlink_gps_raw_t, v) }, \
-         { "hdg", NULL, MAVLINK_TYPE_FLOAT, 0, 32, offsetof(mavlink_gps_raw_t, hdg) }, \
-         { "fix_type", NULL, MAVLINK_TYPE_UINT8_T, 0, 36, offsetof(mavlink_gps_raw_t, fix_type) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_raw message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in degrees
- * @param lon Longitude in degrees
- * @param alt Altitude in meters
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed
- * @param hdg Compass heading in degrees, 0..360 degrees
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_raw_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint64_t usec, uint8_t fix_type, float lat, float lon, float alt, float eph, float epv, float v, float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, eph);
-	_mav_put_float(buf, 24, epv);
-	_mav_put_float(buf, 28, v);
-	_mav_put_float(buf, 32, hdg);
-	_mav_put_uint8_t(buf, 36, fix_type);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 37);
-#else
-	mavlink_gps_raw_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-	packet.fix_type = fix_type;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 37);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_RAW;
-	return mavlink_finalize_message(msg, system_id, component_id, 37, 220);
-}
-
-/**
- * @brief Pack a gps_raw message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in degrees
- * @param lon Longitude in degrees
- * @param alt Altitude in meters
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed
- * @param hdg Compass heading in degrees, 0..360 degrees
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_raw_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint64_t usec,uint8_t fix_type,float lat,float lon,float alt,float eph,float epv,float v,float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, eph);
-	_mav_put_float(buf, 24, epv);
-	_mav_put_float(buf, 28, v);
-	_mav_put_float(buf, 32, hdg);
-	_mav_put_uint8_t(buf, 36, fix_type);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 37);
-#else
-	mavlink_gps_raw_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-	packet.fix_type = fix_type;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 37);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_RAW;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 37, 220);
-}
-
-/**
- * @brief Encode a gps_raw struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_raw C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_raw_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_raw_t* gps_raw)
-{
-	return mavlink_msg_gps_raw_pack(system_id, component_id, msg, gps_raw->usec, gps_raw->fix_type, gps_raw->lat, gps_raw->lon, gps_raw->alt, gps_raw->eph, gps_raw->epv, gps_raw->v, gps_raw->hdg);
-}
-
-/**
- * @brief Send a gps_raw message
- * @param chan MAVLink channel to send the message
- *
- * @param usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- * @param lat Latitude in degrees
- * @param lon Longitude in degrees
- * @param alt Altitude in meters
- * @param eph GPS HDOP
- * @param epv GPS VDOP
- * @param v GPS ground speed
- * @param hdg Compass heading in degrees, 0..360 degrees
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_raw_send(mavlink_channel_t chan, uint64_t usec, uint8_t fix_type, float lat, float lon, float alt, float eph, float epv, float v, float hdg)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[37];
-	_mav_put_uint64_t(buf, 0, usec);
-	_mav_put_float(buf, 8, lat);
-	_mav_put_float(buf, 12, lon);
-	_mav_put_float(buf, 16, alt);
-	_mav_put_float(buf, 20, eph);
-	_mav_put_float(buf, 24, epv);
-	_mav_put_float(buf, 28, v);
-	_mav_put_float(buf, 32, hdg);
-	_mav_put_uint8_t(buf, 36, fix_type);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_RAW, buf, 37, 220);
-#else
-	mavlink_gps_raw_t packet;
-	packet.usec = usec;
-	packet.lat = lat;
-	packet.lon = lon;
-	packet.alt = alt;
-	packet.eph = eph;
-	packet.epv = epv;
-	packet.v = v;
-	packet.hdg = hdg;
-	packet.fix_type = fix_type;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_RAW, (const char *)&packet, 37, 220);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_RAW UNPACKING
-
-
-/**
- * @brief Get field usec from gps_raw message
- *
- * @return Timestamp (microseconds since UNIX epoch or microseconds since system boot)
- */
-static inline uint64_t mavlink_msg_gps_raw_get_usec(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint64_t(msg,  0);
-}
-
-/**
- * @brief Get field fix_type from gps_raw message
- *
- * @return 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
- */
-static inline uint8_t mavlink_msg_gps_raw_get_fix_type(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  36);
-}
-
-/**
- * @brief Get field lat from gps_raw message
- *
- * @return Latitude in degrees
- */
-static inline float mavlink_msg_gps_raw_get_lat(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  8);
-}
-
-/**
- * @brief Get field lon from gps_raw message
- *
- * @return Longitude in degrees
- */
-static inline float mavlink_msg_gps_raw_get_lon(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  12);
-}
-
-/**
- * @brief Get field alt from gps_raw message
- *
- * @return Altitude in meters
- */
-static inline float mavlink_msg_gps_raw_get_alt(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  16);
-}
-
-/**
- * @brief Get field eph from gps_raw message
- *
- * @return GPS HDOP
- */
-static inline float mavlink_msg_gps_raw_get_eph(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  20);
-}
-
-/**
- * @brief Get field epv from gps_raw message
- *
- * @return GPS VDOP
- */
-static inline float mavlink_msg_gps_raw_get_epv(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  24);
-}
-
-/**
- * @brief Get field v from gps_raw message
- *
- * @return GPS ground speed
- */
-static inline float mavlink_msg_gps_raw_get_v(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  28);
-}
-
-/**
- * @brief Get field hdg from gps_raw message
- *
- * @return Compass heading in degrees, 0..360 degrees
- */
-static inline float mavlink_msg_gps_raw_get_hdg(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_float(msg,  32);
-}
-
-/**
- * @brief Decode a gps_raw message into a struct
- *
- * @param msg The message to decode
- * @param gps_raw C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_raw_decode(const mavlink_message_t* msg, mavlink_gps_raw_t* gps_raw)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_raw->usec = mavlink_msg_gps_raw_get_usec(msg);
-	gps_raw->lat = mavlink_msg_gps_raw_get_lat(msg);
-	gps_raw->lon = mavlink_msg_gps_raw_get_lon(msg);
-	gps_raw->alt = mavlink_msg_gps_raw_get_alt(msg);
-	gps_raw->eph = mavlink_msg_gps_raw_get_eph(msg);
-	gps_raw->epv = mavlink_msg_gps_raw_get_epv(msg);
-	gps_raw->v = mavlink_msg_gps_raw_get_v(msg);
-	gps_raw->hdg = mavlink_msg_gps_raw_get_hdg(msg);
-	gps_raw->fix_type = mavlink_msg_gps_raw_get_fix_type(msg);
-#else
-	memcpy(gps_raw, _MAV_PAYLOAD(msg), 37);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_gps_raw_int.h

@@ -8,10 +8,10 @@ typedef struct __mavlink_gps_raw_int_t
  int32_t lat; ///< Latitude (WGS84), in degrees * 1E7
  int32_t lon; ///< Longitude (WGS84), in degrees * 1E7
  int32_t alt; ///< Altitude (WGS84), in meters * 1000 (positive for up)
- uint16_t eph; ///< GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- uint16_t epv; ///< GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- uint16_t vel; ///< GPS ground speed (m/s * 100). If unknown, set to: 65535
- uint16_t cog; ///< Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ uint16_t eph; ///< GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ uint16_t epv; ///< GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ uint16_t vel; ///< GPS ground speed (m/s * 100). If unknown, set to: UINT16_MAX
+ uint16_t cog; ///< Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  uint8_t fix_type; ///< 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
  uint8_t satellites_visible; ///< Number of satellites visible. If unknown, set to 255
 } mavlink_gps_raw_int_t;
@@ -52,10 +52,10 @@ typedef struct __mavlink_gps_raw_int_t
  * @param lat Latitude (WGS84), in degrees * 1E7
  * @param lon Longitude (WGS84), in degrees * 1E7
  * @param alt Altitude (WGS84), in meters * 1000 (positive for up)
- * @param eph GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- * @param epv GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- * @param vel GPS ground speed (m/s * 100). If unknown, set to: 65535
- * @param cog Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @param eph GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ * @param epv GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ * @param vel GPS ground speed (m/s * 100). If unknown, set to: UINT16_MAX
+ * @param cog Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  * @param satellites_visible Number of satellites visible. If unknown, set to 255
  * @return length of the message in bytes (excluding serial stream start sign)
  */
@@ -104,17 +104,17 @@ static inline uint16_t mavlink_msg_gps_raw_int_pack(uint8_t system_id, uint8_t c
  * @brief Pack a gps_raw_int message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param time_usec Timestamp (microseconds since UNIX epoch or microseconds since system boot)
  * @param fix_type 0-1: no fix, 2: 2D fix, 3: 3D fix. Some applications will not use the value of this field unless it is at least two, so always correctly fill in the fix.
  * @param lat Latitude (WGS84), in degrees * 1E7
  * @param lon Longitude (WGS84), in degrees * 1E7
  * @param alt Altitude (WGS84), in meters * 1000 (positive for up)
- * @param eph GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- * @param epv GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- * @param vel GPS ground speed (m/s * 100). If unknown, set to: 65535
- * @param cog Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @param eph GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ * @param epv GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ * @param vel GPS ground speed (m/s * 100). If unknown, set to: UINT16_MAX
+ * @param cog Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  * @param satellites_visible Number of satellites visible. If unknown, set to 255
  * @return length of the message in bytes (excluding serial stream start sign)
  */
@@ -161,7 +161,7 @@ static inline uint16_t mavlink_msg_gps_raw_int_pack_chan(uint8_t system_id, uint
 }
 
 /**
- * @brief Encode a gps_raw_int struct into a message
+ * @brief Encode a gps_raw_int struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -173,6 +173,20 @@ static inline uint16_t mavlink_msg_gps_raw_int_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_gps_raw_int_pack(system_id, component_id, msg, gps_raw_int->time_usec, gps_raw_int->fix_type, gps_raw_int->lat, gps_raw_int->lon, gps_raw_int->alt, gps_raw_int->eph, gps_raw_int->epv, gps_raw_int->vel, gps_raw_int->cog, gps_raw_int->satellites_visible);
 }
 
+/**
+ * @brief Encode a gps_raw_int struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param gps_raw_int C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_gps_raw_int_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gps_raw_int_t* gps_raw_int)
+{
+	return mavlink_msg_gps_raw_int_pack_chan(system_id, component_id, chan, msg, gps_raw_int->time_usec, gps_raw_int->fix_type, gps_raw_int->lat, gps_raw_int->lon, gps_raw_int->alt, gps_raw_int->eph, gps_raw_int->epv, gps_raw_int->vel, gps_raw_int->cog, gps_raw_int->satellites_visible);
+}
+
 /**
  * @brief Send a gps_raw_int message
  * @param chan MAVLink channel to send the message
@@ -182,10 +196,10 @@ static inline uint16_t mavlink_msg_gps_raw_int_encode(uint8_t system_id, uint8_t
  * @param lat Latitude (WGS84), in degrees * 1E7
  * @param lon Longitude (WGS84), in degrees * 1E7
  * @param alt Altitude (WGS84), in meters * 1000 (positive for up)
- * @param eph GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- * @param epv GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
- * @param vel GPS ground speed (m/s * 100). If unknown, set to: 65535
- * @param cog Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @param eph GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ * @param epv GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
+ * @param vel GPS ground speed (m/s * 100). If unknown, set to: UINT16_MAX
+ * @param cog Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  * @param satellites_visible Number of satellites visible. If unknown, set to 255
  */
 #ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
@@ -289,7 +303,7 @@ static inline int32_t mavlink_msg_gps_raw_int_get_alt(const mavlink_message_t* m
 /**
  * @brief Get field eph from gps_raw_int message
  *
- * @return GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
+ * @return GPS HDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
  */
 static inline uint16_t mavlink_msg_gps_raw_int_get_eph(const mavlink_message_t* msg)
 {
@@ -299,7 +313,7 @@ static inline uint16_t mavlink_msg_gps_raw_int_get_eph(const mavlink_message_t*
 /**
  * @brief Get field epv from gps_raw_int message
  *
- * @return GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: 65535
+ * @return GPS VDOP horizontal dilution of position in cm (m*100). If unknown, set to: UINT16_MAX
  */
 static inline uint16_t mavlink_msg_gps_raw_int_get_epv(const mavlink_message_t* msg)
 {
@@ -309,7 +323,7 @@ static inline uint16_t mavlink_msg_gps_raw_int_get_epv(const mavlink_message_t*
 /**
  * @brief Get field vel from gps_raw_int message
  *
- * @return GPS ground speed (m/s * 100). If unknown, set to: 65535
+ * @return GPS ground speed (m/s * 100). If unknown, set to: UINT16_MAX
  */
 static inline uint16_t mavlink_msg_gps_raw_int_get_vel(const mavlink_message_t* msg)
 {
@@ -319,7 +333,7 @@ static inline uint16_t mavlink_msg_gps_raw_int_get_vel(const mavlink_message_t*
 /**
  * @brief Get field cog from gps_raw_int message
  *
- * @return Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: 65535
+ * @return Course over ground (NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. If unknown, set to: UINT16_MAX
  */
 static inline uint16_t mavlink_msg_gps_raw_int_get_cog(const mavlink_message_t* msg)
 {

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_gps_set_global_origin.h

@@ -1,232 +0,0 @@
-// MESSAGE GPS_SET_GLOBAL_ORIGIN PACKING
-
-#define MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN 48
-
-typedef struct __mavlink_gps_set_global_origin_t
-{
- int32_t latitude; ///< global position * 1E7
- int32_t longitude; ///< global position * 1E7
- int32_t altitude; ///< global position * 1000
- uint8_t target_system; ///< System ID
- uint8_t target_component; ///< Component ID
-} mavlink_gps_set_global_origin_t;
-
-#define MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN_LEN 14
-#define MAVLINK_MSG_ID_48_LEN 14
-
-
-
-#define MAVLINK_MESSAGE_INFO_GPS_SET_GLOBAL_ORIGIN { \
-	"GPS_SET_GLOBAL_ORIGIN", \
-	5, \
-	{  { "latitude", NULL, MAVLINK_TYPE_INT32_T, 0, 0, offsetof(mavlink_gps_set_global_origin_t, latitude) }, \
-         { "longitude", NULL, MAVLINK_TYPE_INT32_T, 0, 4, offsetof(mavlink_gps_set_global_origin_t, longitude) }, \
-         { "altitude", NULL, MAVLINK_TYPE_INT32_T, 0, 8, offsetof(mavlink_gps_set_global_origin_t, altitude) }, \
-         { "target_system", NULL, MAVLINK_TYPE_UINT8_T, 0, 12, offsetof(mavlink_gps_set_global_origin_t, target_system) }, \
-         { "target_component", NULL, MAVLINK_TYPE_UINT8_T, 0, 13, offsetof(mavlink_gps_set_global_origin_t, target_component) }, \
-         } \
-}
-
-
-/**
- * @brief Pack a gps_set_global_origin message
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param latitude global position * 1E7
- * @param longitude global position * 1E7
- * @param altitude global position * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_set_global_origin_pack(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg,
-						       uint8_t target_system, uint8_t target_component, int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-	_mav_put_uint8_t(buf, 12, target_system);
-	_mav_put_uint8_t(buf, 13, target_component);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 14);
-#else
-	mavlink_gps_set_global_origin_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN;
-	return mavlink_finalize_message(msg, system_id, component_id, 14, 170);
-}
-
-/**
- * @brief Pack a gps_set_global_origin message on a channel
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
- * @param msg The MAVLink message to compress the data into
- * @param target_system System ID
- * @param target_component Component ID
- * @param latitude global position * 1E7
- * @param longitude global position * 1E7
- * @param altitude global position * 1000
- * @return length of the message in bytes (excluding serial stream start sign)
- */
-static inline uint16_t mavlink_msg_gps_set_global_origin_pack_chan(uint8_t system_id, uint8_t component_id, uint8_t chan,
-							   mavlink_message_t* msg,
-						           uint8_t target_system,uint8_t target_component,int32_t latitude,int32_t longitude,int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-	_mav_put_uint8_t(buf, 12, target_system);
-	_mav_put_uint8_t(buf, 13, target_component);
-
-        memcpy(_MAV_PAYLOAD(msg), buf, 14);
-#else
-	mavlink_gps_set_global_origin_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-        memcpy(_MAV_PAYLOAD(msg), &packet, 14);
-#endif
-
-	msg->msgid = MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN;
-	return mavlink_finalize_message_chan(msg, system_id, component_id, chan, 14, 170);
-}
-
-/**
- * @brief Encode a gps_set_global_origin struct into a message
- *
- * @param system_id ID of this system
- * @param component_id ID of this component (e.g. 200 for IMU)
- * @param msg The MAVLink message to compress the data into
- * @param gps_set_global_origin C-struct to read the message contents from
- */
-static inline uint16_t mavlink_msg_gps_set_global_origin_encode(uint8_t system_id, uint8_t component_id, mavlink_message_t* msg, const mavlink_gps_set_global_origin_t* gps_set_global_origin)
-{
-	return mavlink_msg_gps_set_global_origin_pack(system_id, component_id, msg, gps_set_global_origin->target_system, gps_set_global_origin->target_component, gps_set_global_origin->latitude, gps_set_global_origin->longitude, gps_set_global_origin->altitude);
-}
-
-/**
- * @brief Send a gps_set_global_origin message
- * @param chan MAVLink channel to send the message
- *
- * @param target_system System ID
- * @param target_component Component ID
- * @param latitude global position * 1E7
- * @param longitude global position * 1E7
- * @param altitude global position * 1000
- */
-#ifdef MAVLINK_USE_CONVENIENCE_FUNCTIONS
-
-static inline void mavlink_msg_gps_set_global_origin_send(mavlink_channel_t chan, uint8_t target_system, uint8_t target_component, int32_t latitude, int32_t longitude, int32_t altitude)
-{
-#if MAVLINK_NEED_BYTE_SWAP || !MAVLINK_ALIGNED_FIELDS
-	char buf[14];
-	_mav_put_int32_t(buf, 0, latitude);
-	_mav_put_int32_t(buf, 4, longitude);
-	_mav_put_int32_t(buf, 8, altitude);
-	_mav_put_uint8_t(buf, 12, target_system);
-	_mav_put_uint8_t(buf, 13, target_component);
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN, buf, 14, 170);
-#else
-	mavlink_gps_set_global_origin_t packet;
-	packet.latitude = latitude;
-	packet.longitude = longitude;
-	packet.altitude = altitude;
-	packet.target_system = target_system;
-	packet.target_component = target_component;
-
-	_mav_finalize_message_chan_send(chan, MAVLINK_MSG_ID_GPS_SET_GLOBAL_ORIGIN, (const char *)&packet, 14, 170);
-#endif
-}
-
-#endif
-
-// MESSAGE GPS_SET_GLOBAL_ORIGIN UNPACKING
-
-
-/**
- * @brief Get field target_system from gps_set_global_origin message
- *
- * @return System ID
- */
-static inline uint8_t mavlink_msg_gps_set_global_origin_get_target_system(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  12);
-}
-
-/**
- * @brief Get field target_component from gps_set_global_origin message
- *
- * @return Component ID
- */
-static inline uint8_t mavlink_msg_gps_set_global_origin_get_target_component(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_uint8_t(msg,  13);
-}
-
-/**
- * @brief Get field latitude from gps_set_global_origin message
- *
- * @return global position * 1E7
- */
-static inline int32_t mavlink_msg_gps_set_global_origin_get_latitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  0);
-}
-
-/**
- * @brief Get field longitude from gps_set_global_origin message
- *
- * @return global position * 1E7
- */
-static inline int32_t mavlink_msg_gps_set_global_origin_get_longitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  4);
-}
-
-/**
- * @brief Get field altitude from gps_set_global_origin message
- *
- * @return global position * 1000
- */
-static inline int32_t mavlink_msg_gps_set_global_origin_get_altitude(const mavlink_message_t* msg)
-{
-	return _MAV_RETURN_int32_t(msg,  8);
-}
-
-/**
- * @brief Decode a gps_set_global_origin message into a struct
- *
- * @param msg The message to decode
- * @param gps_set_global_origin C-struct to decode the message contents into
- */
-static inline void mavlink_msg_gps_set_global_origin_decode(const mavlink_message_t* msg, mavlink_gps_set_global_origin_t* gps_set_global_origin)
-{
-#if MAVLINK_NEED_BYTE_SWAP
-	gps_set_global_origin->latitude = mavlink_msg_gps_set_global_origin_get_latitude(msg);
-	gps_set_global_origin->longitude = mavlink_msg_gps_set_global_origin_get_longitude(msg);
-	gps_set_global_origin->altitude = mavlink_msg_gps_set_global_origin_get_altitude(msg);
-	gps_set_global_origin->target_system = mavlink_msg_gps_set_global_origin_get_target_system(msg);
-	gps_set_global_origin->target_component = mavlink_msg_gps_set_global_origin_get_target_component(msg);
-#else
-	memcpy(gps_set_global_origin, _MAV_PAYLOAD(msg), 14);
-#endif
-}

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_gps_status.h

@@ -86,7 +86,7 @@ static inline uint16_t mavlink_msg_gps_status_pack(uint8_t system_id, uint8_t co
  * @brief Pack a gps_status message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param satellites_visible Number of satellites visible
  * @param satellite_prn Global satellite ID
@@ -129,7 +129,7 @@ static inline uint16_t mavlink_msg_gps_status_pack_chan(uint8_t system_id, uint8
 }
 
 /**
- * @brief Encode a gps_status struct into a message
+ * @brief Encode a gps_status struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -141,6 +141,20 @@ static inline uint16_t mavlink_msg_gps_status_encode(uint8_t system_id, uint8_t
 	return mavlink_msg_gps_status_pack(system_id, component_id, msg, gps_status->satellites_visible, gps_status->satellite_prn, gps_status->satellite_used, gps_status->satellite_elevation, gps_status->satellite_azimuth, gps_status->satellite_snr);
 }
 
+/**
+ * @brief Encode a gps_status struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param gps_status C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_gps_status_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_gps_status_t* gps_status)
+{
+	return mavlink_msg_gps_status_pack_chan(system_id, component_id, chan, msg, gps_status->satellites_visible, gps_status->satellite_prn, gps_status->satellite_used, gps_status->satellite_elevation, gps_status->satellite_azimuth, gps_status->satellite_snr);
+}
+
 /**
  * @brief Send a gps_status message
  * @param chan MAVLink channel to send the message

src/GCS_MAVLink/include_v1.0/common/mavlink_msg_heartbeat.h

@@ -83,7 +83,7 @@ static inline uint16_t mavlink_msg_heartbeat_pack(uint8_t system_id, uint8_t com
  * @brief Pack a heartbeat message on a channel
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
- * @param chan The MAVLink channel this message was sent over
+ * @param chan The MAVLink channel this message will be sent over
  * @param msg The MAVLink message to compress the data into
  * @param type Type of the MAV (quadrotor, helicopter, etc., up to 15 types, defined in MAV_TYPE ENUM)
  * @param autopilot Autopilot type / class. defined in MAV_AUTOPILOT ENUM
@@ -127,7 +127,7 @@ static inline uint16_t mavlink_msg_heartbeat_pack_chan(uint8_t system_id, uint8_
 }
 
 /**
- * @brief Encode a heartbeat struct into a message
+ * @brief Encode a heartbeat struct
  *
  * @param system_id ID of this system
  * @param component_id ID of this component (e.g. 200 for IMU)
@@ -139,6 +139,20 @@ static inline uint16_t mavlink_msg_heartbeat_encode(uint8_t system_id, uint8_t c
 	return mavlink_msg_heartbeat_pack(system_id, component_id, msg, heartbeat->type, heartbeat->autopilot, heartbeat->base_mode, heartbeat->custom_mode, heartbeat->system_status);
 }
 
+/**
+ * @brief Encode a heartbeat struct on a channel
+ *
+ * @param system_id ID of this system
+ * @param component_id ID of this component (e.g. 200 for IMU)
+ * @param chan The MAVLink channel this message will be sent over
+ * @param msg The MAVLink message to compress the data into
+ * @param heartbeat C-struct to read the message contents from
+ */
+static inline uint16_t mavlink_msg_heartbeat_encode_chan(uint8_t system_id, uint8_t component_id, uint8_t chan, mavlink_message_t* msg, const mavlink_heartbeat_t* heartbeat)
+{
+	return mavlink_msg_heartbeat_pack_chan(system_id, component_id, chan, msg, heartbeat->type, heartbeat->autopilot, heartbeat->base_mode, heartbeat->custom_mode, heartbeat->system_status);
+}
+
 /**
  * @brief Send a heartbeat message
  * @param chan MAVLink channel to send the message