From f179dd113548688910a745417c6db0a568cebbad Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 23 Apr 2018 23:26:24 +0100 Subject: [PATCH 1/4] Update a link --- data/controller_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/controller_data.py b/data/controller_data.py index 70f25236..3dffef55 100644 --- a/data/controller_data.py +++ b/data/controller_data.py @@ -108,7 +108,7 @@ ], 0x454E: [ {'name': 'DMX USB Pro', - 'link': 'http://www.enttec.com/index.php?main_menu=Products&pn=70304', + 'link': 'https://www.enttec.com/products/controls/dmx-usb/dmx-usb-pro/', 'image_url': 'http://www.enttec.com/img/dmxusbpro/flip.gif', 'tags': ['tool', 'USB']}, {'name': 'RDM USB Pro', From 653bbb5c7e9d02a6b860014691dfe4a9f6204752 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Mon, 23 Apr 2018 23:29:12 +0100 Subject: [PATCH 2/4] More link updates --- data/software_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/software_data.py b/data/software_data.py index 49cbf1f2..f4c1defe 100644 --- a/data/software_data.py +++ b/data/software_data.py @@ -20,7 +20,7 @@ SOFTWARE_DATA = { 0x454E: [ {'name': 'ENTTEC RDM Controller', - 'link': 'http://www.enttec.com/index.php?main_menu=Products&pn=70531&show=description&name=rdmcontroller', + 'link': 'https://www.enttec.com/products/controls/rdm/rdm-controller/', 'image_url': 'http://www.enttec.com/img/rdm/cr_sum_small.png', 'tags': ['Windows']}, ], From 0ea286efbed3c1c76b17cab57809d132a294ec75 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 14 Apr 2018 23:10:01 +0100 Subject: [PATCH 3/4] Fix the JS lint issue (cherry picked from commit 27395161d6cc303122c5750ec5d62ef846772097) --- js_src/rdm.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js_src/rdm.js b/js_src/rdm.js index 190e4ed1..0522ea83 100644 --- a/js_src/rdm.js +++ b/js_src/rdm.js @@ -506,7 +506,8 @@ angular.module('rdmApp', []) var data = return_data[1]; if (data.length !== RDM.EUID_SIZE) { - $scope.error = 'Invalid EUID: insufficent data, should be 16 bytes'; + $scope.error = 'Invalid EUID: incorrect amount of data, should be ' + + '16 bytes'; return; } From 27e267cf1330fb48ccff1c720ff58341b4b84259 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sat, 14 Apr 2018 23:21:45 +0100 Subject: [PATCH 4/4] Fix the JS unit test (cherry picked from commit 583051f861e55adaf3d0dae718fd9fb052f8565b) --- unit-test-js/tests/rdm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit-test-js/tests/rdm.js b/unit-test-js/tests/rdm.js index 66fd80ca..965d7a45 100644 --- a/unit-test-js/tests/rdm.js +++ b/unit-test-js/tests/rdm.js @@ -69,7 +69,7 @@ describe('rdmApp', function() { converter.euid = ''; converter.convertToUID(); expect(converter.error).toEqual( - 'Invalid EUID: insufficent data, should be 16 bytes'); + 'Invalid EUID: incorrect amount of data, should be 16 bytes'); expect(converter.uid).toEqual(''); });