Philippe Renon
9229da9c89
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2014-01-16 19:02:39 +01:00
Philippe Renon
b69621ba11
OP-984 fixed jumping PID Tab in stabilization config panel
2014-01-16 19:01:44 +01:00
Corvus Corax
41202a0227
Merge branch 'corvuscorax/OP-1022_AH_improvements_amorale' into next
2014-01-15 22:47:42 +01:00
Philippe Renon
dd32fc6612
Merge remote-tracking branch 'origin/filnet/OP-1122_gcs_waypoint_editor_stabilization' into next
2014-01-15 20:32:04 +01:00
Philippe Renon
694747cd27
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
2014-01-15 20:12:08 +01:00
Philippe Renon
3f66d656ca
OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan
2014-01-15 20:04:54 +01:00
Corvus Corax
eb8d57cf31
uncrustification
2014-01-15 18:47:47 +01:00
Corvus Corax
9997f14d68
Merge remote-tracking branch 'origin/next' into corvuscorax/OP-1022_AH_improvements_amorale
2014-01-15 18:45:09 +01:00
Corvus Corax
92beb54e2d
OP-1022 some small cosmetic fixes for AltitudeHold as suggested by Alessio
2014-01-15 18:43:47 +01:00
Philippe Renon
d43b220dc0
OP-1122 uncrustified gcs and flight
2014-01-14 22:46:01 +01:00
Fredrik Arvidsson
48984a25fd
OP-984 fixed corrupt file.
2014-01-14 21:23:43 +01:00
Philippe Renon
1fca85784c
OP-1122 OP-1145 added more path plan checks :
...
- empty plan (i.e. no waypoints defined)
- out of range waypoint and path action ids
+review OPReview-609
2014-01-14 21:08:40 +01:00
Philippe Renon
8ccdb252d1
OP-1122 OP-1145 commented out PIOS_DEBUGLOG_Printf calls in pathplanner
...
+review OPReview-609
2014-01-14 21:08:35 +01:00
Philippe Renon
c8cb666271
OP-1122 fixed wrong Timeout legend in waypoint editor (was (ms) instead of (s))
...
+review OPReview-609
2014-01-14 21:08:27 +01:00
Philippe Renon
96588ab13e
OP-1122 OP-1145 fixed logging helper as per review
...
+review OPReview-604
2014-01-14 21:05:27 +01:00
Philippe Renon
7f2c24db2b
OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan
...
+review OPReview-609
2014-01-14 21:05:16 +01:00
Fredrik Arvidsson
f639ab30b0
Merge remote-tracking branch 'origin/LesNewell/OP-984_PID_banks' into thread/OP-984_PID_banks_GUI
2014-01-14 20:27:57 +01:00
Les Newell
a6a84a9ef1
Merge branch 'next' into LesNewell/OP-984_PID_banks
...
Conflicts:
flight/modules/Stabilization/stabilization.c
2014-01-14 19:08:32 +00:00
Les Newell
3b0525c4ab
OP-984 Uncrustified
2014-01-14 19:03:42 +00:00
Corvus Corax
07d5c8e4d2
OP-1022 fixed the config plugin widget to represent new simpler settings layout
2014-01-14 00:26:27 +01:00
Corvus Corax
76ee48bc44
OP-1122 safer sanity checks and arming prevention in case of invalid flight plan
2014-01-12 21:37:40 +01:00
Corvus Corax
3d5e27f5f2
OP-1122 fixed simposix so it will compile with new objects
2014-01-12 21:06:41 +01:00
Corvus Corax
cb9e76b006
OP-1122 add flightplan safety check to pathplanner - failsafe rth when flightmode is set to pathplan but no valid plan is uploaded
2014-01-12 21:05:54 +01:00
Corvus Corax
b8118f51e7
OP-1156 Made PathPlanner work with delayed callbacks in "navigation" callback task
...
Conflicts:
flight/modules/PathPlanner/pathplanner.c
2014-01-12 20:13:48 +01:00
Corvus Corax
2ce0cb7909
reverted changes to fixedwingpathfollower - wrong module
2014-01-12 20:13:00 +01:00
Philippe Renon
a64720a9f1
OP-1122 OP-1158 added flight plan CRC consistency checks (in GCS and fixedwingpathfollower module)
...
- need to do the same in vtolpathfollower module)
- addressed an issue that could cause unwanted waypoints to be used (path follower was looping over all instanciated wp)
2014-01-12 19:42:12 +01:00
Philippe Renon
ff8a001a51
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
2014-01-12 16:29:17 +01:00
Philippe Renon
aa24f2193a
OP-1122 OP-1158 renamed FlightPlanInfo uavobject to FlightPlan
2014-01-12 15:23:21 +01:00
Philippe Renon
c8a81f88a4
OP-1122 OP-1158 added facility to update a CRC with uavobject data (flight side)
2014-01-12 15:12:41 +01:00
Philippe Renon
d8d9adb1fd
OP-1122 OP-1158 remove unused flightplan.h (fixes conflict with new FlightPlan uavobject)
2014-01-12 15:10:15 +01:00
Philippe Renon
78fabdd4c3
OP-1122 OP-1158 added facility to update a CRC with uavobject data (ground side)
2014-01-12 15:08:12 +01:00
Fredrik Arvidsson
b43cf9a7fe
OP-984 Commented out some annoying debug prints.
2014-01-11 16:14:12 +01:00
Fredrik Arvidsson
38a709a0da
OP-984 Fixed false dirty indication. Added some constant.
2014-01-11 15:44:07 +01:00
Fredrik Arvidsson
b14c8bd4d2
OP-984 Gui fixes
2014-01-11 15:23:11 +01:00
Corvus Corax
879e29b6cd
OP-1022 Changed altitude (vario) complementary filter to pay more attention to barometer and apply more filtering to accelerometer (needed to compensate vibration noise and errors on flying quads)
2014-01-11 14:12:02 +01:00
Corvus Corax
77d15b9566
Merge branch 'next' into corvuscorax/OP-1022_AH_improvements_amorale
2014-01-11 10:57:31 +01:00
Corvus Corax
f2bc6508c4
uncrustify --- somone forgot to run uncrustify when merging to next -
...
again!!! ;)
2014-01-11 10:55:50 +01:00
Corvus Corax
ca607ad924
OP-1022 overhaul of altitudehold and manualcontrol - cleanup,
...
reimplemented safe throttle cutoff and altitudevario features
2014-01-11 10:51:47 +01:00
Fredrik Arvidsson
92c7e96fc8
Merge remote-tracking branch 'origin/LesNewell/OP-984_PID_banks' into thread/OP-984_PID_banks_GUI
...
Conflicts:
ground/openpilotgcs/src/plugins/config/stabilization.ui
2014-01-11 09:41:36 +01:00
Corvus Corax
4c078f3dd8
Merge branch 'next' into corvuscorax/OP-1022_AH_improvements_amorale
2014-01-11 09:40:34 +01:00
Les Newell
2e030419ca
OP-984 Fixed bad merge of stabilization.c
2014-01-10 22:16:50 +00:00
Les Newell
49cf33ee59
Merge branch 'next' into LesNewell/OP-984_PID_banks
...
Conflicts:
flight/modules/Stabilization/stabilization.c
2014-01-10 19:32:44 +00:00
Les Newell
8eb2eefec7
Merge branch 'LesNewell/OP-984_PID_banks' into next
2014-01-10 15:24:28 +00:00
Alessio Morale
6d3dca6ee3
Merge remote-tracking branch 'origin/theothercliff/OP-1117_multi_wii_horizon_flight_mode_only' into next
2014-01-10 10:43:53 +01:00
Philippe Renon
48aa89d2e7
OP-1122 OP-1120 OPLinkReceiver uavobject had no caterogy defined (is now part of the System category)
2014-01-09 21:48:27 +01:00
Philippe Renon
bcb59a3dca
OP-1122 OP-1120 Added missing FligthPlanInfo uavobject to revoproto/firmware/UAVObjects.inc
2014-01-09 21:46:50 +01:00
Philippe Renon
9c7fcbe47c
[OP-1105] uncrustified
2014-01-09 21:17:44 +01:00
Fredrik Arvidsson
3d8e3eb823
OP-984 Uncrustify.
2014-01-09 19:52:56 +01:00
Fredrik Arvidsson
cd5fb01d7e
Merge remote-tracking branch 'origin/next' into thread/OP-984_PID_banks_GUI
2014-01-09 19:29:53 +01:00
m_thread
41506803e6
OP-984 Some gui fiddling.
2014-01-09 19:00:24 +01:00
