Skip to content

Commit ac8eac4

Browse files
authored
Update crazyflie firmware version (#393)
* Update crazyflie firmware version * Temporary branch change * Add crazyflie tx patch * Add patch
1 parent 0eec818 commit ac8eac4

4 files changed

Lines changed: 74 additions & 1 deletion

File tree

config/freertos/crazyflie21/board.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ repositories:
22
crazyflie_firmware:
33
type: git
44
url: https://github.com/bitcraze/crazyflie-firmware
5-
version: 2020.06
5+
version: 2021.06
66

77
freertos_apps:
88
type: git

config/freertos/crazyflie21/create.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ pushd $FW_TARGETDIR >/dev/null
1010

1111
# Import repos
1212
vcs import --input $PREFIX/config/$RTOS/$PLATFORM/board.repos
13+
git apply $PREFIX/config/$RTOS/$PLATFORM/patchs/*.patch --directory crazyflie_firmware
1314

1415
# ignore broken packages
1516
touch mcu_ws/ros2/rcl_logging/rcl_logging_log4cxx/COLCON_IGNORE
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
From ab2fc76ed60e64f52cb6379ffdf4a04691af658d Mon Sep 17 00:00:00 2001
2+
From: Antonio cuadros <acuadros1995@gmail.com>
3+
Date: Mon, 27 Sep 2021 09:21:33 +0200
4+
Subject: [PATCH] Add tx queue utilities
5+
6+
---
7+
src/hal/interface/radiolink.h | 3 ++-
8+
src/hal/src/radiolink.c | 10 ++++++++++
9+
2 files changed, 12 insertions(+), 1 deletion(-)
10+
11+
diff --git a/src/hal/interface/radiolink.h b/src/hal/interface/radiolink.h
12+
index 293c5c64..ad85e313 100644
13+
--- a/src/hal/interface/radiolink.h
14+
+++ b/src/hal/interface/radiolink.h
15+
@@ -58,6 +58,7 @@ void radiolinkSyslinkDispatch(SyslinkPacket *slp);
16+
struct crtpLinkOperations * radiolinkGetLink();
17+
bool radiolinkSendP2PPacketBroadcast(P2PPacket *p2pp);
18+
void p2pRegisterCB(P2PCallback cb);
19+
-
20+
+int linkGetFreeTxQueuePackets(void);
21+
+int linkResetTxQueuePackets(void);
22+
23+
#endif //__RADIO_H__
24+
diff --git a/src/hal/src/radiolink.c b/src/hal/src/radiolink.c
25+
index 738901f3..23d000b3 100644
26+
--- a/src/hal/src/radiolink.c
27+
+++ b/src/hal/src/radiolink.c
28+
@@ -74,6 +74,16 @@ static bool radiolinkIsConnected(void) {
29+
return (xTaskGetTickCount() - lastPacketTick) < M2T(RADIO_ACTIVITY_TIMEOUT_MS);
30+
}
31+
32+
+int linkGetFreeTxQueuePackets(void)
33+
+{
34+
+ return (RADIOLINK_TX_QUEUE_SIZE - uxQueueMessagesWaiting(txQueue));
35+
+}
36+
+
37+
+int linkResetTxQueuePackets(void)
38+
+{
39+
+ return xQueueReset(txQueue);
40+
+}
41+
+
42+
static struct crtpLinkOperations radiolinkOp =
43+
{
44+
.setEnable = radiolinkSetEnable,
45+
--
46+
2.25.1
47+
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From df14a0e01528c304c758bb4f32b1f28cc5fecc19 Mon Sep 17 00:00:00 2001
2+
From: Antonio cuadros <acuadros1995@gmail.com>
3+
Date: Mon, 27 Sep 2021 10:05:54 +0200
4+
Subject: [PATCH] Remove assert
5+
6+
---
7+
src/hal/src/radiolink.c | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/src/hal/src/radiolink.c b/src/hal/src/radiolink.c
11+
index 738901f3..bfe07865 100644
12+
--- a/src/hal/src/radiolink.c
13+
+++ b/src/hal/src/radiolink.c
14+
@@ -161,7 +161,7 @@ void radiolinkSyslinkDispatch(SyslinkPacket *slp)
15+
{
16+
slp->length--; // Decrease to get CRTP size.
17+
// Assert that we are not dopping any packets
18+
- ASSERT(xQueueSend(crtpPacketDelivery, &slp->length, 0) == pdPASS);
19+
+ xQueueSend(crtpPacketDelivery, &slp->length, 0);
20+
ledseqRun(&seq_linkUp);
21+
// If a radio packet is received, one can be sent
22+
if (xQueueReceive(txQueue, &txPacket, 0) == pdTRUE)
23+
--
24+
2.25.1
25+

0 commit comments

Comments
 (0)