rusefi
/
rusefi-1
mirror of https://github.com/rusefi/rusefi-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rusefi/rusefi

This commit is contained in:
rusefi 2017-05-01 22:44:44 -04:00
parent 065b92f4b6 ef7d56a38d
commit 82b669d811
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/compile_and_program.bat
View File

@ -13,8 +13,8 @@ rem magic once needed
call update_version.bat
echo Starting compilation
rem the important piece
make
rem the important piece (pass external args if needed)
make %1 %2 %3
rem cd build
rem if not exist rusefi.hex echo "compilation failed"

2
firmware/config/boards/ST_STM32F4/board.h
View File

@ -57,7 +57,9 @@
*
* See also STM32F4xx_MCUCONF is defined in mcuconf.h
*/
#ifndef STM32F407xx
#define STM32F407xx
#endif
/*
* IO pins assignments.

3
firmware/config/boards/ST_STM32F4/board.mk
View File

@ -3,3 +3,6 @@ BOARDSRC = $(PROJECT_DIR)/config/boards/ST_STM32F4/board.c
# Required include directories
BOARDINC = $(PROJECT_DIR)/config/boards/ST_STM32F4
# MCU defines
DDEFS += -DSTM32F407xx

4
firmware/controllers/algo/engine_configuration.cpp
View File

@ -263,10 +263,6 @@ void prepareVoidConfiguration(engine_configuration_s *activeConfiguration) {
engineConfiguration->cj125ua = EFI_ADC_NONE;
engineConfiguration->cj125ur = EFI_ADC_NONE;
boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperDirectionPin = GPIO_UNASSIGNED;
boardConfiguration->idle.stepperStepPin = GPIO_UNASSIGNED;
engineConfiguration->stepperEnablePin = GPIO_UNASSIGNED;

3
firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
View File

@ -93,8 +93,9 @@
*/
/* Includes ------------------------------------------------------------------*/
#define STM32F407xx
#ifdef STM32F407xx
#define STM32F40_41xxx
#endif
#define assert_param(expr) ((void)0)
//#include "stm32f4xx_hal.h"

3
firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
View File

@ -80,8 +80,9 @@
/* Includes ------------------------------------------------------------------*/
#define STM32F407xx
#ifdef STM32F407xx
#define STM32F40_41xxx
#endif
#define assert_param(expr) ((void)0)
#define HAL_FLASH_MODULE_ENABLED

4
firmware/svnversion.h
View File

@ -1,5 +1,5 @@
// This file was generated by Version2Header
// Sat Apr 22 01:25:51 EEST 2017
// Mon May 01 22:16:55 EEST 2017
#ifndef VCS_VERSION
#define VCS_VERSION "13886"
#define VCS_VERSION "13950"
#endif