Julian Oes
34c197c7cc
Merge remote-tracking branch 'upstream/master' into new_state_machine
2013-06-18 10:26:48 +02:00
Julian Oes
b5f4f1ee80
Adressed performance concern and fixed a copy paste bug
2013-06-18 10:00:42 +02:00
Anton Babushkin
447fc5e291
sdlog2 bugs fixed
2013-06-18 10:31:24 +04:00
Julian Oes
cc452834c0
First try to prevent motors from stopping when armed
2013-06-18 00:30:10 +02:00
Julian Oes
c874f68108
Checkpoint: Quad is flying after PID lib changes
...
Conflicts:
src/modules/multirotor_att_control/multirotor_attitude_control.c
2013-06-17 21:10:38 +02:00
Julian Oes
e8dbc1fada
Merge remote-tracking branch 'upstream/att_fix' into pid_fixes
2013-06-17 21:05:15 +02:00
Julian Oes
2daff9ebbf
Checkpoint: Quad is flying after PID lib changes
2013-06-17 21:03:55 +02:00
Julian Oes
52f8565f0b
Corrected number of ORB structs in sdlog2
2013-06-17 21:02:52 +02:00
Julian Oes
a25d68440d
Merge with att_fix
2013-06-17 21:01:25 +02:00
Anton Babushkin
effce6edfa
sdlog2 GPOS message bug fix
2013-06-17 22:07:05 +04:00
Anton Babushkin
2124c52cff
position_estimator_inav bugfixes
2013-06-17 22:06:45 +04:00
Lorenz Meier
91e1680c1b
fixed attitude estimator params
2013-06-17 17:13:34 +02:00
Anton Babushkin
e12ae6b3ba
Merge branch 'master' into seatbelt_multirotor
2013-06-17 18:47:41 +04:00
Julian Oes
7bb78a4f9b
Merge remote-tracking branch 'drton/sdlog2' into new_state_machine
...
Conflicts:
src/modules/sdlog2/sdlog2.c
2013-06-17 14:45:20 +02:00
Anton Babushkin
a11895ac43
Critical bug fixed, cleanup
2013-06-17 16:06:35 +04:00
Anton Babushkin
d9f30858c8
sdlog2 messages ID fix
2013-06-17 14:46:18 +04:00
Anton Babushkin
22a925adeb
Merge branch 'master' into sdlog2
2013-06-17 14:44:45 +04:00
Anton Babushkin
a83aca753c
position_estimator_inav rewrite, publishes vehicle_global_position now
2013-06-17 14:41:35 +04:00
Anton Babushkin
650de90a90
sdlog2: ARSP, GPOS messages added
2013-06-17 14:40:55 +04:00
Anton Babushkin
95d324f061
Merge branch 'master' into seatbelt_multirotor
2013-06-17 13:52:20 +04:00
Lorenz Meier
34058ae565
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-17 09:57:47 +02:00
Lorenz Meier
badaa5e4a2
Fixed too low stack sizes
2013-06-17 09:57:34 +02:00
Lorenz Meier
92e0687022
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-17 08:44:07 +02:00
px4dev
b2ff8b5e1a
Turn off logging
2013-06-16 23:02:46 -07:00
px4dev
3163d7ac09
Set the serial port speed before trying to talk to IO
2013-06-16 22:41:08 -07:00
Lorenz Meier
c240e843aa
Merge pull request #305 from sjwilks/sdlog-airspeed
...
Add airspeed logging to sdlog2.
2013-06-16 13:46:35 -07:00
Lorenz Meier
f1419d4f5f
Merge pull request #307 from sjwilks/ets-airspeed-fix
...
Fix the usage help and lots of formatting fixes.
2013-06-16 12:29:37 -07:00
Simon Wilks
24cb66c833
And yet more formatting cleanups
2013-06-16 21:17:07 +02:00
Simon Wilks
7a99de9d30
More formatting cleanups
2013-06-16 21:07:42 +02:00
Simon Wilks
1fc3c8f723
Fix usage help and cleanup formatting
2013-06-16 20:52:15 +02:00
Simon Wilks
dadac932da
Report airspeed over HoTT telemetry
2013-06-16 20:44:11 +02:00
Julian Oes
bca60b98bd
Merge branch 'pid_fixes' into new_state_machine
...
Conflicts:
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/sdlog2/sdlog2.c
src/modules/sdlog2/sdlog2_messages.h
and some fixes, logging of control PID values now working
2013-06-16 17:14:22 +02:00
Julian Oes
216617431d
Logging of ctrl debug values working now
2013-06-16 16:18:40 +02:00
Julian Oes
38558f0f16
Count and write for control debug loging was missing (still not working)
2013-06-16 16:00:44 +02:00
Julian Oes
6f108e18d2
Just include the rate controls for now
2013-06-16 15:32:53 +02:00
Julian Oes
2cb928d87c
Added ctrl debugging values
...
Conflicts:
src/modules/sdlog2/sdlog2.c
2013-06-16 15:25:24 +02:00
Julian Oes
c189ac1c85
Added possibility to log pid control values
...
Conflicts:
apps/multirotor_pos_control/multirotor_pos_control.c
src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 15:22:20 +02:00
Julian Oes
303694f5f7
Fixed pid bug, attitude was not controlled
2013-06-16 15:22:10 +02:00
Anton Babushkin
138ce117ab
ATSP.ThrustSP added
2013-06-16 17:20:07 +04:00
Julian Oes
bd7f86bb6a
Tried to add ctrl debug values to sdlog2 (WIP)
2013-06-16 14:59:00 +02:00
Julian Oes
b52d561b11
Added ctrl debugging values
2013-06-16 12:59:50 +02:00
Julian Oes
562253c508
Fixed bug that I introduced in sdlog2
2013-06-16 11:55:08 +02:00
Julian Oes
1ea9ff3640
Added possibility to log pid control values
...
Conflicts:
apps/multirotor_pos_control/multirotor_pos_control.c
src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 09:57:32 +02:00
Julian Oes
68fb200f0b
Fixed pid bug, attitude was not controlled
2013-06-16 09:55:28 +02:00
Julian Oes
263b60c200
Hack to make flow controll to compile
2013-06-16 09:54:57 +02:00
Simon Wilks
4253c16b3f
Increase array size.
2013-06-15 23:24:57 +02:00
Simon Wilks
12ac41802e
Log airspeed.
2013-06-15 22:58:14 +02:00
Julian Oes
3230f22446
Merge branch 'pid_fixes' into new_state_machine
2013-06-15 20:06:30 +02:00
Julian Oes
8559315f4f
Added a filter parameter to the pid function
...
Conflicts:
apps/multirotor_pos_control/multirotor_pos_control.c
2013-06-15 20:06:13 +02:00
Julian Oes
2b9fa731ef
Use the pid library in the rate controller and change de implementation of the D part
...
Conflicts:
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
2013-06-15 20:05:03 +02:00
Julian Oes
65d36c44af
Prevent flips at high throttle
...
Conflicts:
src/drivers/ardrone_interface/ardrone_motor_control.c
2013-06-15 19:53:25 +02:00
Julian Oes
9f5565de32
Controllers should not access state machine anymore but access the vehicle_control_mode flags
2013-06-15 19:41:54 +02:00
Anton Babushkin
4c6cf3037d
Merge commit 'b714c5c9d1d38132df5cf4bff9a1fd92163be550' into seatbelt_multirotor
2013-06-15 11:49:14 +04:00
Anton Babushkin
38ca3bd78a
multirotor_pos_control fixes, introduced HARD control mode (disabled by default)
2013-06-15 11:36:26 +04:00
samuezih
b789e01a0f
Add PX4Flow board modules and corresponding ORB msgs.
2013-06-14 17:31:46 +02:00
Julian Oes
e556649f2f
Beep when mode is not possible
2013-06-14 16:48:41 +02:00
Julian Oes
5b21362e1f
Arming with IO working now
2013-06-14 16:04:23 +02:00
Julian Oes
90f5e30f2a
Introduced new actuator_safety topic
2013-06-14 13:53:26 +02:00
Sam Kelly
53f29a25b6
Added l3gd20h detection
2013-06-13 12:51:50 -07:00
Anton Babushkin
e4b25f8570
Default parameters updated for position_estimator_inav and multirotor_pos_control
2013-06-13 17:12:13 +04:00
Julian Oes
236053a600
Fixed param save
2013-06-13 15:04:16 +02:00
px4dev
8eb4a03274
Use a better way of guessing whether we can use both-edges mode.
2013-06-12 23:58:22 -07:00
Lorenz Meier
3945dae8d3
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-13 08:27:13 +02:00
Anton Babushkin
46aadb96b6
Merge branch 'sdlog2' into seatbelt_multirotor
2013-06-13 07:59:10 +04:00
Anton Babushkin
95236c379a
sdlog2: ARSP (attitude rates setpoint) message added, attitude rates added to ATT message
2013-06-13 06:51:09 +04:00
Anton Babushkin
4cdee2be03
position_estimator_inav cosmetic changes
2013-06-13 06:49:17 +04:00
Anton Babushkin
4860c73008
multirotor_pos_control: position controller implemented
2013-06-13 06:48:24 +04:00
Lorenz Meier
c3a8f177b6
Software version check fixes
2013-06-12 12:58:17 +02:00
Julian Oes
ec08dec8ba
Two hacks here to make it compile
2013-06-12 12:47:00 +02:00
Lorenz Meier
eb76d116cc
Minor state machine improvements and fixes for IO safety / in-air restart handling
2013-06-12 12:30:42 +02:00
Julian Oes
7f90ebf537
Merge remote-tracking branch 'upstream/master' into new_state_machine
...
Conflicts:
src/examples/fixedwing_control/main.c
2013-06-12 12:24:52 +02:00
Anton Babushkin
4256e43de7
Complete position estimator implemented (GPS + Baro + Accel)
2013-06-10 23:16:04 +04:00
Lorenz Meier
9444def5f8
Merge branch 'master' into fmuv2_bringup
2013-06-10 15:01:44 +02:00
Anton Babushkin
afb34950a3
Merge branch 'master' into seatbelt_multirotor
2013-06-10 16:21:10 +04:00
Lorenz Meier
1028bd932c
Extended vehicle detection
2013-06-10 07:39:12 +02:00
Lorenz Meier
8b67f88331
Play warning tune
2013-06-09 14:12:17 +02:00
Lorenz Meier
1deced7629
Added safety status feedback, disallow arming of a rotary wing with engaged safety
2013-06-09 14:09:09 +02:00
Lorenz Meier
b12678014f
Fixed chan count logic
2013-06-09 14:04:13 +02:00
Lorenz Meier
4ef87206ec
Code formatting and warning fixes
2013-06-09 14:03:49 +02:00
Lorenz Meier
d2c5990d6f
Fixed pwm count check
2013-06-09 12:41:47 +02:00
Lorenz Meier
a16d60e825
Merge branch 'master' of github.com:PX4/Firmware into io_fixes
2013-06-09 11:48:27 +02:00
Anton Babushkin
079cb2cd65
sdlog2: RC (RC controls) and OUT0 (actuator 0 output) messages added, print statistics to mavlink console
2013-06-08 18:15:55 +04:00
Lorenz Meier
3023ef9059
Merge branch 'master' of github.com:PX4/Firmware into io_fixes
2013-06-07 21:45:42 +02:00
Lorenz Meier
048967fb6f
merged
2013-06-07 21:33:49 +02:00
Anton Babushkin
7b98f0a567
sdlog2 minor fix
2013-06-07 22:12:21 +04:00
Anton Babushkin
59b26eca48
sdlog2 -b option (log buffer size) added, minor cleanup
2013-06-07 22:02:40 +04:00
Lorenz Meier
8567134d64
Made pwm command sending continously, improved failsafe logic
2013-06-07 19:41:41 +02:00
Anton Babushkin
d39999425d
sdlog2 fixes
2013-06-07 21:32:58 +04:00
Anton Babushkin
03357f89fd
Merge branch 'master' into sdlog2
2013-06-07 19:29:14 +04:00
Lorenz Meier
ebc12eebd0
Merged
2013-06-07 13:04:49 +02:00
Anton Babushkin
5bad186916
sdlog2: STAT (vehicle state) log message added, minor optimizations
2013-06-07 13:36:15 +04:00
Lorenz Meier
4e3f4b57e3
Hotfix: Allow the IO mixer loading to load larger mixers, fix up the px4io test command to allow a clean exit
2013-06-07 10:36:56 +02:00
Lorenz Meier
11544d27b7
Hotfix: Enlarge the buffer size for mixers, ensure that reasonable setups with 16 outputs can work
2013-06-07 10:35:37 +02:00
Lorenz Meier
6c7c130de7
Hotfix: Make IOs mixer loading pedantic to make sure the full mixer loads
2013-06-07 10:34:55 +02:00
Lorenz Meier
b52aeea746
Merge branch 'master' of github.com:PX4/Firmware
2013-06-06 22:14:19 +02:00
Lorenz Meier
b3c5bd5d3a
Saved a few string bytes, cleaned up task names and output
2013-06-06 22:14:11 +02:00
Anton Babushkin
4052652a28
sdlog2: ATTC - vehicle attitude control logging added
2013-06-06 23:19:16 +04:00
Lorenz Meier
34b6a91860
Merge branch 'master' of github.com:PX4/Firmware into integration
2013-06-06 19:22:34 +02:00
Lorenz Meier
026cad832a
Hotfix: Added missing header
2013-06-06 18:53:33 +02:00
Lorenz Meier
fc471c731a
Tracked task_spawn API changes for sdlog2 and att_estm_so3_comp
2013-06-06 17:38:31 +02:00
Lorenz Meier
6015809d89
Merged
2013-06-06 17:37:41 +02:00
Lorenz Meier
fa1b057bb1
Minor cleanup
2013-06-06 17:27:01 +02:00
Lorenz Meier
b09fc1468c
Hotfix: Fix typos in tutorial code
2013-06-06 17:25:47 +02:00
Lorenz Meier
106f4910be
Merge pull request #284 from limhyon/master
...
Nonlinear complementary SO(3) filter has been implemented.
2013-06-06 04:39:39 -07:00
Hyon Lim (Retina)
6537759dfc
Add detailed documentation for SO3 gains tuning.
...
USB nsh has been removed.
2013-06-06 21:28:40 +10:00
Lorenz Meier
39d6dd3dc6
Merge pull request #287 from DrTon/sdlog2
...
sdlog2 - new APM compatible logger
2013-06-06 03:46:19 -07:00
Lorenz Meier
8ad3aa315f
Merged master
2013-06-06 07:57:31 +02:00
Lorenz Meier
68931f38d5
HOTFIX: Added start / stop syntax to GPIO led command
2013-06-05 15:04:49 +02:00
Lorenz Meier
bddcb11051
Merge pull request #296 from sjwilks/hott-init-fix
...
Fix HoTT syncing issue with receiver on startup.
2013-06-04 22:54:27 -07:00
Simon Wilks
032f7d0b0e
Fix syncing issue with receiver on startup.
2013-06-04 23:24:30 +02:00
Anton Babushkin
aedacc7bc8
Merge branch 'master' into sdlog2
2013-06-04 16:51:12 +04:00
Anton Babushkin
7ae2cf9d2d
Minor sdlog2/logbuffer cleanup
2013-06-04 16:48:55 +04:00
Lorenz Meier
de82295ab5
HOTFIX: Allow PWM command to correctly set ARM_OK flag
2013-06-04 14:13:02 +02:00
Lorenz Meier
45fe45fefa
Better error handling for too large arguments
2013-06-04 13:32:57 +02:00
Lorenz Meier
de8186e050
Merge branch 'master' of github.com:PX4/Firmware into failsafe_io
2013-06-04 13:25:42 +02:00
Lorenz Meier
e3ee6689fe
Merge pull request #294 from sjwilks/hott_v2
...
Add GPS Support to the HoTT Telemetry driver
2013-06-04 03:15:40 -07:00
Simon Wilks
82c7e58122
Removed some debugging code
2013-06-04 01:03:16 +02:00
Simon Wilks
9374e4b1f2
Formatting and comments
2013-06-04 00:52:48 +02:00
Simon Wilks
30d17cf0ba
Fix whitespace
2013-06-04 00:18:23 +02:00
Simon Wilks
f435025d26
Completed main implementation and debugging
2013-06-04 00:10:58 +02:00
Anton Babushkin
4bf49cfc35
multirotor_pos_control cleanup
2013-06-02 19:28:25 +04:00
Anton Babushkin
6264f6ef8a
Merge branch 'master' into seatbelt_multirotor
2013-06-02 19:25:24 +04:00
px4dev
23a6234235
Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own version of task_spawn that's different.
2013-06-01 23:31:53 +02:00
Anton Babushkin
1addb9f6c5
Fixed bug in UBX::configure_message_rate()
2013-06-01 20:42:43 +04:00
Anton Babushkin
606f68c890
sdlog2 GPS message changes
2013-06-01 20:40:56 +04:00
Anton Babushkin
9f895d87cd
sdlog2 mavlink msg fix
2013-06-01 17:16:12 +04:00
Anton Babushkin
34d4d62acc
sdlog2 messages cleanup, fixes
2013-06-01 15:59:42 +04:00
Lorenz Meier
63d460160c
Adjusted to renaming of TCB in NuttX
2013-06-01 12:00:33 +02:00
Anton Babushkin
b344f23daf
Merge branch 'master' into sdlog2
2013-06-01 13:34:49 +04:00
Anton Babushkin
1bf8f7b47e
sdlog2 performance increased, fixes and cleanup
2013-06-01 13:18:03 +04:00
Lorenz Meier
4db739b5e1
Integration WIP with current NuttX version
2013-06-01 01:48:42 +02:00
Lorenz Meier
5375bb5b86
Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX now
2013-06-01 01:04:32 +02:00
sergeil
496127ca45
mpu6000 driver support for setting rate
2013-05-31 11:44:20 +02:00
Anton Babushkin
b614d2f1eb
adlog2: added options cleanup, updates rate limit added
2013-05-30 23:41:06 +04:00
Anton Babushkin
9952fef645
sdlog2 messages packing fixed, sdlog2_dump.py now produces much more compressed output.
2013-05-30 21:27:55 +04:00
Anton Babushkin
d6ae0461ab
sdlog2: GPS message added
2013-05-30 12:28:05 +04:00
Lorenz Meier
abb024c724
More safety added by disabling pulses
2013-05-29 18:32:23 +02:00
Lorenz Meier
5f2571dd01
Set unknown channels to zero, since centering them is a slightly dangerous guess
2013-05-29 18:29:41 +02:00
Lorenz Meier
f6570172da
Set default failsafe value to 0 of mixer
2013-05-29 17:07:26 +02:00
Lorenz Meier
d2c60a248d
Merge branch 'master' of github.com:PX4/Firmware into failsafe_io
2013-05-28 17:49:06 +02:00
Lorenz Meier
2876bc72f9
Slightly reworked IO internal failsafe, added command to activate it (px4io failsafe), does not parse commandline arguments yet
2013-05-28 17:46:24 +02:00
Anton Babushkin
234b9c8f67
Merge branch 'master' into seatbelt_multirotor
2013-05-28 19:04:29 +04:00
Anton Babushkin
7e95edbbe8
New messages added to sdlog2
2013-05-28 19:02:16 +04:00
Hyon Lim (Retina)
90fdf35ae5
GPL Licensed code has been removed
2013-05-29 00:59:20 +10:00
Hyon Lim (Retina)
7a2adb22eb
Visualization code has been added.
2013-05-29 00:45:02 +10:00
Hyon Lim (Retina)
cc6c590af0
I finished to implement nonlinear complementary filter on the SO(3).
...
The previous problem was roll,pitch and yaw angle from quaternion.
Now it is fixed. 1-2-3 Euler representation is used.
Also accelerometer sign change has been applied.
2013-05-29 00:34:21 +10:00
Lorenz Meier
27ee36b204
Hotfix: Completely silencing HMC5883 probing to not confuse users
2013-05-28 07:18:07 +02:00
Hyon Lim (Retina)
13faf0d555
Merge remote-tracking branch 'upstream/master'
...
- Mikrokopter BLCTRL seems to be updated
- HMC5883L calibration problem has been corrected.
(This is because of RAM mis allocation?)
See https://groups.google.com/forum/?fromgroups#!topic/px4users/yTYJiDBBKfo
- Fixed wing control updated
https://groups.google.com/forum/?fromgroups#!topic/px4users/s7owpvZN8UI
- GPIO module has been removed.
- STM32 DRV updated
2013-05-28 11:09:58 +10:00
Lorenz Meier
f1a8f6e75b
Hotfix: Made HMC driver more verbose to prevent false alarm
2013-05-27 16:58:30 +02:00
Lorenz Meier
fba92f357c
Merge pull request #267 from DrTon/gpio_led
...
gpio_led app added: drive LEDs by GPIO_EXT1 pin of PX4FMU
2013-05-26 09:00:41 -07:00
Lorenz Meier
56bd61cd2d
Merge pull request #286 from NosDE/master
...
mkblctrl cleaned up and flown with px4 stack and arducopter
2013-05-26 08:24:14 -07:00
marco
73d2baeb20
comments cleaned
2013-05-26 16:49:33 +02:00
Lorenz Meier
1edc36bfd4
More documentation
2013-05-25 23:01:55 +02:00
Anton Babushkin
691dc8eefd
sdlog2 strick packing fixed, length bug fixed, "sdlog2_dump.py" debug tool added
2013-05-26 00:14:10 +04:00
Anton Babushkin
e211352604
sdlog2 logger app added. New flexible log format, compatible with APM.
2013-05-25 22:16:43 +04:00
Lorenz Meier
bc7a7167ae
Go only to RC failsafe if throttle was half once - to prevent failsafe when armed on ground
2013-05-25 18:21:39 +02:00
Lorenz Meier
214ddd6f1c
Adjusted example params and extensively commented example
2013-05-25 18:16:15 +02:00
marco
8e1571cf02
mkblctrl cleanup & tested
2013-05-24 20:16:47 +02:00
Anton Babushkin
f8900f002c
Merge branch 'master' into seatbelt_multirotor
2013-05-24 12:52:02 +04:00
marco
9f090e651a
mkblctrl cleanup
2013-05-23 21:03:49 +02:00
px4dev
dca844a808
Based on comments in:
...
http://answers.px4.ethz.ch/question/1337/px4io-receiver-connection-problem/?answer=1346#post-id-1346
increase the longest PPM pulse we recognize out to 550µs.
2013-05-23 09:27:57 +02:00
Lorenz Meier
81acd98997
Added limit to heading command
2013-05-23 08:54:08 +02:00
Hyon Lim (Retina)
4bf0505421
Test flight has been performed with nonlinear SO(3) attitude estimator.
...
Here are few observations:
- When the system initialized, roll angle is initially reversed.
As filter converged, it becomes normal.
- I put a negative sign on roll, yaw. It should naturally has right
sign, but I do not know why for now. Let me investigate again.
- Gain : I do not know what gain is good for quadrotor flight.
Let me take a look Ardupilot gain in the later.
Anyway, you can fly with this attitude estimator.
2013-05-23 16:20:38 +10:00
Hyon Lim (Retina)
364d1a06e3
To use freeIMU processing visualization tool, I have implemented float number transmission over uart (default /dev/ttyS2, 115200)
...
But this not tested yet. I should.
2013-05-23 16:20:38 +10:00
Hyon Lim (Retina)
f547044203
Roll pitch yaw should be verified again
2013-05-23 16:20:38 +10:00
Hyon Lim (Retina)
32bace0824
I do not know why roll angle is not correct. But system looks okay
2013-05-23 16:20:38 +10:00
Hyon Lim (Retina)
0c3412223b
Fixed few minor bug
2013-05-23 16:20:38 +10:00
Hyon Lim (Retina)
1caddb7bbb
Initial work of so3 nonlinear complementary filter
2013-05-23 16:20:38 +10:00
px4dev
308ec6001a
Add serial read-length handling.
2013-05-22 22:09:00 +02:00
px4dev
437d9e4180
Merge branch 'fmuv2_bringup' into fmuv2_bringup_io2
2013-05-22 21:39:30 +02:00
Lorenz Meier
327d8751d2
Hotfix: Removing GPS debug output
2013-05-22 17:53:17 +02:00
Lorenz Meier
03eac33a3d
Merge branch 'master' of github.com:cvg/Firmware_Private into fmuv2_bringup
2013-05-22 12:16:41 +02:00
Anton Babushkin
6e8621269b
Code style fixed
2013-05-22 13:59:51 +04:00
Anton Babushkin
09ce3e2d0a
Added GPIO_EXT1/GPIO_EXT2 selection.
2013-05-22 11:30:50 +04:00
Lorenz Meier
5d9512eb79
Removed unnecessary cplusplus check
2013-05-21 10:17:37 +02:00
Lorenz Meier
e655c0fc57
Fixed missing count
2013-05-21 10:14:16 +02:00
Lorenz Meier
5dfde44c56
Fixed va args in MAVLink, tested with RC config, correct output
2013-05-21 09:14:22 +02:00
Lorenz Meier
d720944efe
VA args now supported by MAVLink text messages
2013-05-21 09:14:22 +02:00
Lorenz Meier
88ba97816d
Better preflight check, catches wrong RC configs. Needs rework of mavlink text message API to VARARGs
2013-05-21 09:14:22 +02:00
Lorenz Meier
0165034e49
Hotfix: Changed alarms back to what they originally were designed for: Traps to later see if condition was once violated. Currente status can be read through the status flags
2013-05-21 09:14:22 +02:00
Lorenz Meier
bc3eca5df3
Merge branch 'master' of github.com:PX4/Firmware
2013-05-20 23:19:40 +02:00
Lorenz Meier
462547c527
Hotfix: Building fixedwing backside params correctly
2013-05-20 23:19:24 +02:00
px4dev
05fe7779a9
Fix .gitignore to avoid ignoring prebuilt libraries.
...
Also, generally clean-up the .gitignores and farm off separate versions for the NuttX/Apps directories to keep things tidy.
2013-05-20 20:33:18 +02:00
Anton Babushkin
5842c22123
Use GPS velocity in position estimator
2013-05-20 19:47:38 +04:00
px4dev
5576e321fa
Use the new prebuilt-library support to wrap the ARM CMSIS DSP library, and update to the version shipped with CMSIS 3.0 r3p2
2013-05-20 00:30:43 +02:00
px4dev
b7d430e3c0
Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup
...
Fix px4iov2 build issue by selecting the correct NuttX config.
2013-05-19 21:51:35 +02:00
Julian Oes
f5c157e74d
Merge remote-tracking branch 'upstream/master' into new_state_machine
...
Conflicts:
src/drivers/px4io/px4io.cpp
src/modules/commander/commander.c
src/modules/commander/state_machine_helper.c
2013-05-17 11:24:02 +02:00
Anton Babushkin
2f280bb4ca
Merge branch 'master' into gpio_led
2013-05-17 12:48:46 +04:00
Anton Babushkin
eb2fc4e036
Merge branch 'master' into seatbelt_multirotor
2013-05-17 12:23:48 +04:00
Andrew Tridgell
fa816d0fd6
arming: added PWM_SERVO_SET_ARM_OK and PWM_SERVO_CLEAR_ARM_OK
...
these new ioctls allow for the flight code to tell the IO board that
arming can proceed
2013-05-16 08:39:24 +02:00
Simon Wilks
6571629dca
Merged new repository layout from PX4/Firmware
2013-05-15 20:11:13 +02:00
Lorenz Meier
d02f5c5505
Merge branch 'master' of github.com:PX4/Firmware
2013-05-14 22:47:21 +02:00
Lorenz Meier
9a07788d58
Hotfix: Off-by-one fix in overflow check
2013-05-13 23:25:18 +02:00
sjwilks
1b9222f43a
Merge pull request #269 from PX4/new_led_status
...
New led status
2013-05-13 07:49:19 -07:00
Lorenz Meier
3ac76c4476
Blink pattern fixes
2013-05-13 10:15:36 +02:00
Lorenz Meier
69571c48c4
Fixed compile and logic errors, behaving now
2013-05-13 10:02:15 +02:00
Lorenz Meier
f8c199062a
Merge branch 'master' of github.com:PX4/Firmware
2013-05-13 08:34:18 +02:00
Lorenz Meier
1ff6c80866
More example fixes
2013-05-13 08:28:36 +02:00
Lorenz Meier
6ea204c813
Added fixed wing controller example
2013-05-12 20:08:09 +02:00
Lorenz Meier
79f9b61aff
Fixed led patterns to be up to the latest specs
2013-05-12 20:05:20 +02:00
Lorenz Meier
0c43da3b64
Tested with PX4FMU and PX4IO with GPS and arming
2013-05-12 13:11:12 +02:00
px4dev
555d42e0cd
Oops, left in some test code.
2013-05-11 16:46:52 -07:00
px4dev
196ee8b16f
Change the way modules are built so that object paths are relative and use vpath for locating sources (so source paths are also shorter).
...
Add some basic documentation for the build system files while we're at it.
2013-05-11 11:32:05 -07:00
Anton Babushkin
9a9e41f7a2
Merge branch 'master' into gpio_led
2013-05-09 22:41:09 +04:00
Lorenz Meier
304ce63f00
Hotfix: Wrong capitalization on header file name
2013-05-09 19:03:40 +02:00
Lorenz Meier
b7a9e07783
Hotfix: Wrong capitalization on header file name
2013-05-09 19:03:24 +02:00
Lorenz Meier
26efba2ff3
New blink patterns for safety switch, removed GPS lock indicator
2013-05-09 17:38:12 +02:00
Lorenz Meier
fa1b7388f3
Implemented new led status proposal
2013-05-09 17:34:00 +02:00
Lorenz Meier
3ec536a876
Improved GPS update rate calculation
2013-05-09 17:13:38 +02:00
Lorenz Meier
5886e93a33
Merge branch 'gps_vel' of github.com:PX4/Firmware
2013-05-09 16:09:33 +02:00
Lorenz Meier
614bbb1510
Merged ETS airspeed driver
2013-05-09 15:58:23 +02:00
Lorenz Meier
3152dae3dc
Merged with master
2013-05-09 15:52:36 +02:00
Lorenz Meier
296a19072d
Enabled leds on FMU again
2013-05-09 15:39:54 +02:00
Lorenz Meier
44df8db984
Merge branch 'master' of github.com:PX4/Firmware into export-build
2013-05-06 23:50:23 +02:00
Lorenz Meier
eac9e10a83
Moved calibration
2013-05-06 23:50:14 +02:00
Lorenz Meier
4a44e10411
Merge branch 'export-build' of github.com:PX4/Firmware into export-build
2013-05-06 07:55:12 +02:00
Lorenz Meier
4611fca7b4
Merge branch 'master' of github.com:PX4/Firmware into export-build
2013-05-06 07:54:55 +02:00
px4dev
1ca535b941
Fix whitespace damage, update help text to indicate the -m option is for debug use only.
2013-05-05 16:52:26 -07:00
Lorenz Meier
bb94847511
Allowed parsing of floating point params from scripts
2013-05-05 11:43:29 +02:00
Lorenz Meier
13110e0a1f
ROMFS wide quad mixer addition and cleanup
2013-05-05 11:35:56 +02:00
Lorenz Meier
8c6abe717d
Moved BLCTRL driver to new world
2013-05-05 11:24:31 +02:00
Andrew Tridgell
5b75519925
px4io: handle errors from adc_measure()
...
don't update the voltage/current values on error
2013-05-04 19:18:58 +10:00
Andrew Tridgell
d7e04a3619
px4io: fixed voltage/current output and add discharged_mah calculation
...
this integrates the current over time to calculate discharged_mah, and
allows the scaling of the current and the bias to be set with the
px4io command
2013-05-04 19:18:55 +10:00
Andrew Tridgell
af27101ffe
px4io: changed adc_measure() to return 0xffff on error, and lower timeout
...
the timeout of 1ms was far too long, and could impact flight
performance
Returning 0xffff on error matches the FMU code, and allows bad values
to be discarded
2013-05-04 19:18:51 +10:00
Andrew Tridgell
44015d6915
px4io: return raw ADC value for current
...
we don't know how to scale it as we have no info on what sensor is
attached. As we are returning a uint16_t it is better to let the FMU
sort it out or we'll just lose precision.
2013-05-04 19:18:47 +10:00
Andrew Tridgell
ff7712ca3e
pwm: added -m option
...
this allows setting of the channel mask directly, which is useful for
testing
2013-05-04 19:18:20 +10:00
Andrew Tridgell
fc572906b7
px4io: ensure upload device is closed after use
...
this should release it for PWM use
2013-05-04 19:18:11 +10:00
Andrew Tridgell
421253e6db
px4io: allow set of output rates above 400 and below 50
...
let the IO board decide if the rate is reasonable, and limit it there
this fixes the rates on ArduCopter, which try for 490
2013-05-04 19:17:54 +10:00
Andrew Tridgell
d0122dccfc
hmc5883: fixed use of onboard I2C compass
2013-05-04 18:44:37 +10:00
px4dev
e67022f874
Serial interface for IOv2
2013-04-28 18:14:46 -07:00
px4dev
8f7200e011
Frame up the configuration for the serial interface on IOv2
2013-04-28 13:51:33 -07:00
px4dev
c6b7eb1224
Remove obsoleted file.
2013-04-28 13:00:49 -07:00
px4dev
8d3a738b70
Remove some trash files.
2013-04-28 13:00:32 -07:00
Lorenz Meier
e6b287fbfc
Merge branch 'public-export-build' into fmuv2_bringup_io2
2013-04-28 15:26:05 +02:00
Lorenz Meier
dc2c3cad3e
Re-enabled mixer
2013-04-28 14:59:42 +02:00
Lorenz Meier
a1503a8dd7
Merge branch 'public-export-build' into fmuv2_bringup
2013-04-28 14:54:57 +02:00
Lorenz Meier
0eafc2ade1
IO compiling
2013-04-28 14:54:44 +02:00
Lorenz Meier
6479ebcc73
General app cleanup for FMU
2013-04-28 14:54:06 +02:00
Lorenz Meier
1df5e98aa5
XXX: WIP: Disabled mixer on IOv2 due to CXX compile issue
2013-04-28 14:50:05 +02:00
Lorenz Meier
6aefe5fddf
Merged export-build
2013-04-28 10:40:00 +02:00
Lorenz Meier
25612cebc2
Cleaned up NuttX appconfig, added examples to config
2013-04-28 10:37:07 +02:00
Lorenz Meier
13fc670386
Moved last libs, drivers and headers, cleaned up IO build
2013-04-28 09:54:11 +02:00
Lorenz Meier
d07631d056
Merge branch 'public-export-build' into fmuv2_bringup
2013-04-28 01:30:46 +02:00
Lorenz Meier
f57439b90e
Moved all drivers to new world, PX4IO completely in new world
2013-04-28 01:30:14 +02:00
Lorenz Meier
81df6b1eda
Merge branch 'public-export-build' into fmuv2_bringup
2013-04-27 19:53:21 +02:00
Lorenz Meier
8040b9b96e
Allowed for onboard bus to be not present
2013-04-27 19:51:06 +02:00
Lorenz Meier
ae1f438a3a
Merge branch 'public-export-build' into fmuv2_bringup
2013-04-27 19:31:12 +02:00
Lorenz Meier
7ac617242d
docs fix
2013-04-27 19:27:24 +02:00
Lorenz Meier
ee498a9d7c
Made HMC bus-agnostic
2013-04-27 19:27:15 +02:00
Lorenz Meier
f1b8e4e5b3
Merged move of additional apps out of NuttX folders
2013-04-27 15:50:07 +02:00
Lorenz Meier
7ca82801bd
Moved multirotor controllers
2013-04-27 14:42:12 +02:00
Lorenz Meier
988bf1eb0a
Moved all fixed wing controllers to new world
2013-04-27 14:28:47 +02:00
Lorenz Meier
5085023796
Merge branch 'master' of github.com:PX4/Firmware into public-export-build
2013-04-27 14:17:01 +02:00
Lorenz Meier
76a30108d2
Moved James Gopperts EKF to the new world
2013-04-27 14:16:34 +02:00
Lorenz Meier
5974c37abb
Moved the bulk of sensor drivers to the new world
2013-04-27 14:06:23 +02:00
Lorenz Meier
852e6e2f49
Merged with upstream export-build branch
2013-04-27 13:26:25 +02:00
Lorenz Meier
c89f46f590
Moved sensors app to new world
2013-04-27 13:16:24 +02:00
Lorenz Meier
e6ed8268ee
Moved position_estimator_mc, px4io driver and sdlog app to new style build
2013-04-27 12:59:47 +02:00
Lorenz Meier
574e765321
Moved all system commands to the new world
2013-04-27 11:50:10 +02:00
Lorenz Meier
f924e312fa
Merged
2013-04-27 11:47:42 +02:00
Lorenz Meier
d8a3454538
Cut over MAVLink to new build system
2013-04-27 11:45:46 +02:00
Lorenz Meier
3d6aff38da
Merged
2013-04-27 11:38:06 +02:00
Lorenz Meier
2289c0bb21
Moved all system commands to new build system
2013-04-27 11:30:41 +02:00
px4dev
9d4d1ace43
Pick up the MAVlink headers from the right place
2013-04-26 23:09:38 -07:00
px4dev
1c78e365ce
Merge branch 'export-build' of https://github.com/PX4/Firmware into fmuv2_bringup
2013-04-26 20:43:07 -07:00
px4dev
4748bba35a
Move the 'tests' app to the new world.
2013-04-26 20:02:12 -07:00
px4dev
a7fc1b74bf
Merge branch 'export-build' of https://github.com/PX4/Firmware into fmuv2_bringup
2013-04-26 19:25:31 -07:00
px4dev
01e427b17c
Merge working changes into export-build branch.
2013-04-26 16:14:32 -07:00
Lorenz Meier
63136e3543
Resurrected C++ change commit, now back up to same state as master
2013-04-27 00:11:16 +02:00
Lorenz Meier
c71f4cf869
Cut over MAVLink to new style build system
2013-04-27 00:10:20 +02:00
Lorenz Meier
9169ceb3f4
Cut over commander app to new build system
2013-04-26 11:10:39 +02:00
Lorenz Meier
aa85fba979
Ported AR.Drone interface to new style config
2013-04-26 11:01:47 +02:00
Lorenz Meier
3ecdca41e5
Cut over attitude estimator to new-style config for all boards
2013-04-23 12:36:26 +02:00
Lorenz Meier
c52278f679
Allowed board to init properly as intended with or without SPI2
2013-04-23 12:35:19 +02:00
Lorenz Meier
59d12ee77f
Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_bringup
2013-04-23 09:36:09 +02:00
Lorenz Meier
17e01eb9cb
Merged
2013-04-22 13:13:08 +02:00
px4dev
f45e15615a
Merge commit 'b149b834c835190fbb3f7e1914346d5e0620036d' into fmuv2_bringup
2013-04-20 15:20:33 -07:00
Lorenz Meier
b149b834c8
Initial attempt at getting SDIO to work
2013-04-18 22:56:25 +02:00
Lorenz Meier
94084ec22a
Enable support for RAMTRON, enable support for EEPROM on FMU 1.x
2013-04-18 22:27:55 +02:00
Julian Oes
b7e947cb3d
Anti-Aliasing frequency of the LSM303D can now be read too, not just written
2013-04-17 12:41:56 -07:00
Julian Oes
76497502cb
Moved the L3GD20 driver to the new driver, working on FMU v1 and v2
2013-04-17 12:41:56 -07:00
Julian Oes
0eddcb3357
Tried to collect some changes that I needed to build for FMUv2 into a commit
2013-04-17 12:41:56 -07:00
Julian Oes
3469fefe11
Checked axes of LSM303D
2013-04-09 23:34:27 +02:00
Julian Oes
1d327c42a6
Mag sample rate was not actually changed by an ioctl
2013-04-09 23:34:19 +02:00
Julian Oes
eb3d6f228c
Added some functions for changing rates etc (WIP)
2013-04-09 23:34:08 +02:00
px4dev
4703a68979
Fix the default state of the peripheral power control.
2013-04-07 22:00:23 -07:00
px4dev
2557f0d2de
Rename the 'device' directory back to 'drivers', it's less confusing that way.
...
Move the fmuv2 board driver out into the new world.
2013-04-06 23:04:32 -07:00
px4dev
8eeefcce05
Add GPIO driver access to the power supply control/monitoring GPIOs for FMUv2
2013-04-06 22:46:50 -07:00
px4dev
c355275669
Make the 'fmu' command build for v2. Should be enough to get the FMU-side PWM outputs working, but untested.
2013-04-06 19:20:08 -07:00
px4dev
706dcb6a53
Move the FMU driver from the old universe to the new universe so that we can teach it about v2.
2013-04-06 18:38:32 -07:00
px4dev
d1a2e9a9c1
Fix the v2 RGB LED ID
2013-04-06 18:18:49 -07:00
px4dev
e5fa9dbcea
Move the LSM303D driver over into the new world.
2013-04-06 11:16:24 -07:00
Lorenz Meier
e2c30d7c1d
Added include dir for RGB led
2013-04-06 12:12:39 +02:00
Lorenz Meier
c25248f1af
Fixed RGB led warnings and error handling
2013-04-06 12:00:51 +02:00
px4dev
c558ad15ab
Add the RGB LED driver as an example.
2013-04-06 01:00:07 -07:00
px4dev
8b9b41fd50
Populate INCLUDE_DIRS with some likely candidates.
...
Implement __EXPORT and such for modules, as well as symbol visibility.
Don't use UNZIP to point to unzip, as it looks there for arguments.
2013-04-06 00:51:59 -07:00
px4dev
6b215be739
Use indirect calls for all commands (echo, make, etc.)
...
Replace our dependency on xxd with a toolchain call, and implement the backend using objcopy evil for the default toolchain.
2013-02-23 22:01:00 -08:00
px4dev
d24599931a
APP -> MODULE
...
remove as many duplicate slashes, etc. as seems practical
2013-02-23 22:01:00 -08:00
px4dev
8d7621079a
Checkpoint: application framework makefile done
2013-02-23 22:00:59 -08:00