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

UART DMA for "primary" connector #1528

This commit is contained in:
rusefi 2020-06-21 21:47:51 -04:00
parent 0032ad9778
commit 676aecd581
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,7 +382,7 @@
*/ */
#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__) #if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
/* Configured in efifeatures.h */ /* Configured in efifeatures.h */
#if (TS_UART_DMA_MODE || TS_UART_MODE) #if (PRIMARY_UART_DMA_MODE || TS_UART_DMA_MODE || TS_UART_MODE)
#define UART_USE_WAIT TRUE #define UART_USE_WAIT TRUE
#else #else
#define UART_USE_WAIT FALSE #define UART_USE_WAIT FALSE

16
firmware/console/binary/tunerstudio_io.cpp
View File

@ -13,7 +13,7 @@
#if EFI_SIMULATOR #if EFI_SIMULATOR
#include "rusEfiFunctionalTest.h" #include "rusEfiFunctionalTest.h"
#endif #endif // EFI_SIMULATOR
EXTERN_ENGINE; EXTERN_ENGINE;
@ -123,11 +123,14 @@ void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) {
logMsg("chSequentialStreamWrite [%d]\r\n", size); logMsg("chSequentialStreamWrite [%d]\r\n", size);
#endif #endif
#if (TS_UART_DMA_MODE || TS_UART_MODE) && EFI_PROD_CODE #if (PRIMARY_UART_DMA_MODE || TS_UART_DMA_MODE || TS_UART_MODE) && EFI_PROD_CODE
UNUSED(tsChannel); if (tsChannel->uartp != nullptr) {
int transferred = size; int transferred = size;
uartSendTimeout(TS_UART_DEVICE, (size_t *)&transferred, buffer, BINARY_IO_TIMEOUT); uartSendTimeout(tsChannel->uartp, (size_t *)&transferred, buffer, BINARY_IO_TIMEOUT);
#else return;
}
#endif // UART
if (tsChannel->channel == nullptr) if (tsChannel->channel == nullptr)
return; return;
@ -143,7 +146,6 @@ void sr5WriteData(ts_channel_s *tsChannel, const uint8_t * buffer, int size) {
stillToTransfer -= thisTransferSize; stillToTransfer -= thisTransferSize;
} }
#endif
#if EFI_SIMULATOR #if EFI_SIMULATOR
logMsg("transferred [%d]\r\n", transferred); logMsg("transferred [%d]\r\n", transferred);