Merge pull request #619 from schollz:schollz/issue618

ectocore: tap+mode is a reset to first beat

Author: schollz

lib/ectocore.h

@@ -855,27 +855,7 @@ void input_handling() {
         clock_in_activator = 0;
         clock_in_do = false;
       } else if (!clock_input_absent) {
-        // pressing clock while clock is active will reset to beat 1
-        // after determining whether the press is closer to the last
-        // clock or the next clock (i.e. we are either early or late)
-        uint32_t next_time =
-            clock_in_last_time + (clock_in_last_time - clock_in_last_last_time);
-        uint32_t now_time = time_us_32();
-        // ---|-----------|-----------|-------
-        // --lastlast----last---NOW--next
-        // determine if we are in the first half or the second half
-        if (now_time > clock_in_last_time +
-                           (clock_in_last_time - clock_in_last_last_time) / 2) {
-          // we are in the second half
-          // 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;
-        } 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;
-        }
+        // do nothing (this is handled in TAP+MODE now)
       } else {
         val = TapTempo_tap(taptempo);
         if (val > 0) {
@@ -1145,13 +1125,43 @@ void input_handling() {
             set_audio_variant(audio_variant_num);
           }
         } else if (gpio_btn_state[BTN_TAPTEMPO] == 1) {
-          // A+B
           if (val == 1) {
-            // reset tempo to the tempo of the current sample
-            int16_t new_tempo =
-                banks[sel_bank_cur]->sample[sel_sample_cur].snd[FILEZERO]->bpm;
-            if (new_tempo >= 60 && new_tempo <= 300) {
-              sf->bpm_tempo = new_tempo;
+            // TAP + MODE resets to original bpm if no clock is present
+            // otherwise it resets the pattern to beat 1
+            if (!clock_input_absent) {
+              printf("resetting pattern to beat 1\n");
+              // pressing clock while clock is active will reset to beat 1
+              // after determining whether the press is closer to the last
+              // clock or the next clock (i.e. we are either early or late)
+              uint32_t next_time =
+                  clock_in_last_time +
+                  (clock_in_last_time - clock_in_last_last_time);
+              uint32_t now_time = time_us_32();
+              // ---|-----------|-----------|-------
+              // --lastlast----last---NOW--next
+              // determine if we are in the first half or the second half
+              if (now_time >
+                  clock_in_last_time +
+                      (clock_in_last_time - clock_in_last_last_time) / 2) {
+                // we are in the second half
+                // 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;
+              } 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;
+              }
+            } else {
+              // reset tempo to the tempo of the current sample
+              int16_t new_tempo = banks[sel_bank_cur]
+                                      ->sample[sel_sample_cur]
+                                      .snd[FILEZERO]
+                                      ->bpm;
+              if (new_tempo >= 60 && new_tempo <= 300) {
+                sf->bpm_tempo = new_tempo;
+              }
             }
           }
         } else {