Merge pull request #169 from rerdavies/dev

v1.2.37

.github/workflows/cmake.yml

@@ -29,7 +29,7 @@ jobs:
         sudo apt install libasound2-dev
         sudo apt install libwebsocketpp-dev authbind
         sudo apt install libsdbus-c++-dev libsdbus-c++-bin
-        sudo apt install libavahi-client-dev
+        sudo apt install libavahi-client-dev libzip-dev
         git submodule update --init --recursive 
         ./react-config
 

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.16.0)
 project(pipedal 
-    VERSION 1.2.36
+    VERSION 1.2.37
     DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
     HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
 )
-set (DISPLAY_VERSION "v1.2.36beta2")
+set (DISPLAY_VERSION "v1.2.37beta4")
 
 set (CMAKE_INSTALL_PREFIX "/usr/")
 

README.md

@@ -1,12 +1,12 @@
 
 <img src='docs/GithubBanner.png' width="100%" /><br/>
 
-Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.2.36 Beta3</a> 
+Download: <a href='https://rerdavies.github.io/pipedal/download.html'>v1.2.36 Beta4</a> 
 
 Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
 
 
-> NEW version 1.2.36 Beta3 release, providing support for Raspberry Pi OS Bookworm. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+> NEW version 1.2.36 Beta4 release, providing support for Raspberry Pi OS Bookworm. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 Use your Raspberry Pi as a guitar effects pedal. Configure and control PiPedal with your phone or tablet.
 PiPedal running on a Raspberry Pi 4 provides stable super-low-latency audio via external USB audio devices, or internal Raspberry Pi audio hats.

config/config.json

@@ -14,14 +14,14 @@
     "socketServerAddress": "0.0.0.0:80",
 
     /* Number of threads to use for servicing websockets */
-    "threads" :  10,
+    "threads" :  5,
 
     "logHttpRequests": false,
     /* { None=0,Error =1,Warning =2,Info = 3, Debug=4} */
     "logLevel": 3,
 
     /* Maximum filesize to allow when uploading */
-    "maxUploadSize": 1048576,
+    "maxUploadSize": 536870912,
 
     /* Provide access point capture redirects on this gateway. -- provides automatic browser launching on Access Point access. 
     (not implemented)

docs/BuildPrerequisites.md

@@ -27,7 +27,7 @@ Run the following commands to install dependent libraries required by the PiPeda
     sudo apt install -y authbind
     sudo apt install -y libavahi-client-dev
     sudo apt install -y libnm-dev
-    sudo apt install -y libsdbus-c++-dev
+    sudo apt install -y libsdbus-c++-dev libzip-dev
 
 
 ### Installing Sources

docs/Installing.md

@@ -13,17 +13,17 @@ page_icon: img/Install4.jpg
 
 Download the most recent Debian (.deb) package for your platform:
 
-- [Raspberry Pi OS bookworm (64-bit) v1.2.36 Beta3](https://github.com/rerdavies/pipedal/releases/download/)
+- [Raspberry Pi OS bookworm (64-bit) v1.2.37 Beta4](https://github.com/rerdavies/pipedal/releases/download/)
 - [Ubuntu/Raspberry Pi OS bullseyeye (64-bit) v1.2.31](https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb)
 
-Version 1.2.36 has not yet been tested Ubuntu and Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31.
+Version 1.2.37 has not yet been tested on Ubuntu or Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31.
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo dpkg -i pipedal_1.2.36_arm64.deb 
+  sudo dpkg -i pipedal_1.2.37_arm64.deb 
 ```
 Adjust accordingly if you have downloaded v1.1.31.
 

docs/ReleaseNotes.md

@@ -1,4 +1,26 @@
 # Release Notes
+## Pipedal 1.2.37 Beta4
+
+You can now upload GuitarML Proteus models from the GuitarML project into TooB ML.
+
+- Download protues models from https://guitarml.com/tonelibrary/tonelib-pro.html
+- Load the TooB ML plugin.
+- click on the Model control.
+- click on the Upload button in the lower left corner of the Model selection dialog.
+- Upload the .json model file or .zip model collection that you downloaded from The GuitarML Tone Library.
+
+Features:
+- ToobML allows uploading of models.
+- TooBML support for large models (e.g. GuitarML Proteus models)
+- Support for sub-directories when uploading files.
+- Support for uploading .zip file bundles.
+
+Fixes for the following issues: 
+- Dialog button colors follow Android UI conventions.
+- automatic provisioning of resource files in .LV2 plugins.
+- The web server supports uploading of large files (limited by default to 512MB).
+
+
 ## Pipedal 1.2.36 Beta3
 
 Fixes for the following issues: 

docs/download.md

@@ -4,17 +4,17 @@
 
 Download the most recent Debian (.deb) package for your platform:
 
-- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.2.36/pipedal_1.2.36_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.2.36 Beta3</a>
+- <a href="https://github.com/rerdavies/pipedal/releases/download/v1.2.37/pipedal_1.2.37_arm64.deb">Raspberry Pi OS Bookworm (64-bit) v1.2.37 Beta4</a>
 - <a href="https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb">Ubuntu 21.04 or Raspberry Pi OS bullseyeyeye (64-bit) v1.1.31</a>
 
-v1.2.36 Beta3 is does not currently support Ubuntu 21.04, or older versions of Raspberry Pi OS. 
+v1.2.37 Beta4 is does not currently support Ubuntu 21.04, or older versions of Raspberry Pi OS. 
 
 Install the package by running 
 
 ```
   sudo apt update
   cd ~/Downloads  
-  sudo apt-get install ./pipedal_1.2.36_arm64.deb
+  sudo apt-get install ./pipedal_1.2.37_arm64.deb
 ```
 
 Follow the instructions in [_Configuring PiPedal After Installation_](https://rerdavies.github.io/pipedal/Configuring.html) to complete the installation.

docs/index.md

@@ -1,13 +1,13 @@
 
 
 <img src="GithubBanner.png" width="100%"/>
-<a href="Installing.html"><i>v1.2.36</i></a>
+<a href="Installing.html"><i>v1.2.37</i></a>
 
 &nbsp;
 
 To download PiPedal, click [here](download.md).
 
-> NEW version 1.2.36 Beta3 release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+> NEW version 1.2.37 Beta4 release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
 
 
 Use your Raspberry Pi as a guitar effects pedal. Configure and control PiPedal with your phone or tablet.

lv2/aarch64/ToobAmp.lv2/ToobML.ttl

@@ -26,6 +26,12 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix toobml: <http://two-play.com/plugins/toob-ml#> .
 
+
+toobml:modelFile
+        a lv2:Parameter;
+        rdfs:label "Model";
+        rdfs:range atom:Path.
+
 toobml:filterGroup
     a param:ControlGroup ,
         pg:InputGroup ;
@@ -66,7 +72,25 @@ Generally, TooB ML uses smaller and more efficient neural networks than does Too
 TooB ML models use significantly less CPU, although TooB Neural Amp Modeller is significantly more flexible, and
 has a huge number of downloadable models.
 
-The BluesJR model has an additional Gain control the is used by the BluesJR model to simulate the effect of Blues Junior's gain control.
+TooB ML models are compatible with models from the GuitarML project (). You can download new models from the GuitarML project 
+at 
+
+    https://guitarml.com/tonelibrary/tonelib-pro.html
+
+To use GuitarML models, download them locally using your browser, and then upload them to TooB ML using the following steps:
+
+- Load Toob ML in PiPedal.
+
+- Click on the "Models" control.
+
+- Click on the _Upload_ button in the lower left corner of the selection dialog.
+
+- Select the file that you downloaded localy.
+
+TooB ML can upload indiviual .json files, or collections of models in .zip files downloaded from the GuitarML site.
+
+Some models have an additional Gain control that can be used to simulate the effect of a Gain control on the amplifier 
+being simulated. The gain control will be enabled if the model you have selected has a gain input.
 
 For convenience, tone controls are provided for rough shaping of tone before the input signal is fed to the neural net models. The tone 
 section can be completely bypassed by setting all tone controls to exactly 0.5.
@@ -85,7 +109,6 @@ on the edge of breakup. It does not work particularly well for models of heavily
 compressor. Notionally, Sag Feedback models the effect of transformer sag on intermediate transformer stages (which causes them to clip at a lower level than
 they ordinarily would); and Sag Out models the effect of transformer sag on the final power stage of a guitar amplifier.
 
-
 The TooB ML Amplifier is based heavily on code ported from from the RTNeural project (https://github.com/jatinchowdhury18/RTNeural), by Jatin Chowdhury,
 and uses model files from the GuitarML Neural Pi project (https://github.com/GuitarML/NeuralPi).
 
@@ -94,9 +117,14 @@ and uses model files from the GuitarML Neural Pi project (https://github.com/Gui
         mod:brand "TooB";
         mod:label "TooB ML";
         lv2:requiredFeature urid:map, work:schedule ;
-        lv2:optionalFeature lv2:hardRTCapable;
+        lv2:optionalFeature state::freePath, state:makePath, state:mapPath ;
         lv2:extensionData state:interface, work:interface;
 
+        patch:readable 
+                toobml:modelFile;
+        patch:writable 
+                toobml:modelFile;
+
         patch:readable 
                 <http://two-play.com/plugins/toob#frequencyResponseVector>
                 ;
@@ -128,12 +156,14 @@ and uses model files from the GuitarML Neural Pi project (https://github.com/Gui
                 units:unit units:db ;
         ],
         [
+                # legagcy for loading of old instances.
                 a lv2:InputPort, lv2:ControlPort ;
+                lv2:portProperty epp:notOnGUI;
                 lv2:index 2 ;
                 lv2:symbol "model" ;
                 lv2:name "Model" ;
-                lv2:default 0.0 ; 
-                lv2:minimum 0.0 ;
+                lv2:default -1.0 ; 
+                lv2:minimum -1.0 ;
                 lv2:maximum 32.0 ;
                 lv2:portProperty lv2:enumeration ;
                 lv2:scalePoint 
@@ -462,6 +492,31 @@ and uses model files from the GuitarML Neural Pi project (https://github.com/Gui
 
 <http://two-play.com/plugins/toob-ml#piPedalUI> 
     a pipedal_ui:ui ;
+    pipedal_ui:fileProperties 
+    [
+        a pipedal_ui:fileProperty;
+        rdfs:label "Model" ;
+        pipedal_ui:directory "ToobMlModels";
+        lv2:index 2 ;
+        pipedal_ui:patchProperty toobml:modelFile ;
+        pipedal_ui:resourceDirectory "models/tones";
+
+        pipedal_ui:fileTypes 
+        [
+            a pipedal_ui:fileType;
+            rdfs:label ".json file";
+            pipedal_ui:fileExtension ".json";
+            pipedal_ui:mimeType "application/json";
+        ],[
+            a pipedal_ui:fileType;
+            rdfs:label ".ml file";
+            pipedal_ui:fileExtension ".zip";
+            pipedal_ui:mimeType "application/zip";
+
+        ]
+        ;
+    ];
+
     pipedal_ui:frequencyPlot
     [
         lv2:index 8 ; 

react/public/var/config.json

@@ -1,8 +1,8 @@
 {
-    "socket_server_port": 80,
+    "socket_server_port": 8080,
     "socket_server_address": "*",
     "debug": true,
-    "max_upload_size": 1048576,
+    "max_upload_size": 536870912,
     "fakeAndroid": false,
     "ui_plugins": []
 }