reading 512k works, but hangs the cpu when trying to play 5 samples

soundcube-firmware/ringbuffer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-template<typename T>
 class RingBuffer{
   public:
     RingBuffer() {}
@@ -11,10 +10,10 @@ class RingBuffer{
     }
 
     void begin(){
-      buffer = new T[bufferSize];
+      buffer = new int16_t[bufferSize];
     }
 
-    bool push(T data){
+    bool push(int16_t data){
       if(counter < bufferSize){
         buffer[write] = data;
         write++; // % bufferSize;
@@ -25,8 +24,8 @@ class RingBuffer{
       return false;
     }
     
-    T pop(){
-      T retval = 0;
+    int16_t pop(){
+      int16_t retval = 0;
       if(counter > 0) {
         counter--;
         retval = buffer[read];
@@ -35,23 +34,73 @@ class RingBuffer{
       }
       return retval;
     }
+
+    int16_t* getReadPointer(){
+      return &buffer[read];
+    }
+
+    void pointerPop(int nbytes){
+      for(int i=0; i<nbytes / 2; ++i){
+        if(counter > 0) {
+          counter--;
+          read++;// % bufferSize;
+          if(read == bufferSize) read = 0;
+        }
+      }
+    }
 	
+    void pushDMA(int32_t *source){
+      if(counter < bufferSize){
+        rp2040.memcpyDMA(&buffer[write], source, 4);
+        write += 2; // % bufferSize;
+        if(write == bufferSize) write = 0;
+        counter += 2;
+      } 
+    }
+
+    void* getWritePointer(){
+      return &buffer[write];
+    }
+	
+		void advance(int nbytes){
+			for(int i = 0; i < nbytes/2; ++i){
+				if(counter < (bufferSize-1)){
+					write++; // % bufferSize;
+					if(write == bufferSize) write = 0;
+					counter++;
+				} 
+			}
+		}
+
+    void popDMA(int32_t *target){
+      if(counter > 1) {
+        counter -= 2;
+        rp2040.memcpyDMA(target, &buffer[read], 4);
+        read += 2;
+        if(read >= bufferSize) read = 0;
+      }
+    }
+
     bool isEmpty(){
       return counter == 0;
     }
 
     bool isFull(){
-      return counter == bufferSize;
+      return counter == (bufferSize-2);
     }
 
     int size(){
       return counter;
     }
 
+    int remains(){
+      return (bufferSize-2) - counter;
+    }
+
   private:
     size_t bufferSize = 0;
     int counter = 0;
     int write = 0;
     int read = 0;
-    T *buffer;
+    int16_t *buffer;
 };

soundcube-firmware/soundcube-firmware.ino

@@ -1,4 +1,3 @@
-
 #include <ArduinoJson.h>
 #include <ArduinoJson.hpp>
 
@@ -6,7 +5,9 @@
 #include <AS5600.h>
 #include <DAC8552.h>
 
+#define FASTLED_FORCE_SOFTWARE_SPI
 #include <FastLED.h>
+
 #include <PWMAudio.h>
 #include <I2S.h>
 #include <SPI.h>
@@ -14,21 +15,22 @@
 #include "codec.h"
 #include "wavestream.h"
 
+bool core1_separate_stack = true;
+bool core1_disable_systick = true;
+
 #define HAPTIC 1
 #define AURAL 1
 #define UI_SAMPLERATE 22050
 
-#define BUFFERSIZE 64
-#define NSTREAMS 8
+#define BUFFERSIZE 256
+#define NSTREAMS 16
+
+I2S i2s(INPUT_PULLUP);
 
 int16_t buffer[BUFFERSIZE];
 
 WaveStream stream[NSTREAMS];
 
-bool streams_loaded = false;
-
-I2S i2s(INPUT_PULLUP);
-
 TLV320AIC3204 codec;
 
 TCA9555 TCA(0x20, &Wire1);
@@ -38,31 +40,58 @@ DAC8552 dac(9, &SPI1);
 
 PWMAudio ui_snd(8);
 
-enum BUTTON {CVINL, CVINR, INL, INR, OUTR, OUTL, CVOUTR, CVOUTL, RIGHT, LEFT, SELECT, DEBUG1, DEBUG2, DEBUG3};
+CRGB ui_leds[74];
+CRGB edge_leds[11];
+
+enum STATE {BANK, SAMPLE, SEQUENCE, CTEMPO};
+STATE state = BANK;
+
+//enum BUTTON {CVINL, CVINR, INL, INR, OUTR, OUTL, CVOUTR, CVOUTL, RIGHT, LEFT, SELECT, DEBUG1, DEBUG2, DEBUG3};
+enum BUTTON {MODE, LOOP, INL, INR, OUTR, OUTL, TEMPO, RESET, BACK, POWER, SELECT, DEBUG1, DEBUG2, DEBUG3};
 
 int lut_ring_cw[48] = {39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,50,49,48,47,46,45,44,43,42,41,40};
 int lut_ring_ccw[48] = {40,41,42,43,44,45,46,47,48,49,50,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39};
+
+int lut_ring_cw_3[48] = {40,39,38,37,36,35,34,33,32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,50,49,48,47,46,45,44,43,42,41};
+int lut_ring_ccw_3[48] = {39,40,41,42,43,44,45,46,47,48,49,50,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38};
+
 int lut_matrix[13] = {56,55,57,58,59,62,61,60,63,64,65,67,66};
 
+int lut_banks[4] = {56,55,67,66};
+int lut_samples[4] = {62,58,60,64};
+
 int active = 0;
 int active_led_ring = 0;
 
-bool speakerToggle = false;
+int selected_bank = 0;
+int selected_sample = 0;
 
 uint32_t lastTime = 0;
 int32_t position = 0;
 
-CRGB ui_leds[74];
-CRGB edge_leds[11];
+volatile bool setup0_finished = false;
+volatile bool setup1_finished = false;
 
 volatile bool buttonChanged = false;
+volatile bool sdInitialized = false;
+
+volatile bool wire_ready = false;
+
 volatile bool ui_click = false;
 volatile bool ui_beep = false;
-volatile bool amp = false;
+bool amp = false;
+volatile bool streams_loaded = false;
+bool speakerToggle = false;
+bool sd_card_detected = false;
 
-int counter = 0;
+volatile bool i2s_ready = false;
+volatile bool codec_ready = false;
+volatile bool config_loaded = false;
 
 bool buttons[16] = {false};
+int buttonsDir[16] = {0};
+
+int counter = 0;
 
 int16_t ui_click_snd[UI_SAMPLERATE];
 uint16_t click_length = 0;
@@ -70,8 +99,6 @@ uint16_t click_length = 0;
 int16_t ui_beep_snd[UI_SAMPLERATE];
 uint16_t beep_length = 0;
 
-bool sd_card_detected = false;
-
 struct Color {
   int r;
   int g;
@@ -82,12 +109,34 @@ struct Color {
 };
 
 struct Config {
+  String boxid = "";
   Color edge_color = {0,0,50,0,50,0};
   Color ring_color = {0,50,50,0,80,50};
+  String sampleFiles[16];
+  int bpm = 90;
 };
 
 Config config;
 
+struct Sample{
+  float volume = 1.0;
+  WaveStream *file;
+};
+
+Sample samples[NSTREAMS];
+
+struct SequenceStep{
+  int len = 0;
+  Sample *samples[4];
+  void trigger(){
+    for(int i = 0; i < len; i++){
+      samples[i]->file->play(true);
+    }
+  }
+};
+
+SequenceStep steps[16];
+
 void loadConfiguration(Config& config) {
   File file = SD.open("/config.txt");
   JsonDocument doc;
@@ -109,7 +158,13 @@ void loadConfiguration(Config& config) {
   config.ring_color.g_active = doc["ring"]["color"]["active"]["g"] | 80;
   config.ring_color.b_active = doc["ring"]["color"]["active"]["b"] | 50;
 
-  //strlcpy(config.hostname, doc["hostname"] | "example.com", sizeof(config.hostname));
+  JsonArray _sampleFiles = doc["samples"];
+  config.boxid = doc["boxid"].as<String>();
+  int i = 0;
+  for(JsonVariant item : _sampleFiles){
+    config.sampleFiles[i] = item.as<String>();
+    i++;
+  }
 
   file.close();
 }
@@ -118,12 +173,29 @@ size_t count;
 size_t tape_write = 0;
 
 void codec_transmit() {
-  for(int i = 0; i < count; i++){
-    int j = active % NSTREAMS;
-    for(int k = 0; k < NSTREAMS; k++){
-      int16_t sample = 0;
-      sample = stream[k].get();
-      buffer[i] += sample >> 2;
+  for(int i = 0; i < count; i+=2){
+    if(streams_loaded){
+      for(int k = 0; k < NSTREAMS; k++){
+        //int32_t twosamples;
+        int16_t twosamples[2];
+        if(stream[k].isPlaying()){
+          stream[k].getDMA((int32_t*)&twosamples);
+
+          int16_t sample_l = twosamples[0];// >> 16;
+          int16_t sample_r = twosamples[1];// & 0xFFFF;
+
+          // int16_t *sample_l = stream[k].wavefile.buffer.getReadPointer(); //twosamples >> 16;
+          // stream[k].wavefile.buffer.pointerPop(2);
+          // int16_t *sample_r = stream[k].wavefile.buffer.getReadPointer(); //twosamples & 0xFFFF;
+          // stream[k].wavefile.buffer.pointerPop(2);
+
+          // buffer[i] += (*sample_l / 16);
+          // buffer[i+1] += (*sample_r / 16);
+          
+          buffer[i] += (sample_l / 16);
+          buffer[i+1] += (sample_r / 16);        
+        }
+      }
     }
   }
   i2s.write((const uint8_t *)&buffer, count * sizeof(int16_t));
@@ -190,6 +262,44 @@ bool load_ui_sounds(const char* file, int16_t *buffer, uint16_t &length){
   return false;
 }
 
+bool load_samples(){
+  for(int i = 0; i < NSTREAMS; i++){
+    stream[i].begin();
+    char filename[64];
+    sprintf(filename, "/sound/%s/%s", config.boxid.c_str(), config.sampleFiles[i].c_str());
+    Serial.println(filename);
+
+    if(SD.exists(filename)){
+      bool loaded = stream[i].load(SD.open(filename));
+      if(loaded) {
+        Serial.print("file read: ");
+        Serial.print(stream[i].wavefile.length);
+        Serial.print(" bytes | ");
+        Serial.print(stream[i].wavefile.samplerate);
+        Serial.print(" kHz | ");
+        Serial.print(stream[i].wavefile.bitspersample);
+        Serial.print(" bits | ");
+        Serial.print(stream[i].wavefile.channels);
+        Serial.print(" channels | ");
+        Serial.print(stream[i].wavefile.blockalign);
+        Serial.println(" bytes");
+        //stream[i].wavefile.loop = true;
+      } else {
+        Serial.println("file loading error");
+      }
+    } else {
+      for(int k = 0; k < 3; k++){
+        digitalWrite(6, HIGH);
+        delay(20);
+        digitalWrite(6, LOW);
+        delay(25);
+      }
+      return false;
+    }
+  }
+  return true;
+}
+
 void tca_irq() {
   buttonChanged = true;
 }
@@ -199,77 +309,161 @@ void speaker(bool state){
   digitalWrite(13, state ? HIGH : LOW);
 }
 
+struct Vibration{
+  int32_t last;
+  bool start = false;
+  bool wait = false;
+  uint16_t on = 0;
+  uint16_t off = 0;
+  int n = 1;
+
+  void update(){
+    int32_t delta = millis() - last;
+
+    if(start && !wait){ 
+      digitalWrite(6, HIGH);
+      start = false;
+      wait = true;
+      last = millis();
+    }
+
+    if(delta >= on && wait){
+      digitalWrite(6, LOW);
+      wait = false;
+      n--;
+      last = millis();
+    }
+
+    if(delta >= off && n > 0){
+      start = true;
+      last = millis();
+    }
+  }
+
+  void trigger(int _n, int _on, int _off){
+    n = _n;
+    on = _on;
+    off = _off;
+    start = true;
+    last = millis();
+  }
+};
+Vibration vibration;
+
+// -------------------------------------------- SETUP 0
+
 void setup() {
-  Serial.begin();
-  delay(1000);
+  //i2s.setSysClk(48000);
 
-  i2s.setFrequency(48000);
+  delay(500);
+  
+  Serial.print("1: INIT WIRE: ");
+  Wire1.setSDA(2);
+  Wire1.setSCL(3);
+  Wire1.begin();
+  Serial.println("SUCCESS");
 
+  wire_ready = true;
+
+  Serial.print("1: INIT SPI: ");
   SPI1.setSCK(10);
   SPI1.setTX(11);
   SPI1.begin();
+  Serial.println("SUCCESS");
+  delay(100);
+  
+  Serial.print("1: ENABLE CODEC: ");
+  pinMode(20, OUTPUT); // CODEC reset (enable)
+  digitalWrite(20, HIGH);
+  Serial.println("SUCCESS");
+  
+  Serial.print("1: ENABLE I2S MCLK: ");
+  pinMode(19, OUTPUT); // MCLK enable
+  digitalWrite(19, HIGH); // enable MCLK
+  Serial.println("SUCCESS");
 
+  Serial.print("1: STARTUP");
+
+  Serial.print("1: INIT TCA: ");
+  TCA.begin();
+  TCA.pinMode16(0xFFFF);
+  TCA.setPolarity16(0x0000);
+  Serial.println(" SUCCESS");
+
+  Serial.print("1: INIT TCA INTERRUPT: ");
+  pinMode(1, INPUT_PULLUP);
+  attachInterrupt(digitalPinToInterrupt(1), tca_irq, FALLING);
+  Serial.println("SUCCESS");
+
+  Serial.print("1: INIT ROTARY ENCODER: ");
+  ENC.begin();  //  set direction pin.
+  ENC.setDirection(AS5600_CLOCK_WISE);
+  ENC.resetCumulativePosition();
+  Serial.println("SUCCESS");
+
+  Serial.print("1: INIT DAC: ");
   dac.begin();
+  Serial.println("SUCCESS");
 
+  pinMode(6, OUTPUT);  // Vibration Motor
+  pinMode(7, OUTPUT);  // UI Amp Enable
+
+  //ui_snd.onTransmit(pwm_audio_callback);
+  //ui_snd.begin(UI_SAMPLERATE);
+
+  digitalWrite(7, LOW); // UI amp off
+
+  Serial.print("1: INIT LEDS: ");
   FastLED.addLeds<NEOPIXEL, 4>(edge_leds, 11);
   FastLED.addLeds<NEOPIXEL, 5>(ui_leds, 74);
+  Serial.println("SUCCESS");
+  
+  Serial.print("1: STARTUP COMPLETE");
+  setup1_finished = true;
+  digitalWrite(6, HIGH);
+  delay(25);
+  digitalWrite(6, LOW);
+  Serial.begin();
 
-  pinMode(12, OUTPUT);
-  pinMode(13, OUTPUT);
+  Serial.print("0: INIT CODEC: ");
+  codec.begin(&Wire1);
+  Serial.println("SUCCESS");
 
+  codec_ready = true;
+
+  pinMode(12, OUTPUT); // speaker enable l
+  pinMode(13, OUTPUT); // speaker enable r
   speaker(false);
 
   pinMode(21, INPUT_PULLUP);
   sd_card_detected = !digitalRead(21);
   delay(500);
 
-  bool sdInitialized = SD.begin(22, 23, 24);
-  delay(100);
-  if(!sdInitialized) sdInitialized = SD.begin(22, 23, 24); // hack to prevent SD card from not initializing after soft reset
+  while(!sdInitialized){
+    sdInitialized = SD.begin(22, 23, 24);
+    delay(250);
+    Serial.println("0: Initializing SD Card");
+  }
 
   if(sdInitialized) loadConfiguration(config);
 
   if(sdInitialized){
-    load_ui_sounds("/ui/click.wav", ui_click_snd, click_length);
-    load_ui_sounds("/ui/beep.wav", ui_beep_snd, beep_length);
+   load_ui_sounds("/ui/click.wav", ui_click_snd, click_length);
+   load_ui_sounds("/ui/beep.wav", ui_beep_snd, beep_length);
+  }
+  
+  config_loaded = true;
+
+  if(sdInitialized) {
+    streams_loaded = load_samples();
   }
 
-  Serial.println("INIT WIRE");
-  Wire1.setSDA(2);
-  Wire1.setSCL(3);
-  Wire1.begin();
-  Serial.println("SUCCESS");
-
-  Serial.println("INIT TCA");
-  TCA.begin();
-  TCA.pinMode16(0xFFFF);
-  TCA.setPolarity16(0x0000);
-  Serial.println("SUCCESS");
-
-  Serial.println("INIT INTERRUPT");
-  pinMode(1, INPUT_PULLUP);
-  attachInterrupt(digitalPinToInterrupt(1), tca_irq, FALLING);
-  Serial.println("SUCCESS");
-
-  // Rotary Encoder
-  ENC.begin();  //  set direction pin.
-  ENC.setDirection(AS5600_COUNTERCLOCK_WISE);
-
-  pinMode(6, OUTPUT);  // Vibration Motor
-  pinMode(7, OUTPUT);  // UI Amp Enable
-
-  ui_snd.onTransmit(pwm_audio_callback);
-  ui_snd.begin(UI_SAMPLERATE);
-
-  digitalWrite(7, LOW); // UI amp off
-
-  pinMode(19, OUTPUT); // MCLK enable
-  digitalWrite(19, HIGH); // enable MCLK
-
-  pinMode(20, OUTPUT); // CODEC reset
-  digitalWrite(20, HIGH);
-
-  codec.begin(&Wire1);
+  if(streams_loaded) {
+    for(int i = 0; i < NSTREAMS; i++){
+      samples[i].file = &stream[i];
+    }
+  }
+  
 
   i2s.onTransmit(codec_transmit);
   i2s.onReceive(codec_receive);
@@ -278,200 +472,332 @@ void setup() {
   i2s.setDIN(14);
   i2s.setBCLK(16); // Note: LRCLK = BCLK + 1
   i2s.setMCLK(18);
-  i2s.setMCLKmult(512); // 256 = 12.288.000Hz 512 = 25Mhz
-
+  i2s.setMCLKmult(512); // 256 = 12.288.000Hz 512 = 25MHz
   i2s.swapClocks();
+
+//  i2s.setFrequency(48000);
   i2s.setBitsPerSample(16);
 
-  i2s.setBuffers(6, BUFFERSIZE * sizeof(int16_t) / sizeof(uint32_t));
+  i2s.setBuffers(4, BUFFERSIZE * sizeof(int16_t) / sizeof(uint32_t));
 
   if(!i2s.begin(48000)){
-    Serial.println("I2S error!");
+    Serial.println("0: I2S error!");
     while(100);
   }
+  Serial.println("0: I2S OK");
 
-  if(sdInitialized) {
-    for(int i = 0; i < NSTREAMS; i++){
-      stream[i].begin();
-      char filename[40];
-      sprintf(filename, "/sound/%d.wav", i+1);
-      if(SD.exists(filename)){
-        bool loaded = stream[i].load(SD.open(filename));
-        
-        if(loaded) {
-          Serial.print("file read: ");
-          Serial.print(stream[i].wavefile.length);
-          Serial.print(" bytes | ");
-          Serial.print(stream[i].wavefile.samplerate);
-          Serial.print(" kHz | ");
-          Serial.print(stream[i].wavefile.bitspersample);
-          Serial.print(" bits | ");
-          Serial.print(stream[i].wavefile.channels);
-          Serial.print(" channels | ");
-          Serial.print(stream[i].wavefile.blockalign);
-          Serial.println(" bytes");
+  delay(100);
+  
+  i2s_ready = true;
 
-          //stream[i].play();
-          stream[i].wavefile.loop = true;
-        } else {
-          Serial.println("file loading error");
-        }
-      } else {
-        for(int k = 0; k < 3; k++){
-          digitalWrite(6, HIGH);
-          delay(100);
-          digitalWrite(6, LOW);
-          delay(50);
-        }
-      }
-    }
-    streams_loaded = true;
-  }
+  Serial.print("0: STARTUP COMPLETE");
 
   digitalWrite(6, HIGH);
   delay(25);
   digitalWrite(6, LOW);
-  delay(50);
-  digitalWrite(6, HIGH);
-  delay(25);
-  digitalWrite(6, LOW);
+  setup0_finished = true;
+  setup1_finished = true;
 }
 
-bool dactest = false;
+void setup1(){
+}
 
-void loop() {
-  position = ENC.getCumulativePosition();
+uint32_t last = 0;
+volatile int bar = 0;
+volatile int bar_old = -1;
+int set_bar = 0;
+int16_t angle = 0;
+int32_t position_last = 0;
 
-  sd_card_detected = !digitalRead(21);
-  if(sd_card_detected) edge_leds[8] = CRGB(0,10,0);
-  if(!sd_card_detected) edge_leds[8] = CRGB(10,0,0);
+int16_t encdelta_raw = 0;
+int16_t encdeltadiv = 512;
 
-  // EDGE LEDs
-  for (int i = 0; i < 8; i++) {
-    edge_leds[i] = CRGB(config.edge_color.r, config.edge_color.g, config.edge_color.b);
-  }
-  
-  // LED Ring leeren
-  for (int i = 0; i < 48; i++) {
-    ui_leds[i + 3] = CRGB(0, 0, 0);
-  }
+void loop1() {
+  if(setup0_finished && setup1_finished){
+    position = ENC.getCumulativePosition();
+    angle = ENC.readAngle();
+    encdelta_raw += (position - position_last);
 
-  // Rotary button LEDs
-  ui_leds[0] = CRGB(0, 0, 0);
-  ui_leds[1] = CRGB(0, 0, 0);
-  ui_leds[2] = CRGB(0, 0, 0);
+    // Serial.print(encdelta_raw);
+    // Serial.print(" \t");
 
-  // buttonChanged = true when a button is pushed
-  if (buttonChanged) {
-    int buttonValues = TCA.read16();
+    int encdelta = 0;
+    if(abs(encdelta_raw) > encdeltadiv) {
+      encdelta = encdelta_raw > 0 ? 1 : -1;
+      encdelta_raw = 0;
+    }
+
+    // Serial.print(angle);
+    // Serial.print(" \t");
+    // Serial.print(position);
+    // Serial.print(" \t");
+    // Serial.print(position_last);
+    // Serial.print(" \t");
+    // Serial.print(encdelta_raw);
+    // Serial.print(" \t");
+    // Serial.println(encdelta);
+
+    sd_card_detected = !digitalRead(21);
+    edge_leds[8] = sd_card_detected ? CRGB(0,10,0) : CRGB(10,0,0);
+
+    // EDGE LEDs
+    for (int i = 0; i < 8; i++) {
+      edge_leds[i] = CRGB(config.edge_color.r, config.edge_color.g, config.edge_color.b);
+    }
     
-    bool buttonsNew[16] = {false};
-    int buttonsDir[16] = {0};
+    // LED Ring leeren
+    for (int i = 0; i < 48; i++) {
+      ui_leds[i + 3] = CRGB(0, 0, 0);
+    }
 
-    bool buttonUp = false;
-    bool buttonDown = false;
-    for(int i = 0; i < 16; i++){
-      buttonsNew[i] = ~(buttonValues >> i) & 0x01;
-      if(buttonsNew[i] == true && buttons[i] == false) {
-        buttonsDir[i] = 1;
-        buttonDown = true;
+    // Rotary button LEDs
+    ui_leds[0] = CRGB(0, 0, 0);
+    ui_leds[1] = CRGB(0, 0, 0);
+    ui_leds[2] = CRGB(0, 0, 0);
+
+    // buttonChanged = true when a button is pushed
+    if (buttonChanged) {
+      int buttonValues = TCA.read16();
+      
+      bool buttonsNew[16] = {false};
+
+      bool buttonUp = false;
+      bool buttonDown = false;
+
+      for(int i = 0; i < 16; i++){
+        buttonsNew[i] = ~(buttonValues >> i) & 0x01;
+        if(buttonsNew[i] == true && buttons[i] == false) {
+          buttonsDir[i] = -1;
+          buttonDown = true;
+        }
+        if(buttonsNew[i] == false && buttons[i] == true) {
+          buttonsDir[i] = 1;
+          buttonUp = true;
+        }
+        buttons[i] = buttonsNew[i];
       }
-      if(buttonsNew[i] == false && buttons[i] == true) {
-        buttonsDir[i] = -1;
-        buttonUp = true;
+      
+      // Make vibration
+      if(HAPTIC && buttonDown) {
+        vibration.trigger(1, 25, 25);
       }
-      buttons[i] = buttonsNew[i];
+
+      // Make beep
+      if(AURAL && buttonDown) {
+        digitalWrite(7, HIGH);
+        ui_click = true;
+      }
+
+      if(buttons[TEMPO] && buttonDown){
+        state = CTEMPO;
+      }
+
+      if(buttons[BACK] && buttonDown){
+      }
+
+      switch(state){
+        case BANK:
+          encdeltadiv = 512;
+          encdelta_raw = 0;
+          encdelta = 0;
+          if(buttons[SELECT] && buttonDown){
+            state = SAMPLE;
+          }
+          break;
+        case SAMPLE:
+          encdeltadiv = 512;
+          encdelta_raw = 0;
+          encdelta = 0;
+          if(buttons[SELECT] && buttonDown){
+            state = SEQUENCE;
+          }
+          if(buttons[BACK] && buttonDown){
+            state = BANK;
+          }
+          break;
+        case SEQUENCE:
+          encdeltadiv = 256;
+          encdelta_raw = 0;
+          encdelta = 0;
+          if(buttons[SELECT] && buttonDown){
+            int n = steps[set_bar].len;
+            steps[set_bar].samples[n] = &samples[selected_bank*4 + selected_sample];
+            steps[set_bar].len = (steps[set_bar].len + 1) % 4;
+          }
+          if(buttons[BACK] && buttonDown){
+            state = SAMPLE;
+          }
+          break;
+        case CTEMPO:
+          encdeltadiv = 64;
+          encdelta_raw = 0;
+          encdelta = 0;
+          if(buttons[SELECT] && buttonDown){
+            state = BANK;      
+          }
+          if(buttons[BACK] && buttonDown){
+            state = BANK;
+          }
+          break;
+      }
+
+      // Set bar
+      // if(buttons[BACK]) set_bar++;
+      // if(buttons[POWER]) set_bar--;
+    
+      if(buttons[SELECT]){
+        // Flash encoder leds
+        ui_leds[0] = CRGB(0, 100, 50);
+        ui_leds[1] = CRGB(0, 100, 50);
+        ui_leds[2] = CRGB(0, 100, 50);
+      }
+      
+      if(buttons[DEBUG1]) {
+        Serial.println("vol down");
+        codec.volumeDown();
+      }
+
+      if(buttons[DEBUG3]) {
+        Serial.println("vol up");
+        codec.volumeUp();
+      }
+
+      if(buttons[DEBUG2]) {
+        speakerToggle = !speakerToggle;
+        speaker(speakerToggle);
+      }
+
+
+      Serial.println(codec.getVolumeL());
+
+      buttonChanged = false;
+    }
+
+  //  if(position < 0) position += 4096;
+  
+    switch(state){
+      case BANK:
+        selected_bank += encdelta;
+        if(selected_bank == 4) selected_bank = 0;
+        if(selected_bank == -1) selected_bank = 3;
+        break;
+      case SAMPLE:
+        selected_sample += encdelta;
+        if(selected_sample == 4) selected_sample = 0;
+        if(selected_sample == -1) selected_sample = 3;
+        break;
+      case SEQUENCE:
+        set_bar += encdelta;
+        if(set_bar == 16) set_bar = 0;
+        if(set_bar == -1) set_bar = 15;
+        break;
+      case CTEMPO:
+        config.bpm += encdelta;
+        if(config.bpm < 15) config.bpm = 15;
+        if(config.bpm > 300) config.bpm = 300;
+        break;
+    }
+
+
+    //dac.setValue(0, dactest ? 0 : sin((float)millis() / 100.0f) * 32768 + 32768);
+
+    // empty LED matrix
+    for (int i = 0; i < 4; i++) {
+      ui_leds[lut_banks[i]] = CRGB(0, 0, 0);
+      ui_leds[lut_samples[i]] = CRGB(0,0,0);
     }
     
-    // Make vibration
-    if (HAPTIC && buttonDown) {
-      digitalWrite(6, HIGH);
-      delay(50);
-      digitalWrite(6, LOW);
+    // set active LED matrix LED
+    ui_leds[lut_banks[selected_bank]] = CRGB(100, 50, 50);
+    ui_leds[lut_samples[selected_sample]] = CRGB(100, 0, 50);
+
+    for(int i = 0; i < 48; i++){
+      int step = floor(i/3);
+      if(step == set_bar){
+        ui_leds[lut_ring_cw_3[i]] = CRGB(config.ring_color.r_active, config.ring_color.g_active, config.ring_color.b_active);
+      }
+      if(step == bar){
+        ui_leds[lut_ring_cw_3[i]] = CRGB(config.ring_color.r, config.ring_color.g, config.ring_color.b);
+      }
+      if(steps[step].len > 0) {
+        ui_leds[lut_ring_cw_3[i]] = CRGB(0, 10, 0);
+      }
+
     }
 
-    // Make beep
-    if (AURAL && buttonDown) {
-      digitalWrite(7, HIGH);
-      ui_click = true;
+    FastLED.show();
+
+    if(buttonChanged){
+      for(int i = 0; i < 16; i++){
+        if(buttonsDir[i] == 1) buttonsDir[i] = 0;
+      }
     }
 
-    // Flash encoder leds
-    ui_leds[0] = CRGB(0, 100, 50);
-    ui_leds[1] = CRGB(0, 100, 50);
-    ui_leds[2] = CRGB(0, 100, 50);
-
-    // Switch through LED matrix
-    if(buttons[RIGHT]) active++;
-    if(buttons[LEFT]) active--;
-    if(active == 13) active = 0;
-    if(active == -1) active = 12;
-    
-    if(buttons[CVINL]) {
-      Serial.println("vol down");
-      codec.volumeDown();
-    }
-
-    if(buttons[CVOUTL]) {
-      Serial.println("vol up");
-      codec.volumeUp();
-    }
-
-    if(buttons[DEBUG3]) {
-      speakerToggle = !speakerToggle;
-      speaker(speakerToggle);
-    }
-
-    if(buttons[DEBUG2]) {
-      dactest = !dactest;
-      dac.setValue(0, dactest ? 0 : 32768);
-      dac.setValue(1, !dactest ? 0 : 65535);
-    }
-
-    if(buttons[SELECT]){
-      stream[active % NSTREAMS].toggle();
-      ui_beep = true;
-    }
-
-    Serial.println(codec.getVolumeL());
-
-    //for(int i = 0; i < NSTREAMS; i++){
-    //  stream[i].pause();  
-   // }
-    //stream[active % NSTREAMS].play();
-
-    buttonChanged = false;
+    vibration.update();
+    position_last = position;
+    delay(1);
   }
+}
+//int sc = 0;
+int streamcnt = 0;
+void loop(){
+  if(setup1_finished && setup0_finished){
 
-  //dac.setValue(0, dactest ? 0 : sin((float)millis() / 100.0f) * 32768 + 32768);
+    uint32_t delta_bpm = floor((60000 / config.bpm) / 16);
+    uint32_t delta = millis() - last;
 
-  // empty LED matrix
-  for (int i = 0; i < 13; i++) {
-    ui_leds[lut_matrix[i]] = CRGB(0, 0, 0);
-    if(stream[i % NSTREAMS].isPlaying()) ui_leds[lut_matrix[i % NSTREAMS]] = CRGB(0, 50, 0);
-  }
-  
-  // set active LED matrix LED
-  ui_leds[lut_matrix[active]] = CRGB(100, 100, 100);
+    if(delta >= delta_bpm) {
 
-  if(position < 0) position += 4096;
-  active_led_ring = (position / 32) % 48;
-  
-  // set active LED ring LED
-  for(int i = 0; i < active_led_ring; i++){
-    ui_leds[lut_ring_ccw[i]] = CRGB(config.ring_color.r, config.ring_color.g, config.ring_color.b);
-  }
 
-  FastLED.show();
-  if(streams_loaded) {
-    for(int i = 0; i < NSTREAMS; i++){
-      stream[i].stream();
+      bar = (bar + 1) % 16;
+      if(steps[bar].len > 0) {
+        steps[bar].trigger();
+      }
+
+      if(streams_loaded) {
+        for(int i = 0; i < NSTREAMS; i++){
+          Serial.print(stream[i].wavefile.buffer.size());
+          Serial.print("\t");
+        }
+        Serial.println();
+      }
+
+      // Serial.print(delta_bpm);
+      // Serial.print(" ");
+      // Serial.println(delta);
+
+      last = millis();
     }
+
+    if(streams_loaded) {
+      for(int i = 0; i < NSTREAMS; i++){
+        stream[i].streamChunk();
+      }
+    }
+    streamcnt = (streamcnt + 1) % 16;
+
+//    int16_t sample_l = 0;
+//    int16_t sample_r = 0;
+//
+//    if(streams_loaded){
+//      for(int k = 0; k < NSTREAMS; k++){
+//        sample_l += stream[k].get() >> 2;
+//        sample_r += stream[k].get() >> 2;
+//      }
+//    }
+//
+//    int16_t l = 0, r = 0;
+//    i2s.read16(&l, &r);
+//    l += sample_l;
+//    r += sample_r;
+//    i2s.write16(l, r);
+
+    if(i2s.getOverflow()) Serial.println("overflow");
+    if(i2s.getUnderflow()) Serial.println("underflow");
+
+    bar_old = bar;
+
   }
+}
 
-  if(i2s.getOverflow()) Serial.println("overflow");
-  if(i2s.getUnderflow()) Serial.println("underflow");
 
-  //delay(20); // wait 1ms
-
-}

soundcube-firmware/wavestream.h

@@ -74,16 +74,53 @@ struct WaveFile{
     return true;
   }
   
-  void readblock(){
+  bool readblock(){
     uint8_t samplebyte[blockalign];
 
     file.read(samplebyte, blockalign);
+
     if(!file.available() && loop) file.seek(44, SeekSet);
+    if(!file.available() && !loop) {
+      file.seek(44, SeekSet);
+      return false;
+    }
     
     for(int i = 0; i < blockalign; i+=2){
       int16_t sample = (samplebyte[i+1] << 8) + samplebyte[i];
       buffer.push(sample);
     }
+    return true;
+  }
+
+  bool readblockDMA(){
+    void *bufferStart = buffer.getWritePointer();
+
+    file.read((uint8_t*)bufferStart, 4);
+	  buffer.advance(4);
+
+    if(!file.available() && loop) file.seek(44, SeekSet);
+    if(!file.available() && !loop) {
+      file.seek(44, SeekSet);
+      return false;
+    }    
+    return true;
+  }
+
+  bool readblockSD(){
+    void *bufferStart = buffer.getWritePointer();
+    remains = buffer.remains();
+
+    if(remains > 512){
+      adv = file.readBytes((char*)bufferStart, 512);
+      buffer.advance(adv);
+
+      if(!file.available() && loop) file.seek(44, SeekSet);
+      if(!file.available() && !loop) {
+        file.seek(44, SeekSet);
+        return false;
+      }    
+    }
+    return true;
   }
 
   int16_t get(){
@@ -94,6 +131,10 @@ struct WaveFile{
     file.seek(44, SeekSet);
   }
 
+  void reset(){
+    file.seek(44, SeekSet);
+  }
+
   bool loop = false;
   uint16_t format = 0;
   uint32_t length = 0;  
@@ -102,7 +143,10 @@ struct WaveFile{
   uint16_t blockalign = 0;
   uint16_t bitspersample = 0;
 
-  RingBuffer<int16_t> buffer;
+  int adv = 0;
+  int remains = 0;
+
+  RingBuffer buffer;
 };
 
 class WaveStream{
@@ -110,7 +154,7 @@ class WaveStream{
     WaveStream(){}
 
     void begin(){
-      wavefile.buffer.setSize(24000);
+      wavefile.buffer.setSize(2048);
       wavefile.buffer.begin();
     }
 
@@ -121,7 +165,10 @@ class WaveStream{
 
     void toggle(){playing = !playing;}
 
-    void play(){playing = true;}
+    void play(bool reset = false){
+      if(reset) wavefile.reset();
+      playing = true;
+    }
 
     void stop(){
       playing = false;
@@ -131,19 +178,35 @@ class WaveStream{
     void pause(){playing = false;}
 
     void stream(){
-      if(!wavefile.buffer.isFull() && playing){
-        int cnt = 0;
-        while (!wavefile.buffer.isFull() && cnt < 6000) {
-          wavefile.readblock();
-          cnt++;
-        }
+      int cnt = 0;
+      while (!wavefile.buffer.isFull() && cnt < 1024) {
+        bool ok = wavefile.readblockDMA();
+        if(!ok) playing = false;
+        cnt += 2;
       }
     }
-    
+
+    void streamChunk(){
+      if(!wavefile.buffer.isFull()){
+        bool ok = wavefile.readblockSD();
+        if(!ok) playing = false;
+      }
+    }
+
     int16_t get(){
       return playing ? wavefile.get() : 0;
     }
 
+    int16_t* getPointer(){
+      int16_t* p = wavefile.buffer.getReadPointer();
+      wavefile.buffer.pointerPop(2);
+      return p;
+    }
+
+    void getDMA(int32_t *samples){
+      if(playing) wavefile.buffer.popDMA(samples);
+    }
+
     bool isPlaying(){
       return playing;
     }
@@ -155,4 +218,4 @@ class WaveStream{
     bool playing = false;
 
 
-};
+};