unfreeze, smaller mainram

apfelaudio · Nov 10, 2024 · 4309e0d · 4309e0d
1 parent 88ff1eb
commit 4309e0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/gateware/src/top/macro_osc/fw/src/main.rs b/gateware/src/top/macro_osc/fw/src/main.rs
@@ -57,15 +57,15 @@ scoped_interrupts! {
 
 struct App<'a> {
     voice: Box<Voice<'a>>,
-    patch: Box<Patch>,
+    patch: Patch,
     modulations: Modulations,
     optif: optif::OptInterface,
 }
 
 impl<'a> App<'a> {
     pub fn new() -> Self {
         let mut voice = Box::new(Voice::new(&HEAP, BLOCK_SIZE));
-        let mut patch = Box::new(Patch::default());
+        let mut patch = Patch::default();
 
         patch.engine = 0;
         patch.harmonics = 0.5;
@@ -99,7 +99,7 @@ pub fn f32_to_i32(f: u32) -> i32 {
     }
 }
 
-fn timer0_handler(app: &Mutex<RefCell<Box<App>>>) {
+fn timer0_handler(app: &Mutex<RefCell<App>>) {
 
     let peripherals = unsafe { pac::Peripherals::steal() };
     let audio_fifo = peripherals.AUDIO_FIFO;
@@ -235,7 +235,7 @@ fn main() -> ! {
 
     unsafe { HEAP.init(HEAP_START, HEAP_SIZE) }
 
-    let app = Box::new(App::new());
+    let app = App::new();
     let app = Mutex::new(RefCell::new(app));
 
     info!("heap usage {} KiB", HEAP.used()/1024);

diff --git a/gateware/src/top/macro_osc/top.py b/gateware/src/top/macro_osc/top.py
@@ -195,4 +195,4 @@ def elaborate(self, platform):
 if __name__ == "__main__":
     this_path = os.path.dirname(os.path.realpath(__file__))
     top_level_cli(MacroOscSoc, path=this_path,
-                  argparse_fragment=lambda _: {"mainram_size": 0x20000})
+                  argparse_fragment=lambda _: {"mainram_size": 0x10000})