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

[Silabs] Adds refactored spi multiplexing with feature toggle for NCP combinations #29414

Merged
merged 29 commits into from
Oct 16, 2023
Merged

[Silabs] Adds refactored spi multiplexing with feature toggle for NCP combinations #29414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
67ec6f0
Adds DISPLAY_ENABLED macro for SPI multiplexed functions
rosahay-silabs Sep 2, 2023
49e53ea
Adds CONFIG_USE_EXTERNAL_FLASH macro for SPI multiplex functions
rosahay-silabs Sep 2, 2023
f5cfc34
Added proper MACROs for the features that require multiplexing
rosahay-silabs Sep 11, 2023
4182893
temp commit with test file
rosahay-silabs Sep 12, 2023
d8c9ccb
Adds fix for crash on rs91x
rosahay-silabs Sep 13, 2023
7df92b0
Adds updated build commands
rosahay-silabs Sep 13, 2023
2eedaf2
adds DEBUG logs
rosahay-silabs Sep 13, 2023
65efc77
Adds bugfixes to MACROs
rosahay-silabs Sep 15, 2023
0a51680
Adds additional logs
rosahay-silabs Sep 15, 2023
c6c2034
Adds fix to UART multiplexing
rosahay-silabs Sep 18, 2023
b201d90
Remove comments
rosahay-silabs Sep 18, 2023
f38f1f3
Adds ported changes
rosahay-silabs Sep 18, 2023
f6e8c62
Adds use of SL_CATALOG_UARTDRV_USART_PRESENT, SL_CATALOG_UARTDRV_EUSA…
rosahay-silabs Sep 19, 2023
c85ba9d
Removes code since WF200 requires SL_CATALOG_UARTDRV_USART_PRESENT only
rosahay-silabs Sep 19, 2023
90c21f7
Restyler changes
rosahay-silabs Oct 4, 2023
857253a
Adds additional changes to wrap multiplexing with MACROs
rosahay-silabs Oct 4, 2023
848efa3
Remove log commit
rosahay-silabs Oct 4, 2023
7fa5f11
Adds dummy buffer length check
rosahay-silabs Oct 4, 2023
c5cccd0
Restyler changes
rosahay-silabs Oct 4, 2023
852e7b5
Removes use of unnecessary MACRO
rosahay-silabs Oct 4, 2023
2c36bdb
adds thread check
rosahay-silabs Oct 4, 2023
1d2a15f
Adds comment
rosahay-silabs Oct 4, 2023
32d8413
updated build script
brosahay Oct 5, 2023
27cf906
Adds refactored includes and define macros
brosahay Oct 5, 2023
5d6a7a9
Adds spell fix
rosahay-silabs Oct 5, 2023
cdf8414
Adds feature macro for header include
rosahay-silabs Oct 10, 2023
88e216d
Remove temp code
rosahay-silabs Oct 10, 2023
1063c6d
Adds refactored deassert
rosahay-silabs Oct 16, 2023
c603239
Comment reformatting
rosahay-silabs Oct 16, 2023
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
14 changes: 7 additions & 7 deletions examples/platform/silabs/display/demo-ui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
#include "dmd/dmd.h"
#include "em_types.h"
#include "glib.h"
#if SL_WIFI && !SIWX_917
#include "spi_multiplex.h"
#endif // SL_WIFI && !SIWX_917
#include <stdio.h>
#include <string.h>
#if (defined(EFR32MG24) && defined(SL_WIFI))
#include "spi_multiplex.h"
#endif

// Main Logo and App image
#define SILICONLABS_X_POSITION ((glibContext.pDisplayGeometry->xSize - SILICONLABS_BITMAP_WIDTH) / 2)
Expand Down Expand Up @@ -102,13 +102,13 @@ void demoUIInit(GLIB_Context_t * context)

sl_status_t updateDisplay(void)
{
#if (defined(EFR32MG24) && defined(SL_WIFI))
#if SL_LCDCTRL_MUX
sl_wfx_host_pre_lcd_spi_transfer();
#endif
#endif // SL_LCDCTRL_MUX
sl_status_t status = DMD_updateDisplay();
#if (defined(EFR32MG24) && defined(SL_WIFI))
#if SL_LCDCTRL_MUX
sl_wfx_host_post_lcd_spi_transfer();
#endif
#endif // SL_LCDCTRL_MUX
if (status != DMD_OK)
return SL_STATUS_FAIL;
return SL_STATUS_OK;
Expand Down
3 changes: 0 additions & 3 deletions examples/platform/silabs/display/lcd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@

#include "sl_board_control.h"

#if (defined(EFR32MG24) && defined(SL_WIFI))
#include "spi_multiplex.h"
#endif
#define LCD_SIZE 128
#define QR_CODE_VERSION 4
#define QR_CODE_MODULE_SIZE 3
Expand Down
Loading