Commit 7f1407be authored by maybites's avatar maybites
Browse files

added restart-proxy functionality

changed code to start ultragrid process outside of shell object
changed peer - pattrstorage to @outputmode 6 -> should reduce unnecessary double messages
parent d30644ec
...@@ -8,6 +8,9 @@ var myWinTask = null; ...@@ -8,6 +8,9 @@ var myWinTask = null;
var myOS = null; var myOS = null;
var myTitle = null; var myTitle = null;
var myPortNumber = null;
var OSXProcessID = null;
var copyFeedback = false; var copyFeedback = false;
var runningFeedback = false; var runningFeedback = false;
...@@ -43,7 +46,11 @@ function pkill(){ ...@@ -43,7 +46,11 @@ function pkill(){
outlet(1, 'pkill'); outlet(1, 'pkill');
if(myOS === 'windows'){ if(myOS === 'windows'){
outlet(1, 'taskkill', '/FI', 'WINDOWTITLE eq '+ myTitle, '/T', '/F'); outlet(1, 'taskkill', '/FI', 'WINDOWTITLE eq '+ myTitle, '/T', '/F');
} } else {
if(OSXProcessID != null){
outlet(1, 'kill', OSXProcessID);
}
}
isRunning = false; isRunning = false;
} }
} }
...@@ -57,13 +64,33 @@ function execute(){ ...@@ -57,13 +64,33 @@ function execute(){
if(myOS === 'windows'){ if(myOS === 'windows'){
outlet(0, 'start', myTitle, '/min', myCommands); outlet(0, 'start', myTitle, '/min', myCommands);
} else { } else {
outlet(0, myCommands); var myCom = new Array();
for(var i = 1; i < myCommands.length; i++){
myCom.push(myCommands[i]);
}
//myCom += '\"';
outlet(1, "open", "-g", "-a", myCommands[0], "--args", myCom);
outlet(0, "ps", "aux", "|", "grep", "uv", "|", "grep", "-v", "awk", "|", "awk", '\'/'+ myPortNumber +'/', '{print', "pid ", '\\$2}\'');
//outlet(0, myCommands);
} }
isRunning = true; isRunning = true;
} }
function pid(_processID){
post("processID = " + _processID + "\n");
OSXProcessID = _processID;
}
function start(){ function start(){
myCommands = arrayfromargs(arguments); myCommands = arrayfromargs(arguments);
for(var i = 1; i < myCommands.length; i++){
if((typeof myCommands[i]) === 'string'){
if(myCommands[i].indexOf("-P") == 0){
myPortNumber = myCommands[i];
}
}
}
myPath = myCommands[0]; myPath = myCommands[0];
......
...@@ -2,6 +2,9 @@ let APPVERSION = "TeGateway_v1"; // use simple numbering ...@@ -2,6 +2,9 @@ let APPVERSION = "TeGateway_v1"; // use simple numbering
// only apps with the same version as the first peer that opens the room // only apps with the same version as the first peer that opens the room
// will be accepted - all other will be declined by the manager // will be accepted - all other will be declined by the manager
// used for switchboard hack:
const superagent = require('superagent');
let maxApi = require("max-api"); let maxApi = require("max-api");
let telemersion, BusClient, Client; let telemersion, BusClient, Client;
...@@ -17,6 +20,10 @@ let peerName = ".."; ...@@ -17,6 +20,10 @@ let peerName = "..";
let verbose_out = false; let verbose_out = false;
let verbose_in = false; let verbose_in = false;
// needed for switchboard hack
let proxyHost = null;
let proxyRoom = null;
// overwrite console.log function, if second value is provided, // overwrite console.log function, if second value is provided,
// the log will not be print out on the console, but only stored to the file // the log will not be print out on the console, but only stored to the file
console.log = function(d, v) { // console.log = function(d, v) { //
...@@ -60,9 +67,11 @@ const handlers = { ...@@ -60,9 +67,11 @@ const handlers = {
await Client.disconnectServer(); await Client.disconnectServer();
}, },
configure: (_serverHost, _serverPort, _serverUser, _serverPwd, _localIP) => { configure: (_serverHost, _serverPort, _serverUser, _serverPwd, _localIP) => {
Client.configureServer(_serverHost, _serverPort, _serverUser, _serverPwd, _localIP); proxyHost = _serverHost;
Client.configureServer('mqtt://'+_serverHost, _serverPort, _serverUser, _serverPwd, _localIP);
}, },
join: async (_peerName, _roomName, _roomPwd) => { join: async (_peerName, _roomName, _roomPwd) => {
proxyRoom = _roomName;
peerName = _peerName; peerName = _peerName;
await Client.join(_peerName, _roomName, _roomPwd); await Client.join(_peerName, _roomName, _roomPwd);
}, },
...@@ -114,6 +123,32 @@ const handlers = { ...@@ -114,6 +123,32 @@ const handlers = {
error: async () => { error: async () => {
let obj = [{name: "Frank"}]; let obj = [{name: "Frank"}];
console.log(obj[1].name); console.log(obj[1].name);
},
// switchboard hack. Remove once switchboard works fine again.
restartProxy: async (_port, _type, _description) => {
if(proxyHost !== null && proxyRoom !== null){
console.log('Atempting to restart proxy: ' + _port + ' at ' + proxyHost + ' in ' + proxyRoom);
try {
const resDel = await superagent.delete('http://'+proxyHost+':3591/proxies/' + _port);
let reply = JSON.parse(resDel["text"]);
console.log(reply["msg"]);
// current date
let date = new Date();
let timestamp = "| restarted by " + peerName + " at " + monthNames[date.getMonth()] + " " + zeroPad(date.getDate(),2) + " " + zeroPad(date.getHours(),2) + ":"+ zeroPad(date.getMinutes(),2) + ":"+ zeroPad(date.getSeconds(),2) + "."+ zeroPad(date.getMilliseconds(),3);
let payload = { room: proxyRoom, port: _port, type: _type, description: _description + timestamp };
const resAdd = await superagent.post('http://'+proxyHost+':3591/proxies/').send(payload);
reply = JSON.parse(resAdd["text"]);
console.log(reply["msg"]);
} catch (err) {
let reply = JSON.parse(err.response["text"]);
console.error(reply["msg"]);
}
} else {
console.log('Unable to restart proxy. Not yet connected');
}
} }
}; };
...@@ -139,3 +174,4 @@ try { ...@@ -139,3 +174,4 @@ try {
} catch (err) { } catch (err) {
bubbledUp("bus", [ 'error', 'script', "Required libraries not installed. Please check [config] > debug and install libraries."]) bubbledUp("bus", [ 'error', 'script', "Required libraries not installed. Please check [config] > debug and install libraries."])
} }
This diff is collapsed.
This diff is collapsed.
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
} }
, ,
"classnamespace" : "box", "classnamespace" : "box",
"rect" : [ 382.0, 376.0, 428.0, 146.0 ], "rect" : [ 325.0, 162.0, 428.0, 145.0 ],
"bglocked" : 0, "bglocked" : 0,
"openinpresentation" : 1, "openinpresentation" : 1,
"default_fontsize" : 12.0, "default_fontsize" : 12.0,
...@@ -39,6 +39,28 @@ ...@@ -39,6 +39,28 @@
"subpatcher_template" : "", "subpatcher_template" : "",
"assistshowspatchername" : 0, "assistshowspatchername" : 0,
"boxes" : [ { "boxes" : [ {
"box" : {
"args" : [ "many2manyBi", "osc", "#2" ],
"bgmode" : 0,
"border" : 0,
"clickthrough" : 0,
"enablehscroll" : 0,
"enablevscroll" : 0,
"id" : "obj-16",
"lockeddragscroll" : 0,
"maxclass" : "bpatcher",
"name" : "restartProxy.maxpat",
"numinlets" : 1,
"numoutlets" : 0,
"offset" : [ 0.0, 0.0 ],
"patching_rect" : [ 472.333333333333314, 83.0, 58.333333333333428, 20.0 ],
"presentation" : 1,
"presentation_rect" : [ 6.0, 107.0, 54.333333333333371, 19.0 ],
"viewvisibility" : 1
}
}
, {
"box" : { "box" : {
"id" : "obj-10", "id" : "obj-10",
"maxclass" : "newobj", "maxclass" : "newobj",
...@@ -1435,10 +1457,19 @@ ...@@ -1435,10 +1457,19 @@
"source" : [ "obj-41", 0 ] "source" : [ "obj-41", 0 ]
} }
}
, {
"patchline" : {
"destination" : [ "obj-16", 0 ],
"order" : 1,
"source" : [ "obj-42", 0 ]
}
} }
, { , {
"patchline" : { "patchline" : {
"destination" : [ "obj-35", 2 ], "destination" : [ "obj-35", 2 ],
"order" : 0,
"source" : [ "obj-42", 0 ] "source" : [ "obj-42", 0 ]
} }
...@@ -1516,6 +1547,13 @@ ...@@ -1516,6 +1547,13 @@
"type" : "JSON", "type" : "JSON",
"implicit" : 1 "implicit" : 1
} }
, {
"name" : "restartProxy.maxpat",
"bootpath" : "~/Arbeiten/01_projekte/181111_IASpace/01_projekte/20xx_Telematik/01_dev/telemersive-gateway/patchers/utils",
"patcherrelativepath" : "../utils",
"type" : "JSON",
"implicit" : 1
}
], ],
"autosave" : 0, "autosave" : 0,
"styles" : [ { "styles" : [ {
...@@ -1558,10 +1596,6 @@ ...@@ -1558,10 +1596,6 @@
, { , {
"name" : "rnbodefault", "name" : "rnbodefault",
"default" : { "default" : {
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"fontname" : [ "Lato" ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ], "color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
...@@ -1573,8 +1607,12 @@ ...@@ -1573,8 +1607,12 @@
} }
, ,
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ], "accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"fontsize" : [ 12.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ], "stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontsize" : [ 12.0 ] "fontname" : [ "Lato" ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -1583,14 +1621,6 @@ ...@@ -1583,14 +1621,6 @@
, { , {
"name" : "rnbohighcontrast", "name" : "rnbohighcontrast",
"default" : { "default" : {
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ], "color" : [ 0.0, 0.0, 0.0, 1.0 ],
...@@ -1601,10 +1631,18 @@ ...@@ -1601,10 +1631,18 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ], "selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ], "accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"fontsize" : [ 13.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"fontsize" : [ 13.0 ] "textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
......
This diff is collapsed.
...@@ -403,8 +403,6 @@ ...@@ -403,8 +403,6 @@
"styles" : [ { "styles" : [ {
"name" : "rnbodefault", "name" : "rnbodefault",
"default" : { "default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontsize" : [ 12.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ], "color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
...@@ -415,11 +413,13 @@ ...@@ -415,11 +413,13 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ], "accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"fontname" : [ "Lato" ], "fontsize" : [ 12.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ], "elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ] "bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontname" : [ "Lato" ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -428,10 +428,6 @@ ...@@ -428,10 +428,6 @@
, { , {
"name" : "rnbohighcontrast", "name" : "rnbohighcontrast",
"default" : { "default" : {
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"fontsize" : [ 13.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ], "color" : [ 0.0, 0.0, 0.0, 1.0 ],
...@@ -442,14 +438,18 @@ ...@@ -442,14 +438,18 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ], "accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"fontsize" : [ 13.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ], "elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ], "bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ] "locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -860,8 +860,6 @@ ...@@ -860,8 +860,6 @@
"styles" : [ { "styles" : [ {
"name" : "rnbodefault", "name" : "rnbodefault",
"default" : { "default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontsize" : [ 12.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ], "color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
...@@ -872,11 +870,13 @@ ...@@ -872,11 +870,13 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ], "accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"fontname" : [ "Lato" ], "fontsize" : [ 12.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ], "elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ] "bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontname" : [ "Lato" ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -885,10 +885,6 @@ ...@@ -885,10 +885,6 @@
, { , {
"name" : "rnbohighcontrast", "name" : "rnbohighcontrast",
"default" : { "default" : {
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"fontsize" : [ 13.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ], "color" : [ 0.0, 0.0, 0.0, 1.0 ],
...@@ -899,14 +895,18 @@ ...@@ -899,14 +895,18 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ], "accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"fontsize" : [ 13.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ], "elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ], "bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ] "locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -1766,8 +1766,6 @@ ...@@ -1766,8 +1766,6 @@
"styles" : [ { "styles" : [ {
"name" : "rnbodefault", "name" : "rnbodefault",
"default" : { "default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontsize" : [ 12.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ], "color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
...@@ -1778,11 +1776,13 @@ ...@@ -1778,11 +1776,13 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ], "accentcolor" : [ 0.343034118413925, 0.506230533123016, 0.86220508813858, 1.0 ],
"fontname" : [ "Lato" ], "fontsize" : [ 12.0 ],
"elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ], "elementcolor" : [ 0.357540726661682, 0.515565991401672, 0.861786782741547, 1.0 ],
"bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ] "bgcolor" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"stripecolor" : [ 0.258338063955307, 0.352425158023834, 0.511919498443604, 1.0 ],
"fontname" : [ "Lato" ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -1791,10 +1791,6 @@ ...@@ -1791,10 +1791,6 @@
, { , {
"name" : "rnbohighcontrast", "name" : "rnbohighcontrast",
"default" : { "default" : {
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ],
"fontsize" : [ 13.0 ],
"clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.0, 0.0, 0.0, 1.0 ], "color" : [ 0.0, 0.0, 0.0, 1.0 ],
...@@ -1805,14 +1801,18 @@ ...@@ -1805,14 +1801,18 @@
"autogradient" : 0.0 "autogradient" : 0.0
} }
, ,
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ], "clearcolor" : [ 1.0, 1.0, 1.0, 0.0 ],
"accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ], "accentcolor" : [ 0.666666666666667, 0.666666666666667, 0.666666666666667, 1.0 ],
"fontsize" : [ 13.0 ],
"elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ], "elementcolor" : [ 0.223386004567146, 0.254748553037643, 0.998085916042328, 1.0 ],
"selectioncolor" : [ 0.301960784313725, 0.694117647058824, 0.949019607843137, 1.0 ],
"locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ], "bgcolor" : [ 0.0, 0.0, 0.0, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ] "locked_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"editing_bgcolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"color" : [ 1.0, 0.874509803921569, 0.141176470588235, 1.0 ],
"stripecolor" : [ 0.258823529411765, 0.258823529411765, 0.258823529411765, 1.0 ],
"textcolor_inverse" : [ 1.0, 1.0, 1.0, 1.0 ],
"textcolor" : [ 1.0, 1.0, 1.0, 1.0 ]
} }
, ,
"parentstyle" : "", "parentstyle" : "",
...@@ -1878,7 +1878,7 @@ ...@@ -1878,7 +1878,7 @@
"numinlets" : 1, "numinlets" : 1,
"numoutlets" : 1, "numoutlets" : 1,
"outlettype" : [ "" ], "outlettype" : [ "" ],
"patching_rect" : [ 38.0, 385.0, 144.0, 62.0 ], "patching_rect" : [ 38.0, 385.0, 127.0, 62.0 ],
"saved_object_attributes" : { "saved_object_attributes" : {
"client_rect" : [ 4, 44, 358, 172 ], "client_rect" : [ 4, 44, 358, 172 ],
"parameter_enable" : 0, "parameter_enable" : 0,
...@@ -1886,7 +1886,7 @@ ...@@ -1886,7 +1886,7 @@
"storage_rect" : [ 583, 69, 1034, 197 ] "storage_rect" : [ 583, 69, 1034, 197 ]
} }
, ,
"text" : "pattrstorage localPeer @outputmode 4 @autorestore 0 @savemode 0", "text" : "pattrstorage localPeer @outputmode 6 @autorestore 0 @savemode 0",
"varname" : "localPeer" "varname" : "localPeer"
} }
...@@ -2904,8 +2904,6 @@ ...@@ -2904,8 +2904,6 @@
"styles" : [ { "styles" : [ {
"name" : "rnbodefault", "name" : "rnbodefault",
"default" : { "default" : {
"color" : [ 0.929412, 0.929412, 0.352941, 1.0 ],
"fontsize" : [ 12.0 ],
"bgfillcolor" : { "bgfillcolor" : {
"type" : "color", "type" : "color",
"color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ], "color" : [ 0.031372549019608, 0.125490196078431, 0.211764705882353, 1.0 ],
...@@ -2916,11 +2914,13 @@ ...@@ -2916,11 +2914,13 @@