Broadcast support & examples #9
Conversation
There was a problem hiding this comment.
This looks good overall. I really like the PacketHelper and the more extensive examples on how to use the library. My main concern is the URI - I do agree that your version is easier to parse (and that the current parsing code is a mess), but the URI design was carefully crafted to be backward compatible as well as unified across backends. We'll need @ataffanel input before we can finalize the broadcast URI.
src/USBManager.cpp
Outdated
| // Fixes a crash where device gets destroyed before it gets unref'ed | ||
| crazyradios_.clear(); | ||
|
|
src/Connection.cpp
Outdated
|
|
||
| const std::regex uri_regex("(usb:\\/\\/(\\d+)|radio:\\/\\/(\\d+|\\*)\\/(\\d+)\\/(250K|1M|2M)\\/([a-fA-F0-9]+|\\*)(\\?[\\w=&]+)?)"); | ||
| const std::regex uri_regex("(usb:\\/\\/(\\d+)|radio(broadcast)*:\\/\\/(\\d+|\\*)\\/(\\d+)\\/(250K|1M|2M)(\\/([a-fA-F0-9]+|\\*)(\\?[\\w=&]+)?)*)"); |
There was a problem hiding this comment.
This regex now allows to have address and URI flags for the radiobroadcast backend as well, e.g., radiobroadcast://0/80/2M/E7E7E7E7E7?ackfilter=0 would still be accepted. I think it would be cleaner to add a new option, i.e., "(usb:\\/\\/(\\d+)|radio:\\/\\/(\\d+|\\*)\\/(\\d+)\\/(250K|1M|2M)\\/([a-fA-F0-9]+|\\*)(\\?[\\w=&]+)?)|radiobroadcast:\\/\\/(\\d+|\\*)\\/(\\d+)\\/(250K|1M|2M)". Not pretty, but better error handling & reporting for malformed URIs.
examples/broadcast.cpp
Outdated
| #include <thread> | ||
|
|
||
| #include "crazyflieLinkCpp/Connection.h" | ||
| #include "PacketUtils.hpp"; |
There was a problem hiding this comment.
CI complains about the semicolon at the end of the line. Sorry, this wasn't enabled before, since you are a "new contributor", but CI should run any fix you push. I am happy to merge once the CI passes!
There was a problem hiding this comment.
Ahh, okay, no worries!
There was a problem hiding this comment.
So I've pushed an update, but it looks like I'll need your approval for the workflows to run again
There was a problem hiding this comment.
Stepped away from this for a bit, but coming back I see the CI build is still failing. Currently it's failing with:
LINK : fatal error C1047: The object or library file '3rdparty\libusb-1.0.24\VS2019\MS64\static\libusb-1.0.lib'
was created by a different version of the compiler than other objects like 'cflinkcpp.dir\Release\python_bindings.obj';
rebuild all objects and libraries with the same compiler [D:\a\crazyflie-link-cpp\crazyflie-link-cpp\build\temp.win-amd64-3.8\Release\cflinkcpp.vcxproj]
This is actually something I dealt with when developing locally, and I never found a fix for it (I just cloned the libusb repository, and built the lib from the source myself). Any thoughts on this? Maybe it's just a matter of updating to a newer build of libusb?
There was a problem hiding this comment.
Sorry, I thought I had merged this already as it looked good. The error you are seeing is unrelated to your changes and tracked in issue #12. We'll take a look ASAP.
There was a problem hiding this comment.
Oh no worries, awesome, glad this got merged in!
No description provided.