added generative per track parameters

Author: midilab

v2/AciduinoV2/AciduinoV2.ino

@@ -55,14 +55,26 @@ bool _playing = false;
 uint8_t _selected_track = 0;
 
 // generative engine ui data
-uint8_t _generative_fill = 80;
-uint8_t _accent_probability = 50;
-uint8_t _roll_probability = 0;
-uint8_t _slide_probability = 30;
-uint8_t _tie_probability = 100;
-uint8_t _lower_octave = 2;
-uint8_t _range_octave = 3;
-uint8_t _number_of_tones = 5;
+typedef struct
+{
+  uint8_t generative_fill = 80;
+  uint8_t accent_probability = 50;
+  uint8_t slide_probability = 30;
+  uint8_t tie_probability = 100;
+  uint8_t lower_octave = 2;
+  uint8_t range_octave = 3;
+  uint8_t number_of_tones = 5;
+} GENERATIVE_303_DATA; 
+
+typedef struct
+{
+  uint8_t generative_fill = 80;
+  uint8_t accent_probability = 50;
+  uint8_t roll_probability = 0;
+} GENERATIVE_808_DATA; 
+
+GENERATIVE_303_DATA generative_303[TRACK_NUMBER_303];
+GENERATIVE_808_DATA generative_808[TRACK_NUMBER_808];
 
 #if defined(USE_LITE_BOARD)
 

v2/AciduinoV2/acid_ui_components.ino

@@ -920,90 +920,92 @@ struct TrackTune : PageComponent {
 struct TonesNumber : PageComponent {
 
     void view() {
-      genericOptionView("tones", _number_of_tones, line, col, selected);
+      genericOptionView("tones", generative_303[_selected_track].number_of_tones, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 1, 7, _number_of_tones);
-      _number_of_tones = data;
+      data = parseData(data, 1, 7, generative_303[_selected_track].number_of_tones);
+      generative_303[_selected_track].number_of_tones = data;
     }
 
 } tonesNumberComponent;
 
 struct LowOctave : PageComponent {
 
     void view() {
-      genericOptionView("octave", _lower_octave, line, col, selected);
+      genericOptionView("octave", generative_303[_selected_track].lower_octave, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 1, 11, _lower_octave);
-      _lower_octave = data;
+      data = parseData(data, 1, 11, generative_303[_selected_track].lower_octave);
+      generative_303[_selected_track].lower_octave = data;
     }
 
 } lowOctaveComponent;
 
 struct RangeOctave : PageComponent {
 
     void view() {
-      genericOptionView("octaves", _range_octave, line, col, selected);
+      genericOptionView("octaves", generative_303[_selected_track].range_octave, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 1, 11, _range_octave);
-      _range_octave = data;
+      data = parseData(data, 1, 11, generative_303[_selected_track].range_octave);
+      generative_303[_selected_track].range_octave = data;
     }
 
 } rangeOctaveComponent;
 
 struct AccentAmount : PageComponent {
 
     void view() {
-      genericOptionView("accent", _accent_probability, line, col, selected);
+      uint8_t accent_probability = AcidSequencer.is303(_selected_track) ? generative_303[_selected_track].accent_probability : generative_808[_selected_track-TRACK_NUMBER_303].accent_probability; 
+      genericOptionView("accent", accent_probability, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 0, 100, _accent_probability);
-      _accent_probability = data;
+      uint8_t * accent_probability = AcidSequencer.is303(_selected_track) ? &generative_303[_selected_track].accent_probability : &generative_808[_selected_track-TRACK_NUMBER_303].accent_probability; 
+      data = parseData(data, 0, 100, *accent_probability);
+      *accent_probability = data;
     }
-    
+
 } accentAmountComponent;
 
 struct SlideAmount : PageComponent {
 
     void view() {
-      genericOptionView("slide", _slide_probability, line, col, selected);
+      genericOptionView("slide", generative_303[_selected_track].slide_probability, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 0, 100, _slide_probability);
-      _slide_probability = data;
+      data = parseData(data, 0, 100, generative_303[_selected_track].slide_probability);
+      generative_303[_selected_track].slide_probability = data;
     }
 
 } slideAmountComponent;
 
 struct TieAmount : PageComponent {
 
     void view() {
-      genericOptionView("tie", _tie_probability, line, col, selected);
+      genericOptionView("tie", generative_303[_selected_track].tie_probability, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 0, 100, _tie_probability);
-      _tie_probability = data;
+      data = parseData(data, 0, 100, generative_303[_selected_track].tie_probability);
+      generative_303[_selected_track].tie_probability = data;
     }
 
 } tieAmountComponent;
 
 struct RollAmount : PageComponent {
 
     void view() {
-      genericOptionView("roll", _roll_probability, line, col, selected);
+      genericOptionView("roll", generative_808[_selected_track-TRACK_NUMBER_303].roll_probability, line, col, selected);
     }
 
     void change(int16_t data) {
-      data = parseData(data, 0, 100, _roll_probability);
-      _roll_probability = data;
+      data = parseData(data, 0, 100, generative_808[_selected_track-TRACK_NUMBER_303].roll_probability);
+      generative_808[_selected_track-TRACK_NUMBER_303].roll_probability = data;
     }
 
 } rollAmountComponent;
@@ -1034,13 +1036,15 @@ struct TrackFill : PageComponent {
     }
 
     void view() {
-      genericOptionView("fill", _generative_fill, line, col, selected, true);
+      uint8_t generative_fill = AcidSequencer.is303(_selected_track) ? generative_303[_selected_track].generative_fill : generative_808[_selected_track-TRACK_NUMBER_303].generative_fill; 
+      genericOptionView("fill", generative_fill, line, col, selected, true);
     }
 
     void change(int16_t data) {
       //clearStackNote(_selected_track);
-      data = parseData(data, 1, 100, _generative_fill);
-      _generative_fill = data;
+      uint8_t * generative_fill = AcidSequencer.is303(_selected_track) ? &generative_303[_selected_track].generative_fill : &generative_808[_selected_track-TRACK_NUMBER_303].generative_fill; 
+      data = parseData(data, 1, 100, *generative_fill);
+      *generative_fill = data;
     }
 
 } fillComponent;

v2/AciduinoV2/page_generative.ino

@@ -10,12 +10,12 @@ void generativeFunction1()
 }
 
 void generativeFunction2()
-{
+{ 
   // generate new sequence
   if (AcidSequencer.is303(_selected_track)) {
-    AcidSequencer.acidRandomize(_selected_track, _generative_fill, _accent_probability, _slide_probability, _tie_probability, _number_of_tones, _lower_octave*12, _range_octave*12);
+    AcidSequencer.acidRandomize(_selected_track, generative_303[_selected_track].generative_fill, generative_303[_selected_track].accent_probability, generative_303[_selected_track].slide_probability, generative_303[_selected_track].tie_probability, generative_303[_selected_track].number_of_tones, generative_303[_selected_track].lower_octave*12, generative_303[_selected_track].range_octave*12);
   } else {
-    AcidSequencer.acidRandomize(_selected_track, _generative_fill, _accent_probability, _roll_probability);
+    AcidSequencer.acidRandomize(_selected_track, generative_808[_selected_track-TRACK_NUMBER_303].generative_fill, generative_808[_selected_track-TRACK_NUMBER_303].accent_probability, generative_808[_selected_track-TRACK_NUMBER_303].roll_probability);
   }
 }