Subversion Repositories FlightCtrl

Rev

Rev 1646 | Rev 1801 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1646 Rev 1775
Line 3... Line 3...
3 
MCU = atmega644p
 3 
MCU = atmega644p
4 
F_CPU = 20000000
 4 
F_CPU = 20000000
5 
#-------------------------------------------------------------------
 5 
#-------------------------------------------------------------------
6 
VERSION_MAJOR    =  0
 6 
VERSION_MAJOR    =  0
7 
VERSION_MINOR    =  74
 7 
VERSION_MINOR    =  74
8 
VERSION_PATCH    =  3
 8 
VERSION_PATCH    =  100
Line 9... Line 9...
9 
 
 9 
 
10 
VERSION_SERIAL_MAJOR = 10	# Serial Protocol Major Version
 10 
VERSION_SERIAL_MAJOR = 10	# Serial Protocol Major Version
11 
VERSION_SERIAL_MINOR = 1	# Serial Protocol Minor Version
 11 
VERSION_SERIAL_MINOR = 1	# Serial Protocol Minor Version
Line 12... Line 12...
12 
NC_SPI_COMPATIBLE = 6 		# SPI Protocol Version
 12 
NC_SPI_COMPATIBLE =    6  	# SPI Protocol Version
13 
 
 13 
 
Line 14... Line 14...
14 
#-------------------------------------------------------------------
 14 
#-------------------------------------------------------------------
15 
#OPTIONS
 15 
#OPTIONS
16 
 
 16 
 
Line 17... Line 17...
17 
# Use one of the extensions for a gps solution
 17 
# Use one of the extensions for a gps solution
18 
EXT = NAVICTRL
 18 
EXT = NAVICTRL
19 
#EXT = MK3MAG
 19 
#EXT = MK3MAG
Line 20... Line 20...
20 
 
 20 
 
- 
 
 21 
# Use optional one the RCs if EXT = NAVICTRL has been used
- 
 
 22 
#RC = DSL
- 
 
 23 
#RC = SPECTRUM
- 
 
 24 
 
- 
 
 25 
#GYRO=ENC-03_FC1.3
21 
# Use optional one the RCs if EXT = NAVICTRL has been used
 26 
#GYRO_HW_NAME=ENC
- 
 
 27 
#GYRO_HW_FACTOR=1.304f
- 
 
 28 
#GYRO_PITCHROLL_CORRECTION=0.83f
- 
 
 29 
#GYRO_YAW_CORRECTION=0.93f
- 
 
 30 
 
- 
 
 31 
GYRO=ADXRS610_FC2.0
- 
 
 32 
GYRO_HW_NAME=ADXR
- 
 
 33 
GYRO_HW_FACTOR=1.2288f
- 
 
 34 
GYRO_PITCHROLL_CORRECTION=1.0f
- 
 
 35 
GYRO_YAW_CORRECTION=1.0f
- 
 
 36 
 
- 
 
 37 
#GYRO=invenSense
- 
 
 38 
#GYRO_HW_NAME=Isense
22 
RC = DSL
 39 
#GYRO_HW_FACTOR=0.6827f
Line 23... Line 40...
23 
#RC = SPECTRUM
 40 
#GYRO_PITCHROLL_CORRECTION=0.93f
24 
 
 41 
#GYRO_YAW_CORRECTION=0.97f
25 
#GYRO=ENC-03_FC1.3
 42 
 
Line 108... Line 125...
108 
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)q_SVN$(REV)
 125 
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)q_SVN$(REV)
109 
endif
 126 
endif
110 
ifeq ($(VERSION_PATCH), 17)
 127 
ifeq ($(VERSION_PATCH), 17)
111 
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)r_SVN$(REV)
 128 
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)r_SVN$(REV)
112 
endif
 129 
endif
- 
 
 130 
ifeq ($(VERSION_PATCH), 100)
- 
 
 131 
TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)df_SVN$(REV)
- 
 
 132 
endif
Line 113... Line 133...
113 
 
 133 
 
114 
# Optimization level, can be [0, 1, 2, 3, s]. 0 turns off optimization.
 134 
# Optimization level, can be [0, 1, 2, 3, s]. 0 turns off optimization.
115 
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
 135 
# (Note: 3 is not always the best optimization level. See avr-libc FAQ.)
116 
OPT = 2
 136 
OPT = 2
Line 117... Line 137...
117 
#OPT = s
 137 
#OPT = s
118 
 
 138 
 
119 
##########################################################################################################
 139 
##########################################################################################################
- 
 
 140 
# List C source files here. (C dependencies are automatically generated.)
120 
# List C source files here. (C dependencies are automatically generated.)
 141 
SRC = main.c uart0.c printf_P.c timer0.c timer2.c analog.c menu.c output.c controlMixer.c
Line 121... Line 142...
121 
SRC = main.c uart0.c printf_P.c timer0.c timer2.c analog.c menu.c output.c controlMixer.c externalControl.c GPSControl.c
 142 
SRC += externalControl.c GPSControl.c dongfangMath.c twimaster.c rc.c attitude.c flight.c
122 
SRC += dongfangMath.c twimaster.c rc.c attitude.c flight.c eeprom.c uart1.c configuration.c $(GYRO).c
 143 
SRC += eeprom.c uart1.c heightControl.c configuration.c attitudeControl.c commands.c $(GYRO).c
- 
 
 144 
 
123 
 
 145 
ifeq ($(EXT), MK3MAG)
124 
ifeq ($(EXT), MK3MAG)
 146 
SRC += mk3mag.c gps.c ubx.c
125 
SRC += mk3mag.c mymath.c gps.c ubx.c
 147 
#mymath.c
126 
endif
 148 
endif
127 
ifeq ($(EXT), NAVICTRL)
 149 
ifeq ($(EXT), NAVICTRL)
Line 170... Line 192...
170 
#CFLAGS += -std=c89
 192 
#CFLAGS += -std=c89
171 
#CFLAGS += -std=gnu89
 193 
#CFLAGS += -std=gnu89
172 
#CFLAGS += -std=c99
 194 
#CFLAGS += -std=c99
173 
CFLAGS += -std=gnu99
 195 
CFLAGS += -std=gnu99
Line 174... Line 196...
174 
 
 196 
 
Line 175... Line 197...
175 
CFLAGS += -DF_CPU=$(F_CPU) -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_PATCH=$(VERSION_PATCH) -DVERSION_SERIAL_MAJOR=$(VERSION_SERIAL_MAJOR) -DVERSION_SERIAL_MINOR=$(VERSION_SERIAL_MINOR) -DNC_SPI_COMPATIBLE=$(NC_SPI_COMPATIBLE)
 197 
CFLAGS += -DF_CPU=$(F_CPU) -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_PATCH=$(VERSION_PATCH) -DVERSION_SERIAL_MAJOR=$(VERSION_SERIAL_MAJOR) -DVERSION_SERIAL_MINOR=$(VERSION_SERIAL_MINOR) -DNC_SPI_COMPATIBLE=$(NC_SPI_COMPATIBLE) -DGYRO_HW_NAME=${GYRO_HW_NAME} -DGYRO_HW_FACTOR=${GYRO_HW_FACTOR} -DGYRO_PITCHROLL_CORRECTION=${GYRO_PITCHROLL_CORRECTION} -DGYRO_YAW_CORRECTION=${GYRO_YAW_CORRECTION}
176 
 
 198 
 
177 
ifeq ($(EXT), MK3MAG)
 199 
ifeq ($(EXT), MK3MAG)
178 
 CFLAGS += -DUSE_MK3MAG
 200 
 CFLAGS += -DUSE_MK3MAG