diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 19:23:07 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 19:23:07 +0200 |
| commit | 01da782a8d5335f6bf91bb2d0303c4afdd25bf76 (patch) | |
| tree | c953a2c778f5f34fa694e8d4412b787853124e2b /src/modules | |
| parent | 00af2d5a3dcf565c77948a2545865193a58ec3bf (diff) | |
| parent | e6b5e3ae613e89189ac69cf0b174b10002d51068 (diff) | |
| download | px4-firmware-01da782a8d5335f6bf91bb2d0303c4afdd25bf76.tar.gz px4-firmware-01da782a8d5335f6bf91bb2d0303c4afdd25bf76.tar.bz2 px4-firmware-01da782a8d5335f6bf91bb2d0303c4afdd25bf76.zip | |
Merge pull request #1152 from PX4/sensor_drivers
Sensor drivers
Diffstat (limited to 'src/modules')
| m--------- | src/modules/ekf_att_pos_estimator/InertialNav | 0 | ||||
| -rw-r--r-- | src/modules/systemlib/board_serial.c | 8 | ||||
| -rw-r--r-- | src/modules/systemlib/board_serial.h | 2 | ||||
| -rw-r--r-- | src/modules/systemlib/otp.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/ekf_att_pos_estimator/InertialNav b/src/modules/ekf_att_pos_estimator/InertialNav new file mode 160000 +Subproject 8b65d755b8c4834f90a323172c25d91c45068e2 diff --git a/src/modules/systemlib/board_serial.c b/src/modules/systemlib/board_serial.c index ad8c2bf83..182fd15c6 100644 --- a/src/modules/systemlib/board_serial.c +++ b/src/modules/systemlib/board_serial.c @@ -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; -}
\ No newline at end of file +} diff --git a/src/modules/systemlib/board_serial.h b/src/modules/systemlib/board_serial.h index b14bb4376..873d9657b 100644 --- a/src/modules/systemlib/board_serial.h +++ b/src/modules/systemlib/board_serial.h @@ -44,6 +44,6 @@ __BEGIN_DECLS -__EXPORT int get_board_serial(char *serialid); +__EXPORT int get_board_serial(uint8_t *serialid); __END_DECLS diff --git a/src/modules/systemlib/otp.h b/src/modules/systemlib/otp.h index f10e129d8..273b064f0 100644 --- a/src/modules/systemlib/otp.h +++ b/src/modules/systemlib/otp.h @@ -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) |