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

at42qt1070: code style changes

Browse Source 
Run .clang-format on the header and source files
Add missing braces

Signed-off-by: Wouter van Verre <wouter.van.verre@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Wouter van Verre
2015-06-16 12:05:31 +01:00
committed by Mihai Tudor Panu
parent 32921ff2b1
commit f64c710c12
2 changed files with 174 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/at42qt1070/at42qt1070.cxx
View File

@@ -35,111 +35,110 @@ using namespace std;
AT42QT1070::AT42QT1070(int bus, uint8_t address)
{
m_addr = address;
m_addr = address;
// setup our i2c link
if ( !(m_i2c = mraa_i2c_init(bus)) )
{
cerr << __FUNCTION__ << ": mraa_i2c_init() failed." << endl;
return;
}
mraa_result_t rv;
if ( (rv = mraa_i2c_address(m_i2c, m_addr)) != MRAA_SUCCESS)
{
cerr << __FUNCTION__ << ": Could not initialize i2c bus. " << endl;
mraa_result_print(rv);
return;
// setup our i2c link
if (!(m_i2c = mraa_i2c_init(bus))) {
cerr << __FUNCTION__ << ": mraa_i2c_init() failed." << endl;
return;
}
m_buttonStates = false;
m_calibrating = false;
m_overflow = false;
mraa_result_t rv;
if ((rv = mraa_i2c_address(m_i2c, m_addr)) != MRAA_SUCCESS) {
cerr << __FUNCTION__ << ": Could not initialize i2c bus. " << endl;
mraa_result_print(rv);
return;
}
m_buttonStates = false;
m_calibrating = false;
m_overflow = false;
}
AT42QT1070::~AT42QT1070()
{
mraa_i2c_stop(m_i2c);
mraa_i2c_stop(m_i2c);
}
bool AT42QT1070::writeByte(uint8_t reg, uint8_t byte)
bool
AT42QT1070::writeByte(uint8_t reg, uint8_t byte)
{
mraa_result_t rv = mraa_i2c_write_byte_data(m_i2c, byte, reg);
mraa_result_t rv = mraa_i2c_write_byte_data(m_i2c, byte, reg);
if (rv != MRAA_SUCCESS)
{
cerr << __FUNCTION__ << ": mraa_i2c_write_byte() failed." << endl;
mraa_result_print(rv);
return false;
if (rv != MRAA_SUCCESS) {
cerr << __FUNCTION__ << ": mraa_i2c_write_byte() failed." << endl;
mraa_result_print(rv);
return false;
}
return true;
return true;
}
bool AT42QT1070::writeWord(uint8_t reg, uint16_t word)
bool
AT42QT1070::writeWord(uint8_t reg, uint16_t word)
{
mraa_result_t rv = mraa_i2c_write_word_data(m_i2c, word, reg);
mraa_result_t rv = mraa_i2c_write_word_data(m_i2c, word, reg);
if (rv != MRAA_SUCCESS)
{
cerr << __FUNCTION__ << ": mraa_i2c_write_word() failed." << endl;
mraa_result_print(rv);
return false;
if (rv != MRAA_SUCCESS) {
cerr << __FUNCTION__ << ": mraa_i2c_write_word() failed." << endl;
mraa_result_print(rv);
return false;
}
return true;
return true;
}
uint8_t AT42QT1070::readByte(uint8_t reg)
uint8_t
AT42QT1070::readByte(uint8_t reg)
{
return mraa_i2c_read_byte_data(m_i2c, reg);
return mraa_i2c_read_byte_data(m_i2c, reg);
}
uint16_t AT42QT1070::readWord(uint8_t reg)
uint16_t
AT42QT1070::readWord(uint8_t reg)
{
return mraa_i2c_read_word_data(m_i2c, reg);
return mraa_i2c_read_word_data(m_i2c, reg);
}
void AT42QT1070::updateState()
void
AT42QT1070::updateState()
{
uint8_t stat = readByte(REG_DETSTATUS);
uint8_t stat = readByte(REG_DETSTATUS);
// if we are calibrating, don't change anything
if (stat & DET_CALIBRATE)
{
m_calibrating = true;
return;
// if we are calibrating, don't change anything
if (stat & DET_CALIBRATE) {
m_calibrating = true;
return;
} else {
m_calibrating = false;
}
else
m_calibrating = false;
if (stat & DET_OVERFLOW)
m_overflow = true;
else
m_overflow = false;
if (stat & DET_OVERFLOW)
m_overflow = true;
else
m_overflow = false;
// if a touch is occurring, read the button states
if (stat & DET_TOUCH)
{
uint8_t keys = readByte(REG_KEYSTATUS);
// high bit is reserved, filter it out
m_buttonStates = keys & ~0x80;
// if a touch is occurring, read the button states
if (stat & DET_TOUCH) {
uint8_t keys = readByte(REG_KEYSTATUS);
// high bit is reserved, filter it out
m_buttonStates = keys & ~0x80;
} else {
m_buttonStates = 0;
}
else
m_buttonStates = 0;
}
bool AT42QT1070::reset()
bool
AT42QT1070::reset()
{
// write a non-zero value to the reset register
return writeByte(REG_RESET, 0xff);
// write a non-zero value to the reset register
return writeByte(REG_RESET, 0xff);
}
bool AT42QT1070::calibrate()
bool
AT42QT1070::calibrate()
{
// write a non-zero value to the calibrate register
return writeByte(REG_CALIBRATE, 0xff);
// write a non-zero value to the calibrate register
return writeByte(REG_CALIBRATE, 0xff);
}