MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RPi: Log refactor

Browse Source
This commit is contained in:
Marcelo Aquino
2016-10-18 16:55:47 -02:00
parent 75aad5de35
commit 2be804a1ef
13 changed files with 196 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/Linux/SerialPort.cpp
+16 -16
View File
@@ -39,7 +39,7 @@ SerialPort::SerialPort(const char *port, bool isPty) : serialPort(std::string(po
void SerialPort::begin(int bauds)
{
if (!open(bauds)) {
mys_log(LOG_ERR, "Failed to open serial port.\n");
logError("Failed to open serial port.\n");
exit(1);
}
}
@@ -52,29 +52,29 @@ bool SerialPort::open(int bauds)
if (isPty) {
sd = posix_openpt(O_RDWR | O_NOCTTY | O_NDELAY);
if (sd < 0) {
mys_log(LOG_ERR, "Couldn't open a PTY: %s\n", strerror(errno));
logError("Couldn't open a PTY: %s\n", strerror(errno));
return false;
}
if (grantpt(sd) != 0) {
mys_log(LOG_ERR, "Couldn't grant permission to the PTY: %s\n", strerror(errno));
logError("Couldn't grant permission to the PTY: %s\n", strerror(errno));
return false;
}
if (unlockpt(sd) != 0) {
mys_log(LOG_ERR, "Couldn't unlock the PTY: %s\n", strerror(errno));
logError("Couldn't unlock the PTY: %s\n", strerror(errno));
return false;
}
/* create a symlink with predictable name to the PTY device */
unlink(serialPort.c_str()); // remove the symlink if it already exists
if (symlink(ptsname(sd), serialPort.c_str()) != 0) {
mys_log(LOG_ERR, "Couldn't create a symlink '%s' to PTY! (%d) %s\n", serialPort.c_str(), errno, strerror(errno));
logError("Couldn't create a symlink '%s' to PTY! (%d) %s\n", serialPort.c_str(), errno, strerror(errno));
return false;
}
} else {
if ((sd = ::open(serialPort.c_str(), O_RDWR | O_NOCTTY | O_NDELAY)) == -1) {
mys_log(LOG_ERR, "Unable to open the serial port %s\n", serialPort.c_str());
logError("Unable to open the serial port %s\n", serialPort.c_str());
return false;
}
@@ -104,7 +104,7 @@ bool SerialPort::open(int bauds)
// Get the current options of the port
if (tcgetattr(sd, &options) < 0) {
mys_log(LOG_ERR, "Couldn't get term attributes: %s\n", strerror(errno));
logError("Couldn't get term attributes: %s\n", strerror(errno));
return false;
}
@@ -127,13 +127,13 @@ bool SerialPort::open(int bauds)
// Set parameters
if (tcsetattr(sd, TCSANOW, &options) < 0) {
mys_log(LOG_ERR, "Couldn't set term attributes: %s\n", strerror(errno));
logError("Couldn't set term attributes: %s\n", strerror(errno));
return false;
}
// flush
if (tcflush(sd, TCIOFLUSH) < 0) {
mys_log(LOG_ERR, "Couldn't flush serial: %s\n", strerror(errno));
logError("Couldn't flush serial: %s\n", strerror(errno));
return false;
}
@@ -152,7 +152,7 @@ bool SerialPort::setGroupPerm(const char *groupName)
if (sd != -1 && groupName != NULL) {
devGrp = getgrnam(groupName);
if (devGrp == NULL) {
mys_log(LOG_ERR, "getgrnam: %s failed. (%d) %s\n", groupName, errno, strerror(errno));
logError("getgrnam: %s failed. (%d) %s\n", groupName, errno, strerror(errno));
return false;
}
@@ -164,13 +164,13 @@ bool SerialPort::setGroupPerm(const char *groupName)
ret = chown(dev, -1, devGrp->gr_gid);
if (ret == -1) {
mys_log(LOG_ERR, "Could not change PTY owner! (%d) %s\n", errno, strerror(errno));
logError("Could not change PTY owner! (%d) %s\n", errno, strerror(errno));
return false;
}
ret = chmod(dev, ttyPermissions);
if (ret != 0) {
mys_log(LOG_ERR, "Could not change PTY permissions! (%d) %s\n", errno, strerror(errno));
logError("Could not change PTY permissions! (%d) %s\n", errno, strerror(errno));
return false;
}
@@ -184,7 +184,7 @@ int SerialPort::available()
int nbytes = 0;
if (ioctl(sd, FIONREAD, &nbytes) < 0) {
mys_log(LOG_ERR, "Failed to get byte count on serial.\n");
logError("Failed to get byte count on serial.\n");
exit(-1);
}
return nbytes;
@@ -196,7 +196,7 @@ int SerialPort::read()
int ret = ::read(sd, &c, 1);
if (ret < 0) {
mys_log(LOG_ERR, "Serial - read failed: %s\n", strerror(errno));
logError("Serial - read failed: %s\n", strerror(errno));
} else if (ret == 1) {
return c;
}
@@ -208,7 +208,7 @@ size_t SerialPort::write(uint8_t b)
{
int ret = ::write(sd, &b, 1);
if (ret < 0) {
mys_log(LOG_ERR, "Serial - write failed: %s\n", strerror(errno));
logError("Serial - write failed: %s\n", strerror(errno));
}
return ret;
}
@@ -217,7 +217,7 @@ size_t SerialPort::write(const uint8_t *buffer, size_t size)
{
int ret = ::write(sd, buffer, size);
if (ret < 0) {
mys_log(LOG_ERR, "Serial - write failed: %s\n", strerror(errno));
logError("Serial - write failed: %s\n", strerror(errno));
}
return ret;
}