Skip to content

Commit eb6b497

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents a78ad3d + 35852d8 commit eb6b497

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

docs/advanced/mapping.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This allows us to treat the WLED strip as if it is wired in any way - we can the
1212

1313
### How do we do it?
1414

15-
Navigate to the edit page for your WLED device by adding `/edit` to its' address - for example, https://my-led-device.local/edit
15+
Navigate to the edit page for your WLED device by adding `/edit` to its address - for example, https://my-led-device.local/edit
1616
Use this edit page to create a file called `ledmap.json`.
1717

1818
`ledmap.json` file needs to be a JSON formatted file with the the key being "map" and the value being an array of numbers representing the new order of pixels. The _position_ of values in the array is the "natural" order of LEDs and the value entered is the new position.
@@ -22,7 +22,7 @@ If your `ledmap.json` file is not working, check for white-spaces where they sho
2222

2323
Multiple maps are supported in the latest versions by using `ledmapx.json` where x is a number. Maps can be selected in a preset using `{"ledmap":x,...`.
2424

25-
Use -1 in the map for gaps/blank/nul LEDs.
25+
Use -1 in the map for gaps/blank/null LEDs.
2626

2727
### Examples
2828
In the below example (formatted multiple ways), we remap a strip of four LEDs from a physical order of 0 1 2 3 into a new order of 0 2 1 3.

docs/features/palettes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ hide:
66
---
77

88
!!! info "Version Info"
9-
Beginning in 0.14 up to 10 [Custom Palletes](#custom-palettes) can be uploaded.
9+
Beginning in 0.14 up to 10 [Custom Palettes](#custom-palettes) can be uploaded.
1010

1111
| PaletteID | Name | Description
1212
| ---: | --- | ---

docs/features/settings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Each output has the following settings:
5353
|---|---|---|---|
5454
Type (represented by the output's number) | multiple options | WS281x | Select the type of LEDs this output will be controlling
5555
Clock | multiple options | "Normal" | Select the PWM or SPI frequency used when driving supported LEDs <br> Used PWM frequencies for the ESP8266 / ESP32, and SPI respectively; <br> Slowest: 293.33 Hz / 6510.33 Hz / 1 MHz <br> Slow: 440 Hz / 9765.50 Hz / 2 MHz <br> Normal: 880 Hz / 19531 Hz / 5 MHz <br> Fast: 1760 Hz / 39062 Hz / 10 MHz <br> Fastest: 2640 Hz / 58593 Hz / 20 MHz <br> [*only appears if "Type" is set to a type that is controlled by PWM or SPI*]
56-
Color order | muliple options | "GRB" | Select which order your LEDs process color information (e.g. if your LEDs display red and green swapped, try changing it) [*only appears if "Type" is set to a type that supports color order*]
56+
Color order | multiple options | "GRB" | Select which order your LEDs process color information (e.g. if your LEDs display red and green swapped, try changing it) [*only appears if "Type" is set to a type that supports color order*]
5757
Start/Index | integer | cummulative length of all previous outputs | Define which address this output (or its first pixel) should use within WLED's address space [*only editable if "Custom bus start indices" is on*]
5858
Length | integer | 1 | Define how many pixels are connected to this output [*only appears if "Type" is set to a type that supports multiple pixels*]
5959
(Data/Clk) GPIO(s) | integer | (blank) | Tell WLED which GPIO pin(s) this output is connected to [*number and description of GPIO settings will depend on the output's selected type*]
@@ -79,7 +79,7 @@ Additionally, one or more Color Order Overrides can be defined by clicking the p
7979
|---|---|---|---|
8080
Start | integer | 0 | Define which address this color override should start it
8181
Length | integer | 1 | Define how many pixels in a row should have their color setting overridden
82-
Color order | muliple options | "GRB" | Same as "Color order" above
82+
Color order | multiple options | "GRB" | Same as "Color order" above
8383

8484
### Other settings
8585

@@ -91,7 +91,7 @@ Turn on after power up | Y/N | Whether the lights should turn on after a reset
9191
Apply preset | 0..16 | Preset to load at boot (0 = none)
9292
Use Gamma for brightness | Y/N | Will correct brightness changes to make it appear more linear. Advised to leave off
9393
Use Gamma for color | Y/N | Will correct colors to match those on a monitor. Strongly advised to keep on
94-
Brightness factor | 1..255 | Factor to change master brightness if it is to dim/bright for a certain configuration
94+
Brightness factor | 1..255 | Factor to change master brightness if it is too dim/bright for a certain configuration
9595
Crossfade | Y/N | Whether to have a smooth fading transitional effect when changing colors/brightness
9696
Transition time | 0..65535 | How many milliseconds the transition lasts
9797
Enable transition for secondary color | Y/N |

0 commit comments

Comments
 (0)