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:
commit
31befbb7d8
|
@ -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
|
||||
|
|
|
@ -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?
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue