diff --git a/idm/idm.cpp b/idm/idm.cpp index 799a3de..f2377d5 100644 --- a/idm/idm.cpp +++ b/idm/idm.cpp @@ -168,7 +168,7 @@ void Idm::onReceivedHoldingRegister(int slaveAddress, int modbusRegister, const void Idm::onModbusError() { - qCDebug(dcIdm()) << "iDM: Received modbus error"; + qCDebug(dcIdm()) << "iDM: Received modbus error" << m_modbusMaster->errorString(); m_idmInfo.connected = false; emit statusUpdated(m_idmInfo); } diff --git a/idm/translations/3968d86d-d51a-4ad1-a185-91faa017e38f-en_US.ts b/idm/translations/3968d86d-d51a-4ad1-a185-91faa017e38f-en_US.ts new file mode 100644 index 0000000..3511917 --- /dev/null +++ b/idm/translations/3968d86d-d51a-4ad1-a185-91faa017e38f-en_US.ts @@ -0,0 +1,200 @@ + + + + + Idm + + + + Connected + The name of the ParamType (ThingClass: navigator2, EventType: connected, ID: {cfd71e64-b666-45ef-8db0-8213acd82c5f}) +---------- +The name of the StateType ({cfd71e64-b666-45ef-8db0-8213acd82c5f}) of ThingClass navigator2 + + + + + Connected changed + The name of the EventType ({cfd71e64-b666-45ef-8db0-8213acd82c5f}) of ThingClass navigator2 + + + + + + Current power consumption + The name of the ParamType (ThingClass: navigator2, EventType: currentPowerConsumptionHeatPump, ID: {b98fb325-100d-4eae-bf8d-97e8f7e1eb00}) +---------- +The name of the StateType ({b98fb325-100d-4eae-bf8d-97e8f7e1eb00}) of ThingClass navigator2 + + + + + Current power consumption heat pump changed + The name of the EventType ({b98fb325-100d-4eae-bf8d-97e8f7e1eb00}) of ThingClass navigator2 + + + + + + Error + The name of the ParamType (ThingClass: navigator2, EventType: error, ID: {49fd83ee-ddf3-4477-9ee4-e01c53283b43}) +---------- +The name of the StateType ({49fd83ee-ddf3-4477-9ee4-e01c53283b43}) of ThingClass navigator2 + + + + + Error changed + The name of the EventType ({49fd83ee-ddf3-4477-9ee4-e01c53283b43}) of ThingClass navigator2 + + + + + IP address + The name of the ParamType (ThingClass: navigator2, Type: thing, ID: {05714e5c-d66a-4095-bbff-a0eb96fb035b}) + + + + + + Mode + The name of the ParamType (ThingClass: navigator2, EventType: mode, ID: {e539366b-44da-4119-b11b-497bcdb1f522}) +---------- +The name of the StateType ({e539366b-44da-4119-b11b-497bcdb1f522}) of ThingClass navigator2 + + + + + Mode changed + The name of the EventType ({e539366b-44da-4119-b11b-497bcdb1f522}) of ThingClass navigator2 + + + + + Navigator 2.0 + The name of the ThingClass ({1c95ac91-4eca-4cbf-b0f4-d60d35d069ed}) + + + + + + Outside air temperature + The name of the ParamType (ThingClass: navigator2, EventType: outsideAirTemperature, ID: {9f3462c2-7c42-4eeb-afc4-092e1e41a25d}) +---------- +The name of the StateType ({9f3462c2-7c42-4eeb-afc4-092e1e41a25d}) of ThingClass navigator2 + + + + + Outside air temperature changed + The name of the EventType ({9f3462c2-7c42-4eeb-afc4-092e1e41a25d}) of ThingClass navigator2 + + + + + + Power + The name of the ParamType (ThingClass: navigator2, EventType: power, ID: {33c27167-8e24-4cc5-943c-d17cd03e0f68}) +---------- +The name of the StateType ({33c27167-8e24-4cc5-943c-d17cd03e0f68}) of ThingClass navigator2 + + + + + Power changed + The name of the EventType ({33c27167-8e24-4cc5-943c-d17cd03e0f68}) of ThingClass navigator2 + + + + + + Room temperature + The name of the ParamType (ThingClass: navigator2, EventType: temperature, ID: {f0f596bf-7e45-43ea-b3d4-767b82dd422a}) +---------- +The name of the StateType ({f0f596bf-7e45-43ea-b3d4-767b82dd422a}) of ThingClass navigator2 + + + + + Room temperature changed + The name of the EventType ({f0f596bf-7e45-43ea-b3d4-767b82dd422a}) of ThingClass navigator2 + + + + + Set target room temperature + The name of the ActionType ({efae7493-68c3-4cb9-853c-81011bdf09ca}) of ThingClass navigator2 + + + + + + + Target room temperature + The name of the ParamType (ThingClass: navigator2, ActionType: targetTemperature, ID: {efae7493-68c3-4cb9-853c-81011bdf09ca}) +---------- +The name of the ParamType (ThingClass: navigator2, EventType: targetTemperature, ID: {efae7493-68c3-4cb9-853c-81011bdf09ca}) +---------- +The name of the StateType ({efae7493-68c3-4cb9-853c-81011bdf09ca}) of ThingClass navigator2 + + + + + Target room temperature changed + The name of the EventType ({efae7493-68c3-4cb9-853c-81011bdf09ca}) of ThingClass navigator2 + + + + + + Target water temperature + The name of the ParamType (ThingClass: navigator2, EventType: targetWaterTemperature, ID: {746244d6-dd37-4af8-b2ae-a7d8463e51e2}) +---------- +The name of the StateType ({746244d6-dd37-4af8-b2ae-a7d8463e51e2}) of ThingClass navigator2 + + + + + Target water temperature changed + The name of the EventType ({746244d6-dd37-4af8-b2ae-a7d8463e51e2}) of ThingClass navigator2 + + + + + + Water temperature + The name of the ParamType (ThingClass: navigator2, EventType: waterTemperature, ID: {fcf8e97f-a672-407f-94ae-30df15b310f4}) +---------- +The name of the StateType ({fcf8e97f-a672-407f-94ae-30df15b310f4}) of ThingClass navigator2 + + + + + Water temperature changed + The name of the EventType ({fcf8e97f-a672-407f-94ae-30df15b310f4}) of ThingClass navigator2 + + + + + + iDM + The name of the vendor ({6f54e4b0-1057-4004-87a9-97fdf4581625}) +---------- +The name of the plugin Idm ({3968d86d-d51a-4ad1-a185-91faa017e38f}) + + + + + IntegrationPluginIdm + + + No IP address given + + + + + IP address already in use + + + + diff --git a/modbus/modbustcpmaster.cpp b/modbus/modbustcpmaster.cpp index 1022204..9d37566 100644 --- a/modbus/modbustcpmaster.cpp +++ b/modbus/modbustcpmaster.cpp @@ -92,6 +92,11 @@ QString ModbusTCPMaster::errorString() const return m_modbusTcpClient->errorString(); } +QModbusDevice::Error ModbusTCPMaster::error() const +{ + return m_modbusTcpClient->error(); +} + uint ModbusTCPMaster::port() { return m_modbusTcpClient->connectionParameter(QModbusDevice::NetworkPortParameter).toUInt(); diff --git a/modbus/modbustcpmaster.h b/modbus/modbustcpmaster.h index ac604fe..4852a74 100644 --- a/modbus/modbustcpmaster.h +++ b/modbus/modbustcpmaster.h @@ -52,6 +52,7 @@ public: void setTimeout(int timeout); QString errorString() const; + QModbusDevice::Error error() const; QUuid readCoil(uint slaveAddress, uint registerAddress, uint size = 1); QUuid readDiscreteInput(uint slaveAddress, uint registerAddress, uint size = 1);