Skip to content

Commit

Permalink
Add cameo fixture, outdoor XLR connector (#360)
Browse files Browse the repository at this point in the history
* Add fixture 'cameo/flat-pro-flood-ip65-tri' via editor
* Update register.json via editor
* Small fixes
* Added '3-pin XLR IP65' to schema
* Also adjust cameo Outdoor PAR Tri 12 to use the new connector
  • Loading branch information
FloEdelmann authored Dec 26, 2017
1 parent 3e66a7c commit 3d40571
Show file tree
Hide file tree
Showing 4 changed files with 211 additions and 7 deletions.
194 changes: 194 additions & 0 deletions fixtures/cameo/flat-pro-flood-ip65-tri.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,194 @@
{
"name": "Flat Pro Flood IP65 Tri",
"shortName": "CLFLOODIP65TRI",
"categories": ["Blinder", "Color Changer"],
"meta": {
"authors": ["Felix Edelmann"],
"createDate": "2017-12-25",
"lastModifyDate": "2017-12-25"
},
"manualURL": "https://adamhall.s3.amazonaws.com/media/MARKEN/CAMEO/CLFLOODIP65TRI/CLFLOODIP65TRI_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.pdf",
"physical": {
"dimensions": [180, 180, 120],
"weight": 3.6,
"power": 75,
"DMXconnector": "3-pin XLR IP65",
"bulb": {
"type": "60 W COB LED"
},
"lens": {
"degreesMinMax": [120, 120]
}
},
"availableChannels": {
"Dimmer": {
"type": "Intensity",
"defaultValue": 0
},
"Color Macros Simple": {
"name": "Color Macros",
"type": "Multi-Color",
"capabilities": [
{
"range": [0, 36],
"name": "Red",
"color": "#ff0000"
},
{
"range": [37, 73],
"name": "Green",
"color": "#00ff00"
},
{
"range": [74, 110],
"name": "Blue",
"color": "#0000ff"
},
{
"range": [111, 147],
"name": "Yellow",
"color": "#ffff00"
},
{
"range": [148, 184],
"name": "Magenta",
"color": "#ff00ff"
},
{
"range": [185, 221],
"name": "Cyan",
"color": "#00ffff"
},
{
"range": [222, 255],
"name": "White",
"color": "#ffffff"
}
]
},
"Strobe": {
"type": "Strobe",
"defaultValue": 0,
"capabilities": [
{
"range": [0, 0],
"name": "No function"
},
{
"range": [1, 255],
"name": "Strobe 1-20Hz"
}
]
},
"Color Macros Extended": {
"name": "Color Macros",
"type": "Multi-Color",
"defaultValue": 0,
"capabilities": [
{
"range": [0, 4],
"name": "Blackout",
"color": "#000000"
},
{
"range": [5, 15],
"name": "Red",
"color": "#ff0000"
},
{
"range": [16, 26],
"name": "Green",
"color": "#00ff00"
},
{
"range": [27, 37],
"name": "Blue",
"color": "#0000ff"
},
{
"range": [38, 48],
"name": "Yellow",
"color": "#ffff00"
},
{
"range": [49, 59],
"name": "Magenta",
"color": "#ff00ff"
},
{
"range": [60, 70],
"name": "Cyan",
"color": "#00ffff"
},
{
"range": [71, 80],
"name": "White",
"color": "#ffffff"
},
{
"range": [81, 150],
"name": "Color jump slow-fast"
},
{
"range": [151, 255],
"name": "Color fade slow-fast"
}
]
},
"Red": {
"type": "Single Color",
"color": "Red",
"defaultValue": 0
},
"Green": {
"type": "Single Color",
"color": "Green",
"defaultValue": 0
},
"Blue": {
"type": "Single Color",
"color": "Blue",
"defaultValue": 0
}
},
"modes": [
{
"name": "2-channel",
"shortName": "2ch",
"channels": [
"Dimmer",
"Color Macros Simple"
]
},
{
"name": "3-channel 1",
"shortName": "3ch1",
"channels": [
"Dimmer",
"Strobe",
"Color Macros Extended"
]
},
{
"name": "3-channel 2",
"shortName": "3ch2",
"channels": [
"Red",
"Green",
"Blue"
]
},
{
"name": "6-channel",
"shortName": "6ch",
"channels": [
"Dimmer",
"Strobe",
"Red",
"Green",
"Blue",
"Color Macros Extended"
]
}
]
}
6 changes: 3 additions & 3 deletions fixtures/cameo/outdoor-par-tri-12.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "Outdoor PAR Tri 12",
"shortName": "OutTri12",
"shortName": "CLPSTTRI12IP",
"categories": ["Color Changer"],
"manualURL": "http://adamhall.invaliddomain.de/out/media/downloads/MARKEN/CAMEO/CLPSTTRI12IP/CLPSTTRI12IP_CAMEO_Bedienungsanleitung_EN_DE_FR_ES_PL_IT.pdf",
"meta": {
"authors": ["Flo Edelmann", "Felix Edelmann"],
"createDate": "2017-02-24",
"lastModifyDate": "2017-03-09"
"lastModifyDate": "2017-12-26"
},
"physical": {
"dimensions": [203, 203, 193],
"weight": 4.25,
"power": 50,
"DMXconnector": "3-pin",
"DMXconnector": "3-pin XLR IP65",
"bulb": {
"type": "LED",
"lumens": 911
Expand Down
14 changes: 12 additions & 2 deletions fixtures/register.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@
"lastModifyDate": "2017-07-14",
"lastAction": "created"
},
"cameo/flat-pro-flood-ip65-tri": {
"name": "Flat Pro Flood IP65 Tri",
"lastModifyDate": "2017-12-25",
"lastAction": "created"
},
"cameo/gobo-scanner-80": {
"name": "Gobo Scanner 80",
"lastModifyDate": "2017-11-30",
Expand All @@ -72,7 +77,7 @@
},
"cameo/outdoor-par-tri-12": {
"name": "Outdoor PAR Tri 12",
"lastModifyDate": "2017-03-09",
"lastModifyDate": "2017-12-26",
"lastAction": "modified"
},
"cameo/thunder-wash-100-rgb": {
Expand Down Expand Up @@ -416,6 +421,7 @@
],
"cameo": [
"flat-pro-18",
"flat-pro-flood-ip65-tri",
"gobo-scanner-80",
"hydrabeam-100",
"hydrabeam-300-rgbw",
Expand Down Expand Up @@ -531,6 +537,7 @@
},
"categories": {
"Blinder": [
"cameo/flat-pro-flood-ip65-tri",
"cameo/thunder-wash-100-rgb",
"cameo/thunder-wash-100-w",
"cameo/thunder-wash-600-rgb",
Expand All @@ -547,6 +554,7 @@
"american-dj/xs-400",
"ayra/tdc-triple-burst",
"cameo/flat-pro-18",
"cameo/flat-pro-flood-ip65-tri",
"cameo/gobo-scanner-80",
"cameo/hydrabeam-100",
"cameo/hydrabeam-300-rgbw",
Expand Down Expand Up @@ -747,6 +755,7 @@
"american-dj/fog-fury-jett-pro",
"american-dj/galaxian-3d",
"cameo/flat-pro-18",
"cameo/flat-pro-flood-ip65-tri",
"cameo/gobo-scanner-80",
"cameo/hydrabeam-100",
"cameo/nanospot-120",
Expand Down Expand Up @@ -861,6 +870,8 @@
}
},
"lastUpdated": [
"cameo/outdoor-par-tri-12",
"cameo/flat-pro-flood-ip65-tri",
"futurelight/sc-250-scanner",
"ayra/tdc-triple-burst",
"futurelight/dmh-75-i-led-moving-head",
Expand Down Expand Up @@ -934,7 +945,6 @@
"eurolite/led-par-56-tcl",
"eurolite/led-ps-4-hcl",
"futurelight/pro-slim-par-7-hcl",
"cameo/outdoor-par-tri-12",
"cameo/thunder-wash-100-rgb",
"cameo/thunder-wash-100-w",
"cameo/thunder-wash-600-rgb",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const schema = require('js-schema');
*
* @type {string}
*/
module.exports.VERSION = '2.1.1';
module.exports.VERSION = '2.2.0';

/**
* see https://github.com/molnarg/js-schema
Expand Down Expand Up @@ -46,7 +46,7 @@ const Physical = schema({
'?dimensions': Array.of(3, Number.above(0)), // width, height, depth (in mm)
'?weight': Number.above(0), // in kg
'?power': Number.above(0), // in W
'?DMXconnector': ['3-pin', '5-pin', '3-pin (swapped +/-)', '3-pin and 5-pin', '3.5mm stereo jack'], // additions are welcome
'?DMXconnector': ['3-pin', '5-pin', '3-pin (swapped +/-)', '3-pin and 5-pin', '3-pin XLR IP65', '3.5mm stereo jack'], // additions are welcome
'?bulb': schema({
'?type': NonEmptyString, // e.g. 'LED'
'?colorTemperature': Number.above(0), // in K
Expand Down

0 comments on commit 3d40571

Please sign in to comment.