From 97aa2f1dace47dffc0e6b141e864b2c8dd205803 Mon Sep 17 00:00:00 2001 From: moon2 <moon2protonmail@protonmail.com> Date: Tue, 6 Jun 2023 21:24:59 +0200 Subject: [PATCH] audio: fixed up menu halfway, waiting for iggy changes --- components/badge23/espan.c | 1 - python_payload/demo_menu.py | 3 ++- python_payload/demo_sparabo.py | 5 +++-- python_payload/menu_settings.py | 5 +++-- python_payload/menu_tinysynth.py | 5 +++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/components/badge23/espan.c b/components/badge23/espan.c index 06c760aee3..0375ab5b45 100644 --- a/components/badge23/espan.c +++ b/components/badge23/espan.c @@ -102,7 +102,6 @@ void os_app_main(void) captouch_init(); //vTaskDelay(2000 / portTICK_PERIOD_MS); - set_global_vol_dB(0); captouch_force_calibration(); display_init(); diff --git a/python_payload/demo_menu.py b/python_payload/demo_menu.py index 25c024a719..b1de86295a 100644 --- a/python_payload/demo_menu.py +++ b/python_payload/demo_menu.py @@ -2,6 +2,7 @@ import menu import event import hardware import control +import audio import application import demo_worms,demo_sparabo,cap_touch_demo, melodic_demo, harmonic_demo @@ -10,7 +11,7 @@ import menu_settings,menu_tinysynth import time hardware.captouch_autocalib() -hardware.set_global_volume_dB(0) +audio.set_volume_dB(0) menu_demo = menu.Menu("demo") diff --git a/python_payload/demo_sparabo.py b/python_payload/demo_sparabo.py index 36ead3a4aa..f22a12a6aa 100644 --- a/python_payload/demo_sparabo.py +++ b/python_payload/demo_sparabo.py @@ -8,6 +8,7 @@ from synth import tinysynth import application import ui +import audio popcorn = [9,7,9,5,0,5,-3,999] @@ -37,7 +38,7 @@ def on_step(data): class AppSparabo(application.Application): def on_init(self): - hardware.set_global_volume_dB(0) + audio.set_volume_dB(0) self.synth = tinysynth(440,1) self.synth.decay(25) @@ -55,4 +56,4 @@ class AppSparabo(application.Application): self.sequencer.stop() -app = AppSparabo("sequencer") \ No newline at end of file +app = AppSparabo("sequencer") diff --git a/python_payload/menu_settings.py b/python_payload/menu_settings.py index 860c7e1a75..6e4b985724 100644 --- a/python_payload/menu_settings.py +++ b/python_payload/menu_settings.py @@ -1,5 +1,6 @@ import menu import event +import audio import control import ui import hardware @@ -28,7 +29,7 @@ def set_controls_overlay(value): def set_volume(value): db = int(value*60-40) print("DB",db) - hardware.set_global_volume_dB(db) + audio.set_volume_dB(db) def get_menu(): @@ -48,4 +49,4 @@ def get_menu(): return m -m = get_menu() \ No newline at end of file +m = get_menu() diff --git a/python_payload/menu_tinysynth.py b/python_payload/menu_tinysynth.py index 0d012b4442..a77d138896 100644 --- a/python_payload/menu_tinysynth.py +++ b/python_payload/menu_tinysynth.py @@ -5,6 +5,7 @@ import event import control import ui import hardware +import audio ui_input = ui.Icon("") @@ -20,7 +21,7 @@ def set_play(value): def set_volume(value): db = int(value*60-40) print("DB",db) - hardware.set_global_volume_dB(db) + audio.set_volume_dB(db) def set_frequency(value): f = 440+value*440 @@ -42,4 +43,4 @@ def get_menu(): synth = tinysynth(440,0) -m = get_menu() \ No newline at end of file +m = get_menu() -- GitLab