Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-02-03 10:00:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #547 from jLynx/FM_fix

Browse Source 
Fixed broken radio offset
This commit is contained in:
jLynx 2022-04-08 08:21:11 +12:00 committed by GitHub
commit a824e30420
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
firmware/application/portapack.cpp
View File

@ -361,7 +361,6 @@ bool init() {
i2c0.stop(); i2c0.stop();
set_clock_config(clock_config_irc); set_clock_config(clock_config_irc);
cgu::pll1::disable(); cgu::pll1::disable();
/* Incantation from LPC43xx UM10503 section 12.2.1.1, to bring the M4 /* Incantation from LPC43xx UM10503 section 12.2.1.1, to bring the M4
@ -411,12 +410,6 @@ bool init() {
clock_manager.enable_codec_clocks(); clock_manager.enable_codec_clocks();
radio::init(); radio::init();
LPC_CREG->DMAMUX = portapack::gpdma_mux;
gpdma::controller.enable();
audio::init(portapack_audio_codec());
if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) { if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
// If using a "2021/12 QFP100", press and hold the left button while booting. Should only need to do once. // If using a "2021/12 QFP100", press and hold the left button while booting. Should only need to do once.
if (portapack::persistent_memory::config_cpld() != 3){ if (portapack::persistent_memory::config_cpld() != 3){
@ -429,6 +422,11 @@ bool init() {
chSysHalt(); chSysHalt();
} }
LPC_CREG->DMAMUX = portapack::gpdma_mux;
gpdma::controller.enable();
audio::init(portapack_audio_codec());
return true; return true;
} }

6
firmware/common/portapack_persistent_memory.cpp
View File

@ -83,9 +83,6 @@ struct data_t {
int32_t modem_baudrate; int32_t modem_baudrate;
int32_t modem_repeat; int32_t modem_repeat;
// Hardware
uint32_t hardware_config;
// Play dead unlock // Play dead unlock
uint32_t playdead_magic; uint32_t playdead_magic;
uint32_t playing_dead; uint32_t playing_dead;
@ -98,6 +95,9 @@ struct data_t {
uint32_t pocsag_ignore_address; uint32_t pocsag_ignore_address;
int32_t tone_mix; int32_t tone_mix;
// Hardware
uint32_t hardware_config;
}; };
static_assert(sizeof(data_t) <= backup_ram.size(), "Persistent memory structure too large for VBAT-maintained region"); static_assert(sizeof(data_t) <= backup_ram.size(), "Persistent memory structure too large for VBAT-maintained region");