auto-sync
This commit is contained in:
rusEfi
parent
de915c2a3c
commit
503bd351df
|
|
@ -152,7 +152,7 @@
|
||||||
<tool id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.c.linker.debug.369587711" name="ARM Sourcery Windows GCC C Linker" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.c.linker.debug"/>
|
<tool id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.c.linker.debug.369587711" name="ARM Sourcery Windows GCC C Linker" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.c.linker.debug"/>
|
||||||
<tool id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.cpp.linker.debug.790854990" name="ARM Sourcery Windows GCC C++ Linker" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.cpp.linker.debug">
|
<tool id="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.cpp.linker.debug.790854990" name="ARM Sourcery Windows GCC C++ Linker" superClass="org.eclipse.cdt.cross.arm.gnu.sourcery.windows.elf.cpp.linker.debug">
|
||||||
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.gcsections.1692062869" name="Remove unused sections (-Xlinker --gc-sections)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.gcsections" value="true" valueType="boolean"/>
|
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.gcsections.1692062869" name="Remove unused sections (-Xlinker --gc-sections)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.gcsections" value="true" valueType="boolean"/>
|
||||||
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.scriptfile.1659638949" name="Script file (-T)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.scriptfile" value="${workspace_loc}\\${ProjName}\config\system\STM32F407xG_CCM.ld" valueType="string"/>
|
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.scriptfile.1659638949" name="Script file (-T)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.scriptfile" value="${workspace_loc}\\${ProjName}\config\stm32f4ems\STM32F407xG_CCM.ld" valueType="string"/>
|
||||||
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.libs.266038076" name="Libraries (-l)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.libs"/>
|
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.libs.266038076" name="Libraries (-l)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.libs"/>
|
||||||
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.paths.1546594065" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.paths"/>
|
<option id="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.paths.1546594065" name="Library search path (-L)" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.link.option.paths"/>
|
||||||
<inputType id="org.eclipse.cdt.cross.arm.gnu.cpp.linker.input.214430349" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.linker.input">
|
<inputType id="org.eclipse.cdt.cross.arm.gnu.cpp.linker.input.214430349" superClass="org.eclipse.cdt.cross.arm.gnu.cpp.linker.input">
|
||||||
|
|
|
||||||
|
|
@ -106,8 +106,7 @@ include $(PROJECT_DIR)/console_util/console_util.mk
|
||||||
|
|
||||||
|
|
||||||
# Define linker script file here
|
# Define linker script file here
|
||||||
LDSCRIPT= config/system/STM32F407xG_CCM.ld
|
LDSCRIPT= config/stm32f4ems/STM32F407xG_CCM.ld
|
||||||
#LDSCRIPT= $(PORTLD)/STM32F407xG_CCM.ld
|
|
||||||
|
|
||||||
# C sources that can be compiled in ARM or THUMB mode depending on the global
|
# C sources that can be compiled in ARM or THUMB mode depending on the global
|
||||||
# setting.
|
# setting.
|
||||||
|
|
@ -183,9 +182,7 @@ INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
|
||||||
$(CHCPPINC) \
|
$(CHCPPINC) \
|
||||||
$(CHIBIOS)/os/various \
|
$(CHIBIOS)/os/various \
|
||||||
config/stm32f4ems \
|
config/stm32f4ems \
|
||||||
config/system \
|
|
||||||
config/engines \
|
config/engines \
|
||||||
config/boards \
|
|
||||||
config \
|
config \
|
||||||
chibios/os/various \
|
chibios/os/various \
|
||||||
ext \
|
ext \
|
||||||
|
|
|
||||||
|
|
@ -1,213 +0,0 @@
|
||||||
/**
|
|
||||||
* @file arro_board.h
|
|
||||||
*
|
|
||||||
* This file contents a configuration of default ecu board. Pinout and other.
|
|
||||||
* TODO: most of the pins should get configurable
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* @date Nov 14, 2013
|
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2014
|
|
||||||
* @author frig
|
|
||||||
*
|
|
||||||
* This file is part of rusEfi - see http://rusefi.com
|
|
||||||
*
|
|
||||||
* rusEfi is free software; you can redistribute it and/or modify it under the terms of
|
|
||||||
* the GNU General Public License as published by the Free Software Foundation; either
|
|
||||||
* version 3 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* rusEfi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
|
|
||||||
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with this program.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#ifndef ARRO_BOARD_H_
|
|
||||||
#define ARRO_BOARD_H_
|
|
||||||
|
|
||||||
|
|
||||||
#define STM32_ICU_USE_TIM1 TRUE // wave input
|
|
||||||
#define STM32_ICU_USE_TIM2 TRUE // primary position sensor
|
|
||||||
#define STM32_ICU_USE_TIM3 TRUE // secondary position sensor
|
|
||||||
#define STM32_ICU_USE_TIM4 FALSE
|
|
||||||
#define STM32_ICU_USE_TIM5 FALSE
|
|
||||||
#define STM32_ICU_USE_TIM8 FALSE
|
|
||||||
#define STM32_ICU_USE_TIM9 TRUE // wave input
|
|
||||||
|
|
||||||
// todo: switch to continues ADC conversion for slow ADC?
|
|
||||||
#define EFI_INTERNAL_SLOW_ADC_PWM &PWMD8
|
|
||||||
// todo: switch to continues ADC conversion for fast ADC?
|
|
||||||
#define EFI_INTERNAL_FAST_ADC_PWM &PWMD4
|
|
||||||
|
|
||||||
|
|
||||||
#define STM32_PWM_USE_TIM1 FALSE
|
|
||||||
#define STM32_PWM_USE_TIM2 FALSE
|
|
||||||
#define STM32_PWM_USE_TIM3 FALSE
|
|
||||||
//
|
|
||||||
#define STM32_PWM_USE_TIM4 TRUE // fast adc
|
|
||||||
#define STM32_PWM_USE_TIM5 FALSE
|
|
||||||
#define STM32_PWM_USE_TIM8 TRUE // slow adc
|
|
||||||
#define STM32_PWM_USE_TIM9 FALSE
|
|
||||||
|
|
||||||
#define STM32_SPI_USE_SPI1 TRUE
|
|
||||||
#define STM32_SPI_USE_SPI2 TRUE // external ADC
|
|
||||||
#define STM32_SPI_USE_SPI3 TRUE // potentiometer
|
|
||||||
|
|
||||||
#define STM32_CAN_USE_CAN1 TRUE
|
|
||||||
#define STM32_CAN_USE_CAN2 TRUE
|
|
||||||
|
|
||||||
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
|
|
||||||
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
|
|
||||||
|
|
||||||
#define EFI_CAN_DEVICE CAND2
|
|
||||||
#define EFI_CAN_RX_AF 9
|
|
||||||
#define EFI_CAN_TX_AF 9
|
|
||||||
|
|
||||||
//#define EFI_CAN_DEVICE CAND1
|
|
||||||
//#define EFI_CAN_RX_AF 9
|
|
||||||
//#define EFI_CAN_TX_AF 9
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This section is for bottom-left corner SPI
|
|
||||||
*/
|
|
||||||
//#define SPI_CS1_PORT GPIOE
|
|
||||||
//#define SPI_CS1_PIN 13
|
|
||||||
//#define SPI_CS2_PORT GPIOE
|
|
||||||
//#define SPI_CS2_PIN 14
|
|
||||||
//#define SPI_CS3_PORT GPIOE
|
|
||||||
//#define SPI_CS3_PIN 15
|
|
||||||
//#define SPI_CS4_PORT GPIOD
|
|
||||||
//#define SPI_CS4_PIN 10
|
|
||||||
//#define SPI_SD_MODULE_PORT GPIOD
|
|
||||||
//#define SPI_SD_MODULE_PIN 11
|
|
||||||
|
|
||||||
#define EFI_SPI1_SCK_PORT GPIOB
|
|
||||||
#define EFI_SPI1_SCK_PIN 3
|
|
||||||
#define EFI_SPI1_MISO_PORT GPIOB
|
|
||||||
#define EFI_SPI1_MISO_PIN 4
|
|
||||||
#define EFI_SPI1_MOSI_PORT GPIOB
|
|
||||||
#define EFI_SPI1_MOSI_PIN 5
|
|
||||||
#define EFI_SPI1_AF 5
|
|
||||||
|
|
||||||
|
|
||||||
#define EFI_SPI2_SCK_PORT GPIOB
|
|
||||||
#define EFI_SPI2_SCK_PIN 13
|
|
||||||
#define EFI_SPI2_MISO_PORT GPIOB
|
|
||||||
#define EFI_SPI2_MISO_PIN 14
|
|
||||||
#define EFI_SPI2_MOSI_PORT GPIOB
|
|
||||||
#define EFI_SPI2_MOSI_PIN 15
|
|
||||||
#define EFI_SPI2_AF 5
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This section is for right-side center SPI
|
|
||||||
*/
|
|
||||||
// this is pointing into the sky for now - conflict with I2C
|
|
||||||
#define SPI_CS2_PORT GPIOH
|
|
||||||
// this is pointing into the sky for now - conflict with I2C
|
|
||||||
#define SPI_CS2_PIN 0
|
|
||||||
#define SPI_CS4_PORT GPIOD
|
|
||||||
#define SPI_CS4_PIN 3
|
|
||||||
#define SPI_SD_MODULE_PORT GPIOD
|
|
||||||
#define SPI_SD_MODULE_PIN 4
|
|
||||||
#define EFI_SPI3_SCK_PORT GPIOB
|
|
||||||
#define EFI_SPI3_SCK_PIN 3
|
|
||||||
#define EFI_SPI3_MISO_PORT GPIOB
|
|
||||||
#define EFI_SPI3_MISO_PIN 4
|
|
||||||
#define EFI_SPI3_MOSI_PORT GPIOB
|
|
||||||
#define EFI_SPI3_MOSI_PIN 5
|
|
||||||
#define EFI_SPI3_AF 6
|
|
||||||
#define MMC_CARD_SPI SPID3
|
|
||||||
|
|
||||||
#define EFI_I2C_SCL_PORT GPIOB
|
|
||||||
#define EFI_I2C_SCL_PIN 6
|
|
||||||
#define EFI_I2C_SDA_PORT GPIOB
|
|
||||||
#define EFI_I2C_SDA_PIN 7
|
|
||||||
#define EFI_I2C_AF 4
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Patched version of ChibiOS/RT support extra details in the system error messages
|
|
||||||
*/
|
|
||||||
#define EFI_CUSTOM_PANIC_METHOD TRUE
|
|
||||||
|
|
||||||
#define ADC_CHANNEL_VREF ADC_CHANNEL_IN14
|
|
||||||
|
|
||||||
/**
|
|
||||||
* currently ChibiOS uses only first and second channels of each timer for input capture
|
|
||||||
*
|
|
||||||
* So, our options are:
|
|
||||||
*
|
|
||||||
* TIM2_CH1
|
|
||||||
* PA5
|
|
||||||
*
|
|
||||||
* TIM4_CH1
|
|
||||||
* PB6
|
|
||||||
* PD12
|
|
||||||
*
|
|
||||||
* TIM9_CH1
|
|
||||||
* PE5
|
|
||||||
*/
|
|
||||||
|
|
||||||
//#define ETB_CONTROL_LINE_1_PORT GPIOE
|
|
||||||
//#define ETB_CONTROL_LINE_1_PIN 0
|
|
||||||
//
|
|
||||||
//#define ETB_CONTROL_LINE_2_PORT GPIOB
|
|
||||||
//#define ETB_CONTROL_LINE_2_PIN 8
|
|
||||||
|
|
||||||
//#define CONSOLE_PORT GPIOB
|
|
||||||
//#define CONSOLE_TX_PIN 10
|
|
||||||
//#define CONSOLE_RX_PIN 11
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Here we define the pinout for the human-readable protocol via UART, TunerStudio pinout is defined separately
|
|
||||||
*/
|
|
||||||
//#define EFI_CONSOLE_TX_PORT GPIOD
|
|
||||||
//#define EFI_CONSOLE_TX_PIN 8
|
|
||||||
//#define EFI_CONSOLE_RX_PORT GPIOD
|
|
||||||
//#define EFI_CONSOLE_RX_PIN 9
|
|
||||||
//#define EFI_CONSOLE_AF 7
|
|
||||||
|
|
||||||
#define EFI_CONSOLE_UART_DEVICE (&SD3)
|
|
||||||
|
|
||||||
#define EFI_CONSOLE_TX_PORT GPIOC
|
|
||||||
#define EFI_CONSOLE_TX_PIN 10
|
|
||||||
#define EFI_CONSOLE_RX_PORT GPIOC
|
|
||||||
#define EFI_CONSOLE_RX_PIN 11
|
|
||||||
#define EFI_CONSOLE_AF 7
|
|
||||||
|
|
||||||
//#define TS_SERIAL_TX_PORT GPIOD
|
|
||||||
//#define TS_SERIAL_TX_PIN 8
|
|
||||||
//#define TS_SERIAL_RX_PORT GPIOD
|
|
||||||
//#define TS_SERIAL_RX_PIN 9
|
|
||||||
//#define TS_SERIAL_AF 7
|
|
||||||
|
|
||||||
#define TS_SERIAL_TX_PORT GPIOC
|
|
||||||
#define TS_SERIAL_TX_PIN 10
|
|
||||||
#define TS_SERIAL_RX_PORT GPIOC
|
|
||||||
#define TS_SERIAL_RX_PIN 11
|
|
||||||
#define TS_SERIAL_AF 7
|
|
||||||
|
|
||||||
#define LED_WARNING_PORT GPIOD
|
|
||||||
#define LED_WARNING_PIN GPIOD_LED3
|
|
||||||
|
|
||||||
#define LED_RUNNING_STATUS_PORT GPIOD
|
|
||||||
#define LED_RUNNING_STATUS_PIN GPIOD_LED4
|
|
||||||
|
|
||||||
#define LED_ERROR_PORT GPIOD
|
|
||||||
#define LED_ERROR_PIN GPIOD_LED5
|
|
||||||
|
|
||||||
#define LED_COMMUNICATION_PORT GPIOD
|
|
||||||
#define LED_COMMUNICATION_PIN GPIOD_LED6
|
|
||||||
|
|
||||||
// USART1 -> check defined STM32_SERIAL_USE_USART1
|
|
||||||
// For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX
|
|
||||||
#define GPS_SERIAL_DEVICE &SD1
|
|
||||||
#define GPS_SERIAL_SPEED 38400
|
|
||||||
|
|
||||||
#define CONSOLE_MODE_SWITCH_PORT GPIOB
|
|
||||||
#define CONSOLE_MODE_SWITCH_PIN 1
|
|
||||||
|
|
||||||
#define CONFIG_RESET_SWITCH_PORT GPIOD
|
|
||||||
#define CONFIG_RESET_SWITCH_PIN 6
|
|
||||||
|
|
||||||
#endif /*ARRO_BOARD_H_*/
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
/**
|
|
||||||
* @file board.h
|
|
||||||
* Board configuration. Only general confuration, and including custom configs
|
|
||||||
*
|
|
||||||
* @date Nov 14, 2013
|
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2014
|
|
||||||
* @author frig
|
|
||||||
*
|
|
||||||
* This file is part of rusEfi - see http://rusefi.com
|
|
||||||
*
|
|
||||||
* rusEfi is free software; you can redistribute it and/or modify it under the terms of
|
|
||||||
* the GNU General Public License as published by the Free Software Foundation; either
|
|
||||||
* version 3 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* rusEfi is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
|
|
||||||
* even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with this program.
|
|
||||||
* If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
#ifndef BOARD_H_
|
|
||||||
#define BOARD_H_
|
|
||||||
|
|
||||||
#define EFI_BOARD_ARRO TRUE
|
|
||||||
|
|
||||||
#if EFI_BOARD_ARRO
|
|
||||||
#include "arro_board.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /*BOARD_H_*/
|
|
||||||
|
|
@ -145,4 +145,164 @@
|
||||||
#define EFI_MAP_AVERAGING TRUE
|
#define EFI_MAP_AVERAGING TRUE
|
||||||
//#define EFI_MAP_AVERAGING FALSE
|
//#define EFI_MAP_AVERAGING FALSE
|
||||||
|
|
||||||
|
// todo: most of this should become configurable
|
||||||
|
|
||||||
|
// todo: switch to continues ADC conversion for slow ADC?
|
||||||
|
#define EFI_INTERNAL_SLOW_ADC_PWM &PWMD8
|
||||||
|
// todo: switch to continues ADC conversion for fast ADC?
|
||||||
|
#define EFI_INTERNAL_FAST_ADC_PWM &PWMD4
|
||||||
|
|
||||||
|
#define EFI_CAN_DEVICE CAND2
|
||||||
|
#define EFI_CAN_RX_AF 9
|
||||||
|
#define EFI_CAN_TX_AF 9
|
||||||
|
|
||||||
|
//#define EFI_CAN_DEVICE CAND1
|
||||||
|
//#define EFI_CAN_RX_AF 9
|
||||||
|
//#define EFI_CAN_TX_AF 9
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This section is for bottom-left corner SPI
|
||||||
|
*/
|
||||||
|
//#define SPI_CS1_PORT GPIOE
|
||||||
|
//#define SPI_CS1_PIN 13
|
||||||
|
//#define SPI_CS2_PORT GPIOE
|
||||||
|
//#define SPI_CS2_PIN 14
|
||||||
|
//#define SPI_CS3_PORT GPIOE
|
||||||
|
//#define SPI_CS3_PIN 15
|
||||||
|
//#define SPI_CS4_PORT GPIOD
|
||||||
|
//#define SPI_CS4_PIN 10
|
||||||
|
//#define SPI_SD_MODULE_PORT GPIOD
|
||||||
|
//#define SPI_SD_MODULE_PIN 11
|
||||||
|
|
||||||
|
#define EFI_SPI1_SCK_PORT GPIOB
|
||||||
|
#define EFI_SPI1_SCK_PIN 3
|
||||||
|
#define EFI_SPI1_MISO_PORT GPIOB
|
||||||
|
#define EFI_SPI1_MISO_PIN 4
|
||||||
|
#define EFI_SPI1_MOSI_PORT GPIOB
|
||||||
|
#define EFI_SPI1_MOSI_PIN 5
|
||||||
|
#define EFI_SPI1_AF 5
|
||||||
|
|
||||||
|
|
||||||
|
#define EFI_SPI2_SCK_PORT GPIOB
|
||||||
|
#define EFI_SPI2_SCK_PIN 13
|
||||||
|
#define EFI_SPI2_MISO_PORT GPIOB
|
||||||
|
#define EFI_SPI2_MISO_PIN 14
|
||||||
|
#define EFI_SPI2_MOSI_PORT GPIOB
|
||||||
|
#define EFI_SPI2_MOSI_PIN 15
|
||||||
|
#define EFI_SPI2_AF 5
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This section is for right-side center SPI
|
||||||
|
*/
|
||||||
|
// this is pointing into the sky for now - conflict with I2C
|
||||||
|
#define SPI_CS2_PORT GPIOH
|
||||||
|
// this is pointing into the sky for now - conflict with I2C
|
||||||
|
#define SPI_CS2_PIN 0
|
||||||
|
#define SPI_CS4_PORT GPIOD
|
||||||
|
#define SPI_CS4_PIN 3
|
||||||
|
#define SPI_SD_MODULE_PORT GPIOD
|
||||||
|
#define SPI_SD_MODULE_PIN 4
|
||||||
|
#define EFI_SPI3_SCK_PORT GPIOB
|
||||||
|
#define EFI_SPI3_SCK_PIN 3
|
||||||
|
#define EFI_SPI3_MISO_PORT GPIOB
|
||||||
|
#define EFI_SPI3_MISO_PIN 4
|
||||||
|
#define EFI_SPI3_MOSI_PORT GPIOB
|
||||||
|
#define EFI_SPI3_MOSI_PIN 5
|
||||||
|
#define EFI_SPI3_AF 6
|
||||||
|
#define MMC_CARD_SPI SPID3
|
||||||
|
|
||||||
|
#define EFI_I2C_SCL_PORT GPIOB
|
||||||
|
#define EFI_I2C_SCL_PIN 6
|
||||||
|
#define EFI_I2C_SDA_PORT GPIOB
|
||||||
|
#define EFI_I2C_SDA_PIN 7
|
||||||
|
#define EFI_I2C_AF 4
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Patched version of ChibiOS/RT support extra details in the system error messages
|
||||||
|
*/
|
||||||
|
#define EFI_CUSTOM_PANIC_METHOD TRUE
|
||||||
|
|
||||||
|
#define ADC_CHANNEL_VREF ADC_CHANNEL_IN14
|
||||||
|
|
||||||
|
/**
|
||||||
|
* currently ChibiOS uses only first and second channels of each timer for input capture
|
||||||
|
*
|
||||||
|
* So, our options are:
|
||||||
|
*
|
||||||
|
* TIM2_CH1
|
||||||
|
* PA5
|
||||||
|
*
|
||||||
|
* TIM4_CH1
|
||||||
|
* PB6
|
||||||
|
* PD12
|
||||||
|
*
|
||||||
|
* TIM9_CH1
|
||||||
|
* PE5
|
||||||
|
*/
|
||||||
|
|
||||||
|
//#define ETB_CONTROL_LINE_1_PORT GPIOE
|
||||||
|
//#define ETB_CONTROL_LINE_1_PIN 0
|
||||||
|
//
|
||||||
|
//#define ETB_CONTROL_LINE_2_PORT GPIOB
|
||||||
|
//#define ETB_CONTROL_LINE_2_PIN 8
|
||||||
|
|
||||||
|
//#define CONSOLE_PORT GPIOB
|
||||||
|
//#define CONSOLE_TX_PIN 10
|
||||||
|
//#define CONSOLE_RX_PIN 11
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Here we define the pinout for the human-readable protocol via UART, TunerStudio pinout is defined separately
|
||||||
|
*/
|
||||||
|
//#define EFI_CONSOLE_TX_PORT GPIOD
|
||||||
|
//#define EFI_CONSOLE_TX_PIN 8
|
||||||
|
//#define EFI_CONSOLE_RX_PORT GPIOD
|
||||||
|
//#define EFI_CONSOLE_RX_PIN 9
|
||||||
|
//#define EFI_CONSOLE_AF 7
|
||||||
|
|
||||||
|
#define EFI_CONSOLE_UART_DEVICE (&SD3)
|
||||||
|
|
||||||
|
#define EFI_CONSOLE_TX_PORT GPIOC
|
||||||
|
#define EFI_CONSOLE_TX_PIN 10
|
||||||
|
#define EFI_CONSOLE_RX_PORT GPIOC
|
||||||
|
#define EFI_CONSOLE_RX_PIN 11
|
||||||
|
#define EFI_CONSOLE_AF 7
|
||||||
|
|
||||||
|
//#define TS_SERIAL_TX_PORT GPIOD
|
||||||
|
//#define TS_SERIAL_TX_PIN 8
|
||||||
|
//#define TS_SERIAL_RX_PORT GPIOD
|
||||||
|
//#define TS_SERIAL_RX_PIN 9
|
||||||
|
//#define TS_SERIAL_AF 7
|
||||||
|
|
||||||
|
#define TS_SERIAL_TX_PORT GPIOC
|
||||||
|
#define TS_SERIAL_TX_PIN 10
|
||||||
|
#define TS_SERIAL_RX_PORT GPIOC
|
||||||
|
#define TS_SERIAL_RX_PIN 11
|
||||||
|
#define TS_SERIAL_AF 7
|
||||||
|
|
||||||
|
#define LED_WARNING_PORT GPIOD
|
||||||
|
#define LED_WARNING_PIN GPIOD_LED3
|
||||||
|
|
||||||
|
#define LED_RUNNING_STATUS_PORT GPIOD
|
||||||
|
#define LED_RUNNING_STATUS_PIN GPIOD_LED4
|
||||||
|
|
||||||
|
#define LED_ERROR_PORT GPIOD
|
||||||
|
#define LED_ERROR_PIN GPIOD_LED5
|
||||||
|
|
||||||
|
#define LED_COMMUNICATION_PORT GPIOD
|
||||||
|
#define LED_COMMUNICATION_PIN GPIOD_LED6
|
||||||
|
|
||||||
|
// USART1 -> check defined STM32_SERIAL_USE_USART1
|
||||||
|
// For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX
|
||||||
|
#define GPS_SERIAL_DEVICE &SD1
|
||||||
|
#define GPS_SERIAL_SPEED 38400
|
||||||
|
|
||||||
|
#define CONSOLE_MODE_SWITCH_PORT GPIOB
|
||||||
|
#define CONSOLE_MODE_SWITCH_PIN 1
|
||||||
|
|
||||||
|
#define CONFIG_RESET_SWITCH_PORT GPIOD
|
||||||
|
#define CONFIG_RESET_SWITCH_PIN 6
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* EFIFEATURES_H_ */
|
#endif /* EFIFEATURES_H_ */
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@
|
||||||
|
|
||||||
#define STM32F4xx_MCUCONF
|
#define STM32F4xx_MCUCONF
|
||||||
|
|
||||||
#include "boards.h"
|
|
||||||
#include "efifeatures.h"
|
#include "efifeatures.h"
|
||||||
#include "rusefi_enums.h"
|
#include "rusefi_enums.h"
|
||||||
|
|
||||||
|
|
@ -97,6 +96,8 @@
|
||||||
/*
|
/*
|
||||||
* CAN driver system settings.
|
* CAN driver system settings.
|
||||||
*/
|
*/
|
||||||
|
#define STM32_CAN_USE_CAN1 TRUE
|
||||||
|
#define STM32_CAN_USE_CAN2 TRUE
|
||||||
#define STM32_CAN_CAN1_IRQ_PRIORITY 11
|
#define STM32_CAN_CAN1_IRQ_PRIORITY 11
|
||||||
#define STM32_CAN_CAN2_IRQ_PRIORITY 11
|
#define STM32_CAN_CAN2_IRQ_PRIORITY 11
|
||||||
|
|
||||||
|
|
@ -152,6 +153,8 @@
|
||||||
#define STM32_I2C_USE_I2C1 TRUE
|
#define STM32_I2C_USE_I2C1 TRUE
|
||||||
#define STM32_I2C_USE_I2C2 FALSE
|
#define STM32_I2C_USE_I2C2 FALSE
|
||||||
#define STM32_I2C_USE_I2C3 FALSE
|
#define STM32_I2C_USE_I2C3 FALSE
|
||||||
|
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
|
||||||
|
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
|
||||||
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
|
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
|
||||||
#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
|
#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
|
||||||
#define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
|
#define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2)
|
||||||
|
|
@ -169,6 +172,14 @@
|
||||||
/*
|
/*
|
||||||
* ICU driver system settings.
|
* ICU driver system settings.
|
||||||
*/
|
*/
|
||||||
|
#define STM32_ICU_USE_TIM1 TRUE // wave input
|
||||||
|
#define STM32_ICU_USE_TIM2 TRUE // primary position sensor
|
||||||
|
#define STM32_ICU_USE_TIM3 TRUE // secondary position sensor
|
||||||
|
#define STM32_ICU_USE_TIM4 FALSE
|
||||||
|
#define STM32_ICU_USE_TIM5 FALSE
|
||||||
|
#define STM32_ICU_USE_TIM8 FALSE
|
||||||
|
#define STM32_ICU_USE_TIM9 TRUE // wave input
|
||||||
|
|
||||||
#define STM32_ICU_TIM1_IRQ_PRIORITY 3
|
#define STM32_ICU_TIM1_IRQ_PRIORITY 3
|
||||||
#define STM32_ICU_TIM2_IRQ_PRIORITY 3
|
#define STM32_ICU_TIM2_IRQ_PRIORITY 3
|
||||||
#define STM32_ICU_TIM3_IRQ_PRIORITY 3
|
#define STM32_ICU_TIM3_IRQ_PRIORITY 3
|
||||||
|
|
@ -188,6 +199,14 @@
|
||||||
#define STM32_MAC_ETH1_IRQ_PRIORITY 13
|
#define STM32_MAC_ETH1_IRQ_PRIORITY 13
|
||||||
#define STM32_MAC_IP_CHECKSUM_OFFLOAD 0
|
#define STM32_MAC_IP_CHECKSUM_OFFLOAD 0
|
||||||
|
|
||||||
|
#define STM32_PWM_USE_TIM1 FALSE
|
||||||
|
#define STM32_PWM_USE_TIM2 FALSE
|
||||||
|
#define STM32_PWM_USE_TIM3 FALSE
|
||||||
|
#define STM32_PWM_USE_TIM4 TRUE // fast adc
|
||||||
|
#define STM32_PWM_USE_TIM5 FALSE
|
||||||
|
#define STM32_PWM_USE_TIM8 TRUE // slow adc
|
||||||
|
#define STM32_PWM_USE_TIM9 FALSE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* PWM driver system settings.
|
* PWM driver system settings.
|
||||||
*/
|
*/
|
||||||
|
|
@ -219,6 +238,9 @@
|
||||||
/*
|
/*
|
||||||
* SPI driver system settings.
|
* SPI driver system settings.
|
||||||
*/
|
*/
|
||||||
|
#define STM32_SPI_USE_SPI1 TRUE
|
||||||
|
#define STM32_SPI_USE_SPI2 TRUE // external ADC
|
||||||
|
#define STM32_SPI_USE_SPI3 TRUE // potentiometer
|
||||||
#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
|
#define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 0)
|
||||||
#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
|
#define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3)
|
||||||
#define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
|
#define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3)
|
||||||
|
|
@ -19,7 +19,6 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "efifeatures.h"
|
#include "efifeatures.h"
|
||||||
#include "boards.h"
|
|
||||||
|
|
||||||
#define GET_CONSOLE_MODE_VALUE() palReadPad(CONSOLE_MODE_SWITCH_PORT, CONSOLE_MODE_SWITCH_PIN)
|
#define GET_CONSOLE_MODE_VALUE() palReadPad(CONSOLE_MODE_SWITCH_PORT, CONSOLE_MODE_SWITCH_PIN)
|
||||||
#define SHOULD_INGORE_FLASH() (palReadPad(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN) == 0)
|
#define SHOULD_INGORE_FLASH() (palReadPad(CONFIG_RESET_SWITCH_PORT, CONFIG_RESET_SWITCH_PIN) == 0)
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,6 @@
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "electronic_throttle.h"
|
#include "electronic_throttle.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "pin_repository.h"
|
#include "pin_repository.h"
|
||||||
#include "idle_controller.h"
|
#include "idle_controller.h"
|
||||||
#include "tps.h"
|
#include "tps.h"
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "interpolation.h"
|
#include "interpolation.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "adc_inputs.h"
|
#include "adc_inputs.h"
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
#include "adc_inputs.h"
|
#include "adc_inputs.h"
|
||||||
#include "maf.h"
|
#include "maf.h"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "engine_math.h"
|
#include "engine_math.h"
|
||||||
#include "adc_inputs.h"
|
#include "adc_inputs.h"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "tps.h"
|
#include "tps.h"
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "interpolation.h"
|
#include "interpolation.h"
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "engine_configuration.h"
|
#include "engine_configuration.h"
|
||||||
#include "adc_inputs.h"
|
#include "adc_inputs.h"
|
||||||
#include "voltage.h"
|
#include "voltage.h"
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,6 @@ extern "C"
|
||||||
|
|
||||||
#include "efifeatures.h"
|
#include "efifeatures.h"
|
||||||
#include "efitime.h"
|
#include "efitime.h"
|
||||||
#include "boards.h"
|
|
||||||
#include "rusefi_enums.h"
|
#include "rusefi_enums.h"
|
||||||
#include "enum_strings.h"
|
#include "enum_strings.h"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
// This file was generated by Version2Header
|
// This file was generated by Version2Header
|
||||||
// Thu Dec 18 08:42:54 EST 2014
|
// Tue Dec 23 15:27:13 EST 2014
|
||||||
#ifndef VCS_VERSION
|
#ifndef VCS_VERSION
|
||||||
#define VCS_VERSION "5826"
|
#define VCS_VERSION "5874"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue