diff --git a/content/configuration.css b/content/configuration.css index 0c2c75d..a1f48d9 100755 --- a/content/configuration.css +++ b/content/configuration.css @@ -96,4 +96,8 @@ height: 20px; bottom:25px; padding: 0px; +} +#BoardRotation { + width: 72px; + height: 22px; } \ No newline at end of file diff --git a/content/configuration.html b/content/configuration.html index ea73ac6..9875eec 100755 --- a/content/configuration.html +++ b/content/configuration.html @@ -42,7 +42,12 @@
OneShot 125
OneShot 42
3D Mode
-
FC Rotated by 180°
+
FC Rotation
diff --git a/content/configuration.js b/content/configuration.js index 10b50e2..aa10bf6 100755 --- a/content/configuration.js +++ b/content/configuration.js @@ -148,7 +148,6 @@ CONTENT.configuration.initialize = function(callback) { validateBounds('#content input[type="text"]'); var settingsFilled = 0; - $("#SAC").on('click', function() { document.getElementById('AC').style.visibility = "visible"; document.getElementById('SAC').style.display = "none"; @@ -162,7 +161,7 @@ CONTENT.configuration.initialize = function(callback) { } else { $('#version').text((data['ver'] / 100)); $('input[name="3dMode"]').removeAttr("disabled"); - $('input[name="orientation"]').removeAttr("disabled"); + $('select[name="BoardRotation"]').removeAttr("disabled"); } if (data['ver'] > 101) { @@ -260,8 +259,8 @@ CONTENT.configuration.initialize = function(callback) { contentChange(); }); $('input[name="oneShot"]').prop('checked', data['ESConeshot125']); - $('input[name="orientation"]').prop('checked', data['ori180deg']); - $('input[name="orientation"]').on('click', function() { + $('select[name="BoardRotation"]').val(data['BoardRotation']); + $('select[name="BoardRotation"]').on('change', function() { contentChange(); }); @@ -462,8 +461,8 @@ CONTENT.configuration.initialize = function(callback) { data['Active3DMode'] = parseInt($('input[name="3dMode"]').prop('checked') ? 1 : 0); data['Active3DMode'] = parseInt($('input[name="3dMode"]').prop('checked') ? 1 : 0); data['failsaveseconds'] = parseInt($('input[name="failsaveseconds"]').val()); - data['ori180deg'] = parseInt($('input[name="orientation"]').prop('checked') ? 1 : 0); - + data['BoardRotation'] = parseInt($('select[name="BoardRotation"]').val()); + // pid and rates // roll data['G_P'][0] = parseFloat($('tr.roll input').eq(0).val()); diff --git a/content/welcome.html b/content/welcome.html index b292c8d..8a48a3f 100755 --- a/content/welcome.html +++ b/content/welcome.html @@ -1,6 +1,6 @@
-

KISS Flight Control GUI v1.09

+

KISS Flight Control GUI v1.10


Please connect the KISS FC to your Computer and select the COM port above.

diff --git a/js/protocol.js b/js/protocol.js index 8bf1c6a..cf3bdf8 100755 --- a/js/protocol.js +++ b/js/protocol.js @@ -343,7 +343,7 @@ kissProtocol.processPacket = function (code, obj) { obj.ESConeshot42 = data.getUint8(99); obj.failsaveseconds = data.getUint8(100); if(obj.ver > 100){ - obj.ori180deg = data.getUint8(101); + obj.BoardRotation = data.getUint8(101); obj.isActive = data.getUint8(102); if(!obj.actKey) obj.actKey = 0; } @@ -450,7 +450,7 @@ kissProtocol.preparePacket = function (code) { if(obj.ver > 100){ data.setUint16(88, obj.actKey>>16,0); data.setUint16(90, (obj.actKey&0xFFFF),0); - data.setUint8(92, obj.ori180deg,0); + data.setUint8(92, obj.BoardRotation,0); } if(obj.ver > 101){ data.setUint8(93, obj.CustomTPAInfluence); diff --git a/manifest.json b/manifest.json index eed7cf7..b7f4236 100755 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "minimum_chrome_version": "38", - "version": "1.0.9", + "version": "1.0.10", "author": "Flyduino & Alexander Fedorov", "name": "KissFC",