From 644d3837ff4cd9edd8e17722cbadb54b7847aa8f Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Tue, 8 Dec 2015 15:54:35 -0800
Subject: [PATCH] Consolidate AIS Packet types.

---
 firmware/application/ais_packet.cpp | 4 +---
 firmware/application/ais_packet.hpp | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/firmware/application/ais_packet.cpp b/firmware/application/ais_packet.cpp
index c212936d8..7999a111b 100644
--- a/firmware/application/ais_packet.cpp
+++ b/firmware/application/ais_packet.cpp
@@ -27,8 +27,6 @@
 
 namespace ais {
 
-using CRCFieldReader = ::FieldReader<baseband::Packet, BitRemapNone>;
-
 struct PacketLengthRange {
 	constexpr PacketLengthRange(
 	) : min_bytes { 0 },
@@ -190,7 +188,7 @@ Longitude Packet::longitude(const size_t start_bit) const {
 }
 
 bool Packet::crc_ok() const {
-	CRCFieldReader field_crc { packet_ };
+	CRCReader field_crc { packet_ };
 	CRC<uint16_t> ais_fcs { 0x1021, 0xffff, 0xffff };
 	
 	for(size_t i=0; i<data_length(); i+=8) {
diff --git a/firmware/application/ais_packet.hpp b/firmware/application/ais_packet.hpp
index ac23b3b98..25ecc9360 100644
--- a/firmware/application/ais_packet.hpp
+++ b/firmware/application/ais_packet.hpp
@@ -82,6 +82,7 @@ public:
 
 private:
 	using Reader = FieldReader<baseband::Packet, BitRemapByteReverse>;
+	using CRCReader = FieldReader<baseband::Packet, BitRemapNone>;
 	
 	const baseband::Packet packet_;
 	const rtc::RTC received_at_;