lnsol/log-e-audioc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjustments

Browse source
This commit is contained in:
Ellen Arvidsson 2025-06-18 11:14:48 +02:00
parent 37bb77bc88
commit 9350f90a42
5 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
daisy/scope/Makefile
View file

@ -1,6 +1,7 @@
# Project Name # Project Name
TARGET = scope TARGET = scope
C_DEFS=-DAUDIOC_DEBUG
# Sources # Sources
CPP_SOURCES = scope.cpp tft.cpp osclsk.cpp CPP_SOURCES = scope.cpp tft.cpp osclsk.cpp

3
daisy/scope/osclsk.cpp
View file

@ -1,8 +1,7 @@
#include "audioc.hpp"
#include "scope.hpp" #include "scope.hpp"
#include "osclsk.hpp" #include "osclsk.hpp"
#define AUDIOC_DEBUG
#include "audioc.hpp"
#define _HUUUGE_FLOAT (std::numeric_limits<float>::infinity()) #define _HUUUGE_FLOAT (std::numeric_limits<float>::infinity())

4
daisy/scope/osclsk.hpp
View file

@ -12,8 +12,8 @@ using namespace daisy;
#define OSCLSK_SCREEN_YSZ ILI9341_TFTWIDTH #define OSCLSK_SCREEN_YSZ ILI9341_TFTWIDTH
#define OSCLSK_RATE_DIV 64 #define OSCLSK_RATE_DIV 48
#define OSCLSK_LKB_AMOUNT 32 #define OSCLSK_LKB_AMOUNT 10
#define OSCLSK_BLOCK_LEN OSCLSK_SCREEN_XSZ #define OSCLSK_BLOCK_LEN OSCLSK_SCREEN_XSZ
#define OSCLSK_TRIG_LOOKBACK 0x100u #define OSCLSK_TRIG_LOOKBACK 0x100u

19
daisy/scope/scope.cpp
View file

@ -11,10 +11,9 @@ using namespace daisysp;
#define SCOPE_RING_BUF_SIZE 4096 #define SCOPE_RING_BUF_SIZE 4096
#define AUDIO_BLOCK_SIZE 2 #define AUDIO_BLOCK_SIZE 2
#define AUDIOC_DEBUG
/* declarations */ /* declarations */
DaisySeed daisy_hw; DaisySeed daisy_hw;
System sys;
#ifdef AUDIOC_DEBUG #ifdef AUDIOC_DEBUG
CpuLoadMeter load_meter; CpuLoadMeter load_meter;
@ -40,12 +39,12 @@ void
audio_cb(AudioHandle::InputBuffer in, audio_cb(AudioHandle::InputBuffer in,
AudioHandle::OutputBuffer out, size_t sz) AudioHandle::OutputBuffer out, size_t sz)
{ {
float osc_out, noise_out, snr_env_out, kck_env_out;
float sig[AUDIO_BLOCK_SIZE];
#ifdef AUDIOC_DEBUG #ifdef AUDIOC_DEBUG
load_meter.OnBlockStart(); load_meter.OnBlockStart();
#endif #endif
float osc_out, noise_out, snr_env_out, kck_env_out;
float sig[AUDIO_BLOCK_SIZE];
//Get rid of any bouncing //Get rid of any bouncing
snare.Debounce(); snare.Debounce();
kick.Debounce(); kick.Debounce();
@ -145,7 +144,8 @@ setup_drums(void)
} }
#define LOAD_METER_TICKS (1 << 20) #define LOAD_FREQ 5
#define LOAD_PERIOD (1000u / LOAD_FREQ)
int int
main(void) main(void)
{ {
@ -158,7 +158,8 @@ main(void)
#ifdef AUDIOC_DEBUG #ifdef AUDIOC_DEBUG
load_meter.Init(daisy_hw.AudioSampleRate(), daisy_hw.AudioBlockSize()); load_meter.Init(daisy_hw.AudioSampleRate(), daisy_hw.AudioBlockSize());
uint32_t load_tick = LOAD_METER_TICKS; uint32_t load_tick = sys.GetNow();
uint32_t t;
#endif #endif
if (scope.init(dma_area, sizeof(dma_area)) == -1) if (scope.init(dma_area, sizeof(dma_area)) == -1)
@ -198,8 +199,8 @@ main(void)
#ifdef AUDIOC_DEBUG #ifdef AUDIOC_DEBUG
if (--load_tick == 0) { if ((t = sys.GetNow()) > load_tick + LOAD_PERIOD) {
load_tick = LOAD_METER_TICKS; load_tick = t;
// get the current load (smoothed value and peak values) // get the current load (smoothed value and peak values)
const float avgLoad = load_meter.GetAvgCpuLoad(); const float avgLoad = load_meter.GetAvgCpuLoad();
const float maxLoad = load_meter.GetMaxCpuLoad(); const float maxLoad = load_meter.GetMaxCpuLoad();

4
daisy/scope/tft.cpp
View file

@ -1,10 +1,8 @@
#include "daisy.h" #include "daisy.h"
#include "audioc.hpp"
#include "tft.hpp" #include "tft.hpp"
#define AUDIOC_DEBUG
#include "audioc.hpp"
using namespace daisy; using namespace daisy;