Hellen says merge #1772 fast ADC

This commit is contained in:
rusefi 2020-09-11 03:54:07 -04:00
parent d33afbc0d1
commit 24d91947a6
6 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,7 @@ echo Entering %script_name%
mkdir .dep
rem todo: start using env variable for number of threads or for '-r'
make -j4 -r
make -r -j4 2> err.log
if not exist build/rusefi.hex echo FAILED to compile by %script_name% with %PROJECT_BOARD% %DEBUG_LEVEL_OPT% and %EXTRA_PARAMS%
if not exist build/rusefi.hex exit -1

View File

@ -265,7 +265,7 @@
// todo: switch to continues ADC conversion for slow ADC?
// https://github.com/rusefi/rusefi/issues/630
// todo: switch to continues ADC conversion for fast ADC?
#define EFI_INTERNAL_FAST_ADC_PWM &PWMD2
#define EFI_INTERNAL_FAST_ADC_GPT &GPTD2
// todo: why 64 SPLL prescaler doesn't work?
// 168000000/64/128/1025 = ~20Hz

View File

@ -272,7 +272,7 @@
// todo: switch to continuous ADC conversion for slow ADC?
// https://github.com/rusefi/rusefi/issues/630
// todo: switch to continues ADC conversion for fast ADC?
#define EFI_INTERNAL_FAST_ADC_PWM &PWMD4
#define EFI_INTERNAL_FAST_ADC_GPT &GPTD6
#define EFI_SPI1_AF 5
@ -383,7 +383,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
#define TS_UART_DEVICE (&UARTD3)
#define TS_SERIAL_DEVICE (&SD3)

View File

@ -250,7 +250,7 @@
#define EFI_USB_SERIAL TRUE
#endif
#define EFI_CONSOLE_USB_DEVICE (&SDU1)
#define EFI_CONSOLE_USB_DEVICE SDU1
/**
* While we embed multiple PnP configurations into the same firmware binary, these marcoses give us control
@ -304,7 +304,7 @@
// todo: switch to continues ADC conversion for slow ADC?
// https://github.com/rusefi/rusefi/issues/630
// todo: switch to continues ADC conversion for fast ADC?
#define EFI_INTERNAL_FAST_ADC_PWM &PWMD4
#define EFI_INTERNAL_FAST_ADC_GPT &GPTD6
#define EFI_SPI1_AF 5

View File

@ -180,7 +180,7 @@
#define STM32_GPT_USE_TIM3 FALSE
#define STM32_GPT_USE_TIM4 FALSE
#define STM32_GPT_USE_TIM5 TRUE
#define STM32_GPT_USE_TIM6 FALSE
#define STM32_GPT_USE_TIM6 TRUE
#define STM32_GPT_USE_TIM7 FALSE
#define STM32_GPT_USE_TIM8 FALSE
#define STM32_GPT_USE_TIM9 FALSE

View File

@ -201,7 +201,7 @@
#define STM32_GPT_USE_TIM3 FALSE
#define STM32_GPT_USE_TIM4 FALSE
#define STM32_GPT_USE_TIM5 TRUE
#define STM32_GPT_USE_TIM6 FALSE
#define STM32_GPT_USE_TIM6 TRUE
#define STM32_GPT_USE_TIM7 FALSE
#define STM32_GPT_USE_TIM8 FALSE
#define STM32_GPT_USE_TIM9 FALSE