Reverted to original CPLD data

firmware/application/main.cpp

@@ -23,8 +23,11 @@
 // Color bitmaps generated with:
 // Gimp image > indexed colors (16), then "xxd -i *.bmp"
 
+//BUG: Distorted audio in WFM receiver
 //BUG: (fixed ?) Bad console scroll init
 //BUG: POCSAG misses alphanum messages, cuts them off sometimes
+//BUG: Check AFSK transmit end, skips last bits ?
+//BUG: RDS doesn't stop baseband when stopping tx ?
 
 //TEST: Imperial in whipcalc
 //TEST: Numbers
@@ -37,10 +40,6 @@
 //TODO: IQ replay
 //TODO: Wav visualizer
 
-//BUG: POCSAG RX sometimes misses the first codeword after SYNC
-//BUG: Check AFSK transmit end, skips last bits ?
-//BUG: RDS doesn't stop baseband when stopping tx ?
-
 //TODO: File browser ?
 //TODO: Mousejack ?
 //TODO: Move frequencykeypad from ui_receiver to ui_widget (used everywhere)

firmware/application/receiver_model.hpp

@@ -30,27 +30,6 @@
 #include "max2837.hpp"
 #include "volume.hpp"
 
-struct BasebandConfiguration {
-	int32_t mode;
-	uint32_t sampling_rate;
-	size_t decimation_factor;
-
-	constexpr BasebandConfiguration(
-		int32_t mode,
-		uint32_t sampling_rate,
-		size_t decimation_factor = 1
-	) : mode { mode },
-		sampling_rate { sampling_rate },
-		decimation_factor { decimation_factor }
-	{
-	}
-
-	constexpr BasebandConfiguration(
-	) : BasebandConfiguration { -1, 0, 1 }
-	{
-	}
-};
-
 class ReceiverModel {
 public:
 	enum class Mode {

firmware/application/transmitter_model.cpp

@@ -112,8 +112,10 @@ void TransmitterModel::enable() {
 	signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
 		this->on_tick_second();
 	};
-	if (portapack::persistent_memory::stealth_mode())
-		EventDispatcher::set_display_sleep(true);
+	if (portapack::persistent_memory::stealth_mode()) {
+		DisplaySleepMessage message;
+		EventDispatcher::send_message(message);
+	}
 }
 
 void TransmitterModel::disable() {

firmware/application/ui_bht_tx.cpp

@@ -64,7 +64,7 @@ void BHTView::start_tx() {
 	generate_message();
 	
 	transmitter_model.set_tuning_frequency(bht_freqs[options_freq.selected_index()]);
-	transmitter_model.set_sampling_rate(1536000U);
+	transmitter_model.set_sampling_rate(1536000);
 	transmitter_model.set_rf_amp(true);
 	transmitter_model.set_lna(40);
 	transmitter_model.set_vga(40);
@@ -78,7 +78,7 @@ void BHTView::start_tx() {
 	}
 	
 	audio::set_rate(audio::Rate::Hz_24000);
-	baseband::set_tones_data(field_bw.value() * 20, CCIR_SILENCE, 20, false, checkbox_speaker.value());
+	baseband::set_tones_data(field_bw.value(), CCIR_SILENCE, 20, false, checkbox_speaker.value());
 }
 
 void BHTView::on_tx_progress(const int progress, const bool done) {

firmware/application/ui_nuoptix.cpp

@@ -137,7 +137,7 @@ void NuoptixView::transmit(bool setup) {
 	shared_memory.bb_data.tones_data.silence = NUOPTIX_TONE_LENGTH;		// 49ms tone, 49ms space
 	
 	audio::set_rate(audio::Rate::Hz_24000);
-	baseband::set_tones_data(number_bw.value() * 500, 0, 6 * 2, true, true);	
+	baseband::set_tones_data(number_bw.value(), 0, 6 * 2, true, true);	
 	
 	timecode++;
 }

firmware/application/ui_nuoptix.hpp

@@ -97,14 +97,14 @@ private:
 	
 	NumberField number_bw {
 		{ 13 * 8, 4 },
-		3,
-		{1, 150},
+		2,
+		{1, 99},
 		1,
 		' '
 	};
 	
 	Text text_kHz {
-		{ 16 * 8, 4, 3 * 8, 16 },
+		{ 15 * 8, 4, 3 * 8, 16 },
 		"kHz"
 	};
 	

firmware/application/ui_receiver.cpp

@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
+ * Copyright (C) 2016 Furrtek
  *
  * This file is part of PortaPack.
  *