diff --git a/guh.pri b/guh.pri index c598d199..8f2cd2ac 100644 --- a/guh.pri +++ b/guh.pri @@ -2,7 +2,7 @@ GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" -# Enable coverage option +# Enable coverage option coverage { QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage -O0 LIBS += -lgcov diff --git a/plugins/deviceplugins/elro/devicepluginelro.cpp b/plugins/deviceplugins/elro/devicepluginelro.cpp index a0bebd85..57d0b02e 100644 --- a/plugins/deviceplugins/elro/devicepluginelro.cpp +++ b/plugins/deviceplugins/elro/devicepluginelro.cpp @@ -173,15 +173,15 @@ QList DevicePluginElro::supportedDevices() const deviceParamsSwitch.append(paramSwitch); paramSwitch = ParamType("channel5", QVariant::Bool); deviceParamsSwitch.append(paramSwitch); - paramSwitch = ParamType("channel6", QVariant::Bool); + paramSwitch = ParamType("A", QVariant::Bool); deviceParamsSwitch.append(paramSwitch); - paramSwitch = ParamType("channel7", QVariant::Bool); + paramSwitch = ParamType("B", QVariant::Bool); deviceParamsSwitch.append(paramSwitch); - paramSwitch = ParamType("channel8", QVariant::Bool); + paramSwitch = ParamType("C", QVariant::Bool); deviceParamsSwitch.append(paramSwitch); - paramSwitch = ParamType("channel9", QVariant::Bool); + paramSwitch = ParamType("D", QVariant::Bool); deviceParamsSwitch.append(paramSwitch); - paramSwitch = ParamType("channel10", QVariant::Bool); + paramSwitch = ParamType("E", QVariant::Bool); deviceParamsSwitch.append(paramSwitch); deviceClassElroSwitch.setParams(deviceParamsSwitch); diff --git a/tests/scripts/addconfigureddevice.sh b/tests/scripts/addconfigureddevice.sh index 709edeb5..19c8b7f6 100755 --- a/tests/scripts/addconfigureddevice.sh +++ b/tests/scripts/addconfigureddevice.sh @@ -12,8 +12,8 @@ else # Adds an ELRO remote control on channel 00000 (echo '{"id":1, "method":"Devices.AddConfiguredDevice", "params":{"deviceClassId": "{d85c1ef4-197c-4053-8e40-707aa671d302}","deviceParams":{"channel1":"false", "channel2":"false", "channel3":"false", "channel4": "false", "channel5":"false" }}}'; sleep 1) | nc $1 1234 elif [ $2 == "elroswitch" ]; then - # Adds a ELRO power switch on channel 00000 and group E - (echo '{"id":1, "method":"Devices.AddConfiguredDevice", "params":{"deviceClassId": "{308ae6e6-38b3-4b3a-a513-3199da2764f8}","deviceParams":{"channel1":"false","channel2":"false", "channel3":"false", "channel4": "false","channel5":"false","A":"false","B":"true","C":"false","D":"false","E":"false" }}}'; sleep 1) | nc $1 1234 + # Adds a ELRO power switch on channel 00000 and group D + (echo '{"id":1, "method":"Devices.AddConfiguredDevice", "params":{"deviceClassId": "{308ae6e6-38b3-4b3a-a513-3199da2764f8}","deviceParams":{"channel1":"false","channel2":"false", "channel3":"false", "channel4": "false","channel5":"false","A":"true","B":"false","C":"false","D":"false","E":"false" }}}'; sleep 1) | nc $1 1234 elif [ $2 == "intertechnoremote" ]; then # Adds an intertechno remote control (echo '{"id":1, "method":"Devices.AddConfiguredDevice", "params":{"deviceClassId": "{ab73ad2f-6594-45a3-9063-8f72d365c5e5}","deviceParams":{"familyCode":"J"}}}'; sleep 1) | nc $1 1234