Merge branch 'master' of github.com:bogaudio/BogaudioModules

bogaudio · Apr 24, 2020 · 3fc62e1 · 3fc62e1
2 parents ebec493 + 4b69cd6
commit 3fc62e1
Show file tree

Hide file tree

Showing 22 changed files with 173 additions and 54 deletions.
diff --git a/README.md b/README.md
diff --git a/doc/www/effects.png → doc/www/dynamics.png b/doc/www/effects.png → doc/www/dynamics.png
diff --git a/doc/www/filters.png b/doc/www/filters.png
diff --git a/doc/www/mixers1.png b/doc/www/mixers1.png
diff --git a/doc/www/mixers3.png b/doc/www/mixers3.png
diff --git a/doc/www/mixers4.png b/doc/www/mixers4.png
diff --git a/doc/www/mixers5.png b/doc/www/mixers5.png
diff --git a/doc/www/modules2.png b/doc/www/modules2.png
diff --git a/doc/www/modules3.png b/doc/www/modules3.png
diff --git a/doc/www/modules4.png b/doc/www/modules4.png
diff --git a/doc/www/modules5.png b/doc/www/modules5.png
diff --git a/doc/www/poly.png b/doc/www/poly.png
diff --git a/doc/www/poly1.png b/doc/www/poly1.png
diff --git a/doc/www/poly2.png b/doc/www/poly2.png
diff --git a/doc/www/sequencers.png → doc/www/sequencers1.png b/doc/www/sequencers.png → doc/www/sequencers1.png
diff --git a/doc/www/sequencers2.png b/doc/www/sequencers2.png
diff --git a/doc/www/utilities.png b/doc/www/utilities.png
diff --git a/doc/www/vcas.png b/doc/www/vcas.png
diff --git a/plugin.json b/plugin.json
@@ -1,7 +1,7 @@
 {
   "slug": "Bogaudio",
   "name": "Bogaudio",
-  "version": "1.1.28",
+  "version": "1.1.29",
   "license": "GPL-3.0-or-later",
   "brand": "Bogaudio",
   "author": "Matt Demanett",

diff --git a/scripts/make_screenshots.rb b/scripts/make_screenshots.rb
@@ -18,34 +18,35 @@
     file: 'modules2.png',
     crop: false,
     rows: [
-      ['VCF', 'LVCF', 'FFB', 'EQ'],
+      ['VCF', 'LVCF', 'FFB', 'EQ', 'EQS'],
       ['DADSRH', 'DADSRHPlus', 'Shaper', 'ShaperPlus', 'AD', 'ASR', 'ADSR', 'Follow', 'DGate', 'Edge']
     ]
   },
   {
     file: 'modules3.png',
     crop: false,
     rows: [
-      ['Mix8', 'Mix4', 'Mix1', 'VCM', 'Mute8', '-', 'Pan', 'XFade', '-', 'VCA', 'VCAmp'],
-      ['UMix', 'Mumix', '-', 'Matrix44', 'Matrix88'],
+      ['Mix8', 'Mix8x', 'Mute8'],
+      ['Mix4', 'Mix4x', 'Mix1', 'VCM', 'Pan', 'XFade'],
+      ['UMix', 'Mumix', 'Matrix44', 'Matrix88'],
       ['Switch44', 'Switch88', 'Switch1616']
     ]
   },
   {
     file: 'modules4.png',
     crop: false,
     rows: [
-      ['AMRM', 'Pressor', 'Lmtr', 'Nsgt'],
-      ['Noise', 'SampleHold', 'Walk2', 'Walk', '-', 'EightOne', 'OneEight', 'AddrSeq'],
+      ['VCA', 'VCAmp', '-', 'AMRM', 'Pressor', 'Lmtr', 'Nsgt'],
+      ['Noise', 'SampleHold', 'Walk2', 'Walk', '-', 'EightOne', 'OneEight', 'AddrSeq', 'PGMR', 'PGMRX'],
       ['VU', 'Analyzer', 'AnalyzerXL']
     ]
   },
   {
     file: 'modules5.png',
     crop: false,
     rows: [
-      ['Mono', 'Arp', 'Assign', 'Unison', 'PolyCon', 'PolyMult', '-', 'Detune', 'Stack', 'Reftone'],
-      ['Bool', 'Cmp', 'CVD', 'FlipFlop', 'Manual', 'Mult', 'Offset', 'Slew', 'Sums', 'Switch', '-', 'Blank3', 'Blank6']
+      ['Mono', 'Arp', 'Assign', 'Unison', 'PolyCon', 'PolyCon8', 'PolyOff16', 'PolyOff8', 'PolyMult', '-', 'Detune', 'Stack', 'Reftone'],
+      ['Bool', 'Cmp', 'CVD', 'FlipFlop', 'Inv', 'Manual', 'Mult', 'Offset', 'Slew', 'Sums', 'Switch', '-', 'Blank3', 'Blank6']
     ]
   },
 
@@ -74,7 +75,7 @@
     file: 'filters.png',
     crop: true,
     rows: [
-      ['VCF', 'LVCF', 'FFB', 'EQ']
+      ['VCF', 'LVCF', 'FFB', 'EQ', 'EQS']
     ]
   },
   {
@@ -109,7 +110,7 @@
     file: 'mixers1.png',
     crop: true,
     rows: [
-      ['Mix8', 'Mix4', 'Mix1']
+      ['Mix8', 'Mix8x', 'Mix4', 'Mix4x', 'Mix1']
     ]
   },
   {
@@ -123,37 +124,44 @@
     file: 'mixers3.png',
     crop: true,
     rows: [
-      ['VCA', 'VCAmp']
+      ['UMix', 'Mumix', 'Matrix44', 'Matrix88']
     ]
   },
   {
     file: 'mixers4.png',
     crop: true,
     rows: [
-      ['UMix', 'Mumix', 'Matrix44', 'Matrix88']
+      ['Switch44', 'Switch88', 'Switch1616']
     ]
   },
   {
-    file: 'mixers5.png',
+    file: 'vcas.png',
     crop: true,
     rows: [
-      ['Switch44', 'Switch88', 'Switch1616']
+      ['VCA', 'VCAmp']
     ]
   },
   {
-    file: 'effects.png',
+    file: 'dynamics.png',
     crop: true,
     rows: [
       ['AMRM', 'Pressor', 'Lmtr', 'Nsgt']
     ]
   },
   {
-    file: 'sequencers.png',
+    file: 'sequencers1.png',
     crop: true,
     rows: [
       ['EightOne', 'OneEight', 'AddrSeq']
     ]
   },
+  {
+    file: 'sequencers2.png',
+    crop: true,
+    rows: [
+      ['PGMR', 'PGMRX']
+    ]
+  },
   {
     file: 'visualizers.png',
     crop: true,
@@ -162,10 +170,17 @@
     ]
   },
   {
-    file: 'poly.png',
+    file: 'poly1.png',
+    crop: true,
+    rows: [
+      ['Mono', 'Arp', 'Assign', 'Unison']
+    ]
+  },
+  {
+    file: 'poly2.png',
     crop: true,
     rows: [
-      ['Mono', 'Arp', 'Assign', 'Unison', 'PolyCon', 'PolyMult']
+      ['PolyCon', 'Polycon8', 'PolyOff16', 'PolyOff8', 'PolyMult']
     ]
   },
   {
@@ -179,7 +194,7 @@
     file: 'utilities.png',
     crop: true,
     rows: [
-      ['Bool', 'Cmp', 'CVD', 'FlipFlop', 'Manual', 'Mult', 'Offset', 'Slew', 'Sums', 'Switch']
+      ['Bool', 'Cmp', 'CVD', 'FlipFlop', 'Inv', 'Manual', 'Mult', 'Offset', 'Slew', 'Sums', 'Switch']
     ]
   },
   {

diff --git a/src/addressable_sequence.cpp b/src/addressable_sequence.cpp
@@ -93,7 +93,7 @@ int AddressableSequenceModule::nextStep(
 	_step[c] += (_step[c] < 0) * steps;
 	_step[c] -= _step[c] * reset;
 
-	float select = 0;
+	float select = n;
 	if (selectParam) {
 		select = clamp(selectParam->getValue(), 0.0f, (float)(n - 1));
 	}

diff --git a/src/addressable_sequence.hpp b/src/addressable_sequence.hpp
@@ -58,6 +58,7 @@ struct AddressableSequenceBaseModuleWidget : ModuleWidget {
 		OptionsMenuItem::addToMenu(p, menu);
 
 		menu->addChild(new BoolOptionMenuItem("Reverse step on negative clock", [m]() { return &m->_reverseOnNegativeClock; }));
+		menu->addChild(new BoolOptionMenuItem("Triggered select mode", [m]() { return &m->_triggeredSelect; }));
 	}
 };
 
@@ -68,7 +69,6 @@ struct AddressableSequenceModuleWidget : AddressableSequenceBaseModuleWidget {
 		AddressableSequenceModule* m = dynamic_cast<AddressableSequenceModule*>(module);
 		assert(m);
 		menu->addChild(new BoolOptionMenuItem("Select on clock mode", [m]() { return &m->_selectOnClock; }));
-		menu->addChild(new BoolOptionMenuItem("Triggered select mode", [m]() { return &m->_triggeredSelect; }));
 	}
 };