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.

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

Update WS2812B.cpp to solve compilation error #142

Merged
merged 1 commit into from Oct 26, 2022
Merged

Update WS2812B.cpp to solve compilation error #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Arduino_package/hardware/libraries/SPI/src/SPI.cpp
View file
Open in desktop
Expand Up @@ -311,5 +311,5 @@ SPIClass SPI((void *)(&spi_obj0), SPI_MOSI, SPI_MISO, SPI_SCLK, SPI_SS);
SPIClass SPI1((void *)(&spi_obj1), SPI1_MOSI, SPI1_MISO, SPI1_SCLK, SPI1_SS); // 14, 15, 16, 17 or 4, 3, 29, 28

#else
#error chack the borad supported SPI
#error check the board supported SPI
#endif
22 changes: 12 additions & 10 deletions Arduino_package/hardware/libraries/WS2812B/src/WS2812B.cpp
View file
Open in desktop
Expand Up @@ -63,7 +63,7 @@ void WS2812B::show(void) {
Pinmux_Config((PinName)g_APinDescription[SPI_SCLK].pinname, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI_SCLK].pinname, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI_SS].pinname, PINMUX_FUNCTION_GPIO);
} else if (_input_pin== SPI1_MOSI) {
} else if (_input_pin == SPI1_MOSI) {
spi_init((spi_t *)pSpiMaster, (PinName)g_APinDescription[_input_pin].pinname, (PinName)g_APinDescription[SPI1_MISO].pinname, (PinName)g_APinDescription[SPI1_SCLK].pinname, (PinName)g_APinDescription[SPI1_SS].pinname);
//Revert the unneccesary SPI pins to GPIO functions
Pinmux_Config((PinName)g_APinDescription[SPI1_SCLK].pinname, PINMUX_FUNCTION_GPIO);
Expand All @@ -80,20 +80,22 @@ void WS2812B::show(void) {
//Initialise SPI
SPI.begin();
//Revert the unneccesary SPI pins to GPIO functions
Pinmux_Config(SPI_MISO, PINMUX_FUNCTION_GPIO);
Pinmux_Config(SPI_SCLK, PINMUX_FUNCTION_GPIO);
Pinmux_Config(SPI_SS, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI_MISO].pinname, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI_SCLK].pinname, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI_SS].pinname, PINMUX_FUNCTION_GPIO);
SPI.setDefaultFrequency(2500000);
SPI.setDataMode(SPI_SS, 12, 0);
} else if (_input_pin== SPI1_MOSI) {
SPI.setDataMode(12, 0);
#if !defined(BOARD_RTL8722DM_MINI) && !defined(BOARD_RTL8720DN_BW16)
} else if (_input_pin == SPI1_MOSI) {
//Initialise SPI
SPI1.begin();
//Revert the unneccesary SPI pins to GPIO functions
Pinmux_Config(SPI1_MISO, PINMUX_FUNCTION_GPIO);
Pinmux_Config(SPI1_SCLK, PINMUX_FUNCTION_GPIO);
Pinmux_Config(SPI1_SS, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI1_MISO].pinname, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI1_SCLK].pinname, PINMUX_FUNCTION_GPIO);
Pinmux_Config((PinName)g_APinDescription[SPI1_SS].pinname, PINMUX_FUNCTION_GPIO);
SPI1.setDefaultFrequency(2500000);
SPI1.setDataMode(SPI1_SS, 12, 0);
SPI1.setDataMode(12, 0);
#endif
} else {
printf("spi_init: error. wrong spi_idx \r\n");
return;
Expand Down