experiments

Accents.cpp.swig

@@ -9,6 +9,9 @@
 #include <./Maths.h>
 #include <./PointsEG.h>
 #include <./Bitwise.h>
+#include <./Tuner.h>
+#include <./TunerGraphic.h>
+#include <./TunerGraphicSub.h>
 
 
 #define SWIGLUA
@@ -19,3 +22,6 @@
 %include <./Maths.h>
 %include <./PointsEG.h>
 %include <./Bitwise.h>
+%include <./Tuner.h>
+%include <./TunerGraphic.h>
+%include <./TunerGraphicSub.h>

Makefile

@@ -22,16 +22,17 @@
 
 # Override these defaults on the commandline:
 PKGNAME ?= Accents
-PKGVERSION ?= 0.6.15
+PKGVERSION ?= 0.6.16
 LIBNAME ?= libAccents
 ARCH ?= linux
 PROFILE ?= testing
 SDKPATH ?= ../er-301
 
+
 # Describe your files to this makefile:
-headers = VoltageVault.h Maths.h PointsEG.h Bitwise.h
-sources = VoltageVault.cpp Accents.cpp.swig Maths.cpp PointsEG.cpp Bitwise.cpp
-assets = toc.lua  Ringmod.lua ABSwitch.lua Amie.lua BespokeAliasingPulse.lua BespokeBPF.lua Bitwise.lua CarouselClockDivider.lua ClockedRandomGate.lua Compare.lua Flanger.lua LinearSamplingVCA.lua Logics.lua MathsUnit.lua MotionSensor.lua OctaveCVShifter.lua Phaser4.lua PingableScaledRandom.lua PointsEG.lua RotarySpeakerSim.lua Scorpio.lua StereoEnsemble.lua TimedGate.lua VoltageBank.lua VoltageBank4.lua VoltageBank2.lua VoltageVault.lua WeightedCoinToss.lua XFade.lua Xo.lua Xoxo.lua Xoxoxo.lua Xxxxxx.lua assets/*
+headers = VoltageVault.h Maths.h PointsEG.h Bitwise.h Tuner.h TunerGraphic.h TunerGraphicSub.h
+sources = VoltageVault.cpp Accents.cpp.swig Maths.cpp PointsEG.cpp Bitwise.cpp Tuner.cpp TunerGraphic.cpp TunerGraphicSub.cpp
+assets = toc.lua  Ringmod.lua ABSwitch.lua Amie.lua BespokeAliasingPulse.lua BespokeBPF.lua Bitwise.lua CarouselClockDivider.lua ClockedRandomGate.lua Compare.lua Flanger.lua LinearSamplingVCA.lua Logics.lua MathsUnit.lua MotionSensor.lua OctaveCVShifter.lua Phaser4.lua PingableScaledRandom.lua PointsEG.lua RotarySpeakerSim.lua Scorpio.lua StereoEnsemble.lua TimedGate.lua Tuner.lua TunerControl.lua VoltageBank.lua VoltageBank4.lua VoltageBank2.lua VoltageVault.lua WeightedCoinToss.lua XFade.lua Xo.lua Xoxo.lua Xoxoxo.lua Xxxxxx.lua assets/*
 
 includes = .
 
@@ -56,7 +57,7 @@ objects = $(addprefix $(out_dir)/,$(c_sources:%.c=%.o))
 objects += $(addprefix $(out_dir)/,$(cpp_sources:%.cpp=%.o))
 objects += $(swig_object)
 
-# includes += $(SDKPATH) $(SDKPATH)/arch/$(ARCH)
+includes += $(SDKPATH) $(SDKPATH)/arch/$(ARCH)
 includes += $(SDKPATH) $(SDKPATH)/arch/$(ARCH) $(SDKPATH)/emu
 
 ifeq ($(ARCH),am335x)

Tuner.cpp

@@ -0,0 +1,48 @@
+#define BUILDOPT_VERBOSE
+#define BUILDOPT_DEBUG_LEVEL 10
+
+#include <./Tuner.h>
+#include <hal/ops.h>
+// #include <hal/simd.h>
+// #include <hal/ops.h>
+#include <od/config.h>
+// #include <vector>
+#include <hal/log.h>
+
+ConfigData globalConfig;
+
+// const std::vector<int> notes = { };
+Tuner::Tuner()
+{
+    addInput(mInput);
+    addOutput(mOutput);
+    addParameter(mIndex);
+}
+
+Tuner::~Tuner()
+{
+}
+
+void Tuner::process()
+{
+    float *out = mOutput.buffer();
+    float *in = mInput.buffer();
+    // radiusIndex = mIndex.value();
+
+    for (int i = 0; i < FRAMELENGTH; i++)
+    {
+        out[i] = in[i];
+        if (lastSampleValue < 0.0f && in[i] >= 0.0f)
+        {
+
+            frequency = (frequency + (1 / (ticksSinceLastZeroCrossing * globalConfig.samplePeriod)))/2;
+            // logDebug(1, "ticksSinceLastZeroCrossing=%d, freq=%f", ticksSinceLastZeroCrossing, frequency);
+            ticksSinceLastZeroCrossing = 0;
+        }
+        else
+        {
+            ticksSinceLastZeroCrossing++;
+        }
+        lastSampleValue = in[i];
+    }
+}

Tuner.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <od/objects/Object.h>
+#include <vector> 
+
+class Tuner : public od::Object
+{
+public:
+  Tuner();
+   ~Tuner();
+
+#ifndef SWIGLUA
+    virtual void process();
+    od::Inlet mInput{"In"};
+    od::Outlet mOutput{"Out"};
+    od::Parameter mIndex{"Index", 0};
+
+#endif
+    // void setVaults(int, float);
+    // float getVaults(int);
+
+protected:
+  friend class TunerGraphic;
+  friend class TunerGraphicSub;
+  // float radiusIndex = 0.0;
+  float frequency = 0.0f;
+  int ticksSinceLastZeroCrossing = 1;
+  float lastSampleValue = 0.0f;
+};

Tuner.lua

@@ -0,0 +1,76 @@
+local app = app
+local libcore = require "core.libcore"
+local libAccents = require "Accents.libAccents"
+local Class = require "Base.Class"
+local Unit = require "Unit"
+local ModeSelect = require "Unit.ViewControl.OptionControl"
+local GainBias = require "Unit.ViewControl.GainBias"
+local BranchMeter = require "Unit.ViewControl.BranchMeter"
+local MenuHeader = require "Unit.MenuControl.Header"
+local Gate = require "Unit.ViewControl.Gate"
+local TunerControl = require "Accents.TunerControl"
+local Encoder = require "Encoder"
+local ply = app.SECTION_PLY
+
+local Tuner = Class {}
+Tuner:include(Unit)
+
+function Tuner:init(args)
+    args.title = "Tuner"
+    args.mnemonic = "--"
+    Unit.init(self, args)
+end
+
+function Tuner:onLoadGraph(channelCount)
+    local tuner = self:addObject("tuner", libAccents.Tuner())
+    local index = self:addObject("index",app.ParameterAdapter())
+    local indexRange = self:addObject("indexRange",app.MinMax())
+    self:addMonoBranch("index", index, "In", index, "Out")
+    connect(self, "In1", tuner, "In")
+    connect(index,"Out",indexRange,"In")
+    tie(tuner, "Index", index, "Out")
+    connect(tuner,"Out", self, "Out1")
+    if channelCount > 1 then
+        connect(tuner, "Out", self, "Out2")
+    end
+end
+
+local views = {
+    expanded = {"circle"},
+    collapsed = {},
+    input = {}
+}
+
+local function linMap(min,max,superCoarse,coarse,fine,superFine)
+    local map = app.LinearDialMap(min,max)
+    map:setSteps(superCoarse,coarse,fine,superFine)
+    return map
+  end
+
+local indexMap = linMap(0, 1.0, 1, 0.1, 0.01, 0.001)
+
+function Tuner:onLoadViews(objects, branches)
+    local controls = {}
+
+    -- controls.index = GainBias {
+    --     button = "index",
+    --     description = "test",
+    --     branch = branches.index,
+    --     gainbias = objects.index,
+    --     range = objects.indexRange,
+    --     biasMap = indexMap,
+    --     -- biasPrecision = 0,
+    --     -- gainMap = indexMap,
+    --     initialBias = 1.0,
+    --   }
+
+      controls.circle = TunerControl {
+        tuner = objects.tuner
+      }
+
+    return controls, views
+end
+
+local menu = {"infoHeader", "rename", "load", "save", "edit"}
+
+return Tuner

TunerControl.lua

@@ -0,0 +1,47 @@
+local app = app
+local libAccents = require "Accents.libAccents"
+local Class = require "Base.Class"
+local ViewControl = require "Unit.ViewControl"
+local ply = app.SECTION_PLY
+
+local TunerControl = Class {}
+TunerControl:include(ViewControl)
+
+function TunerControl:init(args)
+  local tuner = args.tuner or
+                        app.logError("%s.init: tuner is missing.", self)
+
+  ViewControl.init(self, "circle")
+  self:setClassName("TunerControl")
+
+  local width = args.width or (4 * ply)
+
+  local graphic
+  graphic = app.Graphic(0, 0, width, 64)
+  self.pDisplay = libAccents.TunerGraphic(0, 0, width, 64)
+  graphic:addChild(self.pDisplay)
+  self:setMainCursorController(self.pDisplay)
+  self:setControlGraphic(graphic)
+
+  -- add spots
+  for i = 1, (width // ply) do
+    self:addSpotDescriptor{
+      center = (i - 0.5) * ply
+    }
+  end
+
+  local subGraphic = app.Graphic(0, 0, 128, 64)
+  self.subDisplay = libAccents.TunerGraphicSub(0, 0, 128, 64)
+  subGraphic:addChild(self.subDisplay)
+  self.subGraphic = subGraphic
+
+  self:follow(tuner)
+end
+
+function TunerControl:follow(tuner)
+  self.pDisplay:follow(tuner)
+  self.subDisplay:follow(tuner)
+  self.tuner = tuner
+end
+
+return TunerControl

TunerGraphic.cpp

@@ -0,0 +1,116 @@
+#define BUILDOPT_VERBOSE
+#define BUILDOPT_DEBUG_LEVEL 10
+#include <TunerGraphic.h>
+#include <math.h>
+#include <string.h>
+#include <stdlib.h>
+#include <hal/log.h>
+
+TunerGraphic::TunerGraphic(int left, int bottom, int width, int height) : od::Graphic(left, bottom, width, height)
+
+{
+}
+
+TunerGraphic::~TunerGraphic()
+{
+  if (mpTuner)
+  {
+    mpTuner->release();
+  }
+}
+
+const float freqs[108] = {16.35, 17.32, 18.35, 19.45, 20.6, 21.83, 23.12, 24.5, 25.96, 27.5, 29.14, 30.87, 32.7, 34.65, 36.71, 38.89, 41.2, 43.65, 46.25, 49, 51.91, 55, 58.27, 61.74, 65.41, 69.3, 73.42, 77.78, 82.41, 87.31, 92.5, 98, 103.83, 110, 116.54, 123.47, 130.81, 138.59, 146.83, 155.56, 164.81, 174.61, 185, 196, 207.65, 220, 233.08, 246.94, 261.63, 277.18, 293.66, 311.13, 329.63, 349.23, 369.99, 392, 415.3, 440, 466.16, 493.88, 523.25, 554.37, 587.33, 622.25, 659.25, 698.46, 739.99, 783.99, 830.61, 880, 932.33, 987.77, 1046.5, 1108.73, 1174.66, 1244.51, 1318.51, 1396.91, 1479.98, 1567.98, 1661.22, 1760, 1864.66, 1975.53, 2093, 2217.46, 2349.32, 2489.02, 2637.02, 2793.83, 2959.96, 3135.96, 3322.44, 3520, 3729.31, 3951.07, 4186.01, 4434.92, 4698.63, 4978.03, 5274.04, 5587.65, 5919.91, 6271.93, 6644.88, 7040, 7458.62, 7902.13};
+const char *notes[108] = {"C0", "C#0/Db0", "D0", "D#0/Eb0", "E0", "F0", "F#0/Gb0", "G0", "G#0/Ab0", "A0", "A#0/Bb0", "B0", "C1", "C#1/Db1", "D1", "D#1/Eb1", "E1", "F1", "F#1/Gb1", "G1", "G#1/Ab1", "A1", "A#1/Bb1", "B1", "C2", "C#2/Db2", "D2", "D#2/Eb2", "E2", "F2", "F#2/Gb2", "G2", "G#2/Ab2", "A2", "A#2/Bb2", "B2", "C3", "C#3/Db3", "D3", "D#3/Eb3", "E3", "F3", "F#3/Gb3", "G3", "G#3/Ab3", "A3", "A#3/Bb3", "B3", "C4", "C#4/Db4", "D4", "D#4/Eb4", "E4", "F4", "F#4/Gb4", "G4", "G#4/Ab4", "A4", "A#4/Bb4", "B4", "C5", "C#5/Db5", "D5", "D#5/Eb5", "E5", "F5", "F#5/Gb5", "G5", "G#5/Ab5", "A5", "A#5/Bb5", "B5", "C6", "C#6/Db6", "D6", "D#6/Eb6", "E6", "F6", "F#6/Gb6", "G6", "G#6/Ab6", "A6", "A#6/Bb6", "B6", "C7", "C#7/Db7", "D7", "D#7/Eb7", "E7", "F7", "F#7/Gb7", "G7", "G#7/Ab7", "A7", "A#7/Bb7", "B7", "C8", "C#8/Db8", "D8", "D#8/Eb8", "E8", "F8", "F#8/Gb8", "G8", "G#8/Ab8", "A8", "A#8/Bb8", "B8"};
+void TunerGraphic::draw(od::FrameBuffer &fb)
+{
+  const int CURSOR = 3;
+  const int MARGIN = 2;
+  // int radius = MIN(mWidth / 2, mHeight / 2) - MARGIN - CURSOR;
+  if (mpTuner)
+  {
+    currentFreq = mpTuner->frequency;
+
+    // determine the highest note stop
+    for (int i = 0; i < 108; i++)
+    {
+      if (currentFreq <= freqs[i])
+      {
+        topIndex = i;
+        break;
+      }
+    }
+
+    if (abs(freqs[topIndex] - currentFreq) <= abs(freqs[topIndex - 1] - currentFreq))
+    {
+      targetIndex = topIndex;
+    }
+    else
+    {
+      targetIndex = topIndex - 1;
+    }
+
+    // Determine if sharp or flat
+    bool sharp = false;
+    if (currentFreq > freqs[targetIndex])
+    {
+      sharp = true;
+    }
+
+    // Get halfway frequency to next target
+    float halfwayFreq = 0.0f;
+    float percentToHalf = 0.0f;
+    if (sharp)
+    {
+      halfwayFreq = (freqs[targetIndex + 1] - freqs[targetIndex]) / 2;
+      percentToHalf = (currentFreq - freqs[targetIndex]) / (halfwayFreq);
+    }
+    else
+    { // target 440, next down = 415, freq = 430
+      halfwayFreq = (freqs[targetIndex] - freqs[targetIndex - 1] / 2); // 440 - 415 / 2 = 12.5  --- 415+ 12.5 = 427.5
+      percentToHalf = -(currentFreq - (freqs[targetIndex-1] + halfwayFreq)) / (freqs[targetIndex-1] + halfwayFreq); // 75 - 50 / 25
+    }
+
+    int centerX = mWorldLeft + mWidth / 2;
+    int centerY = mWorldBottom + mHeight / 2;
+    // logDebug(1, "sharp: %d", sharp);
+    // fb.circle(GRAY5, centerX, centerY, radius);
+    if (targetIndex >= 0)
+    {
+      int offset = floor(strlen(notes[targetIndex]) / 2 * 16);
+      fb.text(WHITE, centerX - offset + 2, centerY, notes[targetIndex], 16);
+      fb.line(WHITE, centerX, centerY - 10, centerX, centerY - 24);
+      if (sharp)
+      {
+        fb.line(WHITE, centerX, centerY - 16, centerX + floor(80 * percentToHalf), centerY - 16);
+        fb.line(WHITE, centerX, centerY - 17, centerX + floor(80 * percentToHalf), centerY - 17);
+        fb.line(WHITE, centerX, centerY - 18, centerX + floor(80 * percentToHalf), centerY - 18);
+      }
+      else 
+      {
+        fb.line(WHITE, centerX, centerY - 16, centerX - floor(80 * percentToHalf), centerY - 16);
+        fb.line(WHITE, centerX, centerY - 17, centerX - floor(80 * percentToHalf), centerY - 17);
+        fb.line(WHITE, centerX, centerY - 18, centerX - floor(80 * percentToHalf), centerY - 18);
+
+      }
+    }
+    else
+    {
+      fb.text(WHITE, mWorldLeft + 6, centerY, "No note data", 10);
+    }
+
+    // fb.text(WHITE, centerX-10, mHeight-32, notes[targetIndex], 10);
+  }
+}
+
+void TunerGraphic::follow(Tuner *pTuner)
+{
+  if (mpTuner)
+  {
+    mpTuner->release();
+  }
+  mpTuner = pTuner;
+  if (mpTuner)
+  {
+    mpTuner->attach();
+  }
+}

TunerGraphic.h

@@ -0,0 +1,23 @@
+#pragma once
+
+#include <od/graphics/Graphic.h>
+#include <Tuner.h>
+
+class TunerGraphic : public od::Graphic
+{
+public:
+  TunerGraphic(int left, int bottom, int width, int height);
+  virtual ~TunerGraphic();
+
+#ifndef SWIGLUA
+  virtual void draw(od::FrameBuffer &fb);
+#endif
+
+  void follow(Tuner *pTuner);
+
+private:
+  Tuner *mpTuner = 0;
+  float currentFreq = 0.0f;
+  int topIndex = 1;
+  int targetIndex = 1;
+};