Laurent Lalanne
ae679d5a04
Fixes in config.pro with original from next
2014-01-18 03:59:56 +01:00
Laurent Lalanne
0b27657dcf
Merge remote-tracking branch 'origin/next' into translations_next
2014-01-18 02:39:06 +01:00
Laurent Lalanne
94f29cdb10
Cruize Control text updated
2014-01-18 01:43:45 +01:00
Corvus Corax
91d5a865da
uncrustification
2014-01-18 00:32:50 +01:00
Laurent Lalanne
96555373e7
Merge remote-tracking branch 'origin/next' into translations_next
2014-01-18 00:03:13 +01:00
Laurent Lalanne
43703dd6d9
Updates about "Windup"
2014-01-18 00:02:00 +01:00
Fredrik Arvidsson
4cc453efb1
Merge branch 'thread/OP-1154_Cruise_Control_automatically_increase_copter_throttle_per' into next
2014-01-17 21:41:07 +01:00
Fredrik Arvidsson
36ebdba29b
Merge branch 'thread/OP-1154_Cruise_Control_automatically_increase_copter_throttle_per' of ssh://git.openpilot.org/OpenPilot into thread/OP-1154_Cruise_Control_automatically_increase_copter_throttle_per
2014-01-17 19:48:46 +01:00
m_thread
83b3a9bf12
OP-1154 Gui Fiddling.
2014-01-17 14:20:18 +01:00
m_thread
234626444e
Merge remote-tracking branch 'origin/next' into thread/OP-1154_Cruise_Control_automatically_increase_copter_throttle_per
2014-01-17 13:16:15 +01:00
m_thread
cc551d4acb
OP-1154 Fixed values from not loading in comboboxes properly.
2014-01-17 11:01:05 +01:00
Fredrik Arvidsson
cee54b6533
OP-984 Fixed a bug related to widget limits loading
2014-01-17 07:22:02 +01:00
Cliff Geerdes
42dda77264
OP-1154 neated up input page, tooltips, labels were cut off, etc.
2014-01-17 01:07:43 -05:00
Fredrik Arvidsson
627da4951b
OP-984 Changed datatype of field CruiseControlFlightModeSwitchPosEnable to enum (TRUE|FALSE) instead of uint8.
...
Now the gui works, but the flight side must be checked for problems.
2014-01-17 01:32:29 +01:00
Fredrik Arvidsson
60465bbd7d
OP-984 Missed something :/
2014-01-17 01:23:17 +01:00
Fredrik Arvidsson
2e2bd096d0
OP-984 Moved Cruise control settings to input config page. Added PID bank settings per flight mode switch position.
...
Field CruiseControlFlightModeSwitchPosEnable needs to be changed to an array of booleans to work with gui.
2014-01-17 01:15:02 +01:00
Laurent Lalanne
a162d885a8
Accentuations missed in capital letters
2014-01-16 23:19:54 +01:00
Cliff Geerdes
bfb5a248a0
OP-1154 enables for individual flight mode switch positions
2014-01-16 16:51:19 -05:00
Laurent Lalanne
e0098b8f54
Updated new strings in Next
2014-01-16 19:59:59 +01:00
Laurent Lalanne
8c4e45a893
Merge remote-tracking branch 'origin/next' into translations_next
2014-01-16 19:18:44 +01:00
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
Les Newell
2b32c5ebc3
Merged theothercliff/OP-1154_Cruise_Control_automatically_increase_copter_throttle_per_1/cos(bank_angle)
...
Changed pid banks to use flight mode switch position instead of FlightStatus.FlightMode
2014-01-15 19:37:13 +00: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
Les Newell
f096d01e3c
Merge branch 'next' into LesNewell/OP-984_PID_banks_flightmode
2014-01-15 19:17:06 +00: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
Cliff Geerdes
e6490c0cea
OP-1154 Add FlightModeSwitchPosition to ManualControlCommand
2014-01-15 13:53:14 -05: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