Skip to content

Added status_string method to return simple status strings #725

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.

Sign up for GitHub

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

Merged
felixdivo merged 8 commits into from
Feb 5, 2020
Merged

Added status_string method to return simple status strings #725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b658d0
Added status_string method to return simple status strings
tamenol Nov 14, 2019
07985c4
Merge branch 'develop' into status_string
felixdivo Jan 29, 2020
bbd7713
Merge branch 'develop' into status_string
tamenol Feb 3, 2020
6b9e4a7
Return None when error code is not implemented; added return type hint
tamenol Feb 4, 2020
53ac483
Merge branch 'status_string' of https://github.com/tamenol/python-can…
tamenol Feb 4, 2020
890128f
added string status to dictionary in .basic
tamenol Feb 4, 2020
87b8b4a
black formatting
tamenol Feb 5, 2020
212f094
Merge branch 'develop' into status_string
felixdivo Feb 5, 2020
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
32 changes: 32 additions & 0 deletions can/interfaces/pcan/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,38 @@
PCAN_TYPE_DNG_SJA = TPCANType(0x05) # PCAN-Dongle SJA1000
PCAN_TYPE_DNG_SJA_EPP = TPCANType(0x06) # PCAN-Dongle EPP SJA1000

# string description of the error codes
PCAN_DICT_STATUS = {
PCAN_ERROR_OK: "OK",
PCAN_ERROR_XMTFULL: "XMTFULL",
PCAN_ERROR_OVERRUN: "OVERRUN",
PCAN_ERROR_BUSLIGHT: "BUSLIGHT",
PCAN_ERROR_BUSHEAVY: "BUSHEAVY",
PCAN_ERROR_BUSWARNING: "BUSWARNING",
PCAN_ERROR_BUSPASSIVE: "BUSPASSIVE",
PCAN_ERROR_BUSOFF: "BUSOFF",
PCAN_ERROR_ANYBUSERR: "ANYBUSERR",
PCAN_ERROR_QRCVEMPTY: "QRCVEMPTY",
PCAN_ERROR_QOVERRUN: "QOVERRUN",
PCAN_ERROR_QXMTFULL: "QXMTFULL",
PCAN_ERROR_REGTEST: "ERR_REGTEST",
PCAN_ERROR_NODRIVER: "NODRIVER",
PCAN_ERROR_HWINUSE: "HWINUSE",
PCAN_ERROR_NETINUSE: "NETINUSE",
PCAN_ERROR_ILLHW: "ILLHW",
PCAN_ERROR_ILLNET: "ILLNET",
PCAN_ERROR_ILLCLIENT: "ILLCLIENT",
PCAN_ERROR_ILLHANDLE: "ILLHANDLE",
PCAN_ERROR_RESOURCE: "ERR_RESOURCE",
PCAN_ERROR_ILLPARAMTYPE: "ILLPARAMTYPE",
PCAN_ERROR_ILLPARAMVAL: "ILLPARAMVAL",
PCAN_ERROR_UNKNOWN: "UNKNOWN",
PCAN_ERROR_ILLDATA: "ILLDATA",
PCAN_ERROR_CAUTION: "CAUTION",
PCAN_ERROR_INITIALIZE: "ERR_INITIALIZE",
PCAN_ERROR_ILLOPERATION: "ILLOPERATION",
}


class TPCANMsg(Structure):
"""
Expand Down
11 changes: 11 additions & 0 deletions can/interfaces/pcan/pcan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import logging
import time

from typing import Optional
from can import CanError, Message, BusABC
from can.bus import BusState
from can.util import len2dlc, dlc2len
Expand Down Expand Up @@ -528,6 +529,16 @@ def _detect_available_configs():
)
return channels

def status_string(self) -> Optional[str]:
"""
Query the PCAN bus status.
:return: The status in string.
"""
if self.status() in PCAN_DICT_STATUS:
return PCAN_DICT_STATUS[self.status()]
else:
return None


class PcanError(CanError):
"""
Expand Down