Skip to content

Commit

Permalink
Merge branch 'master' into hdzero-osd
Browse files Browse the repository at this point in the history
  • Loading branch information
@nerdCopter
nerdCopter authored Jul 16, 2022
2 parents 72333f1 + 58d5535 commit b4beec1
Show file tree
Hide file tree
Showing 19 changed files with 1,356 additions and 86 deletions.
193 changes: 193 additions & 0 deletions locales/en/messages.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5541,5 +5541,198 @@
},
"pidTuningIMUFFilterSettings": {
"message": "Profile independent IMU-F Filter Settings"
},
"tabVtx": {
"message": "Analog VTX"
},
"COMMENT": {"message": "most these need purge"},
"vtxHelp": {
"message": "Here you can configure the values for your Video Transmitter if the flight controller and the VTX support it. Set the values manually, or click the chart frequencies then save.",
"description": "Introduction message in the VTX tab"
},
"vtxMessageNotSupported": {
"message": "<span class=\"message-negative\">Attention:</span> Your VTX is not configured or not supported. Configuration will only be possible if the VTx is properly soldered to the flight-controller and setup correctly with a protocol like Tramp or SmartAudio in the $t(tabPorts.message) tab.",
"description": "Message to show when the VTX is not supported in the VTX tab"
},
"vtxMessageFactoryBandsNotSupported": {
"message": "<span class=\"message-negative\">Attention:</span> The selected VTX type does not support the 'factory' setting for bands, but some of your bands have this setting. Click '$t(vtxButtonSave.message)' to fix this.",
"description": "Message to show when the configured VTX type does not support factory bands, but one or more of the configured bands are of this type"
},
"vtxMessageRequiresHAM": {
"message": "<span class=\"message-negative\">Attention:</span> Pilots operating an analog VTX must comply with the governmental regulations. An amateur radio license may be required."
},
"vtxMessageHardwareModes": {
"message": "Other things to consider: Locked, Unlocked, Race-Mode, Free-Mode should all be set by the VTX hardware. EmuFlight does not have access to this."
},
"vtxMessageAnalogFunny": {
"message": "Set up however you want, you're not gonna see anything but lines and static anyways"
},
"vtxMessageNonMSP": {
"message": "CLI-only settings include 'vtx_low_power_disarm', 'vtx_pit_mode_freq', 'vtx_halfduplex' and VTX-Power-on-a-Switch. Configure them as needed in CLI."
},
"vtxFrequencyChannel": {
"message": "Frequency Mode",
"description": "Text of one of the fields of the VTX tab"
},
"vtxFrequencyChannelHelp": {
"message": "If you enable this, the Configurator will let you select a frequency in place of the habitual band/channel. For this to work your VTX must support this feature.",
"description": "Help text for the frequency or channel select field of the VTX tab"
},
"vtxSelectedMode": {
"message": "Selected Mode",
"description": "Title for the actual mode header of the VTX"
},
"vtxActualState": {
"message": "Current Values",
"description": "Title for the actual values header of the VTX"
},
"vtxType": {
"message": "VTX Type",
"description": "Text of one of the fields of the VTX tab"
},
"vtxType_0": {
"message": "Unsupported",
"description": "Text for one of the types of the VTX type in VTX tab"
},
"vtxType_1": {
"message": "RTC607",
"description": "Text for one of the types of the VTX type in VTX tab"
},
"vtxType_3": {
"message": "SmartAudio",
"description": "Text for one of the types of the VTX type in VTX tab"
},
"vtxType_4": {
"message": "Tramp",
"description": "Text for one of the types of the VTX type in VTX tab"
},
"vtxType_5": {
"message": "BeeSign",
"description": "Text for one of the types of the VTX type in VTX tab"
},
"vtxType_255": {
"message": "Unknown",
"description": "Text for one of the types of the VTX type in VTX tab"
},
"vtxBand": {
"message": "Band",
"description": "Text of one of the fields of the VTX tab"
},
"vtxBandHelp": {
"message": "Here, set the band for your VTX",
"description": "Help text for the band field of the VTX tab"
},
"vtxBand_0": {
"message": "User",
"description": "Text of one of the options for the band field of the VTX tab"
},
"vtxBand_X": {
"message": "Band {{bandName}}",
"description": "Text of one of the options for the band field of the VTX tab"
},
"vtxChannel_0": {
"message": "None",
"description": "Text of one of the options for the channel field of the VTX tab"
},
"vtxChannel_X": {
"message": "Channel {{channelName}}",
"description": "Text of one of the options for the channel field of the VTX tab"
},
"vtxPower_0": {
"message": "None",
"description": "Text of one of the options for the power field of the VTX tab"
},
"vtxPower_X": {
"message": "Level {{powerLevel}}",
"description": "Text of one of the options for the power field of the VTX tab"
},
"vtxChannel": {
"message": "Channel",
"description": "Text of one of the fields of the VTX tab"
},
"vtxChannelHelp": {
"message": "Here, set the channel for your VTX",
"description": "Help text for the channel field of the VTX tab"
},
"vtxFrequency": {
"message": "Frequency",
"description": "Text of one of the fields of the VTX tab"
},
"vtxFrequencyHelp": {
"message": "Here, set the frequency for your VTX if it is supported",
"description": "Help text for the frequency field of the VTX tab"
},
"vtxDeviceReady": {
"message": "Device ready",
"description": "Text of one of the fields of the VTX tab"
},
"vtxPower": {
"message": "Power",
"description": "Text of one of the fields of the VTX tab"
},
"vtxPowerHelp": {
"message": "Here, set the operational power level for the VTX. It can be modified if the $t(vtxPitMode.message) or the $t(vtxLowPowerDisarm.message) is enabled",
"description": "Help text for the power field of the VTX tab"
},
"vtxPitMode": {
"message": "Pit Mode",
"description": "Text of one of the fields of the VTX tab"
},
"vtxPitModeHelp": {
"message": "When enabled, the VTX enters in a very low power mode to let the quad be on at the bench without disturbing other pilots. Usually the range of this mode is less than 5m.<br /><br />NOTE: Some protocols, like SmartAudio, can't enable Pit Mode via software after power-up.",
"description": "Help text for the pit mode field of the VTX tab"
},
"vtxPitModeFrequency": {
"message": "Pit Mode frequency",
"description": "Text of one of the fields of the VTX tab"
},
"vtxPitModeFrequencyHelp": {
"message": "Frequency at which the Pit Mode changes when enabled.",
"description": "Help text for the pit mode field of the VTX tab"
},
"vtxLowPowerDisarm": {
"message": "Low Power Disarm",
"description": "Text of one of the fields of the VTX tab"
},
"vtxLowPowerDisarmHelp": {
"message": "When enabled, the VTX uses the lowest available power when disarmed (except if a failsafe has occurred).",
"description": "Help text for the low power disarm field of the VTX tab"
},
"vtxLowPowerDisarmOption_0": {
"message": "Off",
"description": "One of the options for the Low Power Disarm mode of the VTX"
},
"vtxLowPowerDisarmOption_1": {
"message": "On",
"description": "One of the options for the Low Power Disarm mode of the VTX"
},
"vtxLowPowerDisarmOption_2": {
"message": "On until first arm",
"description": "One of the options for the Low Power Disarm mode of the VTX"
},
"vtxButtonSave": {
"message": "Save",
"description": "Save button in the VTX tab"
},
"vtxButtonSaved": {
"message": "Saved",
"description": "Saved action button in the VTX tab"
},
"vtxButtonRefresh": {
"message": "Refresh",
"description": "Refresh button in the VTX tab"
},
"vtxSmartAudioUnlocked": {
"message": "{{version}} unlocked",
"description": "Indicates if SA device is unlocked"
},
"vtxTableNameCol": {
"message": "Name"
},
"vtxTableChannelRow": {
"message": "Channels"
},
"vtxTableBandCol": {
"message": "Bands"
}
}
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@
"i18next": "^21.3.1",
"i18next-xhr-backend": "^3.2.2",
"inflection": "1.12.0",
"jbox": "1.3.2",
"jbox": "1.3.3",
"jquery": "3.4.1",
"jquery-textcomplete": "^1.8.5",
"jquery-ui-npm": "1.12.0",
"lru_map": "^0.3.3",
"marked": "^2.0.7",
"object-hash": "^2.0.3",
"object-hash": "^3.0.0",
"request": "^2.88.2",
"short-unique-id": "^4.3.3",
"tslib": "^2.1.0",
Expand All @@ -65,7 +65,7 @@
"command-exists": "^1.2.9",
"del": "^6.0.0",
"electron-installer-dmg": "^3.0.0",
"follow-redirects": "^1.14.1",
"follow-redirects": "^1.15.1",
"fs-extra": "^9.1.0",
"gulp": "^4.0.2",
"gulp-concat": "~2.6.1",
Expand Down
10 changes: 9 additions & 1 deletion src/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,14 @@ li.active .ic_data {
background-image: url(../images/icons/cf_icon_data_white.svg);
}

.ic_vtx {
background-image: url(../images/icons/cf_icon_vtx_grey.svg);
}

.ic_vtx:hover {
background-image: url(../images/icons/cf_icon_vtx_white.svg);
}

.ic_cli {
background-image: url(../images/icons/cf_icon_cli_grey.svg);
}
Expand Down Expand Up @@ -1725,7 +1733,7 @@ dialog {

/* fixing padding for all Tabs*/
.tab-setup, .tab-landing, .tab-adjustments, .tab-auxiliary, .tab-cli, .tab-configuration, .tab-failsafe, .tab-firmware_flasher,
.tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver,
.tab-gps, .tab-help, .tab-led-strip, .tab-logging, .tab-modes, .tab-motors, .tab-pid_tuning, .tab-ports, .tab-receiver, .tab-vtx,
.tab-sensors, .tab-servos, .tab-osd, .tab-power {
height: 100%;
position: relative;
Expand Down
Loading

0 comments on commit b4beec1

Please sign in to comment.