DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "SPI code added (experimental)"

Browse Source 
This reverts commit 16759c4dd5.
This commit is contained in:
Christian Ambach 2018-10-31 09:44:16 +01:00
parent 3af348fb65
commit 4cab5113ca
2 changed files with 3 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/spisend.h
View File

@ -1,34 +1,9 @@
#ifndef _SPISEND_H #ifndef _SPISEND_H
#define _SPISEND_H #define _SPISEND_H
#include "globals.h"
#include "spi.h"
extern TaskHandle_t SpiTask; extern TaskHandle_t SpiTask;
extern QueueHandle_t SPISendQueue; extern QueueHandle_t SPISendQueue;
/*
* Process data in SPI send queue
*/
void spi_loop(void *pvParameters); void spi_loop(void *pvParameters);
/*
* initialize local SPI wire interface
*/
void hal_spi_init();
/*
* Perform SPI write transaction on local SPI wire interface
* - write the command byte 'cmd'
* - write 'len' bytes out of 'buf'
*/
void hal_spi_write(uint8_t cmd, const uint8_t* buf, int len);
/*
* Perform SPI read transaction on local SPI wire interface
* - read the command byte 'cmd'
* - read 'len' bytes into 'buf'
*/
void hal_spi_read(uint8_t cmd, uint8_t* buf, int len);
#endif #endif

48
src/spisend.cpp
View File

@ -1,6 +1,6 @@
#ifdef HAS_SPI #ifdef HAS_SPI
#include "spisend.h" #include "globals.h"
// Local logging tag // Local logging tag
static const char TAG[] = "main"; static const char TAG[] = "main";
@ -13,62 +13,18 @@ TaskHandle_t SpiTask;
// SPI feed Task // SPI feed Task
void spi_loop(void *pvParameters) { void spi_loop(void *pvParameters) {
uint8_t buf[32];
configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check
while (1) { while (1) {
// check if data to send on SPI interface
if (xQueueReceive(SPISendQueue, &SendBuffer, (TickType_t)0) == pdTRUE) { if (xQueueReceive(SPISendQueue, &SendBuffer, (TickType_t)0) == pdTRUE) {
hal_spi_write(SendBuffer.MessagePort, SendBuffer.Message,
SendBuffer.MessageSize);
ESP_LOGI(TAG, "%d bytes sent to SPI", SendBuffer.MessageSize); ESP_LOGI(TAG, "%d bytes sent to SPI", SendBuffer.MessageSize);
} }
// check if command is received on SPI command port, then call interpreter
hal_spi_read(RCMDPORT, buf, 32);
if (buf[0])
rcommand(buf, sizeof(buf));
vTaskDelay(2 / portTICK_PERIOD_MS); // yield to CPU vTaskDelay(2 / portTICK_PERIOD_MS); // yield to CPU
} // end of infinite loop } // end of infinite loop
vTaskDelete(NULL); // shoud never be reached vTaskDelete(NULL); // shoud never be reached
} // spi_loop() } // spi_loop()
// SPI hardware abstraction layer
void hal_spi_init() { SPI.begin(SCK, MISO, MOSI, SS); }
void hal_spi_trx(u1_t cmd, u1_t *buf, int len, u1_t is_read) {
u1_t nss = SS;
SPISettings settings(1E6, MSBFIRST, SPI_MODE0);
SPI.beginTransaction(settings);
digitalWrite(nss, 0);
SPI.transfer(cmd);
for (u1_t i = 0; i < len; i++) {
u1_t *p = buf + i;
u1_t data = is_read ? 0x00 : *p;
data = SPI.transfer(data);
if (is_read)
*p = data;
}
digitalWrite(nss, 1);
SPI.endTransaction();
}
void hal_spi_write(u1_t cmd, const u1_t *buf, int len) {
hal_spi_trx(cmd, (u1_t *)buf, len, 0);
}
void hal_spi_read(u1_t cmd, u1_t *buf, int len) {
hal_spi_trx(cmd, buf, len, 1);
}
#endif // HAS_SPI #endif // HAS_SPI