Small fixes for Teensy audio.

vult-dsp · Dec 2, 2022 · 0ae2120 · 0ae2120
1 parent 8167652
commit 0ae2120
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 11 deletions.
diff --git a/src/generators/templates/teensyAudio.ml b/src/generators/templates/teensyAudio.ml
@@ -63,7 +63,8 @@ let header (params : params) (code : Pla.t) : Pla.t =
 #include <math.h>
 #include "vultin.h"
 #include "<#tables#s>.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 <#code#>
 
@@ -144,9 +145,9 @@ let castInput params typ i acc =
 let castOutput params typ value =
    match typ with
    | OReal when params.real = "fixed" -> [%pla {|fix_to_short(<#value#>)|}]
-   | OReal -> [%pla {|<#value#>|}]
+   | OReal -> [%pla {|(int16_t)(32768 * <#value#>)|}]
    | OFix16 -> [%pla {|fix_to_short(<#value#>)|}]
-   | OBool -> [%pla {|<#value#>|}]
+   | OBool -> [%pla {|32768 * (int16_t)<#value#>|}]
    | OInt -> [%pla {|<#value#>|}]
 ;;
 

diff --git a/test/code/af_f.h.fixed.base.teensy b/test/code/af_f.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "af_f.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 typedef struct Af_f__ctx_type_0 {
    int x;

diff --git a/test/code/aff_f.h.fixed.base.teensy b/test/code/aff_f.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "aff_f.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 typedef struct Aff_f__ctx_type_0 {
    int x;

diff --git a/test/code/aff_ff.h.fixed.base.teensy b/test/code/aff_ff.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "aff_ff.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 typedef struct _tuple___real_real__ {
    fix16_t field_0;

diff --git a/test/code/afi_fi.h.fixed.base.teensy b/test/code/afi_fi.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "afi_fi.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 typedef struct _tuple___real_int__ {
    fix16_t field_0;

diff --git a/test/code/sf_f.h.fixed.base.teensy b/test/code/sf_f.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "sf_f.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 static_inline fix16_t Sf_f_process(fix16_t input){
    return fix_mul(input,input);

diff --git a/test/code/sff_f.h.fixed.base.teensy b/test/code/sff_f.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "sff_f.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 static_inline fix16_t Sff_f_process(fix16_t a, fix16_t b){
    return fix_mul(a,b);

diff --git a/test/code/sff_ff.h.fixed.base.teensy b/test/code/sff_ff.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "sff_ff.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 typedef struct _tuple___real_real__ {
    fix16_t field_0;

diff --git a/test/code/sfi_fi.h.fixed.base.teensy b/test/code/sfi_fi.h.fixed.base.teensy
@@ -6,7 +6,8 @@
 #include <math.h>
 #include "vultin.h"
 #include "sfi_fi.tables.h"
-#include "AudioStream.h"
+#include <Audio.h>
+#include <AudioStream.h>
 
 typedef struct _tuple___real_int__ {
    fix16_t field_0;