diff --git a/make.py b/make.py
index 62c1355..6620e73 100755
--- a/make.py
+++ b/make.py
@@ -242,21 +242,24 @@ class BaseSoC(SoCCore):
         from litescope import LiteScopeAnalyzer
         analyzer_signals = [
             self.audio.targ0.re,
-            self.audio.targ0.storage,
-            # self.audio.backpressure_48,
+            # self.audio.targ0.storage,
+            self.audio.wave0.re,
+            # self.audio.wave0.storage,
+            self.audio.backpressure_48,
             # self.audio.sample_48,
-            # self.audio.audioready_48,
+            self.audio.audioready_48,
             self.audio.readrequest_36,
-            self.audio.sample_36,
+            # self.audio.sample_36,
             self.audio.fifoempty_36,
             self.audio.dac_lrck,
             self.audio.dac_bck,
             self.audio.dac_data,
         ]
+        from math import ceil, floor
+        analyzer_depth = floor(190_000 / ((ceil(sum([s.nbits for s in analyzer_signals]) / 16)) * 16))
         self.submodules.analyzer = LiteScopeAnalyzer(
             analyzer_signals,
-            # depth        = 23000,
-            depth        = 3072,
+            depth        = analyzer_depth,
             clock_domain = "dac",
             samplerate   = 36.92e6, # Actual clock frequency of DAC clock domain
             csr_csv      = "analyzer.csv",