search

tiiuae / mesh_com

ROS node for Mesh Network configuration
BSD 3-Clause "New" or "Revised" License
16 stars 17 forks source link

Mesh com 1.5 compatibility #268

Closed SelinaTII closed 1 year ago

SelinaTII commented 1 year ago

mesh.conf --> Added BRIDGE=true to enable bridging mode (put false to disable bridge) mesh_com_11s.conf --> Added bridge, meshint to denote bridging mode and mesh interface entrypoint.sh --> Added condition: if BRIDGE = true in mesh.conf, write bridge: True, meshint: br-lan to mesh_com_11s.conf, else write bridge: False, meshint: bat0 ConnectionMgr.py: Added attribute bridge to class ConnectionMgr which is read from mesh_com_11s.conf. In starting_mesh(), run bridge_settings() after starting mesh if bridge is true mesh_utils.py --> Imported yaml, added function get_mesh_int() to get the interface from meshint in mesh_com_11s.conf, assigned the value returned by get_mesh_int() as default mesh interface in arguments to other functions header.py --> Replaced hardcoded value of MESHINT with mesh_utils.get_mesh_int() continuous/utils.py --> Replaced hardcoded value of MESHINT with mesh_utils.get_mesh_int() continuous/ca_main.py --> Replaced hardcoded value of MESHINT with mesh_utils.get_mesh_int() quarantine.py --> Replaced hardcoded interface 'bat0' with mesh_utils.get_mesh_int() mutual.py --> Updated my_ip_mesh to be the br-lan ip after the bridge is established

Jira_Id : MSS20-125

Signed-off-by: Selina Shrestha selina.shrestha@tii.ae

martin-tii commented 1 year ago

@Monika-Research and @mbaddeley tested it with MS1.5 and the bridge mode works. Please check if it works for the "MS1.0" modes (sta+mesh). I think by default it should go to bridge in any mode, but I will try to test it anyway

martin-tii commented 1 year ago

DO NOT MERGE, This PR will be closed. Use https://github.com/tiiuae/mesh_com/pull/273 instead

martin-tii commented 1 year ago

Replaced with PR 273