fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 11:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,228 Commits 852 Branches 161 Tags
6a1c28fbc1a707712576f60382ad414e971161ed
Commit Graph
12228 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Charlebois 6a1c28fbc1 Merge branch 'linux' of http://github.com/mcharleb/Firmware into linux 2015-05-15 13:00:59 -07:00
Mark Charlebois 9f391b1867 NuttX: fixes for NuttX build 
In the upstream tree ringbuffer.h includes the method implementations
in the header file which causes multiple definitions in the link for
other targets. Changed so ringbuffer.cpp is build separately for other
platforms and is included by ringbuffer.h on NuttX.

uORB changes do not link without uORBTest_UnitTest.cpp enabled for
the NuttX build.

px4_getopt was not exported and wasn't visible in NuttX build.

The makefiles were restored to be as close as possible to upstream
so the NuttX build builtin's work again. The code will have to be
refactored after the merge.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-15 12:56:18 -07:00
mcharleb 868177f3ba Merge pull request #12 from tumbili/simulator_fixes 
fix mavlink message sending, make thread priority default
 2015-05-15 08:59:14 -07:00
Roman Bapst 4a84215a8f fix mavlink message sending, make thread priority default 2015-05-15 17:49:20 +02:00
Mark Charlebois a3a0d0612c QuRT: enabled more modules 
rgbled is now enabled.

Saving parameters causes a crash so those commands are not enabled.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-14 09:45:03 -07:00
Mark Charlebois abe61a3d7e Added missing return on error 
When mc_pos_control_main.cpp was ported to posix one error condition
retuned 0 instead of 1.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-14 08:32:51 -07:00
mcharleb 2bdfd8ca1b Merge pull request #11 from tumbili/mc_pos_control 
Multicopter position controller port
 2015-05-14 06:58:21 -07:00
tumbili cfa0073c35 build mc_pos_control 2015-05-14 14:58:46 +02:00
tumbili f6bf6c89ff ported mc_pos_controller 2015-05-14 14:58:23 +02:00
Mark Charlebois b2c12ff522 QuRT: added stub for inclusion of libdspal.a 
libdspal.a is still incomplete and so is not yet used

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-13 18:49:00 -07:00
Mark Charlebois 8e346a06fb QuRT: enable uORB, and simulator 
uORB, the simulator and simulated devices now run

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-13 18:03:08 -07:00
Mark Charlebois 884f62878d QuRT: pthread API now working 
The use of std::map and static initialization was an issue.

The code was refactored to not use static initialization.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-13 16:21:52 -07:00
mcharleb 7115ec3ab6 Merge pull request #10 from tumbili/hil_message 
read hil sensor message instead of highres imu message
 2015-05-13 09:19:41 -07:00
Roman Bapst cf27fc59c7 read hil sensor message instead of highres imu message 2015-05-13 10:31:52 +02:00
mcharleb c1927b7387 Merge pull request #9 from tumbili/send_controls 
send pwm outputs to simulator
 2015-05-12 15:24:37 -07:00
tumbili 9686f8004e send pwm outputs to simulator 2015-05-12 23:55:32 +02:00
mcharleb 21d7e4f24f Merge pull request #8 from tumbili/serial_device 
read serial device to obtain manual control setpoint
 2015-05-12 14:36:18 -07:00
tumbili 3a79679e2d get manual control setpoint from PIXHAWK 2015-05-12 23:15:58 +02:00
Mark Charlebois 3db5f3bb3b QuRT: toolchain changes 
Reworking toolchain and main.cpp for QuRT to a final link can be
done and the apps.h file is autogenerated.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-12 11:37:28 -07:00
Mark Charlebois 14cbd240ff QuRT: added qurt_log 
Implement as a printf for now

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-11 19:38:03 -07:00
Mark Charlebois d0bf4ab449 Simulator: refactored mavlink additions 
QuRT does not support UDP so moved the mavlink specific code
to a new file that is not built for the qurt target

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-11 19:25:11 -07:00
Mark Charlebois 2f434eb395 POSIX: fixups for px4_log.h change 
After merge from qurt branch, fixups for posix build

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-11 16:14:06 -07:00
Mark Charlebois 2d32395bc0 Merge branch 'qurt' into linux 2015-05-11 16:07:53 -07:00
Mark Charlebois a99f916bdf POSIX: Changed px4_debug.h to px4_log.h 
Also changed use of printf to PX4_WARN or PX4_INFO in posix and
qurt tests.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-11 16:04:39 -07:00
mcharleb 11010a648c Merge pull request #7 from tumbili/polling 
implemented polling to prevent unnecessary cycling.
 2015-05-11 15:00:48 -07:00
tumbili c074d6e913 implemented polling of socket file descriptor and uorb topic file descriptor 2015-05-11 23:55:11 +02:00
mcharleb c303525336 Merge pull request #6 from tumbili/simulator_udp 
implemented bidirectional udp communication with simulator
 2015-05-11 08:39:04 -07:00
tumbili 9119687177 make socket non-blocking, moved socket includes to header file to avoid forward declarations 2015-05-09 10:35:25 +02:00
tumbili 39711ca908 implemented bidirectional udp communication with simulator 2015-05-08 21:51:21 +02:00
Mark Charlebois 0ba5305e94 QuRT: satisfy missing deps 
There is no ioctl or write. Added stubs.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 23:21:24 -07:00
Mark Charlebois 84ca66dcf7 QuRT: updated task support based on posix fixes 
The posix layer implementations should work on QuRT.

QuRT needs to provide a way for getting the current time.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 22:58:51 -07:00
Mark Charlebois 3225edfabb QuRT: Really reverted to non-posix APIs 
Using non-posix APIs for now.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 21:51:02 -07:00
Mark Charlebois ad1865ef9f QuRT: Move to POSIX API for threads 
Use the pthread APIs to implement task support

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 14:55:28 -07:00
Mark Charlebois 8dfb09418b QuRT: added #include<px4_time.h> to posix unit tests 
QuRT does not define usleep and sleep, so they are stubbed out
for now.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 14:40:31 -07:00
Mark Charlebois 8caefc183d QuRT: updated toolchain file to link against libdspal.a 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 13:23:45 -07:00
Mark Charlebois fd3715912e QuRT: stub out missing functions 
Stub out the missing functions to enable running in the simulator

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 12:54:39 -07:00
Mark Charlebois 632f77df49 QuRT: add drivers/led 
The drivers/led module was missing from the QuRT config

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 11:55:24 -07:00
Mark Charlebois a0d548db9a Changed circuit_breaker to not use px4.h 
The inclusion of px4.h requires C++ features not supported in the
Hexagon toolchain. The features are not required so the required
headers are used instead.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 11:35:01 -07:00
Mark Charlebois 99822038f3 POSIX: Fixed px4_open code to not create a file when opening a device 
The code to created a virtual file was preventing the creation of
device nodes.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 10:50:23 -07:00
Mark Charlebois 4216a0d64d POSIX: remove check for /tmp/ttyS{0|1} 
The posix build now disables the UART code in mavlink.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 10:46:10 -07:00
Mark Charlebois 41a2d30cfe Merge branch 'linux' of http://github.com/mcharleb/Firmware into linux 2015-05-07 10:08:56 -07:00
Mark Charlebois 2002d4e774 POSIX: disable UART in mavlink 
Most of the current POSIX builds will not use the UART and it
is just a unnecessary dependency to satisfy when running in a
test environment.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 10:07:18 -07:00
Mark Charlebois 5e2af2b227 POSIX: fixed return values to be posix compliant 
px4_read, px4_write, and px4_opctl were not returning the correct
value on error. They were returning -errno vs -1.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-07 09:38:03 -07:00
Mark Charlebois 6db77dc8bb Experimental virtual file support 
QuRT does not have a filesystem, so creating a virtual filesystem
that could be implemented as an in-memory file or a remote file
over fastRPC.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-06 22:12:45 -07:00
Mark Charlebois 35e6822d95 Added missing px4_ prefixes 
NuttX build required missing px4_ prefix for systemreset and task_spawn_cmd

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-06 16:25:45 -07:00
Mark Charlebois a0d58552a0 blinkm: merged NuttX and POSIX impelmentations 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-06 16:24:18 -07:00
Mark Charlebois 948b47bd33 Removed px4_killall 
killall and px4_killall are not used in the codebase so it was removed.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-06 16:04:20 -07:00
Mark Charlebois 3a65187303 Fixed bad merge 
Forgot to remove old file line when merging the changes from master.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-06 16:00:00 -07:00
Mark Charlebois db52227409 Merge remote-tracking branch 'upstream/master' into linux 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/accelerometer_calibration.cpp
 2015-05-06 15:51:39 -07:00
Mark Charlebois 04b564920f POSIX: Make binutils BDF linker the default 
ld.gold does not support the -Ur flags and it seems some people have
ld as a link to ld.gold.

Made LD = ld.bfd to avoid confusion.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-06 15:44:37 -07:00