DTux/pws2mqtt-qt
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding attachement to notification

Browse Source
This commit is contained in:
DTux committed 2025-10-02 23:27:38 +02:00
1 parent d2c7ececb4
commit b7a07de3e3
10 files changed
+1068 -81
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

fleche.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

main.cpp
+10 -10
View File
@@ -37,20 +37,18 @@ Pws2mqtt *pws2mqtt;
MqttClient *mqttClient; MqttClient *mqttClient;
QHttpServer *httpServer; QHttpServer *httpServer;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
debug(DEBUGMACRO, "QcoreApplication", DEBUG);
QCoreApplication a(argc, argv); QCoreApplication a(argc, argv);
if (argc > 1)
{
if (strcmp(argv[1], "v")) if (strcmp(argv[1], "v"))
{ {
//debug(DEBUGMACRO, "version : " + version, DEBUG); printf ("Version : %s\n", version.c_str());
printf ("Version : %s", version.c_str());
exit(0); exit(0);
} }
notify ("Météo" "Program starting"); }
// Enable logging to journald // Enable logging to journald
qputenv("QT_FORCE_STDERR_LOGGING", QByteArray("0")); qputenv("QT_FORCE_STDERR_LOGGING", QByteArray("0"));
@@ -63,13 +61,14 @@ int main(int argc, char *argv[])
pws2mqtt = new Pws2mqtt; pws2mqtt = new Pws2mqtt;
pws2mqtt->listeningHttp(); pws2mqtt->listeningHttp();
notify ("Program started \n", "default");
a.exec(); a.exec();
mqttClient->qmqttClient->unsubscribe(mqttClient->topic); mqttClient->qmqttClient->unsubscribe(mqttClient->topic);
mqttClient->qmqttClient->disconnectFromHost(); mqttClient->qmqttClient->disconnectFromHost();
debug(DEBUGMACRO, "exiting", DEBUG); debug(DEBUGMACRO, "exiting", DEBUG);
notify ("Program exiting", "low"); notify ("Program exiting \n", "high");
//Closing http server //Closing http server
} }
@@ -94,7 +93,7 @@ void debug(QString debugHeader, QString msg, uint8_t level, QByteArray property)
if ((debugLevel & level) == 1) if ((debugLevel & level) == 1)
{ {
qInfo("%s%sINFO: %s%s", debugHeader.toStdString().c_str(), GREEN, msg.toStdString().c_str(), NORMAL); qInfo("%s%sINFO: %s%s", debugHeader.toStdString().c_str(), GREEN, ("'" + msg.toStdString() + "'").c_str(), NORMAL);
} }
if ((debugLevel & level) == 2) if ((debugLevel & level) == 2)
{ {
@@ -108,16 +107,17 @@ void debug(QString debugHeader, QString msg, uint8_t level, QByteArray property)
if ((debugLevel & level) == 8) if ((debugLevel & level) == 8)
{ {
qInfo("%s%s ERROR: %s%s", debugHeader.toStdString().c_str(), RED, msg.toStdString().c_str(), NORMAL); qInfo("%s%s ERROR: %s%s", debugHeader.toStdString().c_str(), RED, msg.toStdString().c_str(), NORMAL);
notify ("Proram exiting " + debugHeader + " - " + msg ); notify ("Program error : " + debugHeader + " - " + msg, "high");
exit(1); exit(1);
} }
if ((debugLevel & level) == 16) if ((debugLevel & level) == 16)
{ {
qInfo("%s%s DEBUG: %s%s", debugHeader.toStdString().c_str(), GREEN, msg.toStdString().c_str(), NORMAL); qInfo("%s%s DEBUG: %s%s", debugHeader.toStdString().c_str(), GREEN, ("'" + msg.toStdString() + "'").c_str(), NORMAL);
} }
if ((debugLevel & level) == 32) if ((debugLevel & level) == 32)
{ {
qInfo("%s%s ALERT: %s%s", debugHeader.toStdString().c_str(), RED, msg.toStdString().c_str(), NORMAL); qInfo("%s%s ALERT: %s%s", debugHeader.toStdString().c_str(), RED, msg.toStdString().c_str(), NORMAL);
notify ("Program exiting " + debugHeader + " - " + msg, "high" );
exit(2); exit(2);
} }
if (toFollow == property and !toFollow.isEmpty()) if (toFollow == property and !toFollow.isEmpty())
moc_httpserver.cpp
+99
View File
@@ -0,0 +1,99 @@
/****************************************************************************
** Meta object code from reading C++ file 'httpserver.h'
**
** Created by: The Qt Meta Object Compiler version 68 (Qt 6.4.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include <memory>
#include "httpserver.h"
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'httpserver.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 68
#error "This file was generated using the moc from 6.4.1. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
#ifndef Q_CONSTINIT
#define Q_CONSTINIT
#endif
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
namespace {
struct qt_meta_stringdata_HttpServer_t {
uint offsetsAndSizes[2];
char stringdata0[11];
};
#define QT_MOC_LITERAL(ofs, len) \
uint(sizeof(qt_meta_stringdata_HttpServer_t::offsetsAndSizes) + ofs), len
Q_CONSTINIT static const qt_meta_stringdata_HttpServer_t qt_meta_stringdata_HttpServer = {
{
QT_MOC_LITERAL(0, 10) // "HttpServer"
},
"HttpServer"
};
#undef QT_MOC_LITERAL
} // unnamed namespace
Q_CONSTINIT static const uint qt_meta_data_HttpServer[] = {
// content:
10, // revision
0, // classname
0, 0, // classinfo
0, 0, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
0 // eod
};
Q_CONSTINIT const QMetaObject HttpServer::staticMetaObject = { {
QMetaObject::SuperData::link<QObject::staticMetaObject>(),
qt_meta_stringdata_HttpServer.offsetsAndSizes,
qt_meta_data_HttpServer,
qt_static_metacall,
nullptr,
qt_incomplete_metaTypeArray<qt_meta_stringdata_HttpServer_t,
// Q_OBJECT / Q_GADGET
QtPrivate::TypeAndForceComplete<HttpServer, std::true_type>
>,
nullptr
} };
void HttpServer::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
(void)_o;
(void)_id;
(void)_c;
(void)_a;
}
const QMetaObject *HttpServer::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *HttpServer::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_HttpServer.stringdata0))
return static_cast<void*>(this);
return QObject::qt_metacast(_clname);
}
int HttpServer::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QObject::qt_metacall(_c, _id, _a);
return _id;
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE
moc_mqtt.cpp
+262
View File
@@ -0,0 +1,262 @@
/****************************************************************************
** Meta object code from reading C++ file 'mqtt.h'
**
** Created by: The Qt Meta Object Compiler version 68 (Qt 6.4.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include <memory>
#include "mqtt.h"
#include <QtNetwork/QSslPreSharedKeyAuthenticator>
#include <QtNetwork/QSslError>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'mqtt.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 68
#error "This file was generated using the moc from 6.4.1. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
#ifndef Q_CONSTINIT
#define Q_CONSTINIT
#endif
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
namespace {
struct qt_meta_stringdata_MqttClient_t {
uint offsetsAndSizes[48];
char stringdata0[11];
char stringdata1[11];
char stringdata2[1];
char stringdata3[8];
char stringdata4[15];
char stringdata5[6];
char stringdata6[11];
char stringdata7[14];
char stringdata8[9];
char stringdata9[25];
char stringdata10[6];
char stringdata11[28];
char stringdata12[3];
char stringdata13[21];
char stringdata14[2];
char stringdata15[29];
char stringdata16[11];
char stringdata17[15];
char stringdata18[4];
char stringdata19[13];
char stringdata20[37];
char stringdata21[6];
char stringdata22[16];
char stringdata23[25];
};
#define QT_MOC_LITERAL(ofs, len) \
uint(sizeof(qt_meta_stringdata_MqttClient_t::offsetsAndSizes) + ofs), len
Q_CONSTINIT static const qt_meta_stringdata_MqttClient_t qt_meta_stringdata_MqttClient = {
{
QT_MOC_LITERAL(0, 10), // "MqttClient"
QT_MOC_LITERAL(11, 10), // "on_message"
QT_MOC_LITERAL(22, 0), // ""
QT_MOC_LITERAL(23, 7), // "message"
QT_MOC_LITERAL(31, 14), // "QMqttTopicName"
QT_MOC_LITERAL(46, 5), // "topic"
QT_MOC_LITERAL(52, 10), // "on_connect"
QT_MOC_LITERAL(63, 13), // "on_disconnect"
QT_MOC_LITERAL(77, 8), // "on_error"
QT_MOC_LITERAL(86, 24), // "QMqttClient::ClientError"
QT_MOC_LITERAL(111, 5), // "error"
QT_MOC_LITERAL(117, 27), // "on_messageSentStatusChanged"
QT_MOC_LITERAL(145, 2), // "id"
QT_MOC_LITERAL(148, 20), // "QMqtt::MessageStatus"
QT_MOC_LITERAL(169, 1), // "s"
QT_MOC_LITERAL(171, 28), // "QMqttMessageStatusProperties"
QT_MOC_LITERAL(200, 10), // "properties"
QT_MOC_LITERAL(211, 14), // "on_messageSent"
QT_MOC_LITERAL(226, 3), // "mid"
QT_MOC_LITERAL(230, 12), // "updateStatus"
QT_MOC_LITERAL(243, 36), // "QMqttSubscription::Subscripti..."
QT_MOC_LITERAL(280, 5), // "state"
QT_MOC_LITERAL(286, 15), // "on_stateChanged"
QT_MOC_LITERAL(302, 24) // "QMqttClient::ClientState"
},
"MqttClient",
"on_message",
"",
"message",
"QMqttTopicName",
"topic",
"on_connect",
"on_disconnect",
"on_error",
"QMqttClient::ClientError",
"error",
"on_messageSentStatusChanged",
"id",
"QMqtt::MessageStatus",
"s",
"QMqttMessageStatusProperties",
"properties",
"on_messageSent",
"mid",
"updateStatus",
"QMqttSubscription::SubscriptionState",
"state",
"on_stateChanged",
"QMqttClient::ClientState"
};
#undef QT_MOC_LITERAL
} // unnamed namespace
Q_CONSTINIT static const uint qt_meta_data_MqttClient[] = {
// content:
10, // revision
0, // classname
0, 0, // classinfo
8, 14, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
// slots: name, argc, parameters, tag, flags, initial metatype offsets
1, 2, 62, 2, 0x0a, 1 /* Public */,
6, 0, 67, 2, 0x0a, 4 /* Public */,
7, 0, 68, 2, 0x0a, 5 /* Public */,
8, 1, 69, 2, 0x0a, 6 /* Public */,
11, 3, 72, 2, 0x0a, 8 /* Public */,
17, 1, 79, 2, 0x0a, 12 /* Public */,
19, 1, 82, 2, 0x0a, 14 /* Public */,
22, 1, 85, 2, 0x0a, 16 /* Public */,
// slots: parameters
QMetaType::Void, QMetaType::QByteArray, 0x80000000 | 4, 3, 5,
QMetaType::Void,
QMetaType::Void,
QMetaType::Void, 0x80000000 | 9, 10,
QMetaType::Void, QMetaType::Int, 0x80000000 | 13, 0x80000000 | 15, 12, 14, 16,
QMetaType::Void, QMetaType::Int, 18,
QMetaType::Void, 0x80000000 | 20, 21,
QMetaType::Void, 0x80000000 | 23, 21,
0 // eod
};
Q_CONSTINIT const QMetaObject MqttClient::staticMetaObject = { {
QMetaObject::SuperData::link<QObject::staticMetaObject>(),
qt_meta_stringdata_MqttClient.offsetsAndSizes,
qt_meta_data_MqttClient,
qt_static_metacall,
nullptr,
qt_incomplete_metaTypeArray<qt_meta_stringdata_MqttClient_t,
// Q_OBJECT / Q_GADGET
QtPrivate::TypeAndForceComplete<MqttClient, std::true_type>,
// method 'on_message'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
QtPrivate::TypeAndForceComplete<const QByteArray &, std::false_type>,
QtPrivate::TypeAndForceComplete<const QMqttTopicName &, std::false_type>,
// method 'on_connect'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
// method 'on_disconnect'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
// method 'on_error'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
QtPrivate::TypeAndForceComplete<QMqttClient::ClientError, std::false_type>,
// method 'on_messageSentStatusChanged'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
QtPrivate::TypeAndForceComplete<qint32, std::false_type>,
QtPrivate::TypeAndForceComplete<QMqtt::MessageStatus, std::false_type>,
QtPrivate::TypeAndForceComplete<const QMqttMessageStatusProperties &, std::false_type>,
// method 'on_messageSent'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
QtPrivate::TypeAndForceComplete<int, std::false_type>,
// method 'updateStatus'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
QtPrivate::TypeAndForceComplete<QMqttSubscription::SubscriptionState, std::false_type>,
// method 'on_stateChanged'
QtPrivate::TypeAndForceComplete<void, std::false_type>,
QtPrivate::TypeAndForceComplete<QMqttClient::ClientState, std::false_type>
>,
nullptr
} };
void MqttClient::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
if (_c == QMetaObject::InvokeMetaMethod) {
auto *_t = static_cast<MqttClient *>(_o);
(void)_t;
switch (_id) {
case 0: _t->on_message((*reinterpret_cast< std::add_pointer_t<QByteArray>>(_a[1])),(*reinterpret_cast< std::add_pointer_t<QMqttTopicName>>(_a[2]))); break;
case 1: _t->on_connect(); break;
case 2: _t->on_disconnect(); break;
case 3: _t->on_error((*reinterpret_cast< std::add_pointer_t<QMqttClient::ClientError>>(_a[1]))); break;
case 4: _t->on_messageSentStatusChanged((*reinterpret_cast< std::add_pointer_t<qint32>>(_a[1])),(*reinterpret_cast< std::add_pointer_t<QMqtt::MessageStatus>>(_a[2])),(*reinterpret_cast< std::add_pointer_t<QMqttMessageStatusProperties>>(_a[3]))); break;
case 5: _t->on_messageSent((*reinterpret_cast< std::add_pointer_t<int>>(_a[1]))); break;
case 6: _t->updateStatus((*reinterpret_cast< std::add_pointer_t<QMqttSubscription::SubscriptionState>>(_a[1]))); break;
case 7: _t->on_stateChanged((*reinterpret_cast< std::add_pointer_t<QMqttClient::ClientState>>(_a[1]))); break;
default: ;
}
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
switch (_id) {
default: *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); break;
case 0:
switch (*reinterpret_cast<int*>(_a[1])) {
default: *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); break;
case 1:
*reinterpret_cast<QMetaType *>(_a[0]) = QMetaType::fromType< QMqttTopicName >(); break;
}
break;
case 3:
switch (*reinterpret_cast<int*>(_a[1])) {
default: *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); break;
case 0:
*reinterpret_cast<QMetaType *>(_a[0]) = QMetaType::fromType< QMqttClient::ClientError >(); break;
}
break;
case 7:
switch (*reinterpret_cast<int*>(_a[1])) {
default: *reinterpret_cast<QMetaType *>(_a[0]) = QMetaType(); break;
case 0:
*reinterpret_cast<QMetaType *>(_a[0]) = QMetaType::fromType< QMqttClient::ClientState >(); break;
}
break;
}
}
}
const QMetaObject *MqttClient::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *MqttClient::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_MqttClient.stringdata0))
return static_cast<void*>(this);
return QObject::qt_metacast(_clname);
}
int MqttClient::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QObject::qt_metacall(_c, _id, _a);
if (_id < 0)
return _id;
if (_c == QMetaObject::InvokeMetaMethod) {
if (_id < 8)
qt_static_metacall(this, _c, _id, _a);
_id -= 8;
} else if (_c == QMetaObject::RegisterMethodArgumentMetaType) {
if (_id < 8)
qt_static_metacall(this, _c, _id, _a);
_id -= 8;
}
return _id;
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE
moc_predefs.h
+446
View File
@@ -0,0 +1,446 @@
#define __DBL_MIN_EXP__ (-1021)
#define __cpp_attributes 200809L
#define __cpp_nontype_template_parameter_auto 201606L
#define __UINT_LEAST16_MAX__ 0xffff
#define __FLT16_HAS_QUIET_NAN__ 1
#define __ATOMIC_ACQUIRE 2
#define __FLT128_MAX_10_EXP__ 4932
#define __FLT_MIN__ 1.17549435082228750796873653722224568e-38F
#define __GCC_IEC_559_COMPLEX 2
#define __cpp_aggregate_nsdmi 201304L
#define __UINT_LEAST8_TYPE__ unsigned char
#define __SIZEOF_FLOAT80__ 16
#define __INTMAX_C(c) c ## L
#define __CHAR_BIT__ 8
#define __UINT8_MAX__ 0xff
#define __SCHAR_WIDTH__ 8
#define __WINT_MAX__ 0xffffffffU
#define __FLT32_MIN_EXP__ (-125)
#define __cpp_static_assert 201411L
#define __ORDER_LITTLE_ENDIAN__ 1234
#define __SIZE_MAX__ 0xffffffffffffffffUL
#define __WCHAR_MAX__ 0x7fffffff
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 1
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 1
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 1
#define __GCC_ATOMIC_CHAR_LOCK_FREE 2
#define __GCC_IEC_559 2
#define __FLT32X_DECIMAL_DIG__ 17
#define __FLT_EVAL_METHOD__ 0
#define __cpp_binary_literals 201304L
#define __FLT64_DECIMAL_DIG__ 17
#define __cpp_noexcept_function_type 201510L
#define __GCC_ATOMIC_CHAR32_T_LOCK_FREE 2
#define __cpp_variadic_templates 200704L
#define __UINT_FAST64_MAX__ 0xffffffffffffffffUL
#define __SIG_ATOMIC_TYPE__ int
#define __DBL_MIN_10_EXP__ (-307)
#define __FINITE_MATH_ONLY__ 0
#define __cpp_variable_templates 201304L
#define __FLT32X_MAX_EXP__ 1024
#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 1
#define __FLT32_HAS_DENORM__ 1
#define __UINT_FAST8_MAX__ 0xff
#define __cpp_rvalue_reference 200610L
#define __cpp_nested_namespace_definitions 201411L
#define __DEC64_MAX_EXP__ 385
#define __INT8_C(c) c
#define __INT_LEAST8_WIDTH__ 8
#define __cpp_variadic_using 201611L
#define __UINT_LEAST64_MAX__ 0xffffffffffffffffUL
#define __INT_LEAST8_MAX__ 0x7f
#define __cpp_capture_star_this 201603L
#define __SHRT_MAX__ 0x7fff
#define __LDBL_MAX__ 1.18973149535723176502126385303097021e+4932L
#define __FLT64X_MAX_10_EXP__ 4932
#define __cpp_if_constexpr 201606L
#define __LDBL_IS_IEC_60559__ 2
#define __FLT64X_HAS_QUIET_NAN__ 1
#define __UINT_LEAST8_MAX__ 0xff
#define __GCC_ATOMIC_BOOL_LOCK_FREE 2
#define __FLT128_DENORM_MIN__ 6.47517511943802511092443895822764655e-4966F128
#define __UINTMAX_TYPE__ long unsigned int
#define __linux 1
#define __DEC32_EPSILON__ 1E-6DF
#define __FLT_EVAL_METHOD_TS_18661_3__ 0
#define __OPTIMIZE__ 1
#define __unix 1
#define __UINT32_MAX__ 0xffffffffU
#define __GXX_EXPERIMENTAL_CXX0X__ 1
#define __DBL_DENORM_MIN__ double(4.94065645841246544176568792868221372e-324L)
#define __FLT128_MIN_EXP__ (-16381)
#define __WINT_MIN__ 0U
#define __FLT128_MIN_10_EXP__ (-4931)
#define __FLT32X_IS_IEC_60559__ 2
#define __INT_LEAST16_WIDTH__ 16
#define __SCHAR_MAX__ 0x7f
#define __FLT128_MANT_DIG__ 113
#define __WCHAR_MIN__ (-__WCHAR_MAX__ - 1)
#define __INT64_C(c) c ## L
#define __GCC_ATOMIC_POINTER_LOCK_FREE 2
#define _FORTIFY_SOURCE 2
#define __FLT32X_MANT_DIG__ 53
#define __GCC_ATOMIC_CHAR16_T_LOCK_FREE 2
#define __cpp_aligned_new 201606L
#define __FLT32_MAX_10_EXP__ 38
#define __FLT64X_EPSILON__ 1.08420217248550443400745280086994171e-19F64x
#define __STDC_HOSTED__ 1
#define __DEC64_MIN_EXP__ (-382)
#define __cpp_decltype_auto 201304L
#define __DBL_DIG__ 15
#define __FLT32_DIG__ 6
#define __FLT_EPSILON__ 1.19209289550781250000000000000000000e-7F
#define __GXX_WEAK__ 1
#define __SHRT_WIDTH__ 16
#define __FLT32_IS_IEC_60559__ 2
#define __LDBL_MIN__ 3.36210314311209350626267781732175260e-4932L
#define __DBL_IS_IEC_60559__ 2
#define __DEC32_MAX__ 9.999999E96DF
#define __cpp_threadsafe_static_init 200806L
#define __cpp_enumerator_attributes 201411L
#define __FLT64X_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951F64x
#define __FLT32X_HAS_INFINITY__ 1
#define __INT32_MAX__ 0x7fffffff
#define __FLT16_DIG__ 3
#define __unix__ 1
#define __INT_WIDTH__ 32
#define __SIZEOF_LONG__ 8
#define __STDC_IEC_559__ 1
#define PIC 1
#define __STDC_ISO_10646__ 201706L
#define __UINT16_C(c) c
#define __DECIMAL_DIG__ 21
#define __STDC_IEC_559_COMPLEX__ 1
#define __FLT64_EPSILON__ 2.22044604925031308084726333618164062e-16F64
#define __gnu_linux__ 1
#define __INT16_MAX__ 0x7fff
#define __FLT64_MIN_EXP__ (-1021)
#define __FLT64X_MIN_10_EXP__ (-4931)
#define __LDBL_HAS_QUIET_NAN__ 1
#define __FLT16_MIN_EXP__ (-13)
#define __FLT64_MANT_DIG__ 53
#define __FLT64X_MANT_DIG__ 64
#define __GNUC__ 12
#define __GXX_RTTI 1
#define __MMX__ 1
#define __FLT_HAS_DENORM__ 1
#define __SIZEOF_LONG_DOUBLE__ 16
#define __BIGGEST_ALIGNMENT__ 16
#define __STDC_UTF_16__ 1
#define __FLT64_MAX_10_EXP__ 308
#define __FLT16_MAX_10_EXP__ 4
#define __cpp_delegating_constructors 200604L
#define __FLT32_HAS_INFINITY__ 1
#define __DBL_MAX__ double(1.79769313486231570814527423731704357e+308L)
#define __cpp_raw_strings 200710L
#define __INT_FAST32_MAX__ 0x7fffffffffffffffL
#define __DBL_HAS_INFINITY__ 1
#define __SIZEOF_FLOAT__ 4
#define __HAVE_SPECULATION_SAFE_VALUE 1
#define __cpp_fold_expressions 201603L
#define __DEC32_MIN_EXP__ (-94)
#define __INTPTR_WIDTH__ 64
#define __FLT64X_HAS_INFINITY__ 1
#define __UINT_LEAST32_MAX__ 0xffffffffU
#define __FLT32X_HAS_DENORM__ 1
#define __INT_FAST16_TYPE__ long int
#define __MMX_WITH_SSE__ 1
#define __LDBL_HAS_DENORM__ 1
#define __SEG_GS 1
#define __cplusplus 201703L
#define __cpp_ref_qualifiers 200710L
#define __DEC32_MIN__ 1E-95DF
#define __DEPRECATED 1
#define __cpp_rvalue_references 200610L
#define __DBL_MAX_EXP__ 1024
#define __WCHAR_WIDTH__ 32
#define __FLT32_MAX__ 3.40282346638528859811704183484516925e+38F32
#define __DEC128_EPSILON__ 1E-33DL
#define __FLT16_DECIMAL_DIG__ 5
#define __SSE2_MATH__ 1
#define __ATOMIC_HLE_RELEASE 131072
#define __PTRDIFF_MAX__ 0x7fffffffffffffffL
#define __amd64 1
#define __ATOMIC_HLE_ACQUIRE 65536
#define __GNUG__ 12
#define __LONG_LONG_MAX__ 0x7fffffffffffffffLL
#define __SIZEOF_SIZE_T__ 8
#define __cpp_nsdmi 200809L
#define __FLT64X_MIN_EXP__ (-16381)
#define __SIZEOF_WINT_T__ 4
#define __LONG_LONG_WIDTH__ 64
#define __cpp_initializer_lists 200806L
#define __FLT32_MAX_EXP__ 128
#define __cpp_hex_float 201603L
#define __GXX_ABI_VERSION 1017
#define __FLT128_HAS_INFINITY__ 1
#define __FLT_MIN_EXP__ (-125)
#define __GCC_HAVE_DWARF2_CFI_ASM 1
#define __x86_64 1
#define __cpp_lambdas 200907L
#define __INT_FAST64_TYPE__ long int
#define __FLT64_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F64
#define __cpp_template_auto 201606L
#define __DBL_MIN__ double(2.22507385850720138309023271733240406e-308L)
#define __FLT16_DENORM_MIN__ 5.96046447753906250000000000000000000e-8F16
#define __FLT128_EPSILON__ 1.92592994438723585305597794258492732e-34F128
#define __FLT64X_NORM_MAX__ 1.18973149535723176502126385303097021e+4932F64x
#define __SIZEOF_POINTER__ 8
#define __LP64__ 1
#define __DBL_HAS_QUIET_NAN__ 1
#define __FLT32X_EPSILON__ 2.22044604925031308084726333618164062e-16F32x
#define __DECIMAL_BID_FORMAT__ 1
#define __FLT64_MIN_10_EXP__ (-307)
#define __FLT16_MIN_10_EXP__ (-4)
#define __FLT64X_DECIMAL_DIG__ 21
#define __DEC128_MIN__ 1E-6143DL
#define __REGISTER_PREFIX__
#define __UINT16_MAX__ 0xffff
#define __LDBL_HAS_INFINITY__ 1
#define __FLT32_MIN__ 1.17549435082228750796873653722224568e-38F32
#define __UINT8_TYPE__ unsigned char
#define __FLT_DIG__ 6
#define __DEC_EVAL_METHOD__ 2
#define __DEC128_MAX__ 9.999999999999999999999999999999999E6144DL
#define __FLT_MANT_DIG__ 24
#define __LDBL_DECIMAL_DIG__ 21
#define __VERSION__ "12.3.0"
#define __UINT64_C(c) c ## UL
#define __cpp_unicode_characters 201411L
#define _STDC_PREDEF_H 1
#define __INT_LEAST32_MAX__ 0x7fffffff
#define __GCC_ATOMIC_INT_LOCK_FREE 2
#define __FLT128_MAX_EXP__ 16384
#define __FLT32_MANT_DIG__ 24
#define __FLOAT_WORD_ORDER__ __ORDER_LITTLE_ENDIAN__
#define __FLT32X_MIN_EXP__ (-1021)
#define __STDC_IEC_60559_COMPLEX__ 201404L
#define __cpp_aggregate_bases 201603L
#define __FLT128_HAS_DENORM__ 1
#define __FLT32_DECIMAL_DIG__ 9
#define __FLT128_DIG__ 33
#define __INT32_C(c) c
#define __DEC64_EPSILON__ 1E-15DD
#define __ORDER_PDP_ENDIAN__ 3412
#define __DEC128_MIN_EXP__ (-6142)
#define __INT_FAST32_TYPE__ long int
#define __UINT_LEAST16_TYPE__ short unsigned int
#define unix 1
#define __DBL_HAS_DENORM__ 1
#define __cpp_rtti 199711L
#define __SIZE_TYPE__ long unsigned int
#define __UINT64_MAX__ 0xffffffffffffffffUL
#define __FLT_IS_IEC_60559__ 2
#define __GNUC_WIDE_EXECUTION_CHARSET_NAME "UTF-32LE"
#define __FLT64X_DIG__ 18
#define __INT8_TYPE__ signed char
#define __cpp_digit_separators 201309L
#define __ELF__ 1
#define __GCC_ASM_FLAG_OUTPUTS__ 1
#define __UINT32_TYPE__ unsigned int
#define __FLT_RADIX__ 2
#define __INT_LEAST16_TYPE__ short int
#define __LDBL_EPSILON__ 1.08420217248550443400745280086994171e-19L
#define __UINTMAX_C(c) c ## UL
#define __GLIBCXX_BITSIZE_INT_N_0 128
#define __k8 1
#define __FLT32X_MIN__ 2.22507385850720138309023271733240406e-308F32x
#define __SIG_ATOMIC_MAX__ 0x7fffffff
#define __GCC_ATOMIC_WCHAR_T_LOCK_FREE 2
#define __USER_LABEL_PREFIX__
#define __STDC_IEC_60559_BFP__ 201404L
#define __SIZEOF_PTRDIFF_T__ 8
#define __LDBL_DIG__ 18
#define __FLT64_IS_IEC_60559__ 2
#define __x86_64__ 1
#define __FLT16_IS_IEC_60559__ 2
#define __FLT16_MAX_EXP__ 16
#define __DEC32_SUBNORMAL_MIN__ 0.000001E-95DF
#define __INT_FAST16_MAX__ 0x7fffffffffffffffL
#define __GCC_CONSTRUCTIVE_SIZE 64
#define __FLT64_DIG__ 15
#define __UINT_FAST32_MAX__ 0xffffffffffffffffUL
#define __UINT_LEAST64_TYPE__ long unsigned int
#define __FLT16_EPSILON__ 9.76562500000000000000000000000000000e-4F16
#define __FLT_HAS_QUIET_NAN__ 1
#define __FLT_MAX_10_EXP__ 38
#define __LONG_MAX__ 0x7fffffffffffffffL
#define __FLT64X_HAS_DENORM__ 1
#define __DEC128_SUBNORMAL_MIN__ 0.000000000000000000000000000000001E-6143DL
#define __FLT_HAS_INFINITY__ 1
#define __GNUC_EXECUTION_CHARSET_NAME "UTF-8"
#define __cpp_unicode_literals 200710L
#define __UINT_FAST16_TYPE__ long unsigned int
#define __DEC64_MAX__ 9.999999999999999E384DD
#define __INT_FAST32_WIDTH__ 64
#define __CHAR16_TYPE__ short unsigned int
#define __PRAGMA_REDEFINE_EXTNAME 1
#define __SIZE_WIDTH__ 64
#define __SEG_FS 1
#define __INT_LEAST16_MAX__ 0x7fff
#define __FLT16_NORM_MAX__ 6.55040000000000000000000000000000000e+4F16
#define __DEC64_MANT_DIG__ 16
#define __INT64_MAX__ 0x7fffffffffffffffL
#define __FLT32_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F32
#define __SIG_ATOMIC_WIDTH__ 32
#define __INT_LEAST64_TYPE__ long int
#define __INT16_TYPE__ short int
#define __INT_LEAST8_TYPE__ signed char
#define __FLT16_MAX__ 6.55040000000000000000000000000000000e+4F16
#define __cpp_structured_bindings 201606L
#define __SIZEOF_INT__ 4
#define __DEC32_MAX_EXP__ 97
#define __INT_FAST8_MAX__ 0x7f
#define __FLT128_MAX__ 1.18973149535723176508575932662800702e+4932F128
#define __INTPTR_MAX__ 0x7fffffffffffffffL
#define __cpp_sized_deallocation 201309L
#define __cpp_guaranteed_copy_elision 201606L
#define linux 1
#define __FLT64_HAS_QUIET_NAN__ 1
#define __FLT32_MIN_10_EXP__ (-37)
#define __EXCEPTIONS 1
#define __PTRDIFF_WIDTH__ 64
#define __LDBL_MANT_DIG__ 64
#define __cpp_range_based_for 201603L
#define __FLT64_HAS_INFINITY__ 1
#define __FLT64X_MAX__ 1.18973149535723176502126385303097021e+4932F64x
#define __FLT16_HAS_INFINITY__ 1
#define __STDCPP_DEFAULT_NEW_ALIGNMENT__ 16
#define __SIG_ATOMIC_MIN__ (-__SIG_ATOMIC_MAX__ - 1)
#define __code_model_small__ 1
#define __GCC_ATOMIC_LONG_LOCK_FREE 2
#define __cpp_nontype_template_args 201411L
#define __DEC32_MANT_DIG__ 7
#define __cpp_return_type_deduction 201304L
#define __k8__ 1
#define __INTPTR_TYPE__ long int
#define __UINT16_TYPE__ short unsigned int
#define __WCHAR_TYPE__ int
#define __pic__ 2
#define __UINTPTR_MAX__ 0xffffffffffffffffUL
#define __INT_FAST64_WIDTH__ 64
#define __cpp_decltype 200707L
#define __INT_FAST64_MAX__ 0x7fffffffffffffffL
#define __GCC_ATOMIC_TEST_AND_SET_TRUEVAL 1
#define __FLT_NORM_MAX__ 3.40282346638528859811704183484516925e+38F
#define __FLT64X_MAX_EXP__ 16384
#define __UINT_FAST64_TYPE__ long unsigned int
#define __cpp_inline_variables 201606L
#define __INT_MAX__ 0x7fffffff
#define __linux__ 1
#define __INT64_TYPE__ long int
#define __FLT_MAX_EXP__ 128
#define __ORDER_BIG_ENDIAN__ 4321
#define __DBL_MANT_DIG__ 53
#define __cpp_inheriting_constructors 201511L
#define __SIZEOF_FLOAT128__ 16
#define __INT_LEAST64_MAX__ 0x7fffffffffffffffL
#define __DEC64_MIN__ 1E-383DD
#define __WINT_TYPE__ unsigned int
#define __UINT_LEAST32_TYPE__ unsigned int
#define __SIZEOF_SHORT__ 2
#define __FLT32_NORM_MAX__ 3.40282346638528859811704183484516925e+38F32
#define __SSE__ 1
#define __LDBL_MIN_EXP__ (-16381)
#define __FLT64_MAX__ 1.79769313486231570814527423731704357e+308F64
#define __amd64__ 1
#define __WINT_WIDTH__ 32
#define __INT_LEAST64_WIDTH__ 64
#define __LDBL_MAX_EXP__ 16384
#define __FLT32X_MAX_10_EXP__ 308
#define __SSP__ 1
#define __SIZEOF_INT128__ 16
#define __FLT16_MIN__ 6.10351562500000000000000000000000000e-5F16
#define __FLT64X_IS_IEC_60559__ 2
#define __LDBL_MAX_10_EXP__ 4932
#define __ATOMIC_RELAXED 0
#define __DBL_EPSILON__ double(2.22044604925031308084726333618164062e-16L)
#define __FLT128_MIN__ 3.36210314311209350626267781732175260e-4932F128
#define _LP64 1
#define __UINT8_C(c) c
#define __FLT64_MAX_EXP__ 1024
#define __INT_LEAST32_TYPE__ int
#define __SIZEOF_WCHAR_T__ 4
#define __GNUC_PATCHLEVEL__ 0
#define __FLT128_NORM_MAX__ 1.18973149535723176508575932662800702e+4932F128
#define __FLT64_NORM_MAX__ 1.79769313486231570814527423731704357e+308F64
#define __FLT128_HAS_QUIET_NAN__ 1
#define __INTMAX_MAX__ 0x7fffffffffffffffL
#define __INT_FAST8_TYPE__ signed char
#define __cpp_namespace_attributes 201411L
#define __FLT64X_MIN__ 3.36210314311209350626267781732175260e-4932F64x
#define __STDCPP_THREADS__ 1
#define __GNUC_STDC_INLINE__ 1
#define __FLT64_HAS_DENORM__ 1
#define __FLT32_EPSILON__ 1.19209289550781250000000000000000000e-7F32
#define __FLT16_HAS_DENORM__ 1
#define __DBL_DECIMAL_DIG__ 17
#define __STDC_UTF_32__ 1
#define __INT_FAST8_WIDTH__ 8
#define __FXSR__ 1
#define __FLT32X_MAX__ 1.79769313486231570814527423731704357e+308F32x
#define __DBL_NORM_MAX__ double(1.79769313486231570814527423731704357e+308L)
#define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
#define __GCC_DESTRUCTIVE_SIZE 64
#define __INTMAX_WIDTH__ 64
#define __cpp_runtime_arrays 198712L
#define __UINT64_TYPE__ long unsigned int
#define __UINT32_C(c) c ## U
#define __cpp_alias_templates 200704L
#define __FLT_DENORM_MIN__ 1.40129846432481707092372958328991613e-45F
#define __FLT128_IS_IEC_60559__ 2
#define __INT8_MAX__ 0x7f
#define __LONG_WIDTH__ 64
#define __PIC__ 2
#define __UINT_FAST32_TYPE__ long unsigned int
#define __FLT16_MANT_DIG__ 11
#define __FLT32X_NORM_MAX__ 1.79769313486231570814527423731704357e+308F32x
#define __CHAR32_TYPE__ unsigned int
#define __FLT_MAX__ 3.40282346638528859811704183484516925e+38F
#define __cpp_constexpr 201603L
#define __SSE2__ 1
#define __cpp_deduction_guides 201703L
#define __INT32_TYPE__ int
#define __SIZEOF_DOUBLE__ 8
#define __cpp_exceptions 199711L
#define __FLT_MIN_10_EXP__ (-37)
#define __FLT64_MIN__ 2.22507385850720138309023271733240406e-308F64
#define __INT_LEAST32_WIDTH__ 32
#define __INTMAX_TYPE__ long int
#define __DEC128_MAX_EXP__ 6145
#define __FLT32X_HAS_QUIET_NAN__ 1
#define __ATOMIC_CONSUME 1
#define __GNUC_MINOR__ 3
#define __GLIBCXX_TYPE_INT_N_0 __int128
#define __INT_FAST16_WIDTH__ 64
#define __UINTMAX_MAX__ 0xffffffffffffffffUL
#define __FLT32X_DENORM_MIN__ 4.94065645841246544176568792868221372e-324F32x
#define __cpp_template_template_args 201611L
#define __DBL_MAX_10_EXP__ 308
#define __LDBL_DENORM_MIN__ 3.64519953188247460252840593361941982e-4951L
#define __INT16_C(c) c
#define __STDC__ 1
#define __FLT32X_DIG__ 15
#define __PTRDIFF_TYPE__ long int
#define __ATOMIC_SEQ_CST 5
#define __FLT32X_MIN_10_EXP__ (-307)
#define __UINTPTR_TYPE__ long unsigned int
#define __DEC64_SUBNORMAL_MIN__ 0.000000000000001E-383DD
#define __DEC128_MANT_DIG__ 34
#define __LDBL_MIN_10_EXP__ (-4931)
#define __cpp_generic_lambdas 201304L
#define __SSE_MATH__ 1
#define __SIZEOF_LONG_LONG__ 8
#define __cpp_user_defined_literals 200809L
#define __FLT128_DECIMAL_DIG__ 36
#define __GCC_ATOMIC_LLONG_LOCK_FREE 2
#define __FLT32_HAS_QUIET_NAN__ 1
#define __FLT_DECIMAL_DIG__ 9
#define __UINT_FAST16_MAX__ 0xffffffffffffffffUL
#define __LDBL_NORM_MAX__ 1.18973149535723176502126385303097021e+4932L
#define __GCC_ATOMIC_SHORT_LOCK_FREE 2
#define __UINT_FAST8_TYPE__ unsigned char
#define _GNU_SOURCE 1
#define __cpp_init_captures 201304L
#define __ATOMIC_ACQ_REL 4
#define __ATOMIC_RELEASE 3
moc_pws2mqtt.cpp
+101
View File
@@ -0,0 +1,101 @@
/****************************************************************************
** Meta object code from reading C++ file 'pws2mqtt.h'
**
** Created by: The Qt Meta Object Compiler version 68 (Qt 6.4.1)
**
** WARNING! All changes made in this file will be lost!
*****************************************************************************/
#include <memory>
#include "pws2mqtt.h"
#include <QtNetwork/QSslPreSharedKeyAuthenticator>
#include <QtNetwork/QSslError>
#include <QtCore/qmetatype.h>
#if !defined(Q_MOC_OUTPUT_REVISION)
#error "The header file 'pws2mqtt.h' doesn't include <QObject>."
#elif Q_MOC_OUTPUT_REVISION != 68
#error "This file was generated using the moc from 6.4.1. It"
#error "cannot be used with the include files from this version of Qt."
#error "(The moc has changed too much.)"
#endif
#ifndef Q_CONSTINIT
#define Q_CONSTINIT
#endif
QT_BEGIN_MOC_NAMESPACE
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED
namespace {
struct qt_meta_stringdata_Pws2mqtt_t {
uint offsetsAndSizes[2];
char stringdata0[9];
};
#define QT_MOC_LITERAL(ofs, len) \
uint(sizeof(qt_meta_stringdata_Pws2mqtt_t::offsetsAndSizes) + ofs), len
Q_CONSTINIT static const qt_meta_stringdata_Pws2mqtt_t qt_meta_stringdata_Pws2mqtt = {
{
QT_MOC_LITERAL(0, 8) // "Pws2mqtt"
},
"Pws2mqtt"
};
#undef QT_MOC_LITERAL
} // unnamed namespace
Q_CONSTINIT static const uint qt_meta_data_Pws2mqtt[] = {
// content:
10, // revision
0, // classname
0, 0, // classinfo
0, 0, // methods
0, 0, // properties
0, 0, // enums/sets
0, 0, // constructors
0, // flags
0, // signalCount
0 // eod
};
Q_CONSTINIT const QMetaObject Pws2mqtt::staticMetaObject = { {
QMetaObject::SuperData::link<QObject::staticMetaObject>(),
qt_meta_stringdata_Pws2mqtt.offsetsAndSizes,
qt_meta_data_Pws2mqtt,
qt_static_metacall,
nullptr,
qt_incomplete_metaTypeArray<qt_meta_stringdata_Pws2mqtt_t,
// Q_OBJECT / Q_GADGET
QtPrivate::TypeAndForceComplete<Pws2mqtt, std::true_type>
>,
nullptr
} };
void Pws2mqtt::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a)
{
(void)_o;
(void)_id;
(void)_c;
(void)_a;
}
const QMetaObject *Pws2mqtt::metaObject() const
{
return QObject::d_ptr->metaObject ? QObject::d_ptr->dynamicMetaObject() : &staticMetaObject;
}
void *Pws2mqtt::qt_metacast(const char *_clname)
{
if (!_clname) return nullptr;
if (!strcmp(_clname, qt_meta_stringdata_Pws2mqtt.stringdata0))
return static_cast<void*>(this);
return QObject::qt_metacast(_clname);
}
int Pws2mqtt::qt_metacall(QMetaObject::Call _c, int _id, void **_a)
{
_id = QObject::qt_metacall(_c, _id, _a);
return _id;
}
QT_WARNING_POP
QT_END_MOC_NAMESPACE
mqtt.cpp
+8 -8
View File
@@ -61,7 +61,7 @@ qint32 MqttClient::send_message(QString message)
mid = this->qmqttClient->publish(this->topic, message.toUtf8(), this->qos, true); mid = this->qmqttClient->publish(this->topic, message.toUtf8(), this->qos, true);
if (mid == -1) if (mid == -1)
{ {
debug(DEBUGMACRO, "Error, can't publish message : " + this->qmqttErrors[this->qmqttClient->error()], WARNING); debug("MQTT", "Erreur, impossiblité d'envoyer le message : " + this->qmqttErrors[this->qmqttClient->error()], WARNING);
} }
messagesList.insert(mid, message); messagesList.insert(mid, message);
return (mid); return (mid);
@@ -82,13 +82,13 @@ void MqttClient::on_messageSentStatusChanged(qint32 id, QMqtt::MessageStatus s,
if ( id == 0) if ( id == 0)
{ {
debug(DEBUGMACRO, "message id = " + QString::number(id) + this->messageStatus[static_cast<int>(s)], WARNING); debug(DEBUGMACRO, "message id = " + QString::number(id) + this->messageStatus[static_cast<int>(s)], INFO);
} }
} }
void MqttClient::on_error(QMqttClient::ClientError error) void MqttClient::on_error(QMqttClient::ClientError error)
{ {
debug(DEBUGMACRO, "Error " + qmqttErrors[error], WARNING); debug("MQTT", "Error " + qmqttErrors[error], WARNING);
} }
void MqttClient::on_message(const QByteArray &message, const QMqttTopicName &topic) void MqttClient::on_message(const QByteArray &message, const QMqttTopicName &topic)
@@ -116,19 +116,19 @@ void MqttClient::updateStatus(QMqttSubscription::SubscriptionState state)
switch (state) switch (state)
{ {
case QMqttSubscription::Unsubscribed: case QMqttSubscription::Unsubscribed:
debug(DEBUGMACRO, "Unsubscribed", WARNING); debug("MQTT", "Unsubscribed", WARNING);
break; break;
case QMqttSubscription::SubscriptionPending: case QMqttSubscription::SubscriptionPending:
debug(DEBUGMACRO, "Pending subscription", WARNING); debug("MQTT", "Pending subscription", WARNING);
break; break;
case QMqttSubscription::Subscribed: case QMqttSubscription::Subscribed:
debug(DEBUGMACRO, "Subscribed", INFO); debug(DEBUGMACRO, "Subscribed", INFO);
break; break;
case QMqttSubscription::Error: case QMqttSubscription::Error:
debug(DEBUGMACRO, "Subscription error" + this->subscription->reason(), WARNING); debug("MQTT", "Subscription error" + this->subscription->reason(), WARNING);
break; break;
case QMqttSubscription::UnsubscriptionPending: case QMqttSubscription::UnsubscriptionPending:
debug(DEBUGMACRO, "Pending Unsubscription", WARNING); debug("MQTT", "Pending Unsubscription", WARNING);
break; break;
default: default:
debug(DEBUGMACRO, "--Unknown--", DEBUG); debug(DEBUGMACRO, "--Unknown--", DEBUG);
@@ -138,5 +138,5 @@ void MqttClient::updateStatus(QMqttSubscription::SubscriptionState state)
void MqttClient::on_stateChanged(QMqttClient::ClientState state) void MqttClient::on_stateChanged(QMqttClient::ClientState state)
{ {
debug(DEBUGMACRO, QLatin1String("State Change : ") + this->clientStateString[state], WARNING ); debug("MQTT", QLatin1String("State Change : ") + this->clientStateString[state], WARNING );
} }
pws2mqtt.cpp
+129 -54
View File
@@ -11,6 +11,8 @@
#include <QtHttpServer/QHttpServerRequest> #include <QtHttpServer/QHttpServerRequest>
#include <curl/curl.h> #include <curl/curl.h>
#include <QtMath> #include <QtMath>
#include <QImage>
#include <QTransform>
extern MqttClient *mqttClient; extern MqttClient *mqttClient;
extern Pws2mqtt *pws2mqtt; extern Pws2mqtt *pws2mqtt;
@@ -31,7 +33,7 @@ static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *use
return size * nmemb; // On ne traite pas les données reçues return size * nmemb; // On ne traite pas les données reçues
} }
QMap <QByteArray, qfloat16> propertyList; QMap <QByteArray, double> propertyList;
QMap <QByteArray, QPair<QString, QByteArray>> propertyName QMap <QByteArray, QPair<QString, QByteArray>> propertyName
{ {
{"tempf", {"Température extérieure", "°C"}}, {"tempf", {"Température extérieure", "°C"}},
@@ -50,7 +52,7 @@ QMap <QByteArray, QPair<QString, QByteArray>> propertyName
{"indoorhumidity", {"Humidité intérieure", "%"}}, {"indoorhumidity", {"Humidité intérieure", "%"}},
{"baromin", {"pression atmosphérique", " hPa"}}, {"baromin", {"pression atmosphérique", " hPa"}},
{"lowbatt", {"Alerte batterie faible", ""}}, {"lowbatt", {"Alerte batterie faible", ""}},
{"UV", {"UV", ""}} {"UV", {"Alerte UV", ""}}
}; };
@@ -128,6 +130,7 @@ void Pws2mqtt::parseData(QList<std::pair<QString, QString>> queryList)
QStringList priorityList {"", "min", "low", "default", "High", "urgent"}; QStringList priorityList {"", "min", "low", "default", "High", "urgent"};
quint8 priority = 2; quint8 priority = 2;
QPair <QByteArray, QByteArray> winddir = {"", 0}; QPair <QByteArray, QByteArray> winddir = {"", 0};
QString attachment = "";
debug(DEBUGMACRO, "looping list of query", DEBUG); debug(DEBUGMACRO, "looping list of query", DEBUG);
@@ -162,32 +165,47 @@ void Pws2mqtt::parseData(QList<std::pair<QString, QString>> queryList)
if (name == "tempf") if (name == "tempf")
{ {
static QTime timeTemp; static QDateTime timeTemp = QDateTime::currentDateTime().addSecs(-600);
propertyValue = round(fahrenheitToCelsius(pair.second.toFloat())); propertyValue = round(fahrenheitToCelsius(pair.second.toFloat()));
if (compare (propertyList[name], propertyValue, 1) and timeTemp > QTime::currentTime().addSecs(300)) debug (DEBUGMACRO, "timeTemp = " + timeTemp.time().toString() + " - current :" + QDateTime::currentDateTime().toString() , DEBUG);
if (compare (propertyList[name], propertyValue, 1) and timeTemp < QDateTime::currentDateTime())
{ {
notif += formatNotifString (name, QByteArray::number(qPow(propertyValue, 1.0))); notif += formatNotifString (propertyName[name].first, propertyName[name].second, QByteArray::number(qPow(propertyValue, 1.0)));
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
timeTemp = timeTemp.currentDateTime().addSecs(300);
propertyList[name] = propertyValue;
}
}else if (name == "indoortempf")
{
static QDateTime timeIndoorTemp = QDateTime::currentDateTime().addSecs(-600);
propertyValue = round(fahrenheitToCelsius(pair.second.toFloat()));
if (compare (propertyList[name], propertyValue, 1) and timeIndoorTemp < QDateTime::currentDateTime())
{
notif += formatNotifString (propertyName[name].first, propertyName[name].second , QByteArray::number(qPow(propertyValue, 1.0)));
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
timeIndoorTemp = timeIndoorTemp.currentDateTime().addSecs(300);
propertyList[name] = propertyValue; propertyList[name] = propertyValue;
timeTemp = timeTemp.currentTime();
} }
}else if (name == "humidity") }else if (name == "humidity")
{ {
propertyValue = pair.second.toFloat(); propertyValue = pair.second.toFloat();
if (compare (propertyList[name], propertyValue, 3)) if (compare (propertyList[name], propertyValue, 3))
{ {
notif += formatNotifString (name, value); notif += formatNotifString (propertyName[name].first, propertyName[name].second , value);
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
propertyList[name] = propertyValue;
} }
}else if (name == "windchillf") }else if (name == "windchillf")
{ {
static QTime timeWindchill; static QDateTime timeWindchill = QDateTime::currentDateTime().addSecs(-600);
propertyValue = round(fahrenheitToCelsius(pair.second.toFloat())); propertyValue = round(fahrenheitToCelsius(pair.second.toFloat()));
if (compare (propertyList[name], propertyValue, 1) and timeWindchill > QTime::currentTime().addSecs(300)) if (compare (propertyList[name], propertyValue, 1) and timeWindchill < QDateTime::currentDateTime())
{ {
notif += formatNotifString (name, QByteArray::number(qPow(propertyValue, 1.0))); notif += formatNotifString (propertyName[name].first, propertyName[name].second , QByteArray::number(qPow(propertyValue, 1.0)));
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
timeWindchill = timeWindchill.currentTime(); timeWindchill = timeWindchill.currentDateTime().addSecs(300);
propertyList[name] = propertyValue;
} }
}else if (name == "winddir") }else if (name == "winddir")
{ {
@@ -201,15 +219,18 @@ void Pws2mqtt::parseData(QList<std::pair<QString, QString>> queryList)
if (propertyValue > 10) if (propertyValue > 10)
{ {
priority = setPriority (priority, 2); priority = setPriority (priority, 2);
notif += formatNotifString (name, QByteArray::number(propertyValue)); notif += formatNotifString (propertyName[name].first, propertyName[name].second , QByteArray::number(propertyValue));
notif += formatNotifString (winddir.first, winddir.second); notif += formatNotifString (winddir.first, winddir.second);
//TODO attache fleche
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
if (propertyValue > 30) if (propertyValue > 30)
priority = setPriority (priority, 4); priority = setPriority (priority, 4);
if (propertyValue > 50) if (propertyValue > 50)
priority = setPriority (priority, 5); priority = setPriority (priority, 5);
propertyList[name] = propertyValue;
attachment = this->inputPath;
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
} }
} }
@@ -218,67 +239,72 @@ void Pws2mqtt::parseData(QList<std::pair<QString, QString>> queryList)
propertyValue = round(mphTokmh(pair.second.toFloat())); propertyValue = round(mphTokmh(pair.second.toFloat()));
if (compare (propertyList[name], propertyValue, 5) and propertyValue > 20) if (compare (propertyList[name], propertyValue, 5) and propertyValue > 20)
{ {
notif += formatNotifString (name, QByteArray::number(propertyValue)); notif += formatNotifString (propertyName[name].first, propertyName[name].second , QByteArray::number(propertyValue));
if (propertyValue > 40) if (propertyValue > 40)
priority = setPriority (priority, 4); priority = setPriority (priority, 4);
if (propertyValue > 60) if (propertyValue > 60)
priority = setPriority (priority, 5); priority = setPriority (priority, 5);
propertyList[name] = propertyValue;
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
} }
}else if (name == "rainin") }else if (name == "rainin")
{ {
static qfloat16 ecart; static double ecart;
propertyValue = pair.second.toFloat(); propertyValue = pair.second.toFloat();
if (propertyValue == 0) if (propertyValue == 0)
{ {
ecart = 0; ecart = 0.0001;
}else }else
{ {
ecart = 0.01; ecart = 0.01;
} }
if (compare (propertyList[name], propertyValue, ecart)) if (compare (propertyList[name], propertyValue, ecart))
{ {
notif += formatNotifString (name, value); notif += formatNotifString (propertyName[name].first, propertyName[name].second , value);
priority = setPriority (priority, 4); priority = setPriority (priority, 4);
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
propertyList[name] = propertyValue;
} }
}else if (name == "baromin") }else if (name == "baromin")
{ {
propertyValue = tohPa(pair.second.toFloat()); propertyValue = tohPa(pair.second.toFloat());
pressureVariation(propertyValue);
/*if (compare (propertyList[name], propertyValue, 100))
{
notif += formatNotifString (name, QByteArray::number(propertyValue));
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
}*/ if (compare (propertyList[name], propertyValue, 5))
{
pressureVariation(propertyValue);
notif += formatNotifString (propertyName[name].first, propertyName[name].second , QByteArray::number(propertyValue));
propertyList[name] = propertyValue;
}
}else if (name == "UV") }else if (name == "UV")
{ {
static QTime timeUV; static QDateTime timeUV = QDateTime::currentDateTime().addSecs(-600);
propertyValue = pair.second.toFloat(); propertyValue = pair.second.toFloat();
if (compare (propertyList[name], propertyValue, 1) and timeUV > QTime::currentTime().addSecs(300)) if (compare (propertyList[name], propertyValue, 1) and timeUV < QDateTime::currentDateTime())
{ {
notif += formatNotifString (name, value); notif += formatNotifString (propertyName[name].first, propertyName[name].second , value);
if (propertyValue == 5 ) if (propertyValue == 5 )
priority = setPriority (priority, 3); priority = setPriority (priority, 3);
if (propertyValue >= 6 ) if (propertyValue >= 6 )
priority = setPriority (priority, 4); priority = setPriority (priority, 4);
timeUV = timeUV.currentDateTime().addSecs(300);
propertyList[name] = propertyValue;
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
timeUV = timeUV.currentTime();
} }
}else if (name == "lowbat") }else if (name == "lowbat")
{ {
static QTime timeLowBat; static QDateTime timeLowBat = QDateTime::currentDateTime().addSecs(-4000);
if (pair.second.toInt() == 0 and timeLowBat > QTime::currentTime().addSecs(3600)) if (pair.second.toInt() == 0 and timeLowBat < QDateTime::currentDateTime())
{ {
notif += formatNotifString (name, ""); notif += formatNotifString (propertyName[name].first, propertyName[name].second );
debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG); debug (DEBUGMACRO, "Notif = #" + notif + "#", DEBUG);
priority = setPriority (priority, 4); priority = setPriority (priority, 4);
timeLowBat = timeLowBat.currentTime(); timeLowBat = timeLowBat.currentDateTime().addSecs(3600);
}
}
}
propertyList[name] = propertyValue; propertyList[name] = propertyValue;
} }
}
}
}
if (!jsonString.isEmpty()) if (!jsonString.isEmpty())
{ {
jsonString = jsonString +", " + deviceString + "}}"; jsonString = jsonString +", " + deviceString + "}}";
@@ -319,7 +345,7 @@ quint8 previsionMeteo(double currentPressure, double variation3h)
} }
} }
void pressureVariation(qfloat16 currentPressure) QString pressureVariation(double currentPressure)
{ {
const int NB_MESURES_3H = 360; // 3h × 120 mesures/heure (1 mesure toutes les 30s) const int NB_MESURES_3H = 360; // 3h × 120 mesures/heure (1 mesure toutes les 30s)
QVector<double> historiquePressions; QVector<double> historiquePressions;
@@ -340,6 +366,7 @@ void pressureVariation(qfloat16 currentPressure)
// Calcul de la variation sur 3h si on a assez de mesures // Calcul de la variation sur 3h si on a assez de mesures
if (historiquePressions.size() == NB_MESURES_3H) if (historiquePressions.size() == NB_MESURES_3H)
{ {
QString priority = "default";
double pressionInitiale = historiquePressions.front(); double pressionInitiale = historiquePressions.front();
double pressionFinale = historiquePressions.back(); double pressionFinale = historiquePressions.back();
double variation = pressionFinale - pressionInitiale; double variation = pressionFinale - pressionInitiale;
@@ -354,12 +381,14 @@ void pressureVariation(qfloat16 currentPressure)
// Exemple : Envoi d'une alerte si nécessaire // Exemple : Envoi d'une alerte si nécessaire
if (prevision == 4) if (prevision == 4)
{ {
notify ("ALERTE : " + previsionList[prevision], "high"); priority = "high";
}else if (prevision == 5) }else if (prevision == 5)
{ {
notify ("ALERTE : " + previsionList[prevision], "urgent"); priority = "urgent";
} }
return previsionList[prevision] + "," + priority;
} }
return "";
} }
quint8 setPriority (quint8 currentPriority, quint8 newPriority) quint8 setPriority (quint8 currentPriority, quint8 newPriority)
@@ -378,17 +407,17 @@ double fahrenheitToCelsius (double fahrenheit)
return (fahrenheit - 32.0) * 5.0 / 9.0; return (fahrenheit - 32.0) * 5.0 / 9.0;
} }
qfloat16 tohPa (qfloat16 value) double tohPa (double value)
{ {
return value * 33.8639; return value * 33.8639;
} }
qfloat16 mphTokmh (qfloat16 value) double mphTokmh (double value)
{ {
return value * 1.60934; return value * 1.60934;
} }
bool compare (qfloat16 value, qfloat16 currentValue, qfloat16 ecart) bool compare (double value, double currentValue, double ecart)
{ {
debug(DEBUGMACRO, "value: " + QByteArray::number(value) + "testValue: " + QByteArray::number(currentValue), DEBUG); debug(DEBUGMACRO, "value: " + QByteArray::number(value) + "testValue: " + QByteArray::number(currentValue), DEBUG);
@@ -404,30 +433,31 @@ bool compare (qfloat16 value, qfloat16 currentValue, qfloat16 ecart)
} }
} }
QString formatNotifString (QByteArray name, QByteArray value) QString formatNotifString (QString name, QString unit ,QByteArray value)
{ {
return "- " + propertyName[name].first + " : " + value + propertyName[name].second + " \n"; QString text = "- " + name + " : " + value;
if (!unit.isEmpty())
{
text += unit;
//"- " + propertyName[name].first + " : " + value + " " + propertyName[name].second + " \n";
}
return text += " \n";
} }
void notify(QString notif, QString priority) void notify(QString notif, QString priority, QString inputPath)
{ {
CURL *curl; CURL *curl;
CURLcode res; CURLcode res;
std::string readBuffer;
priority = "Priority: " + priority; priority = "Priority: " + priority;
debug (DEBUGMACRO, "notifying at priority " + priority + " - message : " + notif, DEBUG);
// Initialise libcurl // Initialise libcurl
curl_global_init(CURL_GLOBAL_DEFAULT); curl_global_init(CURL_GLOBAL_DEFAULT);
curl = curl_easy_init(); curl = curl_easy_init();
if (curl) if (curl)
{ {
// URL de ton serveur ntfy
QString url = "http://localhost:81/Meteo"; // Remplace par ton URL et topic
// Message à envoyer
QString message = notif;
// Définis les en-têtes pour le titre et les priorités // Définis les en-têtes pour le titre et les priorités
struct curl_slist *headers = NULL; struct curl_slist *headers = NULL;
headers = curl_slist_append(headers, "Title: Météo"); headers = curl_slist_append(headers, "Title: Météo");
@@ -436,11 +466,29 @@ void notify(QString notif, QString priority)
headers = curl_slist_append(headers, "Config: /etc/ntfy.client.yml"); headers = curl_slist_append(headers, "Config: /etc/ntfy.client.yml");
headers = curl_slist_append(headers, "Firebase: no"); headers = curl_slist_append(headers, "Firebase: no");
curl_mime *mime;
curl_mimepart *part;
// Initialise la structure mime
mime = curl_mime_init(curl);
// Ajoute le champ "message" (ton texte de notification)
part = curl_mime_addpart(mime);
curl_mime_name(part, "message");
curl_mime_data(part, notif.toUtf8().constData(), CURL_ZERO_TERMINATED);
// Ajoute le fichier en pièce jointe
part = curl_mime_addpart(mime);
curl_mime_name(part, "attach");
curl_mime_filedata(part, inputPath.toStdString().c_str());
curl_mime_filename(part, QFileInfo(inputPath).fileName().toStdString().c_str());
// Configure la requête POST // Configure la requête POST
curl_easy_setopt(curl, CURLOPT_URL, url.toUtf8().constData()); curl_easy_setopt(curl, CURLOPT_URL, "http://localhost:81/Meteo");
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, message.toUtf8().constData()); curl_easy_setopt(curl, CURLOPT_POSTFIELDS, notif.toUtf8().constData());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &readBuffer);
// Exécute la requête // Exécute la requête
res = curl_easy_perform(curl); res = curl_easy_perform(curl);
@@ -448,18 +496,45 @@ void notify(QString notif, QString priority)
// Vérifie les erreurs // Vérifie les erreurs
if (res != CURLE_OK) if (res != CURLE_OK)
{ {
qCritical() << "Erreur libcurl :" << curl_easy_strerror(res); debug(DEBUGMACRO, "Erreur libcurl :" + QString(curl_easy_strerror(res)), DEBUG);
} else } else
{ {
qDebug() << "Notification envoyée avec succès !"; debug(DEBUGMACRO, "Notification envoyée avec succès", DEBUG);
} }
// Nettoie les ressources // Nettoie les ressources
curl_mime_free(mime);
curl_slist_free_all(headers); curl_slist_free_all(headers);
curl_easy_cleanup(curl); curl_easy_cleanup(curl);
} }
// Nettoie libcurl // Nettoie libcurl
curl_global_cleanup(); curl_global_cleanup();
} }
void rotateAndSaveImage(const QString &inputPath, const QString &outputPath, qreal angle)
{
QImage image(inputPath);
if (image.isNull())
{
debug (DEBUGMACRO, "Impossible de charger l'image : " + inputPath, WARNING);
return;
}
// Crée une transformation pour pivoter l'image
QTransform transform;
// Décale le centre de l'image à l'origine
transform.translate(-image.width() / 2.0, -image.height() / 2.0);
// Applique la rotation
transform.rotate(angle);
// Remet le centre à sa position d'origine
transform.translate(image.width() / 2.0, image.height() / 2.0);
// Applique la transformation
QImage rotatedImage = image.transformed(transform, Qt::SmoothTransformation);
// Enregistre l'image pivotée
if (!rotatedImage.save(outputPath))
{
debug (DEBUGMACRO, "Impossible d'enregistrer l'image : ", WARNING);
}
}
pws2mqtt.h
+12 -8
View File
@@ -37,8 +37,10 @@ class Pws2mqtt : public QObject
FILE * logFh = nullptr; FILE * logFh = nullptr;
QString listenHost = "0.0.0.0"; QString listenHost = "0.0.0.0";
uint listenPort = 5000; uint listenPort = 5000;
int sockfd; int sockfd = 0;
int newsockfd; int newsockfd = 0;
QString inputPath = "./fleche.png";
QString outpuPath = "/tmp/pws2mqttFleche.png";
QList <QString> deviceProperties = QList <QString> deviceProperties =
{ {
"ieeeAddress", "type", "dateutc", "softwaretype", "action", "realtime", "freq", "wh65batt", "wh25batt", "runtime" "ieeeAddress", "type", "dateutc", "softwaretype", "action", "realtime", "freq", "wh65batt", "wh25batt", "runtime"
@@ -48,14 +50,16 @@ class Pws2mqtt : public QObject
void listeningHttp(); void listeningHttp();
void parseData(QList<std::pair<QString, QString>> queryList); void parseData(QList<std::pair<QString, QString>> queryList);
}; };
double fahrenheitToCelsius(double fahrenheit); double fahrenheitToCelsius(double fahrenheit);
qfloat16 tohPa(qfloat16 value); double tohPa(double value);
bool compare (qfloat16 value, qfloat16 testValue, qfloat16 ecart = 0.5); bool compare (double value=0, double testValue=0, double ecart = 0.5);
QString formatNotifString (QByteArray name, QByteArray value); QString formatNotifString (QString name, QString unit, QByteArray value="");
qfloat16 mphTokmh (qfloat16 value); double mphTokmh (double value);
void notify (QString notif, QString priority = "low"); void notify (QString notif, QString priority = "low", QString inputPath = "");
quint8 setPriority (quint8 currentPriority, quint8 newPriority); quint8 setPriority (quint8 currentPriority, quint8 newPriority);
quint8 previsionMeteo(double currentPressure, double variation3h); quint8 previsionMeteo(double currentPressure, double variation3h);
void pressureVariation(qfloat16 currentPressure); QString pressureVariation(double currentPressure);
void rotateAndSaveImage(const QString &inputPath, const QString &outputPath, qreal angle=0);
#endif // PWS2MQTT_H #endif // PWS2MQTT_H
version.h
+1 -1
View File
@@ -3,6 +3,6 @@
#include <string> #include <string>
std::string version = "1.0.1"; std::string version = "1.0.39";
#endif // VERSION_H #endif // VERSION_H