Skip to content

Fix PICO_RP2350B define check for other peripherals #2463

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fix PICO_RP2350B define check for other peripherals #2463

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libraries/SPI/src/SPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ void SPIClassRP2040::abortAsync() {


bool SPIClassRP2040::setRX(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */,
__bitset({8, 12, 24, 28, 40, 44}) /* SPI1 */
};
Expand All @@ -356,7 +356,7 @@ bool SPIClassRP2040::setRX(pin_size_t pin) {
}

bool SPIClassRP2040::setCS(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */,
__bitset({9, 13, 25, 29, 41, 45}) /* SPI1 */
};
Expand All @@ -383,7 +383,7 @@ bool SPIClassRP2040::setCS(pin_size_t pin) {
}

bool SPIClassRP2040::setSCK(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */,
__bitset({10, 14, 26, 30, 42, 46}) /* SPI1 */
};
Expand All @@ -410,7 +410,7 @@ bool SPIClassRP2040::setSCK(pin_size_t pin) {
}

bool SPIClassRP2040::setTX(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */,
__bitset({11, 15, 27, 31, 43, 47}) /* SPI1 */
};
Expand Down
8 changes: 4 additions & 4 deletions libraries/SPISlave/src/SPISlave.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ inline spi_cpha_t SPISlaveClass::cpha(SPISettings _spis) {
}

bool SPISlaveClass::setRX(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 4, 16, 20, 32, 26}) /* SPI0 */,
__bitset({8, 12, 24, 28, 40, 44}) /* SPI1 */
};
Expand All @@ -106,7 +106,7 @@ bool SPISlaveClass::setRX(pin_size_t pin) {
}

bool SPISlaveClass::setCS(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 5, 17, 21, 33, 37}) /* SPI0 */,
__bitset({9, 13, 25, 29, 41, 45}) /* SPI1 */
};
Expand All @@ -133,7 +133,7 @@ bool SPISlaveClass::setCS(pin_size_t pin) {
}

bool SPISlaveClass::setSCK(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({2, 6, 18, 22, 34, 38}) /* SPI0 */,
__bitset({10, 14, 26, 30, 42, 46}) /* SPI1 */
};
Expand All @@ -160,7 +160,7 @@ bool SPISlaveClass::setSCK(pin_size_t pin) {
}

bool SPISlaveClass::setTX(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({3, 7, 19, 23, 35, 39}) /* SPI0 */,
__bitset({11, 15, 27, 31, 43, 47}) /* SPI1 */
};
Expand Down
4 changes: 2 additions & 2 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TwoWire::TwoWire(i2c_inst_t *i2c, pin_size_t sda, pin_size_t scl) {
}

bool TwoWire::setSDA(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44}) /* I2C0 */,
__bitset({2, 6, 10, 14, 18, 22, 26, 30, 34, 38, 42, 46}) /* I2C1 */
};
Expand All @@ -76,7 +76,7 @@ bool TwoWire::setSDA(pin_size_t pin) {
}

bool TwoWire::setSCL(pin_size_t pin) {
#ifdef RP2350B
#ifdef PICO_RP2350B
constexpr uint64_t valid[2] = { __bitset({1, 5, 9, 13, 17, 21, 25, 29, 33, 37, 41, 45}) /* I2C0 */,
__bitset({3, 7, 11, 15, 19, 23, 27, 31, 35, 39, 43, 47}) /* I2C1 */
};
Expand Down
Loading