From 4d959d7b93abd0be6c7f46fbe0ccdfffd8854f9e Mon Sep 17 00:00:00 2001 From: "Austin St. Aubin" Date: Tue, 29 Sep 2015 23:36:07 -0500 Subject: [PATCH 1/5] Edits for adding Roll, Pitch, and Heading to Setup Page --- _locales/en/messages.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 91e33056..b793f5b2 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -372,8 +372,8 @@ "initialSetupModel": { "message": "Model: $1" }, - "initialSetupHeading": { - "message": "Heading: $1 deg" + "initialSetupAttitude": { + "message": "$1 deg" }, "initialSetupAccelCalibStarted": { "message": "Accelerometer calibration started" @@ -426,7 +426,7 @@ "configurationFeaturesHelp": { "message": "Note: Not all combinations of features are valid. When the flight controller firmware detects invalid feature combinations conflicting features will be disabled.
Note: Configure serial ports before enabling the features that will use the ports." }, - + "configurationSerialRXHelp": { "message": "Note: Rememer to configure a Serial Port (via Ports tab) and choose a Serial Receiver Provider when using RX_SERIAL feature." }, @@ -460,7 +460,7 @@ }, "configurationDisarmKillSwitch": { "message": "Disarm motors regardless of throttle value (When arming via AUX channel)" - }, + }, "configurationThrottleMinimum": { "message": "Minimum Throttle" }, @@ -509,7 +509,7 @@ "configurationLoopTime": { "message": "Flight Controller Loop Time" }, - "configurationCalculatedCyclesSec": { + "configurationCalculatedCyclesSec": { "message": "Cycles/Sec (Hz)" }, "configurationLoopTimeHelp": { From 53f99760c7272a9545fb3744eb55871f146b5472 Mon Sep 17 00:00:00 2001 From: "Austin St. Aubin" Date: Tue, 29 Sep 2015 23:37:53 -0500 Subject: [PATCH 2/5] Formatting changes to add Roll, Pitch & Heading --- tabs/setup.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tabs/setup.html b/tabs/setup.html index 9168ebf7..837a7859 100644 --- a/tabs/setup.html +++ b/tabs/setup.html @@ -25,7 +25,13 @@
- +
+
+
Heading:
 
+
Pitch:
 
+
Roll:
 
+
+
From f62cf8defb68554d1536ee5fe00f47aac2c66bd7 Mon Sep 17 00:00:00 2001 From: "Austin St. Aubin" Date: Tue, 29 Sep 2015 23:38:23 -0500 Subject: [PATCH 3/5] Code edit to add Roll, Pitch & Heading --- tabs/setup.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tabs/setup.js b/tabs/setup.js index 875d1a47..5602d79d 100644 --- a/tabs/setup.js +++ b/tabs/setup.js @@ -47,8 +47,13 @@ TABS.setup.initialize = function (callback) { // initialize 3D self.initialize3D(); + // set roll in interactive block + $('span.roll').text(chrome.i18n.getMessage('initialSetupAttitude', [0])); + // set pitch in interactive block + $('span.pitch').text(chrome.i18n.getMessage('initialSetupAttitude', [0])); // set heading in interactive block - $('span.heading').text(chrome.i18n.getMessage('initialSetupheading', [0])); + $('span.heading').text(chrome.i18n.getMessage('initialSetupAttitude', [0])); + // check if we have magnetometer if (!bit_check(CONFIG.activeSensors, 2)) { @@ -151,7 +156,9 @@ TABS.setup.initialize = function (callback) { gpsSats_e = $('.gpsSats'), gpsLat_e = $('.gpsLat'), gpsLon_e = $('.gpsLon'), - heading_e = $('span.heading'); + roll_e = $('dd.roll'), + pitch_e = $('dd.pitch'), + heading_e = $('dd.heading'); function get_slow_data() { MSP.send_message(MSP_codes.MSP_STATUS); @@ -175,7 +182,9 @@ TABS.setup.initialize = function (callback) { function get_fast_data() { MSP.send_message(MSP_codes.MSP_ATTITUDE, false, false, function () { - heading_e.text(chrome.i18n.getMessage('initialSetupheading', [SENSOR_DATA.kinematics[2]])); + roll_e.text(chrome.i18n.getMessage('initialSetupAttitude', [SENSOR_DATA.kinematics[0]])); + pitch_e.text(chrome.i18n.getMessage('initialSetupAttitude', [SENSOR_DATA.kinematics[1]])); + heading_e.text(chrome.i18n.getMessage('initialSetupAttitude', [SENSOR_DATA.kinematics[2]])); self.render3D(); self.updateInstruments(); }); From cf3d8ae798a03b26268129726ba28d55b74fa4fb Mon Sep 17 00:00:00 2001 From: "Austin St. Aubin" Date: Tue, 29 Sep 2015 23:40:12 -0500 Subject: [PATCH 4/5] Formatting changes to add Roll, Pitch, and Heading to Setup Tab --- tabs/setup.css | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tabs/setup.css b/tabs/setup.css index f5b3fc64..81a7fbfc 100644 --- a/tabs/setup.css +++ b/tabs/setup.css @@ -68,12 +68,23 @@ border: 1px solid silver; background-color: white; } -.tab-setup #interactive_block .heading { +.tab-setup #interactive_block .attitude { float: right; - height: 15px; + margin: 10px 10px 0px 0px +} - margin: 10px 10px 0 0; - font-weight: bold; +.tab-setup #interactive_block .attitude dt { + float: left; + width: 64px; + font-weight: 700; + text-align: right +} + +.tab-setup #interactive_block .attitude dd { + display: block; + margin-left: 64px; + width: 64px; + text-align: right } .tab-setup #interactive_block a.reset { position: absolute; From eeb45e63df492987db99d4493c2da7b0ac890b86 Mon Sep 17 00:00:00 2001 From: "Austin St. Aubin" Date: Tue, 29 Sep 2015 23:45:53 -0500 Subject: [PATCH 5/5] Formatting Fixes --- _locales/en/messages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index b793f5b2..1ad53f05 100755 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -426,7 +426,7 @@ "configurationFeaturesHelp": { "message": "Note: Not all combinations of features are valid. When the flight controller firmware detects invalid feature combinations conflicting features will be disabled.
Note: Configure serial ports before enabling the features that will use the ports." }, - + "configurationSerialRXHelp": { "message": "Note: Rememer to configure a Serial Port (via Ports tab) and choose a Serial Receiver Provider when using RX_SERIAL feature." }, @@ -460,7 +460,7 @@ }, "configurationDisarmKillSwitch": { "message": "Disarm motors regardless of throttle value (When arming via AUX channel)" - }, + }, "configurationThrottleMinimum": { "message": "Minimum Throttle" }, @@ -509,7 +509,7 @@ "configurationLoopTime": { "message": "Flight Controller Loop Time" }, - "configurationCalculatedCyclesSec": { + "configurationCalculatedCyclesSec": { "message": "Cycles/Sec (Hz)" }, "configurationLoopTimeHelp": {