TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-13 11:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

First test, ghost-singal c/m to only Mic_App

Browse Source
This commit is contained in:
Brumi-2021 2022-08-26 18:34:30 +02:00
parent 840da4c685
commit 08a108d3e4
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/application/apps/ui_mictx.cpp
View File

@ -30,6 +30,7 @@ using wolfson::wm8731::WM8731;
#include "tonesets.hpp" #include "tonesets.hpp"
#include "portapack_hal.hpp" #include "portapack_hal.hpp"
#include "cpld_update.hpp"
#include "string_format.hpp" #include "string_format.hpp"
#include "irq_controls.hpp" #include "irq_controls.hpp"
@ -178,6 +179,7 @@ void MicTXView::rxaudio(bool is_on) {
receiver_model.set_vga(rx_vga); receiver_model.set_vga(rx_vga);
receiver_model.set_rf_amp(rx_amp); receiver_model.set_rf_amp(rx_amp);
receiver_model.enable(); receiver_model.enable();
hackrf::cpld::load_sram_no_verify(); // to have a good RX without any ghost inside Mic App
audio::output::start(); audio::output::start();
} else { //These incredibly convoluted steps are required for the vumeter to reappear when stopping RX. } 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... receiver_model.set_modulation(ReceiverModel::Mode::NarrowbandFMAudio); //This fixes something with AM RX...
@ -549,6 +551,7 @@ MicTXView::~MicTXView() {
if (rx_enabled) //Also turn off audio rx if enabled if (rx_enabled) //Also turn off audio rx if enabled
rxaudio(false); rxaudio(false);
baseband::shutdown(); baseband::shutdown();
hackrf::cpld::load_sram_no_verify(); // too leave all RX ok, wihouth ghost signal problem at the exit .
} }
} }

14
firmware/common/cpld_update.cpp
View File

@ -114,6 +114,20 @@ bool load_sram() {
return ok; 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() { bool verify_eeprom() {
auto jtag_target_hackrf_cpld = jtag_target_hackrf(); auto jtag_target_hackrf_cpld = jtag_target_hackrf();
hackrf::one::cpld::CPLD hackrf_cpld { jtag_target_hackrf_cpld }; hackrf::one::cpld::CPLD hackrf_cpld { jtag_target_hackrf_cpld };

1
firmware/common/cpld_update.hpp
View File

@ -38,6 +38,7 @@ namespace hackrf {
namespace cpld { namespace cpld {
bool load_sram(); 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(); bool verify_eeprom();
void init_from_eeprom(); void init_from_eeprom();