Merge pull request #643 from schollz/schollz/issue642

ectocore: fix bank+sample scrolling

Author: schollz

ectocore_compile_definitions.cmake

@@ -56,6 +56,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE
     # PRINT_MEMORY_USAGE=1
     # PRINT_SDCARD_TIMING=1
     # PRINT_AUDIOBLOCKDROPS=1
+    # PRINT_SDCARD_OPEN_TIMING=1
 
     # turn off gpio for leds
     LEDS_NO_GPIO=1

lib/audio_callback.h

@@ -410,8 +410,10 @@ void i2s_callback_func() {
 
     if (head == 0 && do_open_file) {
       // setup the next
-      sel_sample_cur = sel_sample_next;
       sel_bank_cur = sel_bank_next;
+      sel_sample_cur = sel_sample_next % banks[sel_bank_cur]->num_samples;
+      // printf("[audio_callback] switch bank/sample %d/%d\n", sel_bank_cur,
+      //        sel_sample_cur);
 
       FRESULT fr;
       t0 = time_us_32();
@@ -424,7 +426,7 @@ void i2s_callback_func() {
       fr = f_open(&fil_current, fil_current_name, FA_READ);
       t1 = time_us_32();
       sd_card_total_time += (t1 - t0);
-#ifdef PRINT_SDCARD_TIMING
+#ifdef PRINT_SDCARD_OPEN_TIMING
       if (do_open_file) {
         MessageSync_printf(messagesync,
                            "[audio_callback] do_open_file f_close+f_open: %d\n",
@@ -467,7 +469,7 @@ void i2s_callback_func() {
         return;
       }
       t1 = time_us_32();
-#ifdef PRINT_SDCARD_TIMING
+#ifdef PRINT_SDCARD_OPEN_TIMING
       if (do_open_file) {
         MessageSync_printf(messagesync,
                            "[audio_callback] do_open_file f_lseek: %d\n",

lib/file_list.h

@@ -77,7 +77,7 @@ SampleList *list_files(const char *dir) {
       }
       filelist_count++;
     } else {
-      printf("[list_files] %s: %s\n", fname, FRESULT_str(fr));
+      // printf("[list_files] %s: %s\n", fname, FRESULT_str(fr));
     }
   }