Merge pull request #171 from david-c14/develop

Develop
david-c14 · Dec 1, 2021 · e0a4b18 · e0a4b18
2 parents 8ef8f9d + 18637df
commit e0a4b18
Show file tree

Hide file tree

Showing 287 changed files with 3,415 additions and 2,849 deletions.
diff --git a/.github/actions/build_linux/Dockerfile b/.github/actions/build_linux/Dockerfile
@@ -10,7 +10,7 @@ LABEL "homepage"="TBD"
 LABEL "maintainer"="dewb"
 
 RUN apt-get update
-RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq
+RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq zstd
 
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod a+x /entrypoint.sh

diff --git a/.github/actions/build_linux/entrypoint.sh b/.github/actions/build_linux/entrypoint.sh
@@ -7,7 +7,7 @@ export RACK_USER_DIR=${GITHUB_WORKSPACE}
 
 git submodule update --init --recursive
 
-curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
+curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-lin.zip -o rack-sdk.zip
 unzip -o rack-sdk.zip
 rm rack-sdk.zip
 

diff --git a/.github/actions/build_osx/Dockerfile b/.github/actions/build_osx/Dockerfile
diff --git a/.github/actions/build_osx/entrypoint.sh b/.github/actions/build_osx/entrypoint.sh
diff --git a/.github/actions/build_win/Dockerfile b/.github/actions/build_win/Dockerfile
@@ -10,7 +10,7 @@ LABEL "homepage"="TBD"
 LABEL "maintainer"="dewb"
 
 RUN apt-get update
-RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq g++-mingw-w64-x86-64
+RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq g++-mingw-w64-x86-64 zstd
 
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod a+x /entrypoint.sh

diff --git a/.github/actions/build_win/entrypoint.sh b/.github/actions/build_win/entrypoint.sh
@@ -11,9 +11,10 @@ export STRIP=x86_64-w64-mingw32-strip
 
 git submodule update --init --recursive
 
-curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}.zip -o rack-sdk.zip
+curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-win.zip -o rack-sdk.zip
 unzip -o rack-sdk.zip
 rm rack-sdk.zip
 
 make clean
 make dist
+chmod 644 dist/*.vcvplugin
diff --git a/.github/actions/combine_zip/script.sh b/.github/actions/combine_zip/script.sh
diff --git a/.github/actions/upload_zip/script.sh → .github/actions/upload_plugin_lin/script.sh b/.github/actions/upload_zip/script.sh → .github/actions/upload_plugin_lin/script.sh
@@ -14,11 +14,11 @@ curl -o release.json \
 
 UPLOAD_URL=$(jq -r .upload_url release.json)
 
-ASSET_PATH=$(ls dist/*.zip)
+ASSET_PATH=$(ls dist/*.vcvplugin)
 
 curl -i \
     --header "Authorization: token ${GITHUB_TOKEN}" \
-    --header "Content-Type: application/zip" \
+    --header "Content-Type: application/zstd" \
     --request POST \
     --data-binary @"${ASSET_PATH}" \
     ${UPLOAD_URL%"{?name,label\}"}?name=${ASSET_PATH#"dist/"}
diff --git a/.github/actions/upload_plugin_mac/script.sh b/.github/actions/upload_plugin_mac/script.sh
@@ -0,0 +1,25 @@
+
+#!/bin/bash
+
+set -eu
+
+GITHUB_API_URL=https://api.github.com
+
+GITHUB_TOKEN=$1
+
+# Get release url
+curl -o release.json \
+    --header "Authorization: token ${GITHUB_TOKEN}" \
+    --request GET \
+    ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${GITHUB_REF#"refs/"}
+
+UPLOAD_URL=$(jq -r .upload_url release.json)
+
+ASSET_PATH=$(ls dist/*.vcvplugin)
+
+curl -i \
+    --header "Authorization: token ${GITHUB_TOKEN}" \
+    --header "Content-Type: application/zstd" \
+    --request POST \
+    --data-binary @"${ASSET_PATH}" \
+    ${UPLOAD_URL/\{\?name,label\}/}?name=${ASSET_PATH#"dist/"}
diff --git a/.github/actions/upload_plugin_win/script.sh b/.github/actions/upload_plugin_win/script.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -eu
+
+GITHUB_API_URL=https://api.github.com
+
+GITHUB_TOKEN=$1
+
+# Get release url
+curl -o release.json \
+    --header "Authorization: token ${GITHUB_TOKEN}" \
+    --request GET \
+    ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/releases/${GITHUB_REF#"refs/"}
+
+UPLOAD_URL=$(jq -r .upload_url release.json)
+# sleep 5
+# ls -al dist
+# ls -al
+ASSET_PATH=$(ls dist/*.vcvplugin)
+# cp ${ASSET_PATH} .
+# ASSET_PATH=${ASSET_PATH#"dist/"}
+# echo ${ASSET_PATH}
+# ls -al
+# ls -al dist
+
+curl -i \
+    --header "Authorization: token ${GITHUB_TOKEN}" \
+    --header "Content-Type: application/zstd" \
+    --request POST \
+    --data-binary @"${ASSET_PATH}" \
+    ${UPLOAD_URL%"{?name,label\}"}?name=${ASSET_PATH#"dist/"}
diff --git a/.github/workflows/buildDevelop.yml b/.github/workflows/buildDevelop.yml
@@ -4,7 +4,7 @@ on:
     - develop
 name: Develop
 env:
-  RACK_SDK_VERSION: 1.1.6
+  RACK_SDK_VERSION: 2.0.0
 jobs:
   buildLinux:
     name: Build Linux

diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml
@@ -3,7 +3,9 @@ on:
     types: [published]
 name: Release
 env:
-  RACK_SDK_VERSION: 1.1.6
+  RACK_DIR: ${GITHUB_WORKSPACE}/Rack-SDK
+  RACK_USER_DIR: ${GITHUB_WORKSPACE}
+  RACK_SDK_VERSION: 2.0.0
 jobs:
   buildLinux:
     name: Build Linux
@@ -13,7 +15,7 @@ jobs:
     - name: Build Linux
       uses: ./.github/actions/build_linux
     - name: upload zip
-      run: sh ./.github/actions/upload_zip/script.sh ${{ secrets.GITHUB_TOKEN }}
+      run: sh ./.github/actions/upload_plugin_lin/script.sh ${{ secrets.GITHUB_TOKEN }}
   buildWindows:
     name: Build Windows
     runs-on: ubuntu-latest
@@ -22,21 +24,23 @@ jobs:
     - name: Build Windows
       uses: ./.github/actions/build_win
     - name: upload zip
-      run: sh ./.github/actions/upload_zip/script.sh ${{ secrets.GITHUB_TOKEN }}
+      run: sh ./.github/actions/upload_plugin_win/script.sh ${{ secrets.GITHUB_TOKEN }}
   buildOsx:
     name: Build OSX
-    runs-on: ubuntu-latest
+    runs-on: macos-10.15
     steps:
     - uses: actions/checkout@master
-    - name: Build OSX
-      uses: ./.github/actions/build_osx
+    - name: install tools
+      run: brew install automake
+    - name: get Rack-SDK
+      run: curl -L https://vcvrack.com/downloads/Rack-SDK-${RACK_SDK_VERSION}-mac.zip -o rack-sdk.zip
+    - name: unzip SDK
+      run: unzip -o rack-sdk.zip
+    - name: clean up SDK
+      run: rm rack-sdk.zip
+    - name: update submodules
+      run: git submodule update --init --recursive
+    - name: make
+      run: make dist
     - name: upload zip
-      run: sh ./.github/actions/upload_zip/script.sh ${{ secrets.GITHUB_TOKEN }}
-  combineDist:
-    name: Combine Distributions
-    runs-on: ubuntu-latest
-    needs: [buildLinux, buildWindows, buildOsx]
-    steps:
-    - uses: actions/checkout@master
-    - name: combine zip
-      run: sh ./.github/actions/combine_zip/script.sh ${{ secrets.GITHUB_TOKEN }}
+      run: sh ./.github/actions/upload_plugin_mac/script.sh ${{ secrets.GITHUB_TOKEN }}
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # FLAGS will be passed to both the C and C++ compiler
 FLAGS +=
 CFLAGS +=
-CXXFLAGS +=
+CXXFLAGS += 
 
 # Careful about linking to shared libraries, since you can't assume much about the user's environment and library search path.
 # Static libraries are fine.

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,32 @@
 # Changelog
 
+## v2.0.1
+- 30-Nov-2021 Add LA-216 Polyphonic Logic Analyser
+
+## v2.0.0
+- 11-Oct-2021 Port shared components to v2
+- 11-Oct-2021 Port Blanking plates to v2
+- 14-Oct-2021 Port LA-108 to v2
+- 15-Oct-2021 Port AG-xxx OG-xxx NG-xxx XG-xxx LD-xxx and PG-xxx to v2
+- 15-Oct-2021 Persist DS suite voltage range between devices. When voltage is changed, new devices use the same option
+- 15-Oct-2021 Port BB-xxx DN-xxx FF-xxx OA-xxx to v2
+- 25-Oct-2021 Port Text devices and Wiremanager
+- 26-Oct-2021 Port HS-101 and EO-102 to v2
+- 26-Oct-2021 Port EN-104 PO-101 PO-102 PO-202 and SN-101 to v2
+- 28-Oct-2021 Port WK-101 and WK-205 to v2  Deprecated Torpedo in WK devices and replace with extension modules
+- 28-Oct-2021 Add Module Link lights for expander modules
+- 29-Oct-2021 Port LT-116 to v2
+- 29-Oct-2021 Port XF-xxx to v2
+- 29-Oct-2021 Port VU meters to v2, including new backlights
+- 03-Nov-2021 Make DO-1xx devices more usable, improve connection labelling, add shuffle and copy/paste
+- 05-Nov-2021 Add visuals to TD-xxx, DO-1xx and WM-102 devices in the module browser
+- 05-Nov-2021 Add Device copy/paste and undo to AO-1xx devices
+- 12-Nov-2021 Add expansion capabilities to VM-1xx and VM-2xx devices
+- 14-Nov-2021 Use keywords to make library searching more effective
+- 14-Nov-2021 Add VM-104 Quad digital VU-meter
+- 19-Nov-2021 Add VM-204 Quad vintage VU-meter
+- 22-Nov-2021 Fix rendering bug in VM-1xx devices
+
 ## v1.1.10
 - 10-Dec-2020 Update images in manual
 - 26-Nov-2020 Add exponential response to VM-needle

diff --git a/manual/A0-106.png b/manual/A0-106.png
diff --git a/manual/A0-112.png b/manual/A0-112.png
diff --git a/manual/A0-118.png b/manual/A0-118.png
diff --git a/manual/A0-124.png b/manual/A0-124.png
diff --git a/manual/A0-136.png b/manual/A0-136.png
diff --git a/manual/AG-104.m.png b/manual/AG-104.m.png
diff --git a/manual/AG-104.png b/manual/AG-104.png
diff --git a/manual/AG-106.m.png b/manual/AG-106.m.png
diff --git a/manual/AG-106.png b/manual/AG-106.png
diff --git a/manual/AG-202.m.png b/manual/AG-202.m.png
diff --git a/manual/AG-202.png b/manual/AG-202.png
diff --git a/manual/AG.md b/manual/AG.md
@@ -1,11 +1,11 @@
 # Logical AND Gates
 ### [Part of the Digital Suite](DS.md)
 #### AG-104 AND Gates
-![View of the AND Gates](AG-104.m.png "AND Gates")
+![View of the AND Gates](AG-104.png "AND Gates")
 #### AG-106 AND Gates
-![View of the AND Gates](AG-106.m.png "AND Gates")
+![View of the AND Gates](AG-106.png "AND Gates")
 #### AG-202 Polyphonic AND Gates
-![View of the AND Gates](AG-202.m.png "AND Gates")
+![View of the AND Gates](AG-202.png "AND Gates")
 
 ## Basic Operation
 

diff --git a/manual/AO-106.m.png b/manual/AO-106.m.png
diff --git a/manual/AO-112.m.png b/manual/AO-112.m.png
diff --git a/manual/AO-118.m.png b/manual/AO-118.m.png
diff --git a/manual/AO-124.m.png b/manual/AO-124.m.png
diff --git a/manual/AO-136.m.png b/manual/AO-136.m.png
diff --git a/manual/AO.md b/manual/AO.md
@@ -1,14 +1,14 @@
 # Arithmetic Operators
 #### AO-106 6 Algorithm Arithmetic Operators
-![View of the AO-106 - Arithmetic Operators](AO-106.m.png "Arithmetic Operators")
+![View of the AO-106 - Arithmetic Operators](AO-106.png "Arithmetic Operators")
 #### AO-112 12 Algorithm Arithmetic Operators
-![View of the AO-112 - Arithmetic Operators](AO-112.m.png "Arithmetic Operators")
+![View of the AO-112 - Arithmetic Operators](AO-112.png "Arithmetic Operators")
 #### AO-118 18 Algorithm Arithmetic Operators
-![View of the AO-118 - Arithmetic Operators](AO-118.m.png "Arithmetic Operators")
+![View of the AO-118 - Arithmetic Operators](AO-118.png "Arithmetic Operators")
 #### AO-124 24 Algorithm Arithmetic Operators
-![View of the AO-124 - Arithmetic Operators](AO-124.m.png "Arithmetic Operators")
+![View of the AO-124 - Arithmetic Operators](AO-124.png "Arithmetic Operators")
 #### AO-136 36 Algorithm Arithmetic Operators
-![View of the AO-136 - Arithmetic Operators](AO-136.m.png "Arithmetic Operators")
+![View of the AO-136 - Arithmetic Operators](AO-136.png "Arithmetic Operators")
 
 ## Basic Operation
 

diff --git a/manual/BB-120.m.png b/manual/BB-120.m.png
diff --git a/manual/BB-120.png b/manual/BB-120.png
diff --git a/manual/BB.md b/manual/BB.md
@@ -3,7 +3,7 @@
 #### BB-120 20-Stage Bucket Brigade Sample and Hold
 
 
-![View of the Sample and Hold Latches](BB-120.m.png "Sample and Hold Latches")
+![View of the Sample and Hold Latches](BB-120.png "Sample and Hold Latches")
 
 ## Basic Operation
 

diff --git a/manual/BP-101.m.png b/manual/BP-101.m.png
diff --git a/manual/BP-101.png b/manual/BP-101.png
diff --git a/manual/BP-102.m.png b/manual/BP-102.m.png
diff --git a/manual/BP-102.png b/manual/BP-102.png
diff --git a/manual/BP-104.m.png b/manual/BP-104.m.png
diff --git a/manual/BP-104.png b/manual/BP-104.png
diff --git a/manual/BP-108.m.png b/manual/BP-108.m.png
diff --git a/manual/BP-108.png b/manual/BP-108.png
diff --git a/manual/BP-110.m.png b/manual/BP-110.m.png
diff --git a/manual/BP-110.png b/manual/BP-110.png
diff --git a/manual/BP-112.m.png b/manual/BP-112.m.png
diff --git a/manual/BP-112.png b/manual/BP-112.png
diff --git a/manual/BP-116.m.png b/manual/BP-116.m.png
diff --git a/manual/BP-116.png b/manual/BP-116.png
diff --git a/manual/BP-120.m.png b/manual/BP-120.m.png
diff --git a/manual/BP-120.png b/manual/BP-120.png
diff --git a/manual/BP-124.m.png b/manual/BP-124.m.png
diff --git a/manual/BP-124.png b/manual/BP-124.png
diff --git a/manual/BP-132.m.png b/manual/BP-132.m.png
diff --git a/manual/BP-132.png b/manual/BP-132.png