jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2025-02-22 17:29:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update for new build deps

Browse Source
This commit is contained in:
jacob.eva 2025-02-20 12:40:26 +00:00
parent 55f6574297
commit 6b1ee775ed
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
3 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -26,6 +26,8 @@ WORKDIR ".."
# Fetch files required for sideband local repository # Fetch files required for sideband local repository
RUN git clone https://github.com/liamcottle/rnode-flasher.git
RUN mkdir dist_archive RUN mkdir dist_archive
WORKDIR "dist_archive" WORKDIR "dist_archive"

3
sbapp/share/index.html
View File

@ -9,8 +9,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
</head> </head>
<body> <body>
<<<<<<< HEAD <span class="logo">OCC Repo</span>
<span class="logo">openCom Companion Repo</span>
<p><center><span class="menu"><a href="index.html">Start</a> | <a href="pkgs.html">Software</a> | <a href="flasher.html">RNode Flasher</a> |<a href="guides.html">Guides</a></span></center></p><hr><h2>Hello!</h2> <p><center><span class="menu"><a href="index.html">Start</a> | <a href="pkgs.html">Software</a> | <a href="flasher.html">RNode Flasher</a> |<a href="guides.html">Guides</a></span></center></p><hr><h2>Hello!</h2>
<table style="margin-bottom: 1.5em;"> <table style="margin-bottom: 1.5em;">
<tbody> <tbody>

55
sbapp/sideband/core.py
View File

@ -3762,43 +3762,36 @@ class SidebandCore():
else: else:
sec_atl_long = self.config["hw_rnode_sec_atl_long"] sec_atl_long = self.config["hw_rnode_sec_atl_long"]
subint_config = [[0]*11 for i in range(2)]
# Primary modem
subint_config[0][0] = "Primary modem" # Name of interface
subint_config[0][1] = 0 # Virtual port
subint_config[0][2] = self.config["hw_rnode_frequency"]
subint_config[0][3] = self.config["hw_rnode_bandwidth"]
subint_config[0][4] = self.config["hw_rnode_tx_power"]
subint_config[0][5] = self.config["hw_rnode_spreading_factor"]
subint_config[0][6] = self.config["hw_rnode_coding_rate"]
subint_config[0][7] = False # flow control hardcoded to false for now
subint_config[0][8] = atl_short
subint_config[0][9] = atl_long
subint_config[0][10] = True # outgoing
# Secondary modem
subint_config[1][0] = "Secondary modem" # Name of interface
subint_config[1][1] = 1 # Virtual port
subint_config[1][2] = self.config["hw_rnode_sec_frequency"]
subint_config[1][3] = self.config["hw_rnode_sec_bandwidth"]
subint_config[1][4] = self.config["hw_rnode_sec_tx_power"]
subint_config[1][5] = self.config["hw_rnode_sec_spreading_factor"]
subint_config[1][6] = self.config["hw_rnode_coding_rate"]
subint_config[1][7] = False # flow control hardcoded to false for now
subint_config[0][8] = sec_atl_short
subint_config[0][9] = sec_atl_long
subint_config[1][10] = True # outgoing
interface_config = { interface_config = {
"name": "RNodeMultiInterface", "name": "RNodeMultiInterface",
"port": target_port, "port": target_port,
"subint_config": subint_config, "Primary modem": {
"interface_enabled": True,
"frequency": self.config["hw_rnode_frequency"],
"vport": 0,
"bandwidth": self.config["hw_rnode_bandwidth"],
"txpower": self.config["hw_rnode_tx_power"],
"spreadingfactor": self.config["hw_rnode_spreading_factor"],
"codingrate": self.config["hw_rnode_coding_rate"],
"flow_control": False,
"airtime_limit_long": atl_long,
"airtime_limit_short": atl_short
},
"Secondary modem": {
"interface_enabled": True,
"frequency": self.config["hw_rnode_sec_frequency"],
"vport": 1,
"bandwidth": self.config["hw_rnode_sec_bandwidth"],
"txpower": self.config["hw_rnode_sec_tx_power"],
"spreadingfactor": self.config["hw_rnode_sec_spreading_factor"],
"codingrate": self.config["hw_rnode_sec_coding_rate"],
"flow_control": False,
"airtime_limit_long": sec_atl_long,
"airtime_limit_short": sec_atl_short
},
"flow_control": False, "flow_control": False,
"id_interval": self.config["hw_rnode_beaconinterval"], "id_interval": self.config["hw_rnode_beaconinterval"],
"id_callsign": self.config["hw_rnode_beacondata"], "id_callsign": self.config["hw_rnode_beacondata"],
"st_alock": atl_short,
"lt_alock": atl_long,
"allow_bluetooth": False, "allow_bluetooth": False,
"target_device_name": None, "target_device_name": None,
"force_ble": True, "force_ble": True,