upd firefly-audio

Author: orsinium

Cargo.lock

@@ -10,7 +10,7 @@ repository = "https://github.com/firefly-zero/firefly-runtime"
 [dependencies]
 embedded-graphics = "0.8.2"
 embedded-io = "0.6.1"
-firefly-audio = "0.2.1"
+firefly-audio = "0.3.0"
 firefly-hal = "0.4.0"
 firefly-types = "0.10.0"
 heapless = { version = "0.9.2", features = ["serde"] }

Cargo.toml

@@ -227,32 +227,39 @@ pub(crate) fn mod_linear(
     mut caller: C,
     node_id: u32,
     param: u32,
-    start: f32,
-    end: f32,
+    low: f32,
+    high: f32,
     start_at: u32,
     end_at: u32,
 ) {
     let state = caller.data_mut();
     state.called = "audio.mod_linear";
-    let lfo = modulators::Linear::new(start, end, start_at, end_at);
-    modulate(state, node_id, param, Box::new(lfo));
+    let lfo = modulators::Linear::new(start_at, end_at);
+    modulate(state, node_id, param, Box::new(lfo), low, high);
 }
 
-pub(crate) fn mod_hold(mut caller: C, node_id: u32, param: u32, v1: f32, v2: f32, time: u32) {
+pub(crate) fn mod_hold(mut caller: C, node_id: u32, param: u32, low: f32, high: f32, time: u32) {
     let state = caller.data_mut();
     state.called = "audio.mod_hold";
-    let lfo = modulators::Hold::new(v1, v2, time);
-    modulate(state, node_id, param, Box::new(lfo));
+    let lfo = modulators::Hold::new(time);
+    modulate(state, node_id, param, Box::new(lfo), low, high);
 }
 
 pub(crate) fn mod_sine(mut caller: C, node_id: u32, param: u32, freq: f32, low: f32, high: f32) {
     let state = caller.data_mut();
     state.called = "audio.mod_sine";
-    let lfo = modulators::Sine::new(freq, low, high);
-    modulate(state, node_id, param, Box::new(lfo));
+    let lfo = modulators::Sine::new(freq);
+    modulate(state, node_id, param, Box::new(lfo), low, high);
 }
 
-fn modulate(state: &mut State, node_id: u32, param: u32, lfo: Box<dyn modulators::Modulator>) {
+fn modulate(
+    state: &mut State,
+    node_id: u32,
+    param: u32,
+    lfo: Box<dyn modulators::Modulator>,
+    low: f32,
+    high: f32,
+) {
     let node = match state.audio.get_node(node_id) {
         Ok(node) => node,
         Err(err) => {
@@ -264,7 +271,7 @@ fn modulate(state: &mut State, node_id: u32, param: u32, lfo: Box<dyn modulators
         state.log_error("param value is too high");
         return;
     }
-    node.modulate(param as u8, lfo);
+    node.modulate(param as u8, lfo, low, high);
 }
 
 /// Reset the given node.

src/host/audio.rs

@@ -22,7 +22,7 @@ const KB: u32 = 1024;
 const FUEL_INIT: u64 = 10_000_000;
 const FUEL_BOOT: u64 = 10_000_000;
 const FUEL_UPDATE: u64 = 10_000_000;
-const FUEL_RENDER: u64 = 100_000;
+const FUEL_RENDER: u64 = 10_000_000;
 const FUEL_BEFORE_EXIT: u64 = 10_000_000;
 const FUEL_CHEAT: u64 = 60_000;