Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #27

Merged
merged 17 commits into from
Oct 5, 2023
Merged

Dev #27

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions UserDB/UserDBmain.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ def get_entry(self, call_str, add_new=True):
else:
return False
else:
self.entry_var_upgrade(call_tup[0])
# self.entry_var_upgrade(call_tup[0])
return self.db[call_tup[0]]
self.entry_var_upgrade(call_str)
# self.entry_var_upgrade(call_str)
return self.db[call_str]
return False

Expand Down
9 changes: 6 additions & 3 deletions ax25/ax25Connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,13 +230,12 @@ def __init__(self, ax25_frame: AX25Frame, cfg, port, rx=True):
""" Encoding """
self.encoding = 'CP437' # 'UTF-8'
""" User DB Entry """
# self.user_db = USER_DB
self.user_db_ent = False
self.cli_language = 0
self.set_user_db_ent()
""" Station Individual Parameter """
self.set_packet_param()
""" Init CLI """
self.cli_language = 0
self.cli = cli.cliMain.NoneCLI(self)
self.cli_type = ''
if self.stat_cfg.stat_parm_pipe is None:
Expand Down Expand Up @@ -386,9 +385,13 @@ def set_user_db_ent(self):
self.user_db_ent.Language = 0
else:
self.user_db_ent.Language = int(self.gui.language)
self.cli_language = int(self.gui.language)
self.cli_language = self.user_db_ent.Language
self.set_distance()

def set_user_db_language(self, lang_ind: int):
self.user_db_ent.Language = int(lang_ind)
self.cli_language = int(lang_ind)

def set_distance(self):
if self.user_db_ent:
if self.my_locator and self.user_db_ent.LOC:
Expand Down
Loading