Skip to content

Commit 92cfbae

Browse files
dlechdlech
committed
kernel release cycle 10
1 parent 2f9ff49 commit 92cfbae

File tree

97 files changed

+245
-235
lines changed

Some content is hidden

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

97 files changed

+245
-235
lines changed

‎_data/motors.json‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
[
22
{
3-
"count_per_rot": "360",
3+
"count_per_m": "2000",
44
"encoder_polarity": "DC_MOTOR_POLARITY_INVERSED",
5+
"full_travel_count": "200",
56
"id": "FIRGELLI_L12_EV3_100",
67
"legoev3_info": [],
7-
"max_speed": "1200",
8+
"max_speed": "24",
9+
"motion_type": "TM_MOTION_LINEAR",
810
"motor_type": "ev3",
911
"name": "fi-l12-ev3-100",
1012
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
11-
"source_line": 27,
13+
"source_line": 39,
1214
"url_name": "firgelli-l12-ev3-100mm",
1315
"vendor_name": "Firgelli",
1416
"vendor_part_name": "L12 EV3 100mm",
1517
"vendor_part_number": "L12-EV3-100",
1618
"vendor_website": "http://store.firgelli.com/product_p/l12-ev3-100.htm"
1719
},
1820
{
19-
"count_per_rot": "360",
21+
"count_per_m": "2000",
2022
"encoder_polarity": "DC_MOTOR_POLARITY_INVERSED",
23+
"full_travel_count": "100",
2124
"id": "FIRGELLI_L12_EV3_50",
2225
"legoev3_info": [],
23-
"max_speed": "1200",
26+
"max_speed": "24",
27+
"motion_type": "TM_MOTION_LINEAR",
2428
"motor_type": "ev3",
2529
"name": "fi-l12-ev3-50",
2630
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
27-
"source_line": 27,
31+
"source_line": 39,
2832
"url_name": "firgelli-l12-ev3-50mm",
2933
"vendor_name": "Firgelli",
3034
"vendor_part_name": "L12 EV3 50mm",
@@ -47,11 +51,12 @@
4751
"count_per_rot": "360",
4852
"id": "LEGO_EV3_LARGE_MOTOR",
4953
"legoev3_info": [],
50-
"max_speed": "1200",
54+
"max_speed": "1050",
55+
"motion_type": "TM_MOTION_ROTATION",
5156
"motor_type": "ev3",
5257
"name": "lego-ev3-l-motor",
5358
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
54-
"source_line": 27,
59+
"source_line": 39,
5560
"url_name": "lego-ev3-large-servo-motor",
5661
"vendor_name": "LEGO",
5762
"vendor_part_name": "EV3 Large Servo Motor",
@@ -62,11 +67,12 @@
6267
"count_per_rot": "360",
6368
"id": "LEGO_EV3_MEDIUM_MOTOR",
6469
"legoev3_info": [],
65-
"max_speed": "900",
70+
"max_speed": "1560",
71+
"motion_type": "TM_MOTION_ROTATION",
6672
"motor_type": "ev3",
6773
"name": "lego-ev3-m-motor",
6874
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
69-
"source_line": 27,
75+
"source_line": 39,
7076
"url_name": "lego-ev3-medium-servo-motor",
7177
"vendor_name": "LEGO",
7278
"vendor_part_name": "EV3 Medium Servo Motor",
@@ -197,11 +203,12 @@
197203
"count_per_rot": "360",
198204
"id": "LEGO_NXT_MOTOR",
199205
"legoev3_info": [],
200-
"max_speed": "1200",
206+
"max_speed": "1020",
207+
"motion_type": "TM_MOTION_ROTATION",
201208
"motor_type": "ev3",
202209
"name": "lego-nxt-motor",
203210
"source_file": "drivers/lego/motors/ev3_motor_defs.c",
204-
"source_line": 27,
211+
"source_line": 39,
205212
"url_name": "lego-interactive-servo-motor-nxt",
206213
"vendor_name": "LEGO",
207214
"vendor_part_name": "Interactive Servo Motor (NXT)",

‎_data/ports.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"num_modes": 6,
4848
"prefix": "in",
4949
"source_file": "drivers/lego/brickpi/brickpi_ports_in.c",
50-
"source_line": 56,
50+
"source_line": 57,
5151
"url_name": "brickpi-in-port"
5252
},
5353
{
@@ -75,7 +75,7 @@
7575
"num_modes": 3,
7676
"prefix": "out",
7777
"source_file": "drivers/lego/brickpi/brickpi_ports_out.c",
78-
"source_line": 53,
78+
"source_line": 54,
7979
"url_name": "brickpi-out-port"
8080
},
8181
{
@@ -262,7 +262,7 @@
262262
"prefix": "M",
263263
"prefix_footnote": "[^prefix]",
264264
"source_file": "drivers/lego/sensors/ms_nxtmmx.c",
265-
"source_line": 142,
265+
"source_line": 139,
266266
"url_name": "ms-nxtmmx-out-port"
267267
},
268268
{

0 commit comments

Comments
 (0)