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

287 commits

Author SHA1 Message Date
mikeller
d401e3bbbe Fix usages, scaling. 2018-05-29 23:08:26 +12:00
Michael Keller
a6d667eb48
Merge pull request #5980 from mikeller/add_osd_core_temperature_warning
Added warning for core temperature to OSD.
2018-05-27 21:38:51 +12:00
jflyper
041bfb22c6 Create a pg for rxConfig 2018-05-27 09:13:04 +09:00
mikeller
88b6751c91 Added warning for core temperature to OSD. 2018-05-27 01:28:27 +12:00
Diego Basch
c3412225f5 Fix GPS Rescue (needs yaw smoothing but works). 2018-05-22 15:42:14 -07: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
Michael Keller
7e6ba60d7d
Merge pull request #5831 from etracer65/osd_stats_reorder
Changes to support enhancements to BFC for OSD stats field ordering
2018-05-12 12:00:34 +12:00
Bruce Luckcuck
5687e66f45 Changes to support enhancements to BFC for OSD stats field ordering
Reorder the stats field enumeration to match the actual on-screen display order. Needed to support changes in the configurator so that it will also disply the selections in the same order.

Going forward if there are any changes to the on-screen display order of the post-flight statistics then the enumeration must be updated to match.
2018-05-08 08:59:27 -04:00
Miguel Angel Mulero Martinez
ca64074a12 Fix OSD GPS Lat and Lon symbols 2018-05-08 13:17:26 +02: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
Michael Keller
d242de87bd
Merge pull request #5764 from dbasch/gps_rescue
[GPS RESCUE] added gps for altitude estimation
2018-05-05 12:48:29 +12:00
Diego Basch
c46be03047 added gps for altitude estimation, remove most unused code, rename altitude.c to position.c, add hdop to nmea 2018-05-04 08:45:26 -07:00
Bruce Luckcuck
809c2a950b Update RPM data in smartport and frsky_hub telemetry
Both previously displayed eRPM.  frsky_hub RPM data is constrained to int16 so the value sent is RPM/10.

Updates per review and function renaming
2018-05-04 07:53:18 -04:00
Bruce Luckcuck
063f3829d4 Display ESC telemetry as real RPM in the OSD
The telemetry data provides eRPM/100.  Added a `motor_poles` parameter (defaulting to 14) that is used to calculate the physical RPM.

RPM = (telemetry_rpm * 100) / (motor_poles / 2)

Most motors we commonly use are 14 poles, but the user can adjust if needed for their setup.

Also calculate actual RPM for DEBUG_ESC_SENSOR_RPM, but to fit with in int16 the log value will be RPM/10.
2018-05-04 07:51:16 -04:00
Michael Keller
f0ea0e81d4
Merge pull request #5765 from etracer65/gps_speed_units
Fix GPS speed and max speed to respect the units selection
2018-05-04 21:11:49 +12:00
Bruce Luckcuck
7e8bd7bb34 Default OSD ESC current alarm to off
The osd_esc_current_alarm was added but never assigned a default value. Therefore it defaulted to 0 instead of off (-1).  This resulted in OSD warnings if the ESCs weren't providing current data as the test looked for values >= the warning setting.
2018-05-01 14:06:49 -04:00
blckmn
a9f74cd6df Removed excess trailing spaces before new lines on licenses. 2018-04-25 20:58:00 +10:00
Bruce Luckcuck
8c24176d96 Fix GPS speed and max speed to respect the units selection
Previously GPS speed and max speed would always display in KPH even if the user chose imperial units.  Now they will display in MPH for imperial units.
2018-04-24 16:41:45 -04:00
blckmn
46fe22b4bd Direct license replacement 2018-04-22 09:22:46 +10:00
pulquero
a86aaeebd1 Improve ESC warning message and include current threshold check. (#5685)
Signed-off-by: Mark Hale <mark.hale@physics.org>
2018-04-18 00:25:36 +12:00
Michael Keller
07cce64572
Added ESC temperature warning, fixed ESC warning issue with motor count > 8. (#5583) 2018-04-04 01:04:18 +12:00
pulquero
cf6b3639e2 Add OSD message to report motor/esc problem. (#5550)
Signed-off-by: Mark Hale <mark.hale@physics.org>
2018-03-31 02:09:33 +13:00
Michael Keller
3a8901daa8
Added assertion about OSD warning field size. (#5533) 2018-03-26 20:53:12 +13:00
Michael Keller
d6af4c2d6b
Fixed blinking of OSD RSSI element. (#5542) 2018-03-26 10:46:46 +13:00
etracer65
9edce2359a Add current battery voltage as an option for the OSD stats page (#5531)
Allows the user to configure a new OSD stat item called "BATTERY" that will display a live and updating battery voltage. This would allow the user to see how their battery was recovering after disarming by comparing to the stat "END BATTERY".
2018-03-25 13:56:25 +13:00
etracer65
0c7ae49464 Fix OSD stats not clearing when entering OSD menu (#5522)
The pitch stick high can be used to clear the OSD stats screen, but it's also part of the sequence to enter the OSD menu. Entering the OSD menu from the stats page should have cleared the stats, but because of a race condition they weren't always cleared and the OSD menu would draw on top of the stats.  Changed the logic to ensure that if the OSD menu is entered the stats page is exited and cleared.
2018-03-24 18:03:43 +13:00
etracer65
6b1336a940 Make OSD stats page follow the state of the OSD disable switch mode (#5463)
Previously the OSD stats would always display even if the OSD disable switch mode was active.

Additionally, since the OSD stats page must now be dynamically refreshed rather than only rendered once at disarm, "live" stats like RTC clock and the timer "ON TIME" continue to update and display current information.  All other stats related to the previous flight remain static as of the disarming.
2018-03-21 00:21:08 +13:00
Michael Keller
509d386f14
Merge pull request #3030 from cleanflight/fix-osd-vtx-power (#5423)
Fix OSD VTX power display.  Only one character for the power is needed.
2018-03-15 02:40:09 +13:00
etracer65
27bc23c3bb Suppress OSD stats screen if runaway takeoff triggered the disarm (#5402)
and OSD_WARNINGS is visible in the OSD.

The stats screen was preventing the user from knowing that a disarm might be casued by runaway takeoff.  If the warnings element is visible it will have the message "RUNAWAY" but the disarm it triggers caused the stats display to replace the screen.

The change prevents the stats page from displaying if the ARMING_DISABLED_RUNAWAY_TAKEOFF flag is set and the OSD_WARNINGS element is visible.  Otherwise the stats screen is displayed as normal.
2018-03-15 02:04:16 +13:00
etracer65
35f5e5025f Fix OSD "DISARMED" blanking the display when armed (#5384)
Changed the logic so that if currently armed and the previous arming state was disarmed, then blank out the message for just this single iteration. This should allow any elements behind to be properly displayed when armed.
2018-03-13 09:31:52 +13:00
Dan Nixon
66dac7a2e3 Positionable OSD crosshairs and AHI (#5326)
* Make Artificial horizon and crosshairs positionable

* Remove dependency on AHI for AHI sidebars

* Use the old fixed positions as defaults for some OSD elements

Namely:
- crosshairs
- artificial horizon
- artificial horizon sidebars
2018-03-04 11:46:39 +13:00
Michael Keller
6560e96e98
Fixed inconsistency in OSD code. (#5223) 2018-03-04 11:43:46 +13:00
Petr Ledvina
c11d016bc7 optimize math (#5287)
* optimize math

Results in considerable flash saving

* log_approx, exp_approx, pow_approx

Taken from https://github.com/jhjourdan/SIMD-math-prims/blob/master/simd_math_prims.h

* Fix pow in rangefinder

* Use approximate function in baro calculation

Maximum error is < 20cm

* fixup! Fix pow in rangefinder
2018-03-04 01:26:33 +13: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
mikeller
8db70252dd Fixed problem with craft name overwriting elements in OSD. 2018-02-19 01:35:01 +13:00
Diego Basch
d75b1f71c3 Fix for #5117. GPS coordinates no longer require special fonts to render the decimal separator.
Removed the code that used leading and trailing half-dots, now using a regular dot instead.
Also fixed the maximum length of the coordinate string, as the 7th decimal digit was getting clobbered in longitudes with three digits (the count was off by one).
2018-02-11 13:02:41 -08:00
Martin Budden
e2683cd2dc Corrected VTX vtables to not use static device handle 2018-02-01 11:15:07 +00:00
Martin Budden
e7cac0e9c6 Always use arming disable flag names 2018-01-21 14:15:49 +00: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
385623bd9d Converted defines for VTX_COMMON, VTX_CONTROL, VTX_RTC6705, VTX_RTC6705SOFTSPI, VTX_TRAMP, VTX_SMARTAUDIO to use USE_ prefix. 2018-01-09 17:34:34 +13:00
mikeller
09d396c05c Cleaned up parameter group handling.
Fixed missing include.
2017-12-31 10:51:01 +13:00
mikeller
d82c72bc54 Moved sdcard parameter group to pg/. 2017-12-24 12:23:27 +13:00
mikeller
b489d0ba9d Renamed 'parameter_group' to 'pg'. 2017-12-19 23:36:31 +13:00
atomiclama
6e5ad5d210 Change switch default handling
Currently if no black box device is selected the default case sets
storageDeviceIsWorking = true. 

I believe this to be wrong.

This commit keeps the initial setting of false.
2017-12-06 09:17:55 +00:00