rusefi
/
rusefi
mirror of https://github.com/rusefi/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/common_make.bat
#	firmware/controllers/algo/engine.cpp
#	firmware/controllers/system_fsio.txt
This commit is contained in:
rusefi 2020-09-11 03:59:06 -04:00
parent 617af80519 24d91947a6
commit 31befbb7d8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -373,7 +373,7 @@
#undef TS_SERIAL_DEVICE
#undef TS_UART_MODE
#define EFI_CONSOLE_SERIAL_DEVICE (&SD1)
//#define EFI_CONSOLE_USB_DEVICE (&SDU1)
//#define EFI_CONSOLE_USB_DEVICE SDU1
#define EFI_UART_ECHO_TEST_MODE TRUE
// USART3 is Alternate Function 7, UART4 is AF8

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

@ -262,7 +262,7 @@
#define EFI_USB_SERIAL TRUE
#endif
#define EFI_CONSOLE_USB_DEVICE (&SDU1)
#define EFI_CONSOLE_USB_DEVICE SDU1
/**
* Should PnP engine configurations be included in the binary?

2
firmware/controllers/system_fsio.txt
View File

@ -55,4 +55,4 @@ STARTER_RELAY_LOGIC=rpm < cranking_rpm
BOOST_CONTROLLER=fsio_table (3, rpm, map) / 100
ANALOG_CONDITION=if(fsio_analog_input (0) > 20, 0, 10)
ANALOG_CONDITION=if(fsio_analog_input (0) > 20, 0, 10)