Midi Handshake

.github/workflows/ci.yml

@@ -35,7 +35,7 @@ jobs:
  with:
  submodules: recursive
  - name: Install Dependencies
- run: sudo apt install -y libsdl2-dev libasound2-dev mesa-common-dev python3.7 python3.7-dev
+ run: sudo apt update && sudo apt install -y libsdl2-dev libasound2-dev mesa-common-dev python3.7 python3.7-dev
  - name: Setup
  run: make setup_sim
  - name: Build

README.md

@@ -1,4 +1,19 @@
-![Build Status](https://github.com/westlicht/performer/actions/workflows/ci.yml/badge.svg?branch=master)
+Build Status: ![Build Status](https://github.com/jackpf/performer/actions/workflows/ci.yml/badge.svg?branch=master)
+Upstream Build Status: ![Upstream Build Status](https://github.com/westlicht/performer/actions/workflows/ci.yml/badge.svg?branch=master)
+
+# Improvements
+
+This is a fork of the [original repository](https://github.com/westlicht/performer), with some improvements that I personally find essential.
+
+To find out more about improvements changes, check the table below.
+
+| Change | Documentation |
+|-------------------- |-------------------------------------------------- |
+| Noise reduction | [docs](./doc/improvements/noise-reduction.md) |
+| Shape improvements | [docs](./doc/improvements/shape-improvements.md) |
+| MIDI improvements | [docs](./doc/improvements/midi-improvements.md) |
+
+--- original documentation below ---
 
 # PER|FORMER
 

doc/improvements/midi-improvements.md

@@ -0,0 +1,22 @@
+# Improvement: MIDI Improvements
+
+This change improves MIDI integration of the performer.
+
+## Program Change Messages
+
+The performer can now send and receive program change messages.
+
+Note:
+
+- Program change messages must be enabled in the project settings
+- Program change messages are only sent when changing all patterns to the same pattern (changing patterns individually will not trigger program change messages)
+- Program change messages are currently always sent on channel 0
+- Program change messages are sent slightly before the end of the sequence in sync mode (this allows the receiving hardware some time to acknowledge the program change request)
+
+## Always Sync Patterns
+
+Enabled in project settings. This isn't strictly a MIDI improvement, but it works well with program changes.
+
+When enabled, pattern changes are synced by default, rather than having to press **SYNC** before selecting a pattern.
+
+Not very exciting, but very useful for live performance when you want things to always be synced.

doc/improvements/noise-reduction.md

@@ -0,0 +1,30 @@
+# Improvement: Noise Reduction
+
+The OLED screen that the performer uses is inherently noisy. It generates noise on the power bus, and also on its outputs,
+meaning any other module that is connected to the performer will pick up this noise (particularly VCOs & filters).
+
+It's not very noticeable, unless you amplify, compress or overdrive the output, but it's definitely there.
+
+The issue with some further information on the original original repository is [here](https://github.com/westlicht/performer/issues/304).
+
+The problem is not entirely solvable by software (since it's a hardware issue), but basically the amount of noise is directly
+related to the pixels that are lit up on the OLED screen.
+
+This change provides some settings to reduce the noise as much as possible (I think I achieved around 20dB reduction).
+
+## Guide
+
+1. Open up the **System** page (**PAGE** + **SYSTEM**)
+2. Press **SETTINGS** (**F5**)
+
+## Settings
+
+| Setting | Description |
+|-------------- |----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Brightness | Reduces the overall brightness of the display. Lower brightness will reduce noise. |
+| Screensaver | Turns the screen off after the specified time, or "off" to disable. When the screen is off, the noise is completely gone. This is useful in a studio setting, when you'd like to record something completely noise-free. |
+| Wake Mode | Determines when the screen should "wake up" from the screensaver. "always" will wake the screen on any key press. "required" allows the screen to stay off when performing tasks that don't really require the screen, e.g. modifying a sequence (since the LEDs describe the current sequence). This is also a pseudo "screen-less" mode for the sequencer, which can be nice :) |
+| Dim Sequence | The sequence page is particularly noisy if a lot of steps are enabled from the steps currently displayed on-screen. With dim sequence on, the squares are slightly darker than normal, which reduces noise on the sequence page substantially. |
+
+One change that is not added as a setting is changing the footer UI elements (the text relating the the **F** keys)
+so that the active function is bold instead of highlighted. This reduces noise drastically.

doc/improvements/shape-improvements.md

@@ -0,0 +1,36 @@
+# Improvement: Shape Improvements
+
+This change improves curve sequencing.
+
+## Curves spanning multiple steps
+
+Adds the ability to make a curve span over multiple steps.
+
+### Guide
+
+1. Open a curve track
+2. Select multiple steps (**SHIFT** + **Sx**)
+3. Hold **SHIFT** and turn the encoder to select a shape
+
+The shape will be spread across the selected steps.
+
+Not holding **SHIFT** will result in the original behaviour - all selected steps are set to the same shape.
+
+### Extra features
+
+- While holding **SHIFT** with multiple steps selected, pressing the encoder will reverse the shape across the selected steps
+
+## Extra shapes
+
+Adds more shapes.
+
+Added shapes:
+
+- Half ramp up: same as ramp up, but half a step
+- Half ramp down: same as ramp down, but half a step
+- Half exponential up: same as exponential up, but half a step
+- Half exponential down: same as exponential down, but half a step
+- Half log up: same as log up, but half a step
+- Half log down: same as log down, but half a step
+- Half smooth up: same as smooth up, but half a step
+- Half smooth down: same as smooth down, but half a step

src/apps/sequencer/CMakeLists.txt

@@ -48,6 +48,7 @@ set(sources
  model/Track.cpp
  model/Types.cpp
  model/UserScale.cpp
+ model/UserSettings.cpp
  # ui
  ui/Controller.cpp
  ui/ControllerManager.cpp
@@ -56,6 +57,7 @@ set(sources
  ui/Page.cpp
  ui/PageManager.cpp
  ui/Ui.cpp
+ ui/Screensaver.cpp
  # ui/controllers/launchpad
  ui/controllers/launchpad/LaunchpadController.cpp
  ui/controllers/launchpad/LaunchpadDevice.cpp

src/apps/sequencer/Sequencer.cpp

@@ -80,7 +80,7 @@ static CCMRAM_BSS Profiler profiler;
 
 static Model model;
 static CCMRAM_BSS Engine engine(model, clockTimer, adc, dac, dio, gateOutput, midi, usbMidi);
-static CCMRAM_BSS Ui ui(model, engine, lcd, blm, encoder);
+static CCMRAM_BSS Ui ui(model, engine, lcd, blm, encoder, model.settings());
 
 
 static constexpr uint32_t TaskAliveCount = 4;

src/apps/sequencer/SequencerApp.h

@@ -52,7 +52,7 @@ struct SequencerApp {
  SequencerApp() :
  volume(sdCard),
  engine(model, clockTimer, adc, dac, dio, gateOutput, midi, usbMidi),
- ui(model, engine, lcd, blm, encoder)
+ ui(model, engine, lcd, blm, encoder, model.settings())
  {
  MidiMessage::setPayloadPool(midiMessagePayloadPool, sizeof(midiMessagePayloadPool));
 

src/apps/sequencer/asteroids/Asteroids.cpp

@@ -214,7 +214,7 @@ void Player::draw(Canvas &canvas) {
  if (_killed) {
  return;
  }
- canvas.setColor(0xf);
+ canvas.setColor(Color::Bright);
  Mat3 transform = Mat3::transform2D(_position, _angle, 1.f);
  drawShape(canvas, transform, playerShape);
 }
@@ -237,7 +237,7 @@ void Asteroid::update(float dt) {
 }
 
 void Asteroid::draw(Canvas &canvas) {
- canvas.setColor(0x7);
+ canvas.setColor(Color::Medium);
  Mat3 transform = Mat3::transform2D(_position, _angle, _scale);
  drawShape(canvas, transform, asteroidShapes[_shape]);
 }
@@ -263,7 +263,7 @@ void Projectile::update(float dt) {
 void Projectile::draw(Canvas &canvas) {
  const Vec2 &a = _position;
  Vec2 b = a + _direction * 3.f;
- canvas.setColor(0xf);
+ canvas.setColor(Color::Bright);
  canvas.line(a.x, a.y, b.x, b.y);
 }
 
@@ -293,7 +293,7 @@ void Particle::draw(Canvas &canvas) {
  const Vec2 &a = _position;
  Vec2 b = a + _direction * 3.f;
  uint8_t color = static_cast<uint8_t>((1.f - _time / _params->lifeTime) * 0xf);
- canvas.setColor(color);
+ canvas.setColorValue(color);
  canvas.line(a.x, a.y, b.x, b.y);
 }
 
@@ -456,7 +456,7 @@ void Game::update(float dt, Inputs &inputs, Outputs &outputs) {
 
 void Game::draw(Canvas &canvas) {
  canvas.setBlendMode(BlendMode::Set);
- canvas.setColor(0);
+ canvas.setColor(Color::None);
  canvas.fill();
 
  canvas.setBlendMode(BlendMode::Add);
@@ -551,25 +551,25 @@ void Game::divideAsteroid(Asteroid &asteroid) {
 
 void Game::drawTexts(Canvas &canvas, const char *title, const char *msg) {
  canvas.setFont(Font::Small);
- drawShadowText(canvas, (ScreenWidth - canvas.textWidth(title)) / 2, 30, 0xf, title);
+ drawShadowText(canvas, (ScreenWidth - canvas.textWidth(title)) / 2, 30, Color::Bright, title);
 
  canvas.setFont(Font::Tiny);
- drawShadowText(canvas, (ScreenWidth - canvas.textWidth(msg)) / 2, 44, 0x7, msg);
+ drawShadowText(canvas, (ScreenWidth - canvas.textWidth(msg)) / 2, 44, Color::Medium, msg);
 }
 
 void Game::drawHUD(Canvas &canvas) {
  canvas.setFont(Font::Tiny);
 
  FixedStringBuilder<16> level("Level %d", _level);
- drawShadowText(canvas, 2, 7, 0xf, level);
+ drawShadowText(canvas, 2, 7, Color::Bright, level);
 
  FixedStringBuilder<16> score("Score %d", _player.score());
- drawShadowText(canvas, ScreenWidth - 2 - canvas.textWidth(score), 7, 0xf, score);
+ drawShadowText(canvas, ScreenWidth - 2 - canvas.textWidth(score), 7, Color::Bright, score);
 }
 
-void Game::drawShadowText(Canvas &canvas, int x, int y, uint8_t color, const char *str) {
+void Game::drawShadowText(Canvas &canvas, int x, int y, Color color, const char *str) {
  canvas.setBlendMode(BlendMode::Sub);
- canvas.setColor(0x7);
+ canvas.setColor(Color::Medium);
 
  for (int dx = -1; dx <= 1; dx += 1) {
  for (int dy = -1; dy <= 1; dy += 1) {

src/apps/sequencer/asteroids/Asteroids.h

@@ -285,7 +285,7 @@ class Game {
 private:
  void drawTexts(Canvas &canvas, const char *title, const char *msg);
  void drawHUD(Canvas &canvas);
- void drawShadowText(Canvas &canvas, int x, int y, uint8_t color, const char *str);
+ void drawShadowText(Canvas &canvas, int x, int y, Color color, const char *str);
 
  static void initAsteroidShapes();