Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix for new H2+ devices (#666)

Browse Source 
* WIP Fix for new h2+ devices

* reset

* Updated sub module
This commit is contained in:
jLynx 2022-06-05 14:15:44 +12:00 committed by GitHub
parent e5a30b4309
commit 39134b62c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/application/portapack.cpp
View File

@ -215,7 +215,7 @@ static int load_config(){
static Optional<int> config_value; static Optional<int> config_value;
if(!config_value.is_valid()){ if(!config_value.is_valid()){
int8_t value = portapack::persistent_memory::config_cpld(); int8_t value = portapack::persistent_memory::config_cpld();
if((value <= 0 || value >= 4) && sd_card::status() == sd_card::Status::Mounted){ if((value <= 0 || value >= 5) && sd_card::status() == sd_card::Status::Mounted){
int data = read_file("/hardware/settings.txt"); int data = read_file("/hardware/settings.txt");
if(data != -1) { if(data != -1) {
config_value = data; config_value = data;
@ -235,14 +235,19 @@ static PortaPackModel portapack_model() {
const auto switches_state = get_switches_state(); const auto switches_state = get_switches_state();
if (switches_state[(size_t)ui::KeyEvent::Up]){ if (switches_state[(size_t)ui::KeyEvent::Up]){
save_config(1); save_config(1);
model = PortaPackModel::R2_20170522; // model = PortaPackModel::R2_20170522; // Commented these out as they should be set down below anyway
} }
else if (switches_state[(size_t)ui::KeyEvent::Down]){ else if (switches_state[(size_t)ui::KeyEvent::Down]){
save_config(2); save_config(2);
model = PortaPackModel::R1_20150901; // model = PortaPackModel::R1_20150901;
} }
else if (switches_state[(size_t)ui::KeyEvent::Left]){ else if (switches_state[(size_t)ui::KeyEvent::Left]){
save_config(3); save_config(3);
// model = PortaPackModel::R1_20150901;
}
else if (switches_state[(size_t)ui::KeyEvent::Right]){
save_config(4);
// model = PortaPackModel::R2_20170522;
} }
else if (switches_state[(size_t)ui::KeyEvent::Select]){ else if (switches_state[(size_t)ui::KeyEvent::Select]){
save_config(0); save_config(0);
@ -253,6 +258,10 @@ static PortaPackModel portapack_model() {
model = PortaPackModel::R2_20170522; model = PortaPackModel::R2_20170522;
} else if (load_config() == 2) { } else if (load_config() == 2) {
model = PortaPackModel::R1_20150901; model = PortaPackModel::R1_20150901;
} else if (load_config() == 3) {
model = PortaPackModel::R1_20150901;
} else if (load_config() == 4) {
model = PortaPackModel::R2_20170522;
} else { } else {
if( audio_codec_wm8731.detected() ) { if( audio_codec_wm8731.detected() ) {
model = PortaPackModel::R1_20150901; // H1R1 model = PortaPackModel::R1_20150901; // H1R1
@ -478,7 +487,7 @@ bool init() {
if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) { if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
chThdSleepMilliseconds(10); chThdSleepMilliseconds(10);
// 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 (load_config() != 3){ if (load_config() != 3 && load_config() != 4){
shutdown_base(); shutdown_base();
return false; return false;
} }

2
hackrf

@ -1 +1 @@
Subproject commit e6eb4ba29bbe5dc2fcd092e394188bc10a8bad54 Subproject commit dfadf6a31c5f5f9817f84f1d28c63243698f7299