4ms · danngreen · May 3, 2025 · May 1, 2025 · May 1, 2025 · May 1, 2025
diff --git a/firmware/metamodule-plugin-sdk b/firmware/metamodule-plugin-sdk
diff --git a/firmware/src/core_intercom/intercore_message.hh b/firmware/src/core_intercom/intercore_message.hh
@@ -51,8 +51,11 @@ struct IntercoreStorageMessage {
 		WriteFileFail,
 		WriteFileOK,
 
-		RequestFactoryResetPatches,
-		FactoryResetPatchesDone,
+		RequestFactoryReset,
+		FactoryResetDone,
+
+		RequestReloadDefaultPatches,
+		ReloadDefaultPatchesDone,
 
 		RequestPluginFileList,
 		PluginFileListOK,

diff --git a/firmware/src/gui/pages/plugin_tab.hh b/firmware/src/gui/pages/plugin_tab.hh
@@ -394,7 +394,7 @@ private:
 							pr_info("Pre-load Disabled: %s\n", plugin_name.data());
 							page->settings.slug.erase(autoload_slot);
 						} else {
-							pr_err("Error: can't disable autoload for %s: not found in settings autoload list\n",
+							pr_err("Error: can't disable pre-load for %s: not found in settings pre-load list\n",
 								   plugin_name.data());
 						}
 					}
@@ -457,7 +457,7 @@ private:
 					page->gui_state.do_write_settings = true;
 				}
 			},
-			"Are you sure you want to autoload no plugins?",
+			"Are you sure you want to disable pre-loading plugins?",
 			"OK");
 	}
 
@@ -479,7 +479,7 @@ private:
 					page->gui_state.do_write_settings = true;
 				}
 			},
-			"This will autoload the current set of loaded plugins the next time you power on",
+			"This will pre-load the current set of loaded plugins the next time you power on",
 			"OK");
 	}
 

diff --git a/firmware/src/gui/pages/system_tab.hh b/firmware/src/gui/pages/system_tab.hh
@@ -156,7 +156,7 @@ private:
 					page->storage.request_reset_factory_patches();
 					while (true) {
 						auto msg = page->storage.get_message();
-						if (msg.message_type == FileStorageProxy::FactoryResetPatchesDone)
+						if (msg.message_type == FileStorageProxy::FactoryResetDone)
 							break;
 					}
 				}

diff --git a/firmware/src/patch_file/file_storage_proxy.hh b/firmware/src/patch_file/file_storage_proxy.hh
@@ -167,7 +167,7 @@ public:
 	}
 
 	bool request_reset_factory_patches() {
-		IntercoreStorageMessage message{.message_type = RequestFactoryResetPatches};
+		IntercoreStorageMessage message{.message_type = RequestFactoryReset};
 		return comm_.send_message(message);
 	}
 

diff --git a/firmware/src/patch_file/patch_storage.hh b/firmware/src/patch_file/patch_storage.hh
@@ -65,6 +65,10 @@ public:
 	}
 
 	void reload_default_patches() {
+		PatchFileIO::create_default_patches(norflash_);
+	}
+
+	void reformat_norflash() {
 		norflash_.reformat();
 		PatchFileIO::create_default_patches(norflash_);
 	}
@@ -179,8 +183,15 @@ public:
 			return result;
 		}
 
-		if (message.message_type == RequestFactoryResetPatches) {
-			IntercoreStorageMessage result{.message_type = FactoryResetPatchesDone};
+		if (message.message_type == RequestFactoryReset) {
+			IntercoreStorageMessage result{.message_type = FactoryResetDone};
+			reformat_norflash();
+
+			return result;
+		}
+
+		if (message.message_type == RequestReloadDefaultPatches) {
+			IntercoreStorageMessage result{.message_type = ReloadDefaultPatchesDone};
 			reload_default_patches();
 
 			return result;

diff --git a/firmware/src/patch_file/patches_default.hh b/firmware/src/patch_file/patches_default.hh
@@ -5,52 +5,79 @@
 
 ///
 
+#include "../patches/default/Ensemble Wash.hh"
+#include "../patches/default/Karpeggiator.hh"
+#include "../patches/default/MorphingDrone.hh"
+#include "../patches/default/Oscillator Wash.hh"
+#include "../patches/default/Thunderbanshee.hh"
+#include "../patches/default/West Coast FM Madness.hh"
+#include "../patches/default/Wonky Bass.hh"
+#include "../patches/default/Wooden Groove.hh"
+
 #include "../patches/default/Djembe4verb.hh"
 #include "../patches/default/DualEnvEnosc.hh"
 #include "../patches/default/EnOscPoly4.hh"
 #include "../patches/default/EnOsc_step_seq.hh"
 #include "../patches/default/KarplusStereo.hh"
 #include "../patches/default/MIDI_Poly4.hh"
 #include "../patches/default/Orcas_Heart_Octo_Djembe.hh"
-#include "../patches/default/PlaygroundBefaco.hh"
-#include "../patches/default/QuadDrum.hh"
+// #include "../patches/default/PlaygroundBefaco.hh"
+// #include "../patches/default/QuadDrum.hh"
 #include "../patches/default/SlothDrone.hh"
-#include "../patches/default/SpringsintoCaves.hh"
-#include "../patches/default/UntwistedBraid.hh"
+// #include "../patches/default/SpringsintoCaves.hh"
+// #include "../patches/default/UntwistedBraid.hh"
 #include "../patches/default/WanderVoices.hh"
 
 struct DefaultPatches {
 
 	static inline std::array patch_raw_data = std::to_array<std::span<const char>>({
-		Sloth_Drone_patch,		//
-		WanderVoices_patch,		//
-		DualEnvEnOsc_patch,		//
-		SpringsIntoCaves_patch, //
-		Orcas_Heart_Octo_Djembe_patch,
-		EnOscPoly4_patch, //
-		QuadDrum_patch,	  //
-		PlaygroundBefaco_patch,
-		Djembe4verb_patch,	 //
-		KarplusStereo_patch, //
+		patch_Ensemble_Wash,
+		patch_Karpeggiator,
+		patch_MorphingDrone,
+		patch_Oscillator_Wash,
+		patch_Thunderbanshee,
+		patch_West_Coast_FM_Madness,
+		patch_Wonky_Bass,
+		patch_Wooden_Groove,
+
+		Djembe4verb_patch, //
+		DualEnvEnOsc_patch,
+		EnOscPoly4_patch,
 		EnOscStepSeq_patch,
-		UntwistedBraid_patch,
-		MIDI_Poly4_patch, //
+		KarplusStereo_patch,
+		MIDI_Poly4_patch,
+		Orcas_Heart_Octo_Djembe_patch,
+		// PlaygroundBefaco_patch,
+		// QuadDrum_patch,
+		Sloth_Drone_patch,
+		// SpringsIntoCaves_patch,
+		// UntwistedBraid_patch,
+		WanderVoices_patch,
 	});
 
 	static inline std::array patch_filenames = std::to_array<StaticString<63>>({
-		"SlothDrone.yml",		//
-		"WanderVoices.yml",		//
-		"DualEnvEnOsc.yml",		//
-		"SpringsintoCaves.yml", //
-		"Orcas_Heart_Octo_Djembe.yml",
-		"EnOscPoly4.yml", //
-		"QuadDrum.yml",	  //
-		"PlaygroundBefaco.yml",
-		"Djembe4verb.yml",	 //
-		"KarplusStereo.yml", //
+		"Ensemble_Wash.yml",
+		"Karpeggiator.yml",
+		"MorphingDrone.yml",
+		"Oscillator_Wash.yml",
+		"Thunderbanshee.yml",
+		"West_Coast_FM_Madness.yml",
+		"Wonky_Bass.yml",
+		"Wooden_Groove.yml",
+
+		"Djembe4verb.yml",	//
+		"DualEnvEnOsc.yml", //
+		"EnOscPoly4.yml",	//
 		"EnOscStepSeq.yml",
-		"UntwistedBraid_patch.yml",
-		"MIDI_Poly4.yml", //
+		"KarplusStereo.yml", //
+		"MIDI_Poly4.yml",	 //
+		"Orcas_Heart_Octo_Djembe.yml",
+		// "PlaygroundBefaco.yml",
+		// "QuadDrum.yml",			//
+		"SlothDrone.yml", //
+		// "SpringsintoCaves.yml", //
+		// "UntwistedBraid_patch.yml",
+		"WanderVoices.yml", //
 	});
 
 	static constexpr uint32_t num_patches() {

diff --git a/firmware/system/linker/memory.ld b/firmware/system/linker/memory.ld
@@ -6,12 +6,12 @@ _TTB			= 0xC0100000;
 _TTB_SZ			= 1M;
 _TTB_END		= 0xC0200000;
 
-_A7_SYMS		= 0xC1F80000;
+_A7_SYMS		= 0xC1F70000;
 _A7_SYMS_SZ		= 256K;		/*0x0004'0000*/ 
-_A7_SYMS_END	= 0xC1FC0000;
+_A7_SYMS_END	= 0xC1FB0000;
 
-_M4_RODATA		= 0xC1FC0000;
-_M4_RODATA_SZ   = 256K;		/*0x0004'0000*/ 
+_M4_RODATA		= 0xC1FB0000;
+_M4_RODATA_SZ   = 320K;		/*0x0005'0000*/ 
 _M4_RODATA_END	= 0xC2000000;
 
 _A7_CODE		= 0xC2000040;

diff --git a/patches/default/Djembe4verb.vcv b/patches/default/Djembe4verb.vcv