jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-12-27 04:28:39 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: jacob.eva:dd002c8ab4f2506421bc8a0cf42bfd4f0ac5257b
Branches Tags
jacob.eva:master
jacob.eva:docker
...
compare: jacob.eva:5ab3bc605c86566d5ad2f7cdb49ae791fb4be8cf
Branches Tags
jacob.eva:master
jacob.eva:docker

3 Commits
dd002c8ab4 ... 5ab3bc605c

Author SHA1 Message Date
jacob.eva
5ab3bc605c
Change preset bandwidths for secondary modem 2024-09-25 15:27:15 +01:00
jacob.eva
d4a926e0d8
Correct indexing issue 2024-09-24 16:38:07 +01:00
jacob.eva
04c3c55305
Update for new version of RNodeMultiInterface 2024-09-24 15:39:44 +01:00
1 changed files with 17 additions and 16 deletions
Show Stats Expand all files Collapse all files

33
sbapp/sideband/core.py
View File

@ -443,7 +443,7 @@ class SidebandCore():
self.config["hw_rnode_coding_rate"] = self.config["hw_rnode_presets_cfg"][0][2]
self.config["hw_rnode_tx_power"] = 22
self.config["hw_rnode_secondary_modem"] = False
self.config["hw_rnode_sec_presets_cfg"] = [[1625000, 5, 5, 100, 100], [1625000, 7, 6, 100, 100], [1625000, 9, 7, 100, 100], [1625000, 12, 8, 100, 100]]
self.config["hw_rnode_sec_presets_cfg"] = [[1625000, 5, 5, 100, 100], [1625000, 7, 6, 100, 100], [812500, 9, 7, 100, 100], [203.125, 12, 8, 100, 100]]
self.config["hw_rnode_sec_advanced_cfg"] = False
self.config["hw_rnode_sec_preset"] = self.config["hw_rnode_presets"][0]
self.config["hw_rnode_sec_channels"] = {
@ -3700,7 +3700,17 @@ class SidebandCore():
atl_long = self.config["hw_rnode_atl_long"]
if self.config["hw_rnode_secondary_modem"]:
subint_config = [[0]*10 for i in range(2)]
if self.config["hw_rnode_sec_atl_short"] == "":
sec_atl_short = None
else:
sec_atl_short = self.config["hw_rnode_sec_atl_short"]
if self.config["hw_rnode_sec_atl_long"] == "":
sec_atl_long = None
else:
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
@ -3713,6 +3723,7 @@ class SidebandCore():
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
@ -3723,19 +3734,9 @@ class SidebandCore():
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
if self.config["hw_rnode_atl_short"] == "":
sec_atl_short = None
else:
sec_atl_short = self.config["hw_rnode_sec_atl_short"]
if self.config["hw_rnode_atl_long"] == "":
sec_atl_long = None
else:
sec_atl_long = self.config["hw_rnode_sec_atl_long"]
subint_config[1][8] = sec_atl_short
subint_config[1][9] = sec_atl_long
subint_config[0][8] = sec_atl_short
subint_config[0][9] = sec_atl_long
subint_config[1][10] = True # outgoing
rnodeinterface = RNS.Interfaces.Android.RNodeMultiInterface.RNodeMultiInterface(
RNS.Transport,
@ -3747,7 +3748,7 @@ class SidebandCore():
target_device_name = bt_device_name,
)
rnodeinterface.OUT = True
rnodeinterface.start()
else:
rnodeinterface = RNS.Interfaces.Android.RNodeInterface.RNodeInterface(
RNS.Transport,