Skip to content

Commit 9c4fc19

Browse files
committed
Merge branch 'devel' into 0.7.x
2 parents 6293333 + 78bbc39 commit 9c4fc19

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

docs/configuration/printing-effects.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ All the standard effects available, with fancy visualisations!
3636

3737
Sets all LEDs to one colour, forever.
3838

39-
![](../.gitbook/assets/solid_colour.gif)
39+
![](../.gitbook/assets/solid_colour%20%284%29.gif)
4040

4141
### Colour Wipe
4242

4343
Wipes colour across the strip pixel by pixel, then clears it pixel by pixel.
4444

45-
![](../.gitbook/assets/color_wipe.gif)
45+
![](../.gitbook/assets/color_wipe%20%284%29.gif)
4646

4747
### Colour Wipe V2
4848

@@ -54,13 +54,13 @@ Wipes colour pixel by pixel, as above, but to clear it turns around and heads ba
5454

5555
Fades brightness up and down. Looks better in real life than the visualisation below!
5656

57-
![](../.gitbook/assets/pulse%20%283%29.gif)
57+
![](../.gitbook/assets/pulse%20%283%29%20%281%29.gif)
5858

5959
### Bounce
6060

6161
Sends a pulse of light bouncing from one side of your strip to the other.
6262

63-
![](../.gitbook/assets/bounce%20%282%29.gif)
63+
![](../.gitbook/assets/bounce%20%282%29%20%281%29.gif)
6464

6565
### Solo Bounce
6666

@@ -72,13 +72,13 @@ Sends just a single pixel from one side to the other, bouncing about.
7272

7373
Cycles all the LEDs through the rainbow together.
7474

75-
![](../.gitbook/assets/rainbow%20%282%29.gif)
75+
![](../.gitbook/assets/rainbow%20%282%29%20%281%29.gif)
7676

7777
### Rainbow Cycle
7878

7979
Rainbow that cycles across the strip, so a full rainbow is across the whole strip at once.
8080

81-
![](../.gitbook/assets/rainbow_cycle%20%282%29.gif)
81+
![](../.gitbook/assets/rainbow_cycle%20%282%29%20%281%29.gif)
8282

8383
### Crossover
8484

@@ -90,7 +90,7 @@ Two pixels bouncing in opposite directions, crossing over in the middle.
9090

9191
Sets all LEDs to a random colour, then changes a random pixel, to a new random colour
9292

93-
![](../.gitbook/assets/random%20%283%29.gif)
93+
![](../.gitbook/assets/random%20%283%29%20%281%29.gif)
9494

9595
### Bouncy Balls
9696

docs/documentation/m150-intercept.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ M150 W100 # Sets to white, at 100 intensity
3131
M150 R255 P200 # Sets LEDs to red, at 200 brightness
3232
```
3333

34-
#### What does the W parameter do?
34+
## What does the W parameter do?
3535

3636
On a standard RGB WS281x strip, the W parameter sets an equal value of R, G and B on the LEDs.
3737

docs/documentation/rest-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SimpleAPI Command
5151
{% endapi-method-summary %}
5252

5353
{% api-method-description %}
54-
Send commands to the plugin, to make it do something.
54+
Send commands to the plugin, to make it do something.
5555
{% endapi-method-description %}
5656

5757
{% api-method-spec %}

docs/guides/setup-guide-1/wiring-your-leds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Wiring is as follows:
3939
Make sure you have a common ground between the power supply and Pi.
4040
{% endhint %}
4141

42-
![Wiring with no shifter](../../.gitbook/assets/wiring_no_shift%20%283%29.png)
42+
![Wiring with no shifter](../../.gitbook/assets/wiring_no_shift%20%283%29%20%281%29.png)
4343

4444
### Level Shifting Chip
4545

octoprint_ws281x_led_status/effects/standard.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,16 +65,17 @@ def set_pixel(pixel, pixel_color):
6565

6666

6767
def simple_pulse(strip, queue, color, delay, brightness_manager, *args, **kwargs):
68+
max_brightness = brightness_manager.max_brightness
69+
solid_color(
70+
strip=strip,
71+
queue=queue,
72+
color=color,
73+
brightness_manager=brightness_manager,
74+
wait=False,
75+
)
76+
6877
while True:
69-
max_brightness = brightness_manager.max_brightness
7078
brightness_manager.set_brightness(1)
71-
solid_color(
72-
strip=strip,
73-
queue=queue,
74-
color=color,
75-
brightness_manager=brightness_manager,
76-
wait=False,
77-
)
7879

7980
for direction in DIRECTIONS:
8081
for b in (
@@ -208,7 +209,7 @@ def blink(strip, queue, color, delay, brightness_manager, *args, **kwargs):
208209
brightness_manager=brightness_manager,
209210
wait=False,
210211
)
211-
for _ms in range(int(delay / 2)):
212+
for _ms in range(int(delay) // 2):
212213
if not q_poll_milli_sleep(2, queue):
213214
# We do it this way so we can check the q more often, as for blink
214215
# delay may be high. Otherwise the effect may end up blocking the

octoprint_ws281x_led_status/static/js/ws281x_led_status.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright (c) Charlie Powell 2020-2021 - released under the terms of the AGPLv3 License
55
*/
66

7-
const ko = window.ko;
7+
let ko = window.ko;
88

99
$(function () {
1010
function ws281xLedStatusNavbarViewModel(parameters) {
@@ -155,7 +155,9 @@ $(function () {
155155
};
156156

157157
self.sendTestCommand = function (color) {
158-
OctoPrint.simpleApiCommand("ws281x_led_status", "test_led", { color } );
158+
OctoPrint.simpleApiCommand("ws281x_led_status", "test_led", {
159+
color,
160+
});
159161
};
160162

161163
self.advancedStripOpen = ko.observable(false);

0 commit comments

Comments
 (0)