tom/doorlockd-mirror
1
0
Fork 0
mirror of https://github.com/binary-kitchen/doorlockd synced 2024-12-22 10:24:26 +01:00
Code Issues Releases Wiki Activity

Door: fix coding style

Browse Source 
Consequently use _ for private member variables/functions.

Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de>
This commit is contained in:
Ralf Ramsauer 2016-07-20 19:59:09 +02:00
parent f713ef6124
commit 573d9e7c65
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doorlockd/lib/door.cpp
View File

@ -38,7 +38,7 @@ Door::~Door()
_ioThread.join();
}
bool Door::readByte(char &byte, std::chrono::milliseconds timeout)
bool Door::_readByte(char &byte, std::chrono::milliseconds timeout)
{
std::unique_lock<std::mutex> lock(_receiveLock);
_receivedCondition.wait_for(lock, timeout);
@ -156,17 +156,17 @@ void Door::unlock()
while (_state == State::Unlocked) {
if (_state == State::Unlocked) {
writeCMD(DOOR_CMD_UNLOCK);
_writeCMD(DOOR_CMD_UNLOCK);
if (_schnapper) {
_schnapper = false;
writeCMD(DOOR_CMD_SCHNAPER);
_writeCMD(DOOR_CMD_SCHNAPER);
}
}
_heartbeatCondition.wait_for(lock, Milliseconds(400));
}
writeCMD(DOOR_CMD_LOCK);
_writeCMD(DOOR_CMD_LOCK);
});
_logger(LogLevel::notice, "Door opened");
@ -176,13 +176,13 @@ void Door::unlock()
system(POST_UNLOCK_SCRIPT);
}
bool Door::writeCMD(char c)
bool Door::_writeCMD(char c)
{
std::lock_guard<std::mutex> l(_serialMutex);
_port.write_some(boost::asio::buffer(&c, sizeof(c)));
char response;
if (readByte(response, Milliseconds(100)))
if (_readByte(response, Milliseconds(100)))
{
if (c != response) {
_logger(LogLevel::error, "Sent command '%c' but got response '%c'", c, response);

4
doorlockd/lib/door.h
View File

@ -69,9 +69,9 @@ private:
Logger &_logger;
// Writed command to AVR board
bool writeCMD(char c);
bool _writeCMD(char c);
// Receives one byte and returns true or returns false on timeout
bool readByte(char &byte, Milliseconds timeout);
bool _readByte(char &byte, Milliseconds timeout);
};
#endif