Skip to content

Commit

Permalink
Merge pull request #492 from bitcraze/rik/link_quality
Browse files Browse the repository at this point in the history
Calculate latency, receive uplink RSSI, calculate bandwidth congestion and packet rate
  • Loading branch information
ataffanel authored Dec 20, 2024
2 parents 57c4b18 + 965f3d2 commit dfd989c
Show file tree
Hide file tree
Showing 11 changed files with 498 additions and 57 deletions.
4 changes: 4 additions & 0 deletions cflib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@
cf.close_link()
```
"""
import warnings

warnings.simplefilter('always', DeprecationWarning) # Enbable DeprecationWarnings

__pdoc__ = {}
__pdoc__['cflib.crtp.cflinkcppdriver'] = False
__pdoc__['cflib.cpx.transports'] = False
52 changes: 42 additions & 10 deletions cflib/crazyflie/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import datetime
import logging
import time
import warnings
from collections import namedtuple
from threading import current_thread
from threading import Lock
Expand All @@ -44,6 +45,7 @@
from .commander import Commander
from .console import Console
from .extpos import Extpos
from .link_statistics import LinkStatistics
from .localization import Localization
from .log import Log
from .mem import Memory
Expand Down Expand Up @@ -99,8 +101,6 @@ def __init__(self, link=None, ro_cache=None, rw_cache=None):
self.packet_received = Caller()
# Called for every packet sent
self.packet_sent = Caller()
# Called when the link driver updates the link quality measurement
self.link_quality_updated = Caller()

self.state = State.DISCONNECTED

Expand All @@ -123,6 +123,7 @@ def __init__(self, link=None, ro_cache=None, rw_cache=None):
self.mem = Memory(self)
self.platform = PlatformService(self)
self.appchannel = Appchannel(self)
self.link_statistics = LinkStatistics(self)

self.link_uri = ''

Expand Down Expand Up @@ -155,6 +156,22 @@ def __init__(self, link=None, ro_cache=None, rw_cache=None):
self.fully_connected.add_callback(
lambda uri: logger.info('Callback->Connection completed [%s]', uri))

self.connected.add_callback(
lambda uri: self.link_statistics.start())
self.disconnected.add_callback(
lambda uri: self.link_statistics.stop())

@property
def link_quality_updated(self):
# Issue a deprecation warning when the deprecated attribute is accessed
warnings.warn(
'link_quality_updated is deprecated and will be removed soon. '
'Please use link_statistics.link_quality_updated directly and/or update your client.',
DeprecationWarning,
stacklevel=2 # To point to the caller's code
)
return self.link_statistics.link_quality_updated

def _disconnected(self, link_uri):
""" Callback when disconnected."""
self.connected_ts = None
Expand Down Expand Up @@ -208,10 +225,6 @@ def _link_error_cb(self, errmsg):
self.disconnected_link_error.call(self.link_uri, errmsg)
self.state = State.DISCONNECTED

def _link_quality_cb(self, percentage):
"""Called from link driver to report link quality"""
self.link_quality_updated.call(percentage)

def _check_for_initial_packet_cb(self, data):
"""
Called when first packet arrives from Crazyflie.
Expand All @@ -233,7 +246,7 @@ def open_link(self, link_uri):
self.link_uri = link_uri
try:
self.link = cflib.crtp.get_link_driver(
link_uri, self._link_quality_cb, self._link_error_cb)
link_uri, self.link_statistics.radio_link_statistics_callback, self._link_error_cb)

if not self.link:
message = 'No driver found or malformed URI: {}' \
Expand Down Expand Up @@ -288,6 +301,14 @@ def remove_port_callback(self, port, cb):
"""Remove the callback cb on port"""
self.incoming.remove_port_callback(port, cb)

def add_header_callback(self, cb, port, channel, port_mask=0xFF, channel_mask=0xFF):
"""Add a callback to cb on port and channel"""
self.incoming.add_header_callback(cb, port, channel, port_mask, channel_mask)

def remove_header_callback(self, cb, port, channel, port_mask=0xFF, channel_mask=0xFF):
"""Remove the callback cb on port and channel"""
self.incoming.remove_header_callback(cb, port, channel, port_mask, channel_mask)

def _no_answer_do_retry(self, pk, pattern):
"""Resend packets that we have not gotten answers to"""
logger.info('Resending for pattern %s', pattern)
Expand Down Expand Up @@ -384,9 +405,7 @@ def add_port_callback(self, port, cb):
def remove_port_callback(self, port, cb):
"""Remove a callback for data that comes on a specific port"""
logger.debug('Removing callback on port [%d] to [%s]', port, cb)
for port_callback in self.cb:
if port_callback.port == port and port_callback.callback == cb:
self.cb.remove(port_callback)
self.remove_header_callback(cb, port, 0, 0xff, 0x0)

def add_header_callback(self, cb, port, channel, port_mask=0xFF,
channel_mask=0xFF):
Expand All @@ -398,6 +417,19 @@ def add_header_callback(self, cb, port, channel, port_mask=0xFF,
self.cb.append(_CallbackContainer(port, port_mask,
channel, channel_mask, cb))

def remove_header_callback(self, cb, port, channel, port_mask=0xFF,
channel_mask=0xFF):
"""
Remove a callback for a specific port/header callback with the
possibility to add a mask for channel and port for multiple
hits for same callback.
"""
for port_callback in self.cb:
if port_callback.port == port and port_callback.port_mask == port_mask and \
port_callback.channel == channel and port_callback.channel_mask == channel_mask and \
port_callback.callback == cb:
self.cb.remove(port_callback)

def run(self):
while True:
if self.cf.link is None:
Expand Down
234 changes: 234 additions & 0 deletions cflib/crazyflie/link_statistics.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,234 @@
# -*- coding: utf-8 -*-
#
# ,---------, ____ _ __
# | ,-^-, | / __ )(_) /_______________ _____ ___
# | ( O ) | / __ / / __/ ___/ ___/ __ `/_ / / _ \
# | / ,--' | / /_/ / / /_/ /__/ / / /_/ / / /_/ __/
# +------` /_____/_/\__/\___/_/ \__,_/ /___/\___/
#
# Copyright (C) 2024 Bitcraze AB
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, in version 3.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
This module provides tools for tracking statistics related to the communication
link between the Crazyflie and the lib. Currently, it focuses on tracking latency
but is designed to be extended with additional link statistics in the future.
"""
import struct
import time
from threading import Event
from threading import Thread

import numpy as np

from cflib.crtp.crtpstack import CRTPPacket
from cflib.crtp.crtpstack import CRTPPort
from cflib.utils.callbacks import Caller

__author__ = 'Bitcraze AB'
__all__ = ['LinkStatistics']

PING_HEADER = 0x0
ECHO_CHANNEL = 0


class LinkStatistics:
"""
LinkStatistics class manages the collection of various statistics related to the
communication link between the Crazyflie and the lib.
This class serves as a high-level manager, initializing and coordinating multiple
statistics trackers, such as Latency. It allows starting and stopping all
statistics trackers simultaneously. Future statistics can be added to extend
the class's functionality.
Attributes:
_cf (Crazyflie): A reference to the Crazyflie instance.
latency (Latency): An instance of the Latency class that tracks latency statistics.
"""

def __init__(self, crazyflie):
self._cf = crazyflie

# Flag to track if the statistics are active
self._is_active = False

# Universal statistics
self.latency = Latency(self._cf)

# Proxy for latency callback
self.latency_updated = self.latency.latency_updated

# Callers for radio link statistics
self.link_quality_updated = Caller()
self.uplink_rssi_updated = Caller()
self.uplink_rate_updated = Caller()
self.downlink_rate_updated = Caller()
self.uplink_congestion_updated = Caller()
self.downlink_congestion_updated = Caller()

def start(self):
"""
Start collecting all statistics.
"""
self._is_active = True
self.latency.start()

def stop(self):
"""
Stop collecting all statistics.
"""
self._is_active = False
self.latency.stop()

def radio_link_statistics_callback(self, radio_link_statistics):
"""
This callback is called by the RadioLinkStatistics class after it
processes the data provided by the radio driver.
"""
if not self._is_active:
return # Skip processing if link statistics are stopped

if 'link_quality' in radio_link_statistics:
self.link_quality_updated.call(radio_link_statistics['link_quality'])
if 'uplink_rssi' in radio_link_statistics:
self.uplink_rssi_updated.call(radio_link_statistics['uplink_rssi'])
if 'uplink_rate' in radio_link_statistics:
self.uplink_rate_updated.call(radio_link_statistics['uplink_rate'])
if 'downlink_rate' in radio_link_statistics:
self.downlink_rate_updated.call(radio_link_statistics['downlink_rate'])
if 'uplink_congestion' in radio_link_statistics:
self.uplink_congestion_updated.call(radio_link_statistics['uplink_congestion'])
if 'downlink_congestion' in radio_link_statistics:
self.downlink_congestion_updated.call(radio_link_statistics['downlink_congestion'])


class Latency:
"""
The Latency class measures and tracks the latency of the communication link
between the Crazyflie and the lib.
This class periodically sends ping requests to the Crazyflie and tracks
the round-trip time (latency). It calculates and stores the 95th percentile
latency over a rolling window of recent latency measurements.
Attributes:
_cf (Crazyflie): A reference to the Crazyflie instance.
latency (float): The current calculated 95th percentile latency in milliseconds.
_stop_event (Event): An event object to control the stopping of the ping thread.
_ping_thread_instance (Thread): Thread instance for sending ping requests at intervals.
"""

def __init__(self, crazyflie):
self._cf = crazyflie
self._cf.add_header_callback(self._ping_response, CRTPPort.LINKCTRL, 0)
self._stop_event = Event()
self._ping_thread_instance = None
self.latency = 0
self.latency_updated = Caller()

def start(self):
"""
Start the latency tracking process.
This method initiates a background thread that sends ping requests
at regular intervals to measure and track latency statistics.
"""
if self._ping_thread_instance is None or not self._ping_thread_instance.is_alive():
self._stop_event.clear()
self._ping_thread_instance = Thread(target=self._ping_thread)
self._ping_thread_instance.start()

def stop(self):
"""
Stop the latency tracking process.
This method stops the background thread and ceases sending further
ping requests, halting latency measurement.
"""
self._stop_event.set()
if self._ping_thread_instance is not None:
self._ping_thread_instance.join()
self._ping_thread_instance = None

def _ping_thread(self, interval: float = 0.1) -> None:
"""
Background thread method that sends a ping to the Crazyflie at regular intervals.
This method runs in a separate thread and continues to send ping requests
until the stop event is set.
Args:
interval (float): The time (in seconds) to wait between ping requests. Default is 0.1 seconds.
"""
while not self._stop_event.is_set():
self.ping()
time.sleep(interval)

def ping(self) -> None:
"""
Send a ping request to the Crazyflie to measure latency.
A ping packet is sent to the Crazyflie with the current timestamp and a
header identifier to differentiate it from other echo responses. The latency
is calculated upon receiving the response.
"""
ping_packet = CRTPPacket()
ping_packet.set_header(CRTPPort.LINKCTRL, ECHO_CHANNEL)

# Pack the current time as the ping timestamp
current_time = time.time()
ping_packet.data = struct.pack('<Bd', PING_HEADER, current_time)
self._cf.send_packet(ping_packet)

def _ping_response(self, packet):
"""
Callback method for processing the echo response received from the Crazyflie.
This method is called when a ping response is received. It checks the header
to verify that it matches the sent ping header before calculating the latency
based on the timestamp included in the ping request.
Args:
packet (CRTPPacket): The packet received from the Crazyflie containing
the echo response data.
"""
received_header, received_timestamp = struct.unpack('<Bd', packet.data)
if received_header != PING_HEADER:
return
self.latency = self._calculate_p95_latency(received_timestamp)
self.latency_updated.call(self.latency)

def _calculate_p95_latency(self, timestamp):
"""
Calculate the 95th percentile latency based on recent ping measurements.
This method records the round-trip time for a ping response and maintains
a rolling window of latency values to compute the 95th percentile.
Args:
timestamp (float): The timestamp from the sent ping packet to calculate
the round-trip time.
Returns:
float: The updated 95th percentile latency in milliseconds.
"""
if not hasattr(self, '_latencies'):
self._latencies = []

instantaneous_latency = (time.time() - timestamp) * 1000
self._latencies.append(instantaneous_latency)
if len(self._latencies) > 100:
self._latencies.pop(0)
p95_latency = np.percentile(self._latencies, 95)
return p95_latency
4 changes: 2 additions & 2 deletions cflib/crtp/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ def get_interfaces_status():
return status


def get_link_driver(uri, link_quality_callback=None, link_error_callback=None):
def get_link_driver(uri, radio_link_statistics_callback=None, link_error_callback=None):
"""Return the link driver for the given URI. Returns None if no driver
was found for the URI or the URI was not well formatted for the matching
driver."""
for driverClass in CLASSES:
try:
instance = driverClass()
instance.connect(uri, link_quality_callback, link_error_callback)
instance.connect(uri, radio_link_statistics_callback, link_error_callback)
return instance
except WrongUriType:
continue
Expand Down
Loading

0 comments on commit dfd989c

Please sign in to comment.