From 9a1a43186ab4b7cebdc53c2f892d153af4cb1239 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Fri, 23 May 2014 09:15:24 +0200 Subject: [PATCH] OP-1351 attempt at using a QToolbox for the calibration steps UI (wip to get early feedback) --- .../src/plugins/config/revosensors.ui | 703 ++++++++++-------- 1 file changed, 412 insertions(+), 291 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/revosensors.ui b/ground/openpilotgcs/src/plugins/config/revosensors.ui index df97a4e77..a78216010 100644 --- a/ground/openpilotgcs/src/plugins/config/revosensors.ui +++ b/ground/openpilotgcs/src/plugins/config/revosensors.ui @@ -47,25 +47,16 @@ - - 9 - 0 0 - - 0 - - - 0 - - + 0 0 @@ -91,291 +82,415 @@ - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Step 3: Gyro bias calibration + + + + + + 0 + 0 + - - - - - false - - - - 0 - 0 - - - - Start - - - - - - - - 300 - 0 - - - - - 16777215 - 16777215 - - - - 0 - - - true - - - - + + 3 + + + 6 + + + + + 0 + 0 + 691 + 41 + + + + + 0 + 0 + + + + Accelerometer / magnetometer + + + + + + false + + + + 0 + 0 + + + + Launch accelerometer range and bias calibration. + + + Calibrate Accel + + + + + + + false + + + + 0 + 0 + + + + Launch magnetometer range and bias calibration. + + + Calibrate Mag + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + false + + + + 0 + 0 + + + + Save settings (only enabled when calibration is running) + + + Save Position + + + + + + + + + 0 + 0 + 691 + 41 + + + + + 0 + 0 + + + + Board level + + + + + + false + + + + 0 + 0 + + + + Start + + + + + + + + 0 + 0 + + + + 0 + + + true + + + + + + + false + + + + 0 + 0 + + + + Save Position + + + + + + + + + 0 + 0 + 691 + 41 + + + + + 0 + 0 + + + + Gyro bias + + + + + + false + + + + 0 + 0 + + + + Start + + + + + + + + 0 + 0 + + + + + 300 + 0 + + + + + 16777215 + 16777215 + + + + 0 + + + true + + + + + + + + + 0 + 0 + 477 + 71 + + + + + 0 + 0 + + + + Thermal + + + + + + + + false + + + + 0 + 0 + + + + Start + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + 0 + + + true + + + + + + + false + + + + 0 + 0 + + + + End + + + + + + + false + + + + 0 + 0 + + + + Cancel + + + + + + + + + 12 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 50 + false + + + + <temperature> + + + + + + + + 0 + 0 + + + + <temperature gradient> + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + - - - - Step 1: Accelerometer / magnetometer calibration - - - - - - false - - - Launch accelerometer range and bias calibration. - - - Calibrate Accel - - - - - - - false - - - Launch magnetometer range and bias calibration. - - - Calibrate Mag - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - Save settings (only enabled when calibration is running) - - - Save Position - - - - - - - - - - Step 4: Thermal calibration - - - - - - - - false - - - Start - - - - - - - - 300 - 0 - - - - - 16777215 - 16777215 - - - - 0 - - - true - - - - - - - false - - - End - - - - - - - false - - - Cancel - - - - - - - - - 12 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 50 - false - - - - <temperature> - - - - - - - - 0 - 0 - - - - <temperature gradient> - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Step 2: Board level calibration - - - - - - false - - - Start - - - - - - - 0 - - - true - - - - - - - false - - - Save Position - - - - - - - + + + + 0 + 0 + + 10 @@ -416,6 +531,12 @@ p, li { white-space: pre-wrap; } + + + 0 + 0 + + Calibration instructions