1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Commit graph

53 commits

Author SHA1 Message Date
Maciej Janowski
9656dbba40 Merge branch 'master' of https://github.com/betaflight/betaflight into motor-diag
# Conflicts:
#	src/main/io/osd.c
#	src/main/io/osd.h
#	src/test/unit/osd_unittest.cc
2018-10-29 21:16:24 +01:00
Maciej Janowski
3d2d5a2efa Initial implementation
Percentage implementation

Settings fix, formatting

Add support for different number of motors

Optimize and cut superfluous code

Hard-add mixer.h

Formatting adjustment to fit BF standards, linking error in unittest fix attempt

Add stubs and variables for unittests

Character based indicators

Change output to special characters

Fix spacing

Update test code, add variable

Include changes as per peer review
2018-10-29 21:09:46 +01:00
Michael Keller
f912b891b5
Merge pull request #6952 from mikeller/improve_airmode_detection
Improved handling of airmode detection.
2018-10-25 00:41:50 +13:00
Bruce Luckcuck
b31b2d0680 OSD temperature display and calculations cleanup
Remove unnecessary decidegrees conversions as all temperature providers are in degrees celcius.

Fixed rounding for imperial units.

Fixed data type error in core temp warning element. Temperature is captured as int16 and can be negative but logic was using uint8 leading to an underflow for negative temperatures and a false alarm triggering.
2018-10-23 09:27:26 -04:00
mikeller
feaa082ac3 Fixes from review. 2018-10-24 02:02:59 +13:00
timman2er
ef17d7fc31 add max esc temp and rpm to osd 2018-09-20 10:15:00 +02:00
mikeller
0bce8549ee Renamed 'fc/fc_' files to remove the double 'fc'. 2018-08-26 14:07:06 +12:00
jflyper
82268b7a4e Add osd warning for fail safe state. 2018-08-22 20:22:40 +09:00
Kiripolszky Károly
c4a32160a7 fix OSD unittest for log status element 2018-08-19 10:22:07 +02:00
AirBreak69
0e52e21524 GPS altitude: cleanup all occurancies to assume source is in cm per lsb resolution
Harmonized (and partly corrected) all occurancies of gpsSol.llh.alt and getEstimatedAltitude() to handle altiude sourced in cm resolution.
This was introduced by GSP_RESCUE/RTH.
Introduced a naming convention that include the unit into the variable/function names:
gpsSol.llh.alt -> gpsSol.llh.alt_cm
getEstimatedAltitude() -> getEstimatedAltitude_cm()
2018-08-19 00:11:30 +12:00
Michael Keller
41ce2c6327
Merge pull request #6391 from leocb/osd-max-g-force-stat
Added Max G-force OSD stat
2018-08-17 00:22:11 +12:00
ctzsnooze
4c917efa50 Smooth anti gravity 2018-07-21 23:49:41 +12:00
leocb
05e42db90b Added Max G-force OSD stat 2018-07-17 11:44:01 -03:00
leocb
7df8075fa3 OSD G-force Fix unit test; use sqrtf 2018-06-28 16:15:16 -03:00
Bruce Luckcuck
843a25903a Display OSD message and countdown if arming is delayed due to beacon
Provides a clear indication that arming is delayed for cases where DSHOT beacon is active.

Clears the OSD and displays "DISABLING BEACON" and "ARMING IN X.Y" with an active countdown in tenths of a second while arming is delayed due to DSHOT beacon. Once delay period is over the normal "ARMING" message appears.

If the DSHOT beacon is not active then this delay screen is not displayed.
2018-06-12 20:04:06 -04:00
mikeller
df06b9b4cb Fixed tests. 2018-06-04 00:23:45 +12:00
mikeller
6eea0d45ca Changes from review. 2018-05-30 22:29:42 +12:00
mikeller
e75eaf85ce Fixed tests. 2018-05-30 00:45:45 +12:00
jflyper
041bfb22c6 Create a pg for rxConfig 2018-05-27 09:13:04 +09:00
Bruce Luckcuck
0916d117b8 Add OSD warning options as cli parameters
Previously only a single bitmapped parameter was available in the cli but this wasn't very useful as the users would have to understand the bit positions to enable/disable warning options. This change exposes each warning item as a separate parameter.
2018-05-11 20:06:34 -04:00
Bruce Luckcuck
905f14d86c Change enabled OSD stats storage to bitmap
Previously the flags controlling the enabled OSD stats were stored as an array of boolean. This change reduces config storage by storing the flags as bits inside a single uint32.
2018-05-07 12:07:25 -04:00
Michael Keller
2f2c95a556
Merge pull request #5686 from pulquero/antigrav_osd
Display anti-gravity activity in OSD.
2018-05-07 21:26:38 +12:00
Mark Hale
b2e43abf2d Display anti-gravity activity in OSD.
Signed-off-by: Mark Hale <mark.hale@physics.org>
2018-05-05 19:56:56 +01:00
Bruce Luckcuck
c10e5b8343 Fix testosd_unittest
The unit test was expecting a metric result during the imperial test.
2018-04-24 16:58:01 -04:00
mikeller
c89f87018b Fixed OSD warnings overlap to the right. 2018-02-23 19:36:22 +13:00
Bruce Luckcuck
4185756baf Change crash-flip OSD message to track actual state rather than switch
Previously the OSD crash-flip warning would only track the state of the activation switch.  So if the switch was disabled but still armed the message would go away, but the quad was still in active crash-flip mode until it was disarmed.  This change makes the OSD message follow the actual internal state for crash-flip.
2018-02-21 08:19:59 -05:00
Dan Nixon
ed42d59c94 Add temperature conversion for ESC temp, tidy formatting 2018-01-14 20:56:40 +00:00
Dan Nixon
52d45ff72b Add temperature unit conversion
Selects unit based on OSD unit system setting: metric is degC and
imperial is degF.
2018-01-14 13:49:05 +00:00
Dan Nixon
f8e4d02c99 Add core (MCU) temperature to OSD 2018-01-13 12:39:42 +00:00
Martin Budden
e6f5926131 Prepare OSD for iterative updating 2018-01-12 14:46:29 +00:00
mikeller
09d396c05c Cleaned up parameter group handling.
Fixed missing include.
2017-12-31 10:51:01 +13:00
mikeller
b489d0ba9d Renamed 'parameter_group' to 'pg'. 2017-12-19 23:36:31 +13:00
Dan Nixon
2bb561aa61 Add RTC date/time to OSD stats
Fixes #4575
2017-11-19 10:55:52 +00:00
Martin Budden
cfc87d1891 Better separation between GPS and NAV 2017-11-18 08:00:31 +00:00
Anders Hoglund
0e1f0e89e7 Spektrum, CMS over Telemetry. Rebased and squashed. 2017-11-14 15:57:33 +01:00
jyesmith
4e0c16855f Added OSD_REMAINING_TIME_ESTIMATE which is based on flight used mAh rate. 2017-11-12 14:20:34 +10:00
mikeller
c6b88e5d04 Cleaned up handling of RSSI, added resetting to 0 for RSSI over MSP. 2017-11-12 01:22:12 +13:00
Dan Nixon
6621ed9818 Allow OSD warnings to be toggled 2017-10-29 10:10:29 +00:00
Miguel Angel Mulero Martinez
dadedd059f Show stats only if enabled
If no enabled stat to show, don't show the stats page in the OSD
2017-10-24 10:14:15 +02:00
Dan Nixon
3aeef39b5a Add OSD and beeper warnings for anti turtle mode 2017-10-10 08:20:56 +01:00
Dan Nixon
3013229918 Left pad OSD electrical power readout 2017-09-10 15:23:01 +01:00
Dan Nixon
8a1ba09ee8 Test rendering of existing OSD power element 2017-09-10 15:20:11 +01:00
Dan Nixon
20f7c77089 Add BATT NOT FULL warning to OSD
Shows BATT NOT FULL when the connected battery has an everage cell
voltage of less than 0.2v lower then vbatmaxcellvoltage (when the craft
has yet to be armed)

Intended as a reminder to make sure pilots fly with a fresh battery

Adds an additional configuration option for the voltage at which a cell
is "full"
2017-08-18 08:07:20 +01:00
Martin Budden
a0f48f74c1 Merge pull request #3615 from DanNixon/osd_battery_current_formatting
Improve formatting of numerical OSD elements
2017-08-12 07:24:44 +01:00
Dan Nixon
28fb930c1f Improve formatting of some numerical OSD elements
- Moved units to the right of the number
- Added adequate left padding
2017-07-26 12:57:12 +01:00
Dan Nixon
ad334113e2 Add test for existing OSD element functionality 2017-07-26 12:34:06 +01:00
blckmn
7a5d1d9b8e Moving boardIdentifier out of config header and into systemConfig (for generic targets) 2017-07-25 09:05:12 +10:00
Dan Nixon
78d28b48f8 Generic OSD timers
- Two configurable timer elements/stat items
- High precision timer (for race timing)
- Add array length checking to OSD items in MSP
2017-07-03 12:30:49 +01:00
Dan Nixon
dbbe79a9f4 Add arming disabled reasons to OSD 2017-07-02 17:29:21 +01:00
mikeller
31df82db2d Reworked arming conditions. 2017-06-30 08:43:46 +12:00