small reworks in frontend and scripts, mostly finalized ansible deploy script -- still needs testing

ansible_deploy/barcoinv.yml

@@ -0,0 +1,6 @@
+all:
+  hosts:
+    mmctrl-p1:
+      projectors:
+        - projector-p1-center
+        - projector-p1-side

ansible_deploy/conf.j2

@@ -0,0 +1,30 @@
+ Hostname: {{ ansible_facts['hostname'] }} running {{ansible_facts['distribution'] }} on address {{ addr }}
+Connected projectors: {{ barco_G62[0].ip }} 
+
+[global]
+room = {{ room }}
+mqttIp = {{ mqtt_ip }}
+mqttPort = {{ mqtt_port }}
+
+{% if barco_G62 %}
+{%+ for projector in barco_G62 +%}
+[{{projector.model}}.{{projector.position}}]
+ip = {{projector.ip}}
+port = {{projector.port}}
+{% endfor %}
+{% endif %}
+
+{%+ if tse_box +%}
+serial_device = {{ tse_box.serial_device }}
+{% endif %}
+
+{%+ if projector_motors +%} {# change to appropriate thingy for running them #}
+{% end if %}
+
+{%+ if extron_audio +%}
+
+{% endif %}
+
+{%+ if extron_video +%}
+
+{% endif %}

ansible_deploy/inventory.ini

@@ -0,0 +1,4 @@
+[prHosts]
+192.168.122.245
+
+

ansible_deploy/inventory.yml

@@ -0,0 +1,23 @@
+P01:
+  hosts:
+    192.168.122.245:
+  vars:
+    room: P01
+    mqtt_ip: localhost
+    mqtt_port: 1883
+
+    barco_G62:
+      - position: main
+        model: barco_G62
+        port: 3023
+        ip: 192.168.192.13
+      - position : side
+        model: barco_G62
+        port: 3023
+        ip: 192.168.192.14
+    
+    barco_old: 
+      main_ip: 1.1.1.1
+
+P22:
+  

ansible_deploy/playbook.yaml

@@ -0,0 +1,152 @@
+- name: test playbook
+  hosts: P01
+
+  #vars_files: 
+  #   - secret
+  vars: 
+    addr: "192.168.122.245"
+    os_environment:
+      - key: VITE_MQTT_HOST
+        value: polztest.local
+
+  tasks:
+    - name: ping hosts
+      ansible.builtin.ping:
+    
+    - name: install pkgs
+      become: true
+      #become_user: root
+      apt:
+        name:
+          - mosquitto
+          - python3-poetry
+          #- npm
+          - nginx
+        state: latest
+
+    #- name: set env
+     
+    - name: ensures services dir exists
+      file: 
+        path: "/home/kat/pyServices"
+        state: directory
+
+    - name: ensures services dir exists
+      file: 
+        path: "/home/kat/pyServices/fri-mm-maline"
+        state: directory
+    
+    - name: Copy poetry
+      become: true
+      ansible.builtin.copy:
+        #seuser: root
+        src: "../{{ item  }}"
+        dest: "/home/kat/pyServices/fri-mm-maline/{{ item }}"
+        owner: kat
+        group: kat
+        mode: '0644'
+        backup: yes
+      loop:
+        - poetry.lock
+        - pyproject.toml
+        - README.md
+
+    - name: copy python scripts 
+      become: true
+      ansible.builtin.copy:
+        src: "../{{ item }}"
+        dest: "/home/kat/pyServices/fri-mm-maline"
+        owner: kat
+        group: kat
+        mode: '0644'
+        backup: yes
+      loop:
+        - barco_telnet/barco_G62_control.py
+        - extron_audio_matrix/extron_audio_matrix_telnet_control.py
+        - extron_audio_matrix/extron_audio_matrix_telnet_interpreter.py
+        - projector_motors/projector_motors.py
+        - tse_serial/tse_serial_controler.py
+        - tse_serial/tse_serial_interpreter.py
+        - config.toml #TODO GENERATE CONFIG 
+
+
+    - name: poetry installation from thing 
+      ansible.builtin.shell: 
+        cmd: "poetry install"
+        chdir: "/home/kat/pyServices/fri-mm-maline"
+
+    - name: Copy barco config
+      become: true
+      ansible.builtin.copy:
+        #seuser: root
+        src: "../{{ item }}"
+        dest: /lib/systemd/system
+        owner: root
+        group: root
+        mode: '0644'
+        #backup: yes
+      loop:
+        - barco@.service
+        - extron_audio.service
+        - mqtt_init.service
+        - projector_motors.service
+        - tse_box.service 
+
+
+    
+    - name: Copy mosqitconfig
+      become: true
+      ansible.builtin.copy:
+        #seuser: root
+        src: ../mosquitto.conf
+        dest: /etc/mosquitto/conf.d
+        owner: root
+        group: root
+        mode: '0644'
+        backup: yes
+
+    # - name: set env
+    #   become: true
+    #   ansible.builtin.lineinfile:
+    #     dest: "/etc/environment"
+    #     state: present
+    #     regexp: "^{{ item.key }}="
+    #     line: "{{ item.key }}={{ item.value }}"
+    #   with_items: "{{ os_environment }}"
+
+    - name: copy frontend to webroot
+      become: true
+
+      ansible.builtin.copy:
+        src: /home/kat/Documents/polzp/fri_multimedia_rework/frontend/vju_display/dist
+        #src: /home/kat/fri_multimedia_rework/frontend/vju_display/dist
+        #remote_src: true
+        dest: /srv/www
+        #dest: /home/kat/testoa
+        owner: root
+        group: root
+        mode: '0755'
+        backup: yes
+
+    - name: enable modules 
+      become: true
+      ansible.builtin.systemd_service:
+        #name: "{{[ 'barco@main.service', 'barco@side.service' ]}}"
+        name: "{{ item }}"
+        state: stopped
+        enabled: false
+      loop:
+        - barco@main.service
+        - barco@side.service 
+        - extron_audio.service
+        - mqtt_init.service
+        - projector_motors.service
+        - tse_box.service
+
+
+    - name: mosquitto service and reload
+      become: true
+      ansible.builtin.systemd_service:
+        name: mosquitto.service 
+        state: started
+        daemon_reload: true

ansible_deploy/service.j2

@@ -0,0 +1,15 @@
+[Unit]
+Description={{ script_file }}
+After=multi-user.target
+
+[Service]
+ExecStart=/usr/bin/poetry run /usr/bin/python3 {{ script_file }}
+Type=simple
+Restart=always
+User=kat
+Group=kat
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target
+DefaultInstance=main

ansible_deploy/testbook.yaml

@@ -0,0 +1,37 @@
+- name: test playbook
+  hosts: P01
+
+  #vars_files: 
+  #   - secret
+  vars: 
+    addr: "192.168.122.245"
+    os_environment:
+      - key: VITE_MQTT_HOST
+        value: polztest.local
+
+  tasks:
+    - name: test things
+      when: barco_g62 is defined
+      block:
+      #- name: ping hosts
+      #  ansible.builtin.ping:
+      
+      - name: template config.toml
+        ansible.builtin.template:
+          src: ./conf.j2
+          dest: /home/kat/testo/conf.txt
+      - name: template barco systemd service
+        vars: 
+          script_file: "/home/kat/pyServices/fri-mm-maline/barco_G62_control.py %i"
+        ansible.builtin.template:
+          src: ./service.j2
+          dest: /home/kat/testo/barc.serv
+      - name: enable barcos 
+        ansible.builtin.ping:
+        #itd itd itd 
+    - name: test second 
+      when: barco_old is defined
+      block: 
+      - name: pingerino
+        ansible.builtin.ping:
+

barco@.service

@@ -1,16 +1,16 @@
 [Unit]
 Description=Barco projector control
-After=mqtt_init.service
+After=multi-user.target
-
 
 [Service]
-ExecStart=/usr/bin/python3 /home/rpi/barco_telnet_control.py %name
+ExecStart=/usr/bin/poetry run python3 /home/kat/pyServices/fri-mm-maline/barco_G62_control.py %i
-User=rpi
-Group=rpi
 Type=simple
 Restart=always
-
+WorkingDirectory=/home/kat/pyServices/fri-mm-maline
+User=kat
+Group=kat
+RestartSec=10
 
 [Install]
-WantedBy=mqtt_init.service
+WantedBy=multi-user.target
-
+DefaultInstance=main

barco_telnet/barco_G62_control.py

@@ -3,14 +3,16 @@ import socket
 import aiomqtt
 import telnetlib3
 import toml
-from socket import gethostname
 import sys 
 
-mainBarcoIP = '192.168.192.12'
+#GLOBALS 
-sideBarcoIP = '192.168.192.13'
 
-# TODO all the checks and stuff
+room = "undefined"
-# TODO MAKE THIS CONFIGURALBE
+position = "undefined"
+barcoIP = "undefined"
+telnetPort = 3023
+mqttPort = 1883
+mqttIP = 'localhost'
 
 cmdMap = {
     'power': 'POWR',
@@ -31,11 +33,13 @@ def parse_barco_response(raw: str):
     status = '1' if status == '01' else '0'
     return cmd, status
 
+#TODO MAKE THESE USE GLOBAL INSTEAD OF PASSING BARCO POSITION IN MAIN
 
 async def barco_telnet_command(client, writer, select: str):
-    onSub = f"p01/projectors/{select}/#"
+    global room
+    onSub = f"{room}/projectors/{select}/#"
     #print('TEST', onSub)
-    onMatch = f"p01/projectors/{select}/command/+"
+    onMatch = f"{room}/projectors/{select}/command/+"
     await client.subscribe(onSub)
     #async with client.messages as msgs:
     async for mesg in client.messages:
@@ -55,6 +59,7 @@ async def barco_telnet_command(client, writer, select: str):
             
 
 async def barco_telnet_read_status(client, reader, select: str):
+    global room
     while True:
         output = await reader.readuntil(b']')
         raw_response: str = output.decode().strip()  # strip not necessary? needed for local netcat testing though
@@ -63,7 +68,7 @@ async def barco_telnet_read_status(client, reader, select: str):
         if parsed == None:
             continue  #TODO alert for errors
         print(f"Updating topic [{parsed[0]}] with value [{parsed[1]}]")
-        await client.publish(f"p01/projectors/{select}/status/{parsed[0]}", payload=parsed[1])
+        await client.publish(f"{room}/projectors/{select}/status/{parsed[0]}", payload=parsed[1])
 
 
 async def barco_telnet_query_status(writer, select: str):
@@ -84,23 +89,25 @@ async def barco_telnet_query_status(writer, select: str):
 #         await asyncio.gather(task_status_query, task_status_reader, task_control)
 
 
-async def main(mqttIP=localhost, barcoIP=localhost, mqttPort=1883, telnetPort=3023):
+async def main():
-    conf = toml.load('config.toml')
+    global barcoPosition, barcoIP, telnetPort, mqttIP, mqttPort
-    barco
+    if len(sys.argv) < 2:
-    # mainBarcoIP = conf[gethostname()]['projektor_glavni']
+        sys.exit("No position provided")
-    # sideBarcoIP = conf[gethostname()]['projektor_stranski']
+    else:
-    mainReader, mainWriter = await telnetlib3.open_connection(barcoIP, telnetPort)
+        barcoPosition = sys.argv[1]
-    #sideReader, sideWriter = await telnetlib3.open_connection('localhost', 3024)
-    async with aiomqtt.Client(mqttIP, mqttPort) as client:
-        task_status_query_main = asyncio.create_task(barco_telnet_query_status(mainWriter, 'glavni'))
-        task_status_reader_main = asyncio.create_task(barco_telnet_read_status(client, mainReader, 'glavni'))
-        task_control_main = asyncio.create_task(barco_telnet_command(client, mainWriter, 'glavni'))
-        #task_status_query_side = asyncio.create_task(barco_telnet_query_status(sideWriter, 'stranski'))
-        #task_status_reader_side = asyncio.create_task(barco_telnet_read_status(client, sideReader, 'stranski'))
-        #task_control_side = asyncio.create_task(barco_telnet_command(client, sideWriter, 'stranski'))
 
-        await asyncio.gather(task_status_query_main, task_status_reader_main, task_control_main)
+    conf = toml.load('./config.toml')
-                             #task_status_query_side, task_status_reader_side, task_control_side)
+    g62Barcos = {k: v for k,v in barcos["barco_G62"].items()}
+    currentBarco = newBarcos[barcoPosition]
+    barcoIP = currentBarco['ip']
+
+    barcoReader, barcoWriter = await telnetlib3.open_connection(barcoIP, telnetPort)
+    async with aiomqtt.Client(mqttIP, mqttPort) as client:
+        task_status_query_barco = asyncio.create_task(barco_telnet_query_status(barcoWriter, barcoPosition))
+        task_status_reader_barco = asyncio.create_task(barco_telnet_read_status(client, barcoReader, barcoPosition))
+        task_control_barco = asyncio.create_task(barco_telnet_command(client, barcoWriter, barcoPosition))
+        
+        await asyncio.gather(task_status_query_barco, task_status_reader_barco, task_control_barco)
 
 
 ### fuj to, ne tk delat

config.toml

@@ -1,5 +1,14 @@
-[p1malina]
+[globals]
-projektor_glavni = ""
+room = 'P01'
-projektor_stranski = ""
+mqttIp = 'localhost'
-extron_audio_matrika = ""
+mqttPort = '1883'
+
+
+[barco.novi.glavni]
+ip = '192.168.192.12'
+port = '3023'
+
+[barco.novi.stranski]
+ip = '192.168.192.16' # or smth
+port = '3023'
 

extron_audio.service

@@ -1,13 +1,13 @@
 [Unit]
 Description=Extron audio matrix control
-After=mqtt_init.service
+After=multi-user.target
 
 [Service]
 ExecStart=/usr/bin/python3 /home/rpi/extron_audio_matrix_telnet_control.py
 Type=simple
 Restart=always
+User=kat
+Group=kat
 
 [Install]
-WantedBy=mqtt_init.service
+WantedBy=multi-user.target
-
-

frontend/vju_display/.env.development

@@ -1,3 +1,3 @@
-VITE_MQTT_HOST=localhost #p01malina.local
+VITE_MQTT_HOST=192.168.122.245
 VITE_MQTT_PORT=8080
 VITE_MQTT_SSL=false

frontend/vju_display/.gitignore

@@ -28,3 +28,5 @@ coverage
 *.sw?
 
 *.tsbuildinfo
+
+.vscode/

frontend/vju_display/package-lock.json

@@ -8,17 +8,19 @@
       "name": "vju_display",
       "version": "0.0.0",
       "dependencies": {
+        "fs": "^0.0.1-security",
+        "paho-mqtt": "^1.1.0",
         "vue": "^3.5.12",
         "vue-paho-mqtt": "^0.6.5"
       },
       "devDependencies": {
         "@tsconfig/node20": "^20.1.4",
-        "@types/node": "^20.17.0",
+        "@types/node": "^20.17.16",
         "@vitejs/plugin-vue": "^5.1.4",
         "@vue/tsconfig": "^0.5.1",
         "npm-run-all2": "^7.0.1",
         "typescript": "~5.6.0",
-        "vite": "^5.4.10",
+        "vite": "^5.4.14",
         "vue-tsc": "^2.1.6"
       }
     },
@@ -704,9 +706,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.17.0",
+      "version": "20.17.16",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.16.tgz",
-      "integrity": "sha512-a7zRo0f0eLo9K5X9Wp5cAqTUNGzuFLDG2R7C4HY2BhcMAsxgSPuRvAC1ZB6QkuUQXf0YZAgfOX2ZyrBa2n4nHQ==",
+      "integrity": "sha512-vOTpLduLkZXePLxHiHsBLp98mHGnl8RptV4YAO3HfKO5UHjDvySGbxKtpYfy8Sx5+WKcgc45qNreJJRVM3L6mw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1044,6 +1046,12 @@
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "license": "MIT"
     },
+    "node_modules/fs": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
+      "integrity": "sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w==",
+      "license": "ISC"
+    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
@@ -1392,9 +1400,9 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "5.4.10",
+      "version": "5.4.14",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.10.tgz",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz",
-      "integrity": "sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==",
+      "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {

frontend/vju_display/package.json

@@ -11,17 +11,19 @@
     "type-check": "vue-tsc --build --force"
   },
   "dependencies": {
+    "fs": "^0.0.1-security",
+    "paho-mqtt": "^1.1.0",
     "vue": "^3.5.12",
     "vue-paho-mqtt": "^0.6.5"
   },
   "devDependencies": {
     "@tsconfig/node20": "^20.1.4",
-    "@types/node": "^20.17.0",
+    "@types/node": "^20.17.16",
     "@vitejs/plugin-vue": "^5.1.4",
     "@vue/tsconfig": "^0.5.1",
     "npm-run-all2": "^7.0.1",
     "typescript": "~5.6.0",
-    "vite": "^5.4.10",
+    "vite": "^5.4.14",
     "vue-tsc": "^2.1.6"
   }
 }

frontend/vju_display/src/main.ts

@@ -4,6 +4,7 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import { createPahoMqttPlugin } from 'vue-paho-mqtt'
 
+let urlParams = new URLSearchParams(window.location.search);
 createApp(App)
     .use(
         createPahoMqttPlugin({
@@ -13,9 +14,13 @@ createApp(App)
               },
         
               MqttOptions: {
-                host: import.meta.env.VITE_MQTT_HOST,
+                //host: import.meta.env.VITE_MQTT_HOST,
-                port: parseInt(import.meta.env.VITE_MQTT_PORT),
+                //host: "localhost",
-                useSSL: ["1", "true", "True"].includes(import.meta.env.VITE_MQTT_SSL),
+                host: urlParams.get('mqtt') || 'localhost',
+                port: 8080,
+                useSSL: false,
+                //port: parseInt(import.meta.env.VITE_MQTT_PORT),
+                //useSSL: ["1", "true", "True"].includes(import.meta.env.VITE_MQTT_SSL),
                 clientId: `vju-${Math.random() * 9999}`,
                 //mainTopic: '',
                 enableMainTopic: false

frontend/vju_display/vite.config.ts

@@ -8,9 +8,15 @@ export default defineConfig({
   plugins: [
     vue(),
   ],
+  //base: './',
   resolve: {
     alias: {
       '@': fileURLToPath(new URL('./src', import.meta.url))
     }
+  },
+  server: {
+    hmr: {
+        host: 'localhost' 
+    }
   }
 })

mosquitto.conf

@@ -231,10 +231,10 @@
 # listener 0 /tmp/mosquitto.sock
 #
 # listener port-number [ip address/host name/unix socket path]
-listener 1883
+listener 1883 0.0.0.0
 listener 8080
 protocol websockets
-protocol mqtt
+#protocol mqtt
 allow_anonymous true
 
 # By default, a listener will attempt to listen on all supported IP protocol

projector_motors.service

@@ -1,12 +1,13 @@
 [Unit]
 Description=Control for projector motors
-After=mqtt_init.service
+After=multi-user.target
 
 [Service]
 ExecStart=/usr/bin/python3 /home/rpi/projector_motors.py
 Restart=always
 Type=simple
+User=kat
+Group=kat
 
 [Install]
-WantedBy=mqtt_init.service
+WantedBy=multi-user.target
-

pyproject.toml

@@ -5,6 +5,7 @@ description = ""
 authors = ["Your Name <you@example.com>"]
 license = "GPLv3"
 readme = "README.md"
+package-mode = false
 
 [tool.poetry.dependencies]
 python = "^3.10"
@@ -18,4 +19,4 @@ smbus2 = "^0.5.0"
 
 [build-system]
 requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+build-backend = "poetry.core.masonry.api"

tomlTest.py

@@ -0,0 +1,19 @@
+import toml 
+
+tomlConf = toml.load('./config.toml')
+
+print(tomlConf)
+barcos = {k: v for k, v in tomlConf["barco"].items()}
+print()
+print(barcos)
+
+newBarcos = {k: v for k,v in barcos["novi"].items()}
+
+print(newBarcos)
+
+for pos in newBarcos.keys():
+    atrs = newBarcos[pos]
+    print(atrs)
+    ip = atrs['ip']
+    # etc
+    # launch scripty thingy with atrs[IP], itd

tse_box.service

@@ -1,15 +1,15 @@
 [Unit]
 Description=TSE serial control
-After=mqtt_init.service
+After=multi-user.target
 
 [Service]
 ExecStart=/usr/bin/python3 /home/rpi/tse_serial_controler.py /home/rpi/tse_serial_interpreter.py
 Type=simple
 Restart=always
-User=rpi
+User=kat
-Group=rpi
+Group=kat
 
 [Install]
-WantedBy=mqtt_init.service
+WantedBy=multi-user.target
 
 

tse_serial/tse_serial_controler.py

@@ -4,26 +4,42 @@ import aioserial
 import aiomqtt
 from tse_serial_interpreter import *
 from dataclasses import dataclass
+import os 
+import sys
+import toml 
+import serial.tools.list_ports
 
 room = 'p01' #TODO make be do get fronm file of configuration 
 
+# serPath = '/dev/serial/by-id/'
+# devLst = os.listdir(serPath)
+# if len(devLst) < 1:
+#     sys.exit("No serial device found.")
+# serDev = devLst[0]
+
+portList = serial.tools.list_ports.comports()
+if portList < 1: 
+    sys.exit("No serial port found")
+#TODO if multiple ports idk, shouldn't ever happen but still
+(serport, serdesc, serhwid) = portList[0]
+
+
 aser: aioserial.AioSerial = aioserial.AioSerial(
-    port='/dev/serial/by-id/usb-Prolific_Technology_Inc._USB-Serial_Controller_D-if00-port0', 
+    port=serport, 
-    #id say not hardcode it ampak kinda nimamo izbire
     baudrate=1200,
     parity=serial.PARITY_NONE,
     bytesize=serial.EIGHTBITS,
     stopbits=serial.STOPBITS_ONE
     )
 
-#TODO get this from file da ni hardcoded
+#TODO get this from file da ni hardcoded? 
-
+# altho itak je ta script za tist specific tse box in so vsi isti
 mapping_toggles = {
     "master": 1,
     "audio": 2,
     "projectors": 3,
 }
-
+# 4 is not connected to anything
 platno_mapping = {
     "glavni": {
         "dol": 5,
@@ -40,26 +56,34 @@ shades_mapping = {
     "gor": 10
 }
 
-#reverse_lookup = {v: k for k, v in mapping.items()} #fujto
+reverse_lookup = {
+    1: "master",
+    2: "audio",
+    3: "projectors",
+    
+    5: "glavni_dol",
+    6: "glavni_gor",
+    
+    7: "glavni_dol",
+    8: "glavni_gor",
 
+    9: "shades_dol",
+    10: "shades_gor"
+}
 
-# TODO simple reverse lookup za ko kripa pove kaj
-# in vse tole
 
 async def task_status2mqtt(statusClient: aiomqtt.Client):
     while True:
-        #data = await aser.read_until_async()
+        data = await aser.read_until_async()
-        #data = data.decode(errors='ignore').strip()
+        data = data.decode(errors='ignore').strip()
-        #print("TSE box sent: " + data)
+        print("TSE box sent: " + data)
-        #relState = resp_to_relay_state(data)
+        relState = resp_to_relay_state(data)
-        #command = reverse_lookup[relState.relay_id]
+        if relState.relay_id == None:
-        #action = relState.state
+            continue # TODO handling 
-        #TODO havent figured out a clean way to 
+        command = reverse_lookup[relState.relay_id]
-        # get out the action from topic yet as they are
+
-        # not always on the same level
+        action = relState.state
-        # REWORK
+        
-        # probably just do it the most straight forward way
-        # with some more code 
         #publishTopic = f"{room}/"
         #publishPayload = "ON" if relState.state else "OFF"
         #print("Publishing [" + publishPayload + "] to topic [" + publishTopic + "]")

tse_serial/tse_serial_interpreter.py

@@ -8,17 +8,15 @@ class RelayState:
 
 
 def resp_to_relay_state(cmd: str) -> RelayState:
-    state = True if cmd.find("ON") > -1 else False
+    state = True if cmd.find("ON") > -1 else False #TODO maybe better handling of other
     #state = False if cmd.find("OFF") > -1 and state == None else None
-    
+    id = None
-    r_state = RelayState(0, state)
-    id = 0
-
     if cmd.startswith("T"):
         id = int(cmd[1]) + (8 if cmd[2] == "B" else 0)
     elif cmd.startswith("re_"):
         id = int(cmd[3]) + (8 if cmd[4] == "B" else 0)
-
+    else: 
+        id = None
     r_state = RelayState(id, state)
     return r_state
 

unit_generator.py

@@ -12,6 +12,7 @@ noviBarcos = barcos.get('novi', None)
 stariBarcos = barcos.get('stari', None)
 
 if noviBarcos: 
+    
     for k,v in noviBarcos.items():
         print(f'barco_novi@{k}.service') #to rabjo bit symlinki
         os.symlink('./barco@.service', f'./barco@{k}.service')