Minor Style updates (#461)

This commit is contained in:
Michael Miller
2021-04-12 15:17:40 -07:00
committed by GitHub
parent b90992fdc2
commit 2480634ca7

View File

@@ -32,49 +32,49 @@ License along with NeoPixel. If not, see
class Esp32VspiBus class Esp32VspiBus
{ {
public: public:
static const spi_host_device_t SpiHostDevice = VSPI_HOST; const static spi_host_device_t SpiHostDevice = VSPI_HOST;
static const int dmaChannel = 1; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow const static int DmaChannel = 1; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow
static const int parallelBits = 1; const static int ParallelBits = 1;
}; };
class Esp32HspiBus class Esp32HspiBus
{ {
public: public:
static const spi_host_device_t SpiHostDevice = HSPI_HOST; const static spi_host_device_t SpiHostDevice = HSPI_HOST;
static const int dmaChannel = 2; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow const static int DmaChannel = 2; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow
static const int parallelBits = 1; const static int ParallelBits = 1;
}; };
class Esp32Vspi2BitBus class Esp32Vspi2BitBus
{ {
public: public:
static const spi_host_device_t SpiHostDevice = VSPI_HOST; const static spi_host_device_t SpiHostDevice = VSPI_HOST;
static const int dmaChannel = 1; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow const static int DmaChannel = 1; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow
static const int parallelBits = 2; const static int ParallelBits = 2;
}; };
class Esp32Hspi2BitBus class Esp32Hspi2BitBus
{ {
public: public:
static const spi_host_device_t SpiHostDevice = HSPI_HOST; const static spi_host_device_t SpiHostDevice = HSPI_HOST;
static const int dmaChannel = 2; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow const static int DmaChannel = 2; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow
static const int parallelBits = 2; const static int ParallelBits = 2;
}; };
class Esp32Vspi4BitBus class Esp32Vspi4BitBus
{ {
public: public:
static const spi_host_device_t SpiHostDevice = VSPI_HOST; const static spi_host_device_t SpiHostDevice = VSPI_HOST;
static const int dmaChannel = 1; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow const static int DmaChannel = 1; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow
static const int parallelBits = 4; const static int ParallelBits = 4;
}; };
class Esp32Hspi4BitBus class Esp32Hspi4BitBus
{ {
public: public:
static const spi_host_device_t SpiHostDevice = HSPI_HOST; const static spi_host_device_t SpiHostDevice = HSPI_HOST;
static const int dmaChannel = 2; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow const static int DmaChannel = 2; // arbitrary assignment, but based on the fact there are only two DMA channels and two available SPI ports, we need to split them somehow
static const int parallelBits = 4; const static int ParallelBits = 4;
}; };
template<typename T_SPISPEED, typename T_SPIBUS> class DotStarEsp32DmaSpiMethod template<typename T_SPISPEED, typename T_SPIBUS> class DotStarEsp32DmaSpiMethod
@@ -111,7 +111,7 @@ public:
{ {
if (_spiHandle) if (_spiHandle)
{ {
DeInitSpiDevice(); deinitSpiDevice();
esp_err_t ret = spi_bus_free(T_SPIBUS::SpiHostDevice); esp_err_t ret = spi_bus_free(T_SPIBUS::SpiHostDevice);
ESP_ERROR_CHECK(ret); ESP_ERROR_CHECK(ret);
} }
@@ -149,10 +149,10 @@ public:
buscfg.max_transfer_sz = _spiBufferSize; buscfg.max_transfer_sz = _spiBufferSize;
//Initialize the SPI bus //Initialize the SPI bus
ret=spi_bus_initialize(T_SPIBUS::SpiHostDevice, &buscfg, T_SPIBUS::dmaChannel); ret = spi_bus_initialize(T_SPIBUS::SpiHostDevice, &buscfg, T_SPIBUS::DmaChannel);
ESP_ERROR_CHECK(ret); ESP_ERROR_CHECK(ret);
InitSpiDevice(); initSpiDevice();
} }
void Initialize(int8_t sck, int8_t miso, int8_t mosi, int8_t ss) void Initialize(int8_t sck, int8_t miso, int8_t mosi, int8_t ss)
@@ -181,15 +181,15 @@ public:
memset(&_spiTransaction, 0, sizeof(spi_transaction_t)); memset(&_spiTransaction, 0, sizeof(spi_transaction_t));
_spiTransaction.length = (_spiBufferSize) * 8; // in bits not bytes! _spiTransaction.length = (_spiBufferSize) * 8; // in bits not bytes!
if (T_SPIBUS::parallelBits == 1) if (T_SPIBUS::ParallelBits == 1)
{ {
_spiTransaction.flags = 0; _spiTransaction.flags = 0;
} }
if (T_SPIBUS::parallelBits == 2) if (T_SPIBUS::ParallelBits == 2)
{ {
_spiTransaction.flags = SPI_TRANS_MODE_DIO; _spiTransaction.flags = SPI_TRANS_MODE_DIO;
} }
if (T_SPIBUS::parallelBits == 4) if (T_SPIBUS::ParallelBits == 4)
{ {
_spiTransaction.flags = SPI_TRANS_MODE_QIO; _spiTransaction.flags = SPI_TRANS_MODE_QIO;
} }
@@ -214,13 +214,13 @@ public:
_speed.applySettings(settings); _speed.applySettings(settings);
if (_spiHandle) if (_spiHandle)
{ {
DeInitSpiDevice(); deinitSpiDevice();
InitSpiDevice(); initSpiDevice();
} }
} }
private: private:
void InitSpiDevice() void initSpiDevice()
{ {
spi_device_interface_config_t devcfg = {}; spi_device_interface_config_t devcfg = {};
@@ -228,21 +228,21 @@ private:
devcfg.mode = 0; //SPI mode 0 devcfg.mode = 0; //SPI mode 0
devcfg.spics_io_num = _ssPin; //CS pin devcfg.spics_io_num = _ssPin; //CS pin
devcfg.queue_size = 1; devcfg.queue_size = 1;
if (T_SPIBUS::parallelBits == 1) if (T_SPIBUS::ParallelBits == 1)
{ {
devcfg.flags=0; devcfg.flags = 0;
} }
if (T_SPIBUS::parallelBits >= 2) if (T_SPIBUS::ParallelBits >= 2)
{ {
devcfg.flags=SPI_DEVICE_HALFDUPLEX; devcfg.flags = SPI_DEVICE_HALFDUPLEX;
} }
//Allocate the LEDs on the SPI bus //Allocate the LEDs on the SPI bus
esp_err_t ret=spi_bus_add_device(T_SPIBUS::SpiHostDevice, &devcfg, &_spiHandle); esp_err_t ret = spi_bus_add_device(T_SPIBUS::SpiHostDevice, &devcfg, &_spiHandle);
ESP_ERROR_CHECK(ret); ESP_ERROR_CHECK(ret);
} }
void DeInitSpiDevice() void deinitSpiDevice()
{ {
while(!IsReadyToUpdate()); while(!IsReadyToUpdate());
esp_err_t ret = spi_bus_remove_device(_spiHandle); esp_err_t ret = spi_bus_remove_device(_spiHandle);