Skip to content

Commit

Permalink
v0.7.3
Browse files Browse the repository at this point in the history
  • Loading branch information
CDeenen committed Nov 18, 2020
1 parent e42cc30 commit d5638de
Show file tree
Hide file tree
Showing 29 changed files with 8 additions and 7 deletions.
Binary file modified Plugin/Release/com.cdeenen.materialdeck.streamDeckPlugin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
13 changes: 7 additions & 6 deletions Plugin/com.cdeenen.materialdeck.sdPlugin/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ console.log("Material Deck - app.js")
//window.$SD.api = SDApi;
//Websocket variables
let ip = "localhost"; //Ip address of the websocket server
let port = "3003"; //Port of the websocket server
let port = "3001"; //Port of the websocket server
let sdCon = false;

let buttonContext = [];
Expand Down Expand Up @@ -63,6 +63,7 @@ const action = {

// if (action == 'token'){
const msg = {
target: "MD",
source: 0,
type: "data",
device: jsn.device,
Expand Down Expand Up @@ -220,7 +221,7 @@ function connectToServerWS() {

// Initalise Node.js WebSocket connection.
serverWS.addEventListener('open', () => {
serverWS.send(JSON.stringify({ type: 'init', source: "SD"}));
serverWS.send(JSON.stringify({ target: 'server', source: "SD"}));
console.log('Connection to Node.js server successful.');
}, { once: true });

Expand All @@ -231,10 +232,10 @@ function connectToServerWS() {
}, { once: true });

serverWS.addEventListener('message', e => {
// console.log(e.data);
//console.log(e.data);
const data = JSON.parse(e.data);
if (data.type == 'Foundry'){
//console.log('test')
if (data.target != 'SD') return;
if (data.type == 'init'){
sendContext();
}
else
Expand Down Expand Up @@ -286,7 +287,7 @@ function sendContext(){
if (buttonContext[i] != undefined)
sendToServer(buttonContext[i]);
}
}
}


function analyzeSettings(context,action,settings){
Expand Down
2 changes: 1 addition & 1 deletion Plugin/com.cdeenen.materialdeck.sdPlugin/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"Name": "Material Deck",
"Icon": "vtt",
"URL": "https://github.com/CDeenen/MaterialDeck_SD",
"Version": "0.7.2",
"Version": "0.7.3",
"OS": [
{
"Platform": "mac",
Expand Down
Diff not rendered.

0 comments on commit d5638de

Please sign in to comment.