Skip to content

Commit 704b1f0

Browse files
webbbnf5soh
webbbn
authored and
f5soh
committed
Merged in webbbn/librepilot/LP-511-port-uavofrskysensorhubbridge (pull request #422)
Frsky sensor hub telemetry Approved-by: Philippe Renon <philippe_renon@yahoo.fr> Approved-by: Lalanne Laurent <f5soh@free.fr> Approved-by: Vladimir Zidar <mr_w@mindnever.org> Approved-by: Brian Webb <webbbn@gmail.com>
2 parents 4c48d87 + ff2504c commit 704b1f0

17 files changed

Lines changed: 910 additions & 110 deletions

File tree

‎flight/modules/UAVOFrSKYSensorHubBridge/UAVOFrSKYSensorHubBridge.c‎

Lines changed: 761 additions & 0 deletions
Large diffs are not rendered by default.

‎flight/pios/common/pios_board_io.c‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ uint32_t pios_openlrs_id; /* OpenLRS handle */
9595
uint32_t pios_com_hkosd_id; /* HK OSD ?? */
9696
uint32_t pios_com_msp_id; /* MSP */
9797
uint32_t pios_com_mavlink_id; /* MAVLink */
98+
uint32_t pios_com_frsky_sensorhub_id; /* Frsky Sensorhub */
9899
uint32_t pios_com_vcp_id; /* USB VCP */
99100

100101
#ifdef PIOS_INCLUDE_DEBUG_CONSOLE
@@ -292,109 +293,116 @@ struct uart_function {
292293
};
293294

294295
static const struct uart_function uart_function_map[] = {
295-
[PIOS_BOARD_IO_UART_TELEMETRY] = {
296+
[PIOS_BOARD_IO_UART_TELEMETRY] = {
296297
.com_id = &pios_com_telem_rf_id,
297298
.com_rx_buf_len = PIOS_COM_TELEM_RF_RX_BUF_LEN,
298299
.com_tx_buf_len = PIOS_COM_TELEM_RF_TX_BUF_LEN,
299300
},
300301

301-
[PIOS_BOARD_IO_UART_MAVLINK] = {
302+
[PIOS_BOARD_IO_UART_MAVLINK] = {
302303
.com_id = &pios_com_mavlink_id,
303304
.com_rx_buf_len = PIOS_COM_MAVLINK_RX_BUF_LEN,
304305
.com_tx_buf_len = PIOS_COM_MAVLINK_TX_BUF_LEN,
305306
},
306307

307-
[PIOS_BOARD_IO_UART_MSP] = {
308+
[PIOS_BOARD_IO_UART_MSP] = {
308309
.com_id = &pios_com_msp_id,
309310
.com_rx_buf_len = PIOS_COM_MSP_RX_BUF_LEN,
310311
.com_tx_buf_len = PIOS_COM_MSP_TX_BUF_LEN,
311312
},
312313
#ifdef PIOS_INCLUDE_GPS
313-
[PIOS_BOARD_IO_UART_GPS] = {
314+
[PIOS_BOARD_IO_UART_GPS] = {
314315
.com_id = &pios_com_gps_id,
315316
.com_rx_buf_len = PIOS_COM_GPS_RX_BUF_LEN,
316317
.com_tx_buf_len = PIOS_COM_GPS_TX_BUF_LEN,
317318
},
318319
#endif
319-
[PIOS_BOARD_IO_UART_OSDHK] = {
320+
[PIOS_BOARD_IO_UART_OSDHK] = {
320321
.com_id = &pios_com_hkosd_id,
321322
.com_rx_buf_len = PIOS_COM_HKOSD_RX_BUF_LEN,
322323
.com_tx_buf_len = PIOS_COM_HKOSD_TX_BUF_LEN,
323324
},
325+
#ifdef PIOS_INCLUDE_FRSKY_SENSORHUB
326+
[PIOS_BOARD_IO_UART_FRSKY_SENSORHUB] = {
327+
.com_id = &pios_com_frsky_sensorhub_id,
328+
.com_rx_buf_len = PIOS_COM_FRSKY_SENSORHUB_RX_BUF_LEN,
329+
.com_tx_buf_len = PIOS_COM_FRSKY_SENSORHUB_TX_BUF_LEN,
330+
},
331+
#endif
324332
#ifdef PIOS_INCLUDE_HOTT_BRIDGE
325-
[PIOS_BOARD_IO_UART_HOTT_BRIDGE] = {
333+
[PIOS_BOARD_IO_UART_HOTT_BRIDGE] = {
326334
.com_id = &pios_com_hott_id,
327335
.com_rx_buf_len = PIOS_COM_HOTT_BRIDGE_RX_BUF_LEN,
328336
.com_tx_buf_len = PIOS_COM_HOTT_BRIDGE_TX_BUF_LEN,
329337
},
330338
#endif
331339
#ifdef PIOS_INCLUDE_DEBUG_CONSOLE
332-
[PIOS_BOARD_IO_UART_DEBUGCONSOLE] = {
340+
[PIOS_BOARD_IO_UART_DEBUGCONSOLE] = {
333341
.com_id = &pios_com_debug_id,
334342
.com_tx_buf_len = PIOS_COM_DEBUGCONSOLE_TX_BUF_LEN,
335343
},
336344
#endif
337-
[PIOS_BOARD_IO_UART_COMBRIDGE] = {
345+
[PIOS_BOARD_IO_UART_COMBRIDGE] = {
338346
.com_id = &pios_com_bridge_id,
339347
.com_rx_buf_len = PIOS_COM_BRIDGE_RX_BUF_LEN,
340348
.com_tx_buf_len = PIOS_COM_BRIDGE_TX_BUF_LEN,
341349
},
342350
#ifdef PIOS_INCLUDE_RCVR
343351
# ifdef PIOS_INCLUDE_IBUS
344-
[PIOS_BOARD_IO_UART_IBUS] = {
352+
[PIOS_BOARD_IO_UART_IBUS] = {
345353
.rcvr_init = &PIOS_IBUS_Init,
346354
.rcvr_driver = &pios_ibus_rcvr_driver,
347355
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_IBUS,
348356
},
349357
# endif /* PIOS_INCLUDE_IBUS */
350358
# ifdef PIOS_INCLUDE_EXBUS
351-
[PIOS_BOARD_IO_UART_EXBUS] = {
359+
[PIOS_BOARD_IO_UART_EXBUS] = {
352360
.rcvr_init = &PIOS_EXBUS_Init,
353361
.rcvr_driver = &pios_exbus_rcvr_driver,
354362
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_EXBUS,
355363
},
356364
# endif /* PIOS_INCLUDE_EXBUS */
357365
# ifdef PIOS_INCLUDE_SRXL
358-
[PIOS_BOARD_IO_UART_SRXL] = {
366+
[PIOS_BOARD_IO_UART_SRXL] = {
359367
.rcvr_init = &PIOS_SRXL_Init,
360368
.rcvr_driver = &pios_srxl_rcvr_driver,
361369
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_SRXL,
362370
},
363371
# endif /* PIOS_INCLUDE_SRXL */
364372
# ifdef PIOS_INCLUDE_HOTT
365-
[PIOS_BOARD_IO_UART_HOTT_SUMD] = {
373+
[PIOS_BOARD_IO_UART_HOTT_SUMD] = {
366374
.rcvr_init = &PIOS_HOTT_Init_SUMD,
367375
.rcvr_driver = &pios_hott_rcvr_driver,
368376
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_HOTT,
369377
},
370378

371-
[PIOS_BOARD_IO_UART_HOTT_SUMH] = {
379+
[PIOS_BOARD_IO_UART_HOTT_SUMH] = {
372380
.rcvr_init = &PIOS_HOTT_Init_SUMH,
373381
.rcvr_driver = &pios_hott_rcvr_driver,
374382
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_HOTT,
375383
},
376384
# endif /* PIOS_INCLUDE_HOTT */
377385
# ifdef PIOS_INCLUDE_DSM
378-
[PIOS_BOARD_IO_UART_DSM_MAIN] = {
386+
[PIOS_BOARD_IO_UART_DSM_MAIN] = {
379387
.rcvr_init = &PIOS_DSM_Init_Helper,
380388
.rcvr_driver = &pios_dsm_rcvr_driver,
381389
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMMAINPORT,
382390
},
383391

384-
[PIOS_BOARD_IO_UART_DSM_FLEXI] = {
392+
[PIOS_BOARD_IO_UART_DSM_FLEXI] = {
385393
.rcvr_init = &PIOS_DSM_Init_Helper,
386394
.rcvr_driver = &pios_dsm_rcvr_driver,
387395
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMFLEXIPORT,
388396
},
389397

390-
[PIOS_BOARD_IO_UART_DSM_RCVR] = {
398+
[PIOS_BOARD_IO_UART_DSM_RCVR] = {
391399
.rcvr_init = &PIOS_DSM_Init_Helper,
392400
.rcvr_driver = &pios_dsm_rcvr_driver,
393401
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_DSMRCVRPORT,
394402
},
395403
# endif /* PIOS_INCLUDE_DSM */
396404
# ifdef PIOS_INCLUDE_SBUS
397-
[PIOS_BOARD_IO_UART_SBUS] = {
405+
[PIOS_BOARD_IO_UART_SBUS] = {
398406
.rcvr_init = &PIOS_SBus_Init_Helper,
399407
.rcvr_driver = &pios_sbus_rcvr_driver,
400408
.rcvr_group = MANUALCONTROLSETTINGS_CHANNELGROUPS_SBUS,

‎flight/pios/inc/pios_board_io.h‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,25 +157,35 @@ extern uint32_t pios_com_mavlink_id;
157157
/* HoTT Telemetry */
158158
#ifdef PIOS_INCLUDE_HOTT_BRIDGE
159159
# ifndef PIOS_COM_HOTT_BRIDGE_RX_BUF_LEN
160-
# define PIOS_COM_HOTT_BRIDGE_RX_BUF_LEN 512
160+
# define PIOS_COM_HOTT_BRIDGE_RX_BUF_LEN 512
161161
# endif
162162
# ifndef PIOS_COM_HOTT_BRIDGE_TX_BUF_LEN
163-
# define PIOS_COM_HOTT_BRIDGE_TX_BUF_LEN 512
163+
# define PIOS_COM_HOTT_BRIDGE_TX_BUF_LEN 512
164164
# endif
165165
extern uint32_t pios_com_hott_id;
166-
# define PIOS_COM_HOTT (pios_com_hott_id)
166+
# define PIOS_COM_HOTT (pios_com_hott_id)
167+
#endif
168+
169+
/* Frsky Sensorhub */
170+
extern uint32_t pios_com_frsky_sensorhub_id;
171+
#define PIOS_COM_FRSKY_SENSORHUB (pios_com_frsky_sensorhub_id)
172+
#ifndef PIOS_COM_FRSKY_SENSORHUB_TX_BUF_LEN
173+
# define PIOS_COM_FRSKY_SENSORHUB_TX_BUF_LEN 128
174+
#endif
175+
#ifndef PIOS_COM_FRSKY_SENSORHUB_RX_BUF_LEN
176+
# define PIOS_COM_FRSKY_SENSORHUB_RX_BUF_LEN 128
167177
#endif
168178

169179
/* USB VCP */
170180
extern uint32_t pios_com_vcp_id;
171-
#define PIOS_COM_VCP (pios_com_vcp_id)
181+
#define PIOS_COM_VCP (pios_com_vcp_id)
172182

173183

174184
#ifdef PIOS_INCLUDE_DEBUG_CONSOLE
175185
extern uint32_t pios_com_debug_id;
176-
#define PIOS_COM_DEBUG (pios_com_debug_id)
186+
#define PIOS_COM_DEBUG (pios_com_debug_id)
177187
#ifndef PIOS_COM_DEBUGCONSOLE_TX_BUF_LEN
178-
# define PIOS_COM_DEBUGCONSOLE_TX_BUF_LEN 40
188+
# define PIOS_COM_DEBUGCONSOLE_TX_BUF_LEN 40
179189
#endif
180190
#endif /* PIOS_INCLUDE_DEBUG_CONSOLE */
181191

@@ -208,6 +218,7 @@ typedef enum {
208218
PIOS_BOARD_IO_UART_EXBUS, /* rcvr */
209219
// PIOS_BOARD_IO_UART_FRSKY_SPORT_TELEMETRY, /* com */
210220
PIOS_BOARD_IO_UART_HOTT_BRIDGE, /* com */
221+
PIOS_BOARD_IO_UART_FRSKY_SENSORHUB, /* com */
211222
} PIOS_BOARD_IO_UART_Function;
212223

213224

‎flight/targets/boards/discoveryf4bare/firmware/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ OPTMODULES += AutoTune
5959
OPTMODULES += ComUsbBridge
6060
OPTMODULES += UAVOMSPBridge
6161
OPTMODULES += UAVOMavlinkBridge
62+
OPTMODULES += UAVOFrSKYSensorHubBridge
6263

6364
SRC += $(FLIGHTLIB)/notification.c
6465

‎flight/targets/boards/discoveryf4bare/firmware/inc/pios_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@
153153
#define PIOS_INCLUDE_GPS_UBX_PARSER
154154
#define PIOS_INCLUDE_GPS_DJI_PARSER
155155
#define PIOS_GPS_SETS_HOMELOCATION
156+
#define PIOS_INCLUDE_FRSKY_SENSORHUB
156157

157158
/* Stabilization options */
158159
/* #define PIOS_QUATERNION_STABILIZATION */

‎flight/targets/boards/discoveryf4bare/firmware/pios_board.c‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -59,44 +59,47 @@ static const PIOS_BOARD_IO_UART_Function flexiio_function_map[] = {
5959
[HWSETTINGS_RM_RCVRPORT_PPMTELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
6060
[HWSETTINGS_RM_RCVRPORT_PPMDEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
6161
[HWSETTINGS_RM_RCVRPORT_PPMCOMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
62-
[HWSETTINGS_RM_RCVRPORT_PPMMSP] = PIOS_BOARD_IO_UART_MSP,
63-
[HWSETTINGS_RM_RCVRPORT_PPMMAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
64-
[HWSETTINGS_RM_RCVRPORT_PPMGPS] = PIOS_BOARD_IO_UART_GPS,
65-
[HWSETTINGS_RM_RCVRPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
66-
[HWSETTINGS_RM_RCVRPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
67-
[HWSETTINGS_RM_RCVRPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
62+
[HWSETTINGS_RM_RCVRPORT_PPMMSP] = PIOS_BOARD_IO_UART_MSP,
63+
[HWSETTINGS_RM_RCVRPORT_PPMMAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
64+
[HWSETTINGS_RM_RCVRPORT_PPMGPS] = PIOS_BOARD_IO_UART_GPS,
65+
[HWSETTINGS_RM_RCVRPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
66+
[HWSETTINGS_RM_RCVRPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
67+
[HWSETTINGS_RM_RCVRPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
6868
[HWSETTINGS_RM_RCVRPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
69-
[HWSETTINGS_RM_RCVRPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
70-
[HWSETTINGS_RM_RCVRPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
69+
[HWSETTINGS_RM_RCVRPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
70+
[HWSETTINGS_RM_RCVRPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
7171
[HWSETTINGS_RM_RCVRPORT_IBUS] = PIOS_BOARD_IO_UART_IBUS,
72+
[HWSETTINGS_RM_RCVRPORT_FRSKYSENSORHUB] = PIOS_BOARD_IO_UART_FRSKY_SENSORHUB,
7273
};
7374

7475
static const PIOS_BOARD_IO_UART_Function main_function_map[] = {
7576
[HWSETTINGS_RM_MAINPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
76-
[HWSETTINGS_RM_MAINPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
77-
[HWSETTINGS_RM_MAINPORT_SBUS] = PIOS_BOARD_IO_UART_SBUS,
78-
[HWSETTINGS_RM_MAINPORT_DSM] = PIOS_BOARD_IO_UART_DSM_MAIN,
79-
[HWSETTINGS_RM_MAINPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
80-
[HWSETTINGS_RM_MAINPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
81-
[HWSETTINGS_RM_MAINPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
82-
[HWSETTINGS_RM_MAINPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
83-
[HWSETTINGS_RM_MAINPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
77+
[HWSETTINGS_RM_MAINPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
78+
[HWSETTINGS_RM_MAINPORT_SBUS] = PIOS_BOARD_IO_UART_SBUS,
79+
[HWSETTINGS_RM_MAINPORT_DSM] = PIOS_BOARD_IO_UART_DSM_MAIN,
80+
[HWSETTINGS_RM_MAINPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
81+
[HWSETTINGS_RM_MAINPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
82+
[HWSETTINGS_RM_MAINPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
83+
[HWSETTINGS_RM_MAINPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
84+
[HWSETTINGS_RM_MAINPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
85+
[HWSETTINGS_RM_MAINPORT_FRSKYSENSORHUB] = PIOS_BOARD_IO_UART_FRSKY_SENSORHUB,
8486
};
8587

8688
static const PIOS_BOARD_IO_UART_Function flexi_function_map[] = {
87-
[HWSETTINGS_RM_FLEXIPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
89+
[HWSETTINGS_RM_FLEXIPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
8890
[HWSETTINGS_RM_FLEXIPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
8991
[HWSETTINGS_RM_FLEXIPORT_DSM] = PIOS_BOARD_IO_UART_DSM_FLEXI,
90-
[HWSETTINGS_RM_FLEXIPORT_EXBUS] = PIOS_BOARD_IO_UART_EXBUS,
91-
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMD] = PIOS_BOARD_IO_UART_HOTT_SUMD,
92-
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMH] = PIOS_BOARD_IO_UART_HOTT_SUMH,
92+
[HWSETTINGS_RM_FLEXIPORT_EXBUS] = PIOS_BOARD_IO_UART_EXBUS,
93+
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMD] = PIOS_BOARD_IO_UART_HOTT_SUMD,
94+
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMH] = PIOS_BOARD_IO_UART_HOTT_SUMH,
9395
[HWSETTINGS_RM_FLEXIPORT_SRXL] = PIOS_BOARD_IO_UART_SRXL,
9496
[HWSETTINGS_RM_FLEXIPORT_IBUS] = PIOS_BOARD_IO_UART_IBUS,
95-
[HWSETTINGS_RM_FLEXIPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
96-
[HWSETTINGS_RM_FLEXIPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
97-
[HWSETTINGS_RM_FLEXIPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
97+
[HWSETTINGS_RM_FLEXIPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
98+
[HWSETTINGS_RM_FLEXIPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
99+
[HWSETTINGS_RM_FLEXIPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
98100
[HWSETTINGS_RM_FLEXIPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
99-
[HWSETTINGS_RM_FLEXIPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
101+
[HWSETTINGS_RM_FLEXIPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
102+
[HWSETTINGS_RM_FLEXIPORT_FRSKYSENSORHUB] = PIOS_BOARD_IO_UART_FRSKY_SENSORHUB,
100103
};
101104

102105
/**

‎flight/targets/boards/revolution/firmware/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ OPTMODULES += ComUsbBridge
5858
OPTMODULES += UAVOHottBridge
5959
OPTMODULES += UAVOMSPBridge
6060
OPTMODULES += UAVOMavlinkBridge
61+
OPTMODULES += UAVOFrSKYSensorHubBridge
6162

6263
SRC += $(FLIGHTLIB)/notification.c
6364

‎flight/targets/boards/revolution/firmware/inc/pios_config.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
#define PIOS_INCLUDE_GPS_UBX_PARSER
161161
#define PIOS_INCLUDE_GPS_DJI_PARSER
162162
#define PIOS_GPS_SETS_HOMELOCATION
163+
#define PIOS_INCLUDE_FRSKY_SENSORHUB
163164

164165
/* Stabilization options */
165166
#define PIOS_QUATERNION_STABILIZATION

‎flight/targets/boards/revolution/firmware/pios_board.c‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -58,44 +58,47 @@ static const PIOS_BOARD_IO_UART_Function flexiio_function_map[] = {
5858
[HWSETTINGS_RM_RCVRPORT_PPMTELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
5959
[HWSETTINGS_RM_RCVRPORT_PPMDEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
6060
[HWSETTINGS_RM_RCVRPORT_PPMCOMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
61-
[HWSETTINGS_RM_RCVRPORT_PPMMSP] = PIOS_BOARD_IO_UART_MSP,
62-
[HWSETTINGS_RM_RCVRPORT_PPMMAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
63-
[HWSETTINGS_RM_RCVRPORT_PPMGPS] = PIOS_BOARD_IO_UART_GPS,
64-
[HWSETTINGS_RM_RCVRPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
65-
[HWSETTINGS_RM_RCVRPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
66-
[HWSETTINGS_RM_RCVRPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
61+
[HWSETTINGS_RM_RCVRPORT_PPMMSP] = PIOS_BOARD_IO_UART_MSP,
62+
[HWSETTINGS_RM_RCVRPORT_PPMMAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
63+
[HWSETTINGS_RM_RCVRPORT_PPMGPS] = PIOS_BOARD_IO_UART_GPS,
64+
[HWSETTINGS_RM_RCVRPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
65+
[HWSETTINGS_RM_RCVRPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
66+
[HWSETTINGS_RM_RCVRPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
6767
[HWSETTINGS_RM_RCVRPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
68-
[HWSETTINGS_RM_RCVRPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
69-
[HWSETTINGS_RM_RCVRPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
68+
[HWSETTINGS_RM_RCVRPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
69+
[HWSETTINGS_RM_RCVRPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
7070
[HWSETTINGS_RM_RCVRPORT_IBUS] = PIOS_BOARD_IO_UART_IBUS,
71+
[HWSETTINGS_RM_RCVRPORT_FRSKYSENSORHUB] = PIOS_BOARD_IO_UART_FRSKY_SENSORHUB,
7172
};
7273

7374
static const PIOS_BOARD_IO_UART_Function main_function_map[] = {
7475
[HWSETTINGS_RM_MAINPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
75-
[HWSETTINGS_RM_MAINPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
76-
[HWSETTINGS_RM_MAINPORT_SBUS] = PIOS_BOARD_IO_UART_SBUS,
77-
[HWSETTINGS_RM_MAINPORT_DSM] = PIOS_BOARD_IO_UART_DSM_MAIN,
78-
[HWSETTINGS_RM_MAINPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
79-
[HWSETTINGS_RM_MAINPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
80-
[HWSETTINGS_RM_MAINPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
81-
[HWSETTINGS_RM_MAINPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
82-
[HWSETTINGS_RM_MAINPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
76+
[HWSETTINGS_RM_MAINPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
77+
[HWSETTINGS_RM_MAINPORT_SBUS] = PIOS_BOARD_IO_UART_SBUS,
78+
[HWSETTINGS_RM_MAINPORT_DSM] = PIOS_BOARD_IO_UART_DSM_MAIN,
79+
[HWSETTINGS_RM_MAINPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
80+
[HWSETTINGS_RM_MAINPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
81+
[HWSETTINGS_RM_MAINPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
82+
[HWSETTINGS_RM_MAINPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
83+
[HWSETTINGS_RM_MAINPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
84+
[HWSETTINGS_RM_MAINPORT_FRSKYSENSORHUB] = PIOS_BOARD_IO_UART_FRSKY_SENSORHUB,
8385
};
8486

8587
static const PIOS_BOARD_IO_UART_Function flexi_function_map[] = {
86-
[HWSETTINGS_RM_FLEXIPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
88+
[HWSETTINGS_RM_FLEXIPORT_TELEMETRY] = PIOS_BOARD_IO_UART_TELEMETRY,
8789
[HWSETTINGS_RM_FLEXIPORT_GPS] = PIOS_BOARD_IO_UART_GPS,
8890
[HWSETTINGS_RM_FLEXIPORT_DSM] = PIOS_BOARD_IO_UART_DSM_FLEXI,
89-
[HWSETTINGS_RM_FLEXIPORT_EXBUS] = PIOS_BOARD_IO_UART_EXBUS,
90-
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMD] = PIOS_BOARD_IO_UART_HOTT_SUMD,
91-
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMH] = PIOS_BOARD_IO_UART_HOTT_SUMH,
91+
[HWSETTINGS_RM_FLEXIPORT_EXBUS] = PIOS_BOARD_IO_UART_EXBUS,
92+
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMD] = PIOS_BOARD_IO_UART_HOTT_SUMD,
93+
[HWSETTINGS_RM_FLEXIPORT_HOTTSUMH] = PIOS_BOARD_IO_UART_HOTT_SUMH,
9294
[HWSETTINGS_RM_FLEXIPORT_SRXL] = PIOS_BOARD_IO_UART_SRXL,
9395
[HWSETTINGS_RM_FLEXIPORT_IBUS] = PIOS_BOARD_IO_UART_IBUS,
94-
[HWSETTINGS_RM_FLEXIPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
95-
[HWSETTINGS_RM_FLEXIPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
96-
[HWSETTINGS_RM_FLEXIPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
96+
[HWSETTINGS_RM_FLEXIPORT_DEBUGCONSOLE] = PIOS_BOARD_IO_UART_DEBUGCONSOLE,
97+
[HWSETTINGS_RM_FLEXIPORT_COMBRIDGE] = PIOS_BOARD_IO_UART_COMBRIDGE,
98+
[HWSETTINGS_RM_FLEXIPORT_OSDHK] = PIOS_BOARD_IO_UART_OSDHK,
9799
[HWSETTINGS_RM_FLEXIPORT_MSP] = PIOS_BOARD_IO_UART_MSP,
98-
[HWSETTINGS_RM_FLEXIPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
100+
[HWSETTINGS_RM_FLEXIPORT_MAVLINK] = PIOS_BOARD_IO_UART_MAVLINK,
101+
[HWSETTINGS_RM_FLEXIPORT_FRSKYSENSORHUB] = PIOS_BOARD_IO_UART_FRSKY_SENSORHUB,
99102
};
100103

101104
/**

‎flight/targets/boards/revonano/firmware/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ OPTMODULES += AutoTune
5656
OPTMODULES += ComUsbBridge
5757
OPTMODULES += UAVOMSPBridge
5858
OPTMODULES += UAVOMavlinkBridge
59+
OPTMODULES += UAVOFrSKYSensorHubBridge
5960

6061
SRC += $(FLIGHTLIB)/notification.c
6162

0 commit comments

Comments
 (0)