diff --git a/src/features/editor/parameters/Arpeggios.js b/src/features/editor/parameters/Arpeggios.js
deleted file mode 100644
index ec3c9b3..0000000
--- a/src/features/editor/parameters/Arpeggios.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import React from 'react';
-import Card from '../card';
-import { useSelector, useDispatch } from 'react-redux';
-import { selectById, parameterUpdated } from './parameterSlice.js';
-import { Slider, SelectList, Checkbox } from '../../helpers/Helpers';
-
-const ArpeggA = (props) => {
- const parameters = useSelector((state) => selectById(state, props.id));
- const dispatch = useDispatch();
-
- return (
-
- Arpeggio A.
-
- Tempo
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { tempo: value },
- })
- )
- }
- />
- Resolution
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { resolution: value },
- })
- )
- }
- />
- Gate
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { gate: value },
- })
- )
- }
- />
-
-
-
- Type
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { type: value },
- })
- )
- }
- />
- Range
- `${v.value} Oct`}
- value={parameters.range}
- list={[{ value: 1 }, { value: 2 }, { value: 3 }, { value: 4 }]}
- onChange={(value) =>
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { range: value },
- })
- )
- }
- />
-
-
- );
-};
-
-const ArpeggB = (props) => {
- const parameters = useSelector((state) => selectById(state, props.id));
- const dispatch = useDispatch();
-
- return (
-
-
Arpeggio B.
-
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { latch: value },
- })
- )
- }
- />
- Swing
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { swing: value },
- })
- )
- }
- />
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { keySync: value },
- })
- )
- }
- />
-
-
-
- Last Step
- `Step ${v.value}`}
- value={parameters.lastStep}
- list={[
- { value: 1 },
- { value: 2 },
- { value: 3 },
- { value: 4 },
- { value: 5 },
- { value: 6 },
- { value: 7 },
- { value: 8 },
- ]}
- onChange={(value) =>
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { lastStep: value },
- })
- )
- }
- />
- Target Timbre
-
- dispatch(
- parameterUpdated({
- id: props.id,
- changes: { target: value },
- })
- )
- }
- />
-
-
- );
-};
-
-export { ArpeggA, ArpeggB };
diff --git a/src/features/editor/parameters/Filter.js b/src/features/editor/parameters/Filter.js
index 2a89a69..ceb4542 100644
--- a/src/features/editor/parameters/Filter.js
+++ b/src/features/editor/parameters/Filter.js
@@ -3,7 +3,6 @@ import Card from '../card';
import { Select, Knob } from '../../utils/components';
import { useSelector, useDispatch } from 'react-redux';
import { selectById, parameterUpdated } from './parameterSlice.js';
-import { Slider } from '../../helpers/Helpers';
export default function Filter(props) {
const parameters = useSelector((state) => selectById(state, props.id));
@@ -11,10 +10,10 @@ export default function Filter(props) {
return (
-
+
Filter Type
-
-
-
-
Cutoff
+
+
+
+
Cutoff
-
-
Resonance
+
+
Resonance
-
-
-
-
+
+
+
+
EG Intensity
-
-
+
+
Keyboard Track
{
const dispatch = useDispatch();
return (
-
-
+
+
Cutoff
{
}
/>
-
+
Resonance
{
}
/>
-
+
EF Sense
{
const dispatch = useDispatch();
return (
-
-
+
+
Source
-
+
Intensity
{
return (
-
-
+
+
Source
-
+
Destination
-
+
Mod Intensity
-
+
+
diff --git a/src/features/editor/parameters/VCO.js b/src/features/editor/parameters/VCO.js
index 20ecbad..6a1b7db 100644
--- a/src/features/editor/parameters/VCO.js
+++ b/src/features/editor/parameters/VCO.js
@@ -9,11 +9,11 @@ export default function VCO(props) {
const dispatch = useDispatch();
return (
-
-
-
Waveform
+
+
+
Waveform
-
-
{`${props.dwgsOrModTypeName}`}
+
+
{`${props.dwgsOrModTypeName}`}
-
-
-
Waveform Mod
+
+
+
Waveform Mod
-
-
LFO Mod
+
+
LFO Mod
{
return (
-
-
-
+
+
+
Gate Sense
{
}
/>
-
-
-
+
+
HPF Level
{
}
/>
-
+
HPF Gate
dispatch(
diff --git a/src/features/io/convert/serialise.js b/src/features/io/convert/serialise.js
index 1f74f1d..fdc1eb8 100644
--- a/src/features/io/convert/serialise.js
+++ b/src/features/io/convert/serialise.js
@@ -14,7 +14,7 @@ export default function serialise(patch) {
data.append(serialise_vocoder(patch[1]));
break;
}
- console.log(data);
+ return data;
}
function serialise_patch(patch) {
@@ -155,7 +155,93 @@ function serialise_timbre(num, timbre) {
),
timbre[`t${num}_patch_4_intensity`],
];
+ array.append(Array(55).fill(0));
return array;
}
-function serialise_vocoder(vocoder) {}
+function serialise_vocoder(vocoder) {
+ const array = [
+ vocoder.v_midi_channel,
+ buildByte(
+ { value: vocoder.v_assign_mode, start: 6 },
+ { value: vocoder.v_eg_2_reset, start: 5 },
+ { value: vocoder.v_eg_1_reset, start: 4 },
+ { value: vocoder.v_trigger_mode, start: 3 },
+ { value: vocoder.v_key_priority, start: 0 }
+ ),
+ vocoder.v_unison_detune,
+ vocoder.v_tune,
+ vocoder.v_bend_range,
+ vocoder.v_transpose,
+ vocoder.v_vibrato_int,
+ vocoder.v_osc_wave,
+ vocoder.v_osc_ctrl_1,
+ vocoder.v_osc_ctrl_2,
+ vocoder.v_osc_dgws,
+ 0,
+ vocoder.v_audio_in_hpf_gate,
+ 0,
+ vocoder.v_portamento_time,
+ vocoder.v_osc_level,
+ vocoder.v_audio_in_level,
+ vocoder.v_noise_level,
+ vocoder.v_audio_in_hpf_level,
+ vocoder.v_audio_in_gate_sense,
+ vocoder.v_audio_in_threshold,
+ vocoder.v_filter_shift,
+ vocoder.v_filter_cutoff,
+ vocoder.v_filter_resonance,
+ vocoder.v_filter_mod_source,
+ vocoder.v_filter_intensity,
+ vocoder.v_filter_e_f_sense,
+ vocoder.v_amp_level,
+ vocoder.v_amp_direct_level,
+ vocoder.v_amp_distortion,
+ vocoder.v_amp_vel_sense,
+ vocoder.v_amp_key_track,
+ vocoder.v_eg_1_attack,
+ vocoder.v_eg_1_decay,
+ vocoder.v_eg_1_sustain,
+ vocoder.v_eg_1_release,
+ vocoder.v_eg_2_attack,
+ vocoder.v_eg_2_decay,
+ vocoder.v_eg_2_sustain,
+ vocoder.v_eg_2_release,
+ buildByte(
+ { value: vocoder.v_lfo_1_key_sync, start: 4 },
+ { value: vocoder.v_lfo_1_wave, start: 0 }
+ ),
+ vocoder.v_lfo_1_frequency,
+ buildByte(
+ { value: vocoder.v_lfo_1_tempo_sync, start: 7 },
+ { value: vocoder.v_lfo_1_sync_note, start: 0 }
+ ),
+ buildByte(
+ { value: vocoder.v_lfo_2_key_sync, start: 4 },
+ { value: vocoder.v_lfo_2_wave, start: 0 }
+ ),
+ vocoder.v_lfo_2_frequency,
+ buildByte(
+ { value: vocoder.v_lfo_2_tempo_sync, start: 7 },
+ { value: vocoder.v_lfo_2_sync_note, start: 0 }
+ ),
+ vocoder.v_level_1,
+ vocoder.v_level_2,
+ vocoder.v_level_3,
+ vocoder.v_level_4,
+ vocoder.v_level_5,
+ vocoder.v_level_6,
+ vocoder.v_level_7,
+ vocoder.v_level_8,
+ vocoder.v_pan_1,
+ vocoder.v_pan_2,
+ vocoder.v_pan_3,
+ vocoder.v_pan_4,
+ vocoder.v_pan_5,
+ vocoder.v_pan_6,
+ vocoder.v_pan_7,
+ vocoder.v_pan_8,
+ ];
+ array.append(Array(174).fill(0));
+ return array;
+}
diff --git a/src/features/io/index.js b/src/features/io/index.js
index 3cc815f..91765fa 100644
--- a/src/features/io/index.js
+++ b/src/features/io/index.js
@@ -1,4 +1,9 @@
-import { sysex_decode, sysex_check } from './utils/sysex';
+import {
+ sysex_decode,
+ sysex_encode,
+ sysex_check,
+ sysex_write_header,
+} from './utils/sysex';
import parse from './convert/parse';
import serialise from './convert/serialise';
import build_store from './convert/loadStore';
@@ -12,7 +17,8 @@ function return_store_from_file(file) {
function return_file_from_store(state) {
const simple_state = saveStoreState(state);
- console.log(serialise(simple_state));
+ const headless_binary = sysex_encode(serialise(simple_state));
+ return sysex_write_header(headless_binary, 0);
}
export { return_store_from_file, return_file_from_store };
diff --git a/src/features/menu/index.js b/src/features/menu/index.js
index 0000ca5..3284c04 100644
--- a/src/features/menu/index.js
+++ b/src/features/menu/index.js
@@ -41,14 +41,14 @@ export default function Menu() {
}, [state.patch.mode, dispatch]);
return (
-
-
-
+
+
+
{
dispatch(
@@ -60,41 +60,44 @@ export default function Menu() {
}}
/>
-
+
{
loadFile(e.target.files[0]);
}}
/>
-
-
+
-
-
Alapatch A microKORG Patch
+
+ Alapatch
A microKORG Patch
Editor