etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-22 12:35:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updating ESFMu to version v1.1.1 (envelope delay patch)

Browse source
This commit is contained in:
Kagamiin~ 2024-01-17 10:33:02 -03:00 committed by tildearrow
parent 3cb8190258
commit cb38cf8f67
3 changed files with 41 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
extern/ESFMu/esfm.c vendored
View file

@ -374,7 +374,6 @@ ESFM_envelope_calc(esfm_slot *slot)
bool reset = 0; bool reset = 0;
bool key_on; bool key_on;
bool key_on_signal; bool key_on_signal;
uint16 delay_counter_compare;
key_on = *slot->in.key_on; key_on = *slot->in.key_on;
if (!slot->chip->native_mode) if (!slot->chip->native_mode)
@ -421,19 +420,42 @@ ESFM_envelope_calc(esfm_slot *slot)
{ {
slot->in.eg_delay_run = 1; slot->in.eg_delay_run = 1;
slot->in.eg_delay_counter = 0; slot->in.eg_delay_counter = 0;
slot->in.eg_delay_transitioned_01 = 0;
slot->in.eg_delay_transitioned_01_gate = 0;
slot->in.eg_delay_transitioned_10 = 0;
slot->in.eg_delay_transitioned_10_gate = 0;
slot->in.eg_delay_counter_compare = 0;
if (slot->env_delay > 0)
{
slot->in.eg_delay_counter_compare = 256 << slot->env_delay;
}
} }
else if (!key_on) else if (!key_on)
{ {
slot->in.eg_delay_run = 0; slot->in.eg_delay_run = 0;
} }
delay_counter_compare = 0; // TODO: is this really how the chip behaves? Can it only transition the envelope delay once? Am I implementing this in a sane way? I feel like this is a roundabout hack.
if ((slot->in.eg_delay_transitioned_10 && !slot->in.eg_delay_transitioned_10_gate) ||
(slot->in.eg_delay_transitioned_01 && !slot->in.eg_delay_transitioned_01_gate)
)
{
slot->in.eg_delay_counter_compare = 0;
if (slot->env_delay > 0) if (slot->env_delay > 0)
{ {
delay_counter_compare = 256 << slot->env_delay; slot->in.eg_delay_counter_compare = 256 << slot->env_delay;
}
if (slot->in.eg_delay_transitioned_10)
{
slot->in.eg_delay_transitioned_10_gate = 1;
}
if (slot->in.eg_delay_transitioned_01)
{
slot->in.eg_delay_transitioned_01_gate = 1;
}
} }
if (key_on && ((slot->in.eg_delay_counter >= delay_counter_compare) || !slot->chip->native_mode)) if (key_on && ((slot->in.eg_delay_counter >= slot->in.eg_delay_counter_compare) || !slot->chip->native_mode))
{ {
key_on_signal = 1; key_on_signal = 1;
} else { } else {
@ -443,7 +465,7 @@ ESFM_envelope_calc(esfm_slot *slot)
if (key_on && slot->in.eg_state == EG_RELEASE) if (key_on && slot->in.eg_state == EG_RELEASE)
{ {
if ((slot->in.eg_delay_counter >= delay_counter_compare) || !slot->chip->native_mode) if ((slot->in.eg_delay_counter >= slot->in.eg_delay_counter_compare) || !slot->chip->native_mode)
{ {
reset = 1; reset = 1;
reg_rate = slot->attack_rate; reg_rate = slot->attack_rate;

5
extern/ESFMu/esfm.h vendored
View file

@ -174,7 +174,12 @@ typedef struct _esfm_slot_internal
uint2 eg_state; uint2 eg_state;
flag eg_delay_run; flag eg_delay_run;
flag eg_delay_transitioned_10;
flag eg_delay_transitioned_10_gate;
flag eg_delay_transitioned_01;
flag eg_delay_transitioned_01_gate;
uint16 eg_delay_counter; uint16 eg_delay_counter;
uint16 eg_delay_counter_compare;
} esfm_slot_internal; } esfm_slot_internal;

8
extern/ESFMu/esfm_registers.c vendored
View file

@ -365,6 +365,14 @@ ESFM_slot_write (esfm_slot *slot, uint8_t register_idx, uint8_t data)
ESFM_slot_update_keyscale(slot); ESFM_slot_update_keyscale(slot);
break; break;
case 0x05: case 0x05:
if (slot->env_delay < (data >> 5))
{
slot->in.eg_delay_transitioned_01 = 1;
}
else if (slot->env_delay > (data >> 5))
{
slot->in.eg_delay_transitioned_10 = 1;
}
slot->env_delay = data >> 5; slot->env_delay = data >> 5;
slot->emu_key_on = (data >> 5) & 0x01; slot->emu_key_on = (data >> 5) & 0x01;
slot->block = (data >> 2) & 0x07; slot->block = (data >> 2) & 0x07;