otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'tildearrow:master' into SID3

Browse source
This commit is contained in:
LTVA1 2024-08-02 11:13:15 +03:00 • committed by GitHub
commit 1a67453b99
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 100 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/engine/platform/fds.cpp
View file

@ -200,6 +200,15 @@ void DivPlatformFDS::tick(bool sysTick) {
}
rWrite(0x4082,chan[i].freq&0xff);
rWrite(0x4083,(chan[i].freq>>8)&15);
if (chan[i].autoModNum>0 && chan[i].autoModDen>0) {
chan[i].modFreq=(chan[i].freq*chan[i].autoModNum)/chan[i].autoModDen;
if (chan[i].modFreq>4095) chan[i].modFreq=4095;
if (chan[i].modFreq<0) chan[i].modFreq=0;
rWrite(0x4086,chan[i].modFreq&0xff);
rWrite(0x4087,chan[i].modFreq>>8);
}
if (chan[i].keyOn) chan[i].keyOn=false;
if (chan[i].keyOff) chan[i].keyOff=false;
chan[i].freqChanged=false;
@ -342,6 +351,13 @@ int DivPlatformFDS::dispatch(DivCommand c) {
rWrite(0x4087,chan[c.chan].modFreq>>8);
break;
}
case DIV_CMD_FDS_MOD_AUTO:
chan[c.chan].autoModNum=c.value>>4;
chan[c.chan].autoModDen=c.value&15;
chan[c.chan].freqChanged=true;
chan[c.chan].modOn=(chan[c.chan].autoModNum && chan[c.chan].autoModDen);
rWrite(0x4084,(chan[c.chan].modOn<<7)|0x40|chan[c.chan].modDepth);
break;
case DIV_CMD_NOTE_PORTA: {
int destFreq=NOTE_FREQUENCY(c.value2);
bool return2=false;

3
src/engine/platform/fds.h
View file

@ -29,6 +29,7 @@ class DivPlatformFDS: public DivDispatch {
struct Channel: public SharedChannel<signed char> {
int prevFreq, modFreq;
unsigned char duty, sweep, modDepth, modPos;
unsigned char autoModNum, autoModDen;
bool sweepChanged, modOn;
signed short wave;
signed char modTable[32];
@ -40,6 +41,8 @@ class DivPlatformFDS: public DivDispatch {
sweep(8),
modDepth(0),
modPos(0),
autoModNum(0),
autoModDen(0),
sweepChanged(false),
modOn(false),
wave(-1) {