2021/12 QFP100 Fix

2021/12 QFP100 fix

.github/workflows/create_nightly_release.yml

@@ -49,7 +49,7 @@ jobs:
         run: docker run -e VERSION_STRING=${{ steps.version_date.outputs.date }} -i -v ${{ github.workspace }}:/havoc portapack-dev
       - name: Create Firmware ZIP
         run: |
-          zip --junk-paths firmware build/firmware/portapack-h1_h2-mayhem.bin
+          zip -j firmware.zip build/firmware/portapack-h1_h2-mayhem.bin && cd flashing && zip -r ../firmware.zip *
       - name: Create SD Card ZIP
         run: |
           zip -r sdcard.zip sdcard
@@ -96,4 +96,4 @@ jobs:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./sdcard.zip
           asset_name: mayhem_nightly_${{ steps.version_date.outputs.date }}_COPY_TO_SDCARD.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip

.gitignore

@@ -39,7 +39,6 @@
 *.lib
 
 # Executables
-*.exe
 *.out
 *.app
 /firmware/baseband/*.bin

README.md

@@ -26,7 +26,9 @@ To support the people behind the hardware, please buy a genuine [HackRF](https:/
 
 ## Where is the latest firmware?
 
-The current stable release is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=Releases&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) page. Follow the instructions you can find in the release description. 
+The **latest (nightly) release** can be found [here](https://github.com/eried/portapack-mayhem/releases/).
+
+The current **stable release** is on the [![GitHub release (latest by date)](https://img.shields.io/github/v/release/eried/portapack-mayhem?label=Releases&style=social)](https://github.com/eried/portapack-mayhem/releases/latest) page. Follow the instructions you can find in the release description. 
 
 ## Is this the newest firmware for my PortaPack? 
 Most probably: **YES**. *If you find new features somewhere else, please [suggest](https://github.com/eried/portapack-mayhem/issues/new/choose) them*.

firmware/application/portapack.cpp

@@ -212,6 +212,9 @@ static const portapack::cpld::Config& portapack_cpld_config() {
 		persistent_memory::set_config_cpld(2);
 		return portapack::cpld::rev_20150901::config;
 	}
+	if (switches_state[(size_t)ui::KeyEvent::Left]){
+		persistent_memory::set_config_cpld(3);
+	}
 	if (switches_state[(size_t)ui::KeyEvent::Select]){
 		persistent_memory::set_config_cpld(0);
 	}
@@ -415,8 +418,11 @@ bool init() {
 	audio::init(portapack_audio_codec());
 
 	if( !portapack::cpld::update_if_necessary(portapack_cpld_config()) ) {
-		shutdown_base();
-		return false;
+		// 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){
+			shutdown_base();
+			return false;
+		}
 	}
 
 	if( !hackrf::cpld::load_sram() ) {