[models/variable_type] on shifte la réponse dans la classe du type

pyheatpump/cli.py

@@ -15,7 +15,6 @@ import requests
 
 from pyheatpump.logger import logger_init
 from pyheatpump.models import *
-from pyheatpump.lib import shift_response
 
 CONTEXT_SETTINGS={
     'default_map':{'run': {}}
@@ -210,10 +209,10 @@ def supervise(since):
     logger.info(build_url(post_url))
 
     for packet in post_packets:
-        logger.debug('Will send %s', shift_response(packet))
+        logger.debug('Will send %s', packet)
         post_resp = requests.post(
             url=build_url(post_url),
-            json=shift_response(packet),
+            json=packet,
             verify=False,
             timeout=200
         )

pyheatpump/heatpump.py

@@ -3,7 +3,6 @@ from datetime import datetime
 from starlette.routing import Router, Route
 from starlette.responses import JSONResponse
 from .config import config
-from .lib import shift_response
 import uvicorn
 
 from pyheatpump.models import *
@@ -16,7 +15,7 @@ def get_variable_values(request):
         time = datetime.fromisoformat(request.params['time'])
         h = Heatpump(config.get('heatpump', 'mac_address'), request.params['time'])
 
-    return JSONResponse(shift_response(h.packet))
+    return JSONResponse(h.packet)
 
 
 ROUTES=[

pyheatpump/models/variable_type.py

@@ -64,8 +64,12 @@ class VariableType(RowClass):
 
     def get_variables_values(self):
         from .variable import Variable
-        print(self)
-        return Variable.getall_values_of_type(self)
+        values = Variable.getall_values_of_type(self)
+        res = {}
+        for address, variable in values.items():
+            res[str(address - self.start_address + 1)] = variable
+        return res
+
 
     def get_variables_values_since(self, since: int):
         from .variable import Variable