Merge pull request #707 from Brumi-2021/try_to_solve_RX_ghost_signal_issue_#637

Solve previous regression fw 1.3.1 -->fw 1.4.0 onwards , about RX ghost signal issue #637

firmware/application/apps/gps_sim_app.cpp

@@ -29,6 +29,7 @@
 
 #include "baseband_api.hpp"
 #include "portapack.hpp"
+#include "cpld_update.hpp"
 #include "portapack_persistent_memory.hpp"
 
 using namespace portapack;
@@ -242,7 +243,8 @@ GpsSimAppView::GpsSimAppView(
 
 GpsSimAppView::~GpsSimAppView() {
 	radio::disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void GpsSimAppView::on_hide() {

firmware/application/apps/lge_app.cpp

@@ -27,6 +27,7 @@
 #include "lge_app.hpp"
 
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "ui_textentry.hpp"
 
 #include "string_format.hpp"
@@ -48,7 +49,8 @@ LGEView::~LGEView() {
 	settings.save("tx_lge", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown();// better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void LGEView::generate_lge_frame(const uint8_t command, const uint16_t address_a, const uint16_t address_b, std::vector<uint8_t>& data) {

firmware/application/apps/soundboard_app.cpp

@@ -25,6 +25,7 @@
 #include "soundboard_app.hpp"
 #include "string_format.hpp"
 #include "tonesets.hpp"
+#include "cpld_update.hpp"
 
 using namespace tonekey;
 using namespace portapack;
@@ -295,7 +296,8 @@ SoundBoardView::~SoundBoardView() {
 
 	stop();
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 }

firmware/application/apps/ui_adsb_tx.cpp

@@ -26,6 +26,7 @@
 #include "manchester.hpp"
 #include "string_format.hpp"
 #include "portapack.hpp"
+#include "cpld_update.hpp"
 #include "baseband_api.hpp"
 
 #include <cstring>
@@ -290,7 +291,8 @@ ADSBTxView::~ADSBTxView() {
 	settings.save("tx_adsb", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, withouth ghost signal problem at the exit .
+	baseband::shutdown();				  // better this function at the end, not load_sram() that sometimes produces hang up.
 	}
 
 void ADSBTxView::generate_frames() {

firmware/application/apps/ui_aprs_tx.cpp

@@ -26,6 +26,7 @@
 #include "aprs.hpp"
 #include "string_format.hpp"
 #include "portapack.hpp"
+#include "cpld_update.hpp"
 #include "baseband_api.hpp"
 #include "portapack_shared_memory.hpp"
 #include "portapack_persistent_memory.hpp"
@@ -48,7 +49,8 @@ APRSTXView::~APRSTXView() {
 	settings.save("tx_aprs", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void APRSTXView::start_tx() {

firmware/application/apps/ui_bht_tx.cpp

@@ -24,6 +24,7 @@
 #include "string_format.hpp"
 
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "portapack_persistent_memory.hpp"
 
 using namespace portapack;
@@ -145,6 +146,8 @@ BHTView::~BHTView() {
 	settings.save("tx_bht", &app_settings);
 
 	transmitter_model.disable();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 BHTView::BHTView(NavigationView& nav) {

firmware/application/apps/ui_coasterp.cpp

@@ -23,6 +23,7 @@
 #include "ui_coasterp.hpp"
 
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "portapack_persistent_memory.hpp"
 
 #include <cstring>
@@ -42,7 +43,8 @@ CoasterPagerView::~CoasterPagerView() {
 	settings.save("tx_coaster", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void CoasterPagerView::generate_frame() {

firmware/application/apps/ui_encoders.cpp

@@ -24,6 +24,7 @@
 
 #include "baseband_api.hpp"
 #include "string_format.hpp"
+#include "cpld_update.hpp"
 
 using namespace portapack;
 
@@ -208,7 +209,8 @@ EncodersView::~EncodersView() {
 	settings.save("tx_ook", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify(); // ghost signal c/m to the problem at the exit .
+	baseband::shutdown(); // better this function after load_sram()
 }
 
 void EncodersView::update_progress() {

firmware/application/apps/ui_jammer.cpp

@@ -25,6 +25,7 @@
 #include "ui_freqman.hpp"
 
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"
 
 using namespace portapack;
@@ -183,7 +184,8 @@ void JammerView::focus() {
 
 JammerView::~JammerView() {
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void JammerView::on_retune(const rf::Frequency freq, const uint32_t range) {

firmware/application/apps/ui_keyfob.cpp

@@ -23,6 +23,7 @@
 #include "ui_keyfob.hpp"
 
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"
 
 using namespace portapack;
@@ -140,7 +141,8 @@ KeyfobView::~KeyfobView() {
 	settings.save("tx_keyfob", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void KeyfobView::update_progress(const uint32_t progress) {

firmware/application/apps/ui_lcr.cpp

@@ -27,6 +27,7 @@
 #include "modems.hpp"
 #include "baseband_api.hpp"
 #include "string_format.hpp"
+#include "cpld_update.hpp"
 
 #include "serializer.hpp"
 
@@ -44,7 +45,8 @@ LCRView::~LCRView() {
 	settings.save("tx_lcr", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 /*

firmware/application/apps/ui_mictx.cpp

@@ -30,6 +30,7 @@ using wolfson::wm8731::WM8731;
 
 #include "tonesets.hpp"
 #include "portapack_hal.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"
 #include "irq_controls.hpp"
 
@@ -178,6 +179,7 @@ void MicTXView::rxaudio(bool is_on) {
 		receiver_model.set_vga(rx_vga);
 		receiver_model.set_rf_amp(rx_amp);
 		receiver_model.enable();
+		hackrf::cpld::load_sram_no_verify();  // to have a good RX without any ghost inside Mic App
 		audio::output::start();
 	} else {	//These incredibly convoluted steps are required for the vumeter to reappear when stopping RX.
 		receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); //This fixes something with AM RX...
@@ -548,7 +550,8 @@ MicTXView::~MicTXView() {
 	transmitter_model.disable();
 	if (rx_enabled) //Also turn off audio rx if enabled
 		rxaudio(false);
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  //  to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 }

firmware/application/apps/ui_morse.cpp

@@ -26,6 +26,7 @@
 #include "baseband_api.hpp"
 #include "hackrf_gpio.hpp"
 #include "portapack_shared_memory.hpp"
+#include "cpld_update.hpp"
 #include "ui_textentry.hpp"
 #include "string_format.hpp"
 
@@ -102,7 +103,8 @@ MorseView::~MorseView() {
 	settings.save("tx_morse", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit .
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void MorseView::paint(Painter&) {

firmware/application/apps/ui_pocsag_tx.cpp

@@ -23,6 +23,7 @@
 #include "ui_pocsag_tx.hpp"
 
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "string_format.hpp"
 #include "ui_textentry.hpp"
 
@@ -43,7 +44,8 @@ POCSAGTXView::~POCSAGTXView() {
 	settings.save("tx_pocsag", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify(); // to leave all RX ok, without ghost signal problem at the exit 
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void POCSAGTXView::on_tx_progress(const uint32_t progress, const bool done) {

firmware/application/apps/ui_rds.cpp

@@ -24,6 +24,7 @@
 
 #include "portapack.hpp"
 #include "baseband_api.hpp"
+#include "cpld_update.hpp"
 #include "portapack_shared_memory.hpp"
 
 #include <cstring>
@@ -180,7 +181,8 @@ RDSView::~RDSView() {
 	settings.save("tx_rds", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void RDSView::start_tx() {

firmware/application/apps/ui_sstvtx.cpp

@@ -25,6 +25,7 @@
 
 #include "portapack.hpp"
 #include "hackrf_hal.hpp"
+#include "cpld_update.hpp"
 
 #include <cstring>
 #include <stdio.h>
@@ -93,7 +94,8 @@ SSTVTXView::~SSTVTXView() {
 	settings.save("tx_sstv", &app_settings);
 
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void SSTVTXView::on_tuning_frequency_changed(rf::Frequency f) {

firmware/application/apps/ui_touchtunes.cpp

@@ -26,6 +26,7 @@
 
 #include "baseband_api.hpp"
 #include "string_format.hpp"
+#include "cpld_update.hpp"
 
 
 using namespace portapack;
@@ -39,7 +40,8 @@ void TouchTunesView::focus() {
 
 TouchTunesView::~TouchTunesView() {
 	transmitter_model.disable();
-	baseband::shutdown();
+	hackrf::cpld::load_sram_no_verify();  // to leave all RX ok, without ghost signal problem at the exit.	
+	baseband::shutdown(); // better this function at the end, not load_sram() that sometimes produces hang up.
 }
 
 void TouchTunesView::stop_tx() {

firmware/common/cpld_update.cpp

@@ -114,6 +114,20 @@ bool load_sram() {
 	return ok;
 }
 
+void load_sram_no_verify() {
+	// CoolRunner II family has Hybrid memory CPLD arquitecture (SRAM+NVM) 
+	// It seems that after using TX App somehow , I do not why , the CPLD_SRAM part needs to be re_loaded to solve #637 ghost beat 
+    // load_sram() it is already called at each boot in portapack.cpp ,including verify CPLD part.
+	// Here we skipped CPLD verify part,just to be quicker (in case any CPLD problem it will be detected in the boot process).
+
+	auto jtag_target_hackrf_cpld = jtag_target_hackrf();
+	hackrf::one::cpld::CPLD hackrf_cpld { jtag_target_hackrf_cpld };
+
+ 	hackrf_cpld.write_sram(hackrf::one::cpld::verify_blocks);
+
+	return;
+}
+
 bool verify_eeprom() {
 	auto jtag_target_hackrf_cpld = jtag_target_hackrf();
 	hackrf::one::cpld::CPLD hackrf_cpld { jtag_target_hackrf_cpld };

firmware/common/cpld_update.hpp

@@ -38,6 +38,7 @@ namespace hackrf {
 namespace cpld {
 
 bool load_sram();
+void load_sram_no_verify(); // added to solve issue #637 , "ghost" signal at RX , after using any TX App
 bool verify_eeprom();
 void init_from_eeprom();