diff --git a/libnymea-core/hardware/zigbee/zigbeehardwareresourceimplementation.cpp b/libnymea-core/hardware/zigbee/zigbeehardwareresourceimplementation.cpp index edf1172b..a893897b 100644 --- a/libnymea-core/hardware/zigbee/zigbeehardwareresourceimplementation.cpp +++ b/libnymea-core/hardware/zigbee/zigbeehardwareresourceimplementation.cpp @@ -69,12 +69,12 @@ void ZigbeeHardwareResourceImplementation::setZigbeeNetwork(ZigbeeNetwork *netwo void ZigbeeHardwareResourceImplementation::setEnabled(bool enabled) { - qCDebug(dcZigbeeHardwareResource()) << "Set" << (enabled ? "enabled" : "disabled"); + qCDebug(dcZigbeeResource()) << "Set" << (enabled ? "enabled" : "disabled"); if (m_enabled && enabled) { - qCDebug(dcZigbeeHardwareResource()) << "Already enabled."; + qCDebug(dcZigbeeResource()) << "Already enabled."; return; } else if (!m_enabled && !enabled) { - qCDebug(dcZigbeeHardwareResource()) << "Already disabled."; + qCDebug(dcZigbeeResource()) << "Already disabled."; return; } @@ -93,15 +93,15 @@ void ZigbeeHardwareResourceImplementation::setEnabled(bool enabled) void ZigbeeHardwareResourceImplementation::onZigbeeNetworkStateChanged(ZigbeeNetwork::State state) { - qCDebug(dcZigbeeHardwareResource()) << "Network state changed" << state; + qCDebug(dcZigbeeResource()) << "Network state changed" << state; } bool ZigbeeHardwareResourceImplementation::enable() { - qCDebug(dcZigbeeHardwareResource()) << "Enable hardware resource"; + qCDebug(dcZigbeeResource()) << "Enable hardware resource"; if (!m_zigbeeNetwork) { - qCDebug(dcZigbeeHardwareResource()) << "There is no zigbee network configured as hardware resource"; + qCDebug(dcZigbeeResource()) << "There is no zigbee network configured as hardware resource"; } else { // TODO: start network } @@ -111,9 +111,9 @@ bool ZigbeeHardwareResourceImplementation::enable() bool ZigbeeHardwareResourceImplementation::disable() { - qCDebug(dcZigbeeHardwareResource()) << "Disable hardware resource"; + qCDebug(dcZigbeeResource()) << "Disable hardware resource"; if (!m_zigbeeNetwork) { - qCDebug(dcZigbeeHardwareResource()) << "There is no zigbee network configured as hardware resource"; + qCDebug(dcZigbeeResource()) << "There is no zigbee network configured as hardware resource"; } // TODO: stop network diff --git a/libnymea/loggingcategories.cpp b/libnymea/loggingcategories.cpp index 303e60a2..c40c2141 100644 --- a/libnymea/loggingcategories.cpp +++ b/libnymea/loggingcategories.cpp @@ -76,7 +76,8 @@ NYMEA_LOGGING_CATEGORY(dcBluetoothServerTraffic, "BluetoothServerTraffic") NYMEA_LOGGING_CATEGORY(dcMqtt, "Mqtt") NYMEA_LOGGING_CATEGORY(dcTranslations, "Translations") NYMEA_LOGGING_CATEGORY(dcI2C, "I2C") -NYMEA_LOGGING_CATEGORY(dcZigbeeHardwareResource, "ZigbeeHardwareResource") +NYMEA_LOGGING_CATEGORY(dcZigbee, "Zigbee") +NYMEA_LOGGING_CATEGORY(dcZigbeeResource, "ZigbeeResource") static QFile s_logFile; diff --git a/libnymea/loggingcategories.h b/libnymea/loggingcategories.h index 979173fb..ec0d5251 100644 --- a/libnymea/loggingcategories.h +++ b/libnymea/loggingcategories.h @@ -92,7 +92,7 @@ Q_DECLARE_LOGGING_CATEGORY(dcI2C) Q_DECLARE_LOGGING_CATEGORY(dcIntegrations) Q_DECLARE_LOGGING_CATEGORY(dcJsIntegrations) Q_DECLARE_LOGGING_CATEGORY(dcZigbee) -Q_DECLARE_LOGGING_CATEGORY(dcZigbeeHardwareResource) +Q_DECLARE_LOGGING_CATEGORY(dcZigbeeResource) /*