Skip to content

Commit cfa4e41

Browse files
bmeglibmegli
committed
Merge remote-tracking branch 'refs/remotes/ev3dev/master'
2 parents 56ea03d + e0060ee commit cfa4e41

467 files changed

Lines changed: 17250 additions & 10008 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ _site/
22
*.orig
33
*~
44
*.lock
5+
.sass-cache

‎.travis.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: ruby
2+
rvm:
3+
- 2.1
4+
5+
before_script:
6+
- chmod +x ./cibuild.sh # or do this locally and commit
7+
8+
# Assume bundler is being used, therefore
9+
# the `install` step will run `bundle install` by default.
10+
script: ./cibuild.sh
11+
12+
env:
13+
global:
14+
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ source 'https://rubygems.org'
22
gem 'github-pages'
33

44
require 'rbconfig'
5+
gem "html-proofer", :platforms => :ruby
56
gem 'wdm', '~> 0.1.0' if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i

‎README.md‎

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ev3dev.github.io
1+
Pretty website for ev3dev [![Build Status](https://travis-ci.org/ev3dev/ev3dev.github.io.svg?branch=master)](https://travis-ci.org/ev3dev/ev3dev.github.io)
22
================
33

44
This is the web page at <http://www.ev3dev.org> and also <http://ev3dev.github.io>.
@@ -48,21 +48,10 @@ Now you should be able to visit your page at: [http://localhost:4000](http://loc
4848
Previewing Your Changes Online
4949
---
5050

51-
When forking, you can create a new branch called `gh-pages`, then your
52-
changes can be viewed as `http://<user>.github.io/ev3dev.github.io`. When you do this
53-
though, GitHub will send you lots of email like this, which you should ignore.
54-
55-
The page build completed successfully, but returned the following warning:
56-
57-
CNAME already taken: www.ev3dev.org
58-
59-
For information on troubleshooting Jekyll see:
60-
61-
https://help.github.com/articles/using-jekyll-with-pages#troubleshooting
62-
63-
If you have any questions please contact us at https://github.com/contact.
64-
65-
If it really gets on your nerves, you can rename the `CNAME` file. Just make sure to
66-
change it back before you submit your pull request.
67-
68-
51+
We have a special script to use to publish your changes using the `gh-pages`
52+
branch of your fork of ev3dev.github.io. If you have SSH setup for your GitHub
53+
account, simply run`./publish <gh-user>` where *gh-user* is your actual GitHub
54+
user name. If you don't have SSH setup, you can use https by running
55+
`./publish https://github.com/<gh-user>/ev3dev.github.io.git` instead.
56+
This will copy the contents of `_site`, fix it up a bit and push it to your
57+
fork on GitHub. You can view the results at `http://<gh-user>.github.io/ev3dev.github.io`.

‎_config.yml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
markdown: kramdown
22
permalink: pretty
3-
exclude: [README.md, Gemfile, Gemfile.lock, repo-metadata.html]
3+
exclude:
4+
- README.md
5+
- Gemfile
6+
- Gemfile.lock
7+
- repo-metadata.html
8+
- publish.rb
9+
- vendor
10+
- cibuild.sh
11+
- .travis.yml
12+
- maintainer-notes.md
413

514
gems:
615
- jekyll-mentions

‎_data/motors.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"vendor_name": "LEGO",
4242
"vendor_part_name": "Motor 9V Mini-motor, newer lighter weight",
4343
"vendor_part_number": "43362",
44-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=43362c01"
44+
"vendor_website": "http://rebrickable.com/parts/43362c01"
4545
},
4646
{
4747
"count_per_rot": "360",
@@ -83,7 +83,7 @@
8383
"vendor_name": "LEGO",
8484
"vendor_part_name": "Technic Motor 9V Geared ",
8585
"vendor_part_number": "47154",
86-
"vendor_website": "http://alpha.bricklink.com/pages/clone/catalogitem.page?P=47154c01"
86+
"vendor_website": "http://rebrickable.com/parts/44486c02"
8787
},
8888
{
8989
"id": "LEGO_9V_MICROMOTOR",
@@ -95,7 +95,7 @@
9595
"vendor_name": "LEGO",
9696
"vendor_part_name": "Motor 9V Micromotor",
9797
"vendor_part_number": "70823",
98-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=2986"
98+
"vendor_website": "https://rebrickable.com/parts/2986"
9999
},
100100
{
101101
"id": "LEGO_9V_MINI_MOTOR_OLDER",
@@ -107,7 +107,7 @@
107107
"vendor_name": "LEGO",
108108
"vendor_part_name": "Motor 9V Mini-motor, older heavier weight",
109109
"vendor_part_number": "71427",
110-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=71427c01"
110+
"vendor_website": "http://rebrickable.com/parts/71427c01"
111111
},
112112
{
113113
"id": "LEGO_TECHNIC_MOTOR_9V",
@@ -119,7 +119,7 @@
119119
"vendor_name": "LEGO",
120120
"vendor_part_name": "Technic Motor 9V",
121121
"vendor_part_number": "74569",
122-
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=2838c01"
122+
"vendor_website": "http://rebrickable.com/parts/2838c01"
123123
},
124124
{
125125
"id": "LEGO_PF_TRAIN_MOTOR",
@@ -131,7 +131,7 @@
131131
"vendor_name": "LEGO",
132132
"vendor_part_name": "Power Functions Train Motor",
133133
"vendor_part_number": "88002",
134-
"vendor_website": "http://shop.lego.com/en-US/Power-Functions-Train-Motor-88002"
134+
"vendor_website": "http://shop.lego.com/en-US/LEGO-Power-Functions-Train-Motor-88002"
135135
},
136136
{
137137
"id": "LEGO_PF_L_MOTOR",

‎_data/ports.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@
9999
],
100100
"module": "ht-nxt-smux",
101101
"name": "ht-nxt-smux-port",
102-
"notes": "\n[^port-name-prefix]: The full `port_name` is in the format:\n ^\n [<parent-port-name>:]mux<n>\n ^\n For example, if we are looking at port 1 of this mux plugged into\n input port 2 on the EV3, the port name will be `in2:i2c08:mux1`.\n \n ",
102+
"notes": "\n[^address-prefix]: The full `address` is in the format:\n ^\n [<parent-address>:]mux<n>\n ^\n For example, if we are looking at port 1 of this mux plugged into\n input port 2 on the EV3, the address will be `in2:i2c08:mux1`.\n \n ",
103103
"num_modes": 2,
104104
"prefix": "mux",
105-
"prefix_footnote": "[^port-name-prefix]",
105+
"prefix_footnote": "[^address-prefix]",
106106
"source_file": "drivers/lego/sensors/ht_nxt_smux.c",
107107
"source_line": 39,
108108
"url_name": "ht-nxt-smux-port"
@@ -184,21 +184,21 @@
184184
"id": "EV3_OUTPUT_PORT_MODE_TACHO_MOTOR",
185185
"name": "tacho-motor",
186186
"name_footnote": "[^tacho-motor-mode]",
187-
"notes": "\n[^tacho-motor-mode]: Configures the port to use the\n [tacho-motor] driver module. The default driver is the\n EV3 Large Motor (`lego-ev3-l-motor`). You can change\n the driver using the `set_device` attribute.\n ^\n [tacho-motor]: /docs/drivers/tacho-motor\n \n "
187+
"notes": "\n[^tacho-motor-mode]: Configures the port to use the\n [tacho-motor] driver module. The default driver is the\n EV3 Large Motor (`lego-ev3-l-motor`). You can change\n the driver using the `set_device` attribute.\n ^\n [tacho-motor]: /docs/drivers/tacho-motor-class\n \n "
188188
},
189189
{
190190
"description": "Load the [dc-motor] device.",
191191
"id": "EV3_OUTPUT_PORT_MODE_DC_MOTOR",
192192
"name": "dc-motor",
193193
"name_footnote": "[^dc-motor-mode]",
194-
"notes": "\n[^dc-motor-mode]: This can be use with MINDSTORMS RCX\n motors, Power Functions motors and any other 'plain' DC\n motor. By 'plain', we mean the motor is just a motor without\n any feedback.\n ^\n [dc-motor]: /docs/drivers/dc-motor\n \n "
194+
"notes": "\n[^dc-motor-mode]: This can be use with MINDSTORMS RCX\n motors, Power Functions motors and any other 'plain' DC\n motor. By 'plain', we mean the motor is just a motor without\n any feedback.\n ^\n [dc-motor]: /docs/drivers/dc-motor-class\n \n "
195195
},
196196
{
197197
"description": "Load the [led] device.",
198198
"id": "EV3_OUTPUT_PORT_MODE_LED",
199199
"name": "led",
200200
"name_footnote": "[^led-mode]",
201-
"notes": "\n[^led-mode]: This can be used with MINDSTORMS RCX LEDs,\n Power Functions LEDs or any other LED connected to pins 1\n and 2 of the output port.\n ^\n [led]: /docs/drivers/led\n \n "
201+
"notes": "\n[^led-mode]: This can be used with MINDSTORMS RCX LEDs,\n Power Functions LEDs or any other LED connected to pins 1\n and 2 of the output port.\n ^\n [led]: /docs/drivers/rcx-led\n \n "
202202
},
203203
{
204204
"description": "Provide access to low level drivers.",
@@ -237,10 +237,10 @@
237237
],
238238
"module": "ms-ev3-smux",
239239
"name": "ms-ev3-smux-port",
240-
"notes": "\n[^port-name-prefix]: The full `port_name` is in the format:\n ^\n [<parent-port-name>:]mux<n>\n ^\n For example, if we are looking at port 1 of this mux plugged into\n input port 2 on the EV3, the port name will be `in2:i2c50:mux1`.\n \n ",
240+
"notes": "\n[^address-prefix]: The full `address` is in the format:\n ^\n [<parent-address>:]mux<n>\n ^\n For example, if we are looking at port 1 of this mux plugged into\n input port 2 on the EV3, the address will be `in2:i2c50:mux1`.\n \n ",
241241
"num_modes": 2,
242242
"prefix": "mux",
243-
"prefix_footnote": "[^port-name-prefix]",
243+
"prefix_footnote": "[^address-prefix]",
244244
"source_file": "drivers/lego/sensors/ms_ev3_smux.c",
245245
"source_line": 42,
246246
"url_name": "ms-ev3-smux-port"
@@ -257,7 +257,7 @@
257257
],
258258
"module": "ms-nxtmmx",
259259
"name": "ms-nxtmmx-out-port",
260-
"notes": "\n[^prefix]: The full port name will be something like `in2:i2c3:M1`\n depending on what port the motor multiplexer is plugged into.\n \n ",
260+
"notes": "\n[^prefix]: The full address will be something like `in2:i2c3:M1`\n depending on what port the motor multiplexer is plugged into.\n \n ",
261261
"num_modes": 1,
262262
"prefix": "M",
263263
"prefix_footnote": "[^prefix]",
@@ -310,10 +310,10 @@
310310
],
311311
"module": "pistorms-ports-in",
312312
"name": "pistorms-in-port",
313-
"notes": "\n[^port-name-prefix]: The full `port_name` is in the format:\n ^\n pistorms:B<b>:<prefix><n>\n ^\n For example, if we are looking at the port labeled \"BBS2\" on the\n PiStorms, the port name will be `pistorms:BB:S2`.\n \n ",
313+
"notes": "\n[^address-prefix]: The full `address` is in the format:\n ^\n pistorms:B<b>:<prefix><n>\n ^\n For example, if we are looking at the port labeled \"BBS2\" on the\n PiStorms, the address will be `pistorms:BB:S2`.\n \n ",
314314
"num_modes": 6,
315315
"prefix": "S",
316-
"prefix_footnote": "[^port-name-prefix]",
316+
"prefix_footnote": "[^address-prefix]",
317317
"source_file": "drivers/lego/pistorms/pistorms_ports_in.c",
318318
"source_line": 134,
319319
"url_name": "pistorms-in-port"
@@ -330,7 +330,7 @@
330330
],
331331
"module": "pistorms-ports-out",
332332
"name": "pistorms-out-port",
333-
"notes": "\n[^prefix]: The full port name will be something like `pistorms:BAM1`\n depending on what port the motor multiplexer is plugged into.\n \n ",
333+
"notes": "\n[^prefix]: The full address will be something like `pistorms:BAM1`.\n \n ",
334334
"num_modes": 1,
335335
"prefix": "M",
336336
"prefix_footnote": "[^prefix]",
@@ -350,10 +350,10 @@
350350
],
351351
"module": "wedo",
352352
"name": "wedo-port",
353-
"notes": "\n[^port-name-prefix]: The full `port_name` is in the format:\n ^\n usb<usb-path>:wedo<n>\n ^\n The USB path might be something like `1-1.3:1.0`. Read more about\n it [here](http://gajjarpremal.blogspot.in/2015/04/sysfs-structures-for-linux-usb.html).\n Run `lsusb -t` to help figure out the correct path for your WeDo hub.\n ^\n For example, this...\n ^\n /: Bus 05.Port 1: Dev 1, Class=root_hub, Driver=ehci-pci/4p, 480M\n |__ Port 4: Dev 5, If 0, Class=Hub, Driver=hub/4p, 480M\n |__ Port 2: Dev 6, If 0, Class=Human Interface Device, Driver=wedo, 1.5M\n ^\n ...translates to `usb5-4.2:1.0:wedo1`. You can see how `Bus 05`,\n `Port 4` and `Port 2` result in `5-4.2`. The last bit (configuration\n and interface) will always be `:1.0`.\n \n ",
353+
"notes": "\n[^address-prefix]: The full `address` is in the format:\n ^\n usb<usb-path>:wedo<n>\n ^\n The USB path might be something like `1-1.3:1.0`. Read more about\n it [here](http://gajjarpremal.blogspot.in/2015/04/sysfs-structures-for-linux-usb.html).\n Run `lsusb -t` to help figure out the correct path for your WeDo hub.\n ^\n For example, this...\n ^\n /: Bus 05.Port 1: Dev 1, Class=root_hub, Driver=ehci-pci/4p, 480M\n |__ Port 4: Dev 5, If 0, Class=Hub, Driver=hub/4p, 480M\n |__ Port 2: Dev 6, If 0, Class=Human Interface Device, Driver=wedo, 1.5M\n ^\n ...translates to `usb5-4.2:1.0:wedo1`. You can see how `Bus 05`,\n `Port 4` and `Port 2` result in `5-4.2`. The last bit (configuration\n and interface) will always be `:1.0`.\n \n ",
354354
"num_modes": 1,
355355
"prefix": "wedo",
356-
"prefix_footnote": "[^port-name-prefix]",
356+
"prefix_footnote": "[^address-prefix]",
357357
"source_file": "drivers/lego/wedo/wedo_port.c",
358358
"source_line": 417,
359359
"url_name": "wedo-port"

‎_data/sensors.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
"vendor_id": "Pixy",
244244
"vendor_name": "Charmed Labs",
245245
"vendor_part_name": "Pixy (CMUcam5) for LEGO",
246-
"vendor_website": "http://charmedlabs.com/default/pixy-cmucam5-for-lego/"
246+
"vendor_website": "http://charmedlabs.com/default/pixy-lego/"
247247
},
248248
{
249249
"id": "DI_DFLEX_SENSOR",
@@ -2008,7 +2008,7 @@
20082008
"vendor_name": "LEGO",
20092009
"vendor_part_name": "NXT Touch Sensor",
20102010
"vendor_part_number": "9843",
2011-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2011+
"vendor_website": "http://shop.lego.com/en-US/Ultrasonic-Sensor-9846"
20122012
},
20132013
{
20142014
"analog_mode_info": [
@@ -2036,7 +2036,7 @@
20362036
"si_max": "1000",
20372037
"units": "pct",
20382038
"units_description": "percent",
2039-
"value0": "Reflected light intensity (0 to 100)"
2039+
"value0": "Reflected light intensity (0 to 1000)"
20402040
},
20412041
{
20422042
"data_sets": "1",
@@ -2051,7 +2051,7 @@
20512051
"si_max": "1000",
20522052
"units": "pct",
20532053
"units_description": "percent",
2054-
"value0": "Ambient light intensity (0 to 100)"
2054+
"value0": "Ambient light intensity (0 to 1000)"
20552055
}
20562056
],
20572057
"name": "lego-nxt-light",
@@ -2063,7 +2063,7 @@
20632063
"vendor_name": "LEGO",
20642064
"vendor_part_name": "NXT Light Sensor",
20652065
"vendor_part_number": "9844",
2066-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2066+
"vendor_website": "http://shop.lego.com/en-US/Light-Sensor-9844"
20672067
},
20682068
{
20692069
"analog_mode_info": [
@@ -2116,7 +2116,7 @@
21162116
"vendor_name": "LEGO",
21172117
"vendor_part_name": "NXT Sound Sensor",
21182118
"vendor_part_number": "9845",
2119-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2119+
"vendor_website": "http://shop.lego.com/en-US/Sound-Sensor-9845"
21202120
},
21212121
{
21222122
"default_address": "0x01",
@@ -2218,7 +2218,7 @@
22182218
"vendor_name": "LEGO",
22192219
"vendor_part_name": "NXT Ultrasonic Sensor",
22202220
"vendor_part_number": "9846",
2221-
"vendor_website": "http://www.lego.com/en-us/mindstorms/downloads/software/nxt-hdk/"
2221+
"vendor_website": "http://shop.lego.com/en-US/Ultrasonic-Sensor-9846"
22222222
},
22232223
{
22242224
"cmd_info": [
@@ -2472,7 +2472,7 @@
24722472
"units_description": "degrees",
24732473
"value0": "X-axis angle (0 to 180)",
24742474
"value1": "Y-axis angle (0 to 180)",
2475-
"value2": "Y-axis angle (0 to 180)"
2475+
"value2": "Z-axis angle (0 to 180)"
24762476
},
24772477
{
24782478
"data_sets": "3",
@@ -3193,7 +3193,7 @@
31933193
}
31943194
],
31953195
"name": "ms-nxtmmx",
3196-
"notes": "\n[^address]: The address is programmable. See manufacturer\n documentation for more information.\n \n[^tacho-motor-devices]: The NxtMMX driver also loads two\n [tacho-motor] class devices. Use the tacho-motor class devices\n to actually control the motors. You can identify the motors\n by the `port_name` attribute. It will be `in<X>:i2c<Y>:mux<Z>`\n where `<X>` is 1-4, `<Y>` is 3 (unless you changed the address)\n and `<Z>` is 1 or 2 (matches M1 or M2 printed on the NxtMMX).\n ^\n [tacho-motor]: /docs/drivers/tacho-motor-class\n \n ",
3196+
"notes": "\n[^address]: The address is programmable. See manufacturer\n documentation for more information.\n \n[^tacho-motor-devices]: The NxtMMX driver also loads two\n [tacho-motor] class devices. Use the tacho-motor class devices\n to actually control the motors. You can identify the motors\n by the `address` attribute. It will be `in<X>:i2c<Y>:mux<Z>`\n where `<X>` is 1-4, `<Y>` is 3 (unless you changed the address)\n and `<Z>` is 1 or 2 (matches M1 or M2 printed on the NxtMMX).\n ^\n [tacho-motor]: /docs/drivers/tacho-motor-class\n \n ",
31973197
"num_modes": "2",
31983198
"ops": [],
31993199
"product_id": "NxTMMX",
@@ -3256,7 +3256,7 @@
32563256
}
32573257
],
32583258
"name": "ms-8ch-servo",
3259-
"notes": "\n[^address]: The address is programmable. See manufacturer\n documentation for more information.\n \n[^servo-motor-devices]: The `ms-8ch-servo` driver loads separate\n servo motor devices (one for each of the 8 channels) in addition\n to the [lego-sensor class] device. See the [servo-motor class]\n for more information. The `servo-motor` class `port_name` attribute\n will return `in<X>:i2c<Y>:sv<Z>` where `<X>` is the input port\n the servo controller is connected to, `<Y>` is the address and\n `<Z>` is the channel as indicated on the servo controller itself.\n ^\n [lego-sensor class]: /docs/drivers/lego-sensor-class\n [servo-motor class]: /docs/drivers/servo-motor-class\n \n ",
3259+
"notes": "\n[^address]: The address is programmable. See manufacturer\n documentation for more information.\n \n[^servo-motor-devices]: The `ms-8ch-servo` driver loads separate\n servo motor devices (one for each of the 8 channels) in addition\n to the [lego-sensor class] device. See the [servo-motor class]\n for more information. The `servo-motor` class `address` attribute\n will return `in<X>:i2c<Y>:sv<Z>` where `<X>` is the input port\n the servo controller is connected to, `<Y>` is the address and\n `<Z>` is the channel as indicated on the servo controller itself.\n ^\n [lego-sensor class]: /docs/drivers/lego-sensor-class\n [servo-motor class]: /docs/drivers/servo-motor-class\n \n ",
32603260
"num_modes": "2",
32613261
"ops": [],
32623262
"product_id": "NXTServo",

‎_includes/breadcrumbs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% assign parent_dirs=page.url | replace_first: '/', '' | split: '/' %}
1+
{% assign parent_dirs=page.url | replace_first: '/', '' | split: '/' %}
22
{% assign link='/' %}
33
<ol class="breadcrumb" vocab="http://schema.org" typeof="BreadcrumbList">
44
{% assign position = 1 %}

0 commit comments

Comments
 (0)