Skip to content

Commit 389edd9

Browse files
committed
Handle backward compatibility with the STM32 core
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent ff9ce88 commit 389edd9

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

src/MX25R6435F.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,27 @@
2323
#include "Arduino.h"
2424
#include "mx25r6435f_driver.h"
2525

26+
/*
27+
* For backward compatibility define the xSPI pins used by:
28+
* B-L475E-IOT01A and B-L4S5I-IOT01A
29+
*/
2630
#ifndef MX25R6435F_D0
27-
#define MX25R6435F_D0 NC
31+
#define MX25R6435F_D0 PE12
2832
#endif
2933
#ifndef MX25R6435F_D1
30-
#define MX25R6435F_D1 NC
34+
#define MX25R6435F_D1 PE13
3135
#endif
3236
#ifndef MX25R6435F_D2
33-
#define MX25R6435F_D2 NC
37+
#define MX25R6435F_D2 PE14
3438
#endif
3539
#ifndef MX25R6435F_D3
36-
#define MX25R6435F_D3 NC
40+
#define MX25R6435F_D3 PE15
3741
#endif
3842
#ifndef MX25R6435F_SCLK
39-
#define MX25R6435F_SCLK NC
43+
#define MX25R6435F_SCLK PE10
4044
#endif
4145
#ifndef MX25R6435F_SSEL
42-
#define MX25R6435F_SSEL NC
46+
#define MX25R6435F_SSEL PE11
4347
#endif
4448

4549
/* Memory configuration paremeters */

src/mx25r6435f_driver.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,22 @@ extern "C" {
5050
#elif defined(QUADSPI)
5151
#define XSPI_HandleTypeDef QSPI_HandleTypeDef
5252
#define XSPI_TypeDef QUADSPI_TypeDef
53+
54+
#if defined(STM32_CORE_VERSION) && (STM32_CORE_VERSION > 0x01090000)
5355
#define PinMap_XSPI_DATA0 PinMap_QUADSPI_DATA0
5456
#define PinMap_XSPI_DATA1 PinMap_QUADSPI_DATA1
5557
#define PinMap_XSPI_DATA2 PinMap_QUADSPI_DATA2
5658
#define PinMap_XSPI_DATA3 PinMap_QUADSPI_DATA3
5759
#define PinMap_XSPI_SCLK PinMap_QUADSPI_SCLK
5860
#define PinMap_XSPI_SSEL PinMap_QUADSPI_SSEL
61+
#else
62+
#define PinMap_XSPI_DATA0 PinMap_QUADSPI
63+
#define PinMap_XSPI_DATA1 PinMap_QUADSPI
64+
#define PinMap_XSPI_DATA2 PinMap_QUADSPI
65+
#define PinMap_XSPI_DATA3 PinMap_QUADSPI
66+
#define PinMap_XSPI_SCLK PinMap_QUADSPI
67+
#define PinMap_XSPI_SSEL PinMap_QUADSPI
68+
#endif
5969
#define HAL_XSPI_Init HAL_QSPI_Init
6070
#define HAL_XSPI_DeInit HAL_QSPI_DeInit
6171
#define HAL_XSPI_TIMEOUT_DEFAULT_VALUE HAL_QPSI_TIMEOUT_DEFAULT_VALUE

0 commit comments

Comments
 (0)