Steve Evans
a0d6de4e1d
Merge branch 'rel-nano-15.05' into steve/OP-1904_Display_current_TxPID_settings_on_OSD
2015-05-24 13:00:44 +01:00
abeck70
6d68ed66d9
Merge branch 'steve/OP-1905_Fix_broken_telemetry_if_OPLM_in_PPM_only_mode' into abeck/nano-rc3-fixes
2015-05-24 20:44:31 +10:00
abeck70
d8f6a7827e
REVONANO fix velocity mode use of altvario
2015-05-24 20:38:35 +10:00
abeck70
a4cff482b4
REVONANO fix altitudeHoldTask initialisation
2015-05-24 20:38:07 +10:00
abeck70
b89d8813b1
REVONANO Optimise and fix when altvario task is disabled
2015-05-24 20:37:42 +10:00
abeck70
553728ffd8
REVONANO Trial Rate on Yaw during braking instead of AxisLock
2015-05-24 20:36:44 +10:00
abeck70
ba903614c6
REVONANO Improve GPSAssist
...
I decided to not check throttle when re-enabling stabii control. It can feel as though the mode is defective. I would rather someone have immediate always-there ability to overridwe gps hold.
2015-05-24 20:34:28 +10:00
Steve Evans
7e2c27671d
Merge branch 'steve/OP-1905_Fix_broken_telemetry_if_OPLM_in_PPM_only_mode' into steve/OP-1904_Display_current_TxPID_settings_on_OSD
2015-05-24 10:28:47 +01:00
Steve Evans
4f8ffc612f
OP-1905 Fix variable initialisation
2015-05-24 10:24:18 +01:00
Steve Evans
31eae08bba
OP-1905 Fix OPLM in PPM mode blocks telemetry stream if no USB connected
2015-05-24 10:18:54 +01:00
Steve Evans
5a9ee46742
OP-1904 Initial commit
2015-05-23 21:55:19 +01:00
Steve Evans
b2dd03cf23
OP-1903 Add AccelTau, AccelKp and AccelKi to TxPID
2015-05-23 14:00:50 +01:00
abeck70
064a5e831b
OP-1898 VelocityRoam gets its own MaxRollPitch
...
This allows smoother velocityroam flight
2015-05-22 21:23:10 +10:00
abeck70
ee43c53cee
Merge branch 'rel-nano-15.05' into abeck/OP-1898-VR
2015-05-22 18:46:09 +10:00
abeck70
c0c5cd3d16
OP-1464 uncrustify
2015-05-22 18:36:38 +10:00
abeck70
22b2317732
Merge branch 'theothercliff/OP-1464_Handle_Autobaud_code_for_GPS' into rel-nano-15.05
2015-05-22 18:34:17 +10:00
abeck70
55b3b52c4f
OP-1898 VelocityRoam flight mode
...
Replace PositionRoam with VelocityRoam
Make VelocityRoam an explicit flight mode to simplify access
Disable PositionRoam as not supported and not suitable to retain.
2015-05-22 17:34:43 +10:00
Cliff Geerdes
ced0d4725b
OP-1464 Rename things as requested Implement autodisable as advised by Alessio
2015-05-21 04:37:44 -04:00
Cliff Geerdes
55a43d1815
OP-1464 Compile warning discovery Remove AbConfStoreDisable
2015-05-20 01:04:06 -04:00
Cliff Geerdes
244c9e2d5e
Merge branch 'rel-15.05' into theothercliff/OP-1464_Handle_Autobaud_code_for_GPS
2015-05-19 21:57:34 -04:00
Cliff Geerdes
3bbe7274ca
OP-1464 remove commented out or unused code and pretty it up
2015-05-19 21:34:47 -04:00
Cliff Geerdes
1ade8b7f59
OP-1464 remove debug
2015-05-19 20:45:57 -04:00
Cliff Geerdes
de521c9004
OP-1464 tested version with debug still in place
2015-05-19 19:33:31 -04:00
Cliff Geerdes
92295559b0
OP-1464 GPS autobaud - stash while debugging newobject issue
2015-05-18 18:37:53 -04:00
Alessio Morale
3563b1ff0e
REVONANO - Prevent modules to start before init: move most code to pios_initcall.h. System and system-Like modules
2015-05-18 21:29:56 +02:00
Stefan Karlsson
efb6855f6f
REVONANO - Various temp fixes debug code to get nano to read from the flash. Code has been added to make the execution of systemTask wait until initTask has completed.
...
Conflicts:
flight/pios/common/pios_flashfs_objlist.c
2015-05-18 21:29:56 +02:00
Alessio Morale
375f23ff0c
REVONANO - Make debuglog, FlashFS and other bits optional
2015-05-18 18:54:50 +02:00
Laurent Lalanne
3eef68c017
OP-1893 Deadband scale
2015-05-18 16:45:13 +02:00
Alessio Morale
330b396a73
Merge remote-tracking branch 'origin/amorale/OP-1874_notifications_improvements' into HEAD
2015-05-18 10:05:56 +02:00
abeck70
7d603bc6cb
OP-1847 gpsassist fix
...
Set assisted control state to HOLD when Brake controller transitions to HOLD. This impacts throttle stick behavior as it is different during braking and on brake completion in the hold state.
Also cleanuped and removed unused/old code that triggered HOLD in plans.c
2015-05-16 20:33:03 +10:00
abeck70
5d923c4125
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1847-gps-assist-fixes
2015-05-16 19:57:41 +10:00
abeck70
2c3fcd64d1
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1869_Analog_airspeed_scaling
2015-05-14 20:21:40 +10:00
abeck70
f4d1fc13ec
OP-1847 gps assist fixes
...
1. Update vtol vertical pids
2. Reduce deadband on throttle in gpsassist auto throttle to avoid large deviations in throttle change from neutral
3. Reinitialise assisted control state on mode change where the flight is the same but only gpsassist is going from disabled to enabled or enabled to disabled.
2015-05-14 20:07:07 +10:00
Laurent Lalanne
8e8d08c4a1
OP-1869 "scale" lower case
2015-05-13 21:55:18 +02:00
Steve Evans
1771d347bb
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge
2015-05-13 20:36:06 +01:00
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
