mirror of
https://github.com/betaflight/betaflight-configurator.git
synced 2025-07-20 14:55:15 +03:00
Update KISS logo
Thanks Paul! Don't try to open modal if already open Don't assign button if modal already open Changed rates type change warning Max rate independent from deadband New actual rates logo Thanks to @Asizon and @igormedrano
This commit is contained in:
fgiudice98
parent
758ce36dc1
commit
99cecfdba8
6 changed files with 587 additions and 155 deletions
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 192 KiB |
|
|
@ -11,13 +11,22 @@
|
|||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="520"
|
||||
height="120"
|
||||
viewBox="0 0 137.58333 31.75"
|
||||
viewBox="0 0 137.58333 31.750001"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
id="svg88"
|
||||
inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
|
||||
sodipodi:docname="kiss.svg">
|
||||
<defs
|
||||
id="defs2" />
|
||||
id="defs82">
|
||||
<clipPath
|
||||
clipPathUnits="userSpaceOnUse"
|
||||
id="clipPath38">
|
||||
<path
|
||||
d="M 0,595.276 H 841.89 V 0 H 0 Z"
|
||||
id="path36"
|
||||
inkscape:connector-curvature="0" />
|
||||
</clipPath>
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
|
|
@ -25,21 +34,21 @@
|
|||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="1.8307692"
|
||||
inkscape:cx="156.4916"
|
||||
inkscape:cy="-5.5462185"
|
||||
inkscape:zoom="1.625"
|
||||
inkscape:cx="147.38462"
|
||||
inkscape:cy="60"
|
||||
inkscape:document-units="mm"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="false"
|
||||
inkscape:pagecheckerboard="true"
|
||||
units="px"
|
||||
inkscape:pagecheckerboard="true"
|
||||
inkscape:window-width="1366"
|
||||
inkscape:window-height="745"
|
||||
inkscape:window-x="-8"
|
||||
inkscape:window-y="-8"
|
||||
inkscape:window-maximized="1" />
|
||||
<metadata
|
||||
id="metadata5">
|
||||
id="metadata85">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
|
|
@ -54,32 +63,77 @@
|
|||
inkscape:label="Livello 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-265.25)">
|
||||
transform="translate(0,-265.24998)">
|
||||
<g
|
||||
aria-label="KISS"
|
||||
transform="matrix(0.11316463,0,0,0.08777538,-46.578526,266.05819)"
|
||||
style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
|
||||
id="flowRoot815">
|
||||
id="g20"
|
||||
transform="matrix(0.11725134,0,0,-0.11725134,47.975973,272.29314)">
|
||||
<path
|
||||
d="m 786.67742,82.784613 v 72.395827 h 15.88541 l 59.11458,-72.395827 h 41.92709 l -71.74479,86.328117 79.29687,91.40625 h -43.22917 l -65.10416,-76.95312 h -16.14583 v 76.95312 H 752.95346 V 82.784613 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:266.66665649px;font-family:Eurostile;-inkscape-font-specification:Eurostile;text-align:center;text-anchor:middle"
|
||||
id="path832"
|
||||
d="M 0,0 -17.019,-52.378 11.333,-91.4 45.873,14.905 Z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path22"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g24"
|
||||
transform="matrix(0.11725134,0,0,-0.11725134,34.008065,287.13293)">
|
||||
<path
|
||||
d="M 958.55242,82.784613 V 260.51898 H 924.82846 V 82.784613 Z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:266.66665649px;font-family:Eurostile;-inkscape-font-specification:Eurostile;text-align:center;text-anchor:middle"
|
||||
id="path834"
|
||||
d="m 0,0 h -55.073 l -28.35,-39.022 H 28.351 Z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path26"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g28"
|
||||
transform="matrix(0.11725134,0,0,-0.11725134,43.402935,281.98224)">
|
||||
<path
|
||||
d="m 1121.8337,134.60753 h -32.9428 q -0.2604,-2.47396 -0.2604,-3.64584 -1.1718,-14.97395 -6.6406,-18.74999 -5.4687,-3.90625 -25.7812,-3.90625 -23.9584,0 -31.3803,4.42708 -7.2916,4.42708 -7.2916,18.61979 0,16.79687 5.9896,20.18229 5.9895,3.38542 39.5833,5.20833 39.7135,2.21355 51.3021,11.32813 11.7187,9.11458 11.7187,37.89062 0,35.41667 -13.6718,45.83333 -13.6719,10.28646 -60.2865,10.28646 -41.9271,0 -55.72917,-10.15625 -13.67187,-10.15625 -13.67187,-41.14583 l -0.13021,-6.51042 h 32.81245 l 0.1303,3.77604 q 0,18.6198 6.5104,22.78646 6.5104,4.16667 35.5468,4.16667 22.6563,0 28.9063,-4.81771 6.25,-4.81771 6.25,-22.26562 0,-12.89063 -4.8177,-17.05729 -4.6875,-4.29688 -20.4427,-5.20834 l -18.6198,-1.17187 q -42.1875,-2.47396 -53.90626,-11.71875 -11.71875,-9.24479 -11.71875,-39.71354 0,-31.11979 14.0625,-41.406251 14.19271,-10.416666 56.51041,-10.416666 40.1042,0 54.0365,9.505208 13.9323,9.505209 13.9323,37.109369 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:266.66665649px;font-family:Eurostile;-inkscape-font-specification:Eurostile;text-align:center;text-anchor:middle"
|
||||
id="path836"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 1281.7295,134.60753 h -32.9427 q -0.2604,-2.47396 -0.2604,-3.64584 -1.1719,-14.97395 -6.6407,-18.74999 -5.4687,-3.90625 -25.7812,-3.90625 -23.9583,0 -31.3802,4.42708 -7.2917,4.42708 -7.2917,18.61979 0,16.79687 5.9896,20.18229 5.9896,3.38542 39.5833,5.20833 39.7136,2.21355 51.3021,11.32813 11.7188,9.11458 11.7188,37.89062 0,35.41667 -13.6719,45.83333 -13.6719,10.28646 -60.2865,10.28646 -41.927,0 -55.7291,-10.15625 -13.6719,-10.15625 -13.6719,-41.14583 l -0.1302,-6.51042 h 32.8125 l 0.1302,3.77604 q 0,18.6198 6.5104,22.78646 6.5104,4.16667 35.5469,4.16667 22.6562,0 28.9062,-4.81771 6.25,-4.81771 6.25,-22.26562 0,-12.89063 -4.8177,-17.05729 -4.6875,-4.29688 -20.4427,-5.20834 l -18.6198,-1.17187 q -42.1875,-2.47396 -53.9062,-11.71875 -11.7188,-9.24479 -11.7188,-39.71354 0,-31.11979 14.0625,-41.406251 14.1927,-10.416666 56.5104,-10.416666 40.1042,0 54.0365,9.505208 13.9323,9.505209 13.9323,37.109369 z"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:266.66665649px;font-family:Eurostile;-inkscape-font-specification:Eurostile;text-align:center;text-anchor:middle"
|
||||
id="path838"
|
||||
d="m 0,0 -44.556,-32.372 v -48.233 l 90.429,65.7 z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path30"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
transform="matrix(0.11725134,0,0,-0.11725134,19.086682,316.0234)"
|
||||
id="g32">
|
||||
<g
|
||||
id="g34"
|
||||
clip-path="url(#clipPath38)">
|
||||
<g
|
||||
id="g40"
|
||||
transform="translate(331.9009,385.198)">
|
||||
<path
|
||||
d="m 0,0 h 38.714 l -24.65,-76.225 h 0.769 c 5.997,4.433 12.08,12.144 17.914,18.38 L 90.501,0 h 47.945 L 57.531,-74.863 85.766,-175.329 H 40.131 l -18.228,75.43 -20.744,-18.449 -18.198,-56.981 h -38.714 z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path42"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g44"
|
||||
transform="translate(528.5254,384.8386)">
|
||||
<path
|
||||
d="M 0,0 -55.753,-174.753 H -94.979 L -39.226,0 Z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path46"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g48"
|
||||
transform="translate(520.875,250.8645)">
|
||||
<path
|
||||
d="m 0,0 c 8.775,-5.427 23.191,-10.84 39.856,-10.81 17.946,0.035 29.827,7.573 33.465,18.98 3.475,10.891 -2.744,17.099 -21.109,24.581 -25.485,10.063 -39.075,26.106 -30.968,51.525 9.514,29.824 41.322,52.429 82.089,52.504 19.482,0.036 32.598,-3.827 41.363,-8.479 l -18.888,-31.91 c -5.852,3.357 -16.584,8.26 -33.508,8.228 -16.918,-0.031 -27.604,-7.825 -30.497,-16.9 -3.557,-11.149 4.61,-16.06 24.188,-24.579 26.866,-11.355 36.099,-27.41 28.238,-52.042 -9.346,-29.305 -39.676,-54.5 -87.105,-54.586 -19.739,-0.039 -37.491,5.37 -45.493,10.8 z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path50"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
<g
|
||||
id="g52"
|
||||
transform="translate(659.3037,251.1223)">
|
||||
<path
|
||||
d="m 0,0 c 8.771,-5.431 23.191,-10.845 39.853,-10.814 17.949,0.034 29.83,7.573 33.467,18.979 3.476,10.892 -2.743,17.104 -21.108,24.586 -25.485,10.061 -39.075,26.104 -30.968,51.523 9.514,29.824 41.322,52.428 82.085,52.503 19.485,0.037 32.601,-3.827 41.367,-8.478 l -18.889,-31.91 c -5.851,3.357 -16.584,8.259 -33.507,8.227 -16.919,-0.03 -27.604,-7.824 -30.497,-16.899 -3.558,-11.149 4.61,-16.06 24.188,-24.58 26.866,-11.355 36.098,-27.408 28.238,-52.044 -9.346,-29.304 -39.676,-54.495 -87.106,-54.586 -19.739,-0.034 -37.49,5.375 -45.493,10.802 z"
|
||||
style="fill:#110f0d;fill-opacity:1;fill-rule:nonzero;stroke:none"
|
||||
id="path54"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 5.2 KiB After Width: | Height: | Size: 5.4 KiB |
|
|
@ -156,7 +156,13 @@ RateCurve.prototype.rcCommandRawToDegreesPerSecond = function (rcData, rate, rcR
|
|||
var angleRate;
|
||||
|
||||
if (rate !== undefined && rcRate !== undefined && rcExpo !== undefined) {
|
||||
const rcCommandf = this.rcCommand(rcData, 1, deadband) / 500;
|
||||
let rcCommandf = this.rcCommand(rcData, 1, deadband);
|
||||
if (semver.gte(CONFIG.apiVersion, "1.43.0")) {
|
||||
rcCommandf = rcCommandf / (500 - deadband);
|
||||
} else {
|
||||
rcCommandf = rcCommandf / 500;
|
||||
}
|
||||
|
||||
var rcCommandfAbs = Math.abs(rcCommandf);
|
||||
|
||||
switch(TABS.pid_tuning.currentRatesType) {
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ TABS.pid_tuning = {
|
|||
currentProfile: null,
|
||||
currentRateProfile: null,
|
||||
currentRatesType: null,
|
||||
previousRatesType: null,
|
||||
RATES_TYPE: {
|
||||
BETAFLIGHT: 0,
|
||||
RACEFLIGHT: 1,
|
||||
|
|
@ -422,6 +423,7 @@ TABS.pid_tuning.initialize = function (callback) {
|
|||
}
|
||||
|
||||
self.currentRatesType = RC_tuning.rates_type;
|
||||
self.previousRatesType = null;
|
||||
ratesTypeListElement.val(self.currentRatesType);
|
||||
|
||||
self.changeRatesType(self.currentRatesType); // update rate type code when updating the tab
|
||||
|
|
@ -2337,32 +2339,42 @@ TABS.pid_tuning.updatePIDColors = function(clear = false) {
|
|||
TABS.pid_tuning.changeRatesType = function(rateTypeID) {
|
||||
const self = this;
|
||||
const dialogRatesType = $('.dialogRatesType')[0];
|
||||
let sameRatesType = true;
|
||||
|
||||
self.currentRatesType = rateTypeID;
|
||||
if (self.previousRatesType == null) {
|
||||
self.currentRatesType = rateTypeID;
|
||||
self.changeRatesTypeLogo();
|
||||
self.changeRatesSystem(true);
|
||||
self.previousRatesType = self.currentRatesType;
|
||||
return;
|
||||
}
|
||||
|
||||
if (self.currentRatesType !== RC_tuning.rates_type) {
|
||||
sameRatesType = false;
|
||||
if (!dialogRatesType.hasAttribute('open')) {
|
||||
dialogRatesType.showModal();
|
||||
|
||||
$('.dialogRatesType-cancelbtn').click(function() {
|
||||
sameRatesType = true;
|
||||
$('.rates_type select[id="ratesType"]').val(self.currentRatesType);
|
||||
self.previousRatesType = self.currentRatesType;
|
||||
dialogRatesType.close();
|
||||
});
|
||||
|
||||
$('.dialogRatesType-tosavedbtn').click(function() {
|
||||
self.currentRatesType = RC_tuning.rates_type;
|
||||
$('.rates_type select[id="ratesType"]').val(RC_tuning.rates_type);
|
||||
$('.rates_type select[id="ratesType"]').val(self.currentRatesType);
|
||||
self.changeRatesTypeLogo();
|
||||
self.changeRatesSystem(sameRatesType);
|
||||
self.changeRatesSystem(true);
|
||||
self.previousRatesType = self.currentRatesType;
|
||||
dialogRatesType.close();
|
||||
});
|
||||
|
||||
$('.dialogRatesType-confirmbtn').click(function() {
|
||||
self.currentRatesType = rateTypeID;
|
||||
self.changeRatesTypeLogo();
|
||||
self.changeRatesSystem(sameRatesType);
|
||||
self.changeRatesSystem(false);
|
||||
self.previousRatesType = self.currentRatesType;
|
||||
dialogRatesType.close();
|
||||
});
|
||||
} else {
|
||||
self.changeRatesTypeLogo();
|
||||
self.changeRatesSystem(sameRatesType);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
TABS.pid_tuning.changeRatesSystem = function(sameType) {
|
||||
|
|
|
|||
|
|
@ -1509,7 +1509,8 @@
|
|||
</div>
|
||||
<div class="buttons">
|
||||
<a href="#" class="dialogRatesType-confirmbtn regular-button" i18n="dialogRatesTypeConfirm"></a>
|
||||
<a href="#" class="dialogRatesType-cancelbtn regular-button" i18n="dialogRatesTypeCancel"></a>
|
||||
<a href="#" class="dialogRatesType-cancelbtn regular-button" i18n="cancel"></a>
|
||||
<a href="#" class="dialogRatesType-tosavedbtn regular-button" i18n="dialogRatesTypeToSaved"></a>
|
||||
</div>
|
||||
</dialog>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue