Skip to content

Commit 6d5db31

Browse files
authored
Merge branch 'connectordef' into codex/review-last-3-commits-for-documentation-issues-uh1j8t
2 parents 48a2832 + 67e5f05 commit 6d5db31

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

documentation/configuration-guide.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ To correctly configure PWM and ADC, two independent items must be addressed:
204204
205205
This is similar to configuring GPIO:
206206
207-
1) **Derive from nexus connector maps**
207+
1) **Derive from connector maps**
208208
209-
Provide connector mappings via the board’s nexus definitions (e.g., `pwm-map` and `io-channel-map`)
209+
Provide connector mappings via the board’s connector definitions (e.g., `pwm-map` and `io-channel-map`)
210210
211211
```dts
212212
/ {
@@ -232,7 +232,7 @@ This is similar to configuring GPIO:
232232
233233
2) **Explicit lists under `/zephyr,user`**
234234
235-
Set GPIO Pin lists in `/zephyr,user/pwm-pin-gpios` and `/zephyr,user/adc-pin-gpios`,
235+
Set GPIO pin lists in `/zephyr,user/pwm-pin-gpios` and `/zephyr,user/adc-pin-gpios`.
236236
237237
```dts
238238
/ {
@@ -254,7 +254,7 @@ This is similar to configuring GPIO:
254254
ArduinoCore-Zephyr needs a list of available PWM/ADC channels.
255255
You can provide it in either of the following ways (**lowest precedence rule first**):
256256
257-
1) **Derive from nexus connector maps**
257+
1) **Derive from connector maps**
258258
259259
If the board defines `arduino_pwm` with `pwm-map` and/or `arduino_adc` with `io-channel-map`,
260260
ArduinoCore-Zephyr can derive the channel lists from those maps.
@@ -263,7 +263,7 @@ You can provide it in either of the following ways (**lowest precedence rule fir
263263
264264
2) **Explicit lists under `/zephyr,user`**
265265
266-
Sets the PWM/ADC channels corresponding to the pins specified by `pwm-pin-gpios` and `adc-pin-gpios`.
266+
Set the PWM/ADC channels corresponding to the pins specified by `pwm-pin-gpios` and `adc-pin-gpios`.
267267
- PWM channels: `/zephyr,user/pwms`
268268
- ADC channels: `/zephyr,user/io-channels`
269269

documentation/configuration-reference.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ A. Devicetree node: `/zephyr,user`
132132
```
133133
134134
135-
### Port provisioning
135+
### Channel provisioning
136136
137137
#### `io-channels`
138138
- **Location:** `/zephyr,user`
@@ -216,9 +216,10 @@ B. Board devicetree constructs (board-provided defaults)
216216
- **Precedence:**
217217
- Lower than `/zephyr,user/adc-pin-gpios` (association)
218218
- Lower than `/zephyr,user/io-channels` (provisioning)
219-
- **Notes:** `io-channel-map`: left = connector pin id, right = target ADC controller/channel.
220-
ADC still requires per-channel configuration under the ADC device node,
221-
regardless of how the channel list is obtained.
219+
- **Notes:**
220+
- `io-channel-map`: left = connector pin id, right = target ADC controller/channel.
221+
- ADC still requires per-channel configuration under the ADC device node,
222+
regardless of how the channel list is obtained.
222223
- **Example:**
223224
```dts
224225
/ {
@@ -377,4 +378,3 @@ B. Board devicetree constructs (board-provided defaults)
377378
### PWM pin association source
378379
- **Primary:** `/zephyr,user/pwm-pin-gpios`
379380
- **Fallback:** connector `pwm-map` under `arduino_pwm`
380-

0 commit comments

Comments
 (0)