Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

java: changed some C types to C++ types

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>

Conflicts:
	src/mma7455/mma7455.cxx
	src/mma7455/mma7455.h
	src/sm130/sm130.cxx
	src/sm130/sm130.h
This commit is contained in:
Andrei Vasiliu
2015-09-02 14:56:13 +03:00
committed by Mihai Tudor Panu
parent b8835958e2
commit ab730038fd
46 changed files with 731 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/st7735/st7735.h
View File

@@ -27,9 +27,19 @@
#pragma once
#include <string>
#include <mraa/aio.h>
#include <mraa/gpio.h>
#include <mraa/spi.h>
#include <mraa/aio.hpp>
#include <mraa/common.hpp>
#ifdef SWIGJAVA
#undef SWIGJAVA
#include <mraa/gpio.hpp>
#define SWIGJAVA
#else
#include <mraa/gpio.hpp>
#endif
#include <mraa/spi.hpp>
#include <gfx.h>
#define INITR_GREENTAB 0x0
@@ -526,11 +536,6 @@ class ST7735 : public GFX {
*/
ST7735 (uint8_t csLCD, uint8_t cSD, uint8_t rs, uint8_t rst);
/**
* ST7735 object destructor
*/
~ST7735 ();
/**
* Returns the name of the component
*/
@@ -598,45 +603,45 @@ class ST7735 : public GFX {
/**
* LCD chip select is LOW
*/
mraa_result_t lcdCSOn ();
mraa::Result lcdCSOn ();
/**
* LCD chip select is HIGH
*/
mraa_result_t lcdCSOff ();
mraa::Result lcdCSOff ();
/**
* CD card chip select is LOW
*/
mraa_result_t sdCSOn ();
mraa::Result sdCSOn ();
/**
* CD card select is HIGH
*/
mraa_result_t sdCSOff ();
mraa::Result sdCSOff ();
/**
* Data select is HIGH
*/
mraa_result_t rsHIGH ();
mraa::Result rsHIGH ();
/**
* Data select is LOW
*/
mraa_result_t rsLOW ();
mraa::Result rsLOW ();
uint8_t m_map[160 * 128 * 2]; /**< Screens buffer */
private:
mraa_spi_context m_spi;
mraa::Spi m_spi;
uint8_t m_csLCD;
uint8_t m_cSD;
uint8_t m_rST;
uint8_t m_rS;
mraa_gpio_context m_csLCDPinCtx;
mraa_gpio_context m_cSDPinCtx;
mraa_gpio_context m_rSTPinCtx;
mraa_gpio_context m_rSPinCtx;
mraa::Gpio m_csLCDPinCtx;
mraa::Gpio m_cSDPinCtx;
mraa::Gpio m_rSTPinCtx;
mraa::Gpio m_rSPinCtx;
uint8_t m_spiBuffer[32];