fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-01 12:40:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1152 from PX4/sensor_drivers

Browse Source 
Sensor drivers
This commit is contained in:
Lorenz Meier
2014-07-12 19:23:07 +02:00
parent 00af2d5a3d e6b5e3ae61
commit 01da782a8d
37 changed files with 1792 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/ekf_att_pos_estimator/InertialNav
Submodule
+1
Submodule src/modules/ekf_att_pos_estimator/InertialNav added at 8b65d755b8
src/modules/systemlib/board_serial.c
+4 -4
View File
@@ -44,11 +44,11 @@
#include "board_config.h"
#include "board_serial.h"
int get_board_serial(char *serialid)
int get_board_serial(uint8_t *serialid)
{
const volatile unsigned *udid_ptr = (const unsigned *)UDID_START;
const volatile uint32_t *udid_ptr = (const uint32_t *)UDID_START;
union udid id;
val_read((unsigned *)&id, udid_ptr, sizeof(id));
val_read((uint32_t *)&id, udid_ptr, sizeof(id));
/* Copy the serial from the chips non-write memory and swap endianess */
@@ -57,4 +57,4 @@ int get_board_serial(char *serialid)
serialid[8] = id.data[11]; serialid[9] = id.data[10]; serialid[10] = id.data[9]; serialid[11] = id.data[8];
return 0;
}
}
src/modules/systemlib/board_serial.h
+1 -1
View File
@@ -44,6 +44,6 @@
__BEGIN_DECLS
__EXPORT int get_board_serial(char *serialid);
__EXPORT int get_board_serial(uint8_t *serialid);
__END_DECLS
src/modules/systemlib/otp.h
+1 -1
View File
@@ -125,7 +125,7 @@ struct otp_lock {
#pragma pack(push, 1)
union udid {
uint32_t serial[3];
char data[12];
uint8_t data[12];
};
#pragma pack(pop)