Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds symbols for the maximum supported address values. #643

Merged
merged 1 commit into from
Aug 16, 2022
Merged

Adds symbols for the maximum supported address values. #643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 27 additions & 14 deletions src/dcc/Address.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,46 +39,59 @@

#include "utils/macros.h"

namespace dcc {
namespace dcc
{

/// Strongly typed wrapper representing a short DCC address. This allows C++
/// type inference to decide whether a particular value is a long or short
/// address.
struct DccShortAddress {
struct DccShortAddress
{
/// Largest valid address.
static constexpr unsigned ADDRESS_MAX = 127;
/// Address value.
uint8_t value;
/// Constructor. @param v is the address value (0<=v<128);
explicit DccShortAddress(uint8_t v)
: value(v) {
HASSERT(value < 128);
explicit DccShortAddress(unsigned v)
: value(v)
{
HASSERT(value <= ADDRESS_MAX);
}
};

/// Strongly typed wrapper representing a long DCC address. This allows C++
/// type inference to decide whether a particular value is a long or short
/// address.
struct DccLongAddress {
struct DccLongAddress
{
/// Largest valid address.
static constexpr unsigned ADDRESS_MAX = 10239;
/// Address value.
uint16_t value;
/// Constructor. @param v is the address value (0<=v<10239);
explicit DccLongAddress(uint16_t v)
: value(v) {
HASSERT(value <= 10239);
explicit DccLongAddress(unsigned v)
: value(v)
{
HASSERT(value <= ADDRESS_MAX);
}
};

/// Strongly typed wrapper representing a marklin-motorola protocol
/// address. This address is between 0 and 80.
struct MMAddress {
struct MMAddress
{
/// Largest valid address.
static constexpr unsigned ADDRESS_MAX = 80;
/// Address value.
uint8_t value;
/// Constructor. @param v is the address value (0<=v<81);
explicit MMAddress(uint8_t v)
: value(v) {
HASSERT(v <= 80);
explicit MMAddress(unsigned v)
: value(v)
{
HASSERT(v <= ADDRESS_MAX);
}
};

} // namespace dcc
} // namespace dcc

#endif // _DCC_ADDRESS_HXX_