Skip to content

Commit bb47176

Browse files
WasabiFanWasabiFan
committed
Merge recent upstream changes into theme update branch
2 parents e3854d9 + 360f999 commit bb47176

File tree

115 files changed

+1491
-305
lines changed

Some content is hidden

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

115 files changed

+1491
-305
lines changed

‎README.md‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,23 @@ You can view your changes locally by installing [jekyll](https://help.github.com
1010
Installing Jekyll in Ubuntu 14.04
1111
---
1212

13-
sudo apt-get install git ruby1.9.1 ruby1.9.1-dev nodejs
13+
### Install Ruby via apt-get
14+
sudo apt-get install git ruby2.0 ruby2.0-dev nodejs
1415
sudo gem install bundler
16+
17+
### Install Ruby via RVM (Ruby Version Manager)
18+
If you hit any snags with apt another option is to install via RVM. Note that
19+
you must do the 'source' line when you open a new xterm.
20+
21+
gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
22+
\curl -sSL https://get.rvm.io | bash -s stable --ruby
23+
source ~/.rvm/scripts/rvm
24+
25+
### Checkout Code and Run Jekyll
1526
git clone git@github.com:<user>/ev3dev.github.io
1627
cd ev3dev.github.io
1728
bundle install
18-
bundle exec jekyll serve --watch &
29+
bundle exec jekyll serve &
1930
www-browser http://localhost:4000 &
2031
# work, work, work
2132

@@ -30,7 +41,7 @@ Then run:
3041
git clone https://github.com/<user>/ev3dev.github.io
3142
cd ev3dev.github.io
3243
bundle install
33-
bundle exec jekyll serve --watch
44+
bundle exec jekyll serve
3445

3546
Now you should be able to visit your page at: [http://localhost:4000](http://localhost:4000). It should auto-update when you change the source files, so all you have to do is refresh your browser.
3647

‎_data/motors.json‎

Lines changed: 158 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,169 +1,211 @@
11
[
22
{
3-
"name": "fi-l12-ev3",
4-
"device_type": "legoev3-motor",
5-
"class": "tacho-motor-class",
6-
"autodetect": "Y[^ev3-large-motor]",
7-
"vendor_name": "Firgelli",
8-
"vendor_part_name": "L12 EV3 50mm",
9-
"vendor_url": "http://store.firgelli.com/product_p/l12-ev3-50.htm"
10-
},
11-
{
12-
"name": "fi-l12-ev3",
13-
"device_type": "legoev3-motor",
14-
"class": "tacho-motor-class",
15-
"autodetect": "Y[^ev3-large-motor]",
3+
"count_per_rot": "360",
4+
"encoder_polarity": "DC_MOTOR_POLARITY_INVERSED",
5+
"id": "FIRGELLI_L12_EV3_100",
6+
"legoev3_info": [],
7+
"max_speed": "1200",
8+
"motor_type": "ev3",
9+
"name": "fi-l12-ev3-100",
10+
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
11+
"source_line": 27,
12+
"url_name": "firgelli-l12-ev3-100mm",
1613
"vendor_name": "Firgelli",
1714
"vendor_part_name": "L12 EV3 100mm",
18-
"vendor_url": "http://store.firgelli.com/product_p/l12-ev3-100.htm"
15+
"vendor_part_number": "L12-EV3-100",
16+
"vendor_website": "http://store.firgelli.com/product_p/l12-ev3-100.htm"
17+
},
18+
{
19+
"count_per_rot": "360",
20+
"encoder_polarity": "DC_MOTOR_POLARITY_INVERSED",
21+
"id": "FIRGELLI_L12_EV3_50",
22+
"legoev3_info": [],
23+
"max_speed": "1200",
24+
"motor_type": "ev3",
25+
"name": "fi-l12-ev3-50",
26+
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
27+
"source_line": 27,
28+
"url_name": "firgelli-l12-ev3-50mm",
29+
"vendor_name": "Firgelli",
30+
"vendor_part_name": "L12 EV3 50mm",
31+
"vendor_part_number": "L12-EV3-50",
32+
"vendor_website": "http://store.firgelli.com/product_p/l12-ev3-50.htm"
1933
},
2034
{
35+
"id": "LEGO_9V_MINI_MOTOR_NEWER",
36+
"motor_type": "rcx",
2137
"name": "rcx-motor",
22-
"device_type": "rcx-motor",
23-
"class": "dc-motor-class",
24-
"autodetect": "N",
38+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
39+
"source_line": 25,
40+
"url_name": "lego-motor-9v-mini-motor-newer-lighter-weight",
2541
"vendor_name": "LEGO",
26-
"vendor_part_name": "Electric Technic Motor 9V Geared",
27-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=47154c01"
28-
},
29-
{
30-
"name": "rcx-led",
31-
"device_type": "rcx-led",
32-
"class": "leds-class",
33-
"autodetect": "N",
34-
"vendor_name": "LEGO",
35-
"vendor_part_number": "6035",
36-
"vendor_part_name": "Light Brick 1 x 2 with Single Side Light",
37-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=6035"
42+
"vendor_part_name": "Motor 9V Mini-motor, newer lighter weight",
43+
"vendor_part_number": "43362",
44+
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=43362c01"
3845
},
3946
{
40-
"name": "rcx-led",
41-
"device_type": "rcx-led",
42-
"class": "leds-class",
43-
"autodetect": "N",
47+
"count_per_rot": "360",
48+
"id": "LEGO_EV3_LARGE_MOTOR",
49+
"legoev3_info": [],
50+
"max_speed": "1200",
51+
"motor_type": "ev3",
52+
"name": "lego-ev3-l-motor",
53+
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
54+
"source_line": 27,
55+
"url_name": "lego-ev3-large-servo-motor",
4456
"vendor_name": "LEGO",
45-
"vendor_part_number": "6637",
46-
"vendor_part_name": "Fiber Optics Element",
47-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=6637"
57+
"vendor_part_name": "EV3 Large Servo Motor",
58+
"vendor_part_number": "45502",
59+
"vendor_website": "http://shop.lego.com/en-US/EV3-Large-Servo-Motor-45502"
4860
},
4961
{
50-
"name": "rcx-led",
51-
"device_type": "rcx-led",
52-
"class": "leds-class",
53-
"autodetect": "N",
62+
"count_per_rot": "360",
63+
"id": "LEGO_EV3_MEDIUM_MOTOR",
64+
"legoev3_info": [],
65+
"max_speed": "900",
66+
"motor_type": "ev3",
67+
"name": "lego-ev3-m-motor",
68+
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
69+
"source_line": 27,
70+
"url_name": "lego-ev3-medium-servo-motor",
5471
"vendor_name": "LEGO",
55-
"vendor_part_number": "8870",
56-
"vendor_part_name": "Power Functions Light",
57-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=8870-1"
72+
"vendor_part_name": "EV3 Medium Servo Motor",
73+
"vendor_part_number": "45503",
74+
"vendor_website": "http://shop.lego.com/en-US/EV3-Medium-Servo-Motor-45503"
5875
},
5976
{
77+
"id": "LEGO_9V_GEARED",
78+
"motor_type": "rcx",
6079
"name": "rcx-motor",
61-
"device_type": "rcx-motor",
62-
"class": "dc-motor-class",
63-
"autodetect": "N",
80+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
81+
"source_line": 25,
82+
"url_name": "lego-technic-motor-9v-geared",
6483
"vendor_name": "LEGO",
65-
"vendor_part_number": "8882",
66-
"vendor_part_name": "Power Functions XL-Motor",
67-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=8882-1"
84+
"vendor_part_name": "Technic Motor 9V Geared ",
85+
"vendor_part_number": "47154",
86+
"vendor_website": "http://alpha.bricklink.com/pages/clone/catalogitem.page?P=47154c01"
6887
},
6988
{
89+
"id": "LEGO_9V_MICROMOTOR",
90+
"motor_type": "rcx",
7091
"name": "rcx-motor",
71-
"device_type": "rcx-motor",
72-
"class": "dc-motor-class",
73-
"autodetect": "N",
92+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
93+
"source_line": 25,
94+
"url_name": "lego-motor-9v-micromotor",
7495
"vendor_name": "LEGO",
75-
"vendor_part_number": "8883",
76-
"vendor_part_name": "Power Functions M-Motor",
77-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=8883-1"
96+
"vendor_part_name": "Motor 9V Micromotor",
97+
"vendor_part_number": "70823",
98+
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=2986"
7899
},
79100
{
101+
"id": "LEGO_9V_MINI_MOTOR_OLDER",
102+
"motor_type": "rcx",
80103
"name": "rcx-motor",
81-
"device_type": "rcx-motor",
82-
"class": "dc-motor-class",
83-
"autodetect": "N",
84-
"vendor_name": "LEGO",
85-
"vendor_part_number": "9670",
86-
"vendor_part_name": "Power Functions E-Motor",
87-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=9670-1"
88-
},
89-
{
90-
"name": "lego-ev3-l-motor",
91-
"device_type": "legoev3-motor",
92-
"class": "tacho-motor-class",
93-
"autodetect": "Y[^ev3-large-motor]",
104+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
105+
"source_line": 25,
106+
"url_name": "lego-motor-9v-mini-motor-older-heavier-weight",
94107
"vendor_name": "LEGO",
95-
"vendor_part_number": "9842",
96-
"vendor_part_name": "NXT Motor",
97-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=9842-1"
108+
"vendor_part_name": "Motor 9V Mini-motor, older heavier weight",
109+
"vendor_part_number": "71427",
110+
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=71427c01"
98111
},
99112
{
113+
"id": "LEGO_TECHNIC_MOTOR_9V",
114+
"motor_type": "rcx",
100115
"name": "rcx-motor",
101-
"device_type": "rcx-motor",
102-
"class": "dc-motor-class",
103-
"autodetect": "N",
116+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
117+
"source_line": 25,
118+
"url_name": "lego-technic-motor-9v",
104119
"vendor_name": "LEGO",
105-
"vendor_part_number": "43362",
106-
"vendor_part_name": "Electric Technic Mini-Motor 9v",
107-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=43362c01"
120+
"vendor_part_name": "Technic Motor 9V",
121+
"vendor_part_number": "74569",
122+
"vendor_website": "http://www.bricklink.com/catalogItem.asp?P=2838c01"
108123
},
109124
{
110-
"name": "lego-ev3-l-motor",
111-
"device_type": "legoev3-motor",
112-
"class": "tacho-motor-class",
113-
"autodetect": "Y",
125+
"id": "LEGO_PF_TRAIN_MOTOR",
126+
"motor_type": "rcx",
127+
"name": "rcx-motor",
128+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
129+
"source_line": 25,
130+
"url_name": "lego-power-functions-train-motor",
114131
"vendor_name": "LEGO",
115-
"vendor_part_number": "45502",
116-
"vendor_part_name": "EV3 Large Motor",
117-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=45502-1"
132+
"vendor_part_name": "Power Functions Train Motor",
133+
"vendor_part_number": "88002",
134+
"vendor_website": "http://shop.lego.com/en-US/Power-Functions-Train-Motor-88002"
118135
},
119136
{
120-
"name": "lego-ev3-m-motor",
121-
"device_type": "legoev3-motor",
122-
"class": "tacho-motor-class",
123-
"autodetect": "Y",
137+
"id": "LEGO_PF_L_MOTOR",
138+
"motor_type": "rcx",
139+
"name": "rcx-motor",
140+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
141+
"source_line": 25,
142+
"url_name": "lego-power-functions-l-motor",
124143
"vendor_name": "LEGO",
125-
"vendor_part_number": "45503",
126-
"vendor_part_name": "EV3 Medium Motor",
127-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=45503-1"
144+
"vendor_part_name": "Power Functions L-Motor",
145+
"vendor_part_number": "88003",
146+
"vendor_website": "http://shop.lego.com/en-US/Power-Functions-L-Motor-88003"
128147
},
129148
{
149+
"id": "LEGO_PF_SERVO_MOTOR",
150+
"motor_type": "rcx",
130151
"name": "rcx-motor",
131-
"device_type": "rcx-motor",
132-
"class": "dc-motor-class",
133-
"autodetect": "N",
152+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
153+
"source_line": 25,
154+
"url_name": "lego-power-functions-servo-motor",
134155
"vendor_name": "LEGO",
135-
"vendor_part_number": "70823",
136-
"vendor_part_name": "Electric Technic Micromotor",
137-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=5119-1"
156+
"vendor_part_name": "Power Functions Servo Motor",
157+
"vendor_part_number": "88004",
158+
"vendor_website": "http://shop.lego.com/en-US/Power-Functions-Servo-Motor-88004"
138159
},
139160
{
161+
"id": "LEGO_PF_XL_MOTOR",
162+
"motor_type": "rcx",
140163
"name": "rcx-motor",
141-
"device_type": "rcx-motor",
142-
"class": "dc-motor-class",
143-
"autodetect": "N",
164+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
165+
"source_line": 25,
166+
"url_name": "lego-power-functions-xl-motor",
144167
"vendor_name": "LEGO",
145-
"vendor_part_number": "71427",
146-
"vendor_part_name": "Electric Technic Mini-Motor 9v",
147-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=71427c01"
168+
"vendor_part_name": "Power Functions XL-Motor",
169+
"vendor_part_number": "8882",
170+
"vendor_website": "http://shop.lego.com/en-US/LEGO-Power-Functions-XL-Motor-8882"
148171
},
149172
{
173+
"id": "LEGO_PF_M_MOTOR",
174+
"motor_type": "rcx",
150175
"name": "rcx-motor",
151-
"device_type": "rcx-motor",
152-
"class": "dc-motor-class",
153-
"autodetect": "N",
176+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
177+
"source_line": 25,
178+
"url_name": "lego-power-functions-m-motor",
154179
"vendor_name": "LEGO",
155-
"vendor_part_number": "74569",
156-
"vendor_part_name": "Electric Technic Motor 9V",
157-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=2838c01"
180+
"vendor_part_name": "Power Functions M-Motor",
181+
"vendor_part_number": "8883",
182+
"vendor_website": "http://shop.lego.com/en-US/LEGO-Power-Functions-M-Motor-8883"
158183
},
159184
{
185+
"id": "LEGO_PF_E_MOTOR",
186+
"motor_type": "rcx",
160187
"name": "rcx-motor",
161-
"device_type": "rcx-motor",
162-
"class": "dc-motor-class",
163-
"autodetect": "N",
188+
"source_file": "drivers/lego/motors/rcx_motor_defs.c",
189+
"source_line": 25,
190+
"url_name": "lego-e-motor",
164191
"vendor_name": "LEGO",
165-
"vendor_part_number": "88002",
166-
"vendor_part_name": "Power Functions Train Motor",
167-
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=88002-1"
192+
"vendor_part_name": "E-Motor",
193+
"vendor_part_number": "9670",
194+
"vendor_website": "https://education.lego.com/en-us/lego-education-product-database/machines-and-mechanisms/9670-e-motor"
195+
},
196+
{
197+
"count_per_rot": "360",
198+
"id": "LEGO_NXT_MOTOR",
199+
"legoev3_info": [],
200+
"max_speed": "1200",
201+
"motor_type": "ev3",
202+
"name": "lego-nxt-motor",
203+
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
204+
"source_line": 27,
205+
"url_name": "lego-interactive-servo-motor-nxt",
206+
"vendor_name": "LEGO",
207+
"vendor_part_name": "Interactive Servo Motor (NXT)",
208+
"vendor_part_number": "9842",
209+
"vendor_website": "http://shop.lego.com/en-US/Interactive-Servo-Motor-9842"
168210
}
169-
]
211+
]

0 commit comments

Comments
 (0)