Skip to content

Commit e8aa5f2

Browse files
DzikuVxDzikuVx
authored
Merge pull request #983 from iNavFlight/giacomo892_alarms_fix
fix missing alarms
2 parents c93e22f + 87e4479 commit e8aa5f2

File tree

2 files changed

+57
-15
lines changed

2 files changed

+57
-15
lines changed

‎_locales/en/messages.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,53 +2452,53 @@
24522452
"osdUnitUKTip": {
24532453
"message": "Use metric units except for the speed, which is displayed in miles per hour."
24542454
},
2455-
"osdAlarmRSSI": {
2456-
"message": "RSSI"
2455+
"osd_rssi_alarm": {
2456+
"message": "RSSI (%)"
24572457
},
24582458
"osdAlarmBATT_CAP": {
24592459
"message": "Used Battery"
24602460
},
24612461
"osdAlarmBATT_CAP_HELP": {
24622462
"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."
24632463
},
2464-
"osdAlarmFLY_MINUTES": {
2465-
"message": "Fly Time"
2464+
"osd_time_alarm": {
2465+
"message": "Fly Time (minutes)"
24662466
},
2467-
"osdAlarmMAX_ALTITUDE": {
2468-
"message": "Altitude"
2467+
"osd_alt_alarm": {
2468+
"message": "Altitude (meters)"
24692469
},
2470-
"osdAlarmDIST": {
2471-
"message": "Distance"
2470+
"osd_dist_alarm": {
2471+
"message": "Distance (meters)"
24722472
},
24732473
"osdAlarmDIST_HELP": {
24742474
"message": "The distance to home indicator will flash when the distance is greater than this value. Zero disables this alarm."
24752475
},
2476-
"osdAlarmMAX_NEG_ALTITUDE": {
2477-
"message": "Negative Altitude"
2476+
"osd_neg_alt_alarm": {
2477+
"message": "Negative Altitude (meters)"
24782478
},
24792479
"osdAlarmMAX_NEG_ALTITUDE_HELP": {
24802480
"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."
24812481
},
2482-
"osdAlarmGFORCE": {
2482+
"osd_gforce_alarm": {
24832483
"message": "g force"
24842484
},
24852485
"osdAlarmGFORCE_HELP": {
24862486
"message": "The g force element will start blinking when greater than this value"
24872487
},
2488-
"osdAlarmGFORCE_AXIS_MIN": {
2488+
"osd_gforce_axis_alarm_min": {
24892489
"message": "g force axis min"
24902490
},
24912491
"osdAlarmGFORCE_AXIS_MIN_HELP": {
24922492
"message": "The axes g force elements will start blinking when lower than this value"
24932493
},
2494-
"osdAlarmGFORCE_AXIS_MAX": {
2494+
"osd_gforce_axis_alarm_max": {
24952495
"message": "g force axis max"
24962496
},
24972497
"osdAlarmGFORCE_AXIS_MAX_HELP": {
24982498
"message": "The axes g force elements will start blinking when greater than this value"
24992499
},
2500-
"osdAlarmCURRENT": {
2501-
"message": "Current"
2500+
"osd_current_alarm": {
2501+
"message": "Current (A)"
25022502
},
25032503
"osdAlarmCURRENT_HELP": {
25042504
"message": "The current draw element will start blinking when the consumption is greater than this value. Zero disables this alarm."

‎tabs/osd.html‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,48 @@ <h1 class="tab_title">
9393
</div>
9494
</div>
9595
<div class="spacer_box settings">
96+
<label for="rssi_alarm">
97+
<input id="osd_rssi_alarm" data-setting="osd_rssi_alarm" data-setting-multiplier="1" type="number" data-step="1" />
98+
<span data-i18n="osd_rssi_alarm"></span>
99+
</label>
100+
<label for="time_alarm">
101+
<input id="osd_time_alarm" data-setting="osd_time_alarm" data-setting-multiplier="1" type="number" data-step="1" />
102+
<span data-i18n="osd_time_alarm"></span>
103+
</label>
104+
<label for="osd_alt_alarm">
105+
<input id="osd_alt_alarm" data-setting="osd_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
106+
<span data-i18n="osd_alt_alarm"></span>
107+
</label>
108+
<div class="helpicon cf_tip" data-i18n_title="osdAlarmMAX_NEG_ALTITUDE_HELP"></div>
109+
<label for="osd_neg_alt_alarm">
110+
<input id="osd_neg_alt_alarm" data-setting="osd_neg_alt_alarm" data-setting-multiplier="1" type="number" data-step="1" />
111+
<span data-i18n="osd_neg_alt_alarm"></span>
112+
</label>
113+
<div class="helpicon cf_tip" data-i18n_title="osdAlarmDIST_HELP"></div>
114+
<label for="osd_dist_alarm">
115+
<input id="osd_dist_alarm" data-setting="osd_dist_alarm" data-setting-multiplier="1" type="number" data-step="1" />
116+
<span data-i18n="osd_dist_alarm"></span>
117+
</label>
118+
<div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_HELP"></div>
119+
<label for="osd_gforce_alarm">
120+
<input id="osd_gforce_alarm" data-setting="osd_gforce_alarm" data-setting-multiplier="1" type="number" data-step="0.1" />
121+
<span data-i18n="osd_gforce_alarm"></span>
122+
</label>
123+
<div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MIN_HELP"></div>
124+
<label for="osd_gforce_axis_alarm_min">
125+
<input id="osd_gforce_axis_alarm_min" data-setting="osd_gforce_axis_alarm_min" data-setting-multiplier="1" type="number" data-step="0.1" />
126+
<span data-i18n="osd_gforce_axis_alarm_min"></span>
127+
</label>
128+
<div class="helpicon cf_tip" data-i18n_title="osdAlarmGFORCE_AXIS_MAX_HELP"></div>
129+
<label for="osd_gforce_axis_alarm_max">
130+
<input id="osd_gforce_axis_alarm_max" data-setting="osd_gforce_axis_alarm_max" data-setting-multiplier="1" type="number" data-step="0.1" />
131+
<span data-i18n="osd_gforce_axis_alarm_max"></span>
132+
</label>
133+
<div class="helpicon cf_tip" data-i18n_title="osdAlarmCURRENT_HELP"></div>
134+
<label for="osd_current_alarm">
135+
<input id="osd_current_alarm" data-setting="osd_current_alarm" data-setting-multiplier="1" type="number" data-step="1" />
136+
<span data-i18n="osd_current_alarm"></span>
137+
</label>
96138
<label for="imu_temp_alarm_min">
97139
<input id="imu_temp_alarm_min" data-setting="osd_imu_temp_alarm_min" data-setting-multiplier="10" type="number" data-step="0.5" />
98140
<span data-i18n="osd_imu_temp_alarm_min"></span>

0 commit comments

Comments
 (0)