From ebf103363c2311bd7ebc64e7937a7e6542791671 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Wed, 11 Nov 2015 09:16:20 -0800
Subject: [PATCH] Constructor style clean-up.

---
 firmware/baseband/channel_stats_collector.hpp |  9 +----
 firmware/common/message.hpp                   | 37 +++++--------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/firmware/baseband/channel_stats_collector.hpp b/firmware/baseband/channel_stats_collector.hpp
index 64b1596a5..8c91ac5b4 100644
--- a/firmware/baseband/channel_stats_collector.hpp
+++ b/firmware/baseband/channel_stats_collector.hpp
@@ -49,13 +49,8 @@ public:
 
 		if( count >= samples_per_update ) {
 			const float max_squared_f = max_squared;
-			const float max_db_f = complex16_mag_squared_to_dbv_norm(max_squared_f);
-			const int32_t max_db = max_db_f;
-			const ChannelStatistics statistics {
-				.max_db = max_db,
-				.count = count,
-			};
-			callback(statistics);
+			const int32_t max_db = complex16_mag_squared_to_dbv_norm(max_squared_f);
+			callback({ max_db, count });
 
 			max_squared = 0;
 			count = 0;
diff --git a/firmware/common/message.hpp b/firmware/common/message.hpp
index 6b7ec9833..4a53bde9b 100644
--- a/firmware/common/message.hpp
+++ b/firmware/common/message.hpp
@@ -69,8 +69,7 @@ struct RSSIStatistics {
 class RSSIStatisticsMessage : public Message {
 public:
 	constexpr RSSIStatisticsMessage(
-	) : Message { ID::RSSIStatistics },
-		statistics { }
+	) : Message { ID::RSSIStatistics }
 	{
 	}
 
@@ -88,8 +87,7 @@ struct BasebandStatistics {
 class BasebandStatisticsMessage : public Message {
 public:
 	constexpr BasebandStatisticsMessage(
-	) : Message { ID::BasebandStatistics },
-		statistics { }
+	) : Message { ID::BasebandStatistics }
 	{
 	}
 
@@ -101,14 +99,8 @@ struct ChannelStatistics {
 	size_t count;
 
 	constexpr ChannelStatistics(
-	) : max_db { -120 },
-		count { 0 }
-	{
-	}
-
-	constexpr ChannelStatistics(
-		int32_t max_db,
-		size_t count
+		int32_t max_db = -120,
+		size_t count = 0
 	) : max_db { max_db },
 		count { count }
 	{
@@ -118,8 +110,7 @@ struct ChannelStatistics {
 class ChannelStatisticsMessage : public Message {
 public:
 	constexpr ChannelStatisticsMessage(
-	) : Message { ID::ChannelStatistics },
-		statistics { }
+	) : Message { ID::ChannelStatistics }
 	{
 	}
 
@@ -200,17 +191,12 @@ public:
 
 struct AISPacket {
 	std::bitset<1024> payload;
-	size_t bits_received;
-
-	AISPacket(
-	) : bits_received { 0 }
-	{
-	}
+	size_t bits_received { 0 };
 };
 
 class AISPacketMessage : public Message {
 public:
-	AISPacketMessage(
+	constexpr AISPacketMessage(
 	) : Message { ID::AISPacket }
 	{
 	}
@@ -220,17 +206,12 @@ public:
 
 struct TPMSPacket {
 	std::bitset<1024> payload;
-	size_t bits_received;
-
-	TPMSPacket(
-	) : bits_received { 0 }
-	{
-	}
+	size_t bits_received { 0 };
 };
 
 class TPMSPacketMessage : public Message {
 public:
-	TPMSPacketMessage(
+	constexpr TPMSPacketMessage(
 	) : Message { ID::TPMSPacket }
 	{
 	}