From 9350f90a426f6548f277bb24ade44f736f73ec28 Mon Sep 17 00:00:00 2001
From: Ellen Arvidsson <ellen@log-e.se>
Date: Wed, 18 Jun 2025 11:14:48 +0200
Subject: [PATCH] adjustments

---
 daisy/scope/Makefile   |  1 +
 daisy/scope/osclsk.cpp |  3 +--
 daisy/scope/osclsk.hpp |  4 ++--
 daisy/scope/scope.cpp  | 19 ++++++++++---------
 daisy/scope/tft.cpp    |  4 +---
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/daisy/scope/Makefile b/daisy/scope/Makefile
index 3d3435d..d75b4a6 100644
--- a/daisy/scope/Makefile
+++ b/daisy/scope/Makefile
@@ -1,6 +1,7 @@
 # Project Name
 TARGET = scope
 
+C_DEFS=-DAUDIOC_DEBUG
 # Sources
 CPP_SOURCES = scope.cpp tft.cpp osclsk.cpp
 
diff --git a/daisy/scope/osclsk.cpp b/daisy/scope/osclsk.cpp
index 08214f3..7744024 100644
--- a/daisy/scope/osclsk.cpp
+++ b/daisy/scope/osclsk.cpp
@@ -1,8 +1,7 @@
+#include "audioc.hpp"
 #include "scope.hpp"
 #include "osclsk.hpp"
 
-#define AUDIOC_DEBUG
-#include "audioc.hpp"
 
 
 #define _HUUUGE_FLOAT		(std::numeric_limits<float>::infinity())
diff --git a/daisy/scope/osclsk.hpp b/daisy/scope/osclsk.hpp
index 90ab806..96a82c1 100644
--- a/daisy/scope/osclsk.hpp
+++ b/daisy/scope/osclsk.hpp
@@ -12,8 +12,8 @@ using namespace daisy;
 #define OSCLSK_SCREEN_YSZ ILI9341_TFTWIDTH
 
 
-#define OSCLSK_RATE_DIV		64
-#define OSCLSK_LKB_AMOUNT	32
+#define OSCLSK_RATE_DIV		48
+#define OSCLSK_LKB_AMOUNT	10
 
 #define OSCLSK_BLOCK_LEN	OSCLSK_SCREEN_XSZ
 #define OSCLSK_TRIG_LOOKBACK	0x100u
diff --git a/daisy/scope/scope.cpp b/daisy/scope/scope.cpp
index 36047dd..fe75e89 100644
--- a/daisy/scope/scope.cpp
+++ b/daisy/scope/scope.cpp
@@ -11,10 +11,9 @@ using namespace daisysp;
 #define SCOPE_RING_BUF_SIZE	4096
 #define AUDIO_BLOCK_SIZE	2
 
-#define AUDIOC_DEBUG
-
 /* declarations */
 DaisySeed daisy_hw;
+System sys;
 
 #ifdef AUDIOC_DEBUG
 CpuLoadMeter load_meter;
@@ -40,12 +39,12 @@ void
 audio_cb(AudioHandle::InputBuffer in,
     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
 	load_meter.OnBlockStart();
 #endif
+	float osc_out, noise_out, snr_env_out, kck_env_out;
+	float sig[AUDIO_BLOCK_SIZE];
+
 	//Get rid of any bouncing
 	snare.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
 main(void)
 {
@@ -158,7 +158,8 @@ main(void)
 
 #ifdef AUDIOC_DEBUG
 	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
 
 	if (scope.init(dma_area, sizeof(dma_area)) == -1)
@@ -198,8 +199,8 @@ main(void)
 
 
 #ifdef AUDIOC_DEBUG
-		if (--load_tick == 0) {
-			load_tick = LOAD_METER_TICKS;
+		if ((t = sys.GetNow()) > load_tick + LOAD_PERIOD) {
+			load_tick = t;
 			// get the current load (smoothed value and peak values)
 			const float avgLoad = load_meter.GetAvgCpuLoad();
 			const float maxLoad = load_meter.GetMaxCpuLoad();
diff --git a/daisy/scope/tft.cpp b/daisy/scope/tft.cpp
index 19998a9..3d2a904 100644
--- a/daisy/scope/tft.cpp
+++ b/daisy/scope/tft.cpp
@@ -1,10 +1,8 @@
 #include "daisy.h"
+#include "audioc.hpp"
 
 #include "tft.hpp"
 
-#define AUDIOC_DEBUG
-#include "audioc.hpp"
-
 using namespace daisy;