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

Extract FieldReader to separate header so it can be reused.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
firmware/common/ais_baseband.cpp
View File

@ -26,6 +26,7 @@
#include <cstdlib> #include <cstdlib>
#include <string> #include <string>
#include "field_reader.hpp"
#include "crc.hpp" #include "crc.hpp"
// TODO: Move string formatting elsewhere!!! // TODO: Move string formatting elsewhere!!!
@ -33,28 +34,6 @@
namespace baseband { 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 { namespace ais {
struct BitRemap { struct BitRemap {
@ -69,8 +48,8 @@ struct CRCBitRemap {
} }
}; };
using FieldReader = baseband::FieldReader<std::bitset<1024>, BitRemap>; using FieldReader = ::FieldReader<std::bitset<1024>, BitRemap>;
using CRCFieldReader = baseband::FieldReader<std::bitset<1024>, CRCBitRemap>; using CRCFieldReader = ::FieldReader<std::bitset<1024>, CRCBitRemap>;
struct PacketLengthRange { struct PacketLengthRange {
constexpr PacketLengthRange( constexpr PacketLengthRange(

50
firmware/common/field_reader.hpp Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
*
* This file is part of PortaPack.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef __FIELD_READER_H__
#define __FIELD_READER_H__
#include <cstdint>
#include <cstddef>
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 { };
};
#endif/*__FIELD_READER_H__*/