avr/uart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: avr:stk500v2-library-wip
Branches Tags
avr:master avr:stk500v2-library-wip avr:example
..
compare: avr:119de3244588b19b4afb06f33f66f22bb80a89b5
Branches Tags
avr:stk500v2-library-wip avr:master avr:example

1 Commits
stk500v2-l ... 119de32445

Author SHA1 Message Date
BlackMark
119de32445 Adapt to moved type submodule 2020-05-16 17:42:52 +02:00
4 changed files with 29 additions and 36 deletions
Expand all files Collapse all files

18
hardware.hpp
View File

@@ -2,7 +2,7 @@
#include "../clock.hpp"
#include "../type/type.hpp"
#include "../util/type.hpp"
#include <math.h>
#include <stdint.h>
@@ -68,11 +68,9 @@ class Hardware {
constexpr uint8_t ControlRegC = DataBitsValues.regCVal | ParityVal | StopBitsVal | ModeVal;
if constexpr (UseDoubleSpeed)
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() =
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() | (1 << CtrlFlagsA::SPEED_2X);
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() |= (1 << CtrlFlagsA::SPEED_2X);
else
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() =
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() & ~(1 << CtrlFlagsA::SPEED_2X);
*getRegPtr<Registers::CTRL_STAT_REG_A_ADDR>() &= ~(1 << CtrlFlagsA::SPEED_2X);
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() = ControlRegB;
*getRegPtr<Registers::CTRL_STAT_REG_C_ADDR>() = ControlRegC;
@@ -132,14 +130,12 @@ class Hardware {
static void enableDataRegEmptyInt() FORCE_INLINE
{
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() =
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() | (1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() |= (1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
}
static void disableDataRegEmptyInt() FORCE_INLINE
{
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() =
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() & ~(1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
*getRegPtr<Registers::CTRL_STAT_REG_B_ADDR>() &= ~(1 << CtrlFlagsB::DATA_REG_EMPTY_INT_ENABLE);
}
private:
@@ -279,7 +275,6 @@ template <class Registers, typename CtrlFlagsA, typename CtrlFlagsB, typename Ct
class BlockingHardware {
public:
using data_t = typename cfg::data_t;
static constexpr auto BAUD_RATE = cfg::BAUD_RATE;
static constexpr auto DATA_BITS = cfg::DATA_BITS;
static void init() FORCE_INLINE
@@ -299,7 +294,7 @@ class BlockingHardware {
static bool peek(data_t &) FORCE_INLINE
{
static_assert(type::always_false_v<data_t>, "Peek with data is not supported in blocking mode");
static_assert(util::always_false_v<data_t>, "Peek with data is not supported in blocking mode");
return false;
}
@@ -325,7 +320,6 @@ template <class Registers, typename CtrlFlagsA, typename CtrlFlagsB, typename Ct
class InterruptHardware {
public:
using data_t = typename cfg::data_t;
static constexpr auto BAUD_RATE = cfg::BAUD_RATE;
static constexpr auto DATA_BITS = cfg::DATA_BITS;
static void txByte(const data_t &byte) FORCE_INLINE

1
hardware1.hpp
View File

@@ -158,4 +158,3 @@ void USART1_UDRE_vect() __attribute__((signal));
#endif
#undef FORCE_INLINE

4
software.hpp
View File

@@ -3,13 +3,13 @@
#include "config.hpp"
#include "../io/io.hpp"
#include "../type/type.hpp"
#include "../util/type.hpp"
namespace uart {
template <io::P rxPin, io::P txPin, class cfg = Config<>>
class Software {
static_assert(type::always_false_v<cfg>, "Not implemented");
static_assert(util::always_false_v<cfg>, "Not implemented");
public:
using data_t = typename cfg::data_t;

42
uart.hpp
View File

@@ -33,8 +33,8 @@ static constexpr size_t cntDigits()
template <typename T, size_t Base>
static constexpr size_t maxNumDigits()
{
constexpr T MinVal = type::numeric_limits<T>::min();
constexpr T MaxVal = type::numeric_limits<T>::max();
constexpr T MinVal = util::numeric_limits<T>::min();
constexpr T MaxVal = util::numeric_limits<T>::max();
constexpr T MinDigits = cntDigits<T, MinVal, Base>();
constexpr T MaxDigits = cntDigits<T, MaxVal, Base>();
@@ -112,7 +112,7 @@ class Uart {
template <typename T, size_t Base = 10, size_t Padding = 0, char PadChar = '0', bool LowerCase = true>
static void txNumber(const T &val)
{
static_assert(type::is_integral_v<T>, "Only supported on integral types");
static_assert(util::is_integral_v<T>, "Only supported on integral types");
static_assert(Base >= 2, "Numbers with base less than 2 make no sense");
static_assert(Base <= 16, "Numbers with base higher than 16 are not supported");
static_assert(Padding <= detail::maxNumDigits<T, Base>(), "Cannot pad more than maximum length of number");
@@ -234,19 +234,19 @@ class Uart {
template <typename... Ts>
Uart &operator<<(float) const
{
static_assert(type::always_false_v<Ts...>, "Not supported by hardware");
static_assert(util::always_false_v<Ts...>, "Not supported by hardware");
}
template <typename... Ts>
Uart &operator<<(double) const
{
static_assert(type::always_false_v<Ts...>, "Not supported by hardware");
static_assert(util::always_false_v<Ts...>, "Not supported by hardware");
}
template <typename... Ts>
Uart &operator<<(long double) const
{
static_assert(type::always_false_v<Ts...>, "Not supported by hardware");
static_assert(util::always_false_v<Ts...>, "Not supported by hardware");
}
Uart &operator<<(const bool &val)
@@ -268,91 +268,91 @@ class Uart {
template <typename... Ts>
Uart &operator>>(char &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(unsigned char &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(short &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(unsigned short &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(int &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(unsigned int &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(long &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(unsigned long &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(long long &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(unsigned long long &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(float &) const
{
static_assert(type::always_false_v<Ts...>, "Not supported by hardware");
static_assert(util::always_false_v<Ts...>, "Not supported by hardware");
}
template <typename... Ts>
Uart &operator>>(double &) const
{
static_assert(type::always_false_v<Ts...>, "Not supported by hardware");
static_assert(util::always_false_v<Ts...>, "Not supported by hardware");
}
template <typename... Ts>
Uart &operator>>(long double &) const
{
static_assert(type::always_false_v<Ts...>, "Not supported by hardware");
static_assert(util::always_false_v<Ts...>, "Not supported by hardware");
}
template <typename... Ts>
Uart &operator>>(bool &) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
template <typename... Ts>
Uart &operator>>(const void *&) const
{
static_assert(type::always_false_v<Ts...>, "Not implemented");
static_assert(util::always_false_v<Ts...>, "Not implemented");
}
private: