issue #3 fix

Corrected location of functions and variable declarations.

src/CatroModulo.hpp

@@ -1,4 +1,5 @@
 #include "rack.hpp"
+#include "dsp/digital.hpp"
 
 using namespace rack;
 
@@ -178,3 +179,224 @@ struct CM_Slider_big_red : SVGSlider {
 		setSVGs(SVG::load(assetPlugin(plugin, "res/CM-slider_big_red_bg.svg")), SVG::load(assetPlugin(plugin, "res/CM-slider_big_red.svg")));
 	}
 };
+
+//classes
+
+//SELECT sequencer
+struct CM_SelSeq {
+	private:
+	SchmittTrigger stepTrigger;
+	SchmittTrigger resetTrigger;
+	int patterns[16][16] = {};
+	bool dostep = true;
+	float recsel = 0.0f;
+
+	public:
+	int astep = 0;
+	bool patternized = false;
+
+	//sequencer built-in patterns
+ 	void patternize(){
+
+		int pat0[16] =  {0,1,2,3,4,5,6,7,0,1,2,3,4,5,6,7};
+		int pat1[16] =  {0,7,6,5,4,3,2,1,0,7,6,5,4,3,2,1};
+		int pat2[16] =  {0,-1,1,-1,2,-1,3,-1,4,-1,5,-1,6,-1,7,-1};
+		int pat3[16] =  {0,-1,7,-1,6,-1,5,-1,4,-1,3,-1,2,-1,1,-1};
+
+		int pat4[16] =  {0,2,6,4,1,3,7,5,0,2,6,4,1,3,7,5};
+		int pat5[16] =  {0,2,4,6,1,3,5,7,0,2,4,6,1,3,5,7};
+		int pat6[16] =  {0,2,1,3,2,4,3,5,4,6,5,7,6,0,7,1};
+		int pat7[16] =  {0,3,1,4,2,5,3,6,4,7,5,0,6,1,7,2};
+
+		int pat8[16] =  {0,1,2,3,4,5,6,7,7,6,5,4,3,2,1,0};
+		int pat9[16] =  {0,1,2,3,4,3,2,1,0,1,2,3,4,3,2,1};
+		int pat10[16] = {0,1,2,3,2,1,0,1,2,3,2,1,0,1,2,3};
+		int pat11[16] = {0,4,1,5,2,6,3,7,4,0,5,1,6,2,7,3};
+
+		int pat12[16] = {0,1,2,3,1,2,3,4,2,3,4,5,3,4,5,6};
+		int pat13[16] = {0,1,2,1,2,3,2,3,4,3,4,5,4,5,6,5};
+		int pat14[16] = {7,5,6,4,5,3,4,2,1,3,2,4,3,5,4,6};
+		int pat15[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+
+
+		for (int i = 0; i < 16; i++){
+		 patterns[0][i] = pat0[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[1][i] = pat1[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[2][i] = pat2[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[3][i] = pat3[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[4][i] = pat4[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[5][i] = pat5[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[6][i] = pat6[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[7][i] = pat7[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[8][i] = pat8[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[9][i] = pat9[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[10][i] = pat10[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[11][i] = pat11[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[12][i] = pat12[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[13][i] = pat13[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[14][i] = pat14[i];
+		}
+		for (int i = 0; i < 16; i++){
+		 patterns[15][i] = pat15[i];
+		}
+		patternized = true;
+	}
+
+	void reset(float ireset){
+		if (resetTrigger.process(ireset)) {
+			astep = 0;
+			dostep = true;
+		}
+	}
+
+	void step(float istep, float len){
+		if (stepTrigger.process(istep)) {
+			if(astep < len && len <= 16){astep++;}else{astep = 0;}
+			dostep = true;
+		}
+	}
+
+	//Main sequencer function
+	float sequence(int pat){
+		if (dostep == true){
+			if (pat == 15){
+				recsel = rand() % 8;
+			}else{
+				recsel = patterns[pat][astep];
+			}
+			dostep = false;
+		}
+		return recsel;
+	}
+
+};
+
+//CV recorder order: scan, mix, output
+struct CM_Recorder {
+	private:
+	float store[8][8] = {};
+	float call[8] = {};
+	float out[8] = {};
+	float lastselect = -1.0;
+	float lastscan = -1.0;
+	SchmittTrigger randomTrigger;
+
+	public:
+	void reset(){
+		lastselect = -1.0;
+	}
+
+	void randomize(){
+		srand(time(NULL));
+	}
+
+	//Save
+	float save(int i, int j){
+		return store[i][j];
+	}
+
+	//Load
+	void load(int i, int j, float val){
+		store[i][j] = val;
+	}
+
+	//store recording
+	void record(float *eyeval, int i){
+		for (int j = 0; j < 8; j++) {
+			store[i][j] = eyeval[j];
+		}
+		reset();
+	}
+
+	//randomize recordings
+	void tryme(float dotry){
+		if (randomTrigger.process(dotry)){
+			for (int i = 0; i < 8; i++){
+				for (int j = 0; j < 8; j++) {
+					rand(); rand(); //call random twice to get more random
+					store[i][j] = ((double) rand() / (RAND_MAX)); 
+				}
+			}
+			reset();
+		}
+	}
+
+	//selector scanning
+	void scan(float select, float scanner){
+		if (scanner == 0.0){
+			if (select > 7.5){
+				select = 0.0;
+			}else{
+			select = roundf(select);
+			}
+		}
+		if (scanner != lastscan){
+			reset();
+		}
+
+		if (select != lastselect){
+			for (int i = 0; i < 8; i++) {
+				if (select < (i + 1.0)){
+					if (i == 7){
+						for (int j = 0; j < 8; j++) {
+							call[j] = (store[i][j] * (1.0f - (select - i)) + (store[0][j] * (select - i)));
+						}
+						i = 9;
+					}else{
+						for (int j = 0; j < 8; j++) {
+							call[j] = (store[i][j] * (1.0f - (select - i)) + (store[i+1][j] * (select - i)));
+						}
+						i = 9;
+					}
+				}
+			}	
+			lastselect = select;
+		}
+		lastscan = scanner;
+	}
+
+	//mix amount is between -1.0 and 1.0
+	void mix(float *eyeval, float amount){
+		if (amount >= 0.0f){
+			for (int i = 0; i < 8; i++) {
+				out[i] = (eyeval[i] * (1.0f - amount) + call[i] * amount);
+			}
+		}else{
+			for (int i = 0; i < 8; i++) {
+				out[i] = (eyeval[i] * call[i] * (0.0 - amount)) + (eyeval[i] * (1.0f + amount));
+			}
+		}
+	}
+
+	float output(int index){
+		return out[index] * 10.0f;
+	}
+};