diff --git a/src/pws2mqtt.cpp b/src/pws2mqtt.cpp index 5c69c8e..5ab0b18 100644 --- a/src/pws2mqtt.cpp +++ b/src/pws2mqtt.cpp @@ -109,7 +109,7 @@ void Pws2mqtt::init() { QByteArray data; QList> queryList = request.query().queryItems(); - + debug(DEBUGMACRO, "Réception des données", INFO); //QTextStream result(&data); if (queryList.isEmpty()) @@ -117,7 +117,8 @@ void Pws2mqtt::init() debug(DEBUGMACRO, "Request query is empty", WARNING); }else { - debug(DEBUGMACRO, "Request query :" + request.query().toString() , DEBUG); + debug(DEBUGMACRO, "Request query :" + request.query().toString() , INFO + ); QMetaObject::invokeMethod(this, [this, query = request.query()]() { this->parseData(query.queryItems()); }, Qt::QueuedConnection); @@ -368,7 +369,6 @@ void Pws2mqtt::parseData(QList> queryList) }else if (name == "baromin") { //static QDateTime timePrevision = QDateTime::currentDateTime().addSecs(-1000); - propertyValue = round(tohPa(pair.second.toFloat()) * 100) / 100; debug (DEBUGMACRO, "Barometre en hPa : " + QByteArray::number(propertyValue), DEBUG); baro->addPressure(propertyValue); @@ -405,10 +405,12 @@ void Pws2mqtt::parseData(QList> queryList) propertyList[name] = formatNotifString(propertyName[name].first, "", QByteArray::number(propertyValue)); } debug (DEBUGMACRO, "priority = " + QString::number(priority[name]), DEBUG); - }else if (name == "solarradiation") { + propertyValue = pair.second.toFloat()*100/100; + propertyList[name] = formatNotifString(propertyName[name].first, "", QByteArray::number(propertyValue)); propertiesValue[name] = round(pair.second.toFloat()*100/100); + debug (DEBUGMACRO, "SolarRadiations = " + QByteArray::number(propertyValue), DEBUG); } } } @@ -462,7 +464,8 @@ void Pws2mqtt::parseData(QList> queryList) notif += propertyList[name]; } } - if (QDateTime::currentDateTime() > timer.addSecs(3600) or start == false or aPriority >= 3) + QTime currentTime = QTime::currentTime(); + if (currentTime.minute() == 0 or start == false or aPriority >= 3) { timer = QDateTime::currentDateTime(); start = true; @@ -471,7 +474,7 @@ void Pws2mqtt::parseData(QList> queryList) notif = "**Prévisions à 12/24h**\n" + propertyList["prevision"]; notify (notif, priorityList[aPriority], "", tag); - debug(DEBUGMACRO, "calling notify with notif = #" + notif + "#", DEBUG); + debug(DEBUGMACRO, "calling notify with notif = #" + notif + "#", INFO); } debug(DEBUGMACRO, "parseData: Returning", DEBUG); }