alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-02 01:41:12 +03:00
Code Issues 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

45
src/lpd8806/lpd8806.cxx
View File

@ -32,39 +32,27 @@
using namespace upm;
LPD8806::LPD8806 (uint16_t pixelCount, uint8_t csn) {
mraa_result_t error = MRAA_SUCCESS;
LPD8806::LPD8806 (uint16_t pixelCount, uint8_t csn) : m_csnPinCtx(csn), m_spi(0) {
mraa::Result error = mraa::SUCCESS;
m_name = "LPD8806";
m_pixels = NULL;
m_csnPinCtx = mraa_gpio_init (csn);
if (m_csnPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": GPIO failed to initialize");
}
error = mraa_gpio_dir (m_csnPinCtx, MRAA_GPIO_OUT);
if (error != MRAA_SUCCESS) {
error = m_csnPinCtx.dir (mraa::DIR_OUT);
if (error != mraa::SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": GPIO failed to set direction");
}
CSOff ();
m_spi = mraa_spi_init (0);
if (m_spi == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": SPI failed to initialize");
}
// set spi mode to mode2 (CPOL = 0, CPHA = 0)
mraa_spi_mode (m_spi, MRAA_SPI_MODE0);
m_spi.mode (mraa::SPI_MODE0);
CSOn ();
// issue initial latch/reset to strip:
for (uint16_t i = ((pixelCount + 31) / 32); i > 0; i--) {
mraa_spi_write (m_spi, 0);
m_spi.writeByte (0);
}
CSOff ();
@ -85,20 +73,9 @@ LPD8806::LPD8806 (uint16_t pixelCount, uint8_t csn) {
}
LPD8806::~LPD8806() {
mraa_result_t error = MRAA_SUCCESS;
if (m_pixels) {
free(m_pixels);
}
error = mraa_spi_stop(m_spi);
if (error != MRAA_SUCCESS) {
mraa_result_print(error);
}
error = mraa_gpio_close (m_csnPinCtx);
if (error != MRAA_SUCCESS) {
mraa_result_print(error);
}
}
void
@ -117,7 +94,7 @@ LPD8806::show (void) {
uint16_t byte = (m_pixelsCount * 3) + ((m_pixelsCount + 31) / 32);
while (byte--) {
mraa_spi_write (m_spi, *ptr++);
m_spi.writeByte (*ptr++);
}
}
@ -132,12 +109,12 @@ LPD8806::getStripLength (void) {
* **************
*/
mraa_result_t
mraa::Result
LPD8806::CSOn () {
return mraa_gpio_write (m_csnPinCtx, HIGH);
return m_csnPinCtx.write (HIGH);
}
mraa_result_t
mraa::Result
LPD8806::CSOff () {
return mraa_gpio_write (m_csnPinCtx, LOW);
return m_csnPinCtx.write (LOW);
}

26
src/lpd8806/lpd8806.h
View File

@ -24,9 +24,18 @@
#pragma once
#include <string>
#include <mraa/aio.h>
#include <mraa/gpio.h>
#include <mraa/spi.h>
#include <mraa/aio.hpp>
#ifdef SWIGJAVA
#undef SWIGJAVA
#include <mraa/gpio.hpp>
#define SWIGJAVA
#else
#include <mraa/gpio.hpp>
#endif
#include <mraa/spi.hpp>
#define HIGH 1
#define LOW 0
@ -66,7 +75,8 @@ class LPD8806 {
LPD8806 (uint16_t pixelCount, uint8_t csn);
/**
* LPD8806 object destructor; basically, it closes the SPI and the GPIO.
* LPD8806 object destructor; basically, it frees the allocated
* pixel buffer.
*/
~LPD8806 ();
@ -97,8 +107,8 @@ class LPD8806 {
}
private:
std::string m_name;
mraa_spi_context m_spi;
mraa_gpio_context m_csnPinCtx;
mraa::Spi m_spi;
mraa::Gpio m_csnPinCtx;
uint8_t* m_pixels;
uint8_t m_pixelsCount;
@ -109,12 +119,12 @@ class LPD8806 {
/**
* Sets the chip select pin to LOW
*/
mraa_result_t CSOn ();
mraa::Result CSOn ();
/**
* Sets the chip select pin to HIGH
*/
mraa_result_t CSOff ();
mraa::Result CSOff ();
};
}