Merge pull request #149 from 4ms/nlc-port

Port Nonlinear Circuits modules
4ms · Nov 18, 2023 · bec3021 · bec3021
2 parents 37587e3 + 828b87c
commit bec3021
Show file tree

Hide file tree

Showing 103 changed files with 13,922 additions and 22 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "firmware/src/wifi/flat"]
 	path = firmware/src/wifi/flat
 	url = https://github.com/4ms/metamodule-bridge-protocol.git
+[submodule "firmware/vcv_ports/nonlinearcircuits"]
+	path = firmware/vcv_ports/nonlinearcircuits
+	url = https://github.com/mhetrick/nonlinearcircuits
diff --git a/firmware/src/VCV_adaptor/app/Menu.hpp b/firmware/src/VCV_adaptor/app/Menu.hpp
@@ -1,20 +1,29 @@
 #pragma once
 #include "VCV_adaptor/events.hh"
+#include "VCV_adaptor/widget/Widget.hh"
+#include <string>
 
 namespace rack::ui
 {
-struct Menu {
-	void addChild(Menu *) {
-	}
+
+struct Menu : widget::OpaqueWidget {
+
 	virtual Menu *createChildMenu() {
 		return nullptr;
 	}
-	virtual void onAction(const event::Action &e) {
-	}
 };
 
-struct MenuSeparator : Menu {};
+struct MenuEntry : widget::OpaqueWidget {};
 
-struct MenuLabel : Menu {};
-struct MenuItem : Menu {};
+struct MenuSeparator : MenuEntry {};
+
+struct MenuLabel : MenuEntry {
+	std::string text;
+};
+
+struct MenuItem : MenuEntry {
+	std::string text;
+	std::string rightText;
+	bool disabled = false;
+};
 } // namespace rack::ui
diff --git a/firmware/src/VCV_adaptor/app/SvgPanel.hpp b/firmware/src/VCV_adaptor/app/SvgPanel.hpp
@@ -14,8 +14,7 @@ struct SvgPanel : widget::Widget {
 	PanelBorder *panelBorder;
 	window::Svg *svg;
 
-	void step() override;
-	void setBackground(window::Svg *svg) {
+	void setBackground(std::shared_ptr<window::Svg> svg) {
 	}
 };
 

diff --git a/firmware/src/VCV_adaptor/app/Widget.hh b/firmware/src/VCV_adaptor/app/Widget.hh
@@ -50,13 +50,17 @@ struct ThemedSvgPort : SvgPort {
 struct ModuleLightWidget : widget::Widget {
 	int firstLightId = -1;
 	NVGcolor bgColor = nvgRGBA(0, 0, 0, 0);
-	// NVGcolor color = nvgRGBA(0, 0, 0, 0);
-	// NVGcolor borderColor = nvgRGBA(0, 0, 0, 0);
+	NVGcolor color = nvgRGBA(0, 0, 0, 0);
+	NVGcolor borderColor = nvgRGBA(0, 0, 0, 0);
 
-	// std::vector<NVGcolor> baseColors;
-	// int getNumColors(){ return 0;}
-	// void addBaseColor(NVGcolor baseColor){}
-	// void setBrightnesses(const std::vector<float>& brightnesses){}
+	std::vector<NVGcolor> baseColors;
+	int getNumColors() {
+		return 0;
+	}
+	void addBaseColor(NVGcolor baseColor) {
+	}
+	void setBrightnesses(const std::vector<float> &brightnesses) {
+	}
 };
 
 // Params

diff --git a/firmware/src/VCV_adaptor/widget/Widget.hh b/firmware/src/VCV_adaptor/widget/Widget.hh
@@ -19,6 +19,7 @@ namespace widget
 {
 struct Widget {
 	math::Rect box;
+	MetaModule::Element element;
 
 	virtual ~Widget() = default;
 
@@ -63,9 +64,6 @@ struct Widget {
 	}
 	void clearChildren() {
 	}
-
-	MetaModule::Element element;
-
 	void hide() {
 	}
 };

diff --git a/firmware/src/VCV_adaptor/widget_convert/Rack.hh b/firmware/src/VCV_adaptor/widget_convert/Rack.hh
@@ -160,6 +160,11 @@ inline Element make_element<rack::componentlibrary::SmallLight<rack::componentli
 	return MonoLight{{b, "SmallLight.png"}, 0x07E0};
 };
 
+template<>
+inline Element make_element<rack::componentlibrary::SmallLight<rack::componentlibrary::BlueLight>>(BaseElement b) {
+	return MonoLight{{b, "SmallLight.png"}, 0x07FF};
+};
+
 template<>
 inline Element make_element<rack::componentlibrary::SmallLight<rack::componentlibrary::GreenRedLight>>(BaseElement b) {
 	return DualLight{{b, "SmallLight.png"}, {0x07E0, 0xF800}};

diff --git a/firmware/src/VCV_adaptor/widget_convert/nlc.hh b/firmware/src/VCV_adaptor/widget_convert/nlc.hh
@@ -0,0 +1,18 @@
+#pragma once
+#include "CoreModules/elements/base_element.hh"
+#include "CoreModules/elements/elements.hh"
+#include "VCV_adaptor/widget_convert/base.hh"
+#include "VCV_adaptor/widgets.hh"
+
+// Forward declare widgets
+struct SlothRedGreenLightWidget;
+
+namespace MetaModule
+{
+
+template<>
+inline Element make_element<rack::componentlibrary::LargeLight<SlothRedGreenLightWidget>>(BaseElement b) {
+	return DualLight{{b, "LargeLight.png"}, {0xF800, 0x07E0}};
+};
+
+} // namespace MetaModule
diff --git a/firmware/src/VCV_adaptor/widget_convert/widget_element_convert.hh b/firmware/src/VCV_adaptor/widget_convert/widget_element_convert.hh
@@ -3,3 +3,4 @@
 #include "VCV_adaptor/widget_convert/Befaco.hh"
 #include "VCV_adaptor/widget_convert/Rack.hh"
 #include "VCV_adaptor/widget_convert/hetrickcv.hh"
+#include "VCV_adaptor/widget_convert/nlc.hh"
diff --git a/firmware/src/VCV_adaptor/widgets.hh b/firmware/src/VCV_adaptor/widgets.hh
@@ -4,7 +4,9 @@
 #include "VCV_adaptor/asset.hpp"
 //TODO Replace this with Rack/include/componentlibrary.hpp
 
-namespace rack::componentlibrary
+namespace rack
+{
+namespace componentlibrary
 {
 
 ////////////////////
@@ -145,8 +147,9 @@ using LEDBezel = VCVBezel;
 
 // Lights
 
-template<typename T> struct MediumLight : app::ModuleLightWidget {};
-template<typename T> struct SmallLight : app::ModuleLightWidget {};
+template<typename T> struct LargeLight : T {};
+template<typename T> struct MediumLight : T {};
+template<typename T> struct SmallLight : T {};
 template <typename TBase> struct VCVBezelLight : TBase {};
 template <typename TBase> using LEDBezelLight = VCVBezelLight<TBase>;
 
@@ -157,7 +160,12 @@ struct BlueLight : app::ModuleLightWidget {};
 struct YellowLight : app::ModuleLightWidget {};
 struct GreenLight : app::ModuleLightWidget {};
 struct RedGreenBlueLight : app::ModuleLightWidget {};
+struct GrayModuleLightWidget : app::ModuleLightWidget {};
 // clang-format off
 
+} // namespace componentlibrary
+
+struct GrayModuleLightWidget : app::ModuleLightWidget {};
+
 } // namespace rack
 
diff --git a/firmware/src/gui/images/Rack/components/LargeLight.c b/firmware/src/gui/images/Rack/components/LargeLight.c
@@ -0,0 +1,66 @@
+#ifdef __has_include
+    #if __has_include("lvgl.h")
+        #ifndef LV_LVGL_H_INCLUDE_SIMPLE
+            #define LV_LVGL_H_INCLUDE_SIMPLE
+        #endif
+    #endif
+#endif
+
+#if defined(LV_LVGL_H_INCLUDE_SIMPLE)
+    #include "lvgl.h"
+#else
+    #include "lvgl/lvgl.h"
+#endif
+
+
+#ifndef LV_ATTRIBUTE_MEM_ALIGN
+#define LV_ATTRIBUTE_MEM_ALIGN
+#endif
+
+#ifndef LV_ATTRIBUTE_IMG_LARGELIGHT
+#define LV_ATTRIBUTE_IMG_LARGELIGHT
+#endif
+
+const LV_ATTRIBUTE_MEM_ALIGN LV_ATTRIBUTE_LARGE_CONST LV_ATTRIBUTE_IMG_LARGELIGHT uint8_t LargeLight_map[] = {
+    0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 
+    0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x09, 0x00, 0x00, 0x00, 0x09, 0x08, 0x06, 
+    0x00, 0x00, 0x00, 0xe0, 0x91, 0x06, 0x10, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 
+    0x59, 0x73, 0x00, 0x00, 0x07, 0x4b, 0x00, 0x00, 0x07, 0x4b, 0x01, 0x5c, 0x9f, 
+    0x52, 0xce, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f, 0x66, 
+    0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 
+    0x73, 0x63, 0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 
+    0x00, 0x00, 0x01, 0x1e, 0x49, 0x44, 0x41, 0x54, 0x18, 0x95, 0x4d, 0x8a, 0xb1, 
+    0x4e, 0x83, 0x50, 0x18, 0x46, 0xbf, 0xff, 0xf6, 0x42, 0x0c, 0xc1, 0x18, 0xac, 
+    0xb4, 0x69, 0x18, 0x58, 0x98, 0x18, 0xba, 0x38, 0x90, 0xa8, 0x75, 0xec, 0x04, 
+    0xa3, 0x0f, 0xd0, 0xb7, 0x70, 0xed, 0x64, 0x27, 0x5e, 0x80, 0x27, 0xe0, 0x0d, 
+    0x5c, 0xd5, 0x90, 0xb6, 0x69, 0xfa, 0x0a, 0x0e, 0x24, 0x34, 0xa1, 0x11, 0xbb, 
+    0x95, 0xe6, 0x02, 0xf7, 0xba, 0x58, 0xe3, 0x19, 0xcf, 0x39, 0xa4, 0x94, 0xc2, 
+    0x7c, 0x3e, 0x37, 0x3c, 0xcf, 0x5b, 0x0c, 0x06, 0x83, 0x07, 0xce, 0xf9, 0x4d, 
+    0xdb, 0xb6, 0x5f, 0xfb, 0xfd, 0xfe, 0x63, 0xbb, 0xdd, 0x3e, 0xc7, 0x71, 0x5c, 
+    0xf7, 0x88, 0xc8, 0x18, 0x8f, 0xc7, 0xaf, 0xd3, 0xe9, 0xf4, 0xa9, 0xdf, 0xef, 
+    0x8f, 0x6c, 0xdb, 0xbe, 0x1a, 0x0e, 0x87, 0x23, 0xdf, 0xf7, 0x83, 0xae, 0xeb, 
+    0x26, 0x49, 0x92, 0xa4, 0xdc, 0xf3, 0xbc, 0x97, 0x30, 0x0c, 0x27, 0x52, 0x4a, 
+    0x08, 0x21, 0x20, 0xa5, 0x04, 0x63, 0x0c, 0x86, 0x61, 0x20, 0x8a, 0xa2, 0xc7, 
+    0xba, 0xae, 0x17, 0xdc, 0x71, 0x9c, 0x7b, 0x4d, 0xd3, 0x00, 0x00, 0xb6, 0x6d, 
+    0x43, 0x29, 0x05, 0x22, 0x02, 0x11, 0x01, 0x00, 0x1c, 0xc7, 0xb9, 0xe3, 0xba, 
+    0xae, 0x5b, 0xf8, 0xe5, 0x7f, 0x3c, 0xa3, 0xeb, 0xfa, 0x35, 0x13, 0x42, 0x1c, 
+    0xce, 0xa2, 0xeb, 0x3a, 0x1c, 0x8f, 0x47, 0x48, 0x29, 0xff, 0x26, 0x21, 0xc4, 
+    0x37, 0x2f, 0x8a, 0x22, 0x6b, 0x9a, 0xe6, 0xb6, 0xaa, 0x2a, 0x6c, 0x36, 0x1b, 
+    0x34, 0x4d, 0x03, 0x4d, 0xd3, 0x10, 0x04, 0x01, 0x2c, 0xcb, 0xc2, 0x6e, 0xb7, 
+    0xcb, 0x7a, 0xae, 0xeb, 0xbe, 0x9d, 0x4e, 0xa7, 0x89, 0x69, 0x9a, 0x6e, 0x59, 
+    0x96, 0x00, 0x00, 0x29, 0x25, 0x4c, 0xd3, 0x44, 0x96, 0x65, 0xef, 0xab, 0xd5, 
+    0x6a, 0xd6, 0x5b, 0x2e, 0x97, 0x6d, 0x92, 0x24, 0x29, 0x11, 0x5d, 0x32, 0xc6, 
+    0x2e, 0x94, 0x52, 0x2d, 0x80, 0xcf, 0x3c, 0xcf, 0xd3, 0xf5, 0x7a, 0x3d, 0x8b, 
+    0xe3, 0xb8, 0xfe, 0x01, 0x66, 0x0a, 0x78, 0x82, 0xe7, 0x9d, 0xd4, 0x42, 0x00, 
+    0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
+};
+
+const lv_img_dsc_t LargeLight = {
+  .header.cf = LV_IMG_CF_RAW_ALPHA,
+  .header.always_zero = 0,
+  .header.reserved = 0,
+  .header.w = 9,
+  .header.h = 9,
+  .data_size = 401,
+  .data = LargeLight_map,
+};
diff --git a/firmware/src/gui/images/Rack/components/LargeLight.png b/firmware/src/gui/images/Rack/components/LargeLight.png