Cascade: multiply TOPAVG and BOTAVG outputs by 10

alefnull · alefnull · commit 9584513198a6 · 2022-09-05T00:23:50.000-04:00
diff --git a/src/funcgen.cpp b/src/funcgen.cpp
@@ -326,7 +326,7 @@ struct Funcgen : Module {
 				max_b = envelope[i].env;
 			}
 		}
-		outputs[TOPAVG_OUTPUT].setVoltage((max_a + max_b) / 2.f);
+		outputs[TOPAVG_OUTPUT].setVoltage((max_a * 10 + max_b * 10) / 2);
 
 		// find the two channels with the lowest amplitude
 		float min_a = 10.f;
@@ -340,7 +340,7 @@ struct Funcgen : Module {
 				min_b = envelope[i].env;
 			}
 		}
-		outputs[BOTAVG_OUTPUT].setVoltage((min_a + min_b) / 2.f);
+		outputs[BOTAVG_OUTPUT].setVoltage((min_a * 10 + min_b * 10) / 2);
 
 		for (int i = 0; i < CHANNEL_COUNT; i++) {
 			lights[OUTPUT_LIGHT + i].setBrightness(envelope[i].env);

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ struct Funcgen : Module {`
`326`	`326`	`max_b = envelope[i].env;`
`327`	`327`	`}`
`328`	`328`	`}`
`329`		`- outputs[TOPAVG_OUTPUT].setVoltage((max_a + max_b) / 2.f);`
	`329`	`+ outputs[TOPAVG_OUTPUT].setVoltage((max_a * 10 + max_b * 10) / 2);`
`330`	`330`
`331`	`331`	`// find the two channels with the lowest amplitude`
`332`	`332`	`float min_a = 10.f;`
`@@ -340,7 +340,7 @@ struct Funcgen : Module {`
`340`	`340`	`min_b = envelope[i].env;`
`341`	`341`	`}`
`342`	`342`	`}`
`343`		`- outputs[BOTAVG_OUTPUT].setVoltage((min_a + min_b) / 2.f);`
	`343`	`+ outputs[BOTAVG_OUTPUT].setVoltage((min_a * 10 + min_b * 10) / 2);`
`344`	`344`
`345`	`345`	`for (int i = 0; i < CHANNEL_COUNT; i++) {`
`346`	`346`	`lights[OUTPUT_LIGHT + i].setBrightness(envelope[i].env);`