Skip to content
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

Fix Skyviper-Journey build #26588

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Fix Skyviper-Journey build #26588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbb9e3e
hwdef: make a skyviper.inc, use it on skyviper-journey
peterbarker Mar 22, 2024
1928f06
AP_Radio: correct guards around code in AP_Radio_cc2500
peterbarker Mar 22, 2024
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
4 changes: 4 additions & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/include/skyviper.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# include file for SkyViper boards. Move things in from
# skyviper-v2450/hwdef.dat as required.

define AP_AIRSPEED_ENABLED 0
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/skyviper-journey/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ env BUILD_ABIN True
define AP_PARAM_MAX_EMBEDDED_PARAM 8192

# Disable un-needed hardware drivers
include ../include/skyviper.inc
define HAL_WITH_ESC_TELEM 0
define AP_FETTEC_ONEWIRE_ENABLED 0

Expand Down
1 change: 1 addition & 0 deletions libraries/AP_HAL_ChibiOS/hwdef/skyviper-v2450/hwdef.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ STORAGE_FLASH_PAGE 22
env BUILD_ABIN True

# Disable un-needed hardware drivers
include ../include/skyviper.inc
define AP_AIRSPEED_ENABLED 0
define AP_BEACON_ENABLED 0
define AP_OPTICALFLOW_ENABLED 0
Expand Down
10 changes: 5 additions & 5 deletions libraries/AP_Radio/AP_Radio_cc2500.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
Many thanks to the cleanflight and betaflight projects
*/
#include "AP_Radio_config.h"

#if AP_RADIO_CC2500_ENABLED

#include <AP_HAL/AP_HAL.h>

// #pragma GCC optimize("O0")

#if CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#if HAL_RCINPUT_WITH_AP_RADIO

#include <AP_Math/AP_Math.h>
#include "AP_Radio_cc2500.h"
#include <utility>
Expand Down Expand Up @@ -1563,5 +1564,4 @@ void AP_Radio_cc2500::check_double_bind(void)
radio_singleton->nextChannel(1);
}

#endif // HAL_RCINPUT_WITH_AP_RADIO
#endif // CONFIG_HAL_BOARD == HAL_BOARD_CHIBIOS
#endif // AP_RADIO_CC2500_ENABLED
Loading