fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-22 01:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

crsf_rc: fixed cmake directory conflict

Browse Source
This commit is contained in:
Tarmo Tänav
2025-11-27 01:36:43 +02:00
committed by Jacob Dahl
parent 8874d533bb
commit ad38dba167
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/rc/crsf_rc/CrsfParser.cpp
+4 -4
View File
@@ -143,7 +143,7 @@ static uint32_t working_segment_size = HEADER_SIZE;
#define RX_QUEUE_BUFFER_SIZE 200 #define RX_QUEUE_BUFFER_SIZE 200
static QueueBuffer_t rx_queue; static QueueBuffer_t rx_queue;
static uint8_t rx_queue_buffer[RX_QUEUE_BUFFER_SIZE]; static uint8_t rx_queue_buffer[RX_QUEUE_BUFFER_SIZE];
#ifdef CONFIG_DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
static QueueBuffer_t inject_queue; static QueueBuffer_t inject_queue;
static uint8_t inject_queue_buffer[RX_QUEUE_BUFFER_SIZE]; static uint8_t inject_queue_buffer[RX_QUEUE_BUFFER_SIZE];
static uint8_t temp_queue_buffer[RX_QUEUE_BUFFER_SIZE]; static uint8_t temp_queue_buffer[RX_QUEUE_BUFFER_SIZE];
@@ -156,7 +156,7 @@ static CrsfPacketDescriptor_t *FindCrsfDescriptor(const enum CRSF_PACKET_TYPE pa
void CrsfParser_Init(void) void CrsfParser_Init(void)
{ {
QueueBuffer_Init(&rx_queue, rx_queue_buffer, RX_QUEUE_BUFFER_SIZE); QueueBuffer_Init(&rx_queue, rx_queue_buffer, RX_QUEUE_BUFFER_SIZE);
#ifdef CONFIG_DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
QueueBuffer_Init(&inject_queue, inject_queue_buffer, RX_QUEUE_BUFFER_SIZE); QueueBuffer_Init(&inject_queue, inject_queue_buffer, RX_QUEUE_BUFFER_SIZE);
#endif #endif
} }
@@ -277,7 +277,7 @@ bool CrsfParser_LoadBuffer(const uint8_t *buffer, const uint32_t size)
return QueueBuffer_AppendBuffer(&rx_queue, buffer, size); return QueueBuffer_AppendBuffer(&rx_queue, buffer, size);
} }
#ifdef CONFIG_DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
bool CrsfParser_InjectBuffer(const uint8_t *buffer, const uint32_t size) bool CrsfParser_InjectBuffer(const uint8_t *buffer, const uint32_t size)
{ {
return QueueBuffer_AppendBuffer(&inject_queue, buffer, size); return QueueBuffer_AppendBuffer(&inject_queue, buffer, size);
@@ -406,7 +406,7 @@ bool CrsfParser_TryParseCrsfPacket(CrsfPacket_t *const new_packet, CrsfParserSta
parser_state = PARSER_STATE_HEADER; parser_state = PARSER_STATE_HEADER;
if (valid_packet) { if (valid_packet) {
#ifdef CONFIG_DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
if (!QueueBuffer_IsEmpty(&inject_queue)) { if (!QueueBuffer_IsEmpty(&inject_queue)) {
// copy the remaining bytes from the rx queue to the temp buffer // copy the remaining bytes from the rx queue to the temp buffer
src/drivers/rc/crsf_rc/CrsfParser.hpp
+1 -1
View File
@@ -109,7 +109,7 @@ typedef struct {
void CrsfParser_Init(void); void CrsfParser_Init(void);
bool CrsfParser_LoadBuffer(const uint8_t *buffer, const uint32_t size); bool CrsfParser_LoadBuffer(const uint8_t *buffer, const uint32_t size);
#ifdef DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
bool CrsfParser_InjectBuffer(const uint8_t *buffer, const uint32_t size); bool CrsfParser_InjectBuffer(const uint8_t *buffer, const uint32_t size);
#endif #endif
uint32_t CrsfParser_FreeQueueSize(void); uint32_t CrsfParser_FreeQueueSize(void);
src/drivers/rc/crsf_rc/CrsfRc.cpp
+2 -2
View File
@@ -545,7 +545,7 @@ int CrsfRc::print_status()
int CrsfRc::custom_command(int argc, char *argv[]) int CrsfRc::custom_command(int argc, char *argv[])
{ {
#ifdef CONFIG_DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
if (!strcmp(argv[0], "start")) { if (!strcmp(argv[0], "start")) {
if (is_running()) { if (is_running()) {
@@ -602,7 +602,7 @@ This module parses the CRSF RC uplink protocol and generates CRSF downlink telem
PRINT_MODULE_USAGE_SUBCATEGORY("radio_control"); PRINT_MODULE_USAGE_SUBCATEGORY("radio_control");
PRINT_MODULE_USAGE_COMMAND("start"); PRINT_MODULE_USAGE_COMMAND("start");
PRINT_MODULE_USAGE_PARAM_STRING('d', "/dev/ttyS3", "<file:dev>", "RC device", true); PRINT_MODULE_USAGE_PARAM_STRING('d', "/dev/ttyS3", "<file:dev>", "RC device", true);
#ifdef CONFIG_DRIVERS_RC_CRSF_RC_INJECT #ifdef CONFIG_RC_CRSF_INJECT
PRINT_MODULE_USAGE_COMMAND_DESCR("inject", "Inject frame data bytes (for testing)"); PRINT_MODULE_USAGE_COMMAND_DESCR("inject", "Inject frame data bytes (for testing)");
#endif #endif
PRINT_MODULE_USAGE_DEFAULT_COMMANDS(); PRINT_MODULE_USAGE_DEFAULT_COMMANDS();
src/drivers/rc/crsf_rc/Kconfig
+5 -1
View File
@@ -4,8 +4,12 @@ menuconfig DRIVERS_RC_CRSF_RC
---help--- ---help---
Enable support for crsf rc Enable support for crsf rc
config DRIVERS_RC_CRSF_RC_INJECT if DRIVERS_RC_CRSF_RC
config RC_CRSF_INJECT
bool "Inject CRSF RC" bool "Inject CRSF RC"
default n default n
---help--- ---help---
Enable this to inject CRSF RC commands. Enable this to inject CRSF RC commands.
endif # DRIVERS_RC_CRSF_RC