Skip to content

update to latest arduino and midi library requirements #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
farvardin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to latest arduino and midi library requirements #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CheapSynth_FM4osc2Poly_v0_5_6/ADSRslow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class ADSR

inline
unsigned int convertMsecToControlSteps(unsigned int msec){
return (uint) (((ulong)msec*CONTROL_UPDATE_RATE)>>10); // approximate /1000 with shift
return (unsigned int) (((unsigned long )msec*CONTROL_UPDATE_RATE)>>10); // approximate /1000 with shift
}

inline
Expand Down Expand Up @@ -96,7 +96,7 @@ inline
void setTime(phase * p, unsigned int msec)
{
p->control_steps=convertMsecToControlSteps(msec);
p->audio_steps = (ulong) p->control_steps * AUDIO_TICKS_PER_CONTROL;
p->audio_steps = (unsigned long) p->control_steps * AUDIO_TICKS_PER_CONTROL;
}


Expand Down
5 changes: 4 additions & 1 deletion CheapSynth_FM4osc2Poly_v0_5_6/CheapSynth_FM4osc2Poly_v0_5_6.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,17 @@ to less computationally demanding envelopes in Mode 0 and 2), toggles between sh
*/

#include <MIDI.h>

MIDI_CREATE_DEFAULT_INSTANCE();

#include <MozziGuts.h>
#include <Oscil.h> /oscSaw/ oscillator template
#include <Line.h> // for envelope
#include <tables/cos2048_int8.h> // table for Oscils to play
#include <tables/saw1024_int8.h> // table for Oscils to play
#include <tables/smoothsquare8192_int8.h> // NB portamento requires table > 512 size?
#include <mozzi_midi.h>
#include <ADSRslow.h>
#include "ADSRslow.h"
#include <mozzi_fixmath.h>
#include <LowPassFilter.h>
#include <Portamento.h>
Expand Down