Skip to content

LED strip refactor #3158

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

Merged
merged 12 commits into from
Jan 6, 2021
Merged

LED strip refactor #3158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
37b09b3
ws2812 buffer extracted to pixbuf
nwf May 23, 2020
4dd575d
ws2801: pixbuf support
nwf May 26, 2020
acb9ebf
apa102 pixbuf support
nwf May 28, 2020
1b87e95
tm1829 pixbuf support
nwf Jun 28, 2020
8d7d207
mispec "ws2812" tests -> NTest pixbuf tests
nwf Jun 12, 2020
4fe9afb
pixbuf: remove types, add some *I methods
nwf Nov 17, 2020
ada272b
pixbuf: map
nwf Nov 17, 2020
76bd3d3
add pixbuf to luacheck_config.lua
HHHartmann Dec 20, 2020
c39903d
fix luacheck errors
HHHartmann Dec 20, 2020
faace6e
reapply lost changes - fix local/local mix
HHHartmann Dec 23, 2020
3ad6f65
Correct typo in NTest pixbuf test
nwf Jan 1, 2021
bdd14f8
pixbuf: incorporate review comments
nwf Jan 5, 2021
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
1 change: 1 addition & 0 deletions app/include/user_modules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
//#define LUA_USE_MODULES_PCM
//#define LUA_USE_MODULES_PERF
//#define LUA_USE_MODULES_PIPE
//#define LUA_USE_MODULES_PIXBUF
//#define LUA_USE_MODULES_PWM
//#define LUA_USE_MODULES_PWM2
//#define LUA_USE_MODULES_RFSWITCH
Expand Down
25 changes: 22 additions & 3 deletions app/modules/apa102.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include "platform.h"
#include "user_interface.h"

#include "pixbuf.h"


#define NOP asm volatile(" nop \n\t")

Expand Down Expand Up @@ -79,9 +81,26 @@ static int apa102_write(lua_State* L) {
MOD_CHECK_ID(gpio, clock_pin);
uint32_t alt_clock_pin = pin_num[clock_pin];

size_t buf_len;
const char *buf = luaL_checklstring(L, 3, &buf_len);
uint32_t nbr_frames = buf_len / 4;
const char *buf;
uint32_t nbr_frames;

switch(lua_type(L, 3)) {
case LUA_TSTRING: {
size_t buf_len;
buf = luaL_checklstring(L, 3, &buf_len);
nbr_frames = buf_len / 4;
break;
}
case LUA_TUSERDATA: {
pixbuf *buffer = pixbuf_from_lua_arg(L, 3);
luaL_argcheck(L, buffer->nchan == 4, 3, "Pixbuf not 4-channel");
buf = (const char *)buffer->values;
nbr_frames = buffer->npix;
break;
}
default:
return luaL_argerror(L, 3, "String or pixbuf expected");
}

if (nbr_frames > 100000) {
return luaL_error(L, "The supplied buffer is too long, and might cause the callback watchdog to bark.");
Expand Down
Loading