1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Commit Graph

1053 Commits

Author SHA1 Message Date
Steve Evans
fd00cd8210 Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames 2015-05-13 20:29:54 +01:00
abeck70
525aabe54c uncrustify flight gps updates 2015-05-13 17:36:52 +10:00
abeck70
858354391d Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-12 22:07:21 +10:00
abeck70
794605b3d9 OP-1848 altvario fixes
1. CC compile fix
2. on reinit calculate a new thrustdemand after which gyro updates will retrigger subsequent calcs
2015-05-12 22:02:03 +10:00
abeck70
8d2f4722d7 OP-1848 altvario improvements
1. Disable velocity pid loop when altvario is not active
2. Add sanity boundf to ensure max min are inforced.
2015-05-12 17:40:28 +10:00
Cliff Geerdes
f1ec9dea33 Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features 2015-05-12 01:25:45 -04:00
abeck70
43ec464737 OP-1848 altvario improvements
1. Avoid neutral thrust calcs in altvario typically used in forward flight
2. Capture stick state for debugging into altitudeholdstatus
2015-05-10 19:05:36 +10:00
abeck70
0ef6779701 OP-1848 altvario tidyup of NE controllers in pathfollower
Change ILimit variable name to Beta in multiple PID loops that now use pid2 implementation.
Change velocity controller yaw from axislock to rate.
2015-05-09 23:03:53 +10:00
abeck70
d6123c018d Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-09 14:31:57 +10:00
abeck70
7fd08ef990 OP-1858 takeoff in nav address code review comments 2015-05-08 22:04:44 +10:00
abeck70
4ccdc46311 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff 2015-05-08 21:48:34 +10:00
Steve Evans
6e6b8c8bad Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge 2015-05-08 07:43:16 +01:00
Steve Evans
8689b2d0ca OP-1803 Don't report error codes as % 2015-05-08 07:38:55 +01:00
abeck70
ddefd11b7f Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-07 11:28:24 +10:00
Cliff Geerdes
193911ba20 OP-1840 another merge conflict 2015-05-05 23:26:08 -04:00
abeck70
143f09d216 Merge remote-tracking branch 'origin/rel-15.02.02' into next
Conflicts:
	flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
Cliff Geerdes
d9ab9e4f27 Merge branch 'next' into theothercliff/OP-1840_GPS_serial_port_needed_features
Conflicts:
	flight/modules/GPS/GPS.c
2015-05-05 17:05:11 -04:00
abeck70
593cf18c5c OP-1848 altvario Update dT to speed on sensor update rate 2015-05-05 22:49:39 +10:00
abeck70
0c77d8a21d OP-1848 altvario
Speed up velocity control loop to original speed
2015-05-05 22:39:15 +10:00
abeck70
72b0d053ef Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff 2015-05-05 21:53:26 +10:00
abeck70
dd1c6c7600 OP-1848 build fixes after merge with ratetrainer 2015-05-05 21:52:04 +10:00
abeck70
43d193cceb OP-1848 altvario merge fixes with ratetrainer 2015-05-05 21:48:04 +10:00
abeck70
5bffc73b17 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
Conflicts:
	flight/modules/Stabilization/outerloop.c
2015-05-05 21:47:19 +10:00
abeck70
16cc9f1512 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1858-autotakeoff 2015-05-04 21:15:24 +10:00
abeck70
5ca9d979e6 OP-1858 if previous mode was autotakeoff, ignore wp start position and go from current position. 2015-05-04 21:14:54 +10:00
abeck70
2ec40072ab OP-1863 ratetrainer fix coding error. ratetrainer should now work. 2015-05-04 17:36:04 +10:00
abeck70
c3c80d4aa8 OP-1848 altvario fix build issue for CC 2015-05-04 08:58:07 +10:00
abeck70
a9ad3c5ec1 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-04 08:42:54 +10:00
abeck70
d4561e9cd8 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch 2015-05-04 08:41:12 +10:00
abeck70
ca03092fb4 OP-1863 ratetrainer update stab handler to support new outerloop directwithlimits mode 2015-05-04 08:40:06 +10:00
Alessio Morale
9dcd6990d3 OP-1874 - Add notification for Critical alarms, add Attitude, modify alarm repetition rates.
reduce rate for Magnetometer, Receiver. Include Attitude.
2015-05-03 23:13:53 +02:00
Alessio Morale
c227686854 uncrustify 2015-05-02 20:27:28 +02:00
RS2K
2fca0b1d9b OP-1835 - Motor Constraints for 15.02.02 - Quick fix to disable clipping. Bit of code not in the original fix I had to deal with. 2015-05-02 13:11:40 -05:00
RS2K
57d062ff67 OP-1835 - Motor Constraints for 15.02.02
OP-1835 - Motor Constraints for 15.02.02
2015-05-02 12:55:43 -05:00
Philippe Renon
9a312ef115 uncrustified 2015-05-02 16:46:35 +02:00
Philippe Renon
b4b93bee93 Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next 2015-05-02 16:34:15 +02:00
abeck70
b479bd5436 OP-1848 altvario TxPID support 2015-05-02 23:57:18 +10:00
abeck70
21c54c3a37 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario 2015-05-01 22:59:36 +10:00
abeck70
b4d727db98 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1863-rate-maxpitch 2015-05-01 21:53:35 +10:00
Laurent Lalanne
11e83bd0e8 OP-1869 Analog Airspeed sensor : Allow scale (voltage divider), change alpha/LowPassFilter behavior 2015-05-01 13:00:36 +02:00
m_thread
c4c60c897b Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2015-05-01 09:53:35 +02:00
m_thread
b8653d44da Merge branch 'thread/OP-1837_SRXL_Cleanup' into next 2015-05-01 09:46:32 +02:00
Cliff Geerdes
dad8f40c4d OP-1840 Remove reference to unreleased hardware 2015-05-01 02:49:15 -04:00
Cliff Geerdes
c365bd3032 OP-1840 Removed unused debug .h and update comments 2015-05-01 02:46:38 -04:00
abeck70
0eb84cd8f6 OP-1867 pathplanner autoland
Setup land with descent rate set from flight mode settings.
2015-04-30 22:54:38 +10:00
Cliff Geerdes
f331ca0daf OP-1840 CC3D wouldn't build and update some comments 2015-04-30 01:27:19 -04:00
Cliff Geerdes
48bea16ab9 OP-1840 GPS serial improvements initial coding 2015-04-29 23:46:47 -04:00
abeck70
d6de7803e1 OP-1858 autotakeoff pathplanner fixes 2015-04-29 20:27:30 +10:00
abeck70
09e2c6f00e OP-1863 RateTrainer
Initial commit for code review
2015-04-28 21:54:58 +10:00
abeck70
b14a966088 OP-1858 autotakeoff and pathplanner
1. Allow arming in pathplanner
2. Typo in comment
2015-04-28 20:54:44 +10:00
abeck70
210b15db4d OP-1858 autotakeoff in pathplanner
1. Allowing arming in pathplanner
2. Takeoff activation requires throttle to be above 30%
3. Takeoff occurs at the current/actual position and rises vertical to the settings altititude.
4. The details of the takeoff waypoint are effectively ignored - this is a simplicifcation to avoid having to have pathplanner inject a flyvector command from the current location to the waypoint
5. We hard code the condition check for autotakeoff as only one mode is supported.
2015-04-27 23:01:47 +10:00
samguns
09a00f8990 Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS 2015-04-27 11:56:25 +08:00
Richard von Lehe
d22b96d24b OP-1740: Force latest Pathfollower changes to use uavobj enums. 2015-04-26 17:46:49 -05:00
Richard von Lehe
f3611591e0 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
Conflicts:
	flight/modules/PathFollower/inc/vtollandcontroller.h
	flight/modules/PathFollower/vtollandcontroller.cpp
	flight/modules/PathFollower/vtollandfsm.cpp
2015-04-26 17:45:36 -05:00
m_thread
b0b1a42aec OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +02:00
Steve Evans
7445add280 OP-1849 Hooks all in place for CDC line state changes to drive port GPIO for DTR 2015-04-26 03:05:47 +01:00
abeck70
e36ab50040 OP-1838 altvario
Fixes and tidyup.

TODO:
1. Fix UI for sliders
2. Disable vtol tuning on stabi input
3. Altitude loss feedback
2015-04-23 22:49:12 +10:00
abeck70
0d77cd95d9 OP-1848 altvari0
1. build fixes
2. Updated ui to use updated uavo names in altitude settings that align to the naming in vtol settings
3. Moved call the thrust altvario to pre application of PIDs for 3d axes to allow for later coupling.
2015-04-23 21:13:00 +10:00
abeck70
d469a754bf OP-1848 ready for review
AltVario:
1. Uses new PID scheme
2. Runs at the outer loop rate to save CPU cycles
2015-04-23 15:51:09 +10:00
abeck70
955f314541 OP-1848 altvario rewrite - initial checkin
TODO: 1) update uavos 2) check dT
2015-04-23 15:46:47 +10:00
Steve Evans
79339d677f Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_update_minimosd_via_usb 2015-04-21 07:44:50 +01:00
Alessio Morale
ab36dcbdee Merge remote-tracking branch 'origin/rel-15.02.02' into next 2015-04-20 14:54:07 +02:00
Alessio Morale
6176f7a1d7 Uncrustify 2015-04-20 14:52:13 +02:00
Alessio Morale
2571db4d96 Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next 2015-04-20 14:29:16 +02:00
Alessio Morale
19bb4d8016 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2015-04-20 12:10:31 +02:00
Alessio Morale
118a0ec66f Merge remote-tracking branch 'origin/amorale/OP-1802_throttle_fake_pos_vel' into next 2015-04-20 12:10:08 +02:00
abeck70
f68e1144ca OP-1760 fix compile issue for CC 2015-04-20 20:09:27 +10:00
Alessio Morale
9103b4de92 Merge remote-tracking branch 'origin/rodney/OP-1834_disable_piro_comp_in_self_level_modes' into next 2015-04-20 11:58:51 +02:00
Alessio Morale
107f807c92 Merge remote-tracking branch 'origin/rodney/OP-1794_dump_axis_lock_accumulators_on_low_throttle' into next 2015-04-20 11:52:35 +02:00
Alessio Morale
e12a595826 OP-1802 - (missing) change from review 2015-04-20 11:38:38 +02:00
Alessio Morale
6c22ed3b69 OP-1802 - Changes from review 2015-04-20 11:35:40 +02:00
abeck70
d943f5a0ce OP-1760 autotakeoff
On landing stausvtolland state of DISARMED, armhandler  now detects this and disarms by force equivalent to a pathplanner alarm trigger.

To re-arm, one must leave the land flight mode.
2015-04-20 08:43:57 +10:00
abeck70
3a0c36f7d7 OP-1760 autotakeoff
Add sanity checks to protect from waypoint looping inpath planner.

If takeoff initiated and thrust > vtol_min, enter position hold, reflect copletion in pathstatus, and pathplanner will move to next waypoint in a very short period of time.
2015-04-19 18:46:40 +10:00
abeck70
b96379cf78 OP-1760 landing fixes : avoid false positives on ground detection from accel vibration
Viper found that a badly mounted FC can trigger ground detection.
2015-04-19 18:18:14 +10:00
abeck70
1e9bd43871 Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed 2015-04-19 17:52:35 +10:00
Alessio Morale
5c76c0ee07 Merge remote-tracking branch 'origin/steve/OP-1289_two_telemetry_streams' into next
Conflicts:
	flight/modules/Telemetry/telemetry.c
2015-04-18 19:10:13 +02:00
abeck70
c4aa17a04c OP-1760 autotakeoff pathplanner now uses pathstatus in conditionLegRemaining 2015-04-17 23:06:02 +10:00
abeck70
eebbfcea64 OP-1760 autotakeoff - enable positional control pathplanner landing to fly to final waypoint during landing 2015-04-17 22:58:53 +10:00
abeck70
88b0c99087 OP-1760 autotakeoff in pathplaner: control to start location instead of end location in NE 2015-04-17 22:44:05 +10:00
abeck70
55cbc2cd9b OP-1760 autotakeoff - simplify pathplanner data input requirements to trigger autotakeoff 2015-04-17 22:21:08 +10:00
abeck70
db0dc0e552 OP-1760 indicate completion of takeoff when disarmed
This can be detected in pathplanner.
2015-04-17 21:26:24 +10:00
abeck70
04c42bd316 OP-1760 autotakeoff
1. Make autotakeoff height configurable
2. Fix the pidcontroldown transfer to solve the rough transition between pid controllers for landing, takeoff, braking etc.
2015-04-16 21:22:37 +10:00
abeck70
a8c6a19784 OP-1760 code review fixes 2015-04-15 08:39:13 +10:00
Rodney Grainger
aa9ed6a62a OP-1843 - uncrustify 2015-04-14 22:00:11 +12:00
Rodney Grainger
115b206032 OP-1834 - Disable pirouette compensation in self level modes 2015-04-14 21:55:57 +12:00
Richard von Lehe
1ac4c63fa7 OP-1740: UAVObjects use enums 2015-04-12 22:05:05 -05:00
Rich von Lehe
782944bfb1 OP-1740: uavobj use enums: clean up errors 2015-04-12 16:20:09 -05:00
abeck70
a52969a76b OP-1760 Autotakeoff
Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696
2015-04-12 21:39:31 +10:00
Rich von Lehe
e6de41855b OP-1740: GetSet use enums: Getting more files to conform to using enums instead of uint8_t... 2015-04-11 15:43:04 -05:00
Steve Evans
d2a69b2d44 OP-1803 Merge OP-1289 Only create local telemetry queues/tasks if needed 2015-04-11 13:32:45 +01:00
Steve Evans
32a25e7044 OP-1289 Only create local telemetry queues/tasks if needed 2015-04-11 12:58:14 +01:00
Richard von Lehe
b3a7a89dca OP-1740: GetSet functions take enum: Fix remaining compile errors in PathFollower and Airspeed modules. 2015-04-09 20:04:44 -05:00
Richard von Lehe
4c5cebf5c6 OP-1740 UAV0 GetSet Functions Take Enum: getting codebase to compile - multiple changes needed, still incomplete (i.e. this commit will not compile, but I want to save my changes on more than just my machine :-) 2015-04-08 21:40:15 -05:00
Alessio Morale
c452ecf180 OP-1820 - fix some now unneded mess in PiOS_Sensor 2015-04-05 16:10:10 +02:00
Rodney Grainger
e81e9c03cb OP-1794 - Uncrustify 2015-04-05 17:27:43 +12:00
Rodney Grainger
34401d645b OP-1794 Dump Axis Lock accumulators when throttle is low.
For multi-rotors, the system should prevent the wind up of the AxisLock accumulators when the throttle is low.
With the current firmware, a multi-rotor using Axis Lock will flip upon takeoff if the vehicle is moved, or left for a long period, prior to arming.
2015-04-05 16:41:58 +12:00
Laurent Lalanne
2350acb068 OP-1814 Add ResetConsumedEnergy option to flight side 2015-04-04 22:34:22 +02:00
Alessio Morale
ee19ff893e OP-1820 - Add mag orientation parameter in hmc configuration 2015-04-03 20:40:52 +02:00
Werner Backes
e42c6e4265 Fixed PathPlanner's 3D mode for the case of non-custom crafts. 2015-04-03 16:32:33 +02:00
Steve Evans
2843715432 Merge branch 'steve/OP-1289_two_telemetry_streams' into steve/OP-1803_s.bus_dropped_frames
Update with taskinfo update
2015-04-03 12:46:12 +01:00