add new modulation types for FMX and Analog Generator osc2

specs/fileformat.yaml

@@ -870,6 +870,8 @@ module_types:
         "max": 4
         "bitwise_and": 5
         "bitwise_xor": 6
+        "min_abs": 7
+        "max_abs": 8
     controllers:
       - volume: { min: 0, max: 256, default: 80 }
       - waveform: { enum: Waveform, default: "triangle" }
@@ -1474,6 +1476,8 @@ module_types:
         "bitwise_and": 7
         "bitwise_xor": 8
         "phase_plus": 9
+        "min_abs": 10
+        "max_abs": 11
       Op1OutputMode:
         "none": 0
         "to_output": 1

src/python/rv/modules/base/analoggenerator.py

@@ -64,6 +64,8 @@ class Osc2Mode(IntEnum):
         max = 4
         bitwise_and = 5
         bitwise_xor = 6
+        min_abs = 7
+        max_abs = 8
 
     volume = Controller((0, 256), 80)
     waveform = Controller(Waveform, Waveform.triangle)

src/python/rv/modules/base/fmx.py

@@ -81,6 +81,8 @@ class ModulationType(IntEnum):
         bitwise_and = 7
         bitwise_xor = 8
         phase_plus = 9
+        min_abs = 10
+        max_abs = 11
 
     class Op1OutputMode(IntEnum):
         none = 0

src/ts/modtypes/analogGenerator.ts

@@ -68,6 +68,8 @@ export namespace AnalogGenerator {
     Max = 4,
     BitwiseAnd = 5,
     BitwiseXor = 6,
+    MinAbs = 7,
+    MaxAbs = 8,
   }
   export enum CtlNum {
     Volume = 1,

src/ts/modtypes/analogGeneratorEnums.ts

@@ -59,4 +59,6 @@ export enum Osc2Mode {
   Max = 4,
   BitwiseAnd = 5,
   BitwiseXor = 6,
+  MinAbs = 7,
+  MaxAbs = 8,
 }

src/ts/modtypes/fmx.ts

@@ -87,6 +87,8 @@ export namespace Fmx {
     BitwiseAnd = 7,
     BitwiseXor = 8,
     PhasePlus = 9,
+    MinAbs = 10,
+    MaxAbs = 11,
   }
   export enum Op1OutputMode {
     // noinspection JSUnusedGlobalSymbols

src/ts/modtypes/fmxEnums.ts

@@ -79,6 +79,8 @@ export enum ModulationType {
   BitwiseAnd = 7,
   BitwiseXor = 8,
   PhasePlus = 9,
+  MinAbs = 10,
+  MaxAbs = 11,
 }
 export enum Op1OutputMode {
   // noinspection JSUnusedGlobalSymbols

tests/python/conftest.py

@@ -15,11 +15,12 @@ def test_files_path() -> Path:
 @pytest.fixture
 def read_write_read_synth(test_files_path):
     def _read_write_read_synth(name: str) -> Synth:
-        synth = read_sunvox_file(test_files_path / f"{name}.sunsynth")
+        synth = read_sunvox_file(path := test_files_path / f"{name}.sunsynth")
         f = BytesIO()
         synth.write_to(f)
         f.seek(0)
         synth = read_sunvox_file(f)
+        synth.module.path = path  # for inspecting original file as needed
         return synth
 
     return _read_write_read_synth
@@ -55,19 +56,31 @@ def _read_write_read_project(name: str, verbose=False) -> Project:
 
 @pytest.fixture
 def dump_on_failure():
-    """Context manager useful for debugging test failures for module tests."""
+    """
+    Context manager to print a hex dump of the module on failure.
+
+    Include the fixture and then use it like this:
+
+        with dump_on_failure(mod):  # or mod.path to dump the original file
+            assert mod.custom_waveform.values == EXPECTED_CUSTOM_WAVEFORM
+    """
 
     @contextmanager
-    def _dump_on_failure(module: m.Module):
+    def _dump_on_failure(module: m.Module | Path):
         try:
             yield
         except Exception:
             from rv.lib.iff import dump_file
 
-            f = BytesIO()
-            synth = Synth(module)
-            synth.write_to(f)
-            f.seek(0)
+            if isinstance(module, m.Module):
+                f = BytesIO()
+                synth = Synth(module)
+                synth.write_to(f)
+                f.seek(0)
+            elif isinstance(module, Path):
+                f = module.open("rb")
+            else:
+                raise TypeError(f"Don't know how to dump {type(module)}")
             dump_file(f)
             raise
 

tests/python/readwrite/synth/test_analog_generator.py

@@ -32,7 +32,7 @@ def test_analog_generator(read_write_read_synth):
     assert mod.mode == mod.Mode.lq
     assert mod.noise == 9
     assert mod.osc2_volume == 20640
-    assert mod.osc2_mode == mod.Osc2Mode.mul
+    assert mod.osc2_mode == mod.Osc2Mode.max_abs
     assert mod.osc2_phase == 0
 
     assert mod.volume_envelope_scaling_per_key