From ce3db201ff4e08a4a1080365e8b6d5f423d4ce1f Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 24 Mar 2012 07:50:20 +0000 Subject: [PATCH] Mavlink compilation problem --- src/Makefile | 8 +++----- src/mavlink.cpp | 2 +- src/open9x.h | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index c7b117de2..105065fac 100644 --- a/src/Makefile +++ b/src/Makefile @@ -755,13 +755,11 @@ ifeq ($(PCB), ARM) @echo @echo $(MSG_FLASH) $@ arm-none-eabi-objcopy -O binary open9x.elf open9x.bin +else +%.bin: + endif -#arm-none-eabi-gcc -c -mcpu=cortex-m3 -O2 -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -fverbose-asm -Wa,-ahlms=open9x.lst -Dat91sam3s4 -DRUN_FROM_FLASH=1 -DPCBARM -DDECIMALS_DISPLAYED -DSPLASH -MD -MP -MF .dep/open9x.o.d -fno-exceptions -I . -I./ersky9x open9x.cpp -o open9x.o -#arm-none-eabi-gcc ersky9x/core_cm3.o ersky9x/board_lowlevel.o ersky9x/crt.o ersky9x/vectors_sam3s.o drivers.o ersky9x\sound.o lcd.o menus.o main_views.o statistics_views.o model_menus.o general_menus.o open9x.o beeper.o o9xstrings.o board_ersky9x.o -mcpu=cortex-m3 -mthumb -nostartfiles -Tersky9x/sam3s2c_flash.ld -Wl,-Map=open9x_rom.map,--cref,--no-warn-mismatch -o open9x_rom.elf -#arm-none-eabi-objcopy -O ihex open9x_rom.elf open9x_rom.hex -#arm-none-eabi-objdump -h -S open9x_rom.elf > open9x_rom.lss -#arm-none-eabi-objcopy -O binary open9x_rom.elf open9x_rom.bin ifeq ($(PCB), ARM) %.eep: diff --git a/src/mavlink.cpp b/src/mavlink.cpp index 6af0494bc..ae17dc1f3 100644 --- a/src/mavlink.cpp +++ b/src/mavlink.cpp @@ -184,7 +184,7 @@ static inline void REC_MAVLINK_MSG_ID_ACTION_ACK(const mavlink_message_t* msg) { #ifdef MAVLINK_PARAMS const pm_char * getParamId(uint8_t idx) { - const pm_char *mav_params_id[((NB_PID_PARAMS / 2) + 4)] PROGMEM = { // + const pm_char *mav_params_id [((NB_PID_PARAMS / 2) + 4)] = { // // PSTR("RATE_YAW"), // Rate Yaw PSTR("STB_YAW"), // Stabilize Yaw diff --git a/src/open9x.h b/src/open9x.h index df972d838..0bff5460a 100644 --- a/src/open9x.h +++ b/src/open9x.h @@ -236,7 +236,7 @@ extern void board_init(); #define INP_E_AileDR 1 #define INP_E_ThrCt 0 -#if defined(JETI) || defined(FRSKY) || defined(ARDUPILOT) || defined(NMEA) +#if defined(JETI) || defined(FRSKY) || defined(ARDUPILOT) || defined(NMEA) || defined(MAVLINK) #undef INP_E_ThrCt #undef INP_E_AileDR #define INP_C_ThrCt 6