From dedc9ef2014beffd5f4d9a74508087049c042801 Mon Sep 17 00:00:00 2001 From: Peter Hall <33176108+IamPete1@users.noreply.github.com> Date: Tue, 3 Oct 2023 01:48:21 +0100 Subject: [PATCH] GCSViews: ConfigurationView: Motor test: use JSON file to add more infromation (#3043) * Include `APMotorLayout.json` in build * GCSViews: ConfigurationView: Motor test: use JSON file to add more infromation --------- Co-authored-by: Michael Oborne --- APMotorLayout.json | 2815 +++++++++++++++++ ExtLibs/Xamarin/Xamarin/files.resx | 3 + .../ConfigMotorTest.Designer.cs | 46 +- GCSViews/ConfigurationView/ConfigMotorTest.cs | 157 +- .../ConfigurationView/ConfigMotorTest.resx | 80 +- .../ConfigRawParams.Designer.cs | 64 +- .../ConfigurationView/ConfigRawParams.resx | 2 +- MissionPlanner.csproj | 3 + MissionPlannerCore.csproj | 3 + MissionPlannerLib.csproj | 3 + 10 files changed, 3080 insertions(+), 96 deletions(-) create mode 100644 APMotorLayout.json diff --git a/APMotorLayout.json b/APMotorLayout.json new file mode 100644 index 0000000000..95ef1cae0d --- /dev/null +++ b/APMotorLayout.json @@ -0,0 +1,2815 @@ +{ + "Version": "AP_Motors library test ver 1.1", + "layouts": [ + { + "Class": 1, + "ClassName": "QUAD", + "Type": 0, + "TypeName": "PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 2, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 3, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 1, + "TypeName": "X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 2, + "TypeName": "V", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 3, + "TypeName": "H", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 3, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 6, + "TypeName": "PLUSREV", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 2, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 3, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 12, + "TypeName": "BF_X", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 2, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 13, + "TypeName": "DJI_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 14, + "TypeName": "CW_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 16, + "TypeName": "NYT_PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "?", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 2, + "TestOrder": 4, + "Rotation": "?", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 3, + "TestOrder": 1, + "Rotation": "?", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "?", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 17, + "TypeName": "NYT_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "?", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 3, + "Rotation": "?", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 4, + "Rotation": "?", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 2, + "Rotation": "?", + "Roll": -0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 1, + "ClassName": "QUAD", + "Type": 18, + "TypeName": "X_REV", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 2, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 2, + "ClassName": "HEXA", + "Type": 0, + "TypeName": "PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.2500 + }, + { + "Number": 4, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 5, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2500 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.2500 + } + ] + }, + { + "Class": 2, + "ClassName": "HEXA", + "Type": 1, + "TypeName": "X", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 2, + "ClassName": "HEXA", + "Type": 3, + "TypeName": "H", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.0000 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.0000 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 2, + "ClassName": "HEXA", + "Type": 13, + "TypeName": "DJI_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + } + ] + }, + { + "Class": 2, + "ClassName": "HEXA", + "Type": 14, + "TypeName": "CW_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 0, + "TypeName": "PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.3535, + "Pitch": 0.3535 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.3535, + "Pitch": -0.3535 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.3535, + "Pitch": 0.3535 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.3535, + "Pitch": -0.3535 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 8, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 1, + "TypeName": "X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.2071, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.2071, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2071 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.2071, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.2071, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.2071 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2071 + }, + { + "Number": 8, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.2071 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 2, + "TypeName": "V", + "motors": [ + { + "Number": 1, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.4150, + "Pitch": 0.1700 + }, + { + "Number": 2, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.3350, + "Pitch": -0.1600 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.3350, + "Pitch": -0.1600 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.4150, + "Pitch": 0.1700 + }, + { + "Number": 7, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 8, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 3, + "TypeName": "H", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 3, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.1665 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.1665 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.1665 + }, + { + "Number": 8, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.1665 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 13, + "TypeName": "DJI_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.2071, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.2071, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2071 + }, + { + "Number": 4, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.2071 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.2071, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.2071, + "Pitch": -0.5000 + }, + { + "Number": 7, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.2071 + }, + { + "Number": 8, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2071 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 14, + "TypeName": "CW_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.2071, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2071 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.2071 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.2071, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.2071, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.2071 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2071 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.2071, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 3, + "ClassName": "OCTA", + "Type": 15, + "TypeName": "I", + "motors": [ + { + "Number": 1, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.1665, + "Pitch": -0.5000 + }, + { + "Number": 2, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.1665, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.1665, + "Pitch": 0.5000 + }, + { + "Number": 5, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.1665, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 0, + "TypeName": "PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 8, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 1, + "TypeName": "X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 2, + "TypeName": "V", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 3, + "TypeName": "H", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 12, + "TypeName": "BF_X", + "motors": [ + { + "Number": 1, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 2, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 5, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 14, + "TypeName": "CW_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 4, + "ClassName": "OCTAQUAD", + "Type": 18, + "TypeName": "X_REV", + "motors": [ + { + "Number": 1, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 2, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.5000 + }, + { + "Number": 5, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.5000 + }, + { + "Number": 7, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 0, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 1, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 2, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 3, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 6, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 7, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 8, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 9, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 10, + "TypeName": "Y6B", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2500 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2500 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 11, + "TypeName": "Y6F", + "motors": [ + { + "Number": 1, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 2, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 3, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2500 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2500 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 12, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 13, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 14, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 15, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 16, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 17, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 5, + "ClassName": "Y6", + "Type": 18, + "TypeName": "default", + "motors": [ + { + "Number": 1, + "TestOrder": 2, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 2, + "TestOrder": 5, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 3, + "TestOrder": 6, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2498 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 5, + "TestOrder": 1, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2498 + }, + { + "Number": 6, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + } + ] + }, + { + "Class": 12, + "ClassName": "DODECAHEXA", + "Type": 0, + "TypeName": "PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.2500 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.2500 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.2500 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 9, + "TestOrder": 9, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.2500 + }, + { + "Number": 10, + "TestOrder": 10, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.2500 + }, + { + "Number": 11, + "TestOrder": 11, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": 0.2500 + }, + { + "Number": 12, + "TestOrder": 12, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.2500 + } + ] + }, + { + "Class": 12, + "ClassName": "DODECAHEXA", + "Type": 1, + "TypeName": "X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.2500, + "Pitch": 0.5000 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": -0.2500, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": -0.2500, + "Pitch": -0.5000 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": -0.5000 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CCW", + "Roll": 0.2500, + "Pitch": -0.5000 + }, + { + "Number": 9, + "TestOrder": 9, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 10, + "TestOrder": 10, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 11, + "TestOrder": 11, + "Rotation": "CW", + "Roll": 0.2500, + "Pitch": 0.5000 + }, + { + "Number": 12, + "TestOrder": 12, + "Rotation": "CCW", + "Roll": 0.2500, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 14, + "ClassName": "DECA", + "Type": 0, + "TypeName": "PLUS", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.0000, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.3090, + "Pitch": 0.4045 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": 0.1545 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.5000, + "Pitch": -0.1545 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": -0.3090, + "Pitch": -0.4045 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.0000, + "Pitch": -0.5000 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.3090, + "Pitch": -0.4045 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.1545 + }, + { + "Number": 9, + "TestOrder": 9, + "Rotation": "CCW", + "Roll": 0.5000, + "Pitch": 0.1545 + }, + { + "Number": 10, + "TestOrder": 10, + "Rotation": "CW", + "Roll": 0.3090, + "Pitch": 0.4045 + } + ] + }, + { + "Class": 14, + "ClassName": "DECA", + "Type": 1, + "TypeName": "X/CW_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.1545, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.4045, + "Pitch": 0.3090 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.4045, + "Pitch": -0.3090 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": -0.1545, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.1545, + "Pitch": -0.5000 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.4045, + "Pitch": -0.3090 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 9, + "TestOrder": 9, + "Rotation": "CCW", + "Roll": 0.4045, + "Pitch": 0.3090 + }, + { + "Number": 10, + "TestOrder": 10, + "Rotation": "CW", + "Roll": 0.1545, + "Pitch": 0.5000 + } + ] + }, + { + "Class": 14, + "ClassName": "DECA", + "Type": 14, + "TypeName": "X/CW_X", + "motors": [ + { + "Number": 1, + "TestOrder": 1, + "Rotation": "CCW", + "Roll": -0.1545, + "Pitch": 0.5000 + }, + { + "Number": 2, + "TestOrder": 2, + "Rotation": "CW", + "Roll": -0.4045, + "Pitch": 0.3090 + }, + { + "Number": 3, + "TestOrder": 3, + "Rotation": "CCW", + "Roll": -0.5000, + "Pitch": -0.0000 + }, + { + "Number": 4, + "TestOrder": 4, + "Rotation": "CW", + "Roll": -0.4045, + "Pitch": -0.3090 + }, + { + "Number": 5, + "TestOrder": 5, + "Rotation": "CCW", + "Roll": -0.1545, + "Pitch": -0.5000 + }, + { + "Number": 6, + "TestOrder": 6, + "Rotation": "CW", + "Roll": 0.1545, + "Pitch": -0.5000 + }, + { + "Number": 7, + "TestOrder": 7, + "Rotation": "CCW", + "Roll": 0.4045, + "Pitch": -0.3090 + }, + { + "Number": 8, + "TestOrder": 8, + "Rotation": "CW", + "Roll": 0.5000, + "Pitch": -0.0000 + }, + { + "Number": 9, + "TestOrder": 9, + "Rotation": "CCW", + "Roll": 0.4045, + "Pitch": 0.3090 + }, + { + "Number": 10, + "TestOrder": 10, + "Rotation": "CW", + "Roll": 0.1545, + "Pitch": 0.5000 + } + ] + } + ] +} diff --git a/ExtLibs/Xamarin/Xamarin/files.resx b/ExtLibs/Xamarin/Xamarin/files.resx index f6370ef9b3..ac002b1edb 100644 --- a/ExtLibs/Xamarin/Xamarin/files.resx +++ b/ExtLibs/Xamarin/Xamarin/files.resx @@ -145,6 +145,9 @@ ..\..\..\FirmwareHistory.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + ..\..\..\APMotorLayout.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + ..\..\..\HighContrast.mpsystheme;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 diff --git a/GCSViews/ConfigurationView/ConfigMotorTest.Designer.cs b/GCSViews/ConfigurationView/ConfigMotorTest.Designer.cs index 9d62363086..1000ca17c3 100644 --- a/GCSViews/ConfigurationView/ConfigMotorTest.Designer.cs +++ b/GCSViews/ConfigurationView/ConfigMotorTest.Designer.cs @@ -36,10 +36,12 @@ private void InitializeComponent() this.NUM_duration = new System.Windows.Forms.NumericUpDown(); this.label3 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.but_mot_spin_arm = new MissionPlanner.Controls.MyButton(); - this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); this.but_mot_spin_min = new MissionPlanner.Controls.MyButton(); + this.label4 = new System.Windows.Forms.Label(); + this.but_mot_spin_arm = new MissionPlanner.Controls.MyButton(); + this.FrameClass = new System.Windows.Forms.Label(); + this.FrameType = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.NUM_thr_percent)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.NUM_duration)).BeginInit(); this.groupBox1.SuspendLayout(); @@ -100,6 +102,8 @@ private void InitializeComponent() // groupBox1 // resources.ApplyResources(this.groupBox1, "groupBox1"); + this.groupBox1.Controls.Add(this.FrameType); + this.groupBox1.Controls.Add(this.FrameClass); this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.but_mot_spin_min); this.groupBox1.Controls.Add(this.label4); @@ -113,18 +117,6 @@ private void InitializeComponent() this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // - // but_mot_spin_arm - // - resources.ApplyResources(this.but_mot_spin_arm, "but_mot_spin_arm"); - this.but_mot_spin_arm.Name = "but_mot_spin_arm"; - this.but_mot_spin_arm.UseVisualStyleBackColor = true; - this.but_mot_spin_arm.Click += new System.EventHandler(this.but_mot_spin_arm_Click); - // - // label4 - // - resources.ApplyResources(this.label4, "label4"); - this.label4.Name = "label4"; - // // label5 // resources.ApplyResources(this.label5, "label5"); @@ -134,9 +126,33 @@ private void InitializeComponent() // resources.ApplyResources(this.but_mot_spin_min, "but_mot_spin_min"); this.but_mot_spin_min.Name = "but_mot_spin_min"; + this.but_mot_spin_min.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); this.but_mot_spin_min.UseVisualStyleBackColor = true; this.but_mot_spin_min.Click += new System.EventHandler(this.but_mot_spin_min_Click); // + // label4 + // + resources.ApplyResources(this.label4, "label4"); + this.label4.Name = "label4"; + // + // but_mot_spin_arm + // + resources.ApplyResources(this.but_mot_spin_arm, "but_mot_spin_arm"); + this.but_mot_spin_arm.Name = "but_mot_spin_arm"; + this.but_mot_spin_arm.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); + this.but_mot_spin_arm.UseVisualStyleBackColor = true; + this.but_mot_spin_arm.Click += new System.EventHandler(this.but_mot_spin_arm_Click); + // + // FrameClass + // + resources.ApplyResources(this.FrameClass, "FrameClass"); + this.FrameClass.Name = "FrameClass"; + // + // FrameType + // + resources.ApplyResources(this.FrameType, "FrameType"); + this.FrameType.Name = "FrameType"; + // // ConfigMotorTest // resources.ApplyResources(this, "$this"); @@ -164,5 +180,7 @@ private void InitializeComponent() private System.Windows.Forms.Label label5; private Controls.MyButton but_mot_spin_min; private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label FrameType; + private System.Windows.Forms.Label FrameClass; } } diff --git a/GCSViews/ConfigurationView/ConfigMotorTest.cs b/GCSViews/ConfigurationView/ConfigMotorTest.cs index 133fd06000..ed4e206c98 100644 --- a/GCSViews/ConfigurationView/ConfigMotorTest.cs +++ b/GCSViews/ConfigurationView/ConfigMotorTest.cs @@ -1,9 +1,12 @@ using MissionPlanner.Controls; -using MissionPlanner.HIL; +using MissionPlanner.Utilities; using System; using System.Diagnostics; using System.Drawing; using System.Windows.Forms; +using System.Reflection; +using Newtonsoft.Json; +using System.IO; namespace MissionPlanner.GCSViews.ConfigurationView { @@ -14,31 +17,35 @@ public ConfigMotorTest() InitializeComponent(); } - /* -#if (FRAME_CONFIG == QUAD_FRAME) - MAV_TYPE_QUADROTOR, -#elif (FRAME_CONFIG == TRI_FRAME) - MAV_TYPE_TRICOPTER, -#elif (FRAME_CONFIG == HEXA_FRAME || FRAME_CONFIG == Y6_FRAME) - MAV_TYPE_HEXAROTOR, -#elif (FRAME_CONFIG == OCTA_FRAME || FRAME_CONFIG == OCTA_QUAD_FRAME) - MAV_TYPE_OCTOROTOR, -#elif (FRAME_CONFIG == HELI_FRAME) - MAV_TYPE_HELICOPTER, -#elif (FRAME_CONFIG == SINGLE_FRAME) //because mavlink did not define a singlecopter, we use a rocket - MAV_TYPE_ROCKET, -#elif (FRAME_CONFIG == COAX_FRAME) //because mavlink did not define a singlecopter, we use a rocket - MAV_TYPE_ROCKET, -#else - #error Unrecognised frame type -#endif*/ + private int motormax = 0; + + private struct _motors + { + public int Number { get; set; } + public int TestOrder { get; set; } + public string Rotation { get; set; } + public float Roll { get; set; } + public float Pitch { get; set; } + } + struct _layouts + { + public int Class { get; set; } + public int Type { get; set; } + public _motors[] motors { get; set; } + } + private struct JSON_motors + { + public string Version { get; set; } + public _layouts[] layouts { get; set; } + } + private _layouts motor_layout; public void Activate() { - var x = 20; - var y = 40; + var x = 6; + var y = 75; - var motormax = this.get_motormax(); + motormax = this.get_motormax(); MyButton but; for (var a = 1; a <= motormax; a++) @@ -51,6 +58,25 @@ public void Activate() groupBox1.Controls.Add(but); + if (motor_layout.motors != null) + { + foreach (var motor in motor_layout.motors) + { + if (motor.TestOrder == a) + { + var lab = new Label(); + lab.Text += "Motor Number: " + motor.Number; + if (motor.Rotation != "?") + { + lab.Text += ", " + motor.Rotation; + } + lab.Location = new Point(x + 85, y + 5); + lab.Width = 150; + groupBox1.Controls.Add(lab); + } + } + } + y += 25; } @@ -99,8 +125,16 @@ private int get_motormax() return motormax; } + if (set_frame_class_and_type("FRAME_CLASS", "FRAME_TYPE") || + set_frame_class_and_type("Q_FRAME_CLASS", "Q_FRAME_TYPE")) + { + if (motor_layout.motors != null) + { + return motor_layout.motors.Length; + } + } + MAVLink.MAV_TYPE type = MAVLink.MAV_TYPE.QUADROTOR; - int frame_type = 0; // + frame if (MainV2.comPort.MAV.param.ContainsKey("Q_FRAME_CLASS")) { @@ -127,44 +161,31 @@ private int get_motormax() break; } - frame_type = (int)MainV2.comPort.MAV.param["Q_FRAME_TYPE"].Value; } else if (MainV2.comPort.MAV.param.ContainsKey("FRAME")) { type = MainV2.comPort.MAV.aptype; - frame_type = (int)MainV2.comPort.MAV.param["FRAME"].Value; } else if (MainV2.comPort.MAV.param.ContainsKey("FRAME_TYPE")) { type = MainV2.comPort.MAV.aptype; - frame_type = (int)MainV2.comPort.MAV.param["FRAME_TYPE"].Value; } - var motors = new Motor[0]; - if (type == MAVLink.MAV_TYPE.TRICOPTER) { motormax = 4; - - motors = Motor.build_motors(MAVLink.MAV_TYPE.TRICOPTER, frame_type); } else if (type == MAVLink.MAV_TYPE.QUADROTOR) { motormax = 4; - - motors = Motor.build_motors(MAVLink.MAV_TYPE.QUADROTOR, frame_type); } else if (type == MAVLink.MAV_TYPE.HEXAROTOR) { motormax = 6; - - motors = Motor.build_motors(MAVLink.MAV_TYPE.HEXAROTOR, frame_type); } else if (type == MAVLink.MAV_TYPE.OCTOROTOR) { motormax = 8; - - motors = Motor.build_motors(MAVLink.MAV_TYPE.OCTOROTOR, frame_type); } else if (type == MAVLink.MAV_TYPE.HELICOPTER) { @@ -178,12 +199,72 @@ private int get_motormax() return motormax; } + private bool set_frame_class_and_type(string class_param_name, string type_param_name) + { + if (!MainV2.comPort.MAV.param.ContainsKey(class_param_name) || !MainV2.comPort.MAV.param.ContainsKey(type_param_name)) + { + return false; + } + var frame_class = (int)MainV2.comPort.MAV.param[class_param_name].Value; + var class_list = ParameterMetaDataRepository.GetParameterOptionsInt(class_param_name, MainV2.comPort.MAV.cs.firmware.ToString()); + foreach (var item in class_list) + { + if (item.Key == Convert.ToInt32(frame_class)) + { + FrameClass.Text = "Class: " + item.Value; + break; + } + } + + var frame_type = (int)MainV2.comPort.MAV.param[type_param_name].Value; + var type_list = ParameterMetaDataRepository.GetParameterOptionsInt(type_param_name, MainV2.comPort.MAV.cs.firmware.ToString()); + foreach (var item in type_list) + { + if (item.Key == Convert.ToInt32(frame_type)) + { + FrameType.Text = "Type: " + item.Value; + break; + } + } + + lookup_frame_layout(frame_class, frame_type); + + return true; + } + + + private void lookup_frame_layout(int frame_class, int frame_type) + { + try + { + string file = Path.GetDirectoryName(Path.GetFullPath(Assembly.GetExecutingAssembly().Location)) + Path.DirectorySeparatorChar + "APMotorLayout.json"; + using (StreamReader r = new StreamReader(file)) + { + string json = r.ReadToEnd(); + var all_layouts = JsonConvert.DeserializeObject(json); + if (all_layouts.Version == "AP_Motors library test ver 1.1") + { + foreach (var layout in all_layouts.layouts) + { + if ((layout.Class == frame_class) && (layout.Type == frame_type)) + { + motor_layout = layout; + break; + } + } + } + } + } + catch + { + } + } + private void but_TestAll(object sender, EventArgs e) { int speed = (int)NUM_thr_percent.Value; int time = (int)NUM_duration.Value; - int motormax = this.get_motormax(); for (int i = 1; i <= motormax; i++) { testMotor(i, speed, time); @@ -192,7 +273,6 @@ private void but_TestAll(object sender, EventArgs e) private void but_TestAllSeq(object sender, EventArgs e) { - int motormax = this.get_motormax(); int speed = (int)NUM_thr_percent.Value; int time = (int)NUM_duration.Value; @@ -201,7 +281,6 @@ private void but_TestAllSeq(object sender, EventArgs e) private void but_StopAll(object sender, EventArgs e) { - int motormax = this.get_motormax(); for (int i = 1; i <= motormax; i++) { testMotor(i, 0, 0); diff --git a/GCSViews/ConfigurationView/ConfigMotorTest.resx b/GCSViews/ConfigurationView/ConfigMotorTest.resx index 779abc7f6d..8eaea061d2 100644 --- a/GCSViews/ConfigurationView/ConfigMotorTest.resx +++ b/GCSViews/ConfigurationView/ConfigMotorTest.resx @@ -138,7 +138,7 @@ groupBox1 - 6 + 8 True @@ -165,7 +165,7 @@ groupBox1 - 4 + 6 True @@ -195,7 +195,7 @@ starting at the front right. groupBox1 - 8 + 10 True @@ -223,7 +223,7 @@ scroll to the bottom of the page groupBox1 - 9 + 11 201, 14 @@ -244,7 +244,7 @@ scroll to the bottom of the page groupBox1 - 7 + 9 True @@ -271,7 +271,7 @@ scroll to the bottom of the page groupBox1 - 5 + 7 @@ -280,6 +280,66 @@ scroll to the bottom of the page True + + True + + + NoControl + + + 129, 45 + + + 81, 13 + + + 11 + + + Type: unknown + + + FrameType + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + True + + + NoControl + + + 6, 45 + + + 82, 13 + + + 10 + + + Class: unknown + + + FrameClass + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + NoControl @@ -305,7 +365,7 @@ scroll to the bottom of the page groupBox1 - 0 + 2 NoControl @@ -332,7 +392,7 @@ scroll to the bottom of the page groupBox1 - 1 + 3 NoControl @@ -359,7 +419,7 @@ scroll to the bottom of the page groupBox1 - 2 + 4 282, 11 @@ -383,7 +443,7 @@ scroll to the bottom of the page groupBox1 - 3 + 5 0, 0 diff --git a/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs b/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs index 5d723b5ab4..0d82831325 100644 --- a/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs +++ b/GCSViews/ConfigurationView/ConfigRawParams.Designer.cs @@ -54,8 +54,6 @@ private void InitializeComponent() this.chk_none_default = new System.Windows.Forms.CheckBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.treeView1 = new System.Windows.Forms.TreeView(); - this.but_collapse = new MissionPlanner.Controls.MyButton(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.Params = new MissionPlanner.Controls.MyDataGridView(); this.Command = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Value = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -64,12 +62,14 @@ private void InitializeComponent() this.Options = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Desc = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Fav = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.but_collapse = new MissionPlanner.Controls.MyButton(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.Params)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // BUT_compare @@ -209,34 +209,6 @@ private void InitializeComponent() this.treeView1.Name = "treeView1"; this.treeView1.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterSelect); // - // but_collapse - // - resources.ApplyResources(this.but_collapse, "but_collapse"); - this.but_collapse.Name = "but_collapse"; - this.but_collapse.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); - this.but_collapse.UseVisualStyleBackColor = true; - this.but_collapse.Click += new System.EventHandler(this.but_collapse_Click); - // - // tableLayoutPanel1 - // - resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); - this.tableLayoutPanel1.Controls.Add(this.label2, 0, 11); - this.tableLayoutPanel1.Controls.Add(this.BUT_refreshTable, 0, 16); - this.tableLayoutPanel1.Controls.Add(this.chk_none_default, 0, 14); - this.tableLayoutPanel1.Controls.Add(this.txt_search, 0, 12); - this.tableLayoutPanel1.Controls.Add(this.BUT_load, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.BUT_save, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.BUT_rerequestparams, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.BUT_commitToFlash, 0, 6); - this.tableLayoutPanel1.Controls.Add(this.BUT_writePIDS, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.BUT_reset_params, 0, 10); - this.tableLayoutPanel1.Controls.Add(this.BUT_compare, 0, 5); - this.tableLayoutPanel1.Controls.Add(this.BUT_paramfileload, 0, 9); - this.tableLayoutPanel1.Controls.Add(this.label1, 0, 7); - this.tableLayoutPanel1.Controls.Add(this.CMB_paramfiles, 0, 8); - this.tableLayoutPanel1.Controls.Add(this.chk_modified, 0, 13); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - // // Params // this.Params.AllowUserToAddRows = false; @@ -337,6 +309,34 @@ private void InitializeComponent() this.Fav.Name = "Fav"; this.Fav.Resizable = System.Windows.Forms.DataGridViewTriState.True; // + // but_collapse + // + resources.ApplyResources(this.but_collapse, "but_collapse"); + this.but_collapse.Name = "but_collapse"; + this.but_collapse.TextColorNotEnabled = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(87)))), ((int)(((byte)(4))))); + this.but_collapse.UseVisualStyleBackColor = true; + this.but_collapse.Click += new System.EventHandler(this.but_collapse_Click); + // + // tableLayoutPanel1 + // + resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1"); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 11); + this.tableLayoutPanel1.Controls.Add(this.BUT_refreshTable, 0, 16); + this.tableLayoutPanel1.Controls.Add(this.chk_none_default, 0, 14); + this.tableLayoutPanel1.Controls.Add(this.txt_search, 0, 12); + this.tableLayoutPanel1.Controls.Add(this.BUT_load, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.BUT_save, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.BUT_rerequestparams, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.BUT_commitToFlash, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.BUT_writePIDS, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.BUT_reset_params, 0, 10); + this.tableLayoutPanel1.Controls.Add(this.BUT_compare, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.BUT_paramfileload, 0, 9); + this.tableLayoutPanel1.Controls.Add(this.label1, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.CMB_paramfiles, 0, 8); + this.tableLayoutPanel1.Controls.Add(this.chk_modified, 0, 13); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + // // ConfigRawParams // this.Controls.Add(this.splitContainer1); @@ -347,9 +347,9 @@ private void InitializeComponent() this.splitContainer1.Panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.Params)).EndInit(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.Params)).EndInit(); this.ResumeLayout(false); } diff --git a/GCSViews/ConfigurationView/ConfigRawParams.resx b/GCSViews/ConfigurationView/ConfigRawParams.resx index 8104d0eb8d..e4b71f35f8 100644 --- a/GCSViews/ConfigurationView/ConfigRawParams.resx +++ b/GCSViews/ConfigurationView/ConfigRawParams.resx @@ -298,7 +298,7 @@ 73 - All Units are in raw + All Units are in raw format with no scaling diff --git a/MissionPlanner.csproj b/MissionPlanner.csproj index 3b248214d3..e1eeb616d6 100644 --- a/MissionPlanner.csproj +++ b/MissionPlanner.csproj @@ -4919,6 +4919,9 @@ Always + + Always + Always diff --git a/MissionPlannerCore.csproj b/MissionPlannerCore.csproj index 07d5ddac91..f4609ddd32 100644 --- a/MissionPlannerCore.csproj +++ b/MissionPlannerCore.csproj @@ -410,5 +410,8 @@ Always + + Always + \ No newline at end of file diff --git a/MissionPlannerLib.csproj b/MissionPlannerLib.csproj index 3564e7f6ed..d03f4109fc 100644 --- a/MissionPlannerLib.csproj +++ b/MissionPlannerLib.csproj @@ -654,6 +654,9 @@ Always + + Always + \ No newline at end of file