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
