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

* 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

View File

@@ -108,8 +108,8 @@ void LocalGpio::processCommand(RDMacro *cmd)
switch(cmd->command()) {
case RDMacro::GO:
if((!gpio_open)||(cmd->argQuantity()!=5)||
((cmd->arg(1).toString().lower()!="i")&&
(cmd->arg(1).toString().lower()!="o"))||
((cmd->arg(1).lower()!="i")&&
(cmd->arg(1).lower()!="o"))||
(cmd->arg(2).toInt()<1)||(cmd->arg(2).toInt()>gpio_gpos)||
((cmd->arg(3).toInt()!=1)&&(cmd->arg(3).toInt()!=0)&&
(cmd->arg(3).toInt()!=-1))||(cmd->arg(4).toInt()<0)) {
@@ -117,7 +117,7 @@ void LocalGpio::processCommand(RDMacro *cmd)
emit rmlEcho(cmd);
return;
}
if(cmd->arg(1).toString().lower()=="i") {
if(cmd->arg(1).lower()=="i") {
if(cmd->arg(3).toInt()==0) {
emit gpiChanged(gpio_matrix,cmd->arg(2).toInt()-1,false);
gpio_gpi_mask[cmd->arg(2).toInt()-1]=true;
@@ -143,7 +143,7 @@ void LocalGpio::processCommand(RDMacro *cmd)
emit rmlEcho(cmd);
return;
}
if(cmd->arg(1).toString().lower()=="o") {
if(cmd->arg(1).lower()=="o") {
if(cmd->arg(3).toInt()==0) {
gpio_gpio->gpoReset(cmd->arg(2).toInt()-1,cmd->arg(4).toInt());
}