From 6d0cc690ead455ef61abe24a38b36eea9adab956 Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Tue, 8 Jun 2021 22:08:04 -0400
Subject: [PATCH] Fix Rogan6PSWhite on Frames and Warps.

---
 src/Frames.cpp | 13 ++++---------
 src/Warps.cpp  | 15 +++------------
 src/plugin.hpp |  8 ++++++++
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/Frames.cpp b/src/Frames.cpp
index 4618727..b13ecc3 100644
--- a/src/Frames.cpp
+++ b/src/Frames.cpp
@@ -195,8 +195,8 @@ struct Frames : Module {
 			colors = keyframer.color();
 		}
 		for (int i = 0; i < 3; i++) {
-			float c = colors[i] / 255.0;
-			c = 1.0 - (1.0 - c) * 1.25;
+			float c = colors[i] / 255.f;
+			// c = 1.f - (1.f - c) * 1.25f;
 			lights[FRAME_LIGHT + i].setBrightness(c);
 		}
 	}
@@ -301,7 +301,7 @@ struct FramesWidget : ModuleWidget {
 		addParam(createParam<Rogan1PSWhite>(Vec(81, 52), module, Frames::GAIN2_PARAM));
 		addParam(createParam<Rogan1PSWhite>(Vec(149, 52), module, Frames::GAIN3_PARAM));
 		addParam(createParam<Rogan1PSWhite>(Vec(216, 52), module, Frames::GAIN4_PARAM));
-		addParam(createParam<Rogan6PSWhite>(Vec(89, 115), module, Frames::FRAME_PARAM));
+		addParam(createParamCentered<Rogan6PSWhite>(Vec(133.556641, 159.560532), module, Frames::FRAME_PARAM));
 		addParam(createParam<Rogan1PSGreen>(Vec(208, 141), module, Frames::MODULATION_PARAM));
 		addParam(createParam<CKD6>(Vec(19, 123), module, Frames::ADD_PARAM));
 		addParam(createParam<CKD6>(Vec(19, 172), module, Frames::DEL_PARAM));
@@ -327,12 +327,7 @@ struct FramesWidget : ModuleWidget {
 		addChild(createLight<SmallLight<GreenLight>>(Vec(232, 101), module, Frames::GAIN1_LIGHT + 3));
 		addChild(createLight<MediumLight<GreenLight>>(Vec(61, 155), module, Frames::EDIT_LIGHT));
 
-		struct FrameLight : RedGreenBlueLight {
-			FrameLight() {
-				box.size = Vec(71, 71);
-			}
-		};
-		addChild(createLight<FrameLight>(Vec(100, 126), module, Frames::FRAME_LIGHT));
+		addChild(createLightCentered<Rogan6PSLight<RedGreenBlueLight>>(Vec(133.556641, 159.560532), module, Frames::FRAME_LIGHT));
 	}
 
 	void appendContextMenu(Menu* menu) override {
diff --git a/src/Warps.cpp b/src/Warps.cpp
index 2246d3e..15cac55 100644
--- a/src/Warps.cpp
+++ b/src/Warps.cpp
@@ -70,7 +70,7 @@ struct Warps : Module {
 			{
 				// TODO
 				// Use the correct light color
-				NVGcolor algorithmColor = nvgHSL(p->modulation_algorithm, 0.3, 0.4);
+				NVGcolor algorithmColor = nvgHSL(p->modulation_algorithm, 1.0, 0.5);
 				lights[ALGORITHM_LIGHT + 0].setBrightness(algorithmColor.r);
 				lights[ALGORITHM_LIGHT + 1].setBrightness(algorithmColor.g);
 				lights[ALGORITHM_LIGHT + 2].setBrightness(algorithmColor.b);
@@ -120,13 +120,6 @@ struct Warps : Module {
 };
 
 
-struct AlgorithmLight : RedGreenBlueLight {
-	AlgorithmLight() {
-		box.size = Vec(71, 71);
-	}
-};
-
-
 struct WarpsWidget : ModuleWidget {
 	WarpsWidget(Warps* module) {
 		setModule(module);
@@ -137,8 +130,7 @@ struct WarpsWidget : ModuleWidget {
 		addChild(createWidget<ScrewSilver>(Vec(15, 365)));
 		addChild(createWidget<ScrewSilver>(Vec(120, 365)));
 
-		addParam(createParam<Rogan6PSWhite>(Vec(29, 52), module, Warps::ALGORITHM_PARAM));
-
+		addParam(createParamCentered<Rogan6PSWhite>(Vec(73.556641, 96.560532), module, Warps::ALGORITHM_PARAM));
 		addParam(createParam<Rogan1PSWhite>(Vec(94, 173), module, Warps::TIMBRE_PARAM));
 		addParam(createParam<TL1105>(Vec(16, 182), module, Warps::STATE_PARAM));
 		addParam(createParam<Trimpot>(Vec(14, 213), module, Warps::LEVEL1_PARAM));
@@ -155,8 +147,7 @@ struct WarpsWidget : ModuleWidget {
 		addOutput(createOutput<PJ301MPort>(Vec(116, 316), module, Warps::AUX_OUTPUT));
 
 		addChild(createLight<SmallLight<GreenRedLight>>(Vec(21, 167), module, Warps::CARRIER_GREEN_LIGHT));
-
-		addChild(createLight<AlgorithmLight>(Vec(40, 63), module, Warps::ALGORITHM_LIGHT));
+		addChild(createLightCentered<Rogan6PSLight<RedGreenBlueLight>>(Vec(73.556641, 96.560532), module, Warps::ALGORITHM_LIGHT));
 	}
 };
 
diff --git a/src/plugin.hpp b/src/plugin.hpp
index d3a7e32..40a2124 100644
--- a/src/plugin.hpp
+++ b/src/plugin.hpp
@@ -26,3 +26,11 @@ extern Model* modelMarbles;
 extern Model* modelRipples;
 extern Model* modelShelves;
 extern Model* modelStreams;
+
+
+template <typename Base>
+struct Rogan6PSLight : Base {
+	Rogan6PSLight() {
+		this->box.size = mm2px(Vec(23.04, 23.04));
+	}
+};