rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Move some of the F2 defines into the makefile to make them global. Fixes some

Browse Source 
issues with grabbing the wrong stm32 configuration file.
This commit is contained in:
James Cotton 2011-08-09 01:19:05 -05:00
parent 27213c7fd9
commit d78450eae8
9 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/Bootloaders/AHRS/ahrs_spi_program_slave.c
View File

@ -29,7 +29,7 @@
#include "pios_opahrs_proto.h"
#include "pios_spi.h"
#include "STM32103CB_AHRS.h"
#include "pios_board.h"
#include "ahrs_bl.h"
#include "ahrs_spi_program_slave.h"

4
flight/Bootloaders/INS/Makefile
View File

@ -237,7 +237,11 @@ ifeq ($(DEBUG),YES)
CFLAGS =
endif
# This is not the best place for these. Really should abstract out
# to the board file or something
CFLAGS += -DHSE_VALUE=$(OSCILLATOR_FREQ)
CFLAGS += -DSTM32F2XX
CFLAGS += -DMEM_SIZE=1024000000
CFLAGS += -g$(DEBUGF)
CFLAGS += -O$(OPT)

2
flight/Bootloaders/INS/ahrs_spi_program_slave.c
View File

@ -29,7 +29,7 @@
#include "pios_opahrs_proto.h"
#include "pios_spi.h"
#include "STM32103CB_AHRS.h"
#include "pios_board.h"
#include "ahrs_bl.h"
#include "ahrs_spi_program_slave.h"

3
flight/Bootloaders/INS/inc/pios_config.h
View File

@ -27,9 +27,6 @@
#ifndef PIOS_CONFIG_H
#define PIOS_CONFIG_H
#define STM32F2XX
#define MEM_SIZE 1024000000
/* Enable/Disable PiOS Modules */
#define PIOS_INCLUDE_DELAY
#define PIOS_INCLUDE_IRQ

4
flight/INS/Makefile
View File

@ -198,7 +198,11 @@ else
CFLAGS += -Os
endif
# This is not the best place for these. Really should abstract out
# to the board file or something
CFLAGS += -DHSE_VALUE=$(OSCILLATOR_FREQ)
CFLAGS += -DSTM32F2XX
CFLAGS += -DMEM_SIZE=1024000000
# Output format. (can be ihex or binary or both)
# binary to create a load-image in raw-binary format i.e. for SAM-BA,

2
flight/INS/inc/pios_config.h
View File

@ -36,8 +36,6 @@
#ifndef PIOS_CONFIG_H
#define PIOS_CONFIG_H
#define STM32F2XX
/* Enable/Disable PiOS Modules */
#define PIOS_INCLUDE_DELAY
#define PIOS_INCLUDE_I2C

2
flight/Libraries/inc/fifo_buffer.h
View File

@ -26,7 +26,7 @@
#ifndef _FIFO_BUFFER_H_
#define _FIFO_BUFFER_H_
#include "pios.h"
#include "stdint.h"
// *********************

4
flight/PiOS/pios.h
View File

@ -46,14 +46,12 @@
#include <string.h>
#include <math.h>
#include "pios_config.h"
/* STM32 Std Perf Lib */
#if defined(STM32F2XX)
#include <stm32f2xx.h>
// XXX probably don't need this (header above gets it)
#include <stm32f2xx_conf.h>
#else
#include <stm32f10x.h>
#include <stm32f10x_conf.h>
#endif
#if defined(PIOS_INCLUDE_SDCARD)

2
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
View File

@ -2859,6 +2859,7 @@
65C35F6812F0DC2D004811C2 /* attitude.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = attitude.h; sourceTree = "<group>"; };
65D2CA841248F9A400B1E7D6 /* mixersettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mixersettings.xml; sourceTree = "<group>"; };
65D2CA851248F9A400B1E7D6 /* mixerstatus.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = mixerstatus.xml; sourceTree = "<group>"; };
65DEA78513F0FE6000095B06 /* stm32f2xx_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stm32f2xx_conf.h; sourceTree = "<group>"; };
65E410AE12F65AEA00725888 /* attitudesettings.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = attitudesettings.xml; sourceTree = "<group>"; };
65E6DF7112E02E8E00058553 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
65E6DF7312E02E8E00058553 /* alarms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alarms.c; sourceTree = "<group>"; };
@ -8179,6 +8180,7 @@
65E8F03811EFF25C00BBF654 /* inc */ = {
isa = PBXGroup;
children = (
65DEA78513F0FE6000095B06 /* stm32f2xx_conf.h */,
6528CCE212E40F6700CF5144 /* pios_adxl345.h */,
65E8C745139A6D1A00E1F979 /* pios_crc.h */,
65E8F03A11EFF25C00BBF654 /* pios_adc.h */,