From 674aa58a6ac8921015ad0530b7202b8cb8279c61 Mon Sep 17 00:00:00 2001 From: Chad C Date: Tue, 14 May 2024 04:57:21 +0000 Subject: [PATCH 1/6] Updated devices to add renewed line of ATEM Televeisoin Studio Switchers: Television Studio 4k8, Television Studio HD8ISO, and Television Studio HD8 --- src/js/devices.js | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/js/devices.js b/src/js/devices.js index d7bc4a2..ab30797 100755 --- a/src/js/devices.js +++ b/src/js/devices.js @@ -193,6 +193,36 @@ Generator.getDevices = function() colors: 2 }, + tvstudio4k8: { + name: 'ATEM Television Studio 4K8', + switchers: 1, + keyers: 4, + supersource: 1, + cameras: 8, + mediaplayers: 2, + colors: 2 + }, + + tvstudiohd8iso: { + name: 'ATEM Television Studio HD8 ISO', + switchers: 1, + keyers: 4, + supersource: 1, + cameras: 8, + mediaplayers: 2, + colors: 2 + }, + + tvstudiohd8: { + name: 'ATEM Television Studio HD8', + switchers: 1, + keyers: 4, + supersource: 1, + cameras: 8, + mediaplayers: 2, + colors: 2 + }, + constellation8k: { name: 'ATEM Constellation 8K', switchers: 4, From bff39668050780c424ebad248061f2a4ef8185ca Mon Sep 17 00:00:00 2001 From: Chad C Date: Tue, 14 May 2024 04:57:21 +0000 Subject: [PATCH 2/6] Update to device list to include new ATEM switchers --- README.md | 8 +++++++- build/js/devices-min.js | 2 +- src/js/devices.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 731d8c1..7f072f5 100755 --- a/README.md +++ b/README.md @@ -84,7 +84,13 @@ As I've written earlier, I'm impressed with what the ATEM Mini's can do, hardwar * ATEM Television Studio Pro 4K -* ATEM Constellation 8K +* ATEM Television Studio 4k8 - **New!** + +* ATEM Television Studio HD8 - **New!** + +* ATEM Televison Studio HD8ISO - **New!** + +* ATEM Constellation 8K ## Development information diff --git a/build/js/devices-min.js b/build/js/devices-min.js index 3147fc3..a35d50c 100644 --- a/build/js/devices-min.js +++ b/build/js/devices-min.js @@ -1 +1 @@ -Generator.getDevices=function(){return{mini:{name:"ATEM Mini",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},pro:{name:"ATEM Mini Pro",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},proiso:{name:"ATEM Mini Pro ISO",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},extreme:{name:"ATEM Mini Extreme",switchers:1,keyers:2,supersource:1,cameras:8,mediaplayers:2,colors:2},extremeiso:{name:"ATEM Mini Extreme ISO",switchers:1,keyers:2,supersource:1,cameras:8,mediaplayers:2,colors:2},tvstudio:{name:"ATEM Television Studio",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_sw1me:{name:"ATEM 1 M/E Production Switcher",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_sw2me:{name:"ATEM 2 M/E Production Switcher",switchers:2,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_st4k:{name:"ATEM Production Studio 4K",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_st1me4k:{name:"ATEM 1 M/E Production Studio 4K",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_st2me4k:{name:"ATEM 2 M/E Production Studio 4K",switchers:2,keyers:2,supersource:0,cameras:20,mediaplayers:2,colors:2},broadcast_st2me4k:{name:"ATEM 2 M/E Broadcast Studio 4K",switchers:2,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},broadcast_st4me4k:{name:"ATEM 4 M/E Broadcast Studio 4K",switchers:4,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},tvstudiohd:{name:"ATEM Television Studio HD",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},tvstudioprohd:{name:"ATEM Television Studio Pro HD",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},tvstudiopro4k:{name:"ATEM Television Studio Pro 4K",switchers:1,keyers:1,supersource:0,cameras:20,mediaplayers:2,colors:2},constellation8k:{name:"ATEM Constellation 8K",switchers:4,keyers:4,supersource:1,cameras:8,mediaplayers:4,colors:2}}}; \ No newline at end of file +Generator.getDevices=function(){var e={mini:{name:"ATEM Mini",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},pro:{name:"ATEM Mini Pro",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},proiso:{name:"ATEM Mini Pro ISO",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},extreme:{name:"ATEM Mini Extreme",switchers:1,keyers:2,supersource:1,cameras:8,mediaplayers:2,colors:2},extremeiso:{name:"ATEM Mini Extreme ISO",switchers:1,keyers:2,supersource:1,cameras:8,mediaplayers:2,colors:2},sdi:{name:"ATEM SDI",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},sdiproiso:{name:"ATEM SDI Pro ISO",switchers:1,keyers:1,supersource:0,cameras:4,mediaplayers:1,colors:2},sdiextremeiso:{name:"ATEM SDI Extreme ISO",switchers:1,keyers:2,supersource:1,cameras:8,mediaplayers:2,colors:2},tvstudio:{name:"ATEM Television Studio",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_sw1me:{name:"ATEM 1 M/E Production Switcher",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_sw2me:{name:"ATEM 2 M/E Production Switcher",switchers:2,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_st4k:{name:"ATEM Production Studio 4K",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_st1me4k:{name:"ATEM 1 M/E Production Studio 4K",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},production_st2me4k:{name:"ATEM 2 M/E Production Studio 4K",switchers:2,keyers:2,supersource:0,cameras:20,mediaplayers:2,colors:2},broadcast_st2me4k:{name:"ATEM 2 M/E Broadcast Studio 4K",switchers:2,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},broadcast_st4me4k:{name:"ATEM 4 M/E Broadcast Studio 4K",switchers:4,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},tvstudiohd:{name:"ATEM Television Studio HD",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},tvstudioprohd:{name:"ATEM Television Studio Pro HD",switchers:1,keyers:1,supersource:0,cameras:8,mediaplayers:2,colors:2},tvstudiopro4k:{name:"ATEM Television Studio Pro 4K",switchers:1,keyers:1,supersource:0,cameras:20,mediaplayers:2,colors:2},tvstudio4K8:{name:"ATEM Television Studio 4K8",switchers:1,keyers:4,supersource:1,cameras:8,mediaplayers:2,colors:2},tvstudiohd8iso:{name:"ATEM Television Studio HD8 ISO",switchers:1,keyers:4,supersource:1,cameras:8,mediaplayers:2,colors:2},tvstudiohd8:{name:"ATEM Television Studio HD8",switchers:1,keyers:4,supersource:1,cameras:8,mediaplayers:2,colors:2},constellation8k:{name:"ATEM Constellation 8K",switchers:4,keyers:4,supersource:1,cameras:8,mediaplayers:4,colors:2}};return e}; \ No newline at end of file diff --git a/src/js/devices.js b/src/js/devices.js index ab30797..43ef5f7 100755 --- a/src/js/devices.js +++ b/src/js/devices.js @@ -193,7 +193,7 @@ Generator.getDevices = function() colors: 2 }, - tvstudio4k8: { + tvstudio4K8: { name: 'ATEM Television Studio 4K8', switchers: 1, keyers: 4, From 1ce068ccf614cf1132d84903022c947a59ed7bc9 Mon Sep 17 00:00:00 2001 From: Chad C Date: Sun, 20 Oct 2024 18:25:44 -0500 Subject: [PATCH 3/6] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7f072f5..e505af9 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # ATEM-Animation-Generator An amazing ATEM DVE Animation Generator for creating "macro-based" animations for Blackmagic Design ATEM video switchers. +* **GRAB THE LATEST BUILD [HERE](https://github.com/ChgoChad/ATEM-Animation-Generator/releases)** + [Check out the demo](https://zmip.github.io). ![preview of the animation editor](https://forum.blackmagicdesign.com/download/file.php?id=50357) From 7b452454f197962462d58016f9554e993d7c7832 Mon Sep 17 00:00:00 2001 From: Chad C Date: Sun, 20 Oct 2024 18:30:38 -0500 Subject: [PATCH 4/6] Create static.yml --- .github/workflows/static.yml | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/static.yml diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml new file mode 100644 index 0000000..6c8d850 --- /dev/null +++ b/.github/workflows/static.yml @@ -0,0 +1,43 @@ +# Simple workflow for deploying static content to GitHub Pages +name: Deploy static content to Pages + +on: + # Runs on pushes targeting the default branch + push: + branches: ["main"] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages +permissions: + contents: read + pages: write + id-token: write + +# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. +# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. +concurrency: + group: "pages" + cancel-in-progress: false + +jobs: + # Single deploy job since we're just deploying + deploy: + environment: + name: github-pages + url: ${{ steps.deployment.outputs.page_url }} + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Setup Pages + uses: actions/configure-pages@v5 + - name: Upload artifact + uses: actions/upload-pages-artifact@v3 + with: + # Upload entire repository + path: 'build/ATEM-DVE-Animation-generator.html' + - name: Deploy to GitHub Pages + id: deployment + uses: actions/deploy-pages@v4 From 55dbed762b5b8aede76616f6a8187809891db765 Mon Sep 17 00:00:00 2001 From: Chad C Date: Sun, 20 Oct 2024 18:40:49 -0500 Subject: [PATCH 5/6] Update static.yml --- .github/workflows/static.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 6c8d850..6a6dc9e 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -36,8 +36,8 @@ jobs: - name: Upload artifact uses: actions/upload-pages-artifact@v3 with: - # Upload entire repository - path: 'build/ATEM-DVE-Animation-generator.html' + # Upload single static page + path: './build/' - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 From b700ee20052cf045ecd7b61e241696919c61fdac Mon Sep 17 00:00:00 2001 From: Chad C Date: Sun, 20 Oct 2024 18:49:04 -0500 Subject: [PATCH 6/6] Update static.yml --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 6a6dc9e..43ecec6 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -37,7 +37,7 @@ jobs: uses: actions/upload-pages-artifact@v3 with: # Upload single static page - path: './build/' + path: './build' - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4