playground-stm32/f407_test
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved f4ll_cpp imto its own namespace

Browse source 
moved strutil to the application
This commit is contained in:
Attila Body 2020-11-16 13:24:15 +01:00
parent 3a20a7d846
commit fb5670a950
21 changed files with 70 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
App/application.cpp
View file

@ -6,16 +6,16 @@
*/
#include <f4ll_cpp/ili9341.h>
#include <f4ll_cpp/strutil.h>
#include <application.h>
#include <initializer_list>
#include "main.h"
#include "globals.h"
#include "strutil.h"
#define BORDER 60
#define BARWIDTH 2
using namespace f4ll_cpp;
void MainLoop()
{

12
App/application.h
View file

@ -23,23 +23,23 @@ void MainLoop();
#include "globals.h"
struct GlobalsInitializer {
GlobalsInitializer(SerialConsole<257> *console) {
GlobalsInitializer(f4ll_cpp::SerialConsole<257> *console) {
g_console = console;
}
};
class Application : public GlobalsInitializer, public SerialConsole<257>::ISerialConsoleCallback {
class Application : public GlobalsInitializer, public f4ll_cpp::SerialConsole<257>::ISerialConsoleCallback {
public:
Application();
void Loop();
private:
virtual void LineReceived(void *userParam, SerialConsole<257>::Buffer *buffer);
virtual void TransmissionComplete(void *userParam, SerialConsole<257>::Buffer *buffer);
virtual void LineReceived(void *userParam, f4ll_cpp::SerialConsole<257>::Buffer *buffer);
virtual void TransmissionComplete(void *userParam, f4ll_cpp::SerialConsole<257>::Buffer *buffer);
SerialConsole<257> m_console;
f4ll_cpp::SerialConsole<257> m_console;
volatile bool m_lineReceived = false;
volatile SerialConsole<257>::Buffer *m_rcvdBuffer;
volatile f4ll_cpp::SerialConsole<257>::Buffer *m_rcvdBuffer;
char m_appBuffer[128];
volatile bool m_transmissionCompleted = true;

2
App/globals.cpp
View file

@ -7,4 +7,4 @@
#include "globals.h"
SerialConsole<257> *g_console = nullptr;
f4ll_cpp::SerialConsole<257> *g_console = nullptr;

2
App/globals.h
View file

@ -11,7 +11,7 @@
#if defined(__cplusplus)
extern SerialConsole<257> *g_console;
extern f4ll_cpp::SerialConsole<257> *g_console;
#endif // __cplusplus

2
App/interrupt_handlers.cpp
View file

@ -12,7 +12,7 @@
void HandleLcdDmaIrq()
{
// DMA2 Stream4
Ili9341Fsmc::HandleDmaIrq(&Ili9341Fsmc::Instance());
f4ll_cpp::Ili9341Fsmc::HandleDmaIrq(&f4ll_cpp::Ili9341Fsmc::Instance());
}
void HandleConsoleRxDmaIrq()

2
components/f4ll_cpp/strutil.c → App/strutil.c
View file

@ -1,5 +1,5 @@
#include <stdint.h>
#include <f4ll_cpp/strutil.h>
#include "strutil.h"
//////////////////////////////////////////////////////////////////////////////
size_t strcpy_ex(char *dst, char const *src)

8
components/f4ll_cpp/strutil.h → App/strutil.h
View file

@ -4,9 +4,8 @@
* Created on: Feb 11, 2017
* Author: compi
*/
#ifndef _STM32PLUS_STRUTIL_H_
#define _STM32PLUS_STRUTIL_H_
#ifndef _STRUTIL_H_
#define _STRUTIL_H_
#include <stddef.h>
#include <inttypes.h>
@ -28,4 +27,5 @@ char tochr(const uint8_t in, const uint8_t upper);
}
#endif
#endif /* _STM32PLUS_STRUTIL_H_ */
#endif // _STRUTIL_H_

4
components/f4ll_cpp/crcscheduler.cpp
View file

@ -27,6 +27,9 @@
# define DIAG_INTERRUPT_OUT()
#endif
namespace f4ll_cpp
{
void Crc_StartNextTask(struct crcstatus_t *status);
@ -188,3 +191,4 @@ void CrcScheduler::_HandleDmaIrq()
DIAG_INTERRUPT_OUT();
}
} // f4ll_cpp

4
components/f4ll_cpp/crcscheduler.h
View file

@ -17,6 +17,9 @@
#include <platform/crc_ll.h>
#include <f4ll_cpp/dmahelper.h>
namespace f4ll_cpp
{
class CrcScheduler {
public:
struct ICrcCallback {
@ -64,5 +67,6 @@ private:
crcslot_t *m_firstSlot;
};
} // f4ll_cpp
#endif /* CRC_HANDLER_H_ */

4
components/f4ll_cpp/dmahelper.cpp
View file

@ -9,6 +9,9 @@
#define MOCKABLE(x) x
#endif
namespace f4ll_cpp
{
DmaHelper::DmaHelper(DMA_TypeDef *dma, uint32_t stream)
{
m_dma = dma;
@ -80,3 +83,4 @@ uint32_t DmaHelper::_GetTcMask(uint32_t stream)
return tcMasks[stream];
}
} // f4ll_cpp

15
components/f4ll_cpp/dmahelper.h
View file

@ -14,6 +14,9 @@
#define DECLARE_MOCK(x)
#endif
namespace f4ll_cpp
{
class DmaHelper {
public:
DmaHelper(DMA_TypeDef *dma, uint32_t stream);
@ -49,16 +52,6 @@ private:
uint32_t m_tcMask;
};
#ifdef UNITTEST
DECLARE_MOCK(Dma_GetIsReg);
DECLARE_MOCK(Dma_GetIfcReg);
DECLARE_MOCK(Dma_GetDmeMask);
DECLARE_MOCK(Dma_GetTeMask);
DECLARE_MOCK(Dma_GetHtMask);
DECLARE_MOCK(Dma_GetTcMask);
DECLARE_MOCK(Dma_GetFeMask);
DECLARE_MOCK(Dma_Init);
#endif
} // f4ll_cpp
#endif /* DMA_HELPER_H_ */

4
components/f4ll_cpp/ili9341.cpp
View file

@ -16,6 +16,8 @@
#define RGB2U16(R,G,B) ((R & 0xf8) << 8 | (G & 0xfc) << 3 | (B & 0xf8) >> 3)
#define MSBSPLIT(x) ((uint8_t)(x >> 8)), ((uint8_t)x)
namespace f4ll_cpp {
Ili9341Fsmc::Ili9341Fsmc(volatile uint16_t *reg, volatile uint16_t *ram,
DMA_TypeDef *dma, uint32_t dmaStream,
bool horizontal)
@ -395,3 +397,5 @@ const uint8_t Ili9341Fsmc::m_font[CHRCOUNT][CHRWIDTH] = {
{0x02,0x01,0x02,0x01,0x00,0x00}, // ~
{0x00,0x00,0x00,0x00,0x00,0x00}
};
} // f4ll_cpp

4
components/f4ll_cpp/ili9341.h
View file

@ -5,6 +5,8 @@
#include <f4ll_cpp/dmahelper.h>
#include <inttypes.h>
namespace f4ll_cpp {
class Ili9341Fsmc : public Singleton<Ili9341Fsmc>, private DmaHelper
{
public:
@ -186,4 +188,6 @@ public:
};
};
} // f4ll_cpp
#endif

4
components/f4ll_cpp/memcpydma.cpp
View file

@ -7,6 +7,8 @@
#include <f4ll_cpp/dmahelper.h>
#include <f4ll_cpp/memcpydma.h>
namespace f4ll_cpp {
MemcpyDma::MemcpyDma(DMA_TypeDef *dma, uint32_t stream) :
DmaHelper(dma, stream),
m_busy(false)
@ -33,3 +35,5 @@ void MemcpyDma::HandleDmaIrq(void)
m_busy = false;
}
}
} // f4ll_cpp

3
components/f4ll_cpp/memcpydma.h
View file

@ -14,6 +14,8 @@
#include <f4ll_cpp/singleton.h>
namespace f4ll_cpp {
class MemcpyDma : public DmaHelper, public Singleton<MemcpyDma>
{
public:
@ -26,5 +28,6 @@ private:
volatile bool m_busy;
};
} // namespace f4ll_cpp
#endif /* MEMCPY_DMA_H_ */

4
components/f4ll_cpp/packetuart.cpp
View file

@ -30,6 +30,9 @@
#define STARTMARKER 0x95
namespace f4ll_cpp
{
static inline uint32_t RoundUpTo4(uint32_t inp)
{
return (inp + 3) & 0xfffc;
@ -280,3 +283,4 @@ void PacketUart::HandleUsartIrq()
DIAG_INTERRUPT_OUT();
}
} // f4ll_cpp

4
components/f4ll_cpp/packetuart.h
View file

@ -13,6 +13,8 @@
#define USART_STATS_DISABLED
namespace f4ll_cpp {
class PacketUart : public UartBase, public CrcScheduler::ICrcCallback
{
public:
@ -100,4 +102,6 @@ private:
Buffer rxBuffers[2];
};
} // f4ll_cpp
#endif /* UART_HANDLER_H_ */

4
components/f4ll_cpp/serialconsole.h
View file

@ -14,6 +14,8 @@
#include <f4ll_cpp/uartbase.h>
namespace f4ll_cpp {
template<unsigned int bufSize> class SerialConsole : protected UartBase
{
public:
@ -166,4 +168,6 @@ template<unsigned int bufSize> void SerialConsole<bufSize>::SendLine(char const
}
}
} // f4ll_cpp
#endif /* CONSOLEHANDLER_H_ */

4
components/f4ll_cpp/singleton.h
View file

@ -10,6 +10,8 @@
#include <utility>
namespace f4ll_cpp {
template<typename T> class Singleton {
public:
static T &Instance() { return *m_instance; }
@ -32,4 +34,6 @@ protected:
template<typename T> T* Singleton<T>::m_instance = nullptr;
} // f4ll_cpp
#endif /* SINGLETON_H_ */

3
components/f4ll_cpp/uartbase.cpp
View file

@ -7,6 +7,8 @@
#include <f4ll_cpp/uartbase.h>
namespace f4ll_cpp {
UartBase::UartBase(USART_TypeDef *uart, DMA_TypeDef *dma, uint32_t stream_rx, uint32_t stream_tx)
: m_uart(uart)
, m_rxDma(dma, stream_rx)
@ -44,3 +46,4 @@ void UartBase::SetupTransmit(void *buffer, uint16_t length)
LL_DMA_EnableStream(m_txDma.GetDma(), m_txDma.GetStream());
}
} // f4ll_cpp

4
components/f4ll_cpp/uartbase.h
View file

@ -10,6 +10,8 @@
#include <platform/usart_ll.h>
#include <f4ll_cpp/dmahelper.h>
namespace f4ll_cpp {
class UartBase
{
public:
@ -24,4 +26,6 @@ protected:
DmaHelper m_txDma;
};
} // f4ll_cpp
#endif /* F4LL_CPP_UARTBASE_H_ */