From 5d88b83491873e97725bbc27ae49b2d6ae00c703 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 3 Jan 2013 00:11:44 +0000 Subject: [PATCH] Companion9x compilation --- src/x9d/aspi.h | 2 +- src/x9d/board_x9d.cpp | 2 +- src/x9d/board_x9d.h | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/x9d/aspi.h b/src/x9d/aspi.h index de5332512..cc289bc75 100644 --- a/src/x9d/aspi.h +++ b/src/x9d/aspi.h @@ -11,7 +11,7 @@ #ifndef _ASPI_H_ #define _ASPI_H_ -#include "stm32f2xx.h" +#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h" #define LCD_NCS_HIGH() do{GPIO_SetBits(GPIO_LCD, PIN_LCD_NCS);}while(0) #define LCD_NCS_LOW() do{GPIO_ResetBits(GPIO_LCD, PIN_LCD_NCS);}while(0) diff --git a/src/x9d/board_x9d.cpp b/src/x9d/board_x9d.cpp index 76d570730..6eadcf52d 100644 --- a/src/x9d/board_x9d.cpp +++ b/src/x9d/board_x9d.cpp @@ -31,7 +31,7 @@ * */ -#include "open9x.h" +#include "../open9x.h" uint16_t Analog_values[NUMBER_ANALOG] ; uint8_t temperature = 0; // Raw temp reading diff --git a/src/x9d/board_x9d.h b/src/x9d/board_x9d.h index 40f65788a..2e3939271 100644 --- a/src/x9d/board_x9d.h +++ b/src/x9d/board_x9d.h @@ -36,14 +36,14 @@ #include -#include "stm32f2xx_rcc.h" -#include "stm32f2xx_gpio.h" -#include "stm32f2xx.h" +#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_rcc.h" +#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc/stm32f2xx_gpio.h" +#include "./STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h" -#include "x9d/hal.h" -#include "x9d/aspi.h" -#include "x9d/i2c_ee.h" -#include "x9d/audio_driver.h" +#include "hal.h" +#include "aspi.h" +#include "i2c_ee.h" +#include "audio_driver.h" // TODO elsewhere #if !defined(SIMU)