diff options
37 files changed, 3808 insertions, 3646 deletions
diff --git a/_locales/en/messages.json b/_locales/en/messages.json index e3d2e7f5..54bb520e 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -3417,6 +3417,12 @@ "osdElement_GLIDESLOPE_HELP": { "message": "Amount of horizontal distance traveled per unit of lost altitude" }, + "osdElement_PAN_SERVO_CENTRED": { + "message": "Pan Servo Centred" + }, + "osdElement_PAN_SERVO_CENTRED_HELP": { + "message": "Displays if the pan servo is centred (0) or offset (arrows). Check the <b>osd_pan_servo_</b> settings for configuring the pan servo." + }, "osdElement_VTX_CHANNEL": { "message": "Video TX Band and Channel" }, @@ -3642,6 +3648,33 @@ "osdSwitchInd3": { "message" : "Switch 4" }, + "osd_pan_servo_settings": { + "message": "Pan Servo OSD Settings" + }, + "osd_pan_servo_settings_HELP": { + "message": "This section enables and configures the pan servo offset feature. It is used to keep OSD elements, like the home arrow and POIs, pointing to or in the correct direction. Even when you have panned the camera around." + }, + "osdPanServoIndex": { + "message": "Pan Servo Output" + }, + "osdPanServoIndex_HELP": { + "message": "Set the is to the output number of the pan servo; as shown in the mixer outputs table. For example output S6." + }, + "osdPanServoPwm2centideg": { + "message": "Total degrees of movement of the pan servo" + }, + "osdPanServoPwm2centideg_HELP": { + "message": "Degrees of pan servo rotation. A servo with 180 degrees of rotation from 1000 to 2000 us PWM typically needs 180 for this setting. Make the value negative to inverse the direction." + }, + "osdPanServoIndicatorShowDegrees": { + "message": "Show degrees of offset next to pan indicator" + }, + "osdPanServoOffcentreWarning": { + "message": "Off-centre warning" + }, + "osdPanServoOffcentreWarning_HELP": { + "message": "Degrees either side of the pan servo centre; where it is assumed camera is wanted to be facing forwards, but isn't at 0. If in this range and not 0 for longer than 10 seconds, the pan servo offset OSD element will blink. 0 means the warning is disabled." + }, "osd_font_default": { "message" : "Default" }, diff --git a/js/settings.js b/js/settings.js index 36816ed9..2199517d 100644 --- a/js/settings.js +++ b/js/settings.js @@ -266,6 +266,8 @@ var Settings = (function () { 'mins' : 'm', 'hours' : 'h', // Angles + 'centideg' : 'centi°', + 'centideg-deg' : 'centi°', // Centidegrees, but always converted to degrees by default 'deg' : '°', 'decideg' : 'deci°', 'decideg-lrg' : 'deci°', // Decidegrees, but always converted to degrees by default @@ -310,6 +312,8 @@ var Settings = (function () { 'mins' : 'Minutes', 'hours' : 'Hours', // Angles + 'centideg' : 'CentiDegrees', + 'centideg-deg' : 'CentiDegrees', 'deg' : 'Degrees', 'decideg' : 'DeciDegrees', 'decideg-lrg' : 'DeciDegrees', @@ -385,6 +389,12 @@ var Settings = (function () { 'mins' : { 'hours' : 60 }, + 'centideg' : { + 'deg' : 0.1 + }, + 'centideg-deg' : { + 'deg' : 0.1 + }, 'decideg' : { 'deg' : 10 }, @@ -412,6 +422,8 @@ var Settings = (function () { 'dsec' : 'sec', 'mins' : 'hours', 'decadegps' : 'degps', + 'centideg' : 'deg', + 'centideg-deg' : 'deg', 'decideg' : 'deg', 'decideg-lrg' : 'deg', 'decidegc' : 'degf', @@ -426,6 +438,8 @@ var Settings = (function () { 'dsec' : 'sec', 'mins' : 'hours', 'decadegps' : 'degps', + 'centideg' : 'deg', + 'centideg-deg' : 'deg', 'decideg' : 'deg', 'decideg-lrg' : 'deg', 'decidegc' : 'degc', @@ -437,6 +451,8 @@ var Settings = (function () { 'cms' : 'mph', 'v-cms' : 'ms', 'decadegps' : 'degps', + 'centideg' : 'deg', + 'centideg-deg' : 'deg', 'decideg' : 'deg', 'decideg-lrg' : 'deg', 'msec' : 'sec', @@ -451,6 +467,8 @@ var Settings = (function () { 'cms' : 'mph', 'v-cms' : 'fts', 'decadegps' : 'degps', + 'centideg' : 'deg', + 'centideg-deg' : 'deg', 'decideg' : 'deg', 'decideg-lrg' : 'deg', 'msec' : 'sec', @@ -465,6 +483,8 @@ var Settings = (function () { 'cms': 'kt', 'v-cms' : 'hftmin', 'decadegps' : 'degps', + 'centideg' : 'deg', + 'centideg-deg' : 'deg', 'decideg' : 'deg', 'decideg-lrg' : 'deg', 'msec' : 'sec', @@ -475,6 +495,7 @@ var Settings = (function () { default: { //show base units 'decadegps' : 'degps', 'decideg-lrg' : 'deg', + 'centideg-deg' : 'deg', 'mins' : 'hours', } }; diff --git a/resources/osd/analogue/README.md b/resources/osd/analogue/README.md index 6fe9bfe1..e0ac1e73 100644 --- a/resources/osd/analogue/README.md +++ b/resources/osd/analogue/README.md @@ -3,7 +3,11 @@ This directory contains one directory per font. In each directory, each character is named `%d%d%d.png`, where the digits represent the decimal character number found -in the filename without the extension. +in the filename without the extension. All characters +must be in the `default` font directory. If characters +missing from alternate font directories, the default +version of the character will be used. + Don't alter the `.mcm` files directly, those should be only modified by altering the `.png` files found in its diff --git a/resources/osd/analogue/bold.mcm b/resources/osd/analogue/bold.mcm index 6745bf21..56aa88fc 100644 --- a/resources/osd/analogue/bold.mcm +++ b/resources/osd/analogue/bold.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/bold.png b/resources/osd/analogue/bold.png Binary files differindex 75d6cd74..a3d3da5b 100644 --- a/resources/osd/analogue/bold.png +++ b/resources/osd/analogue/bold.png diff --git a/resources/osd/analogue/clarity.mcm b/resources/osd/analogue/clarity.mcm index 259b802e..c8cba7b1 100644 --- a/resources/osd/analogue/clarity.mcm +++ b/resources/osd/analogue/clarity.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/clarity.png b/resources/osd/analogue/clarity.png Binary files differindex c8043117..dade9834 100644 --- a/resources/osd/analogue/clarity.png +++ b/resources/osd/analogue/clarity.png diff --git a/resources/osd/analogue/clarity_medium.mcm b/resources/osd/analogue/clarity_medium.mcm index 891ccb91..c24e0504 100644 --- a/resources/osd/analogue/clarity_medium.mcm +++ b/resources/osd/analogue/clarity_medium.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/clarity_medium.png b/resources/osd/analogue/clarity_medium.png Binary files differindex 388b95f4..65d26cef 100644 --- a/resources/osd/analogue/clarity_medium.png +++ b/resources/osd/analogue/clarity_medium.png diff --git a/resources/osd/analogue/default.mcm b/resources/osd/analogue/default.mcm index 136c5ea1..6cce407e 100644 --- a/resources/osd/analogue/default.mcm +++ b/resources/osd/analogue/default.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/default.png b/resources/osd/analogue/default.png Binary files differindex 2039b5bd..835fb551 100644 --- a/resources/osd/analogue/default.png +++ b/resources/osd/analogue/default.png diff --git a/resources/osd/analogue/default/442.png b/resources/osd/analogue/default/442.png Binary files differnew file mode 100644 index 00000000..b73a33bc --- /dev/null +++ b/resources/osd/analogue/default/442.png diff --git a/resources/osd/analogue/default/443.png b/resources/osd/analogue/default/443.png Binary files differnew file mode 100644 index 00000000..0688c607 --- /dev/null +++ b/resources/osd/analogue/default/443.png diff --git a/resources/osd/analogue/default/444.png b/resources/osd/analogue/default/444.png Binary files differnew file mode 100644 index 00000000..6a855467 --- /dev/null +++ b/resources/osd/analogue/default/444.png diff --git a/resources/osd/analogue/default/445.png b/resources/osd/analogue/default/445.png Binary files differnew file mode 100644 index 00000000..3881aa54 --- /dev/null +++ b/resources/osd/analogue/default/445.png diff --git a/resources/osd/analogue/default/446.png b/resources/osd/analogue/default/446.png Binary files differnew file mode 100644 index 00000000..29fc4f3c --- /dev/null +++ b/resources/osd/analogue/default/446.png diff --git a/resources/osd/analogue/default/447.png b/resources/osd/analogue/default/447.png Binary files differnew file mode 100644 index 00000000..793883a2 --- /dev/null +++ b/resources/osd/analogue/default/447.png diff --git a/resources/osd/analogue/default/448.png b/resources/osd/analogue/default/448.png Binary files differnew file mode 100644 index 00000000..02fc75d7 --- /dev/null +++ b/resources/osd/analogue/default/448.png diff --git a/resources/osd/analogue/default/449.png b/resources/osd/analogue/default/449.png Binary files differnew file mode 100644 index 00000000..178e016c --- /dev/null +++ b/resources/osd/analogue/default/449.png diff --git a/resources/osd/analogue/default/450.png b/resources/osd/analogue/default/450.png Binary files differnew file mode 100644 index 00000000..7889aad9 --- /dev/null +++ b/resources/osd/analogue/default/450.png diff --git a/resources/osd/analogue/default/451.png b/resources/osd/analogue/default/451.png Binary files differnew file mode 100644 index 00000000..86199185 --- /dev/null +++ b/resources/osd/analogue/default/451.png diff --git a/resources/osd/analogue/default/452.png b/resources/osd/analogue/default/452.png Binary files differnew file mode 100644 index 00000000..8c634498 --- /dev/null +++ b/resources/osd/analogue/default/452.png diff --git a/resources/osd/analogue/default/453.png b/resources/osd/analogue/default/453.png Binary files differnew file mode 100644 index 00000000..fa9312a6 --- /dev/null +++ b/resources/osd/analogue/default/453.png diff --git a/resources/osd/analogue/default/454.png b/resources/osd/analogue/default/454.png Binary files differnew file mode 100644 index 00000000..7a661fcf --- /dev/null +++ b/resources/osd/analogue/default/454.png diff --git a/resources/osd/analogue/default/455.png b/resources/osd/analogue/default/455.png Binary files differnew file mode 100644 index 00000000..7bcf16c9 --- /dev/null +++ b/resources/osd/analogue/default/455.png diff --git a/resources/osd/analogue/default/456.png b/resources/osd/analogue/default/456.png Binary files differnew file mode 100644 index 00000000..13b59cd5 --- /dev/null +++ b/resources/osd/analogue/default/456.png diff --git a/resources/osd/analogue/iNav character map.md b/resources/osd/analogue/iNav character map.md index 5164a743..030de2f5 100644 --- a/resources/osd/analogue/iNav character map.md +++ b/resources/osd/analogue/iNav character map.md @@ -22,9 +22,9 @@ SYM_2RSS | SYM.RSS2 | RSSI 2 icon SYM_DB | SYM.DB | Decibel icon | 018 | 0x12 SYM_DBM | SYM.DBM | Decibel per milliwatt icon | 019 | 0x13 SYM_SNR | SYM.SNR | Signal to Noise Ratio icon | 020 | 0x14 -SYM_AH_DECORATION_UP | SYM.AH_DECORATION_UP | AHi up arrow | 021 | 0x15 -SYM_AH_DECORATION_DOWN | | AHI down arrow | 022 | 0x16 -SYM_DECORATION | SYM.DIRECTION | Direction little arrows | 023 - 030 | 0x17 - 0x1E +SYM_AH_DIRECTION_UP | SYM.AH_DIRECTION_UP | AHi up arrow | 021 | 0x15 +SYM_AH_DIRECTION_DOWN | | AHI down arrow | 022 | 0x16 +SYM_DIRECTION | SYM.DIRECTION | Direction little arrows | 023 - 030 | 0x17 - 0x1E SYM_VOLT | SYM.VOLT | Volts symbol | 031 | 0x1F SYM_BLANK _*_ | SYM.BLANK | Empty | 032 | 0x20 _ASCII_ _*_ | | ! | 033 | 0x21 @@ -198,5 +198,20 @@ SYM_HUD_ARROWS_U3 | | 3 arrows up SYM_HUD_ARROWS_D1 | | 1 arrow down | 439 | 0x1B7 SYM_HUD_ARROWS_D2 | | 2 arrows down | 440 | 0x1B8 SYM_HUD_ARROWS_D3 | | 3 arrows down | 441 | 0x1B9 +SYM_HUD_CARDINAL | | Cardinal heading 180 degrees | 442 | 0x1BA +SYM_HUD_CARDINAL | | Cardinal heading 210 degrees | 443 | 0x1BB +SYM_HUD_CARDINAL | | Cardinal heading 240 degrees | 444 | 0x1BC +SYM_HUD_CARDINAL | | Cardinal heading 270 degrees | 445 | 0x1BD +SYM_HUD_CARDINAL | | Cardinal heading 300 degrees | 446 | 0x1BE +SYM_HUD_CARDINAL | | Cardinal heading 330 degrees | 447 | 0x1BF +SYM_HUD_CARDINAL | | Cardinal heading 0 degrees | 448 | 0x1C0 +SYM_HUD_CARDINAL | | Cardinal heading 30 degrees | 449 | 0x1C1 +SYM_HUD_CARDINAL | | Cardinal heading 60 degrees | 450 | 0x1C2 +SYM_HUD_CARDINAL | | Cardinal heading 90 degrees | 451 | 0x1C3 +SYM_HUD_CARDINAL | | Cardinal heading 120 degrees | 452 | 0x1C4 +SYM_HUD_CARDINAL | | Cardinal heading 150 degrees | 453 | 0x1C5 +SYM_SERVO_PAN_IS_CENTRED | | Pan servo is centred | 454 | 0x1C6 +SYM_SERVO_PAN_IS_OFFSET_L | SYM.PAN_SERVO_IS_OFFSET_L | Pan servo is turned to the left | 455 | 0x1C7 +SYM_SERVO_PAN_IS_OFFSET_R | | Pan servo is turned to the right | 456 | 0x1C8 _*_ Do not change the IDs of these characters diff --git a/resources/osd/analogue/impact.mcm b/resources/osd/analogue/impact.mcm index c80ce1db..2d289893 100644 --- a/resources/osd/analogue/impact.mcm +++ b/resources/osd/analogue/impact.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/impact.png b/resources/osd/analogue/impact.png Binary files differindex 88ef2431..73007498 100644 --- a/resources/osd/analogue/impact.png +++ b/resources/osd/analogue/impact.png diff --git a/resources/osd/analogue/impact_mini.mcm b/resources/osd/analogue/impact_mini.mcm index 4fffb833..0e00e67a 100644 --- a/resources/osd/analogue/impact_mini.mcm +++ b/resources/osd/analogue/impact_mini.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/impact_mini.png b/resources/osd/analogue/impact_mini.png Binary files differindex b6e5ffc7..03ad6b2d 100644 --- a/resources/osd/analogue/impact_mini.png +++ b/resources/osd/analogue/impact_mini.png diff --git a/resources/osd/analogue/large.mcm b/resources/osd/analogue/large.mcm index 17153f68..471c998c 100644 --- a/resources/osd/analogue/large.mcm +++ b/resources/osd/analogue/large.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/large.png b/resources/osd/analogue/large.png Binary files differindex dc235d85..e98541fc 100644 --- a/resources/osd/analogue/large.png +++ b/resources/osd/analogue/large.png diff --git a/resources/osd/analogue/vision.mcm b/resources/osd/analogue/vision.mcm index 258a2bc5..848bbe65 100644 --- a/resources/osd/analogue/vision.mcm +++ b/resources/osd/analogue/vision.mcm @@ -28303,7 +28303,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01000010 +10100010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28336,7 +28367,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01000010 +10001010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28369,7 +28431,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10001010 +10101000 +01001010 +00101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28402,7 +28495,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001000 +00000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28435,7 +28559,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001000 +00101010 +10101000 +01001010 +10000010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28468,7 +28623,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10001010 +10000101 +01010010 +10001010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28501,7 +28687,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10100010 +10000101 +01010010 +10100010 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28534,7 +28751,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101000 +10000101 +01010010 +10101000 +10100001 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28567,7 +28815,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +00001000 +01001010 +10100000 +10101000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28600,7 +28879,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100000 +00001000 +01001010 +10101010 +10101000 +01001010 +10101010 +10101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28633,7 +28943,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01001010 +10101010 +00101000 +01000010 +10101010 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28666,7 +29007,38 @@ MAX7456 01010101 01010101 01010101 +00000000 +00010101 +01010100 +10101010 +10000101 +01010010 +10101010 +10100001 +01001010 +10101010 +10101000 +01001010 +10100010 +10101000 +01001010 +10100010 +10101000 +01001010 +10101000 +10101000 +01000010 +10101000 +10100000 +01010000 +10101010 +10000001 +01010100 +00000000 +00000101 01010101 +00000000 +00010101 01010101 01010101 01010101 @@ -28696,16 +29068,40 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010001 +00100010 +00000000 +10001000 +00101000 01010101 +00101000 +00101010 +00010100 +10101000 +01000000 01010101 +00000001 01010101 +01000001 01010101 01010101 +00101000 01010101 +01010100 +10000010 +00010101 +01010100 +10000010 +00010101 01010101 +00101000 01010101 01010101 +01000001 01010101 01010101 01010101 @@ -28733,15 +29129,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01000100 +10101010 +00010101 +00100010 +00000000 01010101 +00101000 01010101 01010101 +00101010 +00010101 01010101 +01000000 01010101 01010101 +00101000 01010101 01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 @@ -28768,469 +29193,44 @@ MAX7456 01010101 01010101 01010101 +00000000 01010101 +01010100 +10101010 +00010001 01010101 +00000000 +10001000 01010101 01010101 +00101000 01010101 +01010100 +10101000 +01000000 01010101 +00000001 +00101000 01010101 01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 -01010101 +00100010 +00000101 +00010100 +00100010 +00100000 +10000010 +00101000 +10001000 +10100010 +00100000 +10101000 +10001010 +00100000 +10001000 +10000010 +01000101 +00010001 +00010100 01010101 01010101 01010101 diff --git a/resources/osd/analogue/vision.png b/resources/osd/analogue/vision.png Binary files differindex 0c07278b..133eec61 100644 --- a/resources/osd/analogue/vision.png +++ b/resources/osd/analogue/vision.png diff --git a/tabs/osd.html b/tabs/osd.html index 389ded66..ac8ccb14 100644 --- a/tabs/osd.html +++ b/tabs/osd.html @@ -282,6 +282,36 @@ </label> </div> </div> + <div class="gui_box grey pan-servo-container"> + <div class="gui_box_titlebar"> + <div for="osd_pan_servo_settings" class="helpicon cf_tip" data-i18n_title="osd_pan_servo_settings_HELP"></div> + <div class="spacer_box_title" data-i18n="osd_pan_servo_settings"></div> + </div> + <div class="spacer_box settings"> + <div for="panServoOutput" class="helpicon cf_tip" data-i18n_title="osdPanServoIndex_HELP"></div> + <label> + <select id="panServoOutput" data-setting="osd_pan_servo_index" data-live="true"></select> + <span data-i18n="osdPanServoIndex"></span> + </label> + + <div id="osd_pan_settings"> + <div for="osdPanServoPwm2centideg" class="helpicon cf_tip" data-i18n_title="osdPanServoPwm2centideg_HELP"></div> + <label for="osdPanServoPwm2centideg"> + <input id="osdPanServoPwm2centideg" data-setting="osd_pan_servo_pwm2centideg" data-unit="centideg-deg" data-setting-multiplier="1" type="number" data-step="1" /> + <span data-i18n="osdPanServoPwm2centideg"></span> + </label> + <label for="osdPanServoIndicatorShowDegrees"> + <input type="checkbox" id="osdPanServoIndicatorShowDegrees" data-setting="osd_pan_servo_indicator_show_degrees" data-live="true" class="toggle"></select> + <span data-i18n="osdPanServoIndicatorShowDegrees"></span> + </label> + <div for="osdPanServoOffcentreWarning" class="helpicon cf_tip" data-i18n_title="osdPanServoOffcentreWarning_HELP"></div> + <label for="osdPanServoOffcentreWarning"> + <input id="osdPanServoOffcentreWarning" data-setting="osd_pan_servo_offcentre_warning" data-unit="deg" data-setting-multiplier="1" type="number" data-step="1" /> + <span data-i18n="osdPanServoOffcentreWarning"></span> + </label> + </div> + </div> + </div> </div> <div id="fontmanagercontent" style="display:none; width:712px;"> <div class="font-picker" style="margin-bottom: 10px;"> diff --git a/tabs/osd.js b/tabs/osd.js index 44bd89d3..bfba0360 100644 --- a/tabs/osd.js +++ b/tabs/osd.js @@ -11,7 +11,7 @@ SYM.AH_RIGHT = 0x12D; SYM.AH_LEFT = 0x12C; SYM.THR = 0x95; SYM.VOLT = 0x1F; -SYM.AH_DECORATION_UP = 0x15; +SYM.AH_DIRECTION_UP = 0x15; SYM.WIND_SPEED_HORIZONTAL = 0x86; SYM.WIND_SPEED_VERTICAL = 0x87; SYM.FLY_M = 0x9F; @@ -109,6 +109,7 @@ SYM.PROFILE = 0xCF; SYM.SWITCH_INDICATOR_HIGH = 0xD2; SYM.GLIDE_MINS = 0xD5; SYM.GLIDE_RANGE = 0xD4; +SYM.PAN_SERVO_IS_OFFSET_L = 0x1C7; SYM.AH_AIRCRAFT0 = 0x1A2; SYM.AH_AIRCRAFT1 = 0x1A3; @@ -944,6 +945,12 @@ OSD.constants = { } }, { + name: 'PAN_SERVO_CENTRED', + id: 140, + min_version: '6.0.0', + preview: FONT.symbol(SYM.PAN_SERVO_IS_OFFSET_L) + '120' + FONT.symbol(SYM.DEGREES) + }, + { name: 'MISSION INFO', id: 129, min_version: '4.0.0', @@ -2443,7 +2450,7 @@ OSD.GUI.updateFields = function() { $('<div class="helpicon cf_tip"></div>') .css('margin-top', '1px') .attr('title', groupHelp) - .appendTo(groupTitleContainer) + .prependTo(groupTitleContainer.parent()) .jBox('Tooltip', { delayOpen: 100, delayClose: 100, @@ -2553,6 +2560,7 @@ OSD.GUI.updateFields = function() { // Update the OSD preview refreshOSDSwitchIndicators(); updateCraftName(); + updatePanServoPreview(); }; OSD.GUI.removeBottomLines = function(){ @@ -2944,6 +2952,17 @@ TABS.osd.initialize = function (callback) { refreshOSDSwitchIndicators(); }); + // Functions for when pan servo settings change + $('#osdPanServoIndicatorShowDegrees').on('change', function() { + // Update the OSD preview + updatePanServoPreview(); + }); + + $('#panServoOutput').on('change', function() { + // Update the OSD preview + updatePanServoPreview(); + }); + // Function for when text for craft name changes $('#craft_name').on('keyup', function() { // Make sure that the craft name only contains A to Z, 0-9, spaces, and basic ASCII symbols @@ -3121,6 +3140,46 @@ function refreshOSDSwitchIndicators() { OSD.GUI.updatePreviews(); } +function updatePanServoPreview() { + // Show or hide the settings, based on of the feature is active. + if ($('#panServoOutput').val() === "0") { + $('#osd_pan_settings').hide(); + $('#panServoOutput').parent().addClass('no-bottom'); + } else { + $('#osd_pan_settings').show(); + $('#panServoOutput').parent().removeClass('no-bottom'); + } + + // Update the panServoOutput select to be visibly easier to use + $('#panServoOutput option').each(function() { + if ($(this).val() === "0") { + $(this).text("OFF"); + } else { + $(this).text("S" + $(this).val()); + } + }); + + // Update the OSD preview based on settings + let generalGroup = OSD.constants.ALL_DISPLAY_GROUPS.filter(function(e) { + return e.name == "osdGroupGeneral"; + })[0]; + + for (let si = 0; si < generalGroup.items.length; si++) { + if (generalGroup.items[si].name == "PAN_SERVO_CENTRED") { + let craftNameText = $('#craft_name').val(); + + if ($('#osdPanServoIndicatorShowDegrees').prop('checked')) { + generalGroup.items[si].preview = FONT.symbol(SYM.PAN_SERVO_IS_OFFSET_L) + '120' + FONT.symbol(SYM.DEGREES); + } else { + generalGroup.items[si].preview = FONT.symbol(SYM.PAN_SERVO_IS_OFFSET_L); + } + break; + } + } + + OSD.GUI.updatePreviews(); +} + function updateCraftName() { let generalGroup = OSD.constants.ALL_DISPLAY_GROUPS.filter(function(e) { return e.name == "osdGroupGeneral"; |