Merge branch 'master' into usb_midi_launchpad

Makefile.conf

@@ -1,5 +1,5 @@
-#HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
+HERE:=$(dir $(lastword $(MAKEFILE_LIST)))
--include build.conf
+-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

examples/Makefile

@@ -11,10 +11,22 @@ LDFLAGS += -L$(LIBDIZZY_DIR)
 LDFLAGS += -ldizzy
 
 SRC_EXCLUDED := \
-  main_minimal.c \
+  main_adc_direct.cc \
-  main_adc.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))

examples/main_testtone.cc

@@ -1,54 +1,41 @@
-#include "types.hh"
+#include "daisy_seed.h"
+#include "daisysp.h"
 
-namespace Heck {
+namespace ld = daisy;
-    namespace Constants {
+namespace dsp = daisysp;
-    }
 
-    ld::DaisySeed hw{};
+ld::DaisySeed seed{};
-    dsp::Oscillator osc{};
+dsp::Oscillator osc_l{};
+dsp::Oscillator osc_r{};
 
 void AudioCallback(
-        ld::AudioHandle::InterleavingInputBuffer in,
+    ld::AudioHandle::InputBuffer in,
-        ld::AudioHandle::InterleavingOutputBuffer out,
+    ld::AudioHandle::OutputBuffer out,
     size_t size)
 {
-        float osc_out;
+    float osc_out{};
-        osc.SetFreq(1000);
+    for (size_t i = 0; i < size; i++) {
-
+        out[0][i] = osc_l.Process() *  0.005;
-        for (size_t i = 0; i < size; i += 2) {
+        out[1][i] = osc_r.Process() *  0.005;
-            osc.SetAmp(1.0);
-            osc_out = osc.Process();
-            osc_out *= 0.005;
-            out[i] = osc_out;
-            out[i + 1] = osc_out;
     }
 }
 
-    void init()
+int main(void)
 {
-        hw.Configure();
+    // system init
-        hw.Init();
+    seed.Configure();
-        hw.SetAudioBlockSize(4);
+    seed.Init();
-        float samplerate = hw.AudioSampleRate();
+    seed.SetAudioBlockSize(4);
-
+    float samplerate = seed.AudioSampleRate();
-        osc.Init(samplerate);
-        osc.SetWaveform(osc.WAVE_SIN);
-        osc.SetAmp(1.f);
-        osc.SetFreq(1000);
-
-        hw.StartAudio(AudioCallback);
-    }
 
-    void mainloop()
+    // application init
-    {
+    osc_l.Init(samplerate);
-        for (;;) {}
+    osc_l.SetFreq(300);
-    }
-} // namespace Heck
 
+    osc_r.Init(samplerate);
+    osc_r.SetFreq(400);
 
-int main(void)
+    // system main
-{
+    seed.StartAudio(AudioCallback);
-    Heck::init();
-    Heck::mainloop();
     return 0;
 }