From 61371f0a9336d10bafb51ec4d5168315f22638bd Mon Sep 17 00:00:00 2001
From: moon2 <moon2protonmail@protonmail.com>
Date: Tue, 7 May 2024 12:03:22 +0200
Subject: [PATCH] simplified motion modulator for now
---
python_payload/apps/demo_melodic/__init__.py | 3 ++-
python_payload/apps/demo_melodic/modules/synth.py | 10 ++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/python_payload/apps/demo_melodic/__init__.py b/python_payload/apps/demo_melodic/__init__.py
index 78e364ea25..881edc62de 100644
--- a/python_payload/apps/demo_melodic/__init__.py
+++ b/python_payload/apps/demo_melodic/__init__.py
@@ -223,11 +223,12 @@ class MelodicApp(Application):
self.modulators += [
Modulator(
- "sensors", sens, signal_range=[0, 4096], feed_hook=sens.update_data
+ "motion", sens, signal_range=[0, 4096], feed_hook=sens.update_data
),
]
mod_pages = [mod.patch.make_page(mod.name) for mod in self.modulators]
+ mod_pages = [p for p in mod_pages if p]
self.osc_pages = [None, None]
diff --git a/python_payload/apps/demo_melodic/modules/synth.py b/python_payload/apps/demo_melodic/modules/synth.py
index f2039b2d0a..89a0585826 100644
--- a/python_payload/apps/demo_melodic/modules/synth.py
+++ b/python_payload/apps/demo_melodic/modules/synth.py
@@ -79,20 +79,22 @@ class sensors(bl00mbox.Patch):
self.plugins.mixer.always_render = True
self.signals.modulation_output = self.plugins.mixer.signals.output
- def make_page(self, name="sensors"):
+ def make_page(self, name="motion"):
+ # hiii this isn't really done yet :D
page = ParameterPage(name, self)
param = Parameter(
self.plugins.mixer.signals.input_gain[0], "tilt", 0.5, [-4096, 4096]
)
page.params += [param]
param = Parameter(
- self.plugins.mixer.signals.input_gain[1], "speed", 0.5, [-4096, 4096]
+ self.plugins.mixer.signals.input_gain[1], "speed", 1, [-4096, 4096]
)
page.params += [param]
page.scope_param = Parameter(
self.signals.modulation_output, "", None, [-2048, 2048]
)
- return page
+ # return page
+ return None
def update_data(self, ins, delta_ms):
acc_vector = ins.imu.acc
@@ -118,7 +120,7 @@ class sensors(bl00mbox.Patch):
return -math.tau / 4
return math.tau / 4
- self.plugins.mixer.signals.input[0] = inclination(acc_vector) * 4096 * 2
+ # self.plugins.mixer.signals.input[0] = inclination(acc_vector) * 4096 * 2
r = math.sqrt(sum([x * x for x in acc_vector]))
self.plugins.mixer.signals.input[1] = (r - 9.81) * 256
--
GitLab