Skip to content

Commit a26d7ee

Browse files
committed
Updated centideg to be actual centidegrees and added decadeg
1 parent 76a1624 commit a26d7ee

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

js/settings.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,10 @@ var Settings = (function () {
225225
// Angles
226226
'centideg' : 'centi°',
227227
'centideg-deg' : 'centi°', // Centidegrees, but always converted to degrees by default
228-
'deg' : '°',
229228
'decideg' : 'deci°',
230229
'decideg-lrg' : 'deci°', // Decidegrees, but always converted to degrees by default
230+
'deg' : '°',
231+
'decadeg' : 'deca°',
231232
// Rotational speed
232233
'degps' : '° per second',
233234
'decadegps' : 'deca° per second',
@@ -273,9 +274,10 @@ var Settings = (function () {
273274
// Angles
274275
'centideg' : 'CentiDegrees',
275276
'centideg-deg' : 'CentiDegrees',
276-
'deg' : 'Degrees',
277277
'decideg' : 'DeciDegrees',
278278
'decideg-lrg' : 'DeciDegrees',
279+
'deg' : 'Degrees',
280+
'decadeg' : 'DecaDegrees',
279281
// Rotational speed
280282
'degps' : 'Degrees per second',
281283
'decadegps' : 'DecaDegrees per second',
@@ -352,17 +354,20 @@ var Settings = (function () {
352354
'tzhours' : 'TZHOURS'
353355
},
354356
'centideg' : {
355-
'deg' : 0.1
357+
'deg' : 100
356358
},
357359
'centideg-deg' : {
358-
'deg' : 0.1
360+
'deg' : 100
359361
},
360362
'decideg' : {
361363
'deg' : 10
362364
},
363365
'decideg-lrg' : {
364366
'deg' : 10
365367
},
368+
'decadeg' : {
369+
'deg' : 0.1
370+
},
366371
'decadegps' : {
367372
'degps' : 0.1
368373
},
@@ -389,6 +394,7 @@ var Settings = (function () {
389394
'centideg-deg' : 'deg',
390395
'decideg' : 'deg',
391396
'decideg-lrg' : 'deg',
397+
'decadeg' : 'deg',
392398
'decidegc' : 'degf',
393399
},
394400
1: { //metric
@@ -406,6 +412,7 @@ var Settings = (function () {
406412
'centideg-deg' : 'deg',
407413
'decideg' : 'deg',
408414
'decideg-lrg' : 'deg',
415+
'decadeg' : 'deg',
409416
'decidegc' : 'degc',
410417
},
411418
2: { //metric with MPH
@@ -419,6 +426,7 @@ var Settings = (function () {
419426
'centideg-deg' : 'deg',
420427
'decideg' : 'deg',
421428
'decideg-lrg' : 'deg',
429+
'decadeg' : 'deg',
422430
'msec' : 'sec',
423431
'dsec' : 'sec',
424432
'mins' : 'hours',
@@ -436,6 +444,7 @@ var Settings = (function () {
436444
'centideg-deg' : 'deg',
437445
'decideg' : 'deg',
438446
'decideg-lrg' : 'deg',
447+
'decadeg' : 'deg',
439448
'msec' : 'sec',
440449
'dsec' : 'sec',
441450
'mins' : 'hours',
@@ -453,6 +462,7 @@ var Settings = (function () {
453462
'centideg-deg' : 'deg',
454463
'decideg' : 'deg',
455464
'decideg-lrg' : 'deg',
465+
'decadeg' : 'deg',
456466
'msec' : 'sec',
457467
'dsec' : 'sec',
458468
'mins' : 'hours',
@@ -464,6 +474,7 @@ var Settings = (function () {
464474
'decideg-lrg' : 'deg',
465475
'centideg' : 'deg',
466476
'centideg-deg' : 'deg',
477+
'decadeg' : 'deg',
467478
'tzmins' : 'tzhours',
468479
}
469480
};

tabs/osd.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ <h1 class="tab_title" data-i18n="tabOSD"></h1>
380380
<div id="osd_pan_settings">
381381
<div for="osdPanServoPwm2decadeg" class="helpicon cf_tip" data-i18n_title="osdPanServoPwm2decadeg_HELP"></div>
382382
<label for="osdPanServoPwm2decadeg">
383-
<input id="osdPanServoPwm2decadeg" data-setting="osd_pan_servo_pwm2decadeg" data-unit="centideg-deg" data-setting-multiplier="1" type="number" data-step="1" />
383+
<input id="osdPanServoPwm2decadeg" data-setting="osd_pan_servo_pwm2decadeg" data-unit="decadeg" data-setting-multiplier="1" type="number" data-step="1" />
384384
<span data-i18n="osdPanServoPwm2decadeg"></span>
385385
</label>
386386
<label for="osdPanServoIndicatorShowDegrees">

0 commit comments

Comments
 (0)