Skip to content

Commit 0dbe08b

Browse files
committed
Revert "chore(i3c): disable for HALv2 support"
This reverts commit b509e77.
1 parent 8a81c63 commit 0dbe08b

4 files changed

Lines changed: 5 additions & 13 deletions

File tree

‎CI/build/examples/BareMinimum/BareMinimum.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <SPI.h>
1616
#include <SoftwareSerial.h>
1717
#include <Wire.h>
18-
#if (defined(I3C1_BASE) || defined(I3C2_BASE)) && defined(HAL_I3C_MODULE_ENABLED)
18+
#if defined(I3C1_BASE) || defined(I3C2_BASE)
1919
#include <I3C.h>
2020
#endif
2121

@@ -137,7 +137,7 @@ void setup() {
137137
Wire.requestFrom(2, 1);
138138
Wire.end();
139139

140-
#if (defined(I3C1_BASE) || defined(I3C2_BASE)) && defined(HAL_I3C_MODULE_ENABLED)
140+
#if defined(I3C1_BASE) || defined(I3C2_BASE)
141141
// I3C
142142
I3C.setBusType(I3CBusType::Pure);
143143
I3C.setMixedBusOpenDrainFrequency(1000000U);

‎libraries/I3C/src/I3C.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#include <cstring>
33

44
#if defined(I3C1_BASE) || defined(I3C2_BASE)
5-
#if !defined(USE_HALV2_DRIVER)
65

76
// ============================================================================
87
// Global bus instances
@@ -1966,5 +1965,4 @@ extern "C" void I3C2_ER_IRQHandler(void)
19661965
}
19671966
#endif
19681967

1969-
#endif /* !USE_HALV2_DRIVER */
1970-
#endif /* I3C1_BASE || I3C2_BASE */
1968+
#endif

‎libraries/I3C/src/I3C.h‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
#if defined(I3C1_BASE) || defined(I3C2_BASE)
66

7-
#if defined(USE_HALV2_DRIVER)
8-
#warning "I3C library is not yet compatible with HALv2 driver."
9-
#else
107
#include "stm32yyxx_utils_i3c.h"
118

129
// ============================================================================
@@ -584,5 +581,4 @@ class I3CBus {
584581

585582
extern I3CBus I3C;
586583

587-
#endif /* !USE_HALV2_DRIVER */
588-
#endif /* I3C1_BASE || I3C2_BASE */
584+
#endif

‎libraries/I3C/src/I3C_I2C.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#if defined(I3C1_BASE) || defined(I3C2_BASE)
55

6-
#if !defined(USE_HALV2_DRIVER)
76
// ============================================================================
87
// I2C helpers on mixed I3C bus
98
// ============================================================================
@@ -399,5 +398,4 @@ int I3CBus::readRegBuffer(uint8_t addr,
399398
: readRegBuffer(addr, reg, pData, len, timeout);
400399
}
401400

402-
#endif /* !USE_HALV2_DRIVER */
403-
#endif /* I3C1_BASE || I3C2_BASE */
401+
#endif

0 commit comments

Comments
 (0)