Extract FieldReader to separate header so it can be reused.

This commit is contained in:
Jared Boone 2015-11-16 10:31:36 -08:00
parent 77199fb3dd
commit 4d6877ab15
2 changed files with 53 additions and 24 deletions

View file

@ -26,6 +26,7 @@
#include <cstdlib>
#include <string>
#include "field_reader.hpp"
#include "crc.hpp"
// TODO: Move string formatting elsewhere!!!
@ -33,28 +34,6 @@
namespace baseband {
template<typename T, typename BitRemap>
class FieldReader {
public:
constexpr FieldReader(
const T& data
) : data { data }
{
}
uint32_t read(const size_t start_bit, const size_t length) const {
uint32_t value = 0;
for(size_t i=start_bit; i<(start_bit + length); i++) {
value = (value << 1) | data[bit_remap(i)];
}
return value;
}
private:
const T& data;
const BitRemap bit_remap { };
};
namespace ais {
struct BitRemap {
@ -69,8 +48,8 @@ struct CRCBitRemap {
}
};
using FieldReader = baseband::FieldReader<std::bitset<1024>, BitRemap>;
using CRCFieldReader = baseband::FieldReader<std::bitset<1024>, CRCBitRemap>;
using FieldReader = ::FieldReader<std::bitset<1024>, BitRemap>;
using CRCFieldReader = ::FieldReader<std::bitset<1024>, CRCBitRemap>;
struct PacketLengthRange {
constexpr PacketLengthRange(