Michel/Gestion_sondes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Résolution des conflits Git et nettoyage du code

Browse Source
This commit is contained in:
Michel
2025-05-07 09:41:52 +02:00
parent bca5dd14d3
commit 12a202c2b2
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/Gestion sondes.iml generated
View File

@@ -4,7 +4,7 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.venv" /> <excludeFolder url="file://$MODULE_DIR$/.venv" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="Python 3.13" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

2
.idea/misc.xml generated
View File

@@ -3,7 +3,7 @@
<component name="Black"> <component name="Black">
<option name="sdkName" value="Python 3.11 (Gestion sondes) (2)" /> <option name="sdkName" value="Python 3.11 (Gestion sondes) (2)" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (Gestion sondes) (2)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
<component name="PyPackaging"> <component name="PyPackaging">
<option name="earlyReleasesAsUpgrades" value="true" /> <option name="earlyReleasesAsUpgrades" value="true" />
</component> </component>

4
Cuisine_meudon.py
View File

@@ -64,5 +64,5 @@ try:
client.subscribe("Meudon/#") client.subscribe("Meudon/#")
logging.info("Connexion MQTT réussie et abonnement au topic 'Meudon/#'.") logging.info("Connexion MQTT réussie et abonnement au topic 'Meudon/#'.")
client.loop_forever() client.loop_forever()
except Exception as e: except Exception as err:
logging.error(f"Erreur MQTT : {e}") logging.error(f"Erreur MQTT : {err}")

4
Cuisine_saclay.py
View File

@@ -64,5 +64,5 @@ try:
client.subscribe("Saclay/#") client.subscribe("Saclay/#")
logging.info("Connexion MQTT réussie et abonnement au topic 'Saclay/#'.") logging.info("Connexion MQTT réussie et abonnement au topic 'Saclay/#'.")
client.loop_forever() client.loop_forever()
except Exception as e: except Exception as err:
logging.error(f"Erreur MQTT : {e}") logging.error(f"Erreur MQTT : {err}")

1
Monitor.py
View File

@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
import mysql.connector import mysql.connector
from datetime import datetime, timedelta from datetime import datetime, timedelta
import time import time

9
domo91.py
View File

@@ -533,11 +533,10 @@ if st.session_state["authenticated"]:
except Exception as e: except Exception as e:
st.error(f"Erreur chargement des connexions : {e}") st.error(f"Erreur chargement des connexions : {e}")
<<<<<<< HEAD
except Exception as err: # petit bug dans ton except ici (tu avais écrit "except exception") except Exception as err:
st.error(f"Erreur MySQL : {err}") st.error(f"Erreur MySQL : {err}")
======= except Exception as err:
except exception as err:
st.error(f"Erreur MySQL : {err}") st.error(f"Erreur MySQL : {err}")
>>>>>>> product

1
requirements.txt
View File

@@ -8,3 +8,4 @@ paho-mqtt~=2.1.0
requests~=2.32.3 requests~=2.32.3
schedule~=1.2.2 schedule~=1.2.2
paramiko~=3.5.1 paramiko~=3.5.1
dotenv