mirror of https://github.com/DJ2LS/FreeDATA.git
fixing some path related issues - trying to merge this PR soon
parent
69bfd4c052
commit
a4451f8300
|
|
@ -13,6 +13,7 @@ from freedata_server.message_system_db_messages import DatabaseManagerMessages
|
|||
from freedata_server.message_system_db_attachments import DatabaseManagerAttachments
|
||||
from freedata_server.message_system_db_beacon import DatabaseManagerBeacon
|
||||
from freedata_server.message_system_db_station import DatabaseManagerStations
|
||||
from freedata_server.message_system_db_broadcasts import DatabaseManagerBroadcasts
|
||||
from freedata_server import command_message_send
|
||||
from freedata_server import adif_udp_logger
|
||||
from freedata_server import wavelog_api_logger
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@
|
|||
|
||||
import structlog
|
||||
import time
|
||||
import data_frame_factory
|
||||
from enum import IntEnum
|
||||
import hashlib
|
||||
from codec2 import FREEDV_MODE
|
||||
from freedata_server.codec2 import FREEDV_MODE
|
||||
|
||||
|
||||
|
||||
|
|
@ -36,7 +35,7 @@ class NormTransmission:
|
|||
self.origin = None
|
||||
self.domain = None
|
||||
|
||||
self.frame_factory = data_frame_factory.DataFrameFactory(self.ctx)
|
||||
self.frame_factory = freedata_server.data_frame_factory.DataFrameFactory(self.ctx)
|
||||
|
||||
def log(self, message, isWarning=False):
|
||||
"""Logs a message with session context.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# file for handling received data
|
||||
from norm.norm_transmission import NormTransmission
|
||||
from message_system_db_broadcasts import DatabaseManagerBroadcasts
|
||||
from freedata_server.norm.norm_transmission import NormTransmission
|
||||
from freedata_server.message_system_db_broadcasts import DatabaseManagerBroadcasts
|
||||
import base64
|
||||
from datetime import datetime, timezone, timedelta
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
# file for handling transmitting data
|
||||
from norm.norm_transmission import NormTransmission
|
||||
from norm.norm_transmission import NORMMsgType, NORMMsgPriority
|
||||
from freedata_server.norm.norm_transmission import NormTransmission
|
||||
from freedata_server.norm.norm_transmission import NORMMsgType, NORMMsgPriority
|
||||
from enum import Enum
|
||||
import time
|
||||
from codec2 import FREEDV_MODE
|
||||
import helpers
|
||||
from freedata_server.codec2 import FREEDV_MODE
|
||||
|
||||
import freedata_server.helpers
|
||||
from datetime import datetime, timezone, timedelta
|
||||
import base64
|
||||
from message_system_db_broadcasts import DatabaseManagerBroadcasts
|
||||
from freedata_server.message_system_db_broadcasts import DatabaseManagerBroadcasts
|
||||
import threading
|
||||
import numpy as np
|
||||
|
||||
|
|
@ -71,9 +72,8 @@ class NormTransmissionISS(NormTransmission):
|
|||
raise ValueError(f"Empty payload at burst {burst_number}")
|
||||
|
||||
burst_info = self.encode_burst_info(burst_number, total_bursts)
|
||||
checksum = helpers.get_crc_24(full_data)
|
||||
checksum = freedata_server.helpers.get_crc_24(full_data)
|
||||
is_last = (burst_number == total_bursts)
|
||||
print("so...")
|
||||
print("message type", self.message_type)
|
||||
print("priority", self.priority)
|
||||
print("is_last", is_last)
|
||||
|
|
@ -187,7 +187,7 @@ class NormTransmissionISS(NormTransmission):
|
|||
def add_to_database(self):
|
||||
try:
|
||||
db = DatabaseManagerBroadcasts(self.ctx)
|
||||
checksum = helpers.get_crc_24(self.data).hex()
|
||||
checksum = freedata_server.helpers.get_crc_24(self.data).hex()
|
||||
broadcast_id = self.create_broadcast_id(int(self.timestamp), self.domain, checksum)
|
||||
|
||||
total_bursts = (len(self.data) + self.MAX_PAYLOAD_SIZE - 1) // self.MAX_PAYLOAD_SIZE
|
||||
|
|
|
|||
Loading…
Reference in New Issue