Added bitrate option for POCSAG baseband, PWMRSSI frequency option

Split SD card wiper app
Cleanup for -Weffc++

firmware/baseband/proc_closecall.hpp

@@ -42,9 +42,9 @@ public:
 private:
 	BasebandThread baseband_thread { 3072000, this, NORMALPRIO + 20, baseband::Direction::Receive };
 	
-	SpectrumCollector channel_spectrum;
+	SpectrumCollector channel_spectrum { };
 
-	std::array<complex16_t, 256> spectrum;
+	std::array<complex16_t, 256> spectrum { };
 
 	size_t phase = 0;
 };

firmware/baseband/proc_nfm_audio.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
  *
  * This file is part of PortaPack.
  *
@@ -49,7 +50,8 @@ void NarrowbandFMAudio::execute(const buffer_c8_t& buffer) {
 				pwmrssi_audio_buffer.p[c] = 32767;
 			else
 				pwmrssi_audio_buffer.p[c] = -32768;
-			if (synth_acc < 30)		// 24kHz / 30 = 800Hz (TODO: use pwmrssi_freq !)
+			
+			if (synth_acc < synth_div)		// 24kHz / 30 = 800Hz
 				synth_acc++;
 			else
 				synth_acc = 0;
@@ -111,8 +113,9 @@ void NarrowbandFMAudio::configure(const NBFMConfigureMessage& message) {
 
 void NarrowbandFMAudio::pwmrssi_config(const PWMRSSIConfigureMessage& message) {
 	pwmrssi_enabled = message.enabled;
-	pwmrssi_freq = message.freq;
 	pwmrssi_avg = message.avg / 3;
+	synth_div = message.synth_div;
+	synth_acc = 0;
 }
 
 void NarrowbandFMAudio::capture_config(const CaptureConfigMessage& message) {

firmware/baseband/proc_nfm_audio.hpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
  *
  * This file is part of PortaPack.
  *
@@ -57,7 +58,7 @@ private:
 		audio.size()
 	};
 	
-	std::array<int16_t, 32> pwm;
+	std::array<int16_t, 32> pwm { };
 	const buffer_s16_t pwmrssi_audio_buffer {
 		(int16_t*)pwm.data(),
 		sizeof(pwm) / sizeof(int16_t)
@@ -73,12 +74,12 @@ private:
 
 	AudioOutput audio_output { };
 
-	SpectrumCollector channel_spectrum;
+	SpectrumCollector channel_spectrum { };
 	
-	unsigned int c, synth_acc = 0;
+	unsigned int c { 0 }, synth_acc { 0 };
+	uint32_t synth_div { 0 };
 	bool pwmrssi_enabled = false;
-	uint32_t pwmrssi_freq;
-	uint32_t pwmrssi_avg;
+	uint32_t pwmrssi_avg { 0 };
 
 	bool configured { false };
 	void pwmrssi_config(const PWMRSSIConfigureMessage& message);

firmware/baseband/proc_pocsag.cpp

@@ -29,49 +29,50 @@
 #include <cstdint>
 #include <cstddef>
 
-#define FREQ_SAMP		24000
-#define BAUD			1200
-#define SPHASEINC		(0x10000u * BAUD / FREQ_SAMP)
+#define POCSAG_AUDIO_RATE		24000
 
 #define POCSAG_SYNC		0x7CD215D8
 #define POCSAG_IDLE		0x7A89C197
+#define POCSAG_PREAMBLE_LENGTH	576
+#define POCSAG_BATCH_LENGTH		(9 * 32)
 
 void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
-	/* 1.536MHz, 2048 samples */
+	// Samplerate is 1.536MHz, gets 2048 samples, called at 750Hz
 	
-	if( !configured ) return;
+	if (!configured) return;
 	
+	// Get 24kHz audio
 	const auto decim_0_out = decim_0.execute(buffer, dst_buffer);
 	const auto decim_1_out = decim_1.execute(decim_0_out, dst_buffer);
-
 	auto audio = demod.execute(decim_1_out, audio_buffer);
 	
-	for (c = 0; c < 32; c++) {
+	// End up with 32 samples
+	for (uint32_t c = 0; c < 32; c++) {
 		
-		// Bit = sign
-		const int32_t audio_sample = audio.p[c] * 32768.0f;	// sample_int
+		const int32_t audio_sample = audio.p[c] * 32768.0f;
 		//const int32_t audio_sample = __SSAT(sample_int, 16);
 		
-		dcd_shreg <<= 1;
-		dcd_shreg |= (audio_sample < 0);
+		slicer_sr <<= 1;
+		slicer_sr |= (audio_sample < 0);
 
 		// Detect transitions to adjust clock
-		if ((dcd_shreg ^ (dcd_shreg >> 1)) & 1) {
-			if (sphase < (0x8000u-(SPHASEINC/2)))
-				sphase += SPHASEINC/8;
+		if ((slicer_sr ^ (slicer_sr >> 1)) & 1) {
+			if (sphase < (0x8000u - sphase_delta_half))
+				sphase += sphase_delta_eighth;
 			else
-				sphase -= SPHASEINC/8;
+				sphase -= sphase_delta_eighth;
 		}
 		
-		sphase += SPHASEINC;
+		sphase += sphase_delta;
 		
+		// Symbol time elapsed
 		if (sphase >= 0x10000u) {
-			sphase &= 0xffffu;
+			sphase &= 0xFFFFu;
 			
 			rx_data <<= 1;
-			rx_data |= (dcd_shreg & 1);
+			rx_data |= (slicer_sr & 1);
 			
-			switch(rx_state) {
+			switch (rx_state) {
 				
 				case WAITING:
 					if (rx_data == 0xAAAAAAAA) {
@@ -79,12 +80,10 @@ void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
 						sync_timeout = 0;
 					}
 					break;
-						
+				
 				case PREAMBLE:
-					if (sync_timeout < 600) {
+					if (sync_timeout < POCSAG_PREAMBLE_LENGTH) {
 						sync_timeout++;
-						
-						//pocsag_brute_repair(&s->l2.pocsag, &rx_data);
 
 						if (rx_data == POCSAG_SYNC) {
 							packet.clear();
@@ -94,44 +93,39 @@ void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
 							last_rx_data = rx_data;
 							rx_state = SYNC;
 						} else if (rx_data == POCSAG_IDLE) {
+							push_packet(pocsag::PacketFlag::IDLE);
 							rx_state = WAITING;
 						}
 						
 					} else {
-						rx_state = WAITING;		// Abort
+						rx_state = WAITING;		// Timed out: abort
 					}
 					break;
 				
 				case SYNC:
-					if (msg_timeout < 600) {
+					if (msg_timeout < POCSAG_BATCH_LENGTH) {
 						msg_timeout++;
 						rx_bit++;
 						
 						if (rx_bit >= 32) {
 							rx_bit = 0;
 							
+							// Got a complete codeword
+							
 							//pocsag_brute_repair(&s->l2.pocsag, &rx_data);
 							
 							packet.set(frame_counter, rx_data);
 							
 							if ((rx_data == POCSAG_IDLE) && (!(last_rx_data & 0x80000000))) {
 								// SYNC then IDLE always means end of message ?
-								packet.set_bitrate(pocsag::BitRate::FSK1200);
-								packet.set_flag(pocsag::PacketFlag::NORMAL);
-								packet.set_timestamp(Timestamp::now());
-								const POCSAGPacketMessage message(packet);
-								shared_memory.application_queue.push(message);
+								push_packet(pocsag::PacketFlag::NORMAL);
 								rx_state = WAITING;
 							} else {
 								if (frame_counter < 15) {
 									frame_counter++;
 								} else {
 									// More than 17-1 codewords
-									packet.set_bitrate(pocsag::BitRate::FSK1200);
-									packet.set_flag(pocsag::PacketFlag::TOO_LONG);
-									packet.set_timestamp(Timestamp::now());
-									const POCSAGPacketMessage message(packet);
-									shared_memory.application_queue.push(message);
+									push_packet(pocsag::PacketFlag::TOO_LONG);
 									rx_state = WAITING;
 								}
 							}
@@ -140,11 +134,7 @@ void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
 						}
 					} else {
 						// Timed out (no end of message received)
-						packet.set_bitrate(pocsag::BitRate::FSK1200);
-						packet.set_flag(pocsag::PacketFlag::TIMED_OUT);
-						packet.set_timestamp(Timestamp::now());
-						const POCSAGPacketMessage message(packet);
-						shared_memory.application_queue.push(message);
+						push_packet(pocsag::PacketFlag::TIMED_OUT);
 						rx_state = WAITING;
 					}
 					break;
@@ -156,14 +146,20 @@ void POCSAGProcessor::execute(const buffer_c8_t& buffer) {
 	}
 }
 
+void POCSAGProcessor::push_packet(pocsag::PacketFlag flag) {
+	packet.set_bitrate(bitrate);
+	packet.set_flag(flag);
+	packet.set_timestamp(Timestamp::now());
+	const POCSAGPacketMessage message(packet);
+	shared_memory.application_queue.push(message);
+}
+
 void POCSAGProcessor::on_message(const Message* const message) {
 	if (message->id == Message::ID::POCSAGConfigure)
 		configure(*reinterpret_cast<const POCSAGConfigureMessage*>(message));
 }
 
 void POCSAGProcessor::configure(const POCSAGConfigureMessage& message) {
-	(void)message;
-	
 	constexpr size_t decim_0_input_fs = baseband_fs;
 	constexpr size_t decim_0_output_fs = decim_0_input_fs / decim_0.decimation_factor;
 
@@ -176,6 +172,11 @@ void POCSAGProcessor::configure(const POCSAGConfigureMessage& message) {
 	decim_1.configure(taps_11k0_decim_1.taps, 131072);
 	demod.configure(demod_input_fs, 4500);
 
+	bitrate = message.bitrate;
+	sphase_delta = 0x10000u * bitrate / POCSAG_AUDIO_RATE;
+	sphase_delta_half = sphase_delta / 2;			// Just for speed
+	sphase_delta_eighth = sphase_delta / 8;
+	
 	rx_state = WAITING;
 	configured = true;
 }

firmware/baseband/proc_pocsag.hpp

@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 1996 Thomas Sailer (sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu)
+ * Copyright (C) 2012-2014 Elias Oenal (multimon-ng@eliasoenal.com)
  * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
  * Copyright (C) 2016 Furrtek
  *
@@ -60,37 +62,40 @@ private:
 	BasebandThread baseband_thread { baseband_fs, this, NORMALPRIO + 20, baseband::Direction::Receive };
 	RSSIThread rssi_thread { NORMALPRIO + 10 };
 	
-	std::array<complex16_t, 512> dst;
+	std::array<complex16_t, 512> dst { };
 	const buffer_c16_t dst_buffer {
 		dst.data(),
 		dst.size()
 	};
-	std::array<float, 32> audio;
+	std::array<float, 32> audio { };
 	const buffer_f32_t audio_buffer {
 		audio.data(),
 		audio.size()
 	};
 
-	dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0;
-	dsp::decimate::FIRC16xR16x32Decim8 decim_1;
+	dsp::decimate::FIRC8xR16x24FS4Decim8 decim_0 { };
+	dsp::decimate::FIRC16xR16x32Decim8 decim_1 { };
 
-	dsp::demodulate::FM demod;
+	dsp::demodulate::FM demod { };
 
-	uint32_t sync_timeout;
-	uint32_t msg_timeout;
+	uint32_t sync_timeout { 0 };
+	uint32_t msg_timeout { 0 };
 
-	uint32_t dcd_shreg;
-	uint32_t sphase;
-	uint32_t rx_data;
-	uint32_t last_rx_data;
-	uint32_t rx_bit;
+	uint32_t slicer_sr { 0 };
+	uint32_t sphase { 0 };
+	uint32_t sphase_delta { 0 };
+	uint32_t sphase_delta_half { 0 };
+	uint32_t sphase_delta_eighth { 0 };
+	uint32_t rx_data { 0 };
+	uint32_t last_rx_data { 0 };
+	uint32_t rx_bit { 0 };
 	bool configured = false;
-	rx_states rx_state;
-	
-	size_t c, frame_counter;
-	
-	pocsag::POCSAGPacket packet;
+	rx_states rx_state { WAITING };
+	pocsag::BitRate bitrate { pocsag::BitRate::FSK1200 };
+	uint32_t frame_counter { 0 };
+	pocsag::POCSAGPacket packet { };
 	
+	void push_packet(pocsag::PacketFlag flag);
 	void configure(const POCSAGConfigureMessage& message);
 	
 };

firmware/baseband/proc_wfm_audio.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
  *
  * This file is part of PortaPack.
  *
@@ -77,7 +78,8 @@ void WidebandFMAudio::execute(const buffer_c8_t& buffer) {
 				pwmrssi_audio_buffer.p[c] = 32767;
 			else
 				pwmrssi_audio_buffer.p[c] = -32768;
-			if (synth_acc < 96)		// 48kHz / 96 = 500Hz (TODO: use pwmrssi_freq !)
+			
+			if (synth_acc < synth_div)		// 48kHz / 96 = 500Hz
 				synth_acc++;
 			else
 				synth_acc = 0;
@@ -135,7 +137,6 @@ void WidebandFMAudio::configure(const WFMConfigureMessage& message) {
 
 	channel_spectrum.set_decimation_factor(1);
 
-	pwmrssi_enabled = false;
 	synth_acc = 0;
 
 	configured = true;
@@ -143,8 +144,9 @@ void WidebandFMAudio::configure(const WFMConfigureMessage& message) {
 
 void WidebandFMAudio::pwmrssi_config(const PWMRSSIConfigureMessage& message) {
 	pwmrssi_enabled = message.enabled;
-	pwmrssi_freq = message.freq;
 	pwmrssi_avg = message.avg;
+	synth_div = message.synth_div;
+	synth_acc = 0;
 }
 
 void WidebandFMAudio::capture_config(const CaptureConfigMessage& message) {

firmware/baseband/proc_wfm_audio.hpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
  *
  * This file is part of PortaPack.
  *
@@ -55,7 +56,7 @@ private:
 		sizeof(dst) / sizeof(int16_t)
 	};
 	
-	std::array<int16_t, 32> pwm;
+	std::array<int16_t, 32> pwm { };
 	const buffer_s16_t pwmrssi_audio_buffer {
 		(int16_t*)pwm.data(),
 		sizeof(pwm) / sizeof(int16_t)
@@ -77,10 +78,10 @@ private:
 	size_t spectrum_interval_samples = 0;
 	size_t spectrum_samples = 0;
 	
-	unsigned int c, synth_acc = 0;
+	unsigned int c { 0 }, synth_acc { 0 };
+	uint32_t synth_div { 0 };
 	bool pwmrssi_enabled = false;
-	uint32_t pwmrssi_freq;
-	uint32_t pwmrssi_avg;
+	uint32_t pwmrssi_avg { 0 };
 
 	bool configured { false };
 	void pwmrssi_config(const PWMRSSIConfigureMessage& message);