| 5,11 → 5,11 |
|---|
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 74 |
| VERSION_PATCH = 3 |
| VERSION_PATCH = 100 |
| |
| VERSION_SERIAL_MAJOR = 10 # Serial Protocol Major Version |
| VERSION_SERIAL_MINOR = 1 # Serial Protocol Minor Version |
| NC_SPI_COMPATIBLE = 6 # SPI Protocol Version |
| NC_SPI_COMPATIBLE = 6 # SPI Protocol Version |
| |
| #------------------------------------------------------------------- |
| #OPTIONS |
| 19,13 → 19,30 |
|---|
| #EXT = MK3MAG |
| |
| # Use optional one the RCs if EXT = NAVICTRL has been used |
| RC = DSL |
| #RC = DSL |
| #RC = SPECTRUM |
| |
| #GYRO=ENC-03_FC1.3 |
| #GYRO_HW_NAME=ENC |
| #GYRO_HW_FACTOR=1.304f |
| #GYRO_PITCHROLL_CORRECTION=0.83f |
| #GYRO_YAW_CORRECTION=0.93f |
| |
| GYRO=ADXRS610_FC2.0 |
| GYRO_HW_NAME=ADXR |
| GYRO_HW_FACTOR=1.2288f |
| GYRO_PITCHROLL_CORRECTION=1.0f |
| GYRO_YAW_CORRECTION=1.0f |
| |
| #GYRO=invenSense |
| #GYRO_HW_NAME=Isense |
| #GYRO_HW_FACTOR=0.6827f |
| #GYRO_PITCHROLL_CORRECTION=0.93f |
| #GYRO_YAW_CORRECTION=0.97f |
| |
| #GYRO= |
| #GYRO=invenSense |
| |
| #------------------------------------------------------------------- |
| # get SVN revision |
| REV=0001 |
| 110,6 → 127,9 |
|---|
| ifeq ($(VERSION_PATCH), 17) |
| TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)r_SVN$(REV) |
| endif |
| ifeq ($(VERSION_PATCH), 100) |
| TARGET = Flight-Ctrl_$(HEX_NAME)_V$(VERSION_MAJOR)_$(VERSION_MINOR)df_SVN$(REV) |
| endif |
| |
| # Optimization level, can be [0, 1, 2, 3, s]. 0 turns off optimization. |
| # (Note: 3 is not always the best optimization level. See avr-libc FAQ.) |
| 118,11 → 138,13 |
|---|
| |
| ########################################################################################################## |
| # List C source files here. (C dependencies are automatically generated.) |
| SRC = main.c uart0.c printf_P.c timer0.c timer2.c analog.c menu.c output.c controlMixer.c externalControl.c GPSControl.c |
| SRC += dongfangMath.c twimaster.c rc.c attitude.c flight.c eeprom.c uart1.c configuration.c $(GYRO).c |
| SRC = main.c uart0.c printf_P.c timer0.c timer2.c analog.c menu.c output.c controlMixer.c |
| SRC += externalControl.c GPSControl.c dongfangMath.c twimaster.c rc.c attitude.c flight.c |
| SRC += eeprom.c uart1.c heightControl.c configuration.c attitudeControl.c commands.c $(GYRO).c |
| |
| ifeq ($(EXT), MK3MAG) |
| SRC += mk3mag.c mymath.c gps.c ubx.c |
| SRC += mk3mag.c gps.c ubx.c |
| #mymath.c |
| endif |
| ifeq ($(EXT), NAVICTRL) |
| SRC += spi.c |
| 172,7 → 194,7 |
|---|
| #CFLAGS += -std=c99 |
| CFLAGS += -std=gnu99 |
| |
| 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) |
| 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} |
| |
| ifeq ($(EXT), MK3MAG) |
| CFLAGS += -DUSE_MK3MAG |