3 files changed, 9 insertions, 2 deletions
diff --git a/sw/Core/Src/config.h b/sw/Core/Src/config.h
index 0314cb7..682230e 100755
--- a/sw/Core/Src/config.h
+++ b/sw/Core/Src/config.h
@@ -16,6 +16,8 @@
 // THIS SHOULD NOT BE DEFINED FOR REAL BOARDS:
 //#define HALF_FLASH // pcbway fitted the wrong CPU, with only half the flash ram! this disables all use of the upper 512k, to enable testing
 
+//#define DISABLE_AUTOSAVE // enables Demo Mode - changes are not written to flash. Disables ProgramPage() in params.h
+
 // 0.7 - flashed onto first units
 // 0.8 - fix stereo pan when changing waveshape, and the broken wipe pattern
 // 0.9 - click encoder to zero value
@@ -49,4 +51,7 @@
 // 0.9z - fix shimmer click? thanks hippo!
 // 0.A - USB MIDI Sync
 // 0.A1 - HW SERIAL MIDI SYNC & More CCs
-#define VERSION2			  "v0.A3"
+// 0.A2 - Allows for playing notes from the touch surface over a recorded sequence. Still buggy. In touch.h #define MERGE_PLAYBACK 1
+// 0.A3 - Fixes a USB bug in which some hosts wouldn't recognize Plinky. New startup sequence is plinky_init(), then midiinit().
+// 0.A4 - Disabled MERGE_PLAYBACK in touch.h. DISABLE_AUTOSAVE flag enables Demo Mode - changes are not written to flash. Disables ProgramPage() in params.h
+#define VERSION2			  "v0.A4"
diff --git a/sw/Core/Src/params.h b/sw/Core/Src/params.h
index c3cb507..532eac7 100755
--- a/sw/Core/Src/params.h
+++ b/sw/Core/Src/params.h
@@ -754,6 +754,7 @@ u8 AllocAndEraseFlashPage(void) {
 
 
 void ProgramPage(void* datasrc, u32 datasize, u8 index) {
+#ifndef DISABLE_AUTOSAVE
 #ifndef HALF_FLASH
 
 	updating_bank2 = 1;
@@ -772,6 +773,7 @@ void ProgramPage(void* datasrc, u32 datasize, u8 index) {
 	latestpagesidx[index] = page;
 	updating_bank2 = 0;
 #endif
+#endif
 }
 
 void SetPreset(u8 preset, bool force) {
diff --git a/sw/Core/Src/touch.h b/sw/Core/Src/touch.h
index 6df81d7..b62313c 100755
--- a/sw/Core/Src/touch.h
+++ b/sw/Core/Src/touch.h
@@ -745,7 +745,7 @@ void finger_synth_update(int fi) {
 		if (!want_recording_on)
 			last_rec_step = 255;
 	}
-#define MERGE_PLAYBACK 1
+#define MERGE_PLAYBACK 0
     if (MERGE_PLAYBACK) {
         // read from pattern
         FingerRecord *fr = readpattern(fi);