diff --git a/Otarcik_CAN/Config/Station.cfg b/Otarcik_CAN/Config/Station.cfg index 0b435e3..d3ef639 100644 Binary files a/Otarcik_CAN/Config/Station.cfg and b/Otarcik_CAN/Config/Station.cfg differ diff --git a/Otarcik_CAN/Logs/SystemLog.txt b/Otarcik_CAN/Logs/SystemLog.txt index 7c19922..bbba125 100644 --- a/Otarcik_CAN/Logs/SystemLog.txt +++ b/Otarcik_CAN/Logs/SystemLog.txt @@ -586,3 +586,519 @@ Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 12:32:06 2025-05-03 12:37:51 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full 2025-05-03 12:37:51 Client MQTT déconnecté. 2025-05-03 12:37:51 Passage en mode buffering des messages MQTT + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:08:02 +******************************************************************** +2025-05-03 14:08:02 Chargement de la configuration système... +2025-05-03 14:08:02 Configuration système chargée avec succès! +2025-05-03 14:08:02 Initialisation du dispositif [MasterCAN] +2025-05-03 14:08:02 Démarrage d'un module CAN... +2025-05-03 14:08:02 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:08:02 Démarrage du Watchdog CAN... +2025-05-03 14:08:02 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:08:02 Démarrage du logiciel OtarcikCAN +2025-05-03 14:08:02 Client MQTT en cours de connexion... +2025-05-03 14:08:02 Client MQTT connecté. +2025-05-03 14:08:02 Internet Connecté... +2025-05-03 14:08:02 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:08:02 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:08:02 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:08:02 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:08:02 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:09:00 Client MQTT déconnecté. +2025-05-03 14:09:00 Passage en mode buffering des messages MQTT +2025-05-03 14:09:00 Client MQTT en cours de connexion... +2025-05-03 14:09:00 Client MQTT en cours de connexion... +2025-05-03 14:09:00 Sauvegarde de la configuration système... +2025-05-03 14:09:00 Client MQTT connecté. +2025-05-03 14:09:00 Client MQTT connecté. +2025-05-03 14:11:32 Client MQTT déconnecté. +2025-05-03 14:11:32 Passage en mode buffering des messages MQTT +2025-05-03 14:11:32 Client MQTT déconnecté. +2025-05-03 14:11:32 Passage en mode buffering des messages MQTT +2025-05-03 14:11:32 Client MQTT en cours de connexion... +2025-05-03 14:11:32 Client MQTT en cours de connexion... +2025-05-03 14:11:32 Sauvegarde de la configuration système... +2025-05-03 14:11:32 Client MQTT connecté. +2025-05-03 14:11:32 Client MQTT connecté. +2025-05-03 14:11:58 Client MQTT déconnecté. +2025-05-03 14:11:58 Passage en mode buffering des messages MQTT +2025-05-03 14:11:58 Client MQTT déconnecté. +2025-05-03 14:11:58 Passage en mode buffering des messages MQTT +2025-05-03 14:11:58 Client MQTT en cours de connexion... +2025-05-03 14:11:58 Client MQTT en cours de connexion... +2025-05-03 14:11:58 Client MQTT en cours de connexion... +2025-05-03 14:11:58 Sauvegarde de la configuration système... +2025-05-03 14:11:58 Client MQTT connecté. +2025-05-03 14:11:58 Client MQTT connecté. +2025-05-03 14:11:59 Client MQTT connecté. +2025-05-03 14:13:16 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:13:16 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:13:16 Client MQTT déconnecté. +2025-05-03 14:13:16 Passage en mode buffering des messages MQTT +2025-05-03 14:13:16 Client MQTT déconnecté. +2025-05-03 14:13:16 Passage en mode buffering des messages MQTT +2025-05-03 14:13:16 Client MQTT déconnecté. +2025-05-03 14:13:16 Passage en mode buffering des messages MQTT + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:23:40 +******************************************************************** +2025-05-03 14:23:40 Chargement de la configuration système... +2025-05-03 14:23:40 Configuration système chargée avec succès! +2025-05-03 14:23:40 Initialisation du dispositif [MasterCAN] +2025-05-03 14:23:40 Démarrage d'un module CAN... +2025-05-03 14:23:40 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:23:40 Démarrage du Watchdog CAN... +2025-05-03 14:23:40 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:23:40 Démarrage du logiciel OtarcikCAN +2025-05-03 14:23:40 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:23:40 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:23:40 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:23:40 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:23:40 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:23:40 Internet Connecté... +2025-05-03 14:23:40 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:23:40 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:23:40 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:23:40 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:23:40 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:23:40 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:24:10 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:24:10 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:24:10 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:24:10 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:24:10 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:24:10 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:24:10 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:24:10 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:24:17 +******************************************************************** +2025-05-03 14:24:17 Chargement de la configuration système... +2025-05-03 14:24:17 Configuration système chargée avec succès! +2025-05-03 14:24:17 Initialisation du dispositif [MasterCAN] +2025-05-03 14:24:17 Démarrage d'un module CAN... +2025-05-03 14:24:17 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:24:17 Démarrage du Watchdog CAN... +2025-05-03 14:24:17 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:24:17 Démarrage du logiciel OtarcikCAN +2025-05-03 14:24:17 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:24:17 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:24:17 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:24:17 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:24:17 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:24:17 Internet Connecté... +2025-05-03 14:24:17 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:24:17 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:24:17 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:24:17 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:24:17 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:24:17 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:24:25 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:24:25 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:24:25 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:24:25 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:24:25 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:24:25 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:24:25 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:24:25 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:39:07 +******************************************************************** +2025-05-03 14:39:07 Chargement de la configuration système... +2025-05-03 14:39:07 Configuration système chargée avec succès! +2025-05-03 14:39:07 Initialisation du dispositif [MasterCAN] +2025-05-03 14:39:07 Démarrage d'un module CAN... +2025-05-03 14:39:07 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:39:07 Démarrage du Watchdog CAN... +2025-05-03 14:39:07 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:39:07 Démarrage du logiciel OtarcikCAN +2025-05-03 14:39:07 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:39:07 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:39:07 Client MQTT 192.168.51.32 en cours de connexion... + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:39:23 +******************************************************************** +2025-05-03 14:39:23 Chargement de la configuration système... +2025-05-03 14:39:29 Configuration système chargée avec succès! +2025-05-03 14:39:29 Initialisation du dispositif [MasterCAN] +2025-05-03 14:39:29 Démarrage d'un module CAN... +2025-05-03 14:39:29 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:39:29 Démarrage du Watchdog CAN... +2025-05-03 14:39:29 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:39:29 Démarrage du logiciel OtarcikCAN +2025-05-03 14:39:29 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:39:29 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:39:29 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:39:29 Internet Connecté... + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:43:36 +******************************************************************** +2025-05-03 14:43:36 Chargement de la configuration système... +2025-05-03 14:43:36 Configuration système chargée avec succès! +2025-05-03 14:43:36 Initialisation du dispositif [MasterCAN] +2025-05-03 14:43:36 Démarrage d'un module CAN... +2025-05-03 14:43:36 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:43:36 Démarrage du Watchdog CAN... +2025-05-03 14:43:36 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:43:36 Démarrage du logiciel OtarcikCAN +2025-05-03 14:43:36 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:43:36 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:43:36 Client MQTT 192.168.51.32 en cours de connexion... + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:47:14 +******************************************************************** +2025-05-03 14:47:14 Chargement de la configuration système... +2025-05-03 14:47:14 Configuration système chargée avec succès! +2025-05-03 14:47:14 Initialisation du dispositif [MasterCAN] +2025-05-03 14:47:14 Démarrage d'un module CAN... +2025-05-03 14:47:14 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:47:14 Démarrage du Watchdog CAN... +2025-05-03 14:47:14 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:47:14 Démarrage du logiciel OtarcikCAN +2025-05-03 14:47:14 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:47:14 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:47:14 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:47:14 Client MQTT 192.168.51.32 connecté. + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:47:45 +******************************************************************** +2025-05-03 14:47:45 Chargement de la configuration système... +2025-05-03 14:47:45 Configuration système chargée avec succès! +2025-05-03 14:47:45 Initialisation du dispositif [MasterCAN] +2025-05-03 14:47:45 Démarrage d'un module CAN... +2025-05-03 14:47:45 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:47:45 Démarrage du Watchdog CAN... +2025-05-03 14:47:45 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:47:45 Démarrage du logiciel OtarcikCAN +2025-05-03 14:47:45 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:47:45 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:47:45 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:47:45 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:47:45 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:47:45 Internet Connecté... +2025-05-03 14:47:45 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:47:45 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:47:45 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:47:45 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:47:45 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:47:45 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:47:56 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:47:56 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:47:56 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:47:56 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:47:56 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:47:56 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:47:56 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:47:56 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:48:57 +******************************************************************** +2025-05-03 14:48:57 Chargement de la configuration système... +2025-05-03 14:48:57 Configuration système chargée avec succès! +2025-05-03 14:48:57 Initialisation du dispositif [MasterCAN] +2025-05-03 14:48:57 Démarrage d'un module CAN... +2025-05-03 14:48:57 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:48:57 Démarrage du Watchdog CAN... +2025-05-03 14:48:57 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:48:57 Démarrage du logiciel OtarcikCAN +2025-05-03 14:48:57 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:48:57 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:48:57 Client MQTT 192.168.51.32 en cours de connexion... + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:49:39 +******************************************************************** +2025-05-03 14:49:39 Chargement de la configuration système... +2025-05-03 14:49:39 Configuration système chargée avec succès! +2025-05-03 14:49:39 Initialisation du dispositif [MasterCAN] +2025-05-03 14:49:39 Démarrage d'un module CAN... +2025-05-03 14:49:39 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:49:39 Démarrage du Watchdog CAN... +2025-05-03 14:49:39 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:49:39 Démarrage du logiciel OtarcikCAN +2025-05-03 14:49:39 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:49:39 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:49:39 Client MQTT 192.168.51.32 en cours de connexion... + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:50:45 +******************************************************************** +2025-05-03 14:50:45 Chargement de la configuration système... +2025-05-03 14:50:45 Configuration système chargée avec succès! +2025-05-03 14:50:45 Initialisation du dispositif [MasterCAN] +2025-05-03 14:50:45 Démarrage d'un module CAN... +2025-05-03 14:50:45 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:50:46 Démarrage du Watchdog CAN... +2025-05-03 14:50:46 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:50:46 Démarrage du logiciel OtarcikCAN +2025-05-03 14:50:46 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:50:46 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:50:46 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:50:46 Internet Connecté... + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:51:21 +******************************************************************** +2025-05-03 14:51:21 Chargement de la configuration système... +2025-05-03 14:51:21 Configuration système chargée avec succès! +2025-05-03 14:51:21 Initialisation du dispositif [MasterCAN] +2025-05-03 14:51:21 Démarrage d'un module CAN... +2025-05-03 14:51:21 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:51:21 Démarrage du Watchdog CAN... +2025-05-03 14:51:21 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:51:21 Démarrage du logiciel OtarcikCAN +2025-05-03 14:51:21 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:51:21 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:51:21 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:51:21 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:51:21 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:51:21 Internet Connecté... +2025-05-03 14:51:21 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:51:21 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:51:21 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:51:21 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:51:21 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:51:21 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:51:28 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:51:28 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:51:28 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:51:28 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:51:28 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:51:28 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:51:28 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:51:28 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:52:08 +******************************************************************** +2025-05-03 14:52:08 Chargement de la configuration système... +2025-05-03 14:52:08 Configuration système chargée avec succès! +2025-05-03 14:52:08 Initialisation du dispositif [MasterCAN] +2025-05-03 14:52:08 Démarrage d'un module CAN... +2025-05-03 14:52:08 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:52:08 Démarrage du Watchdog CAN... +2025-05-03 14:52:08 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:52:08 Démarrage du logiciel OtarcikCAN +2025-05-03 14:52:08 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:52:08 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:52:08 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:52:08 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:52:08 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:52:08 Internet Connecté... +2025-05-03 14:52:08 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:52:08 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:52:08 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:52:08 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:52:08 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:52:08 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:52:23 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:52:23 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:52:23 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:52:23 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:52:23 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:52:23 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:52:23 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:52:23 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:52:44 +******************************************************************** +2025-05-03 14:52:44 Chargement de la configuration système... +2025-05-03 14:52:44 Configuration système chargée avec succès! +2025-05-03 14:52:44 Initialisation du dispositif [MasterCAN] +2025-05-03 14:52:44 Démarrage d'un module CAN... +2025-05-03 14:52:44 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:52:44 Démarrage du Watchdog CAN... +2025-05-03 14:52:44 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:52:44 Démarrage du logiciel OtarcikCAN +2025-05-03 14:52:44 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:52:44 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:52:44 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:53:33 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:53:36 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:53:36 Client MQTT metrics.yultek.dev déconnecté pendant une reconnexion. +2025-05-03 14:53:36 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:53:36 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:53:36 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:53:36 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:53:36 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:53:36 Internet Connecté... +2025-05-03 14:53:41 Tentative de connexion au serveur MQTT... +2025-05-03 14:53:41 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:54:14 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:54:14 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:54:14 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:54:14 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:54:14 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:54:19 Tentative de connexion au serveur MQTT... +2025-05-03 14:54:19 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:54:19 Tentative de connexion au serveur MQTT... +2025-05-03 14:54:19 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:54:19 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:54:19 Client MQTT 192.168.51.32 connecté. + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:54:24 +******************************************************************** +2025-05-03 14:54:24 Chargement de la configuration système... +2025-05-03 14:54:24 Configuration système chargée avec succès! +2025-05-03 14:54:24 Initialisation du dispositif [MasterCAN] +2025-05-03 14:54:24 Démarrage d'un module CAN... +2025-05-03 14:54:24 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:54:24 Démarrage du Watchdog CAN... +2025-05-03 14:54:24 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:54:24 Démarrage du logiciel OtarcikCAN +2025-05-03 14:54:24 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:54:24 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:54:24 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:54:24 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:54:24 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:54:24 Internet Connecté... +2025-05-03 14:54:24 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:54:24 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:54:24 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:54:24 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:54:24 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:54:24 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:54:28 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:54:28 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:54:28 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:54:28 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:54:28 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:54:28 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:54:28 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:54:28 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:55:02 +******************************************************************** +2025-05-03 14:55:02 Chargement de la configuration système... +2025-05-03 14:55:02 Configuration système chargée avec succès! +2025-05-03 14:55:02 Initialisation du dispositif [MasterCAN] +2025-05-03 14:55:02 Démarrage d'un module CAN... +2025-05-03 14:55:02 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:55:02 Démarrage du Watchdog CAN... +2025-05-03 14:55:02 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:55:02 Démarrage du logiciel OtarcikCAN +2025-05-03 14:55:02 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:55:02 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:55:02 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:55:02 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:55:02 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:55:02 Internet Connecté... +2025-05-03 14:55:02 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:55:02 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:55:02 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:55:02 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:55:02 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:55:02 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:55:11 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:55:11 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:55:11 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:55:11 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:55:11 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:55:11 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:55:11 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:55:11 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:56:20 +******************************************************************** +2025-05-03 14:56:20 Chargement de la configuration système... +2025-05-03 14:56:20 Configuration système chargée avec succès! +2025-05-03 14:56:20 Initialisation du dispositif [MasterCAN] +2025-05-03 14:56:20 Démarrage d'un module CAN... +2025-05-03 14:56:20 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:56:20 Démarrage du Watchdog CAN... +2025-05-03 14:56:20 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:56:20 Démarrage du logiciel OtarcikCAN +2025-05-03 14:56:20 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:56:20 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:56:20 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:56:21 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:56:21 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:56:21 Internet Connecté... +2025-05-03 14:56:21 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:56:21 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:56:21 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:56:21 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:56:21 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:56:21 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:56:52 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:56:52 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:56:57 Tentative de connexion au serveur MQTT... +2025-05-03 14:56:57 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:56:57 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:57:17 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:57:17 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:57:17 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:57:17 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:57:17 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:57:17 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:57:17 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:57:17 Passage en mode buffering des messages MQTT pour 192.168.51.32 + + +******************************************************************** +Démarrage du logiciel Otarcik CAN version 1.07-DBG le 2025-05-03 à 14:58:46 +******************************************************************** +2025-05-03 14:58:46 Chargement de la configuration système... +2025-05-03 14:58:46 Configuration système chargée avec succès! +2025-05-03 14:58:46 Initialisation du dispositif [MasterCAN] +2025-05-03 14:58:46 Démarrage d'un module CAN... +2025-05-03 14:58:46 Impossible de trouver le module CAN sur le channel 1 +2025-05-03 14:58:46 Démarrage du Watchdog CAN... +2025-05-03 14:58:46 Watchdog CAN initialisé pour le module sur le channel 1 +2025-05-03 14:58:46 Démarrage du logiciel OtarcikCAN +2025-05-03 14:58:46 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:58:46 Client MQTT metrics.yultek.dev en cours de connexion... +2025-05-03 14:58:46 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:58:46 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:58:46 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:58:46 Internet Connecté... +2025-05-03 14:58:46 LAN Device 192.168.50.100 is now ONLINE on network +2025-05-03 14:58:46 LAN Device 192.168.50.110 is now ONLINE on network +2025-05-03 14:58:46 LAN Device 192.168.51.32 is now ONLINE on network +2025-05-03 14:58:46 LAN Device 192.168.51.2 is now ONLINE on network +2025-05-03 14:58:46 LAN Device 192.168.51.34 is now ONLINE on network +2025-05-03 14:58:46 Client MQTT metrics.yultek.dev connecté. +2025-05-03 14:58:56 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:58:56 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:59:01 Tentative de connexion au serveur MQTT... +2025-05-03 14:59:01 Client MQTT 192.168.51.32 en cours de connexion... +2025-05-03 14:59:01 Client MQTT 192.168.51.32 connecté. +2025-05-03 14:59:22 Déinitialisation du module PCAN USB ID 81 +2025-05-03 14:59:22 Impossible de déinitialiser un module USB PCAN.. Error:The transmit buffer in CAN controller is full +2025-05-03 14:59:22 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:59:22 Passage en mode buffering des messages MQTT pour 192.168.51.32 +2025-05-03 14:59:22 Client MQTT metrics.yultek.dev déconnecté. +2025-05-03 14:59:22 Passage en mode buffering des messages MQTT pour metrics.yultek.dev +2025-05-03 14:59:22 Client MQTT 192.168.51.32 déconnecté. +2025-05-03 14:59:22 Passage en mode buffering des messages MQTT pour 192.168.51.32 diff --git a/Otarcik_CAN/Makefile.Debug b/Otarcik_CAN/Makefile.Debug index 9ab4f2d..08123e1 100644 --- a/Otarcik_CAN/Makefile.Debug +++ b/Otarcik_CAN/Makefile.Debug @@ -3759,14 +3759,7 @@ debug/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/LANDevicePresenceConfig.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ - ui_MainWindow.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QStatusBar \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstatusbar.h + ui_MainWindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o debug\MainWindow.o Sources\MainWindow.cpp debug/PCANInterface.o: Sources/PCANInterface.cpp Sources/PCANInterface.h \ @@ -4376,55 +4369,10 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ ui_GeneralStatusPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHeaderView \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qheaderview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QStringList \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QScrollBar \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qscrollbar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QLibrary \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlibrary.h \ Sources/OtarcikCan.h \ @@ -4432,7 +4380,18 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ Sources/Gui/CANbusSettingsPage.h \ Sources/CANBus/CANDevice.h \ Sources/CANBus/CANAnalyzer.h \ @@ -4457,6 +4416,8 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -4473,6 +4434,7 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -4480,6 +4442,7 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -4504,6 +4467,7 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ @@ -4575,6 +4539,7 @@ debug/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/General C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -4908,52 +4873,6 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ ui_CANViewerPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHeaderView \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qheaderview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPlainTextEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qplaintextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qabstracttextdocumentlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qglyphrun.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qrawfont.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ Sources/defines.h \ Sources/CANBus/CANDevice.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ @@ -4974,6 +4893,8 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -4990,6 +4911,7 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -4997,6 +4919,7 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -5022,6 +4945,7 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ @@ -5094,6 +5018,7 @@ debug/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage.h C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -5969,60 +5894,6 @@ debug/CANbusSettingsPage.o: Sources/Gui/CANbusSettingsPage.cpp Sources/Gui/CANbu Sources/CloudLogging/CloudParams.h \ Sources/CANBus/CANWatchdog.h \ ui_CANbusSettingsPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHeaderView \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qheaderview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QListWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPlainTextEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qplaintextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qabstracttextdocumentlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qglyphrun.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qrawfont.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpinBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFileDialog \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qfiledialog.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ @@ -6038,7 +5909,18 @@ debug/CANbusSettingsPage.o: Sources/Gui/CANbusSettingsPage.cpp Sources/Gui/CANbu Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ Sources/Gui/GeneralStatusPage.h \ Sources/ComputerBoardInterface.h \ Sources/ComputerBoardState.h \ @@ -6168,63 +6050,24 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/LANDevicePresenceConfig.h \ ui_LoggingSettingsPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QListWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpinBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qspinbox.h \ Sources/defines.h \ Sources/OtarcikCan.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ Sources/Gui/GeneralStatusPage.h \ Sources/ComputerBoardInterface.h \ Sources/ComputerBoardState.h \ @@ -6252,6 +6095,8 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -6268,6 +6113,7 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -6275,6 +6121,7 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -6300,6 +6147,7 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ @@ -6372,6 +6220,7 @@ debug/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/Log C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -8234,39 +8083,6 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ Sources/PCAN/PCANBasic.h \ ui_CCANWatchdogSettingsPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpinBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qspinbox.h \ Sources/CANBus/CANDevice.h \ Sources/defines.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ @@ -8292,6 +8108,8 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -8308,6 +8126,7 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -8315,6 +8134,7 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -8413,6 +8233,7 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -8488,10 +8309,13 @@ debug/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sourc Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ diff --git a/Otarcik_CAN/Makefile.Release b/Otarcik_CAN/Makefile.Release index 7b4ea2c..32cb31a 100644 --- a/Otarcik_CAN/Makefile.Release +++ b/Otarcik_CAN/Makefile.Release @@ -3759,14 +3759,7 @@ release/MainWindow.o: Sources/MainWindow.cpp Sources/MainWindow.h \ Sources/LANDevicePresenceConfig.h \ Sources/Gui/CCANWatchdogSettingsPage.h \ Sources/CANBus/CANWatchdogConfig.h \ - ui_MainWindow.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QStatusBar \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstatusbar.h + ui_MainWindow.h $(CXX) -c $(CXXFLAGS) $(INCPATH) -o release\MainWindow.o Sources\MainWindow.cpp release/PCANInterface.o: Sources/PCANInterface.cpp Sources/PCANInterface.h \ @@ -4376,55 +4369,10 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qtimer.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qbasictimer.h \ ui_GeneralStatusPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHeaderView \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qheaderview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QStringList \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QScrollBar \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qscrollbar.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QLibrary \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qlibrary.h \ Sources/OtarcikCan.h \ @@ -4432,7 +4380,18 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ Sources/Gui/CANbusSettingsPage.h \ Sources/CANBus/CANDevice.h \ Sources/CANBus/CANAnalyzer.h \ @@ -4457,6 +4416,8 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -4473,6 +4434,7 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -4480,6 +4442,7 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -4504,6 +4467,7 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ @@ -4575,6 +4539,7 @@ release/GeneralStatusPage.o: Sources/Gui/GeneralStatusPage.cpp Sources/Gui/Gener C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -4908,52 +4873,6 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ ui_CANViewerPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHeaderView \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qheaderview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPlainTextEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qplaintextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qabstracttextdocumentlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qglyphrun.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qrawfont.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ Sources/defines.h \ Sources/CANBus/CANDevice.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ @@ -4974,6 +4893,8 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -4990,6 +4911,7 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -4997,6 +4919,7 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -5022,6 +4945,7 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ @@ -5094,6 +5018,7 @@ release/CANViewerPage.o: Sources/Gui/CANViewerPage.cpp Sources/Gui/CANViewerPage C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -5969,60 +5894,6 @@ release/CANbusSettingsPage.o: Sources/Gui/CANbusSettingsPage.cpp Sources/Gui/CAN Sources/CloudLogging/CloudParams.h \ Sources/CANBus/CANWatchdog.h \ ui_CANbusSettingsPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QHeaderView \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qheaderview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QListWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPlainTextEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qplaintextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qabstracttextdocumentlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextlayout.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qglyphrun.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qrawfont.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qfontdatabase.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpinBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTableWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtablewidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtableview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QFileDialog \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qfiledialog.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdialog.h \ @@ -6038,7 +5909,18 @@ release/CANbusSettingsPage.o: Sources/Gui/CANbusSettingsPage.cpp Sources/Gui/CAN Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ Sources/Gui/GeneralStatusPage.h \ Sources/ComputerBoardInterface.h \ Sources/ComputerBoardState.h \ @@ -6168,63 +6050,24 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QList \ Sources/LANDevicePresenceConfig.h \ ui_LoggingSettingsPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QCheckBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcheckbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLineEdit \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlineedit.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QListWidget \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlistview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemview.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpinBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qspinbox.h \ Sources/defines.h \ Sources/OtarcikCan.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextformat.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qpen.h \ Sources/Gui/GeneralStatusPage.h \ Sources/ComputerBoardInterface.h \ Sources/ComputerBoardState.h \ @@ -6252,6 +6095,8 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -6268,6 +6113,7 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -6275,6 +6121,7 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -6300,6 +6147,7 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qhistorystate.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qidentityproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qisenum.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qitemselectionmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonarray.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsonvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qjsondocument.h \ @@ -6372,6 +6220,7 @@ release/LoggingSettingsPage.o: Sources/Gui/LoggingSettingsPage.cpp Sources/Gui/L C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -8234,39 +8083,6 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QString \ Sources/PCAN/PCANBasic.h \ ui_CCANWatchdogSettingsPage.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QApplication \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qdesktopwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qguiapplication.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qinputmethod.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QComboBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qcombobox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractitemdelegate.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyleoption.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractspinbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qvalidator.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractslider.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qstyle.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabbar.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qrubberband.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QGroupBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qgroupbox.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QLabel \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qlabel.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QPushButton \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qpushbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractbutton.h \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QSpinBox \ - C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qspinbox.h \ Sources/CANBus/CANDevice.h \ Sources/defines.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QObject \ @@ -8292,6 +8108,8 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QtCoreDepends \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractanimation.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstracteventdispatcher.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qeventloop.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractitemmodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractnativeeventfilter.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qabstractstate.h \ @@ -8308,6 +8126,7 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborvalue.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdatetime.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborcommon.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qregularexpression.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/quuid.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcbormap.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcborstream.h \ @@ -8315,6 +8134,7 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcollator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcommandlineparser.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcoreapplication.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qconcatenatetablesproxymodel.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qcryptographichash.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/qdeadlinetimer.h \ @@ -8413,6 +8233,7 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qnetworkrequest.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QSharedDataPointer \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QUrl \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtCore/QVariant \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qabstractsocket.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qauthenticator.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtNetwork/qdnslookup.h \ @@ -8488,10 +8309,13 @@ release/CCANWatchdogSettingsPage.o: Sources/Gui/CCANWatchdogSettingsPage.cpp Sou Sources/MainWindow.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QMainWindow \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qmainwindow.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtabwidget.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qicon.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTabWidget \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/QTextEdit \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qtextedit.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qabstractscrollarea.h \ + C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtWidgets/qframe.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextdocument.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextoption.h \ C:/Qt/Qt5.14.2/5.14.2/mingw73_64/include/QtGui/qtextcursor.h \ diff --git a/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp b/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp index 25effb6..dc7e0e2 100644 --- a/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp +++ b/Otarcik_CAN/Sources/CANBus/CANDataLogger.cpp @@ -4,8 +4,7 @@ CCANDataLogger::CCANDataLogger(): mTopicDeviceString("") { - mMQTTCLient = 0; - mCANMsgList.clear(); + mCANMsgList.clear(); } @@ -51,11 +50,6 @@ int CCANDataLogger::SetMQTTTopicDevice(QString DeviceString) return RET_OK; } -int CCANDataLogger::SetMQTTClient(CMQTTClientWrapper *MQTTClient) -{ - mMQTTCLient = MQTTClient; - return RET_OK; -} QList *CCANDataLogger::GetMQTTMessagesList() { @@ -115,10 +109,6 @@ QList *CCANDataLogger::GetMQTTMessagesList() mCANMsgList.clear(); -// if(mMQTTCLient != 0) -// { -// mMQTTCLient->NewMQTTMessages(mMQTTMsgList); -// } return &mMQTTMsgList; } diff --git a/Otarcik_CAN/Sources/CANBus/CANDataLogger.h b/Otarcik_CAN/Sources/CANBus/CANDataLogger.h index e3ed6cd..3e8b1c1 100644 --- a/Otarcik_CAN/Sources/CANBus/CANDataLogger.h +++ b/Otarcik_CAN/Sources/CANBus/CANDataLogger.h @@ -18,12 +18,10 @@ public: //MQTT logging QString mTopicDeviceString; QList mMQTTMsgList; - CMQTTClientWrapper *mMQTTCLient; QList mCANMsgList; CMQTTMessage GetMQTTMessage(CCANMessage* Message, bool Format = false); int SetMQTTTopicDevice(QString DeviceString); - int SetMQTTClient(CMQTTClientWrapper *MQTTClient); QList *GetMQTTMessagesList(); diff --git a/Otarcik_CAN/Sources/CANBus/CANDevice.cpp b/Otarcik_CAN/Sources/CANBus/CANDevice.cpp index 88693b9..d008dfd 100644 --- a/Otarcik_CAN/Sources/CANBus/CANDevice.cpp +++ b/Otarcik_CAN/Sources/CANBus/CANDevice.cpp @@ -13,7 +13,7 @@ CCANDevice::CCANDevice(QObject *parent) mProgramPtr = 0; } -CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper *MQTTClient, QString DeviceTopicPrefix) +CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, QString DeviceTopicPrefix) { mMessageList.clear(); mMessagesListLoaded = false; @@ -21,7 +21,6 @@ CCANDevice::CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper *MQTTClie mProgramPtr = 0; mDeviceConfigInfo = SysConfig; - mCANMQTTClient = MQTTClient; mDeviceTopicPrefix = DeviceTopicPrefix; mCANDriverIF = 0; @@ -101,7 +100,6 @@ int CCANDevice::Init() #else mCANDataLogger.SetMQTTTopicDevice(QString("CANBus/%1/").arg(mDeviceConfigInfo.mDeviceName)); #endif - mCANDataLogger.SetMQTTClient(mCANMQTTClient); mProgramPtr->SetCANConnectionStatusRequest(true); mProgramPtr->UpdateCANModuleStatusRequest(mDeviceConfigInfo.mDeviceName,"Connecté","NOUPDATE"); diff --git a/Otarcik_CAN/Sources/CANBus/CANDevice.h b/Otarcik_CAN/Sources/CANBus/CANDevice.h index f86e2e6..f526c62 100644 --- a/Otarcik_CAN/Sources/CANBus/CANDevice.h +++ b/Otarcik_CAN/Sources/CANBus/CANDevice.h @@ -24,7 +24,7 @@ class CCANDevice : public QObject Q_OBJECT public: explicit CCANDevice(QObject *parent = 0); - CCANDevice(CCANDeviceConfig &SysConfig, CMQTTClientWrapper* MQTTClient = 0, QString DeviceTopicPrefix=""); + CCANDevice(CCANDeviceConfig &SysConfig, QString DeviceTopicPrefix=""); ~CCANDevice(); int Init(QString DatabaseFileName, TPCANHandle CANDeviceID, TPCANBaudrate CANDeviceBaudRate, QString DevDescription, QString DeviceName, unsigned int DevicePollPeriod); @@ -40,7 +40,6 @@ public: CCANAnalyzer mCANAnalyzer; //The module that handles the USB puck and decodes the data CCANDatabase mCANDatabase; //The device's database loaded from dbc file CCANDataLogger mCANDataLogger; - CMQTTClientWrapper *mCANMQTTClient; QString mDeviceTopicPrefix; CCANWatchdog mCANWatchdog; diff --git a/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp b/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp index 14a1233..f4af3de 100644 --- a/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp +++ b/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.cpp @@ -175,11 +175,12 @@ void CMQTTClientWrapper::StateChanged() { //Connection attempt failed, just restart the timer... mMQTTReconnectTimer->start(MQTT_CLIENT_RECONNECT_TIMEOUT); - CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT déconnecté pendant une reconnexion. ","CMQTTClientWrapper",true,1); + + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Client MQTT %1 déconnecté pendant une reconnexion. ").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,1); } else { - CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT déconnecté.","CMQTTClientWrapper",true,1); + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Client MQTT %1 déconnecté.").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,1); mProgramPtr->SetMQTTConnectionSatusRequest(false); #ifndef ENABLE_DEVELOPMENT_DEBUG_TOOLS mMQTTReconnectTimer->start(MQTT_CLIENT_RECONNECT_TIMEOUT); @@ -195,7 +196,7 @@ void CMQTTClientWrapper::StateChanged() if(mDisconnectionIsVoluntary == false) { mMessagesQueueMode = MQTT_QUEUE_MSG_MODE; //We're disconnected, queue all the messages. - CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Passage en mode buffering des messages MQTT","CMQTTClientWrapper",true,1); + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Passage en mode buffering des messages MQTT pour %1").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,1); mBufferingModeText = "Buffering"; UpdateGUIBufferingStatus(); } @@ -207,11 +208,11 @@ void CMQTTClientWrapper::StateChanged() mProgramPtr->SetMQTTConnectionSatusRequest(true); mMQTTReconnectTimer->stop(); mIsClientConnecting = false; - CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT connecté.","CMQTTClientWrapper",true,1); + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Client MQTT %1 connecté.").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,1); if(mMQTTMessagesQueue.isEmpty() == false) { mMessagesQueueMode = MQTT_QUEUE_MSG_MODE; //Stay in (or enter) queue mode until we empty the buffer - CGeneralMessagesLogDispatcher::instance()->AddLogMessage("FIFO non vide, passage au mode de vidage de la FIFO","CMQTTClientWrapper",true,2); + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("FIFO non vide, passage au mode de vidage de la FIFO pour %1").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,2); mBufferingModeText = "Buffering"; mCircularBufferStatusText = QString("%2/%1 messages (0%3\%)").arg(MQTT_CLIENT_MSG_QUEUE_SIZE).arg(mMQTTMessagesQueue.size()).arg((mMQTTMessagesQueue.size()/MQTT_CLIENT_MSG_QUEUE_SIZE)*100); @@ -234,7 +235,8 @@ void CMQTTClientWrapper::StateChanged() case QMqttClient::Connecting: { mIsClientConnecting = true; - CGeneralMessagesLogDispatcher::instance()->AddLogMessage("Client MQTT en cours de connexion... ","CMQTTClientWrapper",true,1); + CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Client MQTT %1 en cours de connexion... ").arg(mMQTTParams.mMQTTBrokerHostName),"CMQTTClientWrapper",true,1); + mProgramPtr->SetMQTTConnectionSatusRequest(false); break; } } @@ -414,6 +416,32 @@ void CMQTTClientWrapper::MQTTClientError(QMqttClient::ClientError error) CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Erreur du client MQTT: %1").arg(error),"CMQTTClientWrapper",true,2); } +bool CMQTTClientWrapper::IsMQTTClientConnected() +{ + if(mMQTTClient.state() != QMqttClient::Connected) + return false; + else + return true; +} + +QString CMQTTClientWrapper::GetMQTTClientConnectionState() +{ + QString StateText; + if(mMQTTClient.state() == QMqttClient::Connected) + { + StateText = QString("%1 : Connecté").arg(mMQTTParams.mMQTTBrokerHostName); + } + else if(mMQTTClient.state() == QMqttClient::Connecting) + { + StateText = QString("%1 : En connexion...").arg(mMQTTParams.mMQTTBrokerHostName); + } + else + { + StateText = QString("%1 : Déconnecté").arg(mMQTTParams.mMQTTBrokerHostName); + } + return StateText; +} + //This function is used only when flushing the msg queue void CMQTTClientWrapper::MQTTMessageSent(qint32 MsgID) { diff --git a/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h b/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h index 0cb8c2d..6c33bc7 100644 --- a/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h +++ b/Otarcik_CAN/Sources/CloudLogging/MQTTClientWrapper.h @@ -41,6 +41,8 @@ public: int StartMQTTClient(); int StopMQTTClient(); quint64 GetMQTTServerPresenceCANMask(); + bool IsMQTTClientConnected(); + QString GetMQTTClientConnectionState(); #ifdef ENABLE_DEVELOPMENT_DEBUG_TOOLS int ForceMQTTClientDisconnection(bool Disconnect); diff --git a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp index 432e9f8..04de8a1 100644 --- a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp +++ b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.cpp @@ -13,7 +13,7 @@ CGeneralStatusPage::CGeneralStatusPage(QWidget *parent) : connect(ui->mClearGenMsgTxtBtn,&QPushButton::clicked,this,&CGeneralStatusPage::ClearGenMsgAreaBtnPressed); connect(ui->mQuitAppBtn,&QPushButton::clicked,this,&CGeneralStatusPage::QuitAppBtnPressed); - SetMQTTConnectionStatus(false); + //SetMQTTConnectionStatus(false); SetCANConnectionStatus(false); ui->mCANModuleStatusTableWdgt->setColumnCount(3); @@ -155,6 +155,11 @@ int CGeneralStatusPage::SetMQTTConnectionStatus(bool Connected) return RET_OK; } +int CGeneralStatusPage::SetMQTTConnectionStatus(QString Status) +{ + ui->mClientMQTTConnStatLbl->setText(Status); +} + int CGeneralStatusPage::SetCANConnectionStatus(bool Connected) { diff --git a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h index 14ae353..8533c0d 100644 --- a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h +++ b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.h @@ -46,6 +46,7 @@ public: int AddGeneralMsgBoxLineEntry(QString LineTxt); int SetMQTTConnectionStatus(bool Connected); + int SetMQTTConnectionStatus(QString Status); int SetCANConnectionStatus(bool Connected); int UpdateCANModuleStatus(QString ModuleName, QString ModuleStatus, QString Buffer); int ClearCANModuleStatusTable(); diff --git a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.ui b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.ui index d0ca582..c48cdab 100644 --- a/Otarcik_CAN/Sources/Gui/GeneralStatusPage.ui +++ b/Otarcik_CAN/Sources/Gui/GeneralStatusPage.ui @@ -47,31 +47,13 @@ Nettoyer - + 1200 210 - 101 - 16 - - - - - 12 - - - - Client MQTT: - - - - - - 1300 - 210 - 121 - 16 + 251 + 131 @@ -84,6 +66,9 @@ Déconnecté + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + @@ -131,8 +116,8 @@ - 1230 - 240 + 1200 + 180 61 16 @@ -149,8 +134,8 @@ - 1300 - 240 + 1270 + 180 121 16 @@ -254,8 +239,8 @@ - 1210 - 290 + 1200 + 370 201 121 diff --git a/Otarcik_CAN/Sources/OtarcikCan.cpp b/Otarcik_CAN/Sources/OtarcikCan.cpp index 43b173d..7146d4c 100644 --- a/Otarcik_CAN/Sources/OtarcikCan.cpp +++ b/Otarcik_CAN/Sources/OtarcikCan.cpp @@ -23,7 +23,7 @@ COtarcikCan::COtarcikCan(QObject *parent) : QObject(parent) { mGPTimer = new QTimer; connect(mGPTimer,SIGNAL(timeout()),this,SLOT(GPTimerExpired())); - mCANBusMQTTClient.mProgramPtr = this; +// mCANBusMQTTClient.mProgramPtr = this; mWatchdogTimer = new QTimer; connect(mWatchdogTimer,&QTimer::timeout,this,&COtarcikCan::WatchdogUpdateTimerExpired); mWatchdogTimer->setSingleShot(false); @@ -41,7 +41,14 @@ COtarcikCan::~COtarcikCan() } mCANDevicesList.clear(); - mCANBusMQTTClient.DisconnectFromBroker(); + while(!mCANBusMQTTClientList.isEmpty()) + { + + mCANBusMQTTClientList.first()->DisconnectFromBroker(); + delete mCANBusMQTTClientList.takeFirst(); + } + + // mCANBusMQTTClient.DisconnectFromBroker(); delete mGPTimer; @@ -84,12 +91,21 @@ int COtarcikCan::Start() mCloudLoggingParamsList = mSystemConfig.GetCloudParams(); mMainWindow.mDataLoggingSettingsPage->SetCloudParams(mCloudLoggingParamsList); - mCANBusMQTTClient.SetMQTTParams(mCloudLoggingParamsList->at(0)); //TODO: Fix that - mCANBusMQTTClient.SetCANDevicesList(&mCANDevicesList); + for(int i = 0; i < mCloudLoggingParamsList->size(); i++) + { + CMQTTClientWrapper *NewMQTTWrapper = new CMQTTClientWrapper; + NewMQTTWrapper->mProgramPtr = this; + NewMQTTWrapper->SetMQTTParams(mCloudLoggingParamsList->at(i)); + NewMQTTWrapper->SetCANDevicesList(&mCANDevicesList); #ifdef ENABLE_CHIPSET_DRIVER - mCANBusMQTTClient.SetCPUInterface(&mCPUInterface); + NewMQTTWrapper->SetCPUInterface(&mCPUInterface); #endif - mCANBusMQTTClient.SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit); + NewMQTTWrapper->SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit); + mCANBusMQTTClientList.append(NewMQTTWrapper); + } +// mCANBusMQTTClient.SetMQTTParams(mCloudLoggingParamsList->at(0)); //TODO: Fix that +// mCANBusMQTTClient.SetCANDevicesList(&mCANDevicesList); + mGeneralSystemParams = *mSystemConfig.GetGeneralSystemSettings(); mMainWindow.mDataLoggingSettingsPage->SetGeneralSettingsParams(&mGeneralSystemParams); @@ -107,7 +123,8 @@ int COtarcikCan::Start() mInternetMonitor.Start(mSystemConfig.GetDeviceDetectionConfig()->mInternetDetectionCANStatusBit); mLANDevicesPresenceMonitor.Start(mSystemConfig.GetDeviceDetectionConfig()->GetLANDevicesConfigList()); - mSystemConfig.mDeviceDetectionParams.SetCANPresenceMonitors(&mCANBusMQTTClient,&mLANDevicesPresenceMonitor,&mInternetMonitor); + //mSystemConfig.mDeviceDetectionParams.SetCANPresenceMonitors(&mCANBusMQTTClient,&mLANDevicesPresenceMonitor,&mInternetMonitor); TODO: Add a bit for each MQTT client? + mSystemConfig.mDeviceDetectionParams.SetCANPresenceMonitors(mCANBusMQTTClientList.at(0),&mLANDevicesPresenceMonitor,&mInternetMonitor); for(int i = 0; i < mCANDevicesList.size(); i++) { mCANDevicesList.at(i)->StartWatchdog(mSystemConfig.GetDeviceDetectionConfig()); @@ -140,7 +157,11 @@ int COtarcikCan::Start() CGeneralMessagesLogDispatcher::instance()->AddLogMessage(QString("Démarrage du logiciel OtarcikCAN"),"CPCANInterface"); // mCANBusMQTTClient.ConnectToBroker(); - mCANBusMQTTClient.StartMQTTClient(); + //mCANBusMQTTClient.StartMQTTClient(); + for(int i = 0; i < mCANBusMQTTClientList.size(); i++) + { + mCANBusMQTTClientList.at(i)->StartMQTTClient(); + } mMainWindow.mCANbusSettingsPage->SetDevicesList(&mCANDevicesList); connect(&mInternetMonitor,&CInternetMonitor::InternetStateChanged,mMainWindow.mGeneralStatusPage,&CGeneralStatusPage::InternetStatusChanged); @@ -206,7 +227,7 @@ int COtarcikCan::PopulateCANDevicesList(QList *CANDeviceConf for(int i = 0; i < CANDeviceConfigList->size(); i++) { - CCANDevice *NewDevice = new CCANDevice(*CANDeviceConfigList->at(i),&mCANBusMQTTClient,mSystemConfig.mCloudLoggingParamsList[0]->mMQTTTopicPrefix); //TODO fix the cloud + CCANDevice *NewDevice = new CCANDevice(*CANDeviceConfigList->at(i),mSystemConfig.mCloudLoggingParamsList[0]->mMQTTTopicPrefix); //TODO fix the cloud NewDevice->mProgramPtr = this; NewDevice->Init(); mCANDevicesList.append(NewDevice); @@ -227,7 +248,28 @@ int COtarcikCan::SaveCloudLoggingConfigRequest(QList *CloudParam mSystemConfig.SetCloudParamsList(CloudParams); mCloudLoggingParamsList = mSystemConfig.GetCloudParams(); - mCANBusMQTTClient.SetMQTTParams(mCloudLoggingParamsList->at(0)); //TODO: Fix + + while(!mCANBusMQTTClientList.isEmpty()) + { + mCANBusMQTTClientList.first()->DisconnectFromBroker(); + delete mCANBusMQTTClientList.takeFirst(); + } + for(int i = 0; i < CloudParams->size(); i++) + { + CMQTTClientWrapper *NewMQTTWrapper = new CMQTTClientWrapper; + NewMQTTWrapper->mProgramPtr = this; + NewMQTTWrapper->SetMQTTParams(CloudParams->at(i)); + NewMQTTWrapper->SetCANDevicesList(&mCANDevicesList); +#ifdef ENABLE_CHIPSET_DRIVER + NewMQTTWrapper->SetCPUInterface(&mCPUInterface); +#endif + NewMQTTWrapper->SetMQTTServerPresenceCANBit(mSystemConfig.GetDeviceDetectionConfig()->mMQTTDetectionCANStatusBit); + mCANBusMQTTClientList.append(NewMQTTWrapper); + + NewMQTTWrapper->StartMQTTClient(); + } + mSystemConfig.mDeviceDetectionParams.SetCANPresenceMonitors(mCANBusMQTTClientList.at(0),&mLANDevicesPresenceMonitor,&mInternetMonitor); + //mCANBusMQTTClient.SetMQTTParams(mCloudLoggingParamsList->at(0)); //TODO: Fix if(mSystemConfig.SaveConfig() == RET_OK) { @@ -284,7 +326,11 @@ int COtarcikCan::SaveDeviceDetectionSettingsRequest(CDeviceDetectionConfig *Devi mLANDevicesPresenceMonitor.Stop(); mLANDevicesPresenceMonitor.Start(DeviceDetectconfig->GetLANDevicesConfigList()); mInternetMonitor.UpdateCANReportingBit(DeviceDetectconfig->mInternetDetectionCANStatusBit); - mCANBusMQTTClient.SetMQTTServerPresenceCANBit(DeviceDetectconfig->mMQTTDetectionCANStatusBit); + for(int i = 0; i < mCANBusMQTTClientList.size(); i++) + { + mCANBusMQTTClientList.at(i)->SetMQTTServerPresenceCANBit(DeviceDetectconfig->mMQTTDetectionCANStatusBit); + } + // mCANBusMQTTClient.SetMQTTServerPresenceCANBit(DeviceDetectconfig->mMQTTDetectionCANStatusBit); return RET_OK; } @@ -300,8 +346,18 @@ int COtarcikCan::SetCANConnectionStatusRequest(bool Connected) int COtarcikCan::SetMQTTConnectionSatusRequest(bool Connected) { + QString MQTTStates("Clients MQTT:\n"); + for(int i = 0; i < mCANBusMQTTClientList.size(); i++) + { + CMQTTClientWrapper *Wrapper = mCANBusMQTTClientList.at(i); + MQTTStates.append(Wrapper->GetMQTTClientConnectionState()); + MQTTStates.append("\n"); + + } mMainWindow.mDataLoggingSettingsPage->SetMQTTPresenceStatus(Connected); - return mMainWindow.mGeneralStatusPage->SetMQTTConnectionStatus(Connected); + mMainWindow.mGeneralStatusPage->SetMQTTConnectionStatus(MQTTStates); + + return RET_OK; } int COtarcikCan::UpdateCANModuleStatusRequest(QString ModuleName, QString ModuleStatus, QString Buffer) @@ -350,7 +406,7 @@ void COtarcikCan::QuitApplicationRequest() int COtarcikCan::ForceMQTTDisconnect(bool Disconnect) { - mCANBusMQTTClient.ForceMQTTClientDisconnection(Disconnect); + // mCANBusMQTTClient.ForceMQTTClientDisconnection(Disconnect); } #endif diff --git a/Otarcik_CAN/Sources/OtarcikCan.h b/Otarcik_CAN/Sources/OtarcikCan.h index 5b4b478..8088c24 100644 --- a/Otarcik_CAN/Sources/OtarcikCan.h +++ b/Otarcik_CAN/Sources/OtarcikCan.h @@ -25,7 +25,8 @@ public: ~COtarcikCan(); CMainWindow mMainWindow; CSystemConfig mSystemConfig; - CMQTTClientWrapper mCANBusMQTTClient; + /// CMQTTClientWrapper mCANBusMQTTClient; + QList mCANBusMQTTClientList; QTimer *mGPTimer; #ifdef ENABLE_CHIPSET_DRIVER CComputerBoardInterface mCPUInterface; diff --git a/Otarcik_CAN/debug/Otarcik_CAN.exe b/Otarcik_CAN/debug/Otarcik_CAN.exe index 5df87bf..070bc99 100644 Binary files a/Otarcik_CAN/debug/Otarcik_CAN.exe and b/Otarcik_CAN/debug/Otarcik_CAN.exe differ diff --git a/Otarcik_CAN/ui_GeneralStatusPage.h b/Otarcik_CAN/ui_GeneralStatusPage.h index 73ca496..8db01e6 100644 --- a/Otarcik_CAN/ui_GeneralStatusPage.h +++ b/Otarcik_CAN/ui_GeneralStatusPage.h @@ -27,7 +27,6 @@ class Ui_CGeneralStatusPage public: QTextEdit *mGenMsgTextEdit; QPushButton *mClearGenMsgTxtBtn; - QLabel *mClientMQTTLbl; QLabel *mClientMQTTConnStatLbl; QTableWidget *mCANModuleStatusTableWdgt; QLabel *label; @@ -62,42 +61,39 @@ public: mClearGenMsgTxtBtn = new QPushButton(CGeneralStatusPage); mClearGenMsgTxtBtn->setObjectName(QString::fromUtf8("mClearGenMsgTxtBtn")); mClearGenMsgTxtBtn->setGeometry(QRect(30, 480, 80, 22)); - mClientMQTTLbl = new QLabel(CGeneralStatusPage); - mClientMQTTLbl->setObjectName(QString::fromUtf8("mClientMQTTLbl")); - mClientMQTTLbl->setGeometry(QRect(1200, 210, 101, 16)); - QFont font1; - font1.setPointSize(12); - mClientMQTTLbl->setFont(font1); mClientMQTTConnStatLbl = new QLabel(CGeneralStatusPage); mClientMQTTConnStatLbl->setObjectName(QString::fromUtf8("mClientMQTTConnStatLbl")); - mClientMQTTConnStatLbl->setGeometry(QRect(1300, 210, 121, 16)); - QFont font2; - font2.setPointSize(12); - font2.setBold(true); - font2.setWeight(75); - mClientMQTTConnStatLbl->setFont(font2); + mClientMQTTConnStatLbl->setGeometry(QRect(1200, 210, 251, 131)); + QFont font1; + font1.setPointSize(12); + font1.setBold(true); + font1.setWeight(75); + mClientMQTTConnStatLbl->setFont(font1); + mClientMQTTConnStatLbl->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop); mCANModuleStatusTableWdgt = new QTableWidget(CGeneralStatusPage); mCANModuleStatusTableWdgt->setObjectName(QString::fromUtf8("mCANModuleStatusTableWdgt")); mCANModuleStatusTableWdgt->setGeometry(QRect(1190, 40, 371, 131)); label = new QLabel(CGeneralStatusPage); label->setObjectName(QString::fromUtf8("label")); label->setGeometry(QRect(1200, 20, 221, 16)); - QFont font3; - font3.setPointSize(11); - font3.setBold(true); - font3.setWeight(75); - label->setFont(font3); + QFont font2; + font2.setPointSize(11); + font2.setBold(true); + font2.setWeight(75); + label->setFont(font2); mQuitAppBtn = new QPushButton(CGeneralStatusPage); mQuitAppBtn->setObjectName(QString::fromUtf8("mQuitAppBtn")); mQuitAppBtn->setGeometry(QRect(1470, 550, 131, 22)); mInternetConnectedLbl = new QLabel(CGeneralStatusPage); mInternetConnectedLbl->setObjectName(QString::fromUtf8("mInternetConnectedLbl")); - mInternetConnectedLbl->setGeometry(QRect(1230, 240, 61, 16)); - mInternetConnectedLbl->setFont(font1); + mInternetConnectedLbl->setGeometry(QRect(1200, 180, 61, 16)); + QFont font3; + font3.setPointSize(12); + mInternetConnectedLbl->setFont(font3); mInternetPresentStatLbl = new QLabel(CGeneralStatusPage); mInternetPresentStatLbl->setObjectName(QString::fromUtf8("mInternetPresentStatLbl")); - mInternetPresentStatLbl->setGeometry(QRect(1300, 240, 121, 16)); - mInternetPresentStatLbl->setFont(font2); + mInternetPresentStatLbl->setGeometry(QRect(1270, 180, 121, 16)); + mInternetPresentStatLbl->setFont(font1); MQTTBufferingGrpBx = new QGroupBox(CGeneralStatusPage); MQTTBufferingGrpBx->setObjectName(QString::fromUtf8("MQTTBufferingGrpBx")); MQTTBufferingGrpBx->setGeometry(QRect(1460, 190, 231, 91)); @@ -121,7 +117,7 @@ public: mBufferSizeValue->setFont(font4); mSystemStateGroupBox = new QGroupBox(CGeneralStatusPage); mSystemStateGroupBox->setObjectName(QString::fromUtf8("mSystemStateGroupBox")); - mSystemStateGroupBox->setGeometry(QRect(1210, 290, 201, 121)); + mSystemStateGroupBox->setGeometry(QRect(1200, 370, 201, 121)); mSystemStateLbl = new QLabel(mSystemStateGroupBox); mSystemStateLbl->setObjectName(QString::fromUtf8("mSystemStateLbl")); mSystemStateLbl->setGeometry(QRect(10, 20, 281, 131)); @@ -144,7 +140,6 @@ public: { CGeneralStatusPage->setWindowTitle(QCoreApplication::translate("CGeneralStatusPage", "Form", nullptr)); mClearGenMsgTxtBtn->setText(QCoreApplication::translate("CGeneralStatusPage", "Nettoyer", nullptr)); - mClientMQTTLbl->setText(QCoreApplication::translate("CGeneralStatusPage", "Client MQTT:", nullptr)); mClientMQTTConnStatLbl->setText(QCoreApplication::translate("CGeneralStatusPage", "D\303\251connect\303\251", nullptr)); label->setText(QCoreApplication::translate("CGeneralStatusPage", "Statut des modules CAN ", nullptr)); mQuitAppBtn->setText(QCoreApplication::translate("CGeneralStatusPage", "Quitter l'application", nullptr));