diff --git a/docker-compose.yaml b/docker-compose.yaml index 1ddc0b51..e3fa9b85 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -50,7 +50,7 @@ services: restart: unless-stopped command: python -u /app/parser/cellular_parser.py environment: - - DBC_FILE=/app/dbc/brightside.dbc + - DBC_FILE=/app/dbc/cascadia.dbc - INFLUX_URL=${INFLUX_URL} - INFLUX_ORG=${INFLUX_ORG} - INFLUX_BUCKET=CAN_test diff --git a/link_telemetry.py b/link_telemetry.py index f91b371d..5a59c4ab 100755 --- a/link_telemetry.py +++ b/link_telemetry.py @@ -656,8 +656,8 @@ def main(): help=("allows randomization with production bucket. Please user carefully and locally ")) source_group.add_argument("--dbc", action="store", - help="Specifies the dbc file to use. For example: ./dbc/brightside.dbc" - "Default: ./dbc/brightside.dbc") + help="Specifies the dbc file to use. For example: ./dbc/cascadia.dbc. " + "Default: ./dbc/cascadia.dbc") source_group.add_argument("-f", "--frequency-hz", action="store", default=DEFAULT_RANDOM_FREQUENCY_HZ, type=int, help=((f"Specifies the frequency (in Hz) for random message generation. \ diff --git a/parser/cellular_parser.py b/parser/cellular_parser.py index 9cc5b794..f7784406 100644 --- a/parser/cellular_parser.py +++ b/parser/cellular_parser.py @@ -8,7 +8,7 @@ - Logs undecodable/unknown frames to a rotating file ENV (typical): - DBC_FILE=/app/dbc/brightside.dbc + DBC_FILE=/app/dbc/cascadia.dbc INFLUX_URL=http://influxdb:8086 INFLUX_ORG=UBC Solar INFLUX_BUCKET=CAN_test @@ -41,7 +41,7 @@ # ----------------------------- # Config from environment # ----------------------------- -DBC_FILE = os.getenv("DBC_FILE", "/app/dbc/brightside.dbc") +DBC_FILE = os.getenv("DBC_FILE", "/app/dbc/cascadia.dbc") INFLUX_URL = os.getenv("INFLUX_URL", "http://localhost:8086") INFLUX_ORG = os.getenv("INFLUX_ORG", "UBC Solar") INFLUX_BUCKET = os.getenv("INFLUX_BUCKET", "CAN_test") @@ -207,7 +207,7 @@ def UploadFrames(self, request_iter, context): continue try: - vals = msg.decode(bytes(f.data)) + vals = msg.decode(bytes(f.data), decode_choices=False) except Exception as e: metrics["decodes_failed"] += 1 _log_fail(f.can_id, f.is_extended_id, bytes(f.data), f"DECODE_FAIL:{type(e).__name__}") diff --git a/parser/data_classes/CAN_Msg.py b/parser/data_classes/CAN_Msg.py index 3934838b..d20ffaf1 100644 --- a/parser/data_classes/CAN_Msg.py +++ b/parser/data_classes/CAN_Msg.py @@ -108,7 +108,7 @@ def get_data_bytes(self, message_data) -> bytearray: """ def get_measurements(self, identifier, data_bytes): try: - measurements = CAR_DBC.decode_message(identifier, data_bytes) + measurements = CAR_DBC.decode_message(identifier, data_bytes, decode_choices=False) if measurements == {}: raise Exception(f"Could not decode_message on ID = {identifier} with data = {data_bytes}") return measurements diff --git a/parser/parameters.py b/parser/parameters.py index a8e17b06..f73c8f24 100644 --- a/parser/parameters.py +++ b/parser/parameters.py @@ -32,7 +32,7 @@ def generate_exception(e: Exception, func_name: str) -> Exception: # <----- DBC Variables (Can be changed by user arguement in Link Tel) -----> -DBC_FILE = Path("./dbc/brightside.dbc") +DBC_FILE = Path("./dbc/cascadia.dbc") if not DBC_FILE.is_file(): print(f"Unable to find expected existing DBC file: \"{DBC_FILE.absolute()}\"") sys.exit(1)