@@ -340,20 +340,20 @@ bool spiDetachMOSI(spi_t * spi)
340
340
return true;
341
341
}
342
342
343
- bool spiAttachSS (spi_t * spi , uint8_t cs_num , int8_t ss )
343
+ bool spiAttachSS (spi_t * spi , uint8_t ss_num , int8_t ss )
344
344
{
345
- if (!spi || ss < 0 || cs_num > 2 ) {
345
+ if (!spi || ss < 0 || ss_num > 2 ) {
346
346
return false;
347
347
}
348
- void * bus = perimanGetPinBus (ss , ESP32_BUS_TYPE_SPI_MASTER_CS );
348
+ void * bus = perimanGetPinBus (ss , ESP32_BUS_TYPE_SPI_MASTER_SS );
349
349
if (bus != NULL && !perimanClearPinBus (ss )){
350
350
return false;
351
351
}
352
352
pinMode (ss , OUTPUT );
353
- pinMatrixOutAttach (ss , SPI_SS_IDX (spi -> num , cs_num ), false, false);
354
- spiEnableSSPins (spi , (1 << cs_num ));
353
+ pinMatrixOutAttach (ss , SPI_SS_IDX (spi -> num , ss_num ), false, false);
354
+ spiEnableSSPins (spi , (1 << ss_num ));
355
355
spi -> ss = ss ;
356
- if (!perimanSetPinBus (ss , ESP32_BUS_TYPE_SPI_MASTER_CS , (void * )(spi -> num + 1 ), spi -> num , -1 )){
356
+ if (!perimanSetPinBus (ss , ESP32_BUS_TYPE_SPI_MASTER_SS , (void * )(spi -> num + 1 ), spi -> num , -1 )){
357
357
spiDetachBus_SS ((void * )(spi -> num + 1 ));
358
358
log_e ("Failed to set pin bus to SPI for pin %d" , ss );
359
359
return false;
@@ -375,30 +375,30 @@ bool spiDetachSS(spi_t * spi)
375
375
return true;
376
376
}
377
377
378
- void spiEnableSSPins (spi_t * spi , uint8_t cs_mask )
378
+ void spiEnableSSPins (spi_t * spi , uint8_t ss_mask )
379
379
{
380
380
if (!spi ) {
381
381
return ;
382
382
}
383
383
SPI_MUTEX_LOCK ();
384
384
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2
385
- spi -> dev -> misc .val &= ~(cs_mask & SPI_CS_MASK_ALL );
385
+ spi -> dev -> misc .val &= ~(ss_mask & SPI_SS_MASK_ALL );
386
386
#else
387
- spi -> dev -> pin .val &= ~(cs_mask & SPI_CS_MASK_ALL );
387
+ spi -> dev -> pin .val &= ~(ss_mask & SPI_SS_MASK_ALL );
388
388
#endif
389
389
SPI_MUTEX_UNLOCK ();
390
390
}
391
391
392
- void spiDisableSSPins (spi_t * spi , uint8_t cs_mask )
392
+ void spiDisableSSPins (spi_t * spi , uint8_t ss_mask )
393
393
{
394
394
if (!spi ) {
395
395
return ;
396
396
}
397
397
SPI_MUTEX_LOCK ();
398
398
#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 || CONFIG_IDF_TARGET_ESP32H2
399
- spi -> dev -> misc .val |= (cs_mask & SPI_CS_MASK_ALL );
399
+ spi -> dev -> misc .val |= (ss_mask & SPI_SS_MASK_ALL );
400
400
#else
401
- spi -> dev -> pin .val |= (cs_mask & SPI_CS_MASK_ALL );
401
+ spi -> dev -> pin .val |= (ss_mask & SPI_SS_MASK_ALL );
402
402
#endif
403
403
SPI_MUTEX_UNLOCK ();
404
404
}
@@ -622,7 +622,7 @@ spi_t * spiStartBus(uint8_t spi_num, uint32_t clockDiv, uint8_t dataMode, uint8_
622
622
perimanSetBusDeinit (ESP32_BUS_TYPE_SPI_MASTER_SCK , spiDetachBus_SCK );
623
623
perimanSetBusDeinit (ESP32_BUS_TYPE_SPI_MASTER_MISO , spiDetachBus_MISO );
624
624
perimanSetBusDeinit (ESP32_BUS_TYPE_SPI_MASTER_MOSI , spiDetachBus_MOSI );
625
- perimanSetBusDeinit (ESP32_BUS_TYPE_SPI_MASTER_CS , spiDetachBus_SS );
625
+ perimanSetBusDeinit (ESP32_BUS_TYPE_SPI_MASTER_SS , spiDetachBus_SS );
626
626
627
627
spi_t * spi = & _spi_bus_array [spi_num ];
628
628
0 commit comments