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

ladislas/feature/rfidkit fix refactor #1126

Merged
merged 4 commits into from
Nov 17, 2022
Merged

ladislas/feature/rfidkit fix refactor #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73dfcaa
:recycle: (CoreRFIDReader): Replace for loops w/ std::copy
ladislas Nov 7, 2022
e5c614b
:rotating_light: (RFIDKit): Fix warnings
ladislas Nov 14, 2022
23f66a2
:recycle: (RFIDKit): Refactor struct Command to be fully constexpr + …
ladislas Nov 14, 2022
b81290f
:adhesive_bandage: (RFIDKit): Add missing inline qualifiers
ladislas Nov 14, 2022
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
9 changes: 3 additions & 6 deletions drivers/CoreRFIDReader/source/CoreRFIDReaderCR95HF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ void CoreRFIDReaderCR95HF::sendRequestToTag(std::span<const uint8_t> data)
_tx_buf.at(0) = rfid::cr95hf::command::send_receive;
_tx_buf.at(1) = static_cast<uint8_t>(data.size());

for (auto i = 0; i < data.size(); ++i) {
_tx_buf.at(i + rfid::cr95hf::tag_answer::heading_size) = data[i];
}
std::copy(data.begin(), data.end(), _tx_buf.begin() + rfid::cr95hf::tag_answer::heading_size);

_serial.write(_tx_buf.data(), data.size() + rfid::cr95hf::tag_answer::heading_size);
}
Expand All @@ -96,9 +94,8 @@ auto CoreRFIDReaderCR95HF::didTagCommunicationSucceed(size_t sizeTagData) -> boo

auto CoreRFIDReaderCR95HF::getTag() -> rfid::Tag &
{
for (auto i = 0; i < _tag.data.size(); ++i) {
_tag.data.at(i) = _rx_buf.at(i + rfid::cr95hf::tag_answer::heading_size);
}
std::copy(_rx_buf.begin() + rfid::cr95hf::tag_answer::heading_size, _rx_buf.end(), _tag.data.begin());

return _tag;
}

Expand Down
47 changes: 22 additions & 25 deletions libs/RFIDKit/include/ISO14443A.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@ namespace leka::rfid {

template <std::size_t SIZE>
struct Command {
const std::array<uint8_t, SIZE> data;
const leka::rfid::Flag flags;
struct Details {
std::initializer_list<uint8_t> data;
rfid::Flag flags {};
};

[[nodiscard]] inline auto getArray() const -> std::array<uint8_t, SIZE + 1>
explicit constexpr Command(Details details)
{
auto cmd = std::array<uint8_t, SIZE + 1> {};

for (std::size_t i = 0; i < SIZE; ++i) {
cmd.at(i) = data.at(i);
}
std::copy(details.data.begin(), details.data.end(), _data.begin());
_data.back() = static_cast<uint8_t>(details.flags);
};

cmd.at(SIZE) = static_cast<uint8_t>(flags);
[[nodiscard]] constexpr auto data() const -> std::span<const uint8_t> { return std::span(_data); }

return cmd;
}
private:
std::array<uint8_t, SIZE + 1> _data;
};

constexpr Command<1> command_requestA = {.data = {0x26}, .flags = leka::rfid::Flag::sb_7};
constexpr Command<2> command_read_register_4 = {.data = {0x30, 0x04},
.flags = leka::rfid::Flag::crc | leka::rfid::Flag::sb_8};
inline constexpr auto command_requestA = Command<1>({.data = {0x26}, .flags = leka::rfid::Flag::sb_7});
inline constexpr auto command_read_register_4 =
Command<2>({.data = {0x30, 0x04}, .flags = leka::rfid::Flag::crc | leka::rfid::Flag::sb_8});

constexpr auto ATQA_answer_size = 2;
constexpr auto initial_polynomial_value = uint32_t {0x6363};
constexpr auto register_answer_size = size_t {18};
constexpr auto expected_ATQA_answer = std::array<uint8_t, ATQA_answer_size> {0x44, 0x00};
inline constexpr auto ATQA_answer_size = 2;
inline constexpr auto initial_polynomial_value = uint32_t {0x6363};
inline constexpr auto register_answer_size = std::size_t {18};
inline constexpr auto expected_ATQA_answer = std::array<uint8_t, ATQA_answer_size> {0x44, 0x00};

inline auto computeCRC(uint8_t const *data) -> std::array<uint8_t, 2>
{
Expand All @@ -48,13 +48,13 @@ inline auto computeCRC(uint8_t const *data) -> std::array<uint8_t, 2>
size_t size = 16;

do {
std::byte val;
std::byte val {};
val = static_cast<std::byte>(*data++);
val = (val ^ static_cast<std::byte>(wCrc & 0x00FF));
val = (val ^ (val << 4));
wCrc = (wCrc >> 8) ^ (static_cast<uint32_t>(val) << 8) ^ (static_cast<uint32_t>(val) << 3) ^
(static_cast<uint32_t>(val) >> 4);
} while (--size);
} while (--size != 0);

std::array<uint8_t, 2> pbtCrc = {static_cast<uint8_t>(wCrc & 0xFF), static_cast<uint8_t>((wCrc >> 8) & 0xFF)};
return pbtCrc;
Expand Down Expand Up @@ -142,14 +142,11 @@ namespace sm::action {
};

struct send_request_A {
auto operator()(irfidreader &rfidreader) const { rfidreader.sendRequestToTag(command_requestA.getArray()); }
auto operator()(irfidreader &rfidreader) const { rfidreader.sendRequestToTag(command_requestA.data()); }
};

struct send_register_4 {
auto operator()(irfidreader &rfidreader) const
{
rfidreader.sendRequestToTag(command_read_register_4.getArray());
}
auto operator()(irfidreader &rfidreader) const { rfidreader.sendRequestToTag(command_read_register_4.data()); }
};

struct on_tag_readable {
Expand Down
8 changes: 4 additions & 4 deletions libs/RFIDKit/tests/ISO14443A_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ class ISO14443ATest : public ::testing::Test
mock::CoreRFIDReader mock_reader {};
boost::sml::sm<rfid::ISO14443A, boost::sml::testing> sm {static_cast<interface::RFIDReader &>(mock_reader)};

static constexpr rfid::Command<1> command_requestA = {.data = {0x26}, .flags = leka::rfid::Flag::sb_7};
static constexpr rfid::Command<2> command_read_register_4 = {
.data = {0x30, 0x04}, .flags = leka::rfid::Flag::crc | leka::rfid::Flag::sb_8};

std::function<void()> magic_card_callback {};
};

inline constexpr auto command_requestA = rfid::Command<1>({.data = {0x26}, .flags = leka::rfid::Flag::sb_7});
inline constexpr auto command_read_register_4 =
rfid::Command<2>({.data = {0x30, 0x04}, .flags = leka::rfid::Flag::crc | leka::rfid::Flag::sb_8});

TEST_F(ISO14443ATest, initialization)
{
ASSERT_NE(&sm, nullptr);
Expand Down