Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-16 21:05:28 +03:00
Code Wiki Activity

Merge pull request #983 from iNavFlight/giacomo892_alarms_fix

Browse source 
fix missing alarms
This commit is contained in:
Paweł Spychalski 2020-05-12 10:23:12 +02:00 • committed by GitHub
commit e8aa5f228b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
_locales/en/messages.json
View file

@ -2452,8 +2452,8 @@
"osdUnitUKTip": { "osdUnitUKTip": {
"message": "Use metric units except for the speed, which is displayed in miles per hour." "message": "Use metric units except for the speed, which is displayed in miles per hour."
}, },
"osdAlarmRSSI": { "osd_rssi_alarm": {
"message": "RSSI" "message": "RSSI (%)"
}, },
"osdAlarmBATT_CAP": { "osdAlarmBATT_CAP": {
"message": "Used Battery" "message": "Used Battery"
@ -2461,44 +2461,44 @@
"osdAlarmBATT_CAP_HELP": { "osdAlarmBATT_CAP_HELP": {
"message": "The battery capacity used indicator (mah drawn) will flash when the total consumed mah are greater than this value. Requires a current sensor. Zero disables this alarm." "message": "The battery capacity used indicator (mah drawn) will flash when the total consumed mah are greater than this value. Requires a current sensor. Zero disables this alarm."
}, },
"osdAlarmFLY_MINUTES": { "osd_time_alarm": {
"message": "Fly Time" "message": "Fly Time (minutes)"
}, },
"osdAlarmMAX_ALTITUDE": { "osd_alt_alarm": {
"message": "Altitude" "message": "Altitude (meters)"
}, },
"osdAlarmDIST": { "osd_dist_alarm": {
"message": "Distance" "message": "Distance (meters)"
}, },
"osdAlarmDIST_HELP": { "osdAlarmDIST_HELP": {
"message": "The distance to home indicator will flash when the distance is greater than this value. Zero disables this alarm." "message": "The distance to home indicator will flash when the distance is greater than this value. Zero disables this alarm."
}, },
"osdAlarmMAX_NEG_ALTITUDE": { "osd_neg_alt_alarm": {
"message": "Negative Altitude" "message": "Negative Altitude (meters)"
}, },
"osdAlarmMAX_NEG_ALTITUDE_HELP": { "osdAlarmMAX_NEG_ALTITUDE_HELP": {
"message": "The altitude indicator will flash when altitude is negative and its absolute value is greater than this alarm. Useful when taking off from elevated places. Zero disables this alarm." "message": "The altitude indicator will flash when altitude is negative and its absolute value is greater than this alarm. Useful when taking off from elevated places. Zero disables this alarm."
}, },
"osdAlarmGFORCE": { "osd_gforce_alarm": {
"message": "g force" "message": "g force"
}, },
"osdAlarmGFORCE_HELP": { "osdAlarmGFORCE_HELP": {
"message": "The g force element will start blinking when greater than this value" "message": "The g force element will start blinking when greater than this value"
}, },
"osdAlarmGFORCE_AXIS_MIN": { "osd_gforce_axis_alarm_min": {
"message": "g force axis min" "message": "g force axis min"
}, },
"osdAlarmGFORCE_AXIS_MIN_HELP": { "osdAlarmGFORCE_AXIS_MIN_HELP": {
"message": "The axes g force elements will start blinking when lower than this value" "message": "The axes g force elements will start blinking when lower than this value"
}, },
"osdAlarmGFORCE_AXIS_MAX": { "osd_gforce_axis_alarm_max": {
"message": "g force axis max" "message": "g force axis max"
}, },
"osdAlarmGFORCE_AXIS_MAX_HELP": { "osdAlarmGFORCE_AXIS_MAX_HELP": {
"message": "The axes g force elements will start blinking when greater than this value" "message": "The axes g force elements will start blinking when greater than this value"
}, },
"osdAlarmCURRENT": { "osd_current_alarm": {
"message": "Current" "message": "Current (A)"
}, },
"osdAlarmCURRENT_HELP": { "osdAlarmCURRENT_HELP": {
"message": "The current draw element will start blinking when the consumption is greater than this value. Zero disables this alarm." "message": "The current draw element will start blinking when the consumption is greater than this value. Zero disables this alarm."

42
tabs/osd.html
View file

@ -93,6 +93,48 @@
</div> </div>
</div> </div>
<div class="spacer_box settings"> <div class="spacer_box settings">
<label for="rssi_alarm">
<input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_rssi_alarm"></span>
</label>
<label for="time_alarm">
<input id="osd_time_alarm" data-setting="osd_time_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_time_alarm"></span>
</label>
<label for="osd_alt_alarm">
<input id="osd_alt_alarm" data-setting="osd_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_alt_alarm"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="osdAlarmMAX_NEG_ALTITUDE_HELP"></div>
<label for="osd_neg_alt_alarm">
<input id="osd_neg_alt_alarm" data-setting="osd_neg_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_neg_alt_alarm"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="osdAlarmDIST_HELP"></div>
<label for="osd_dist_alarm">
<input id="osd_dist_alarm" data-setting="osd_dist_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_dist_alarm"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_HELP"></div>
<label for="osd_gforce_alarm">
<input id="osd_gforce_alarm" data-setting="osd_gforce_alarm" data-setting-multiplier="1" type="number" data-step="0.1" />
<span data-i18n="osd_gforce_alarm"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MIN_HELP"></div>
<label for="osd_gforce_axis_alarm_min">
<input id="osd_gforce_axis_alarm_min" data-setting="osd_gforce_axis_alarm_min" data-setting-multiplier="1" type="number" data-step="0.1" />
<span data-i18n="osd_gforce_axis_alarm_min"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MAX_HELP"></div>
<label for="osd_gforce_axis_alarm_max">
<input id="osd_gforce_axis_alarm_max" data-setting="osd_gforce_axis_alarm_max" data-setting-multiplier="1" type="number" data-step="0.1" />
<span data-i18n="osd_gforce_axis_alarm_max"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="osdAlarmCURRENT_HELP"></div>
<label for="osd_current_alarm">
<input id="osd_current_alarm" data-setting="osd_current_alarm" data-setting-multiplier="1" type="number" data-step="1" />
<span data-i18n="osd_current_alarm"></span>
</label>
<label for="imu_temp_alarm_min"> <label for="imu_temp_alarm_min">
<input id="imu_temp_alarm_min" data-setting="osd_imu_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" /> <input id="imu_temp_alarm_min" data-setting="osd_imu_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
<span data-i18n="osd_imu_temp_alarm_min"></span> <span data-i18n="osd_imu_temp_alarm_min"></span>