From a37ba1ee2bdc59d56ac3be86f4fdc50641f21f0f Mon Sep 17 00:00:00 2001
From: jLynx <admin@jlynx.net>
Date: Thu, 7 Apr 2022 08:41:46 +1200
Subject: [PATCH] 2021/12 QFP100 fix

---
 firmware/application/portapack.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/firmware/application/portapack.cpp b/firmware/application/portapack.cpp
index 15b9d5c2b..58008b72e 100644
--- a/firmware/application/portapack.cpp
+++ b/firmware/application/portapack.cpp
@@ -228,6 +228,11 @@ static const portapack::cpld::Config& portapack_cpld_config() {
 }
 
 Backlight* backlight() {
+	// if (portapack::persistent_memory::config_cpld() == 1) {
+	// 	return static_cast<portapack::Backlight*>(&backlight_cat4004);
+	// } else if (portapack::persistent_memory::config_cpld() == 2) {
+	// 	return static_cast<portapack::Backlight*>(&backlight_on_off);
+	// }
 	return (portapack_model() == PortaPackModel::R2_20170522)
 		? static_cast<portapack::Backlight*>(&backlight_cat4004) // R2_20170522
 		: static_cast<portapack::Backlight*>(&backlight_on_off); // R1_20150901
@@ -415,8 +420,12 @@ bool init() {
 	audio::init(portapack_audio_codec());
 
 	if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
-		shutdown_base();
-		return false;
+		const auto switches_state = get_switches_state();
+		// If using a "2021/12 QFP100", press and hold the left button while booting. Should only need to do once.
+		if (!switches_state[(size_t)ui::KeyEvent::Left]){
+			shutdown_base();
+			return false;
+		}
 	}
 
 	if( !hackrf::cpld::load_sram() ) {