Another fixed await and frequencies typo
This commit is contained in:
@@ -68,15 +68,18 @@ async def join_server(system_id, guild_id, channel_id):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
# Generate the config for the channel requested
|
# Generate the config for the channel requested
|
||||||
chn_config = ConfigGenerator(
|
tags_list = [TalkgroupTag(**tag_dict) for tag_dict in sys_details.get('tags', []) if tag_dict] if sys_details.get('tags') is not None else None
|
||||||
|
|
||||||
|
sys_config = ConfigGenerator(
|
||||||
type=sys_details['decode_mode'],
|
type=sys_details['decode_mode'],
|
||||||
systemName=sys_details['name'],
|
systemName=sys_details['name'],
|
||||||
frequencys=sys_details['frequency_list_khz'],
|
frequencies=sys_details['frequency_list_khz'], # Assuming 'channels' is the correct field name
|
||||||
tags=sys_details['tags'],
|
tags=tags_list,
|
||||||
whitelist=sys_details['tag_whitelist'])
|
whitelist=sys_details.get('tag_whitelist') # Use .get for optional fields
|
||||||
|
)
|
||||||
|
|
||||||
# Set the OP25 config
|
# Set the OP25 config
|
||||||
drb_api.generate_op25_config(chn_config)
|
await drb_api.generate_op25_config(sys_config)
|
||||||
|
|
||||||
# Start OP25
|
# Start OP25
|
||||||
await drb_api.start_op25()
|
await drb_api.start_op25()
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ class ConfigGenerator:
|
|||||||
self,
|
self,
|
||||||
type: DecodeMode,
|
type: DecodeMode,
|
||||||
systemName: str,
|
systemName: str,
|
||||||
frequencys: List[str],
|
frequencies: List[str],
|
||||||
tags: Optional[List[TalkgroupTag]] = None,
|
tags: Optional[List[TalkgroupTag]] = None,
|
||||||
whitelist: Optional[List[int]] = None
|
whitelist: Optional[List[int]] = None
|
||||||
):
|
):
|
||||||
self.type = type
|
self.type = type
|
||||||
self.systemName = systemName
|
self.systemName = systemName
|
||||||
self.frequencys = frequencys
|
self.frequencies = frequencies
|
||||||
self.tags = tags
|
self.tags = tags
|
||||||
self.whitelist = whitelist
|
self.whitelist = whitelist
|
||||||
|
|
||||||
@@ -37,7 +37,7 @@ class ConfigGenerator:
|
|||||||
data = {
|
data = {
|
||||||
"type": self.type.value, # Use .value for Enum
|
"type": self.type.value, # Use .value for Enum
|
||||||
"systemName": self.systemName,
|
"systemName": self.systemName,
|
||||||
"frequencys": self.frequencys,
|
"frequencies": self.frequencies,
|
||||||
}
|
}
|
||||||
if self.tags is not None:
|
if self.tags is not None:
|
||||||
# Convert list of TalkgroupTag objects to list of dictionaries
|
# Convert list of TalkgroupTag objects to list of dictionaries
|
||||||
|
|||||||
Reference in New Issue
Block a user