Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-27 06:47:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean up FieldReader and BitRemap types.

Browse Source
This commit is contained in:
Jared Boone 2015-12-08 14:15:15 -08:00
parent 31fdf026f2
commit 90a7327cd5
4 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/application/app_ais.cpp
View File

@ -33,13 +33,7 @@ using namespace portapack;
namespace baseband { namespace baseband {
namespace ais { namespace ais {
struct CRCBitRemap { using CRCFieldReader = ::FieldReader<::Packet, BitRemapNone>;
constexpr size_t operator()(const size_t& bit_index) const {
return bit_index;
}
};
using CRCFieldReader = ::FieldReader<::Packet, CRCBitRemap>;
struct PacketLengthRange { struct PacketLengthRange {
constexpr PacketLengthRange( constexpr PacketLengthRange(

12
firmware/application/app_ais.hpp
View File

@ -43,14 +43,6 @@ using namespace lpc43xx;
namespace baseband { namespace baseband {
namespace ais { namespace ais {
struct BitRemap {
constexpr size_t operator()(const size_t bit_index) const {
return bit_index ^ 7;
}
};
using FieldReader = ::FieldReader<::Packet, BitRemap>;
struct DateTime { struct DateTime {
uint16_t year; uint16_t year;
uint8_t month; uint8_t month;
@ -98,9 +90,11 @@ public:
bool crc_ok() const; bool crc_ok() const;
private: private:
using Reader = FieldReader<::Packet, BitRemapByteReverse>;
const ::Packet packet_; const ::Packet packet_;
const rtc::RTC received_at_; const rtc::RTC received_at_;
const FieldReader field_; const Reader field_;
const size_t fcs_length = 16; const size_t fcs_length = 16;

8
firmware/application/app_ert.hpp
View File

@ -38,12 +38,6 @@ using namespace lpc43xx;
namespace ert { namespace ert {
struct BitRemap {
constexpr size_t operator()(const size_t bit_index) const {
return bit_index;
}
};
using ID = uint32_t; using ID = uint32_t;
using Consumption = uint32_t; using Consumption = uint32_t;
@ -76,7 +70,7 @@ public:
bool crc_ok() const; bool crc_ok() const;
private: private:
using Reader = FieldReader<ManchesterDecoder, BitRemap>; using Reader = FieldReader<ManchesterDecoder, BitRemapNone>;
const ::Packet packet_; const ::Packet packet_;
const rtc::RTC received_at_; const rtc::RTC received_at_;

15
firmware/common/field_reader.hpp
View File

@ -25,6 +25,18 @@
#include <cstdint> #include <cstdint>
#include <cstddef> #include <cstddef>
struct BitRemapNone {
constexpr size_t operator()(const size_t& bit_index) const {
return bit_index;
}
};
struct BitRemapByteReverse {
constexpr size_t operator()(const size_t bit_index) const {
return bit_index ^ 7;
}
};
template<typename T, typename BitRemap> template<typename T, typename BitRemap>
class FieldReader { class FieldReader {
public: public:
@ -34,6 +46,9 @@ public:
{ {
} }
/* The "start_bit" winds up being the MSB of the returned field value. */
/* The BitRemap functor determines which bits are read from the source
* packet. */
uint32_t read(const size_t start_bit, const size_t length) const { uint32_t read(const size_t start_bit, const size_t length) const {
uint32_t value = 0; uint32_t value = 0;
for(size_t i=start_bit; i<(start_bit + length); i++) { for(size_t i=start_bit; i<(start_bit + length); i++) {