[cli] fusion de fetch et supervise pour corresponse à l'ordre juste d'execution des tâches

config/pyheatpump_fetch.service → config/pyheatpump_supervise.service

@@ -6,8 +6,7 @@ Wants=dev-rs485.device
 Type=simple
 WorkingDirectory=/var/lib/pyheatpump/
 Environment="LOGLEVEL=INFO"
-ExecStart=/usr/bin/env pyheatpump fetch -t D -t A -t I
-ExecStop=/usr/bin/env pyheatpump supervise --since
+ExecStart=/usr/bin/env pyheatpump supervise --since
 KillMode=mixed
 TimeoutStopSec="infinity"
 PrivateTmp=true

config/pyheatpump_fetch.timer → config/pyheatpump_supervise.timer

@@ -1,5 +1,5 @@
 [Unit]
-Description=Timer to launch pyheatpump fetch every minute
+Description=Timer to launch pyheatpump supervise every minute
 
 [Timer]
 OnStartSec=15sec

pyheatpump/cli.py

@@ -57,15 +57,14 @@ def run(host, port):
         workers=1)
 
 
-@click.option('--type', '-t', default=None, multiple=True)
-@cli.command()
-def fetch(type):
+
+def fetch(types=[]):
     logger = logger_init()
 
     from pyheatpump import modbus
 
     try:
-        if type is None:
+        if len(types) == 0:
             var_types = VariableType.getall()
         else:
             var_types = {}
@@ -158,7 +157,6 @@ def fetch(type):
 
 
 
-@click.option('--since', is_flag=True)
 @cli.command()
 def supervise(since):
     logger = logger_init()
@@ -204,7 +202,8 @@ def supervise(since):
     else:
         logger.warn('Unable to set data from supervisor\n{}'.format(control_data))
 
-    time.sleep(3)
+    # Récupération de toutes les variables en modbus
+    fetch()
     
     post_packets = [
         Heatpump(mac_address, last_update, ['Analog']).packet,