Commit Graph
937 Commits
Author SHA1 Message Date
Lorenz Meier 0b47ed86e0 Implemented new, simple system boot config and sane default value system based on two parameters evaluated at boot time 2013-07-15 13:58:43 +02:00
px4dev dca9019f75 Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup 2013-07-14 13:04:44 -07:00
Lorenz Meier f27491d2e5 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-07-10 11:58:48 +02:00
Jean Cyr 897b541b12 General cleanup of /dev/px4io and /dev/px4fmu
- Use distinct common symbols for px4io and px4fmu device files, and use
instead of hardcoded filenames
- Use common symbols defining px4io bits consistently between px4fmu and
px4io builds.
2013-07-09 20:37:00 -04:00
Lorenz Meier 9910a5ef5f Merge branch 'top' of https://github.com/a-ha/Firmware into top 2013-07-09 13:36:38 +02:00
Julian Oes 88389ea255 Merge branch 'master' into new_state_machine
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
2013-07-08 10:31:32 +02:00
px4dev 43f1843cc7 Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup 2013-07-07 12:22:56 -07:00
px4dev 8fa226c909 Tweak protocol register assignments and add new registers to accommodate differences in IOv2. 2013-07-06 23:59:35 -07:00
Julian Oes 9b6c9358ed First try for an ESC calibration tool 2013-06-20 01:13:49 +02:00
Julian Oes 202792294a Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
	src/modules/commander/state_machine_helper.h
	src/modules/px4iofirmware/mixer.cpp
	src/modules/uORB/topics/actuator_controls.h
	src/modules/uORB/topics/vehicle_status.h
2013-06-18 15:35:26 +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
Lorenz Meier 9444def5f8 Merge branch 'master' into fmuv2_bringup 2013-06-10 15:01:44 +02:00
Lorenz Meier b12678014f Fixed chan count logic 2013-06-09 14:04:13 +02:00
Lorenz Meier d2c5990d6f Fixed pwm count check 2013-06-09 12:41:47 +02:00
Lorenz Meier 8567134d64 Made pwm command sending continously, improved failsafe logic 2013-06-07 19:41:41 +02:00
Lorenz Meier ebc12eebd0 Merged 2013-06-07 13:04:49 +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 8ad3aa315f Merged master 2013-06-06 07:57:31 +02:00
Lorenz Meier de82295ab5 HOTFIX: Allow PWM command to correctly set ARM_OK flag 2013-06-04 14:13:02 +02:00
Lorenz Meier 63d460160c Adjusted to renaming of TCB in NuttX 2013-06-01 12:00:33 +02:00
Lorenz Meier 4db739b5e1 Integration WIP with current NuttX version 2013-06-01 01:48:42 +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
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
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
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
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
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
Lorenz Meier 574e765321 Moved all system commands to the new world 2013-04-27 11:50:10 +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 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 01e427b17c Merge working changes into export-build branch. 2013-04-26 16:14:32 -07:00
Lorenz Meier 94084ec22a Enable support for RAMTRON, enable support for EEPROM on FMU 1.x 2013-04-18 22:27:55 +02:00