Skip to content

Adds cpx versioning #388

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
krichardsson merged 2 commits into from
Mar 21, 2023
Merged

Adds cpx versioning #388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48f8a12
Adds cpx versioning
hmllr Mar 21, 2023
42fa152
Fix styling
hmllr Mar 21, 2023
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
16 changes: 12 additions & 4 deletions cflib/cpx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
""" CPX Router and discovery"""
import enum
import logging
import queue
import struct
import threading

__author__ = 'Bitcraze AB'
__all__ = ['CPXRouter']
logger = logging.getLogger(__name__)


class CPXTarget(enum.Enum):
Expand Down Expand Up @@ -59,6 +61,7 @@ class CPXPacket(object):
"""
A packet with routing and data
"""
CPX_VERSION = 0

def __init__(self, function=0, destination=0, source=CPXTarget.HOST, data=bytearray()):
"""
Expand All @@ -68,6 +71,7 @@ def __init__(self, function=0, destination=0, source=CPXTarget.HOST, data=bytear
self.source = source
self.destination = destination
self.function = function
self.version = self.CPX_VERSION
self.length = len(data)
self.lastPacket = False

Expand All @@ -79,18 +83,22 @@ def _get_wire_data(self):
if self.lastPacket:
targetsAndFlags |= 0x40

function = self.function.value & 0xFF
raw.extend(struct.pack('<BB', targetsAndFlags, function))
functionAndVersion = (self.function.value & 0x3F) | ((self.version & 0x3) << 6)
raw.extend(struct.pack('<BB', targetsAndFlags, functionAndVersion))
raw.extend(self.data)

return raw

def _set_wire_data(self, data):
[targetsAndFlags, self.function] = struct.unpack('<BB', data[0:2])
[targetsAndFlags, functionAndVersion] = struct.unpack('<BB', data[0:2])
self.version = (functionAndVersion >> 6) & 0x3
if self.version != self.CPX_VERSION:
logging.error(f'Unsupported CPX version {self.version} instead of {self.CPX_VERSION}')
raise RuntimeError(f'Unsupported CPX version {self.version} instead of {self.CPX_VERSION}')
self.source = CPXTarget((targetsAndFlags >> 3) & 0x07)
self.destination = CPXTarget(targetsAndFlags & 0x07)
self.lastPacket = targetsAndFlags & 0x40 != 0
self.function = CPXFunction(self.function)
self.function = CPXFunction(functionAndVersion & 0x3F)
self.data = data[2:]
self.length = len(self.data)

Expand Down