Skip to content

Commit dad366b

Browse files
dlechdlech
committed
Updates for kernel release v3.16.7-ckt9-ev3dev1
1 parent 039a40c commit dad366b

File tree

69 files changed

+744
-225
lines changed

Some content is hidden

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

69 files changed

+744
-225
lines changed

‎_data/motors.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[
22
{
3-
"name": "ev3-tacho-motor",
4-
"device_type": "ev3-tacho-motor",
3+
"name": "fi-l12-ev3",
4+
"device_type": "legoev3-motor",
55
"class": "tacho-motor-class",
66
"autodetect": "Y[^ev3-large-motor]",
77
"vendor_name": "Firgelli",
88
"vendor_part_name": "L12 EV3 50mm",
99
"vendor_url": "http://store.firgelli.com/product_p/l12-ev3-50.htm"
1010
},
1111
{
12-
"name": "ev3-tacho-motor",
13-
"device_type": "ev3-tacho-motor",
12+
"name": "fi-l12-ev3",
13+
"device_type": "legoev3-motor",
1414
"class": "tacho-motor-class",
1515
"autodetect": "Y[^ev3-large-motor]",
1616
"vendor_name": "Firgelli",
@@ -87,8 +87,8 @@
8787
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=9670-1"
8888
},
8989
{
90-
"name": "ev3-tacho-motor",
91-
"device_type": "ev3-tacho-motor",
90+
"name": "lego-ev3-l-motor",
91+
"device_type": "legoev3-motor",
9292
"class": "tacho-motor-class",
9393
"autodetect": "Y[^ev3-large-motor]",
9494
"vendor_name": "LEGO",
@@ -107,8 +107,8 @@
107107
"vendor_url": "http://www.bricklink.com/catalogItem.asp?P=43362c01"
108108
},
109109
{
110-
"name": "ev3-tacho-motor",
111-
"device_type": "ev3-tacho-motor",
110+
"name": "lego-ev3-l-motor",
111+
"device_type": "legoev3-motor",
112112
"class": "tacho-motor-class",
113113
"autodetect": "Y",
114114
"vendor_name": "LEGO",
@@ -117,8 +117,8 @@
117117
"vendor_url": "http://www.bricklink.com/catalogItem.asp?S=45502-1"
118118
},
119119
{
120-
"name": "ev3-tacho-motor",
121-
"device_type": "ev3-tacho-motor",
120+
"name": "lego-ev3-m-motor",
121+
"device_type": "legoev3-motor",
122122
"class": "tacho-motor-class",
123123
"autodetect": "Y",
124124
"vendor_name": "LEGO",

‎_data/ports.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@
9999
"notes": "\n[^auto-mode]: Only the EV3/NXT large motors and the EV3\n medium motor can be automatically detected. All other devices\n must be manually configured.\n \n "
100100
},
101101
{
102-
"description": "Load the [ev3-tacho-motor] device.",
102+
"description": "Load the [legoev3-motor] device.",
103103
"id": "EV3_OUTPUT_PORT_MODE_TACHO_MOTOR",
104-
"name": "ev3-tacho-motor",
105-
"name_footnote": "[^ev3-tacho-motor-mode]",
106-
"notes": "\n[^ev3-tacho-motor-mode]: Currently only supports loading the\n driver with EV3/NXT Large Motor settings. In the future, you\n will be able to change the driver using `set_device`.\n ^\n [ev3-tacho-motor]: /docs/drivers/ev3-tacho-motor\n \n "
104+
"name": "legoev3-motor",
105+
"name_footnote": "[^legoev3-motor-mode]",
106+
"notes": "\n[^legoev3-motor-mode]: Configures the port to use the\n [legoev3-motor] driver module. The default driver is the\n EV3/NXT Large Motor (`lego-ev3-l-motor`). You can change\n the driver using the `set_device` attribute.\n ^\n [legoev3-motor]: /docs/drivers/legoev3-motor\n \n "
107107
},
108108
{
109109
"description": "Load the [rcx-motor] device.",
@@ -132,7 +132,7 @@
132132
"num_modes": 5,
133133
"prefix": "out",
134134
"source_file": "drivers/lego/ev3/legoev3_ports_out.c",
135-
"source_line": 130,
135+
"source_line": 110,
136136
"url_name": "legoev3-output-port"
137137
},
138138
{

‎_data/sensors.json‎

Lines changed: 80 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
"product_id": "Color",
176176
"sensor_type": "nxt-i2c-sensor",
177177
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
178-
"source_line": 299,
178+
"source_line": 300,
179179
"url_name": "hitechnic-nxt-color-sensor",
180180
"vendor_id": "HiTechnc",
181181
"vendor_name": "HiTechnic",
@@ -257,7 +257,7 @@
257257
"product_id": "AnglSnsr",
258258
"sensor_type": "nxt-i2c-sensor",
259259
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
260-
"source_line": 299,
260+
"source_line": 300,
261261
"url_name": "hitechnic-nxt-angle-sensor",
262262
"vendor_id": "HITECHNC",
263263
"vendor_name": "HiTechnic",
@@ -309,7 +309,7 @@
309309
"product_id": "Accel.",
310310
"sensor_type": "nxt-i2c-sensor",
311311
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
312-
"source_line": 299,
312+
"source_line": 300,
313313
"url_name": "hitechnic-nxt-acceleration-tilt-sensor",
314314
"vendor_id": "HITECHNC",
315315
"vendor_name": "HiTechnic",
@@ -360,7 +360,7 @@
360360
"product_id": "Barometr",
361361
"sensor_type": "nxt-i2c-sensor",
362362
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
363-
"source_line": 299,
363+
"source_line": 300,
364364
"url_name": "hitechnic-nxt-barometric-sensor",
365365
"vendor_id": "HiTechnc",
366366
"vendor_name": "HiTechnic",
@@ -490,7 +490,7 @@
490490
"product_id": "ColorPD",
491491
"sensor_type": "nxt-i2c-sensor",
492492
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
493-
"source_line": 299,
493+
"source_line": 300,
494494
"url_name": "hitechnic-nxt-color-sensor-v2",
495495
"vendor_id": "HiTechnc",
496496
"vendor_name": "HiTechnic",
@@ -621,7 +621,7 @@
621621
"product_id": "IRLink",
622622
"sensor_type": "nxt-i2c-sensor",
623623
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
624-
"source_line": 299,
624+
"source_line": 300,
625625
"url_name": "hitechnic-nxt-irlink-sensor",
626626
"vendor_id": "HiTechnc",
627627
"vendor_name": "HiTechnic",
@@ -686,7 +686,7 @@
686686
"product_id": "IRRecv",
687687
"sensor_type": "nxt-i2c-sensor",
688688
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
689-
"source_line": 299,
689+
"source_line": 300,
690690
"url_name": "hitechnic-nxt-irreceiver-sensor",
691691
"vendor_id": "HiTechnc",
692692
"vendor_name": "HiTechnic",
@@ -721,7 +721,7 @@
721721
"product_id": "PIR",
722722
"sensor_type": "nxt-i2c-sensor",
723723
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
724-
"source_line": 299,
724+
"source_line": 300,
725725
"url_name": "hitechnic-nxt-pir-sensor",
726726
"vendor_id": "HITECHNC",
727727
"vendor_name": "HiTechnic",
@@ -756,7 +756,7 @@
756756
"product_id": "Compass",
757757
"sensor_type": "nxt-i2c-sensor",
758758
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
759-
"source_line": 299,
759+
"source_line": 300,
760760
"url_name": "hitechnic-nxt-compass-sensor",
761761
"vendor_id": "HITECHNC",
762762
"vendor_name": "HiTechnic",
@@ -875,7 +875,7 @@
875875
"product_id": "NewIRDir",
876876
"sensor_type": "nxt-i2c-sensor",
877877
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
878-
"source_line": 299,
878+
"source_line": 300,
879879
"url_name": "hitechnic-nxt-irseeker-v2",
880880
"vendor_id": "HiTechnc",
881881
"vendor_name": "HiTechnic",
@@ -968,7 +968,7 @@
968968
"product_id": "SensrMUX",
969969
"sensor_type": "nxt-i2c-sensor",
970970
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
971-
"source_line": 299,
971+
"source_line": 300,
972972
"url_name": "hitechnic-nxt-sensor-multiplexer",
973973
"vendor_id": "HiTechnc",
974974
"vendor_name": "HiTechnic",
@@ -1093,7 +1093,7 @@
10931093
"product_id": "SuperPro",
10941094
"sensor_type": "nxt-i2c-sensor",
10951095
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
1096-
"source_line": 299,
1096+
"source_line": 300,
10971097
"url_name": "hitechnic-nxt-superpro-prototype-board",
10981098
"vendor_id": "HiTechnc",
10991099
"vendor_name": "HiTechnic",
@@ -1758,7 +1758,7 @@
17581758
"product_id": "",
17591759
"sensor_type": "nxt-i2c-sensor",
17601760
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
1761-
"source_line": 299,
1761+
"source_line": 300,
17621762
"url_name": "lego-energy-display",
17631763
"vendor_id": "LEGO",
17641764
"vendor_name": "LEGO",
@@ -2013,7 +2013,7 @@
20132013
"sensor_type": "nxt-i2c-sensor",
20142014
"slow": "true",
20152015
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2016-
"source_line": 299,
2016+
"source_line": 300,
20172017
"url_name": "lego-nxt-ultrasonic-sensor",
20182018
"vendor_id": "LEGO",
20192019
"vendor_name": "LEGO",
@@ -2155,7 +2155,7 @@
21552155
"product_id_footnote": "[^ids]",
21562156
"sensor_type": "nxt-i2c-sensor",
21572157
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2158-
"source_line": 299,
2158+
"source_line": 300,
21592159
"url_name": "microinfinity-digital-gyroscope-and-accelerometer",
21602160
"vendor_id": "mnfinity",
21612161
"vendor_id_footnote": "[^ids]",
@@ -2348,7 +2348,7 @@
23482348
"product_id": "AbsIMU",
23492349
"sensor_type": "nxt-i2c-sensor",
23502350
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2351-
"source_line": 299,
2351+
"source_line": 300,
23522352
"url_name": "mindsensors.com-gyro-multisensitivity-accelerometer-and-compass",
23532353
"vendor_id": "mndsnsrs",
23542354
"vendor_name": "mindsensors.com",
@@ -2449,7 +2449,7 @@
24492449
"product_id": "AngSens",
24502450
"sensor_type": "nxt-i2c-sensor",
24512451
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2452-
"source_line": 299,
2452+
"source_line": 300,
24532453
"url_name": "mindsensors.com-glidewheel-as",
24542454
"vendor_id": "mndsnsrs",
24552455
"vendor_name": "mindsensors.com",
@@ -2482,7 +2482,7 @@
24822482
"product_id": "Ev3SMux",
24832483
"sensor_type": "nxt-i2c-sensor",
24842484
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2485-
"source_line": 299,
2485+
"source_line": 300,
24862486
"url_name": "mindsensors.com-ev3-sensor-multiplexer",
24872487
"vendor_id": "mndsnsrs",
24882488
"vendor_name": "mindsensors.com",
@@ -2626,7 +2626,7 @@
26262626
"product_id": "LSArray",
26272627
"sensor_type": "nxt-i2c-sensor",
26282628
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2629-
"source_line": 299,
2629+
"source_line": 300,
26302630
"url_name": "mindsensors.com-light-sensor-array",
26312631
"vendor_id": "mndsnsrs",
26322632
"vendor_name": "mindsensors.com",
@@ -2839,14 +2839,73 @@
28392839
"product_id": "LineLdr",
28402840
"sensor_type": "nxt-i2c-sensor",
28412841
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2842-
"source_line": 299,
2842+
"source_line": 300,
28432843
"url_name": "mindsensors.com-line-follower-sensor",
28442844
"vendor_id": "mndsnsrs",
28452845
"vendor_name": "mindsensors.com",
28462846
"vendor_part_name": "Line Follower Sensor",
28472847
"vendor_part_number": "LineLeader",
28482848
"vendor_website": "http://mindsensors.com/index.php?module=pagemaster&PAGE_user_op=view_page&PAGE_id=111"
28492849
},
2850+
{
2851+
"default_address": "0x03",
2852+
"default_address_footnote": "[^address]",
2853+
"device_class_footnote": "[^tacho-motor-devices]",
2854+
"i2c_mode_info": [
2855+
{
2856+
"id": "0",
2857+
"read_data_reg": "0"
2858+
},
2859+
{
2860+
"id": "1",
2861+
"read_data_reg": "0"
2862+
}
2863+
],
2864+
"id": "MS_NXTMMX",
2865+
"mode_info": [
2866+
{
2867+
"data_sets": "1",
2868+
"decimals": "3",
2869+
"description": "Status",
2870+
"id": "0",
2871+
"name": "STATUS",
2872+
"raw_max": "255",
2873+
"si_max": "255",
2874+
"units": "V",
2875+
"units_description": "volts",
2876+
"value0": "Battery voltage"
2877+
},
2878+
{
2879+
"data_sets": "1",
2880+
"decimals": "3",
2881+
"description": "Status (for older firmware versions)",
2882+
"id": "1",
2883+
"name": "STATUS-OLD",
2884+
"name_footnote": "[^status-old]",
2885+
"notes": "\n[^status-old]: The I2C register for battery voltage\n was changed for EV3 compatibility. If `STATUS` does\n not seem to work, try this mode instead.\n ",
2886+
"raw_max": "255",
2887+
"si_max": "255",
2888+
"units": "V",
2889+
"units_description": "volts",
2890+
"value0": "Battery voltage"
2891+
}
2892+
],
2893+
"name": "ms-nxtmmx",
2894+
"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 A-D, `<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 ",
2895+
"num_modes": "2",
2896+
"ops.probe_cb": "ms_nxtmmx_probe_cb",
2897+
"ops.remove_cb": "ms_nxtmmx_remove_cb",
2898+
"product_id": "NxTMMX",
2899+
"sensor_type": "nxt-i2c-sensor",
2900+
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2901+
"source_line": 300,
2902+
"url_name": "mindsensors.com-multiplexer-for-nxt-ev3-motors",
2903+
"vendor_id": "mndsnsrs",
2904+
"vendor_name": "mindsensors.com",
2905+
"vendor_part_name": "Multiplexer for NXT/EV3 Motors",
2906+
"vendor_part_number": "NXTMMX-v2",
2907+
"vendor_website": "http://mindsensors.com/index.php?module=pagemaster&PAGE_user_op=view_page&PAGE_id=134"
2908+
},
28502909
{
28512910
"default_address": "0x58",
28522911
"default_address_footnote": "[^address]",
@@ -2903,7 +2962,7 @@
29032962
"product_id": "NXTServo",
29042963
"sensor_type": "nxt-i2c-sensor",
29052964
"source_file": "drivers/lego/sensors/nxt_i2c_sensor_defs.c",
2906-
"source_line": 299,
2965+
"source_line": 300,
29072966
"url_name": "mindsensors.com-8-channel-servo-controller",
29082967
"vendor_id": "mndsnsrs",
29092968
"vendor_name": "mindsensors.com",

‎docs/drivers/dc-motor-class.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
autogen: This file was automatically generated by kernel-doc-text-to-markdown.py
3-
kernel_version: 3.16.7-ckt6-ev3dev1
3+
kernel_version: 3.16.7-ckt9-ev3dev1
44
source_file: drivers/lego/motors/dc_motor_class.c
55
title: DC Motor Class
66
---

‎docs/drivers/ev3-analog-sensor.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
autogen: This file was automatically generated by kernel-doc-text-to-markdown.py
3-
kernel_version: 3.16.7-ckt6-ev3dev1
3+
kernel_version: 3.16.7-ckt9-ev3dev1
44
source_file: drivers/lego/sensors/ev3_analog_sensor_core.c
55
title: EV3 Analog Sensor Driver
66
---

‎docs/drivers/ev3-tacho-motor.markdown‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎docs/drivers/ev3-uart-sensor-ld.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
autogen: This file was automatically generated by kernel-doc-text-to-markdown.py
3-
kernel_version: 3.16.7-ckt6-ev3dev1
3+
kernel_version: 3.16.7-ckt9-ev3dev1
44
source_file: drivers/lego/sensors/ev3_uart_sensor_ld.c
55
title: EV3 UART Sensor Line Discipline
66
---

‎docs/drivers/ht-nxt-smux-i2c-sensor.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
autogen: This file was automatically generated by kernel-doc-text-to-markdown.py
3-
kernel_version: 3.16.7-ckt6-ev3dev1
3+
kernel_version: 3.16.7-ckt9-ev3dev1
44
source_file: drivers/lego/sensors/ht_nxt_smux_i2c_sensor.c
55
title: HiTechnic NXT Sensor Multiplexer I2C sensor driver
66
---

‎docs/drivers/lego-port-class.markdown‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
autogen: This file was automatically generated by kernel-doc-text-to-markdown.py
3-
kernel_version: 3.16.7-ckt6-ev3dev1
3+
kernel_version: 3.16.7-ckt9-ev3dev1
44
source_file: drivers/lego/core/lego_port_class.c
55
title: LEGO Port Class Driver
66
---

0 commit comments

Comments
 (0)