ETM-Schurig
/
nymea-gpio
mirror of https://github.com/nymea/nymea-gpio
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge PR #7: Fix active low logic

default-to-active-high
Jenkins nymea 2021-11-07 00:39:47 +01:00
parent cd11846be4 80dd57a8ea
commit 562f62004e
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-gpio/gpio.cpp
View File

@ -346,9 +346,9 @@ bool Gpio::setActiveLow(bool activeLow)
QTextStream out(&activeLowFile); QTextStream out(&activeLowFile);
if (activeLow) { if (activeLow) {
out << "0";
} else {
out << "1"; out << "1";
} else {
out << "0";
} }
activeLowFile.close(); activeLowFile.close();
@ -369,7 +369,7 @@ bool Gpio::activeLow()
in >> value; in >> value;
activeLowFile.close(); activeLowFile.close();
if (value == "0") if (value == "1")
return true; return true;
return false; return false;

16
nymea-gpio-tool/main.cpp
View File

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
QCommandLineOption monitorOption(QStringList() << "m" << "monitor", "Monitor the given GPIO. The GPIO will automatically configured as input and print any change regarding to the given interrupt behaviour."); QCommandLineOption monitorOption(QStringList() << "m" << "monitor", "Monitor the given GPIO. The GPIO will automatically configured as input and print any change regarding to the given interrupt behaviour.");
parser.addOption(monitorOption); parser.addOption(monitorOption);
QCommandLineOption activeLowOption(QStringList() << "a" << "active-low", "Set the GPIO to active low. Allowerd values are: [0, 1]", "VALUE"); QCommandLineOption activeLowOption(QStringList() << "l" << "active-low", "Configure the pin as active low (default is active high).");
parser.addOption(activeLowOption); parser.addOption(activeLowOption);
parser.process(application); parser.process(application);
@ -102,17 +102,7 @@ int main(int argc, char *argv[])
} }
} }
bool activeLow = true; bool activeLow = parser.isSet(activeLowOption);
if (parser.isSet(activeLowOption)) {
if (parser.value(activeLowOption) == "1") {
activeLow = false;
} else if (parser.value(activeLowOption) == "0") {
activeLow = true;
} else {
qCritical() << "Invalid active low parameter" << parser.value(activeLowOption) << "passed. Valid options are [0, 1].";
return EXIT_FAILURE;
}
}
Gpio::Value value = Gpio::ValueInvalid; Gpio::Value value = Gpio::ValueInvalid;
if (parser.isSet(valueOption)) { if (parser.isSet(valueOption)) {
@ -171,7 +161,7 @@ int main(int argc, char *argv[])
// Inform about interrupt // Inform about interrupt
QObject::connect(monitor, &GpioMonitor::interruptOccurred, [gpioNumber](bool value) { QObject::connect(monitor, &GpioMonitor::interruptOccurred, [gpioNumber](bool value) {
qDebug() << "GPIO" << gpioNumber << "interrupt occured. Current value:" << (value ? "1" : "0"); qDebug() << "GPIO" << gpioNumber << "interrupt occurred. Current value:" << (value ? "1" : "0");
}); });
// Enable the monitor // Enable the monitor