Skip to content

Commit 211b5d3

Browse files
kriptonkripton
authored
Merge pull request #310 from peternewman/manufacturer-updates
Manufacturer updates
2 parents b702314 + 7a54920 commit 211b5d3

3 files changed

Lines changed: 38 additions & 4 deletions

File tree

‎data/manufacturer_data.py‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@
316316
(0x03A8, "ARTFOX"),
317317
(0x03AA, "AIGA Electronic (GuangZhou) Co., Ltd."),
318318
(0x03AB, "ABMICROLONDON"),
319+
(0x03C6, "NYSOFT"),
319320
(0x03D5, "eX Systems"),
320321
(0x03D6, "i-Lumen"),
321322
(0x03DA, "QST LED"),
@@ -327,6 +328,8 @@
327328
(0x0412, "D's DMX"),
328329
(0x041C, "IMLIGHT"),
329330
(0x0424, "FLUX ECLAIRAGE"),
331+
(0x0428, "ITSTECH"),
332+
(0x0430, "BOE MLED Technology Co., Ltd"),
330333
(0x0440, "Guangzhou VAS Lighting Co., Ltd."),
331334
(0x044E, "Ben Peoples Industries, LLC"),
332335
(0x044F, "B2 Co., Ltd."),
@@ -346,6 +349,7 @@
346349
(0x04D7, "Targetti Sankey Spa"),
347350
(0x04D8, "Guangzhou Hong Yuan Electronic Technology Co., LTD."),
348351
(0x04DD, "Topstriving Photoelectricity Technology Co., Ltd."),
352+
(0x04E6, "Kelvix"),
349353
(0x04EE, "Tivoli Lighting"),
350354
(0x04F0, "SIGMA NET"),
351355
(0x04F4, "Zeraus"),
@@ -355,6 +359,7 @@
355359
(0x051C, "Ambitsel, Inc."),
356360
(0x0520, "ANLC Ltd"),
357361
(0x0529, "OSRAM"),
362+
(0x0536, "tarm AG"),
358363
(0x0537, "TERMINAL-COM"),
359364
(0x0540, "EverBrighten Co., Ltd."),
360365
(0x0555, "Maresch Electronics"),
@@ -377,6 +382,7 @@
377382
(0x05C0, "Vertigo"),
378383
(0x05CF, "Brighten Technology Development Co., Ltd."),
379384
(0x05D3, "D-LED Illumination Technologies Ltd."),
385+
(0x05DA, "Spacyal"),
380386
(0x05E0, "esp_dmx"),
381387
(0x05E2, "KORRO PLUS"),
382388
(0x05E8, "Snap One"),
@@ -428,6 +434,7 @@
428434
(0x06A1, "ProTec GmbH"),
429435
(0x06A3, "RODLIGHT ALBRECHT SILBERBERGER"),
430436
(0x06AC, "GOLVER PROJECTS S.L."),
437+
(0x06AD, "LEDMAN OPTOELECTRONIC CO.,LTD."),
431438
(0x06AE, "CANARA LIGHTING INDUSTRIES PVT LTD"),
432439
(0x06AF, "ZHEJIANG JINGRI TECHNOLOGY CO.,LTD"),
433440
(0x06B3, "NANOLUMENS, INC."),
@@ -436,6 +443,7 @@
436443
(0x06BB, "IQ COMPANY Ltd."),
437444
(0x06C4, "RHENAC Systems GmbH"),
438445
(0x06C7, "L&L Luce&Light"),
446+
(0x06CA, "Leding"),
439447
(0x06CE, "American-Pro International"),
440448
(0x06D1, "BIRUN ELECTRONIC INDUSTRIAL CO., LTD"),
441449
(0x06D2, "LIGHTSTAR (BEIJING) ELECTRONIC CORPORATION"),
@@ -551,6 +559,7 @@
551559
(0x0824, "Almotechnos CO.,LTD."),
552560
(0x0827, "PIXREAL"),
553561
(0x0832, "Shenzhen EXC-LED Technology Co.,Ltd"),
562+
(0x0836, "Nyvoll Lys"),
554563
(0x0838, "LaserAV"),
555564
(0x083A, "Bright Ideas Custom Electronics Inc."),
556565
(0x083C, "TDT Productions"),
@@ -614,6 +623,7 @@
614623
(0x0892, "DongGuan Ruishen Technology Co.,Ltd"),
615624
(0x0893, "Brighten LED Lighting Limited"),
616625
(0x0894, "Dongguan HCP Technology Co., Ltd."),
626+
(0x0896, "CSD Design and Fabrication"),
617627
(0x089A, "ADL Electronics Ltd."),
618628
(0x089D, "gobo.ws"),
619629
(0x08A1, "Shenzhen Gloshine Technology Co., Ltd"),
@@ -651,6 +661,7 @@
651661
(0x08C6, "Guangzhou Ever Famous Electronic Co.,Ltd"),
652662
(0x08C9, "LEDitgo Videowall Germany GmbH"),
653663
(0x08CA, "Foshan City Xuandao Optoelectronics Equipment Co., Ltd"),
664+
(0x08CB, "Practical LEDs.com"),
654665
(0x08CC, "Guangzhou Santu Stage Lighting Equipment Co.Ltd"),
655666
(0x08D0, "Image Engineering"),
656667
(0x08D1, "Shenzhen Leqi Network Technology Co., Ltd."),
@@ -703,6 +714,7 @@
703714
(0x090B, "StarLighting"),
704715
(0x090C, "GRE Alpha"),
705716
(0x090E, "Sichuan esRadio Technology Co., Ltd"),
717+
(0x090F, "Shenzhen Dingli Display Technology Co., Ltd"),
706718
(0x0910, "Shenzhen Tecnon EXCO-Vision Technology Co., Ltd."),
707719
(0x0911, "Guangzhou Aceda Professional Lighting Co., Ltd."),
708720
(0x0912, "ags - Wissenschaftliche Arbeitsgemeinschaft fur Studio- und Senderfragen"),
@@ -753,16 +765,19 @@
753765
(0x0949, "Shenzhen Jiuzhou Optoelectronic Technology"),
754766
(0x094A, "Funovation, Inc"),
755767
(0x094B, "Invisua Lighting BV"),
768+
(0x094D, "Quantum Theory"),
756769
(0x0951, "Guangzhou GTD Lighting Technology Co., Ltd"),
757770
(0x0952, "Guangzhou Sunway Entertainment Equipment Co., Ltd."),
758771
(0x0953, "Boumakers Techniek"),
759772
(0x0954, "Ledtop Visual Ltd."),
773+
(0x0956, "Expromo Europe A/S"),
760774
(0x0957, "White Light Ltd"),
761775
(0x0958, "Illum Technology LLC (previously Verde Designs, Inc.)"),
762776
(0x0959, "Urbs Lighting, LLC"),
763777
(0x095A, "kLabs Research UK"),
764778
(0x095B, "Wuhan Zhongtian Jiaye Mechanical and Electrical Engineering Co. LTD"),
765779
(0x095C, "Thomas Neumann Licht und Tontechnik"),
780+
(0x095D, "Silver Curve Ltd"),
766781
(0x095E, "Hondel Lighting Limited"),
767782
(0x095F, "Elaborated Networks GmbH"),
768783
(0x0960, "Fineline Solutions Ltd."),
@@ -785,6 +800,7 @@
785800
(0x0980, "Moog Animatics"),
786801
(0x0981, "Luxam, Ltd."),
787802
(0x0982, "AC Entertainment Products Ltd."),
803+
(0x0984, "Laserworld AG"),
788804
(0x0986, "ROE Visual Co. Ltd."),
789805
(0x0987, "mathertel.de"),
790806
(0x0989, "YeGrin Liteworks"),
@@ -801,6 +817,7 @@
801817
(0x0997, "Star Iluminacao Computadorizada LTDA"),
802818
(0x0999, "Concept Smoke Systems Ltd."),
803819
(0x099A, "Aixz International (S)"),
820+
(0x099D, "Frenexport SPA"),
804821
(0x099E, "LLC Lighting Technologies production"),
805822
(0x09A0, "Rnet Lighting Technology Limited"),
806823
(0x09A1, "Veranstaltungstechnik Konig"),
@@ -816,6 +833,7 @@
816833
(0x09B3, "Aquatique Show Int."),
817834
(0x09B4, "Brompton Technology Ltd."),
818835
(0x09B5, "XBlack Visual Products"),
836+
(0x09B6, "Second String Studios"),
819837
(0x09B7, "inCon-trol water systems"),
820838
(0x09B8, "Prolites S.A.L."),
821839
(0x09BB, "Guangzhou Yiyi Technology Co., Ltd."),
@@ -837,6 +855,7 @@
837855
(0x09D6, "Mittomakers"),
838856
(0x09D7, "Unilumin Group"),
839857
(0x09D8, "Pioneer Lighting Solutions India Pvt Ltd"),
858+
(0x09DC, "Froggys Fog"),
840859
(0x09DD, "Planet Innovation Products Inc"),
841860
(0x09DE, "Matthias Bauch Software"),
842861
(0x09E9, "Starway"),
@@ -861,6 +880,7 @@
861880
(0x120A, "Bulldog Lighting and Events, Inc."),
862881
(0x120B, "Brilliant Stages Ltd."),
863882
(0x120C, "Shanxi Tian Gong Sheng Optoelectronic Equipment Technology Co."),
883+
(0x1211, "Recrealab"),
864884
(0x1212, "HPL Light Company"),
865885
(0x1221, "SAGITTER-SDJ-Proel"),
866886
(0x1222, "SM International"),
@@ -1005,6 +1025,7 @@
10051025
(0x26A2, "MEGATECHNICS Ltd."),
10061026
(0x26B4, "Milford Instruments Ltd."),
10071027
(0x2724, "Nila Inc."),
1028+
(0x2727, "Lumikit"),
10081029
(0x2734, "Nixer Ltd."),
10091030
(0x27A8, "Callegenix LLC"),
10101031
(0x2821, "Pioneer Corporation"),
@@ -1051,6 +1072,7 @@
10511072
(0x3333, "NightStarry Electronics Co., LTD."),
10521073
(0x3388, "Macostar International Ltd."),
10531074
(0x3434, "Global Design Solutions, Ltd."),
1075+
(0x3533, "Figure 53, LLC"),
10541076
(0x3534, "Five4, LLC"),
10551077
(0x3535, "Changsha Spark Technology Electronics Ltd."),
10561078
(0x3536, "Cindy Professional Lighting Co., Ltd."),
@@ -1365,6 +1387,7 @@
13651387
(0x5DAC, "Mediatec Group"),
13661388
(0x5E5D, "Multisenses GmbH"),
13671389
(0x5E5E, "Converging Systems Inc."),
1390+
(0x6019, "Artifice Industries Ltd."),
13681391
(0x6100, "Krobox Sdn Bhd"),
13691392
(0x610A, "Visenge Pty. Ltd"),
13701393
(0x6123, "CMYLight (S) Pte. Ltd."),
@@ -1389,6 +1412,7 @@
13891412
(0x6464, "Dangeross Design"),
13901413
(0x646C, "dilitronics GmbH"),
13911414
(0x646F, "eldoLED BV"),
1415+
(0x6472, "Ingenieurburo Steffens"),
13921416
(0x64B9, "Finelite, Inc."),
13931417
(0x6542, "eBrain GmbH"),
13941418
(0x6543, "LES-TV Ltd."),
@@ -1455,7 +1479,7 @@
14551479
(0x7403, "Yenrich Technology Corporation"),
14561480
(0x7764, "WET"),
14571481
(0x7765, "MKT engineering GmbH & Co. KG"),
1458-
(0x7777, "Develtron A/S"),
1482+
(0x7777, "DVT Light"),
14591483
(0x7788, "DigitaLicht AG"),
14601484
(0x780E, "Mole-Richardson Co."),
14611485
(0x783A, "Audiolux Devices LLC"),

‎data/manufacturer_links.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
(0x0391, "https://alcorn.com/"),
4545
(0x044E, "http://benpeoples.com/"),
4646
(0x0455, "https://lampandpencil.com/"),
47+
(0x04E6, "https://www.kelvix.com/"),
4748
(0x04FC, "http://strong.lighting/"),
49+
(0x0504, "https://ezevent.net/"), # One of their brand names
4850
(0x050A, "https://secure.chamsys.co.uk/"),
4951
(0x0529, "https://www.osram.com/"),
5052
(0x056B, "https://www.cosmolight.it/"),
@@ -62,18 +64,22 @@
6264
(0x07EA, "http://www.lemaitreltd.com/"),
6365
(0x0808, "http://zero88.com/"),
6466
(0x0854, "https://www.nec-display-solutions.com/"),
67+
(0x0896, "https://www.csdcnc.com/"),
6568
(0x089D, "http://www.gobo.ws/"),
6669
(0x08A4, "https://www.adamhall.com/"),
6770
(0x08A6, "https://impulswerk.de"),
6871
(0x08EA, "https://www.cedarled.com/"),
6972
(0x08C5, "https://ehrgeiz.glp.de/"),
70-
(0x0960, "https://www.whitelight.ltd.uk/"),
73+
(0x0956, "https://www.expromo.eu/"),
74+
(0x0957, "https://www.whitelight.ltd.uk/"),
7175
(0x0960, "https://fineline.solutions/"),
7276
(0x097A, "http://teamboyce.com/"),
7377
(0x097F, "https://raumzeitlabor.de/"),
78+
(0x0984, "https://www.laserworld.com/"),
7479
(0x0987, "https://www.mathertel.de/"),
7580
(0x09B5, "https://www.xblackpro.com/"),
7681
(0x09D1, "https://www.environmentallights.com/"),
82+
(0x09DC, "https://www.froggysfog.com/"),
7783
(0x1234, "https://tsp.esta.org/tsp/working_groups/CP/cp.html"),
7884
(0x15D0, "https://www.musiclights.it/"),
7985
# (0x15D0, "http://prolights.it/"), # This is one of their sub-brands
@@ -90,13 +96,15 @@
9096
(0x2635, "http://www.ljusdesign.se/"),
9197
(0x263C, "http://www.i-pix.com/"),
9298
# (0x26B4, "http://www.milinst.co.uk/"), # Company, and website has gone
99+
(0x2727, "https://www.lumikit.com.br/international"),
93100
(0x29B4, "http://www.highlite.nl/"),
94101
(0x2C1A, "https://www.dmx4all.de/"),
95102
(0x2C2A, "http://www.xtba.co.uk/"),
96103
# (0x2DC8, "http://www.stellascapes.com/"), # Website has gone
97104
(0x2DDE, "https://www.luminlite.com.tw/"),
98105
(0x3388, "https://macostar.com/"),
99106
(0x3434, "https://www.gds.uk.com/"),
107+
(0x3533, "https://figure53.com/"),
100108
# (0x3638, "https://www.lumenpulse.com/"), # Website currently gone
101109
(0x3B10, "https://www.nxp.com/"),
102110
(0x4144, "https://www.adbstagelight.com/"),
@@ -149,6 +157,7 @@
149157
(0x5753, "http://wirelessdmx.com"),
150158
(0x5759, "https://www.wybron.com/"),
151159
(0x586D, "http://www.doityourselfchristmas.com/"),
160+
(0x6019, "https://artificers.co.uk/"),
152161
(0x6205, "http://www.ltechonline.com/"),
153162
(0x6364, "http://www.lanbox.com/"),
154163
(0x646F, "https://www.eldoled.com/"),

‎data/manufacturer_test.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ def test_ManufacturerData(self):
4848
self.assertEqual(str, type(name))
4949

5050
self.assertNotIn(esta_id, seen_ids,
51-
"ESTA ID 0x%04x is present twice" % esta_id)
51+
("ESTA ID 0x%04x is present twice in manufacturers" %
52+
esta_id))
5253
seen_ids.add(esta_id)
5354

5455
# check that ESTA exists
@@ -79,7 +80,7 @@ def test_ManufacturerLinks(self):
7980

8081
# Check we've not seen a URL for this ID before
8182
self.assertNotIn(esta_id, seen_ids,
82-
"ESTA ID 0x%04x is present twice" % esta_id)
83+
"ESTA ID 0x%04x is present twice in links" % esta_id)
8384
seen_ids.add(esta_id)
8485

8586
# Check the link is valid

0 commit comments

Comments
 (0)