From b35a8c4501129e488aa4456d7a1260196ee3dae0 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Wed, 6 Apr 2016 17:04:40 -0700
Subject: [PATCH] Add TPMS signal_type.

---
 firmware/application/tpms_app.cpp | 6 +++---
 firmware/application/tpms_app.hpp | 2 +-
 firmware/baseband/proc_tpms.cpp   | 2 +-
 firmware/common/message.hpp       | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/firmware/application/tpms_app.cpp b/firmware/application/tpms_app.cpp
index d83372f1d..c80bfb9d7 100644
--- a/firmware/application/tpms_app.cpp
+++ b/firmware/application/tpms_app.cpp
@@ -156,7 +156,7 @@ TPMSAppView::TPMSAppView(NavigationView&) {
 		[this](Message* const p) {
 			const auto message = static_cast<const TPMSPacketMessage*>(p);
 			const tpms::Packet packet { message->packet };
-			this->on_packet(packet);
+			this->on_packet(message->signal_type, packet);
 		}
 	);
 
@@ -194,12 +194,12 @@ void TPMSAppView::set_parent_rect(const Rect new_parent_rect) {
 	recent_entries_view.set_parent_rect({ 0, 0, new_parent_rect.width(), new_parent_rect.height() });
 }
 
-void TPMSAppView::on_packet(const tpms::Packet& packet) {
+void TPMSAppView::on_packet(const tpms::SignalType signal_type, const tpms::Packet& packet) {
 	if( logger ) {
 		logger->on_packet(packet, target_frequency());
 	}
 
-	const auto reading_opt = packet.reading();
+	const auto reading_opt = packet.reading(signal_type);
 	if( reading_opt.is_valid() ) {
 		const auto reading = reading_opt.value();
 		recent.on_packet({ reading.type(), reading.id() }, reading);
diff --git a/firmware/application/tpms_app.hpp b/firmware/application/tpms_app.hpp
index ba4c154e4..24516908c 100644
--- a/firmware/application/tpms_app.hpp
+++ b/firmware/application/tpms_app.hpp
@@ -107,7 +107,7 @@ private:
 
 	TPMSRecentEntriesView recent_entries_view { recent };
 
-	void on_packet(const tpms::Packet& packet);
+	void on_packet(const tpms::SignalType signal_type, const tpms::Packet& packet);
 	void on_show_list();
 
 	uint32_t target_frequency() const;
diff --git a/firmware/baseband/proc_tpms.cpp b/firmware/baseband/proc_tpms.cpp
index d9b2375aa..2ce115a35 100644
--- a/firmware/baseband/proc_tpms.cpp
+++ b/firmware/baseband/proc_tpms.cpp
@@ -78,6 +78,6 @@ void TPMSProcessor::consume_symbol(
 void TPMSProcessor::payload_handler(
 	const baseband::Packet& packet
 ) {
-	const TPMSPacketMessage message { packet };
+	const TPMSPacketMessage message { tpms::SignalType::FLM, packet };
 	shared_memory.application_queue.push(message);
 }
diff --git a/firmware/common/message.hpp b/firmware/common/message.hpp
index cbce464ea..effb11267 100644
--- a/firmware/common/message.hpp
+++ b/firmware/common/message.hpp
@@ -29,6 +29,7 @@
 
 #include "baseband_packet.hpp"
 #include "ert_packet.hpp"
+#include "tpms_packet.hpp"
 #include "dsp_fir_taps.hpp"
 #include "dsp_iir.hpp"
 #include "fifo.hpp"
@@ -275,12 +276,15 @@ public:
 class TPMSPacketMessage : public Message {
 public:
 	constexpr TPMSPacketMessage(
+		const tpms::SignalType signal_type,
 		const baseband::Packet& packet
 	) : Message { ID::TPMSPacket },
+		signal_type { signal_type },
 		packet { packet }
 	{
 	}
 
+	tpms::SignalType signal_type;
 	baseband::Packet packet;
 };