Skip to content
Snippets Groups Projects
Commit 61371f0a authored by moon2's avatar moon2 :speech_balloon:
Browse files

simplified motion modulator for now

parent 00363750
No related branches found
No related tags found
1 merge request!661Draft: return of melodic demo
...@@ -223,11 +223,12 @@ class MelodicApp(Application): ...@@ -223,11 +223,12 @@ class MelodicApp(Application):
self.modulators += [ self.modulators += [
Modulator( 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 = [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] self.osc_pages = [None, None]
......
...@@ -79,20 +79,22 @@ class sensors(bl00mbox.Patch): ...@@ -79,20 +79,22 @@ class sensors(bl00mbox.Patch):
self.plugins.mixer.always_render = True self.plugins.mixer.always_render = True
self.signals.modulation_output = self.plugins.mixer.signals.output 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) page = ParameterPage(name, self)
param = Parameter( param = Parameter(
self.plugins.mixer.signals.input_gain[0], "tilt", 0.5, [-4096, 4096] self.plugins.mixer.signals.input_gain[0], "tilt", 0.5, [-4096, 4096]
) )
page.params += [param] page.params += [param]
param = Parameter( 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.params += [param]
page.scope_param = Parameter( page.scope_param = Parameter(
self.signals.modulation_output, "", None, [-2048, 2048] self.signals.modulation_output, "", None, [-2048, 2048]
) )
return page # return page
return None
def update_data(self, ins, delta_ms): def update_data(self, ins, delta_ms):
acc_vector = ins.imu.acc acc_vector = ins.imu.acc
...@@ -118,7 +120,7 @@ class sensors(bl00mbox.Patch): ...@@ -118,7 +120,7 @@ class sensors(bl00mbox.Patch):
return -math.tau / 4 return -math.tau / 4
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])) r = math.sqrt(sum([x * x for x in acc_vector]))
self.plugins.mixer.signals.input[1] = (r - 9.81) * 256 self.plugins.mixer.signals.input[1] = (r - 9.81) * 256
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment