Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: fix build with both GCS and Scripting enabled

This commit is contained in:
bugobliterator 2024-10-13 13:59:27 +08:00 committed by Andrew Tridgell
parent 830de73e58
commit 2cc7277692
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Scripting/generator/description/bindings.desc
View File

@ -284,7 +284,7 @@ singleton AP_Relay method toggle void uint8_t 0 AP_RELAY_NUM_RELAYS
singleton AP_Relay method get uint8_t uint8_t 0 AP_RELAY_NUM_RELAYS singleton AP_Relay method get uint8_t uint8_t 0 AP_RELAY_NUM_RELAYS
include GCS_MAVLink/GCS.h include GCS_MAVLink/GCS.h
singleton GCS depends HAL_GCS_ENABLED singleton GCS depends (HAL_GCS_ENABLED && !defined(HAL_BUILD_AP_PERIPH))
singleton GCS rename gcs singleton GCS rename gcs
singleton GCS method send_text void MAV_SEVERITY'enum MAV_SEVERITY_EMERGENCY MAV_SEVERITY_DEBUG "%s"'literal string singleton GCS method send_text void MAV_SEVERITY'enum MAV_SEVERITY_EMERGENCY MAV_SEVERITY_DEBUG "%s"'literal string
singleton GCS method set_message_interval MAV_RESULT'enum uint8_t 0 MAVLINK_COMM_NUM_BUFFERS uint32_t'skip_check int32_t -1 INT32_MAX singleton GCS method set_message_interval MAV_RESULT'enum uint8_t 0 MAVLINK_COMM_NUM_BUFFERS uint32_t'skip_check int32_t -1 INT32_MAX
@ -970,7 +970,7 @@ global manual dirlist lua_dirlist 1 2
global manual remove lua_removefile 1 3 global manual remove lua_removefile 1 3
global manual print lua_print 1 0 global manual print lua_print 1 0
singleton mavlink depends HAL_GCS_ENABLED singleton mavlink depends (HAL_GCS_ENABLED && !defined(HAL_BUILD_AP_PERIPH))
singleton mavlink manual init lua_mavlink_init 2 0 singleton mavlink manual init lua_mavlink_init 2 0
singleton mavlink manual register_rx_msgid lua_mavlink_register_rx_msgid 1 1 singleton mavlink manual register_rx_msgid lua_mavlink_register_rx_msgid 1 1
singleton mavlink manual send_chan lua_mavlink_send_chan 3 1 singleton mavlink manual send_chan lua_mavlink_send_chan 3 1

2
libraries/AP_Scripting/lua_bindings.cpp
View File

@ -1165,7 +1165,7 @@ void lua_abort()
#endif #endif
} }
#if HAL_GCS_ENABLED #if (HAL_GCS_ENABLED && !defined(HAL_BUILD_AP_PERIPH))
/* /*
implement gcs:command_int() access to MAV_CMD_xxx commands implement gcs:command_int() access to MAV_CMD_xxx commands
*/ */