m_thread
7bcdff9f2f
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
2014-09-23 22:30:49 +02:00
Laurent Lalanne
a8f0bb6eb6
OP-1222 Uncrustify
2014-09-16 19:27:18 +02:00
Laurent Lalanne
bc9e6b24f9
Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
Conflicts resolved in artwork, same style as FW branch
2014-09-16 18:55:43 +02:00
Laurent Lalanne
fb4b9b05cd
OP-1491 Artwork fixes + wizard support - work in progress
2014-09-16 00:48:45 +02:00
Stefan Karlsson
09a943f17f
OP-1493 Make Vehicle and TX Wizards work with the discoveryf4bare target
2014-09-15 23:43:58 +02:00
Fredrik Larrson
d91db0af6f
Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next"
...
This reverts commit a39e393274
, reversing
changes made to ebfdaf28b5
.
2014-09-08 02:31:02 +10:00
Fredrik Larrson
a39e393274
Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next
...
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
2014-09-08 01:54:59 +10:00
m_thread
7cd46bdeee
OP-1222 Fixed handling of conflicting configurations. Config is now invalidated if use goes back and make changes introducing conflicts.
...
Added more configuration saving logic.
2014-09-07 13:52:28 +02:00
m_thread
436646d070
OP-1222 Added configuration code for GPS and Airspeed sensors to the hardware settings section.
...
Still some ?? since the Platinum GPS support not yet is merged to this branch.
2014-09-07 10:15:09 +02:00
m_thread
73d1217cc7
OP-1222 Added code to handle port conflicts in configuration.
2014-09-05 17:31:41 +02:00
Corvus Corax
daefab99be
OP-1222 fixed elevon mixer to be consistent with aileron type (no channel reversals needed), made FW wizzard and config widget create the same type of mixer setup
2014-08-31 20:15:36 +02:00
Corvus Corax
3f9fa97d0f
OP-1222 fixed FW elevon wizzard channel assignment to be compatible with config widget
2014-08-31 20:15:20 +02:00
Fredrik Arvidsson
5d928725f1
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
2014-08-29 00:50:08 +02:00
Laurent Lalanne
9857ef56dd
OP-1422 Tricopter_mixers_settings : Uncrustify !
2014-08-27 20:38:04 +02:00
Laurent Lalanne
f313bef2e5
OP-1422 Tricopter_mixers_settings Store mixing / sliders values on board - Wizard/Config tab. Tricopter Yaw mixing now applies to servo, 100% default.
2014-08-27 20:33:11 +02:00
m_thread
b31ee46724
OP-1222 Uncrustify
2014-08-26 22:34:58 +02:00
Laurent Lalanne
0edf70d0aa
OP-1422_Tricopter_mixers_settings : Uncrustify
2014-08-26 19:31:08 +02:00
Laurent Lalanne
94809de9c4
OP-1422_Tricopter_mixers_settings Ternary operator and include qmath.h in cpp
2014-08-26 19:27:05 +02:00
Laurent Lalanne
aea2adf2df
OP-1422 Tricopter_mixers_settings Normalize mixer values saved from Wizard and Config tab. Fix bad values saved previously like -63/64.
2014-08-26 17:07:00 +02:00
Laurent Lalanne
458120cce2
OP-1422 Tricopter_mixers_settings : Do the same calc as Gcs and round values so Wizard set same values as Gcs defaults. Little fix for HexaX wizard that set HexaH frame !
2014-08-26 14:17:24 +02:00
Fredrik Larson
e4a4f35178
Summary to not show unknown ESC type fpr FWs, remane legacy ESC to
...
standard ESC, summary shows "legacy" still for Multis.
Remaining problems appear to be SVG ID related.
2014-08-23 02:00:11 +10:00
Fredrik Larson
18c3f8147a
Start basics of single Aileron type support, here be dragons and some SVG
...
known issues
2014-08-23 01:01:01 +10:00
m_thread
a893f6ff2b
OP-1222 Renamed some pages. Added support for both esc and servo types.
2014-08-22 01:40:05 +02:00
m_thread
a7ab68f539
OP-1222 Fixed a 'off-by-one' bug with channels. Fixed some bugs in the configuration plugin regarding fixed wings.
2014-08-21 23:47:18 +02:00
m_thread
82a3590da5
OP-1222 Fixed a bug with Actuator settings and banks to use for motors.
2014-08-18 13:14:07 +02:00
m_thread
5354723928
OP-1222 Renamed some files.
...
Fixed Wing wizard made only available on Revo
Moved motor for fixed wing to channel 3 since channel 3 got its own timer.
Fixed a crash in config plugin when selecting Fixed Wing.
Added code in outputcalibration in Fixed Wing setup to set min and max values as well as neutral for servos.
Added Controller type Nano.
2014-08-18 01:20:31 +02:00
Fredrik Larson
137a6e4308
Refactor name of legacy servos, remove PID hard coding from the config
...
helper
2014-08-18 03:47:16 +10:00
Fredrik Larson
ea1e95db7b
Minor refactroring of a type in a class, change ESC_TYPE and geter /
...
serter to be actuator type as we are dealing with servos. Add servos to
enum, remove hard coded min / max for now.
2014-08-17 22:55:11 +10:00
Fredrik Larson
501441d3fb
Merge branch 'next' into kf_hayvosh/OP-1222_FW_Wizard_lets_get_this_finished
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
2014-08-16 12:12:15 +10:00
Gasté Olivier
dfb21482f4
DSM protocol improvement
...
added item in DSM protocol in GCS
2014-08-08 13:14:39 +02:00
Laurent Lalanne
d2471361bb
OP-1063 Multi_config_Hexa_fixes : Uncrustify
2014-07-14 15:59:26 +02:00
Laurent Lalanne
c26e33964a
OP-1063 Multi_config_Hexa_fixes Added OctoX, define new mixer table for Octo(p) and OctoX. New motor definition for OctoX (NNE, ENE...) Fixes for svg frames. Defined default settings for OctoP/X in setupwizard (but disabled)
2014-07-13 13:58:18 +02:00
Laurent Lalanne
64eb77ed8b
OP-1063 Multi_config_Hexa_fixes Svg file : Added HexaX_reverse and fixed gradients
...
SetupWizard : Updated Hexa, HexaX and HexaH default values, default
Throttle curve at 90% max
Fixed a previous bug sign in HexaH (and HexaX because previously copied)
: Bug was in M4 Roll and M6 Yaw.
2014-07-13 10:30:45 +02:00
Laurent Lalanne
a46480a99b
OP-1063 Multi_config_Hexa_fixes : Added real HexaX, renamed HexaX > HexaH
...
Added artwork in config and wizard svg. Cleanup on svg connection diagram (layers)
DO NOT USE until mixers are fixed
2014-07-10 06:01:28 +02:00
Kevin Finisterre
58dad5d3a5
Try to set Ilimit Rate... somehow I set Ilimit Attitude instead. Need to sort out. basic idea worked though.
2014-06-12 12:07:03 -04:00
Kevin Finisterre
9aaa764797
work out a method to set some default PIDs... using a setData() call helps!!!
2014-06-12 11:05:46 -04:00
Kevin Finisterre
1bf9f250dc
poor attempt to set some default PIDS? make a note to change the modelview ehre as well.
2014-06-12 02:43:38 -04:00
Kevin Finisterre
1f74a78263
Attempt adding in the proper Mixer setting constructs for Elevon setup.
2014-06-11 14:41:42 -04:00
Kevin Finisterre
28246cccbe
fix remaining headers
2014-06-07 23:04:12 -04:00
Kevin Finisterre
c2c89bf0f5
Merge remote-tracking branch 'origin/next' into thread/OP-1222_Fixed_Wing_Wizard_Support
...
Getting more current code in place.
2014-06-07 21:24:05 -04:00
Kevin Finisterre
4ebaa6f205
set all the min and max values to 554 and 2400 per the Arduino servo library
...
fix some cosmetic errors on the debug output
fix the Vtail mixer setting that caused channel 4 to go crazy due to being undefined. Servo would sit and shake for no reason.
2014-05-25 16:05:13 -04:00
Kevin Finisterre
4d250ff856
Fix channel indexes to use servoCenterSlider
...
Set channelNeutral = 1500 where appropriate for each model type.
Add the missing actuator save for fixed wing! actSettings->setData(data);
2014-05-25 15:20:04 -04:00
Corvus Corax
0509595137
OP-1309 present for Laurent: 3 more Stabilized modes (and a bit of cleanup)
2014-05-03 18:38:45 +02:00
Corvus Corax
33acbc4209
OP-1309 added new thrust mode default to setup wizard
2014-04-26 20:57:39 +02:00
Corvus Corax
599661ba18
OP-1309 UAVObject changes, GCS changes and Makefile changes needed for Stabi refactoring
2014-04-26 15:14:40 +02:00
m_thread
cfff73361b
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
2014-03-20 07:25:20 +01:00
Alessio Morale
e407eb8126
Merge branch 'next' of git://git.openpilot.org/OpenPilot into next
2014-03-09 14:38:17 +01:00
Alessio Morale
0b30b79c98
Merge remote-tracking branch 'origin/amorale/OP-1149_gyro_accel_thermal_calibration' into next
...
Conflicts:
ground/openpilotgcs/src/libs/eigen/Eigen/src/Core/util/Memory.h
ground/openpilotgcs/src/plugins/config/revosensors.ui
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2014-03-09 14:38:08 +01:00
Corvus Corax
82a196b8cf
Merge branch 'next' into corvuscorax/OP-1216_flight-control-refurbishment
2014-03-08 15:52:45 +01:00
m_thread
4209f1d6b5
Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-03-08 10:50:32 +01:00