Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add definition WS2812_BYTE_ORDER to fix RGB LED issues #10184

Merged
merged 12 commits into from
Dec 6, 2020
Merged

add definition WS2812_BYTE_ORDER to fix RGB LED issues #10184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7e7ca72
add define for WS2812B-2020 to fix RGB issues
Aug 27, 2020
533866a
update driver doc
Aug 27, 2020
278fc6b
add WS2812_BYTE_ORDER definition to correct RGB byte issues
Aug 27, 2020
df6c54a
add definition variable thing
Aug 27, 2020
9e06514
update per PR request
Aug 27, 2020
da1f557
update per PR reqs
Aug 27, 2020
8cf2a50
update per PR request
Aug 28, 2020
de6626e
inital changes
Xelus22 Aug 28, 2020
643b370
Merge pull request #2 from Xelus22/ws2812_byte_order
hineybush Aug 28, 2020
70b8ad8
move defines to color.h and add rgbw incase
Xelus22 Oct 25, 2020
c670840
Merge pull request #3 from Xelus22/ws2812_byte_order
hineybush Oct 27, 2020
c957bca
Update docs/ws2812_driver.md
hineybush Nov 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update per PR request
  • Loading branch information
hineybush committed Aug 27, 2020
commit 9e06514e91e9d97fb35c6b91582d25da5e3b2c77
2 changes: 1 addition & 1 deletion docs/ws2812_driver.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Without correction, this causes the two internal LEDs to swap colors and display
The default setting GRB allows other addressable LEDs to work properly with the correct byte structure (G[7-0]R[7-0]G[7-0]), however the WS2812B-2020 needs the green and red bytes reversed.

```c
#define WS2812_BYTE_ORDER RGB
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
```

hineybush marked this conversation as resolved.
Show resolved Hide resolved
### Bitbang
Expand Down
14 changes: 7 additions & 7 deletions quantum/color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@
# define LED_TYPE RGB
#endif

#define WS2812_BYTE_ORDER_RGB 0
#define WS2812_BYTE_ORDER_GRB 1

#ifndef WS2812_BYTE_ORDER
// default structure - G[7..0]R[7..0]B[7..0]
// WS2812 specific layout
# define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_GRB
#endif
typedef struct PACKED {
hineybush marked this conversation as resolved.
Show resolved Hide resolved
#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
uint8_t g;
uint8_t r;
uint8_t b;
} cRGB;
#elif (WS2812_BYTE_ORDER == RGB)
// WS2812B-2020 structure - R[7..0]G[7..0]B[7..0]
typedef struct PACKED {
#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
uint8_t r;
uint8_t g;
uint8_t b;
} cRGB;
#endif
} cRGB;
typedef cRGB RGB;
hineybush marked this conversation as resolved.
Show resolved Hide resolved

// WS2812 specific layout
Expand Down