Lorenz Meier
|
154f14e747
|
Merged master into power_enforce
|
2014-06-30 00:50:38 +02:00 |
|
Lorenz Meier
|
28a31708f9
|
Merged estimator fixes and mavlink rate config bits
|
2014-06-30 00:46:29 +02:00 |
|
Don Gagne
|
2448e2adbc
|
More tab fixes
|
2014-06-29 13:55:55 -07:00 |
|
Don Gagne
|
d5b5dcef24
|
Fix bugs found through compiler warnings
|
2014-06-29 12:01:43 -07:00 |
|
Julian Oes
|
b8d07532a7
|
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
|
2014-06-27 14:41:19 +02:00 |
|
Julian Oes
|
cc8f7f4c97
|
Merge branch 'master' into navigator_rewrite
Conflicts:
src/modules/commander/commander.cpp
src/modules/commander/state_machine_helper.h
src/modules/mavlink/mavlink_messages.cpp
|
2014-06-27 14:39:36 +02:00 |
|
Julian Oes
|
19fad94a34
|
Merge branch 'navigator_rewrite' into navigator_rewrite_estimator
|
2014-06-27 11:02:47 +02:00 |
|
Lorenz Meier
|
0fe8ed509a
|
Merge branch 'master' into power_enforce
|
2014-06-26 17:28:01 +02:00 |
|
Lorenz Meier
|
547f71d791
|
Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed
|
2014-06-26 12:09:54 +02:00 |
|
Anton Babushkin
|
bdf1b9274c
|
commander: modes fallback and reject messages fixed
|
2014-06-25 17:56:11 +02:00 |
|
Lorenz Meier
|
f318ee2194
|
Remove debug output in commander spamming console
|
2014-06-22 18:15:15 +02:00 |
|
Julian Oes
|
62faa2ee51
|
commander/navigator: renamed FS modes to RTL and RTGS (return to ground station)
|
2014-06-19 10:26:56 +02:00 |
|
Julian Oes
|
e24925c743
|
commander: added some failsafe logic
|
2014-06-18 19:01:41 +02:00 |
|
Anton Babushkin
|
55e5f747de
|
commander: modes display fixes, don't activate failsafe while disarmed
|
2014-06-17 13:19:50 +02:00 |
|
Anton Babushkin
|
e0ed0625f8
|
commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions
|
2014-06-16 17:34:21 +02:00 |
|
Julian Oes
|
d48a8bc073
|
navigator: renamed the different RTL states
|
2014-06-12 19:09:18 +02:00 |
|
Julian Oes
|
94c4fc56aa
|
navigator: audio messages about what is happening, RTL during mission not triggered but after mission
|
2014-06-06 23:08:11 +02:00 |
|
Julian Oes
|
d1d03c34b9
|
Merge remote-tracking branch 'px4/master' into navigator_rewrite
Conflicts:
src/modules/navigator/navigator_main.cpp
|
2014-06-03 16:04:39 +02:00 |
|
Thomas Gubler
|
480c41d835
|
do not read out home position in gcs (home position is still displayed)
|
2014-06-01 13:18:56 +02:00 |
|
Julian Oes
|
c8903b1672
|
commander: modes and RC loss working now
|
2014-05-27 23:24:01 +02:00 |
|
Julian Oes
|
ed6c2a5168
|
commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP)
|
2014-05-27 21:56:32 +02:00 |
|
Julian Oes
|
063caba36b
|
Merge branch 'master' into navigator_rewrite
Conflicts:
src/drivers/gps/gps.cpp
src/drivers/gps/mtk.cpp
src/modules/commander/commander.cpp
src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
src/modules/navigator/mission.cpp
src/modules/navigator/mission.h
src/modules/navigator/navigator_main.cpp
src/modules/navigator/navigator_state.h
src/modules/position_estimator_inav/position_estimator_inav_main.c
|
2014-05-26 20:19:11 +02:00 |
|
Lorenz Meier
|
064329dd09
|
commander: put circuit breaker into effect
|
2014-05-25 20:34:32 +02:00 |
|
Lorenz Meier
|
c7bf00562d
|
commander: Enforce (in presence of power sensing) that a) system is not purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail
|
2014-05-25 08:22:54 +02:00 |
|
Lorenz Meier
|
a359a1b940
|
Fixed audio output to provide decent user feedback
|
2014-05-23 15:02:24 +02:00 |
|
Lorenz Meier
|
5f752cdb7c
|
commander: Better audio indications on arming reject reasons
|
2014-05-23 13:41:48 +02:00 |
|
Lorenz Meier
|
639d86eab2
|
Merge pull request #979 from PX4/acro2
ACRO mode
|
2014-05-20 08:36:49 -07:00 |
|
Lorenz Meier
|
4fdc016308
|
Merge pull request #970 from PX4/flow_no_gps
Allow POSCTL with only PX4FLOW (without GPS)
|
2014-05-20 08:35:42 -07:00 |
|
Anton Babushkin
|
559bfbb11c
|
commander: allow disarm in ACRO mode
|
2014-05-20 16:42:11 +02:00 |
|
Anton Babushkin
|
b12928548c
|
Merge branch 'master' into acro2
|
2014-05-20 00:03:00 +02:00 |
|
Anton Babushkin
|
32ae2dd1d0
|
commander: missed 'break' in 'switch' added
|
2014-05-17 11:00:14 +02:00 |
|
Anton Babushkin
|
692e8f84a9
|
commander: don't require good EPH for local_position_valid, position_estimator_inav: estimate EPH/EPV and publish it in local position topic
|
2014-05-16 22:12:07 +02:00 |
|
Lorenz Meier
|
1e13b5a02c
|
commander: Reduce calibration count, minimally reduce stack sizes after careful inspection
|
2014-05-15 09:02:31 +02:00 |
|
Lorenz Meier
|
8dc0a21a7e
|
mavlink, commander: Get back close to original stack sizes. Although tests came clean, we do not want to take any chances
|
2014-05-15 07:14:58 +02:00 |
|
Lorenz Meier
|
531ba79e55
|
Reduce commander stack size mildly
|
2014-05-14 19:34:37 +02:00 |
|
Thomas Gubler
|
7c75f61863
|
Merge remote-tracking branch 'upstream/master' into manualcontrolrename
Conflicts:
src/modules/commander/commander.cpp
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/uORB/topics/manual_control_setpoint.h
|
2014-05-12 09:39:52 +02:00 |
|
Thomas Gubler
|
cde4c9addb
|
commander: use new manual control setpoint variable names
|
2014-05-12 09:21:39 +02:00 |
|
Lorenz Meier
|
dd04a70afa
|
Reporting cleanup, use different variables for different state switching results to avoid being tripped on local / global name scope
|
2014-05-11 18:10:02 +02:00 |
|
Anton Babushkin
|
349809f535
|
sensors, commander: code style fixed
|
2014-05-11 13:36:51 +02:00 |
|
Anton Babushkin
|
88b18bbad1
|
ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL
|
2014-05-11 13:35:05 +02:00 |
|
Lorenz Meier
|
e18bdfdf65
|
Merge pull request #858 from TickTock-/rc_merged
Rc merged
|
2014-05-08 23:21:22 -07:00 |
|
Julian Oes
|
26f5e550c4
|
Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params
Conflicts:
src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
|
2014-05-07 21:11:21 +02:00 |
|
Lorenz Meier
|
8dd0453edc
|
Merge pull request #909 from PX4/failsafe_reporting
Much better failsafe reporting on failsafe state changes
|
2014-05-07 02:10:53 -07:00 |
|
Lorenz Meier
|
0c318f9ad7
|
commander: Fix the position failsafe to a) use proper logic to determine if eph / epv are good or not (the previous logic was in some states not initialized) and b) add a hysteresis time - because the check as it was before had zero hysteresis time for a bad eph / epv value
|
2014-05-07 08:42:57 +02:00 |
|
Lorenz Meier
|
32b84b9652
|
Much better failsafe reporting on failsafe state changes
|
2014-05-06 21:46:59 +02:00 |
|
Lorenz Meier
|
1d6b9fae03
|
Fix in-air restarts, protect against an external MAVLink sender exploiting the restart mechanism
|
2014-05-06 14:57:06 +02:00 |
|
TickTock-
|
6c76e8ea50
|
shortened rc_assisted_th to rc_assist_th in case we add a dedicated switch mapping later
|
2014-04-29 20:51:04 -07:00 |
|
TickTock-
|
31089a290b
|
Replaces poshold/althold with posctrl/altctrl
|
2014-04-28 21:47:45 -07:00 |
|
TickTock-
|
269800b48c
|
renamed EASY to POSHOLD and SEATBELT to ALTHOLD
|
2014-04-27 14:06:00 -07:00 |
|
TickTock-
|
6a7b104c2b
|
compiles
|
2014-04-27 13:12:28 -07:00 |
|