Merge pull request #152 from 4ms/lyle4ms--audible_simple_modules

Audible Instruments simple modules
4ms · Nov 2, 2023 · ac7c2da · ac7c2da
2 parents d7abb14 + 2407700
commit ac7c2da
Show file tree

Hide file tree

Showing 91 changed files with 14,258 additions and 19 deletions.
diff --git a/firmware/lib/jansson/jansson b/firmware/lib/jansson/jansson
diff --git a/firmware/lib/mdrivlib b/firmware/lib/mdrivlib
diff --git a/firmware/src/CMakeLists.txt b/firmware/src/CMakeLists.txt
@@ -319,7 +319,6 @@ target_link_script(
   -Wno-psabi
   -ffreestanding
   -nostartfiles
-  # -nostdlib
   -flto=auto
 )
 

diff --git a/firmware/src/VCV_adaptor/VCV_module_wrapper.hh b/firmware/src/VCV_adaptor/VCV_module_wrapper.hh
@@ -4,6 +4,7 @@
 #include "VCV_adaptor/engine/Param.hpp"
 #include "VCV_adaptor/engine/ParamQuantity.hpp"
 #include "VCV_adaptor/engine/Port.hpp"
+#include "VCV_adaptor/random.hpp"
 #include <array>
 #include <memory>
 #include <vector>
@@ -21,6 +22,10 @@ struct VCVModuleWrapper : CoreProcessor {
 		int64_t frame;
 	};
 
+	VCVModuleWrapper() {
+		rack::random::init();
+	}
+
 	virtual void process(const ProcessArgs &) = 0;
 
 	void update() override {

diff --git a/firmware/src/VCV_adaptor/app/Widget.hh b/firmware/src/VCV_adaptor/app/Widget.hh
@@ -49,7 +49,7 @@ struct ThemedSvgPort : SvgPort {
 
 struct ModuleLightWidget : widget::Widget {
 	int firstLightId = -1;
-	// NVGcolor bgColor = nvgRGBA(0, 0, 0, 0);
+	NVGcolor bgColor = nvgRGBA(0, 0, 0, 0);
 	// NVGcolor color = nvgRGBA(0, 0, 0, 0);
 	// NVGcolor borderColor = nvgRGBA(0, 0, 0, 0);
 

diff --git a/firmware/src/VCV_adaptor/helpers.hpp b/firmware/src/VCV_adaptor/helpers.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include "CoreModules/elements/element_info.hh"
-#include "CoreModules/elements/element_setters.hh"
+#include "CoreModules/elements/element_strings.hh"
 #include "VCV_adaptor/app/Menu.hpp"
 #include "VCV_adaptor/app/SvgPanel.hpp"
 #include "VCV_adaptor/engine/Module.hpp"
@@ -9,6 +9,7 @@
 #include "VCV_adaptor/widget_convert/widget_element_convert.hh"
 #include <functional>
 #include <string_view>
+
 // #include "pr_dbg.hh"
 
 namespace rack
@@ -31,30 +32,42 @@ T *createElementWidget(math::Vec pos, MetaModule::Coords coord_ref, std::string_
 
 inline std::string_view getParamName(engine::Module *module, int id) {
 	if (auto pq = module->getParamQuantity(id)) {
-		return pq->name;
+		if (pq->name.size()) {
+			remove_extended_chars(pq->name);
+			return pq->name;
+		}
 	}
-	return "";
+	return "(Param)";
 }
 
 inline std::string_view getInputName(engine::Module *module, int id) {
 	if (auto info = module->getInputInfo(id)) {
-		return info->name;
+		if (info->name.size()) {
+			remove_extended_chars(info->name);
+			return info->name;
+		}
 	}
-	return "";
+	return "(In)";
 }
 
 inline std::string_view getOutputName(engine::Module *module, int id) {
 	if (auto info = module->getOutputInfo(id)) {
-		return info->name;
+		if (info->name.size()) {
+			remove_extended_chars(info->name);
+			return info->name;
+		}
 	}
-	return "";
+	return "(Out)";
 }
 
 inline std::string_view getLightName(engine::Module *module, int id) {
 	if (auto info = module->getLightInfo(id)) {
-		return info->name;
+		if (info->name.size()) {
+			remove_extended_chars(info->name);
+			return info->name;
+		}
 	}
-	return "";
+	return "(Light)";
 }
 
 template<class TWidget>

diff --git a/firmware/src/VCV_adaptor/widget_convert/Rack.hh b/firmware/src/VCV_adaptor/widget_convert/Rack.hh
@@ -56,6 +56,21 @@ struct ElementConvert<componentlibrary::Davies1900hLargeWhiteKnob> {
 	using ElementType = MetaModule::Davies1900hLargeWhiteKnob;
 };
 
+template<>
+struct ElementConvert<componentlibrary::Rogan1PSGreen> {
+	using ElementType = MetaModule::Rogan1PSGreen;
+};
+
+template<>
+struct ElementConvert<componentlibrary::Rogan1PSRed> {
+	using ElementType = MetaModule::Rogan1PSRed;
+};
+
+template<>
+struct ElementConvert<componentlibrary::Rogan1PSWhite> {
+	using ElementType = MetaModule::Rogan1PSWhite;
+};
+
 template<>
 struct ElementConvert<componentlibrary::Rogan2SGray> {
 	using ElementType = MetaModule::Rogan2SGray;
@@ -86,6 +101,22 @@ struct ElementConvert<componentlibrary::Rogan2PSGreen> {
 	using ElementType = MetaModule::Rogan2PSGreen;
 };
 
+template<>
+struct ElementConvert<componentlibrary::Rogan3PSWhite> {
+	using ElementType = MetaModule::Rogan3PSWhite;
+};
+
+template<>
+struct ElementConvert<componentlibrary::Rogan3PSRed> {
+	using ElementType = MetaModule::Rogan3PSRed;
+};
+
+template<>
+struct ElementConvert<componentlibrary::Rogan3PSGreen> {
+	using ElementType = MetaModule::Rogan3PSGreen;
+};
+
+
 template<>
 struct ElementConvert<componentlibrary::Trimpot> {
 	using ElementType = MetaModule::Trimpot;
@@ -126,6 +157,21 @@ struct ElementConvert<componentlibrary::SmallLight<componentlibrary::GreenRedLig
 	using ElementType = MetaModule::SmallLight<MetaModule::GreenRedLight>;
 };
 
+template<>
+struct ElementConvert<componentlibrary::MediumLight<componentlibrary::GreenRedLight>> {
+	using ElementType = MetaModule::MediumLight<MetaModule::GreenRedLight>;
+};
+
+template<>
+struct ElementConvert<componentlibrary::MediumLight<componentlibrary::RedLight>> {
+	using ElementType = MetaModule::MediumLight<MetaModule::RedLight>;
+};
+
+template<>
+struct ElementConvert<componentlibrary::MediumLight<componentlibrary::GreenLight>> {
+	using ElementType = MetaModule::MediumLight<MetaModule::GreenLight>;
+};
+
 template<>
 struct ElementConvert<componentlibrary::PJ301MPort> {
 	using ElementTypeInput = MetaModule::PJ301MPortIn;
+17 −3		drivers/gpio_expander.hh
+11 −8		target/stm32mp1_ca7/drivers/cache.hh