8000 new esp4 fixes · espressif/arduino-esp32@c7faea3 · GitHub
[go: up one dir, main page]
Skip to content

Commit c7faea3

Browse files
sierensieren
committed
new esp4 fixes
1 parent 847b600 commit c7faea3

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎cores/esp32/Arduino.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ typedef unsigned int word;
118118
void setup(void);
119119
void loop(void);
120120

121-
long random(long, long);
121+
// long random(long, long);
122122
void randomSeed(unsigned long);
123123
long map(long, long, long, long, long);
124124

‎cores/esp32/esp32-hal-spi.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -421,14 +421,14 @@ spi_t * spiStartBus(uint8_t spi_num, uint32_t clockDiv, uint8_t dataMode, uint8_
421421
#endif
422422

423423
if(spi_num == HSPI) {
424-
DPORT_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI_CLK_EN);
425-
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_SPI_RST);
424+
DPORT_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI2_CLK_EN);
425+
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_SPI2_RST);
426426
} else if(spi_num == VSPI) {
427-
DPORT_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI_CLK_EN_2);
428-
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_SPI_RST_2);
427+
DPORT_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI3_CLK_EN);
428+
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_SPI3_RST);
429429
} else {
430-
DPORT_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI_CLK_EN_1);
431-
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_SPI_RST_1);
430+
DPORT_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_SPI01_CLK_EN);
431+
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_SPI01_RST);
432432
}
433433

434434
spiStopBus(spi);

‎libraries/BLE/src/FreeRTOS.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ void FreeRTOS::Semaphore::setName(std::string name) {
257257
* @param [in] length The amount of storage to allocate for the ring buffer.
258258
* @param [in] type The type of buffer. One of RINGBUF_TYPE_NOSPLIT, RINGBUF_TYPE_ALLOWSPLIT, RINGBUF_TYPE_BYTEBUF.
259259
*/
260-
Ringbuffer::Ringbuffer(size_t length, ringbuf_type_t type) {
260+
Ringbuffer::Ringbuffer(size_t length, RingbufferType_t type) {
261261
m_handle = ::xRingbufferCreate(length, type);
262262
} // Ringbuffer
263263

‎libraries/BLE/src/FreeRTOS.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class FreeRTOS {
6060
*/
6161
class Ringbuffer {
6262
public:
63-
Ringbuffer(size_t length, ringbuf_type_t type = RINGBUF_TYPE_NOSPLIT);
63+
Ringbuffer(size_t length, RingbufferType_t type = RINGBUF_TYPE_NOSPLIT);
6464
~Ringbuffer();
6565

6666
void* receive(size_t* size, TickType_t wait = portMAX_DELAY);

0 commit comments

Comments
 (0)
0