misc: Minor fixes due to previous rebase

Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu
2015-09-18 16:33:53 +03:00
committed by Mihai Tudor Panu
parent 428bac360b
commit 5e72c4febd
13 changed files with 14 additions and 153 deletions

View File

@ -54,42 +54,7 @@ ST7735::initModule () {
m_height = 160;
m_width = 128;
m_csLCDPinCtx = mraa_gpio_init (m_csLCD);
if (m_csLCDPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(csLCD) failed, invalid pin?");
return;
}
m_cSDPinCtx = mraa_gpio_init (m_cSD);
if (m_cSDPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(cSD) failed, invalid pin?");
return;
}
m_rSTPinCtx = mraa_gpio_init (m_rST);
if (m_rSTPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(rST) failed, invalid pin?");
return;
}
m_rSPinCtx = mraa_gpio_init (m_rS);
if (m_rSPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(rS) failed, invalid pin?");
return;
}
if ( !(m_spi = mraa_spi_init (0)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_spi_init() failed");
return;
}
mraa_spi_frequency(m_spi, 15 * 1000000);
m_spi.frequency(15 * 1000000);
error = m_csLCDPinCtx.dir(mraa::DIR_OUT);
if (error != mraa::SUCCESS) {