diff --git a/src/globals.hh b/src/globals.hh index 3e8420a..2aba6d5 100644 --- a/src/globals.hh +++ b/src/globals.hh @@ -2,33 +2,49 @@ #define HECK_DAISY_GLOBALS_HH #include -namespace Constants { - constexpr int BUFFERSIZE = 4; - constexpr int SAMPLERATE = 48000; - constexpr int TRACK_COUNT = 4; - - namespace MIDI_Mapping { - constexpr int TRACK_PITCH = 70; - constexpr int TRACK_DECAY = 71; - constexpr int TRACK_PARAM1 = 72; - constexpr int TRACK_PARAM2 = 73; - constexpr int TRACK_FILTER = 74; - constexpr int TRACK_DRIVE = 75; - constexpr int TRACK_VOLUME = 76; - } // namespace MIDI_Mapping -} // namespace Constants - -// Types -using u8 = uint8_t; -using u16 = uint16_t; -using u32 = uint32_t; -using u64 = uint64_t; - -using i8 = int8_t; -using i16 = int16_t; -using i32 = int32_t; -using i64 = int64_t; - -using f32 = float; -using f64 = double; +#include "daisy_seed.h" +#include "daisysp.h" + +namespace Heck { + namespace ld = daisy; + namespace dsp = daisysp; + + namespace Constants { + constexpr int BUFFERSIZE = 4; + constexpr int SAMPLERATE = 48000; + constexpr int TRACK_COUNT = 4; + + namespace MIDI_Mapping { + constexpr int TRACK_PITCH = 70; + constexpr int TRACK_DECAY = 71; + constexpr int TRACK_PARAM1 = 72; + constexpr int TRACK_PARAM2 = 73; + constexpr int TRACK_FILTER = 74; + constexpr int TRACK_DRIVE = 75; + constexpr int TRACK_VOLUME = 76; + constexpr int TRACK_MODE1 = 78; + constexpr int TRACK_MODE2 = 79; + constexpr int TRACK_FILTERMODE = 80; + } // namespace MIDI_Mapping + } // namespace Constants + + // Types + using u8 = uint8_t; + using u16 = uint16_t; + using u32 = uint32_t; + using u64 = uint64_t; + + using i8 = int8_t; + using i16 = int16_t; + using i32 = int32_t; + using i64 = int64_t; + + using f32 = float; + using f64 = double; + + //Hardware + extern ld::DaisySeed hw; +} // namespace Heck + + #endif \ No newline at end of file diff --git a/src/instr_abstract.hh b/src/instr_abstract.hh index 7ef91e0..0a2d45e 100644 --- a/src/instr_abstract.hh +++ b/src/instr_abstract.hh @@ -5,7 +5,7 @@ namespace Heck { namespace Instrument { - int samplerate = Constants::SAMPLERATE; + static int samplerate = Constants::SAMPLERATE; class AbstractInstrument { public: