From d22238719b5f2103e377718a678d2531c5abbd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Caruso?= <niccolo.caruso@skywarder.eu> Date: Mon, 15 Jul 2024 17:45:26 +0200 Subject: [PATCH] [all, submodule] Updated mavlink, change radio to 433 Updated skyward-boardcore for the new mavlink with unique command list. Updated coherently the on-host cargo.toml and cargo.lock to the correct lyra-gs commit of mavlink-skyward-lib. Changed radio settings to 433MHz. --- on-device/libs/boardcore | 2 +- on-device/src/config/RadioConfig.h | 2 +- on-host/Cargo.lock | 2 +- on-host/Cargo.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/on-device/libs/boardcore b/on-device/libs/boardcore index 1a9769b..be57486 160000 --- a/on-device/libs/boardcore +++ b/on-device/libs/boardcore @@ -1 +1 @@ -Subproject commit 1a9769b03fa2a2aac6c786ca99438fe958350b9d +Subproject commit be57486527b197af264399c62018b6534f6a4be6 diff --git a/on-device/src/config/RadioConfig.h b/on-device/src/config/RadioConfig.h index 7fba28f..25a91a1 100644 --- a/on-device/src/config/RadioConfig.h +++ b/on-device/src/config/RadioConfig.h @@ -33,7 +33,7 @@ constexpr size_t MAV_OUT_BUFFER_MAX_AGE = 10; // Radio configuration constexpr Boardcore::SX1278Fsk::Config RADIO_CONFIG = { - .freq_rf = 434000000, + .freq_rf = 433000000, .freq_dev = 50000, .bitrate = 48000, .rx_bw = Boardcore::SX1278Fsk::Config::RxBw::HZ_125000, diff --git a/on-host/Cargo.lock b/on-host/Cargo.lock index d94fa9a..768579e 100644 --- a/on-host/Cargo.lock +++ b/on-host/Cargo.lock @@ -733,7 +733,7 @@ dependencies = [ [[package]] name = "skyward_mavlink" version = "0.1.0" -source = "git+https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git?branch=lyra-refactor#5fe20588f7e1023ed2cc4095a2faaf81c86c7a64" +source = "git+https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git?branch=lyra-gs#58f269163b0564db9e4f0b76662667e776df98c0" dependencies = [ "bitflags 2.5.0", "mavlink-bindgen", diff --git a/on-host/Cargo.toml b/on-host/Cargo.toml index cb93c99..f543405 100644 --- a/on-host/Cargo.toml +++ b/on-host/Cargo.toml @@ -15,7 +15,7 @@ simple_logger = { version = "4.3.3", features = ["colors"] } [dependencies.skyward_mavlink] git = "https://git.skywarder.eu/avn/swd/mavlink/mavlink-skyward-lib.git" -branch = "lyra-refactor" +branch = "lyra-gs" features = ["serde", "lyra"] [dependencies.tdl-core] -- GitLab