Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 15:45:59 +01:00
Code Issues Projects Releases Wiki Activity

2018-07-31 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Refactored 'RDMacro' to handle UTF-8 strings correctly.
This commit is contained in:
Fred Gleason
2018-07-31 12:54:08 -04:00
parent dbb0d9c415
commit 26c29e1d4e
47 changed files with 676 additions and 686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ripcd/livewire_lwrpgpio.cpp
View File

@@ -101,15 +101,15 @@ void LiveWireLwrpGpio::processCommand(RDMacro *cmd)
case RDMacro::GO:
if((cmd->argQuantity()!=5)||
(cmd->arg(2).toInt()<1)||
((cmd->arg(1).toString().lower()!="i")&&
(cmd->arg(1).toString().lower()!="o"))) {
((cmd->arg(1).lower()!="i")&&
(cmd->arg(1).lower()!="o"))) {
cmd->acknowledge(false);
emit rmlEcho(cmd);
return;
}
if(((cmd->arg(1).toString().lower()=="i")&&
if(((cmd->arg(1).lower()=="i")&&
(cmd->arg(2).toUInt()>gpio_gpi_limit))||
((cmd->arg(1).toString().lower()=="o")&&
((cmd->arg(1).lower()=="o")&&
(cmd->arg(2).toUInt()>gpio_gpo_limit))) {
cmd->acknowledge(false);
emit rmlEcho(cmd);
@@ -117,7 +117,7 @@ void LiveWireLwrpGpio::processCommand(RDMacro *cmd)
}
slot=(cmd->arg(2).toInt()-1)/5;
line=(cmd->arg(2).toInt()-1)%5;
if(cmd->arg(1).toString().lower()=="i") {
if(cmd->arg(1).lower()=="i") {
if(cmd->arg(3).toInt()==0) {
if(gpio_is_virtual) {
gpio_livewire->gpoReset(slot,line,cmd->arg(4).toInt());
@@ -135,7 +135,7 @@ void LiveWireLwrpGpio::processCommand(RDMacro *cmd)
}
}
}
if(cmd->arg(1).toString().lower()=="o") {
if(cmd->arg(1).lower()=="o") {
if(cmd->arg(3).toInt()==0) {
if(gpio_is_virtual) {
gpio_livewire->gpiReset(slot,line,cmd->arg(4).toInt());