fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,418 Commits 852 Branches 161 Tags
Commit Graph

17418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Charlebois
fea910d45a Code cleanup and ifdefs required for qurt build 
Code that was previously out of tree that was #if 0, is now #ifdef __PX4_QURT.
These changes were required for flight using the qurt build.

Changes include code cleanup for shmem_posix.c.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:43 +01:00
Mark Charlebois
8634452d6d Fixed logic for posix SITL build 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:43 +01:00
Mark Charlebois
49eacbf6b0 Updated src/lib/DriverFramework 2016-02-19 16:59:43 +01:00
Mark Charlebois
a356e845dc Updated cmake/cmake_hexagon 2016-02-19 16:59:43 +01:00
Mark Charlebois
62635fe37d Reverted to older version 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
d7505af067 Removed load of string vs file for qurt build 
DSPAL now supports reading from a file so the change is no longer
required.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
4e79300bdb Removed extra carriage return 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
29f8409445 Reverted change to src/modules/mc_pos_control/mc_pos_control_main.cpp 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
a996b94c41 Reverted change to src/modules/simulator/simulator_mavlink.cpp 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
a002d6eabd Added rpcmem.a to posix_eagle_release build 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
5846a22a8f Code format fixes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
d6a99c79c1 Added back ending carriage return 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
fa4434ad96 Backed out change to uORBDevices_posix.cpp 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
d079c1a33e Backed out bad merge change in commander.cpp 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
05580d8d65 Backed out change to attitude_estimator_q_main.cpp introduced in merge 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
8a1335dbd9 Backed out commented out line 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
20bc45f187 Removed extraneous ifdef __PX4_QURT 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
9cf44c0a31 Backed out added code from bad merge 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
c06d51d02a More bad merge fixes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
7860c959a5 Whitespace fixes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
ff1a38dba6 Fixed bad merge artifacts 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
0c42c469af Removed extra returns 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
01d0543e0a Provide impelmentation of px4muorb_KraitRpcWrapper 
The Terminate function is not properly implemented yet.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
7389ea7648 Merge fixes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
da8519b44d Removed duplicate target in Makefile 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
87524955b0 Whitespace fix 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
20f7d3d49f Whitespace fixes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:42 +01:00
Mark Charlebois
b63e29e53d Removed bad integration changes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
65d89b5b97 Rebase changes on upstream master 
This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
a0d91d2225 Made generic external module support 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
136c6da36d Generalized use of external modules 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
7d9a14dab5 Removed duplicate target in Makefile 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
b70f87af34 Whitespace fix 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
252eca9fb5 Require HEXAGON_ARM_SYSROOT for arm-linux-gnueabihf 
The Toolchain-arm-linux-gnueabihf.cmake is currently used for
the SnapdragonFlight Apps processor.

The sysroot is required for cross building for Ubuntu 14.04 armhf.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
53bf98c630 Fixed HEXAGON_ARM_SYSROOT 
This was being reset in px4_impl_posix.cmake

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
8ca3e8e057 Whitespace fixes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
0e24e808ab Removed dspal submodule, added px4muorb.idl 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
2a1ec7aad8 Removed bad integration changes 
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
Mark Charlebois
9f3bf8e9f4 Rebase changes on upstream master 
This brings in many of the changes from the PX4 fork on ATLFLight.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2016-02-19 16:59:41 +01:00
tumbili
efe9344fc2 removed text from generic quav250 startup script because it was interpreted as a command 2016-02-19 14:37:26 +01:00
Mark Whitehorn
7c91aaee64 add generic 250 quad_x config tuned for acro mode 2016-02-19 08:58:19 +01:00
Daniel Agar
7fbd4a0b5b sensors fix code style 2016-02-18 21:25:49 -05:00
Lorenz Meier
eb11c91733 Fix airspeed check in simulation 2016-02-18 22:53:43 +01:00
ksschwabe
4b6d0ef0a6 batt_smbus: Adds check for if the battery detected is a 3DR solo battery 
Also, if the battery is a 3DR Solo battery, it checks for the button
press on the battery which sets the is_powering_off flag.

The check for whether the battery is a 3DR Solo battery is based on
whether the Manufacturer Name, Device Name and Device Chemistry all
match the that of the standard 3DR Solo battery.
 2016-02-18 21:47:09 +01:00
ksschwabe
27a645353b batt_smbus: Adds functions for reading out the SBS Info 
Functions added for reading out the following info:
 - Manufacturer Name
 - Device Name
 - Serial Number
 - Device Chemistry
 2016-02-18 21:47:09 +01:00
ksschwabe
e3f2467b91 batt_smbus: Commentted out button press detection 
The button press detection relies on reading the MANUFACTURER_DATA
register. The implementation of what information is returned when reading
this register differs from manufacturer to manufacturer.

This has been commented out until an elegant solution can be found to detect
the battery shutdown on different batteries manufactured by different
manufacturers.
 2016-02-18 21:47:09 +01:00
Angus Peart
6ac26c680d batt_smbus: read button status from the smart battery 
This is a cherry-pick of commit 8bd17a4b0cd9c1432cb57a9a80a215692f532370
in 3drobotics/PX4Firmware-solo

Conflicts:
	src/drivers/batt_smbus/batt_smbus.cpp
	src/drivers/drv_irlock.h
	src/lib/ecl
 2016-02-18 21:47:09 +01:00
ksschwabe
7fc0b0925c batt_smbus: Adds ManufacturerAccess, write_reg, and write_block functions 
Also fixes the the PEC calculation for writing. See
http://cache.freescale.com/files/32bit/doc/app_note/AN4471.pdf and
http://www.ti.com/lit/an/sloa132/sloa132.pdf for more details for more
details on SMBus reading and writing including with and without PECs.
 2016-02-18 21:47:09 +01:00
sander
90276fa3a7 VTOL: check feasibility as rotary wing 2016-02-18 21:42:37 +01:00
Lorenz Meier
8007a84ab3 FMU: Ensure an all-low output set on boot with direct start of the PWM sequence 2016-02-18 19:01:44 +01:00