Skip to content

Supress exception occuring in NIXNET _detect_available_configs() #1085

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 10 commits into from
Jun 24, 2021
Merged

Supress exception occuring in NIXNET _detect_available_configs() #1085

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
91dd7ef
Supress exception occuring in NIXNET _detect_available_configs()
felixdivo Jun 9, 2021
b964949
Format code with black
felixdivo Jun 9, 2021
7520d21
fix error import
felixdivo Jun 9, 2021
5b8efb2
Merge branch 'felixdivo-fix-nixnet-detect_available_configs' of githu…
felixdivo Jun 9, 2021
d61590d
Format code with black
felixdivo Jun 9, 2021
0e355b3
Merge branch 'develop' into felixdivo-fix-nixnet-detect_available_con…
mergify[bot] Jun 17, 2021
0d676fd
Merge branch 'develop' into felixdivo-fix-nixnet-detect_available_con…
mergify[bot] Jun 17, 2021
8546501
Merge branch 'develop' into felixdivo-fix-nixnet-detect_available_con…
mergify[bot] Jun 17, 2021
33fa0b4
Merge branch 'develop' into felixdivo-fix-nixnet-detect_available_con…
mergify[bot] Jun 17, 2021
74b4176
Merge branch 'develop' into felixdivo-fix-nixnet-detect_available_con…
mergify[bot] Jun 17, 2021
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
41 changes: 28 additions & 13 deletions can/interfaces/nixnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@

if sys.platform == "win32":
try:
from nixnet import session, types, constants, errors, system, database
from nixnet import (
session,
types,
constants,
errors,
system,
database,
XnetError,
)
except ImportError:
logger.error("Error, NIXNET python module cannot be loaded.")
raise ImportError()
Expand Down Expand Up @@ -225,18 +233,25 @@ def shutdown(self):
@staticmethod
def _detect_available_configs():
configs = []
nixnet_system = system.System()
for can_intf in nixnet_system.intf_refs_can:
logger.info("Channel index %d: %s", can_intf.port_num, str(can_intf))
configs.append(
{
"interface": "nixnet",
"channel": str(can_intf),
"can_term_available": can_intf.can_term_cap
== constants.CanTermCap.YES,
}
)
nixnet_system.close()

try:
with system.System() as nixnet_system:
for interface in nixnet_system.intf_refs_can:
cahnnel = str(interface)
logger.debug(
"Found channel index %d: %s", interface.port_num, cahnnel
)
configs.append(
{
"interface": "nixnet",
"channel": cahnnel,
"can_term_available": interface.can_term_cap
== constants.CanTermCap.YES,
}
)
except XnetError as error:
logger.debug("An error occured while searching for configs: %s", str(error))

return configs


Expand Down