diff --git a/build.conf.example b/build.conf.example index a6f88ca..8888efa 100644 --- a/build.conf.example +++ b/build.conf.example @@ -3,7 +3,7 @@ # The program to compile and flash # the name of the main cxx file without the prefix 'main_' -TARGET ?= perkons +TARGET ?= osp DEBUG ?= 0 diff --git a/src/Makefile b/src/Makefile index f266621..7419e9f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,6 @@ -include ../build.conf -TARGET ?= perkons +TARGET ?= osp DEBUG ?= 0 LIBDAISY_DIR ?= ../../heck_libDaisy DAISYSP_DIR ?= ../../heck_DaisySP diff --git a/src/globals.hh b/src/globals.hh index 872bbca..02d5485 100644 --- a/src/globals.hh +++ b/src/globals.hh @@ -1,5 +1,5 @@ -#ifndef HECK_DAISY_GLOBALS_HH -#define HECK_DAISY_GLOBALS_HH +#ifndef HECK_OSP_GLOBALS_HH +#define HECK_OSP_GLOBALS_HH #include #include "daisy_seed.h" diff --git a/src/instr_bd2.hh b/src/instr_bd2.hh index c494654..a556f48 100644 --- a/src/instr_bd2.hh +++ b/src/instr_bd2.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_BD2_HH -#define HECK_DAISY_INSTR_BD2_HH +#ifndef HECK_OSP_INSTR_BD2_HH +#define HECK_OSP_INSTR_BD2_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/instr_fm.hh b/src/instr_fm.hh index 978af1e..7252543 100644 --- a/src/instr_fm.hh +++ b/src/instr_fm.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_FM_HH -#define HECK_DAISY_INSTR_FM_HH +#ifndef HECK_OSP_INSTR_FM_HH +#define HECK_OSP_INSTR_FM_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/instr_grainlet.hh b/src/instr_grainlet.hh index a1a7573..6a8245d 100644 --- a/src/instr_grainlet.hh +++ b/src/instr_grainlet.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_GRAINLET_HH -#define HECK_DAISY_INSTR_GRAINLET_HH +#ifndef HECK_OSP_INSTR_GRAINLET_HH +#define HECK_OSP_INSTR_GRAINLET_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/instr_hihat.hh b/src/instr_hihat.hh index d47d86b..4a6f870 100644 --- a/src/instr_hihat.hh +++ b/src/instr_hihat.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_HIHAT_HH -#define HECK_DAISY_INSTR_HIHAT_HH +#ifndef HECK_OSP_INSTR_HIHAT_HH +#define HECK_OSP_INSTR_HIHAT_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/instr_abstract.hh b/src/instr_interface.hh similarity index 81% rename from src/instr_abstract.hh rename to src/instr_interface.hh index 0bac8e9..07e4f61 100644 --- a/src/instr_abstract.hh +++ b/src/instr_interface.hh @@ -1,5 +1,5 @@ -#ifndef HECK_DAISY_PERKONS_INSTR_ABSTRACT -#define HECK_DAISY_PERKONS_INSTR_ABSTRACT +#ifndef HECK_OSP_INSTR_ABSTRACT +#define HECK_OSP_INSTR_ABSTRACT #include "globals.hh" @@ -23,4 +23,4 @@ namespace Heck { } // namespace Heck -#endif // HECK_DAISY_PERKONS_INSTR_ABSTRACT +#endif // HECK_OSP_INSTR_ABSTRACT diff --git a/src/instr_kick.hh b/src/instr_kick.hh index 0ae516f..5967df8 100644 --- a/src/instr_kick.hh +++ b/src/instr_kick.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_KICK_HH -#define HECK_DAISY_INSTR_KICK_HH +#ifndef HECK_OSP_INSTR_KICK_HH +#define HECK_OSP_INSTR_KICK_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/instr_noise.hh b/src/instr_noise.hh index 6dcc241..e705791 100644 --- a/src/instr_noise.hh +++ b/src/instr_noise.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_NOISE_HH -#define HECK_DAISY_INSTR_NOISE_HH +#ifndef HECK_OSP_INSTR_NOISE_HH +#define HECK_OSP_INSTR_NOISE_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/instr_zosc.hh b/src/instr_zosc.hh index b41fef9..3082916 100644 --- a/src/instr_zosc.hh +++ b/src/instr_zosc.hh @@ -1,7 +1,7 @@ -#ifndef HECK_DAISY_INSTR_ZOSC_HH -#define HECK_DAISY_INSTR_ZOSC_HH +#ifndef HECK_OSP_INSTR_ZOSC_HH +#define HECK_OSP_INSTR_ZOSC_HH -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "daisy_seed.h" #include "daisysp.h" diff --git a/src/main_perkons.cc b/src/main_osp.cc similarity index 99% rename from src/main_perkons.cc rename to src/main_osp.cc index 140f704..99baaf0 100644 --- a/src/main_perkons.cc +++ b/src/main_osp.cc @@ -1,4 +1,3 @@ -// Hecks perkons extension #include #include @@ -7,7 +6,7 @@ #include "utils.hh" #include "midiclock.hh" #include "sequencer.hh" -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "instr_kick.hh" #include "instr_noise.hh" #include "instr_fm.hh" diff --git a/src/midiclock.hh b/src/midiclock.hh index cf2c28c..7a926ba 100644 --- a/src/midiclock.hh +++ b/src/midiclock.hh @@ -1,5 +1,5 @@ -#ifndef HECK_PERKONS_MIDICLOCK_HH -#define HECK_PERKONS_MIDICLOCK_HH +#ifndef HECK_OSP_MIDICLOCK_HH +#define HECK_OSP_MIDICLOCK_HH namespace Heck { struct MidiClock { diff --git a/src/sequencer.hh b/src/sequencer.hh index 28cff80..20f6032 100644 --- a/src/sequencer.hh +++ b/src/sequencer.hh @@ -1,5 +1,5 @@ -#ifndef HECK_PERKONS_SEQUENCER_HH -#define HECK_PERKONS_SEQUENCER_HH +#ifndef HECK_OSP_SEQUENCER_HH +#define HECK_OSP_SEQUENCER_HH #include #include "daisy_seed.h" diff --git a/src/track.hh b/src/track.hh index 362f32c..dedf108 100644 --- a/src/track.hh +++ b/src/track.hh @@ -1,8 +1,8 @@ -#ifndef HECK_PERKONS_TRACK_HH -#define HECK_PERKONS_TRACK_HH +#ifndef HECK_OSP_TRACK_HH +#define HECK_OSP_TRACK_HH #include "daisysp.h" -#include "instr_abstract.hh" +#include "instr_interface.hh" #include "utils.hh" #include "globals.hh" namespace dsp = daisysp; diff --git a/src/types.hh b/src/types.hh index 2e7f7d0..b173ff1 100644 --- a/src/types.hh +++ b/src/types.hh @@ -1,5 +1,5 @@ -#ifndef HECK_DAISY_TYPES_HH -#define HECK_DAISY_TYPES_HH +#ifndef HECK_OSP_TYPES_HH +#define HECK_OSP_TYPES_HH #include #include "daisy_seed.h" diff --git a/src/utils.hh b/src/utils.hh index 35a5815..232e20e 100644 --- a/src/utils.hh +++ b/src/utils.hh @@ -1,5 +1,5 @@ -#ifndef HECK_DAISY_UTILS_HH -#define HECK_DAISY_UTILS_HH +#ifndef HECK_OSP_UTILS_HH +#define HECK_OSP_UTILS_HH #include "daisy_seed.h" #include "globals.hh" @@ -12,4 +12,4 @@ namespace Heck { float scalen_center_range(float val, float center, float range); } // namespace Heck -#endif // HECK_DAISY_UTILS_HH \ No newline at end of file +#endif // HECK_OSP_UTILS_HH \ No newline at end of file