fix: variable mode

Author: schollz

lib/clockhandling.h

@@ -16,9 +16,11 @@ void clock_in_do_update() {
   if (playback_stopped) {
     playback_was_stopped_clock = true;
     clock_in_beat_total = 0;
+    clock_in_beat_last = 0;
   } else if (playback_was_stopped_clock) {
     playback_was_stopped_clock = false;
     clock_in_beat_total = 0;
+    clock_in_beat_last = 0;
   }
 }
 
@@ -49,6 +51,7 @@ void clock_handling_start() {
     clock_in_last_last_time = clock_in_last_time;
     clock_in_last_time = time_us_32();
     clock_in_beat_total = 0;
+    clock_in_beat_last = 0;
     clock_in_ready = true;
     cancel_repeating_timer(&timer);
     do_restart_playback = true;

lib/ectocore.h

@@ -1337,11 +1337,13 @@ void __not_in_flash_func(input_handling)() {
                 // the next clock is going to be the first beat
                 // reset it to -1, so that when it increments it will be at 0
                 clock_in_beat_total = -1;
+                clock_in_beat_last = -1;
               } else {
                 // we are in the first half
                 // the next clock is going to be the second beat
                 // reset it to 0, so that when it increments it will be at 1
                 clock_in_beat_total = 0;
+                clock_in_beat_last = 0;
               }
             } else {
               // reset tempo to the tempo of the current sample

lib/globals.h

@@ -186,6 +186,8 @@ bool clock_input_absent_zeptocore = false;
 bool clock_in_ready = false;
 uint8_t clock_in_activator = 0;
 int32_t clock_in_beat_total = 0;
+int32_t clock_in_beat_last = 0;
+bool should_skip_clock_pulse = false;
 volatile uint32_t clock_in_diff_2x = 0;
 volatile uint32_t clock_in_last_time = 0;
 uint32_t clock_in_last_last_time = 0;

lib/midicallback.h

@@ -100,6 +100,7 @@ void midi_timing() {
     printf("[midicallback] midi resetting\n");
 #endif
     clock_in_beat_total = -1;
+    clock_in_beat_last = -1;
   }
   if (midi_timing_count % (midi_timing_modulus / MIDI_CLOCK_MULTIPLIER) == 0) {
     // soft sync

main.c

@@ -360,12 +360,39 @@ bool __not_in_flash_func(timer_step)() {
         //        num_slices, bpm_timer_counter, (float)bpm_timer_counter_last);
         bpm_timer_counter_last = bpm_timer_counter;
       }
+
+      // In variable mode with clock input, check if enough pulses accumulated
+      if (clock_in_do && clock_in_ready) {
+        // Calculate expected pulses for this slice based on num_slices
+        // num_slices is in timer ticks (192 per quarter note)
+        // splice_trigger is pulses per quarter note (typically 24)
+        float expected_pulses = num_slices *
+                                (float)banks[sel_bank_cur]
+                                    ->sample[sel_sample_cur]
+                                    .snd[FILEZERO]
+                                    ->splice_trigger / 192.0f;
+        int32_t pulses_accumulated = clock_in_beat_total - clock_in_beat_last;
+
+        if (pulses_accumulated < (int32_t)roundf(expected_pulses)) {
+          // Not enough pulses accumulated for this slice yet
+          should_skip_clock_pulse = true;
+        } else {
+          // Enough pulses accumulated, allow trigger and reset counter
+          should_skip_clock_pulse = false;
+          clock_in_beat_last = clock_in_beat_total;
+        }
+      }
+    } else {
+      // Not in variable mode, reset the skip flag
+      should_skip_clock_pulse = false;
     }
 
     if (sequencerhandler[0].playing) {
       // already done
-    } else if ((clock_in_do && clock_in_ready) || do_splice_trigger) {
+    } else if (((clock_in_do && clock_in_ready && !should_skip_clock_pulse) ||
+                do_splice_trigger)) {
       clock_in_ready = false;
+      should_skip_clock_pulse = false;
       mem_use = false;
       // keep to the beat
       if (fil_is_open && debounce_quantize == 0) {