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

Merge remote-tracking branch 'origin/Hellen_fork_point' into master 

# Conflicts:
#	firmware/config/boards/kinetis/efifeatures.h
#	firmware/config/boards/prometheus/efifeatures.h
#	firmware/config/boards/skeleton/efifeatures.h
#	firmware/config/boards/subaru-ej20gn/efifeatures.h
#	firmware/config/stm32f4ems/efifeatures.h
#	firmware/config/stm32f7ems/efifeatures.h
This commit is contained in:
rusefi 2020-09-07 15:32:15 -04:00
parent d9100b3cce d424720ceb
commit e9c273d925
4 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/kinetis/efifeatures.h
View File

@ -317,6 +317,7 @@
#define LED_WARNING_BRAIN_PIN GPIOD_13
#define LED_CRITICAL_ERROR_BRAIN_PIN GPIOD_14
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
#define EFI_WARNING_LED FALSE

2
firmware/config/boards/prometheus/efifeatures.h
View File

@ -88,6 +88,8 @@
#undef LED_CRITICAL_ERROR_BRAIN_PIN
#define LED_CRITICAL_ERROR_BRAIN_PIN GPIOA_13
#undef LED_ERROR_BRAIN_PIN_MODE
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
#undef CONSOLE_MODE_SWITCH_PORT
#undef CONFIG_RESET_SWITCH_PORT

9
firmware/config/boards/skeleton/efifeatures.h
View File

@ -114,6 +114,10 @@
#define HAL_TRIGGER_USE_PAL FALSE
#endif /* HAL_TRIGGER_USE_PAL */
#ifndef HAL_TRIGGER_USE_ADC
#define HAL_TRIGGER_USE_ADC FALSE
#endif /* HAL_TRIGGER_USE_ADC */
// TunerStudio support.
#define EFI_TUNER_STUDIO TRUE
#define EFI_TUNER_STUDIO_VERBOSE TRUE // Debugging output
@ -325,6 +329,9 @@
#ifndef LED_CRITICAL_ERROR_BRAIN_PIN
#define LED_CRITICAL_ERROR_BRAIN_PIN GPIOD_14
#endif
#ifndef LED_ERROR_BRAIN_PIN_MODE
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
#endif
// USART1 -> check defined STM32_SERIAL_USE_USART1
// For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX
@ -366,7 +373,7 @@
#undef TS_SERIAL_DEVICE
#undef TS_UART_MODE
#define EFI_CONSOLE_SERIAL_DEVICE (&SD1)
//#define EFI_CONSOLE_SERIAL_DEVICE (&SDU1)
//#define EFI_CONSOLE_USB_DEVICE (&SDU1)
#define EFI_UART_ECHO_TEST_MODE TRUE
// USART3 is Alternate Function 7, UART4 is AF8

13
firmware/config/stm32f4ems/efifeatures.h
View File

@ -80,6 +80,10 @@
#define HAL_TRIGGER_USE_PAL FALSE
#endif /* HAL_TRIGGER_USE_PAL */
#ifndef HAL_TRIGGER_USE_ADC
#define HAL_TRIGGER_USE_ADC FALSE
#endif /* HAL_TRIGGER_USE_ADC */
#ifndef HAL_VSS_USE_PAL
#define HAL_VSS_USE_PAL FALSE
#endif /* HAL_VSS_USE_PAL */
@ -157,6 +161,10 @@
#define BOARD_TLE8888_COUNT 1
#endif
#ifndef BOARD_DRV8860_COUNT
#define BOARD_DRV8860_COUNT 0
#endif
#define EFI_ANALOG_SENSORS TRUE
#ifndef EFI_MAX_31855
@ -254,6 +262,8 @@
#define EFI_USB_SERIAL TRUE
#endif
#define EFI_CONSOLE_USB_DEVICE (&SDU1)
/**
* Should PnP engine configurations be included in the binary?
*/
@ -389,6 +399,9 @@
#ifndef LED_CRITICAL_ERROR_BRAIN_PIN
#define LED_CRITICAL_ERROR_BRAIN_PIN GPIOD_14
#endif
#ifndef LED_ERROR_BRAIN_PIN_MODE
#define LED_ERROR_BRAIN_PIN_MODE DEFAULT_OUTPUT
#endif
// USART1 -> check defined STM32_SERIAL_USE_USART1
// For GPS we have USART1. We can start with PB7 USART1_RX and PB6 USART1_TX