removing prefix LL_ from class/struct names under f4ll namespace
This commit is contained in:
parent
180f2ef624
commit
7cdc79c2ac
17 changed files with 184 additions and 183 deletions
|
@ -8,10 +8,10 @@
|
|||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "f4ll/ll_hsusart.h"
|
||||
#include "f4ll/ll_crchandler.h"
|
||||
#include "f4ll/ll_memcpydma.h"
|
||||
#include "f4ll/ll_consolehandler.h"
|
||||
#include "f4ll/hsusart.h"
|
||||
#include "f4ll/crchandler.h"
|
||||
#include "f4ll/memcpydma.h"
|
||||
#include "f4ll/consolehandler.h"
|
||||
extern "C" {
|
||||
#include "main.h"
|
||||
#include "globals.h"
|
||||
|
@ -34,16 +34,16 @@ extern "C" void MainLoop()
|
|||
"Megszentsegtelenithetetlensegeskedeseitekert\r\n"
|
||||
"--------------------------------------------\r\n\0\0\0";
|
||||
|
||||
f4ll::LL_MemcpyDma::Init(MEMCPY_DMA_ENGINE, MEMCPY_DMA_STREAM);
|
||||
f4ll::LL_CrcHandler::Init(DMA2, LL_DMA_STREAM_4);
|
||||
f4ll::LL_ConsoleHandler::Init(UART4, CONSOLE_DMA_ENGINE, 0u, CONSOLE_TX_DMA_STREAM);
|
||||
f4ll::MemcpyDma::Init(MEMCPY_DMA_ENGINE, MEMCPY_DMA_STREAM);
|
||||
f4ll::CrcHandler::Init(DMA2, LL_DMA_STREAM_4);
|
||||
f4ll::ConsoleHandler::Init(UART4, CONSOLE_DMA_ENGINE, 0u, CONSOLE_TX_DMA_STREAM);
|
||||
|
||||
f4ll::LL_HsUsart u1{ USART1, DMA2, LL_DMA_STREAM_2, LL_DMA_STREAM_7 };
|
||||
f4ll::LL_HsUsart u2{ USART2, DMA1, LL_DMA_STREAM_5, LL_DMA_STREAM_6 };
|
||||
f4ll::LL_HsUsart u3{ USART3, DMA1, LL_DMA_STREAM_1, LL_DMA_STREAM_3 };
|
||||
f4ll::LL_HsUsart u6{ USART6, DMA2, LL_DMA_STREAM_1, LL_DMA_STREAM_6 };
|
||||
f4ll::HsUsart u1{ USART1, DMA2, LL_DMA_STREAM_2, LL_DMA_STREAM_7 };
|
||||
f4ll::HsUsart u2{ USART2, DMA1, LL_DMA_STREAM_5, LL_DMA_STREAM_6 };
|
||||
f4ll::HsUsart u3{ USART3, DMA1, LL_DMA_STREAM_1, LL_DMA_STREAM_3 };
|
||||
f4ll::HsUsart u6{ USART6, DMA2, LL_DMA_STREAM_1, LL_DMA_STREAM_6 };
|
||||
|
||||
f4ll::LL_HsUsart * usarts[] = { &u1, &u2, &u3, &u6 };
|
||||
f4ll::HsUsart * usarts[] = { &u1, &u2, &u3, &u6 };
|
||||
for(unsigned int i=0; i < sizeof(usarts) / sizeof(usarts[0]); ++i)
|
||||
g_usarts[i] = usarts[i];
|
||||
|
||||
|
@ -76,7 +76,7 @@ extern "C" void MainLoop()
|
|||
if(!u->IsTxBusy() && send) {
|
||||
//DIAG_ENTER_BUSY();
|
||||
auto len = sizeof(text2Send) - 1 - (rand() & randmask);
|
||||
f4ll::LL_MemcpyDma::Instance().Copy(u->GetTxPacketBuffer(), text2Send, len);
|
||||
f4ll::MemcpyDma::Instance().Copy(u->GetTxPacketBuffer(), text2Send, len);
|
||||
u->PostPacket(nullptr, len);
|
||||
//DIAG_EXIT_BUSY();
|
||||
}
|
||||
|
@ -85,7 +85,7 @@ extern "C" void MainLoop()
|
|||
u->RxProcessed((bool)rIdx);
|
||||
}
|
||||
if(tick - lastStatsTick > STATS_DELAY_MS) {
|
||||
f4ll::LL_ConsoleHandler::Instance().PrintStats(statId, *usarts[statId]);
|
||||
f4ll::ConsoleHandler::Instance().PrintStats(statId, *usarts[statId]);
|
||||
lastStatsTick += STATS_DELAY_MS;
|
||||
++statId;
|
||||
if(statId >= sizeof(usarts) / sizeof(usarts[0]))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue