Merge files

config.yaml

@@ -15,13 +15,13 @@ network_mesh_interface:
     refresh_interval: 5000
 
 devices_interface:
-  "00:30:1A:3A:4F:9A":
+  "00:30:1A:3A:10:C2":
     name: "castor"
     ip: "10.223.50.4"
     type: "robot"
     belongs_to: "beigebox"
 
-  "00:30:1A:3A:10:C2":
+  "00:30:1A:3A:4F:9A":
     name: "basestation"
     ip: "10.223.50.101"
     type: "human_device_interface"
@@ -50,7 +50,7 @@ credentials:
 ssh_commands:
   cpu: "top -bn1 | grep 'Cpu(s)' | awk '{print $2+$4}'"
   disk: "df -h / | tail -1 | awk '{print $4}'"
-  voltage: "bash -ic 'source /home/robot/ros2_ws/install/setup.bash && ros2 topic echo /motors/left/electrical --once | grep \"^voltage:\" | awk \"{print $1}\"'"
+  voltage: "bash -ic 'source /home/robot/ros2_ws/install/setup.bash && ros2 topic echo /motors/left/electrical --once | grep \"^voltage:\" | awk \"{print $0}\"'"
 
 screen_sort:
   value: "signal"

requirements.txt

@@ -0,0 +1,3 @@
+requests
+pyyaml
+paramiko

watchdog_window.py

@@ -124,11 +124,11 @@ def authenticate(iface_name):
         if 'result' in result and result['result'][0] == 0:
             iface['token'] = result['result'][1]['ubus_rpc_session']
             interface_states[iface_name]['connected'] = True
-            logging.info(f"Authenticated successfully with {iface_name}.")
+            # logging.info(f"Authenticated successfully with {iface_name}.")
             return True
         else:
             interface_states[iface_name]['connected'] = False
-            logging.error(f"Authentication failed for {iface_name}: {result}")
+            # logging.error(f"Authentication failed for {iface_name}: {result}")
             return False
     except requests.exceptions.ConnectionError:
         interface_states[iface_name]['connected'] = False
@@ -405,7 +405,9 @@ def update_data():
                     avg_cpu_str = f"{avg_cpu:.1f}%"
 
                     # Prepare data for top table
-                    belongs_to     = device_info.get('belongs_to', 'N/A') if device_info else 'N/A'
+                    # belongs_to     = MAC_TO_DEVICE.get(device_data.get('mac', 'N/A').lower()).get("belongs_to")
+                    # belongs_to     = device_info.get('belongs_to', 'N/A') if device_info else 'N/A'
+                    belongs_to = f"{iface_name}"
                     signal         = f"{device_data.get('signal', 'N/A')} dBm"
                     connected_time = f"{device_data.get('connected_time', 'N/A')} s"
                     throughput     = f"{device_data.get('thr', 0)/1000:.2f} Mbps"