1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Commit graph

49 commits

Author SHA1 Message Date
Martin Budden
e7bee05005 Merge pull request #4210 from codecae/msp_shared_ringbuffer
Improved msp frame handling for CRSF
2017-10-09 15:05:56 +01:00
Curtis Bangert
4fd948cb24 Created buffer for msp frames and improved msp over telemetry performance for CRSF. 2017-10-09 08:52:16 -04:00
Dominic Clifton
262890896e Merge pull request #2952 from balrog-kun/master
Fix Mavlink port sharing with MSP
2017-10-05 20:44:09 +13:00
mikeller
3bce54186c Disabled MSP over telemetry for F1, re-enabled SERVOS. 2017-09-11 03:44:55 +12:00
Curtis Bangert
863b24ae6a Corrected smartport regression issue with msp_shared
Corrected condition where an extra padded zero was added to outgoing msp buffers.
Whitespace tidy and removal of unnecessary condition.
Commented OSD and CMS from STM32F3DISCOVERY target.h
Various improvements to msp_shared (removed byte loops, point arithmetic)
Raised schedule priority of CRSF device and MSP calls
Reworked buffers in msp_shared to enable writes.
Moved msp buffers to msp_shared
Added new custom frames and reworking msp implementation
Implemented CRSF device info reply
Adding crsf ping/pong device info functionality
Changed Colibri FC address to Betaflight address
Implementing MSP in CRSF Telemetry
Decoupled msp functionality from smartport into msp_shared
Moved USE_SERVOS to FLASH>128 per mikeller
2017-09-10 01:36:59 -04:00
Dominic Clifton
db006b1585 Merge pull request #2856 from ledvinap/improvement-64bit-boxid
array based box masks
2017-06-19 13:31:08 +12:00
Michael Keller
409bbab455 Apply 'telemetry_inversion' consistently to all protocols. 2017-06-13 00:59:18 +12:00
jflyper
eb0f098264 Set telemetry_inversion to default on 2017-06-01 18:09:40 +09:00
Hydra
9726e52a54 CF/BF - Fix HoTT telemetry.
Two issues:
1 - failure to work on softserial ports.

The TX pin was not allocated due to the initial port mode.

HoTT telemetry is different in that it changes the serial port mode
between sending and receiving.

This change opens the port in RX/TX mode so that both RX and TX pins are
initally allocated.

Test scenario:
* HoTT on SoftSerial 1
* Diode connecting between RX and TX pins.

2 - bidirectional hardware ports were not supported.

Renamed `sport_halfduplex` to `tlm_halfduplex`.  The setting is now used
by sport and hott telemetry.
2017-04-23 11:30:29 +01:00
Magnus Ivarsson
b13d4694bb Combine ibus serial rx and ibus telemetry on the same fc uart on a single pin.
```
+---------+
| FS-iA6B |
|         |
| Ser RX  |---|<---\       +------------+
|         |        |       | FC         |
| Sensor  |---[R]--*-------| Uart TX    |
+---------+                +------------+
```
R = 10Kohm, Diode 1N4148 or similar.

Both uart tx and rx channels are used so it's not possible to use the spare pin for rx of something else.

Configure the serial port like this to get both serial rx and ibus telemetry on the same port:
```
serial 1 4160 115200 57600 115200 115200
```

It is still possible to run the serial rx and ibus telemetry on two uarts like before, an example:
```
serial 1 64 115200 57600 0 115200
serial 2 4096 115200 57600 115200 115200
```
2017-03-13 21:43:37 +01:00
Martin Budden
a94318a75f Added PG config definitions 3 2017-02-25 11:29:55 +00:00
Martin Budden
5851b21e4a Removed a number of static config pointers 2017-02-01 12:58:29 +00:00
Martin Budden
79d4b2146d Preparation for conversion to parameter groups 2017-02-01 08:46:19 +00:00
mikeller
94993e55c0 Fixed iBus telemetry handling (cherry-pick from @marcroe 's work in #2170. 2017-01-26 15:58:49 +01:00
blckmn
06775e5c51 Adding ibus telemetry. 2017-01-07 09:15:52 +11:00
blckmn
c49d36a346 Initial implementation of SPEK SRXL telemetry protocol 2016-12-22 07:54:52 +11:00
Michael Keller
ff6752cf38 Moved 'releaseSharedTelemetryPorts' to telemetry.c. 2016-12-02 19:57:03 +13:00
Martin Budden
890eab203b First cut of CRSF RX and telemetry code 2016-11-17 22:36:11 +00:00
Martin Budden
7ea5c6ba42 Added fine-grained TELEMETRY build #defines as per iNav 2016-11-09 07:33:14 +00:00
Martin Budden
e21e1f50aa Merge pull request #826 from digitalentity/betaflight-mavlink-telem
MAVLink telemetry support
2016-10-20 07:59:02 +01:00
Martin Budden
a771280b50 Moved config.c from config directory to fc directory 2016-10-18 08:57:39 +01:00
Konstantin Sharlaimov (DigitalEntity)
8e249ce187 Allow MAVLink telemetry only for targets with >128K flash 2016-10-17 18:43:28 +10:00
Konstantin (DigitalEntity) Sharlaimov
ff19b5bcff MAVLink telemetry support 2016-10-17 17:17:25 +10:00
Martin Budden
40ebc5d0a7 Moved RX functions pointers into rxRuntimeConfig. 2016-09-18 17:27:29 +01:00
Martin Budden
c600dc3784 Used currentTime parameter for beeper and telemetry 2016-09-17 16:59:49 +01:00
Martin Budden
541f4d4018 Directory rearrangement to reflect cleanflight changes 2016-08-07 13:44:00 +01:00
Martin Budden
07adf66bbb Optimisation of driver header files 2016-08-07 01:14:11 +02:00
Martin Budden
168469236b Tidied serial and telemetry files 2016-08-01 06:45:59 +01:00
Martin Budden
ea283ab98c Converted tabs to spaces 2016-07-09 14:39:39 +01:00
mikeller
fefbc4d4bf Graft of 'serial_rx_telemetry_on_same_port' into development for flight testing by @blckmn. 2016-06-13 20:44:08 +12:00
Thomas Miric
bf8c3c88bc Add Jeti Ex Bus receiver with telemetry capabilities 2016-02-08 23:26:28 +01:00
borisbstyle
63dcc3dc1d Add LTM Telemetry // Remove MSP telemetry 2016-02-03 11:14:35 +01:00
Dominic Clifton
e5a50654e3 Improve code consistency by using function prefixes for telemetry
functions.

PR's to make similar changes to other non-static functions are welcomed.
2015-06-24 20:26:41 +01:00
pinkywafer
7220365575 RPM_Motor_Stop_Bugfix
using calculateThrottleStatus, send 0 as RPM when THROTTLE_LOW and
MOTOR_STOP
2015-03-31 19:06:15 +01:00
Dominic Clifton
7dcc7b2fb5 Multiple telemtry providers can now be active at the same time on any
serial port. 
MSP telemetry can now be at any baud rate.

A pattern is emerging in each telemetry provider, code is duplicated to
get things working, refactoring can come later.
2015-02-18 23:10:36 +00:00
Dominic Clifton
5163bef0b2 Refactor serial port configuration, stage 1.
Tested and working:
* multiple MSP ports at different baud rates.
* cli on any MSP port.
* GPS
* gps passthough on currently active cli port.

Example config used for testing:

feature SOFTSERIAL
feature GPS
feature RX_PPM
serial_port_1_functions = 1
serial_port_1_baudrate = 115200
serial_port_2_functions = 128
serial_port_2_baudrate = 115200
serial_port_3_functions = 1
serial_port_3_baudrate = 19200
serial_port_4_functions = 0
serial_port_4_baudrate = 0

Known broken:
* Telemetry and shared serial ports
* Telemetry when unarmed.

Probably broken:
* Blackbox on shared port.

Untested.
* Serial RX.
* Blackbox.
2015-02-12 01:28:53 +00:00
Dominic Clifton
8b0a982931 Telemetry naming cleanup. 2015-01-31 22:12:11 +01:00
Dominic Clifton
668c9c0457 Allow smartport to be configured. Fix shared port flag calculation. 2014-11-12 01:30:05 +00:00
Dominic Clifton
80e660140e Minor formatting fix. 2014-11-12 00:57:23 +00:00
Frank Zhao
0000d3e65e added smartport telemetry
Conflicts:

	src/main/telemetry/telemetry.h
2014-11-12 00:11:13 +00:00
Dominic Clifton
c0fd0c1f33 Replace profile.activate and rcOptions with
profile.modeActivationCondition and rcModeActivationMask.

Implementation of using and setting modeActivationConditions is missing.
2014-10-12 10:40:38 +01:00
Dominic Clifton
d60183d91d Normalize all the line endings 2014-09-15 23:40:17 +01:00
Dominic Clifton
1c6ea1d397 Fix ANGLE mode and HORIZON mode resetting the errorAngle when they are
both attempted to be enabled at the same time.  Angle mode now takes
precedence over horizon mode.

Fix using aux settings that are not applicable to in-use aux channels -
prior to this it was possible to configure aux4 and then switch to
RX_SERIAL using a 7 channel system (3 aux channels) and aux4 would still
have been processed.
2014-08-26 21:28:23 +01:00
Dominic Clifton
3f0754d295 Replace global flags with stateFlags, flightModeFlags and armingFlags.
Each flag was previously a whole byte, now all of the flags only take up
4 bytes as they are represented by bit masks.

This is cleaner because the different kind of flags are now separated.

Additionally this changes the behaviour of arming slightly.  When using
a switch to arm the aircraft will not arm unless the switch has been in
the off state once.  This prevents arming if you power the aircraft with
a low throttle and the switch in the on position.
2014-08-24 12:11:30 +01:00
Dominic Clifton
1ea014ae25 Support MSP telemetry on ports marked as TELEMETRY instead of MSP, this
follows the pattern that HoTT and FrSky use.

Previously MSP telemetry was actually output on the MSP port, NOT the
telemetry port.

Baudrate for MSP telemetry currently fixed at 19200.
2014-08-23 01:14:06 +01:00
Dominic Clifton
125f6d1450 CJMCU - Allow various features to be compiled out to support. 2014-08-01 00:18:37 +01:00
Dominic Clifton
e867af8c4b Correct project name in GPL notices. 2014-06-05 00:47:47 +01:00
Dominic Clifton
0bbcd6570f Updated source files to include the GPL v3 notices. Include a copy of
the GPL v3.
2014-06-04 16:48:23 +01:00
Dominic Clifton
d19a5e7046 Cleanup project structure. Update unit test Makefile to place object
files in obj/test
2014-05-31 22:43:06 +01:00
Renamed from src/telemetry_common.c (Browse further)