[heatpump] added first routes

app.py

@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+from starlette.routing import Router
+from starlette.mounting import Mount
+
+app = Router(routes=[
+    Route('/', index),
+    Mount('/heatpump', heatpump),
+    Mount('/config', config),
+])

heatpump.py

@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+from modbus.client.serial import rtu
+from starlette.routing import Router
+from starlette.responses import JSONResponse
+from conf import config
+from db.db import sql
+
+def get_variables(request):
+    pass
+
+
+def get_variables_by_type(request):
+    pass
+
+
+def get_var_type_addresses(request):
+    request.path_params['type'] 
+
+heatpump = [
+    Route('/', get_variables, methods=['GET']),
+    Route('/{type:str}', get_variables_by_type, methods=['GET'])
+]
+

modbus_get.py

@@ -9,6 +9,8 @@ from serial.serialutil import SerialException
 from umodbus.client.serial import rtu
 import json
 
+from db.db import sql
+
 s = Serial('/dev/ttyUSB0',19200)
 try:
     s.open()
@@ -18,8 +20,17 @@ except SerialException:
 BOOLEAN=1000
 FLOAT=500
 INT=1250
-try:
-    res = {'A':{},'D':{},'I':{}}
+
+def read_digital():
+    global req_adu
+    global sql
+    global s
+
+    start_address, end_address = sql(
+        f"SELECT start_address, end_address FROM var_type
+        WHERE slabel LIKE 'D';")
+
+    res = []
 
     # digital - boolean
     req_adu = rtu.read_coils(
@@ -32,48 +43,71 @@ try:
     address = -1
     try:
         for address in range(0, BOOLEAN, 1):
-            res['D'][address+1] = (resp[address] > 0)
+            res[address+1] = (resp[address] > 0)
     except KeyError as e:
         print(e)
-        res['D'][address] = False
+        res[address] = False
     except IndexError:
         print(address)
 
+    return res
+
+def read_analog():
+    global req_adu
+    global sql
+    global s
+
+    start_address, end_address = sql(
+        f"SELECT start_address, end_address FROM var_type
+        WHERE slabel LIKE 'A';")
+
     # analog - float
-    for address in range(0, FLOAT, 125):
+    for address in range(1, end_address - start_address, 125):
         req_adu = rtu.read_holding_registers(
             slave_id=1,
-            starting_address=1+address,
+            starting_address=start_address + address,
             quantity=125)
 
         resp = rtu.send_message(req_adu, s)
 
         for n in range(125):
             try:
-                res['A'][address + n] =  int(resp[n]) / 10
+                res[address + n] =  int(resp[n]) / 10
             except Exception as e:
                 print(e)
-                res['A'][address + n] = 0.
-            #res['A'][ str(address + var) ] = int(resp[var]) / 10.
+                res[address + n] = 0.
+
+    return res
+
+def read_int():
+    global req_adu
+    global sql
+    global s
+
+    res = []
+
+    start_address, end_address = sql(
+        f"SELECT start_address, end_address FROM var_type
+        WHERE slabel LIKE 'I';")
 
     # integer - int
-    for address in range(1, INT, 125):
+    for address in range(1, end_address - start_address, 125):
         req_adu = rtu.read_coils(
             slave_id=1,
-            starting_address=address+5002,
+            starting_address=start_address + address,
             quantity=125)
 
         resp = rtu.send_message(req_adu, s)
 
         for n in range(125):
             try:
-                res['I'][address + n] = int(resp[n])
+                res[address + n] = int(resp[n])
             except KeyError as e:
                 print(e)
-                res['I'][address + n] = 0
-except KeyboardInterrupt:
-    print("Quitting")
-    pass
+                res[address + n] = 0
+
+    return res
+
 
 s.close()