First tests OK

This commit is contained in:
2024-02-11 19:35:12 -03:00
parent fb4b9e70e4
commit 2632cc428b
7 changed files with 141 additions and 49 deletions

View File

@@ -13,11 +13,11 @@
class GPIO_Pin { class GPIO_Pin {
public: public:
virtual int32_t init() = 0; virtual int32_t init() = 0;
virtual uint8_t read() = 0; virtual int32_t read(uint8_t* state) = 0;
virtual void write(uint8_t state) = 0; virtual int32_t write(uint8_t state) = 0;
virtual void set() = 0; virtual int32_t set() = 0;
virtual void reset() = 0; virtual int32_t reset() = 0;
virtual void toggle() = 0; virtual int32_t toggle() = 0;
}; };
#endif /* SRC_COMPONENTS_GPIO_PIN_HPP_ */ #endif /* SRC_COMPONENTS_GPIO_PIN_HPP_ */

View File

@@ -19,22 +19,27 @@ int32_t GPIO_Pin_STM32::init() {
return 0; return 0;
} }
uint8_t GPIO_Pin_STM32::read() { int32_t GPIO_Pin_STM32::read(uint8_t* state) {
return (uint8_t)HAL_GPIO_ReadPin(gpio_port, gpio_pin); *state = (uint8_t)HAL_GPIO_ReadPin(gpio_port, gpio_pin);
return 0;
} }
void GPIO_Pin_STM32::write(uint8_t state) { int32_t GPIO_Pin_STM32::write(uint8_t state) {
HAL_GPIO_WritePin(gpio_port, gpio_pin, (GPIO_PinState)state); HAL_GPIO_WritePin(gpio_port, gpio_pin, (GPIO_PinState)state);
return 0;
} }
void GPIO_Pin_STM32::set() { int32_t GPIO_Pin_STM32::set() {
HAL_GPIO_WritePin(gpio_port, gpio_pin, GPIO_PIN_SET); HAL_GPIO_WritePin(gpio_port, gpio_pin, GPIO_PIN_SET);
return 0;
} }
void GPIO_Pin_STM32::reset() { int32_t GPIO_Pin_STM32::reset() {
HAL_GPIO_WritePin(gpio_port, gpio_pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(gpio_port, gpio_pin, GPIO_PIN_RESET);
return 0;
} }
void GPIO_Pin_STM32::toggle() { int32_t GPIO_Pin_STM32::toggle() {
HAL_GPIO_TogglePin(gpio_port, gpio_pin); HAL_GPIO_TogglePin(gpio_port, gpio_pin);
return 0;
} }

View File

@@ -16,11 +16,11 @@ public:
GPIO_Pin_STM32(GPIO_TypeDef* gpio_port, uint16_t gpio_pin); GPIO_Pin_STM32(GPIO_TypeDef* gpio_port, uint16_t gpio_pin);
virtual ~GPIO_Pin_STM32(); virtual ~GPIO_Pin_STM32();
int32_t init(); int32_t init();
uint8_t read(); int32_t read(uint8_t* state);
void write(uint8_t state); int32_t write(uint8_t state);
void set(); int32_t set();
void reset(); int32_t reset();
void toggle(); int32_t toggle();
private: private:
GPIO_TypeDef* gpio_port; GPIO_TypeDef* gpio_port;
uint16_t gpio_pin; uint16_t gpio_pin;

View File

@@ -6,6 +6,7 @@
*/ */
#include "ILI9341.hpp" #include "ILI9341.hpp"
#include <cstring>
ILI9341::ILI9341(SPI_Peripheral* hSpi, GPIO_Pin* hNssPin, GPIO_Pin* hResetPin, GPIO_Pin* hDcrsPin, PWM_Pin* hLedPwm) : ILI9341::ILI9341(SPI_Peripheral* hSpi, GPIO_Pin* hNssPin, GPIO_Pin* hResetPin, GPIO_Pin* hDcrsPin, PWM_Pin* hLedPwm) :
hSpi(hSpi), hNssPin(hNssPin), hResetPin(hResetPin), hDcrsPin(hDcrsPin), hLedPwm(hLedPwm) { hSpi(hSpi), hNssPin(hNssPin), hResetPin(hResetPin), hDcrsPin(hDcrsPin), hLedPwm(hLedPwm) {
@@ -16,36 +17,115 @@ ILI9341::~ILI9341() {
} }
int32_t ILI9341::init() { // Public methods
// Init pins
hNssPin->init();
hResetPin->init();
hDcrsPin->init();
hLedPwm->init();
// Reset LCD
hResetPin->reset();
vTaskDelay(1);
hResetPin->set();
hSpi->take(100); int32_t ILI9341::init() {
hNssPin->reset(); int32_t errors = 0;
hSpi->transmit((uint8_t*)"Hello World", 11); // Init pins
hNssPin->set(); errors += hNssPin->init();
hSpi->give(); errors += hResetPin->init();
hSpi->take(100); errors += hDcrsPin->init();
hNssPin->reset(); errors += hLedPwm->init();
hSpi->transmit((uint8_t*)"Hello World", 11); // Reset LCD
hNssPin->set(); errors += hResetPin->reset();
hSpi->give(); vTaskDelay(1);
while(true){ errors += hResetPin->set();
hLedPwm->setDuty(0.5); // Start SPI Command
vTaskDelay(1000); uint32_t id;
hLedPwm->setDuty(1); errors += readReg24(0x04, &id);
vTaskDelay(1000); if(id != 0x858552){
hLedPwm->setDuty(0.5); // Wrong ID
vTaskDelay(1000); return -1;
hLedPwm->setDuty(0);
vTaskDelay(1000);
} }
return 0; uint8_t idn[3];
errors += readReg8(0xDA, idn);
errors += readReg8(0xDB, idn+1);
errors += readReg8(0xDC, idn+2);
writeBuffer(0x11, nullptr, 0);
vTaskDelay(5);
uint8_t buf[720];
uint8_t pasetBuf[4];
for(uint16_t i = 0; i<320; i++){
pasetBuf[0] = (i>>8);
pasetBuf[1] = i;
pasetBuf[2] = 319>>8;
pasetBuf[3] = 319;
writeBuffer(0x2B, pasetBuf, 4);
for(uint32_t j = 0; j<720; j++){
buf[j] = (j%64)<<2;
}
writeBuffer(0x2C, buf, 720);
}
writeBuffer(0x29, nullptr, 0);
uint32_t status;
errors += readReg32(0x09, &status);
errors += hLedPwm->setDuty(1);
return errors;
}
// Private methods
int32_t ILI9341::readReg8(uint8_t command, uint8_t* reg) {
int32_t errors = 0;
errors += hSpi->take(100);
errors += hDcrsPin->reset();
errors += hNssPin->reset();
txBuffer[0] = command;
errors += hSpi->trx(txBuffer, rxBuffer, 2);
errors += hNssPin->set();
errors += hSpi->give();
if(reg != nullptr){
*reg = rxBuffer[1];
}
return errors;
}
int32_t ILI9341::readReg24(uint8_t command, uint32_t* reg) {
int32_t errors = 0;
errors += hSpi->take(100);
errors += hDcrsPin->reset();
errors += hNssPin->reset();
txBuffer[0] = command;
errors += hSpi->trx(txBuffer, rxBuffer, 5);
errors += hNssPin->set();
errors += hSpi->give();
if(reg != nullptr){
*reg = (((uint32_t)rxBuffer[1])<<17) + (((uint32_t)rxBuffer[2])<<9) + (((uint32_t)rxBuffer[3])<<1) + (((uint32_t)rxBuffer[4])>>7);
}
return errors;
}
int32_t ILI9341::readReg32(uint8_t command, uint32_t* reg) {
int32_t errors = 0;
errors += hSpi->take(100);
errors += hDcrsPin->reset();
errors += hNssPin->reset();
txBuffer[0] = command;
errors += hSpi->trx(txBuffer, rxBuffer, 6);
errors += hNssPin->set();
errors += hSpi->give();
if(reg != nullptr){
*reg = (((uint32_t)rxBuffer[1])<<25) + (((uint32_t)rxBuffer[2])<<17) + (((uint32_t)rxBuffer[3])<<9) + (((uint32_t)rxBuffer[4])<<1) + (((uint32_t)rxBuffer[5])>>7);
}
return errors;
}
int32_t ILI9341::writeBuffer(uint8_t command, uint8_t* buffer, uint32_t length) {
int32_t errors = 0;
txBuffer[0] = command;
if(length>0){
memcpy(txBuffer+1, buffer, length);
}
errors += hSpi->take(100);
errors += hDcrsPin->reset();
errors += hNssPin->reset();
errors += hSpi->transmit(txBuffer, 1);
if(length>0){
errors += hDcrsPin->set();
errors += hSpi->transmit(txBuffer+1, length);
errors += hDcrsPin->reset();
}
errors += hNssPin->set();
errors += hSpi->give();
return errors;
} }

View File

@@ -21,11 +21,17 @@ public:
virtual ~ILI9341(); virtual ~ILI9341();
int32_t init(); int32_t init();
private: private:
int32_t readReg8(uint8_t command, uint8_t* reg);
int32_t readReg24(uint8_t command, uint32_t* reg);
int32_t readReg32(uint8_t command, uint32_t* reg);
int32_t writeBuffer(uint8_t command, uint8_t* buffer, uint32_t length);
SPI_Peripheral* hSpi; SPI_Peripheral* hSpi;
GPIO_Pin* hNssPin; GPIO_Pin* hNssPin;
GPIO_Pin* hResetPin; GPIO_Pin* hResetPin;
GPIO_Pin* hDcrsPin; GPIO_Pin* hDcrsPin;
PWM_Pin* hLedPwm; PWM_Pin* hLedPwm;
uint8_t txBuffer[16384];
uint8_t rxBuffer[16384];
}; };
#endif /* SRC_COMPONENTS_ILI9341_HPP_ */ #endif /* SRC_COMPONENTS_ILI9341_HPP_ */

View File

@@ -51,7 +51,7 @@
osThreadId_t defaultTaskHandle; osThreadId_t defaultTaskHandle;
const osThreadAttr_t defaultTask_attributes = { const osThreadAttr_t defaultTask_attributes = {
.name = "defaultTask", .name = "defaultTask",
.stack_size = 128 * 4, .stack_size = 1024 * 4,
.priority = (osPriority_t) osPriorityNormal, .priority = (osPriority_t) osPriorityNormal,
}; };

View File

@@ -25,8 +25,9 @@ Dma.SPI5_TX.1.PeriphDataAlignment=DMA_PDATAALIGN_BYTE
Dma.SPI5_TX.1.PeriphInc=DMA_PINC_DISABLE Dma.SPI5_TX.1.PeriphInc=DMA_PINC_DISABLE
Dma.SPI5_TX.1.Priority=DMA_PRIORITY_LOW Dma.SPI5_TX.1.Priority=DMA_PRIORITY_LOW
Dma.SPI5_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode Dma.SPI5_TX.1.RequestParameters=Instance,Direction,PeriphInc,MemInc,PeriphDataAlignment,MemDataAlignment,Mode,Priority,FIFOMode
FREERTOS.IPParameters=Tasks01,configMAX_TASK_NAME_LEN,configUSE_NEWLIB_REENTRANT FREERTOS.FootprintOK=true
FREERTOS.Tasks01=defaultTask,24,128,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL FREERTOS.IPParameters=Tasks01,configMAX_TASK_NAME_LEN,configUSE_NEWLIB_REENTRANT,FootprintOK
FREERTOS.Tasks01=defaultTask,24,1024,StartDefaultTask,Default,NULL,Dynamic,NULL,NULL
FREERTOS.configMAX_TASK_NAME_LEN=32 FREERTOS.configMAX_TASK_NAME_LEN=32
FREERTOS.configUSE_NEWLIB_REENTRANT=1 FREERTOS.configUSE_NEWLIB_REENTRANT=1
File.Version=6 File.Version=6