diff --git a/software/contrib/osc_control-docs/touchosc_sample_cfg.png b/software/contrib/osc_control-docs/touchosc_sample_cfg.png new file mode 100644 index 000000000..de4645b1f Binary files /dev/null and b/software/contrib/osc_control-docs/touchosc_sample_cfg.png differ diff --git a/software/contrib/osc_control.md b/software/contrib/osc_control.md index 50d1862f0..fade1ac73 100644 --- a/software/contrib/osc_control.md +++ b/software/contrib/osc_control.md @@ -126,9 +126,22 @@ _Configuring TouchOSC's networking_ ### UI setup -The simplest way to control EuroPi via TouchOSC is to add six sliders to your panel. -Then edit each slider to set its name to `europi/cvN` where `N` is the number `1` to -`6`. +#### Sample Setup + +A [sample configuration file](/software/desktop/touch_osc/europi.tosc) is provided +in the `software/desktop` directory. Copy this file onto your device and import it into +TouchOSC. This will automatically add the following controls: + +![TouchOSC Sample Config](./osc_control-docs/touchosc_sample_cfg.png) + +- 6 red sliders to control EuroPi's outputs +- green indicators for the values of `din` and `ain` +- blue indicators for the values of `k1`, `k2`, `b1`, and `b2` + +#### Manual Setup + +To manuyally set up TouchOSC to control EuroPi, add six sliders to your panel. Then edit each +slider to set its name to `europi/cvN` where `N` is the number `1` to `6`. ![TouchOSC Setup](./osc_control-docs/touchosc-setup.png) @@ -155,6 +168,6 @@ _EuroPi's OLED showing the same slider levels as TouchOSC_ If you have a [Music Thing Modular 8mu](https://www.musicthing.co.uk/8mu_page/) you can use it to control EuroPi via OSC. -Refer to the [OSC 8mu interface](/software/desktop/osc_8mu.md) for details on +Refer to the [OSC 8mu interface](/software/desktop/osc_8mu/README.md.md) for details on how to set up your computer to read 8mu's sliders and convert them to OSC messages for EuroPi. diff --git a/software/desktop/README.md b/software/desktop/README.md new file mode 100644 index 000000000..bbcd75f03 --- /dev/null +++ b/software/desktop/README.md @@ -0,0 +1,7 @@ +# Desktop and Mobile Software + +This directory contains programs and configuration files intended to run on your desktop/laptop +computer or mobile device, not on EuroPi itself. + +Please refer to the README.md file in each sub-directory for details on how to set up and use +each piece of software. diff --git a/software/desktop/osc_8mu.md b/software/desktop/osc_8mu/README.md similarity index 100% rename from software/desktop/osc_8mu.md rename to software/desktop/osc_8mu/README.md diff --git a/software/desktop/osc_8mu.py b/software/desktop/osc_8mu/osc_8mu.py similarity index 100% rename from software/desktop/osc_8mu.py rename to software/desktop/osc_8mu/osc_8mu.py diff --git a/software/desktop/touch_osc/README.md b/software/desktop/touch_osc/README.md new file mode 100644 index 000000000..bfc8ece67 --- /dev/null +++ b/software/desktop/touch_osc/README.md @@ -0,0 +1,13 @@ +# Sample TouchOSC Configuration + +This directory contains a sample TouchOSC configuration file designed to work with +[`osc_control`](/software/contrib/osc_control.md). + +To use this layout, copy `europi.tosc` onto your device and open TouchOSC. Import +`europi.tosc` into TouchOSC. This will add the following controls: + +![OSC Layout](/software/contrib/osc_control-docs/touchosc_sample_cfg.png) + +- 6 red sliders to control EuroPi's outputs +- green indicators for the values of `din` and `ain` +- blue indicators for the values of `k1`, `k2`, `b1`, and `b2` diff --git a/software/desktop/touch_osc/europi.tosc b/software/desktop/touch_osc/europi.tosc new file mode 100644 index 000000000..5f85833fa Binary files /dev/null and b/software/desktop/touch_osc/europi.tosc differ