Skip to content

Commit d0832e9

Browse files
peternewmanpeternewman
committed
Merge branch 'dump-fixes' of https://github.com/peternewman/rdm-app into dump-fixes
2 parents 27e267c + 1c6a888 commit d0832e9

File tree

5 files changed

+34
-16
lines changed

5 files changed

+34
-16
lines changed

‎.codespellignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
(0x01B2, "DJSI Schinstad ANS (Northern Light)"),
2-
(0x1BC0, "ALS Stanislaw Binkiewicz"),
2+
(0x01CF, "SRM Technik GmbH"),
33
(0x030F, "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""),
4+
(0x1BC0, "ALS Stanislaw Binkiewicz"),
5+
(0x20B9, "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"),
6+
(0x4D54, "medien technik cords"),
7+
(function($){var escapeable=/["\\\x00-\x1f\x7f-\x9f]/g,meta={'\b':'\\b','\t':'\\t','\n':'\\n','\f':'\\f','\r':'\\r','"':'\\"','\\':'\\\\'};$.toJSON=typeof JSON==='object'&&JSON.stringify?JSON.stringify:function(o){if(o===null){return'null';}
8+
return'{'+pairs.join(',')+'}';}};$.evalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){return eval('('+src+')');};$.secureEvalJSON=typeof JSON==='object'&&JSON.parse?JSON.parse:function(src){var filtered=src.replace(/\\["\\\/bfnrtu]/g,'@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,']').replace(/(?:^|:|,)(?:\s*\[)+/g,'');if(/^[\],:{}\s]*$/.test(filtered)){return eval('('+src+')');}else{throw new SyntaxError('Error parsing JSON, source is not valid.');}};$.quoteString=function(string){if(string.match(escapeable)){return'"'+string.replace(escapeable,function(a){var c=meta[a];if(typeof c==='string'){return c;}

‎data/manufacturer_data.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,15 @@
6565
(0x011A, "Guangzhou Hotion Technology Co., Ltd."),
6666
(0x011B, "Jumptronic GmbH"),
6767
(0x016C, "LGR"),
68+
(0x016D, "Hive Lighting"),
69+
(0x016E, "Artled Technology Corp."),
6870
(0x0199, "Ocean LED Marine Ltd."),
6971
(0x019A, "TwoGain Electronics"),
72+
(0x019B, "ElectroTAS Soluciones Profesionales"),
7073
(0x019F, "DaisaLed Ltd."),
7174
(0x01A0, "Light With LED"),
7275
(0x01A1, "Yuesheng Stage Light Limited"),
76+
(0x01A2, "Art Lighting Production, s.r.o."),
7377
(0x01A8, "ZongDa Photoelectricity Science and Technology Co., Ltd."),
7478
(0x01A9, "Shenzhen Uniview LED Ltd. Co."),
7579
(0x01AA, "Vitec Videocom Inc."),
@@ -79,6 +83,7 @@
7983
(0x01B1, "Lightcare A/S"),
8084
(0x01B2, "DJSI Schinstad ANS (Northern Light)"),
8185
(0x01B3, "Ricardo Dias"),
86+
(0x01B4, "Inventeq B.V."),
8287
(0x01C7, "SCHIEDERWERK GmbH"),
8388
(0x01C8, "Guangzhou JINLIN Stage Lighting Equipment Co., Ltd."),
8489
(0x01C9, "ALPHA LITE Inc."),
@@ -189,6 +194,7 @@
189194
(0x056C, "Lumascape Lighting Industries"),
190195
(0x0573, "JIAXING XINHUALI LIGHTING & SOUNDING CO., LTD."),
191196
(0x0580, "Innovation LED Limited"),
197+
(0x0588, "GuangZhou XiangMing Light Limited"),
192198
(0x05A0, "Stage Smarts AB"),
193199
(0x05AB, "Shenzhen Lesan Lighting Co., Ltd."),
194200
(0x05B5, "Turkowski GmbH"),
@@ -239,6 +245,7 @@
239245
(0x07AE, "A-LITE B.V."),
240246
(0x07B0, "ADDiCTiON BoX GbR"),
241247
(0x07B1, "TBF-PyroTec GmbH"),
248+
(0x07C0, "Code Mercenaries GmbH"),
242249
(0x07C2, "BOOQlight BV"),
243250
(0x07CC, "Griven S.r.l."),
244251
(0x07CF, "MH-Sound"),
@@ -353,6 +360,8 @@
353360
(0x09DE, "Matthias Bauch Software"),
354361
(0x09E9, "Starway"),
355362
(0x09FC, "deskontrol electronics"),
363+
(0x1112, "Zhuhai Bincolor Electronic Technology Co., Ltd."),
364+
(0x1113, "SiliconCore Technology, Inc."),
356365
(0x1212, "HPL Light Company"),
357366
(0x1234, "ESTA"),
358367
(0x12DA, "Newlab S.r.l."),

‎data/manufacturer_test.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import unittest
2020
import urllib2
2121
import pprint
22+
from socket import error as SocketError
2223
from urllib2 import URLError
2324

2425

@@ -93,6 +94,9 @@ def test_ManufacturerLinks(self):
9394
elif hasattr(e, 'code'):
9495
self.fail("The server couldn't fulfill the request for %s. Error "
9596
"code: %s" % (link, e.code))
97+
except SocketError as e:
98+
if hasattr(e, 'errno'):
99+
self.fail("Link %s failed due to socket error %s" % (link, e.errno))
96100
else:
97101
self.assertEqual(response.code, 200,
98102
"Failed to fetch URL %s got status %d" %

‎data/node_data.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,56 +22,56 @@
2222
{'name': 'AL5001',
2323
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=362&project_id=&policies_id=&cart_id=&order_id=',
2424
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/al5001_module_1.jpg',
25-
'tags': ['ArtNet']},
25+
'tags': ['Art-Net']},
2626
{'name': 'Art-Lynx O/P',
2727
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=395&project_id=&policies_id=&cart_id=&order_id=',
2828
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/art-lynx_op_straight_angle.jpg',
29-
'tags': ['ArtNet']},
29+
'tags': ['Art-Net']},
3030
{'name': 'Down-Lynx',
3131
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=262&project_id=&policies_id=&cart_id=&order_id=',
3232
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/down-lynx_3.jpg',
33-
'tags': ['ArtNet']},
33+
'tags': ['Art-Net']},
3434
{'name': 'Net-Lynx O/P',
3535
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=266&project_id=&policies_id=&cart_id=&order_id=',
3636
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/net-lynx_op_1.jpg',
37-
'tags': ['ArtNet']},
37+
'tags': ['Art-Net']},
3838
{'name': 'Cata-Lynx O/P',
3939
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=439&project_id=&policies_id=&cart_id=&order_id=',
4040
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/cata-lynx_op.jpg',
41-
'tags': ['ArtNet']},
41+
'tags': ['Art-Net']},
4242
{'name': 'Ether-Lynx II',
4343
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=393&project_id=&policies_id=&cart_id=&order_id=',
4444
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/Ether-Lynx_II.jpg',
45-
'tags': ['ArtNet']},
45+
'tags': ['Art-Net']},
4646
{'name': 'Data-Lynx O/P',
4747
'link': 'http://www.artisticlicence.com/index.php?mode=products&sub=overview&action=&category_id=4&product_id=215&project_id=&policies_id=&cart_id=&order_id=',
4848
'image_url': 'http://www.artisticlicence.com/WebSiteMaster/Product%20Images/Data-Lynx_OP.jpg',
49-
'tags': ['ArtNet']},
49+
'tags': ['Art-Net']},
5050
],
5151
0x4c4c: [
5252
{'name': 'Ethernet-DMX2 MkII',
5353
'link': 'http://www.luminex.be/products_details.php?cat=1&prod=0100032&display=description',
5454
'image_url': 'http://www.luminex.be/products/0100032/photo_032.png',
55-
'tags': ['ArtNet']},
55+
'tags': ['Art-Net']},
5656
{'name': 'Ethernet-DMX2/Truss MkII',
5757
'link': 'http://www.luminex.be/products_details.php?cat=1&prod=0100045&display=description',
5858
'image_url': 'http://www.luminex.be/products/0100045/photo_045.png',
59-
'tags': ['ArtNet']},
59+
'tags': ['Art-Net']},
6060
{'name': 'Ethernet-DMX4 MkII',
6161
'link': 'http://www.luminex.be/products_details.php?cat=1&prod=0100030&display=description',
6262
'image_url': 'http://www.luminex.be/products/0100030/photo_030.png',
63-
'tags': ['ArtNet']},
63+
'tags': ['Art-Net']},
6464
{'name': 'Ethernet-DMX4/Truss MkII',
6565
'link': 'http://www.luminex.be/products_details.php?cat=1&prod=0100029&display=description',
6666
'image_url': 'http://www.luminex.be/products/0100029/photo_029.png',
67-
'tags': ['ArtNet']},
67+
'tags': ['Art-Net']},
6868
{'name': 'Ethernet-DiMX4',
6969
'link': 'http://www.luminex.be/products_details.php?cat=1&prod=0100042&display=description',
7070
'image_url': 'http://www.luminex.be/products/0100042/photo_042.png',
71-
'tags': ['ArtNet']},
71+
'tags': ['Art-Net']},
7272
{'name': 'Ethernet-DMX8 MkII',
7373
'link': 'http://www.luminex.be/products_details.php?cat=1&prod=0100037&display=description',
7474
'image_url': 'http://www.luminex.be/products/0100037/photo_037.png',
75-
'tags': ['ArtNet']},
75+
'tags': ['Art-Net']},
7676
],
7777
}

‎data/pid_data.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,14 +716,14 @@
716716
{'get_request': {'items': []},
717717
'get_response': {'items': [
718718
{'name': 'input_format', 'type': 'uint8',
719-
'labels': [(0, 'DMX'), (1, 'ArtNet'),
719+
'labels': [(0, 'DMX'), (1, 'Art-Net'),
720720
(2, 'E1.31'), (3, 'KiNet')],
721721
}
722722
]},
723723
'get_sub_device_range': 0,
724724
'name': 'INPUT_FORMAT',
725725
'set_request': {'items': [{'name': 'input_format', 'type': 'uint8',
726-
'labels': [(0, 'DMX'), (1, 'ArtNet'),
726+
'labels': [(0, 'DMX'), (1, 'Art-Net'),
727727
(2, 'E1.31'), (3, 'KiNet')],
728728
}]},
729729
'set_response': {'items': []},

0 commit comments

Comments
 (0)