fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-26 02:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Workaround to get the HMC5883 default rate right

Browse Source
This commit is contained in:
Julian Oes
2013-08-21 10:44:47 +02:00
parent 9762cf86a0
commit 3875df2fe0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/hmc5883/hmc5883.cpp
+4 -4
View File
@@ -77,8 +77,8 @@
#define HMC5883L_ADDRESS PX4_I2C_OBDEV_HMC5883 #define HMC5883L_ADDRESS PX4_I2C_OBDEV_HMC5883
/* Max measurement rate is 160Hz */ /* Max measurement rate is 160Hz, however with 160 it will be set to 166 Hz, therefore workaround using 150 */
#define HMC5883_CONVERSION_INTERVAL (1000000 / 160) /* microseconds */ #define HMC5883_CONVERSION_INTERVAL (1000000 / 150) /* microseconds */
#define ADDR_CONF_A 0x00 #define ADDR_CONF_A 0x00
#define ADDR_CONF_B 0x01 #define ADDR_CONF_B 0x01
@@ -607,7 +607,7 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
if (_measure_ticks == 0) if (_measure_ticks == 0)
return SENSOR_POLLRATE_MANUAL; return SENSOR_POLLRATE_MANUAL;
return (1000 / _measure_ticks); return 1000000/TICK2USEC(_measure_ticks);
case SENSORIOCSQUEUEDEPTH: { case SENSORIOCSQUEUEDEPTH: {
/* add one to account for the sentinel in the ring */ /* add one to account for the sentinel in the ring */
@@ -645,7 +645,7 @@ HMC5883::ioctl(struct file *filp, int cmd, unsigned long arg)
case MAGIOCGSAMPLERATE: case MAGIOCGSAMPLERATE:
/* same as pollrate because device is in single measurement mode*/ /* same as pollrate because device is in single measurement mode*/
return ioctl(filp, SENSORIOCGPOLLRATE, 0); return 1000000/TICK2USEC(_measure_ticks);
case MAGIOCSRANGE: case MAGIOCSRANGE:
return set_range(arg); return set_range(arg);