mirror of
https://github.com/eried/portapack-mayhem.git
synced 2025-06-29 17:17:28 -04:00
Fixed broken radio offset
This commit is contained in:
parent
d2e185a1fb
commit
51bc0f0100
2 changed files with 14 additions and 15 deletions
|
@ -181,11 +181,12 @@ static PortaPackModel portapack_model() {
|
|||
static Optional<PortaPackModel> model;
|
||||
|
||||
if( !model.is_valid() ) {
|
||||
if( audio_codec_wm8731.detected() ) {
|
||||
model = PortaPackModel::R1_20150901; // H1R1
|
||||
} else {
|
||||
model = PortaPackModel::R2_20170522; // H1R2, H2+
|
||||
}
|
||||
// if( audio_codec_wm8731.detected() ) {
|
||||
// model = PortaPackModel::R1_20150901; // H1R1
|
||||
// } else {
|
||||
// model = PortaPackModel::R2_20170522; // H1R2, H2+
|
||||
// }
|
||||
model = PortaPackModel::R2_20170522;
|
||||
}
|
||||
|
||||
return model.value();
|
||||
|
@ -361,7 +362,6 @@ bool init() {
|
|||
i2c0.stop();
|
||||
|
||||
set_clock_config(clock_config_irc);
|
||||
|
||||
cgu::pll1::disable();
|
||||
|
||||
/* Incantation from LPC43xx UM10503 section 12.2.1.1, to bring the M4
|
||||
|
@ -410,12 +410,6 @@ bool init() {
|
|||
clock_manager.enable_second_if_clock();
|
||||
clock_manager.enable_codec_clocks();
|
||||
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 using a "2021/12 QFP100", press and hold the left button while booting. Should only need to do once.
|
||||
|
@ -429,6 +423,11 @@ bool init() {
|
|||
chSysHalt();
|
||||
}
|
||||
|
||||
LPC_CREG->DMAMUX = portapack::gpdma_mux;
|
||||
gpdma::controller.enable();
|
||||
|
||||
audio::init(portapack_audio_codec());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue