From c10c57f903f77ca2343f3f568c76654a2669ddea Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Tue, 27 Feb 2018 00:36:10 +0000 Subject: [PATCH 1/8] Add links to kit items. --- content/kit/_index.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/content/kit/_index.md b/content/kit/_index.md index ceb4daac..102bdc19 100644 --- a/content/kit/_index.md +++ b/content/kit/_index.md @@ -26,20 +26,20 @@ With your kit, you should have the following boards: In addition to the boards, your kit will also contain: -| Part | Quantity | Specification | Notes | -|------------------------------|----------|-------------------------------|--------------------------------------------------| -| Battery Bag | 1 | | | -| Battery Charger | 1 | iMAX B6 | | -| Battery Charger Power Supply | 1 | 12V 5A | | -| Battery | 2 | 11.1V 2200mAh Lithium Polymer | | -| Webcam | 1 | TeckNet C016 | | -| USB Hub | 1 | | | -| Micro USB Cable | 2 | | | -| USB B Cable | 1 | | | -| Large CamCon | 2 | 7.5mm | | -| Medium CamCon | 2 | 5mm | | -| Small CamCon | 3 | 3.81mm | 1 additionally found on Raspberry Pi power cable | -| Raspberry Pi Power Cable | 1 | Micro USB to small CamCon | | +| Part | Quantity | Specification | Notes | +|-------------------------------------------------------|----------|-------------------------------|--------------------------------------------------| +| [Battery Bag](https://goo.gl/6NHiwk) | 1 | | | +| [Battery Charger](https://goo.gl/m3n9AZ) | 1 | iMAX B6 | | +| [Battery Charger Power Supply](https://goo.gl/8dCnhm) | 1 | 12V 5A | | +| [Battery](https://goo.gl/oVGWvH) | 2 | 11.1V 2200mAh Lithium Polymer | | +| [Webcam](https://goo.gl/8sBFQv) | 1 | TeckNet C016 | | +| [USB Hub](https://goo.gl/QSMMFa) | 1 | | | +| [Micro USB Cable](https://goo.gl/MS3vQA) | 2 | | | +| [USB B Cable](https://goo.gl/hMCTGv) | 1 | | | +| [Large CamCon](https://goo.gl/GssRRS) | 2 | 7.5mm | | +| [Medium CamCon](https://goo.gl/rK7UPb) | 2 | 5mm | | +| [Small CamCon](https://goo.gl/4NPxKs) | 3 | 3.81mm | 1 additionally found on Raspberry Pi power cable | +| Raspberry Pi Power Cable | 1 | Micro USB to small CamCon | | ### Parts we don't mind you keeping From 5faa33699e9c528fd04dffa786752bbc060ab7f9 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Tue, 27 Feb 2018 13:24:16 +0000 Subject: [PATCH 2/8] Change Kit Urls to full urls --- content/kit/_index.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/content/kit/_index.md b/content/kit/_index.md index 102bdc19..4e722f52 100644 --- a/content/kit/_index.md +++ b/content/kit/_index.md @@ -26,20 +26,20 @@ With your kit, you should have the following boards: In addition to the boards, your kit will also contain: -| Part | Quantity | Specification | Notes | -|-------------------------------------------------------|----------|-------------------------------|--------------------------------------------------| -| [Battery Bag](https://goo.gl/6NHiwk) | 1 | | | -| [Battery Charger](https://goo.gl/m3n9AZ) | 1 | iMAX B6 | | -| [Battery Charger Power Supply](https://goo.gl/8dCnhm) | 1 | 12V 5A | | -| [Battery](https://goo.gl/oVGWvH) | 2 | 11.1V 2200mAh Lithium Polymer | | -| [Webcam](https://goo.gl/8sBFQv) | 1 | TeckNet C016 | | -| [USB Hub](https://goo.gl/QSMMFa) | 1 | | | -| [Micro USB Cable](https://goo.gl/MS3vQA) | 2 | | | -| [USB B Cable](https://goo.gl/hMCTGv) | 1 | | | -| [Large CamCon](https://goo.gl/GssRRS) | 2 | 7.5mm | | -| [Medium CamCon](https://goo.gl/rK7UPb) | 2 | 5mm | | -| [Small CamCon](https://goo.gl/4NPxKs) | 3 | 3.81mm | 1 additionally found on Raspberry Pi power cable | -| Raspberry Pi Power Cable | 1 | Micro USB to small CamCon | | +| Part | Quantity | Specification | Notes | +|----------------------------------------------------------------------------------------------------------|----------|-------------------------------|--------------------------------------------------| +| [Battery Bag](https://hobbyking.com/en_us/lithium-polymer-charge-pack-25x33cm-jumbo-sack.html) | 1 | | | +| [Battery Charger](https://hobbyking.com/en_us/imax-b6-50w-5a-charger-discharger-1-6-cells-genuine.html) | 1 | iMAX B6 | | +| [Battery Charger Power Supply](https://www.amazon.co.uk/TMEZON-100V-240V-Switching-Security-Accessories-1x-5A-power-adapter/dp/B01N1ULL37) | 1 | 12V 5A | +| [Battery](https://hobbyking.com/en_us/turnigy-2200mah-3s-25c-lipo-pack.html) | 2 | 11.1V 3S 25C 2200mAh Lithium Polymer | | +| [Webcam](https://www.amazon.co.uk/TeckNet%C2%AE-C016-Webcam-MegaPixel-Microphone/dp/B000Q3VECE/) | 1 | TeckNet C016 | | +| [USB Hub](https://www.amazon.co.uk/Warranty-Ultra-Slim-Portable-Expansion-Splitter-Black/dp/B01DYD3Q28/) | 1 | | | +| [Micro USB Cable](https://www.amazon.co.uk/AmazonBasics-USB-Male-Micro-Cable/dp/B01EK87T9M/) | 2 | | | +| [USB B Cable](https://www.amazon.co.uk/AmazonBasics-USB-2-0-Cable-Male/dp/B00NH11KIK) | 1 | | | +| [Large CamCon](http://uk.farnell.com/camdenboss/ctb9400-2/terminal-block-pluggable-2pos/dp/3882275) | 2 | 7.5mm | | +| [Medium CamCon](http://uk.farnell.com/camdenboss/ctb9200-2a/terminal-block-pluggable-2pos/dp/3881854) | 2 | 5mm | | +| [Small CamCon](http://uk.farnell.com/camdenboss/ctb92he-2/terminal-block-pluggable-2pos/dp/1717047) | 3 | 3.81mm | 1 additionally found on Raspberry Pi power cable | +| Raspberry Pi Power Cable | 1 | Micro USB to small CamCon | | ### Parts we don't mind you keeping From 6b5104c318e9bfae729025ab8779487c3013feb8 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Tue, 6 Mar 2018 22:20:42 +0000 Subject: [PATCH 3/8] Add Firefox User Agent to Link Checker --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c8cfe99..6ce81edc 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "spellcheck": "mdspell --en-gb --report --ignore-acronyms --ignore-numbers --no-suggestions 'content/**/*.md'", "broken-link-local": "blcl --recursive --ordered --exclude-external ./public/", - "broken-link-all": "blcl --recursive --ordered ./public/", + "broken-link-all": "blcl --recursive --user-agent \"Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20100101 Firefox/10.0\" --ordered ./public/", "test": "npm run spellcheck && npm run broken-link-local", "ci-test": "npm run spellcheck && npm run broken-link-all" }, From b120f080783463a2fba88e1c1e39e2765dfa11c5 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Tue, 6 Mar 2018 22:52:27 +0000 Subject: [PATCH 4/8] Remove User Agent and Exclude Farnell links --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ce81edc..5a9bfdb6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "scripts": { "spellcheck": "mdspell --en-gb --report --ignore-acronyms --ignore-numbers --no-suggestions 'content/**/*.md'", "broken-link-local": "blcl --recursive --ordered --exclude-external ./public/", - "broken-link-all": "blcl --recursive --user-agent \"Mozilla/5.0 (X11; Linux x86_64; rv:10.0) Gecko/20100101 Firefox/10.0\" --ordered ./public/", + "broken-link-all": "blcl --recursive --exclude farnell --ordered ./public/", "test": "npm run spellcheck && npm run broken-link-local", "ci-test": "npm run spellcheck && npm run broken-link-all" }, From de78cf812614fe1475d5299fc9edca75d630b142 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Wed, 7 Mar 2018 00:38:07 +0000 Subject: [PATCH 5/8] Add comment to package.json explaining the exclusion of Farnell links. As json comments are not a defined standard, I have followed this recommendation from the NPM mailing list https://groups.google.com/forum/#!msg/nodejs/NmL7jdeuw0M/yTqI05DRQrIJ --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 5a9bfdb6..ec6441e3 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "scripts": { "spellcheck": "mdspell --en-gb --report --ignore-acronyms --ignore-numbers --no-suggestions 'content/**/*.md'", "broken-link-local": "blcl --recursive --ordered --exclude-external ./public/", + "//": "Exclude Farnell as their site causes the link checker to hang.", "broken-link-all": "blcl --recursive --exclude farnell --ordered ./public/", "test": "npm run spellcheck && npm run broken-link-local", "ci-test": "npm run spellcheck && npm run broken-link-all" From 79586e40d41a4fd724b455269e5abb92b775c6c4 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Wed, 7 Mar 2018 00:57:27 +0000 Subject: [PATCH 6/8] Change to footnote urls in Kit Links Table --- content/kit/_index.md | 40 ++++++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/content/kit/_index.md b/content/kit/_index.md index 4e722f52..a04f67a7 100644 --- a/content/kit/_index.md +++ b/content/kit/_index.md @@ -26,20 +26,32 @@ With your kit, you should have the following boards: In addition to the boards, your kit will also contain: -| Part | Quantity | Specification | Notes | -|----------------------------------------------------------------------------------------------------------|----------|-------------------------------|--------------------------------------------------| -| [Battery Bag](https://hobbyking.com/en_us/lithium-polymer-charge-pack-25x33cm-jumbo-sack.html) | 1 | | | -| [Battery Charger](https://hobbyking.com/en_us/imax-b6-50w-5a-charger-discharger-1-6-cells-genuine.html) | 1 | iMAX B6 | | -| [Battery Charger Power Supply](https://www.amazon.co.uk/TMEZON-100V-240V-Switching-Security-Accessories-1x-5A-power-adapter/dp/B01N1ULL37) | 1 | 12V 5A | -| [Battery](https://hobbyking.com/en_us/turnigy-2200mah-3s-25c-lipo-pack.html) | 2 | 11.1V 3S 25C 2200mAh Lithium Polymer | | -| [Webcam](https://www.amazon.co.uk/TeckNet%C2%AE-C016-Webcam-MegaPixel-Microphone/dp/B000Q3VECE/) | 1 | TeckNet C016 | | -| [USB Hub](https://www.amazon.co.uk/Warranty-Ultra-Slim-Portable-Expansion-Splitter-Black/dp/B01DYD3Q28/) | 1 | | | -| [Micro USB Cable](https://www.amazon.co.uk/AmazonBasics-USB-Male-Micro-Cable/dp/B01EK87T9M/) | 2 | | | -| [USB B Cable](https://www.amazon.co.uk/AmazonBasics-USB-2-0-Cable-Male/dp/B00NH11KIK) | 1 | | | -| [Large CamCon](http://uk.farnell.com/camdenboss/ctb9400-2/terminal-block-pluggable-2pos/dp/3882275) | 2 | 7.5mm | | -| [Medium CamCon](http://uk.farnell.com/camdenboss/ctb9200-2a/terminal-block-pluggable-2pos/dp/3881854) | 2 | 5mm | | -| [Small CamCon](http://uk.farnell.com/camdenboss/ctb92he-2/terminal-block-pluggable-2pos/dp/1717047) | 3 | 3.81mm | 1 additionally found on Raspberry Pi power cable | -| Raspberry Pi Power Cable | 1 | Micro USB to small CamCon | | +| Part | Quantity | Specification | Notes | +|---------------------------------------------|----------|--------------------------------------|--------------------------------------------------| +| [Battery Bag][battery-bag] | 1 | | | +| [Battery Charger][battery-charger] | 1 | iMAX B6 | | +| [Battery Charger Power Supply][charger-psu] | 1 | 12V 5A | | +| [Battery][battery] | 2 | 11.1V 3S 25C 2200mAh Lithium Polymer | | +| [Webcam][webcam] | 1 | TeckNet C016 | | +| [USB Hub][usb-hub] | 1 | | | +| [Micro USB Cable][micro-usb-cable] | 2 | | | +| [USB B Cable][usb-b-cable] | 1 | | | +| [Large CamCon][lg-camcon] | 2 | 7.5mm | | +| [Medium CamCon][md-camcon] | 2 | 5mm | | +| [Small CamCon][sm-camcon] | 3 | 3.81mm | 1 additionally found on Raspberry Pi power cable | +| Raspberry Pi Power Cable | 1 | Micro USB to small CamCon | | + +[battery-bag]: https://hobbyking.com/en_us/lithium-polymer-charge-pack-25x33cm-jumbo-sack.html +[battery-charger]:https://hobbyking.com/en_us/imax-b6-50w-5a-charger-discharger-1-6-cells-genuine.html +[charger-psu]:https://www.amazon.co.uk/-/dp/B01N1ULL37 +[battery]: https://hobbyking.com/en_us/turnigy-2200mah-3s-25c-lipo-pack.html +[webcam]:https://www.amazon.co.uk/-/dp/B000Q3VECE/ +[usb-hub]:https://www.amazon.co.uk/-/dp/B01DYD3Q28/ +[micro-usb-cable]:https://www.amazon.co.uk/-/dp/B01EK87T9M/ +[usb-b-cable]:https://www.amazon.co.uk/-/dp/B00NH11KIK +[lg-camcon]:http://uk.farnell.com/-/-/-/dp/3882275 +[md-camcon]:http://uk.farnell.com/-/-/-/dp/3881854 +[sm-camcon]: http://uk.farnell.com/-/-/-/dp/1717047 ### Parts we don't mind you keeping From e874d5c8d3019072f9f5300b8527ac8801d146c6 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 17 Mar 2018 11:20:56 +0000 Subject: [PATCH 7/8] Remove nasty comment --- package.json | 1 - scripts/tests/broken-link-all.sh | 6 ++++++ scripts/tests/broken-link-local.sh | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100755 scripts/tests/broken-link-all.sh create mode 100755 scripts/tests/broken-link-local.sh diff --git a/package.json b/package.json index ec6441e3..5a9bfdb6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,6 @@ "scripts": { "spellcheck": "mdspell --en-gb --report --ignore-acronyms --ignore-numbers --no-suggestions 'content/**/*.md'", "broken-link-local": "blcl --recursive --ordered --exclude-external ./public/", - "//": "Exclude Farnell as their site causes the link checker to hang.", "broken-link-all": "blcl --recursive --exclude farnell --ordered ./public/", "test": "npm run spellcheck && npm run broken-link-local", "ci-test": "npm run spellcheck && npm run broken-link-all" diff --git a/scripts/tests/broken-link-all.sh b/scripts/tests/broken-link-all.sh new file mode 100755 index 00000000..bf66db66 --- /dev/null +++ b/scripts/tests/broken-link-all.sh @@ -0,0 +1,6 @@ +#! /bin/bash + +# This script will check all links on the site to see if they are broken. + +# Github links below are excluded to prevent breaking the link checker for the Edit in Github urls, when no such page exists in master +blcl --recursive --exclude https://github.com/sourcebots/docs/tree/master/content/* --ordered ./public/ diff --git a/scripts/tests/broken-link-local.sh b/scripts/tests/broken-link-local.sh new file mode 100755 index 00000000..f744a86a --- /dev/null +++ b/scripts/tests/broken-link-local.sh @@ -0,0 +1,3 @@ +#! /bin/bash + +blcl --recursive --ordered --exclude-external ./public/ From 52c1d1c51b7247d66f08d50d0cf6e9f9328b46f9 Mon Sep 17 00:00:00 2001 From: Dan Trickey Date: Sat, 17 Mar 2018 11:24:56 +0000 Subject: [PATCH 8/8] Remove scripts --- scripts/tests/broken-link-all.sh | 6 ------ scripts/tests/broken-link-local.sh | 3 --- 2 files changed, 9 deletions(-) delete mode 100755 scripts/tests/broken-link-all.sh delete mode 100755 scripts/tests/broken-link-local.sh diff --git a/scripts/tests/broken-link-all.sh b/scripts/tests/broken-link-all.sh deleted file mode 100755 index bf66db66..00000000 --- a/scripts/tests/broken-link-all.sh +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -# This script will check all links on the site to see if they are broken. - -# Github links below are excluded to prevent breaking the link checker for the Edit in Github urls, when no such page exists in master -blcl --recursive --exclude https://github.com/sourcebots/docs/tree/master/content/* --ordered ./public/ diff --git a/scripts/tests/broken-link-local.sh b/scripts/tests/broken-link-local.sh deleted file mode 100755 index f744a86a..00000000 --- a/scripts/tests/broken-link-local.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/bash - -blcl --recursive --ordered --exclude-external ./public/