diff --git a/Makefile.conf b/Makefile.conf index 09e8bf6..dd13d7d 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -1,5 +1,5 @@ -#HERE:=$(dir $(lastword $(MAKEFILE_LIST))) --include build.conf +HERE:=$(dir $(lastword $(MAKEFILE_LIST))) +-include $(HERE)/build.conf TARGET_LIB = libdizzy.a FLASH_TARGET ?= main_testtone @@ -10,7 +10,11 @@ DAISYSP_DIR ?= ../../heck_DaisySP CXX_STANDARD ?= -std=c++17 CXXFLAGS += -Wall -Wno-unused -Wno-reorder-ctor -Wno-switch -CXXFLAGS += -fdiagnostics-color=always +CXXFLAGS += \ + -fdiagnostics-color=always \ + -fmessage-length=170 \ + -fdiagnostics-path-format=inline-events \ + -fdiagnostics-show-template-tree \ #APP_TYPE ?= BOOT_NONE #LDFLAGS += -u_printf_float \ No newline at end of file diff --git a/examples/Makefile b/examples/Makefile index ed25329..170b25e 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -11,10 +11,22 @@ LDFLAGS += -L$(LIBDIZZY_DIR) LDFLAGS += -ldizzy SRC_EXCLUDED := \ - main_minimal.c \ - main_adc.cc \ + main_adc_direct.cc \ main_memtest1.cc \ - test_bla.c + main_minimal.c \ + main_cpuload.cc +# main_adc.cc \ +# main_blink.cc \ +# main_cli.cc \ +# main_density.cc \ +# main_framework_proto1.cc \ +# main_framework_proto2.cc \ +# main_memtest1.cc \ +# main_minimal.cc \ +# main_template_full.cc \ +# main_testtone.cc \ +# main_usbhost.cc \ + SOURCES := $(wildcard *) SOURCES := $(filter-out $(SRC_EXCLUDED), $(SOURCES)) diff --git a/examples/main_testtone.cc b/examples/main_testtone.cc index 0890985..c3ec851 100644 --- a/examples/main_testtone.cc +++ b/examples/main_testtone.cc @@ -1,54 +1,41 @@ -#include "types.hh" +#include "daisy_seed.h" +#include "daisysp.h" -namespace Heck { - namespace Constants { - } - - ld::DaisySeed hw{}; - dsp::Oscillator osc{}; +namespace ld = daisy; +namespace dsp = daisysp; - void AudioCallback( - ld::AudioHandle::InterleavingInputBuffer in, - ld::AudioHandle::InterleavingOutputBuffer out, - size_t size) - { - float osc_out; - osc.SetFreq(1000); +ld::DaisySeed seed{}; +dsp::Oscillator osc_l{}; +dsp::Oscillator osc_r{}; - for (size_t i = 0; i < size; i += 2) { - osc.SetAmp(1.0); - osc_out = osc.Process(); - osc_out *= 0.005; - out[i] = osc_out; - out[i + 1] = osc_out; - } +void AudioCallback( + ld::AudioHandle::InputBuffer in, + ld::AudioHandle::OutputBuffer out, + size_t size) +{ + float osc_out{}; + for (size_t i = 0; i < size; i++) { + out[0][i] = osc_l.Process() * 0.005; + out[1][i] = osc_r.Process() * 0.005; } +} - void init() - { - hw.Configure(); - hw.Init(); - hw.SetAudioBlockSize(4); - float samplerate = hw.AudioSampleRate(); - - osc.Init(samplerate); - osc.SetWaveform(osc.WAVE_SIN); - osc.SetAmp(1.f); - osc.SetFreq(1000); - - hw.StartAudio(AudioCallback); - } +int main(void) +{ + // system init + seed.Configure(); + seed.Init(); + seed.SetAudioBlockSize(4); + float samplerate = seed.AudioSampleRate(); - void mainloop() - { - for (;;) {} - } -} // namespace Heck + // application init + osc_l.Init(samplerate); + osc_l.SetFreq(300); + osc_r.Init(samplerate); + osc_r.SetFreq(400); -int main(void) -{ - Heck::init(); - Heck::mainloop(); + // system main + seed.StartAudio(AudioCallback); return 0; }