summaryrefslogtreecommitdiff
path: root/sw/Core/Src/touch.h
diff options
context:
space:
mode:
authorMaking Sound Machines <40341903+makingsoundmachines@users.noreply.github.com>2024-07-05 14:54:38 +0200
committerGitHub <noreply@github.com>2024-07-05 14:54:38 +0200
commitcc85473908d495cca23ddeedeed1cbf0bda87c49 (patch)
treedf82ab4a0790903637f055ecc1b13d2c6e8e2865 /sw/Core/Src/touch.h
parent2276f86b1b19d9e07fe84c23517b7d4d3fe0ffad (diff)
parent3f9e6ddbab0f8fe770f2ad41f7ae79ee9c4fac6c (diff)
downloadplinky-cc85473908d495cca23ddeedeed1cbf0bda87c49.tar.gz
Merge pull request #19 from makingsoundmachines/main
Disables Merge Playback, adds Disable Autosave flag (off by default)
Diffstat (limited to 'sw/Core/Src/touch.h')
-rwxr-xr-xsw/Core/Src/touch.h2
1 files changed, 1 insertions, 1 deletions
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);