Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 06:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduCopter: defines fixes

Browse Source 
Conflicts:

	libraries/AP_Common/Arduino.mk
This commit is contained in:
Pat Hickey 2012-12-13 16:32:36 -08:00 committed by Andrew Tridgell
parent 2aa4657315
commit d93d932831
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/config.h
View File

@ -21,7 +21,6 @@
//
// - Try to keep this file organised in the same order as APM_Config.h.example
//
#include "defines.h"
///
@ -46,6 +45,9 @@
#error CONFIG_APM_HARDWARE option is deprecated! use CONFIG_HAL_BOARD instead
#endif
#ifndef CONFIG_HAL_BOARD
#error CONFIG_HAL_BOARD must be defined to build ArduCopter
#endif
//////////////////////////////////////////////////////////////////////////////
// APM2 HARDWARE DEFAULTS
//

2
ArduCopter/defines.h
View File

@ -3,6 +3,8 @@
#ifndef _DEFINES_H
#define _DEFINES_H
#include <AP_HAL_Boards.h>
// Just so that it's completely clear...
#define ENABLED 1
#define DISABLED 0

4
libraries/AP_Common/Arduino.mk
View File

@ -239,8 +239,8 @@ endif
#
# Tool options
#
DEFINES = -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERS) $(EXTRAFLAGS)
EXTRAFLAGS =
EXTRAFLAGS ?=
DEFINES = -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_VERS) $(EXTRAFLAGS) -DSKETCH=\"$(SKETCH)\"
OPTFLAGS = -Os -Wformat -Wall -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Wformat=2 -Wno-reorder
DEPFLAGS = -MD -MT $@