Different Morpheus internal encodings added

dukesrg · Oct 12, 2021 · 434adbc · 434adbc
1 parent f204c3b
commit 434adbc
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 5 deletions.
diff --git a/Morpheus-A-osc/manifest.json b/Morpheus-A-osc/manifest.json
@@ -0,0 +1,23 @@
+{
+ "header" :
+ {
+ "platform" : "nutekt-digital",
+ "module" : "osc",
+ "api" : "1.1-0",
+ "dev_id" : 1701541188,
+ "prg_id" : 0,
+ "version" : "1.2-0",
+ "name" : "Morpheus-A",
+ "num_param" : 5,
+ "params" : [
+ ["Mode", 0, 1, ""],
+ ["LFOX", 0, 100, "%"],
+ ["LFOY", 0, 100, "%"],
+ ["LFOTrigger", 0, 3, ""],
+ ["Interpolate", 0, 1, ""]
+ ],
+ "custom_data" : [
+ ["Raw wave, A-law encoded", 64, 16384]
+ ]
+ }
+}
diff --git a/Morpheus-osc/project.mk → Morpheus-A-osc/project.mk b/Morpheus-osc/project.mk → Morpheus-A-osc/project.mk
@@ -4,15 +4,15 @@
 
 include $(PLATFORMDIR)/osc.mk
 
-PROJECT = Morpheus
+PROJECT = Morpheus-A
 
 UCSRC =
 
 UCXXSRC = ../src/morpheus.cpp
 
 UINCDIR = $(PROJECTDIR)/../inc
 
-UDEFS =
+UDEFS = -DFORMAT_ALAW
 
 ULIBS =
 

diff --git a/Morpheus-P-osc/manifest.json b/Morpheus-P-osc/manifest.json
@@ -0,0 +1,23 @@
+{
+ "header" :
+ {
+ "platform" : "nutekt-digital",
+ "module" : "osc",
+ "api" : "1.1-0",
+ "dev_id" : 1701541188,
+ "prg_id" : 0,
+ "version" : "1.2-0",
+ "name" : "Morpheus-P",
+ "num_param" : 5,
+ "params" : [
+ ["Mode", 0, 1, ""],
+ ["LFOX", 0, 100, "%"],
+ ["LFOY", 0, 100, "%"],
+ ["LFOTrigger", 0, 3, ""],
+ ["Interpolate", 0, 1, ""]
+ ],
+ "custom_data" : [
+ ["Raw wave, 8-bit linear PCM encoded", 64, 16384]
+ ]
+ }
+}
diff --git a/Morpheus-P-osc/project.mk b/Morpheus-P-osc/project.mk
@@ -0,0 +1,19 @@
+# #############################################################################
+# Project Customization
+# #############################################################################
+
+include $(PLATFORMDIR)/osc.mk
+
+PROJECT = Morpheus-P
+
+UCSRC =
+
+UCXXSRC = ../src/morpheus.cpp
+
+UINCDIR = $(PROJECTDIR)/../inc
+
+UDEFS = -DFORMAT_PCM8
+
+ULIBS =
+
+ULIBDIR =
diff --git a/Morpheus-osc/manifest.json → Morpheus-U-osc/manifest.json b/Morpheus-osc/manifest.json → Morpheus-U-osc/manifest.json
@@ -6,8 +6,8 @@
  "api" : "1.1-0",
  "dev_id" : 1701541188,
  "prg_id" : 0,
- "version" : "1.0-1",
- "name" : "Morpheus",
+ "version" : "1.2-0",
+ "name" : "Morpheus-U",
  "num_param" : 5,
  "params" : [
  ["Mode", 0, 1, ""],

diff --git a/Morpheus-U-osc/project.mk b/Morpheus-U-osc/project.mk
@@ -0,0 +1,19 @@
+# #############################################################################
+# Project Customization
+# #############################################################################
+
+include $(PLATFORMDIR)/osc.mk
+
+PROJECT = Morpheus-U
+
+UCSRC =
+
+UCXXSRC = ../src/morpheus.cpp
+
+UINCDIR = $(PROJECTDIR)/../inc
+
+UDEFS = -DFORMAT_ULAW
+
+ULIBS =
+
+ULIBDIR =
diff --git a/src/morpheus.cpp b/src/morpheus.cpp
@@ -12,7 +12,6 @@
 #include "simplelfo.hpp"
 #include "userosc.h"
 
-#define FORMAT_ULAW
 #define SAMPLE_COUNT 256
 #define WAVE_COUNT 64
 #define WAVE_COUNT_X 8