diff options
| author | Mike Beattie <mike@ethernal.org> | 2013-03-10 19:07:01 +1300 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2013-03-10 19:07:01 +1300 |
| commit | d029acad6a992be9b7b4498e70605f8a1e1a4ef6 (patch) | |
| tree | 851283be0bcb5915bd54e2c19073531336080bd5 /src/drivers/ao_hmc5883.c | |
| parent | eba7b2ef8ef23bdb61b0390e47be6f27ffde31dc (diff) | |
| parent | 72c5b1429bdfd6e9d2185bad7d0adb281fdf659a (diff) | |
Merge branch 'master' into altosdroid
Diffstat (limited to 'src/drivers/ao_hmc5883.c')
| -rw-r--r-- | src/drivers/ao_hmc5883.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/ao_hmc5883.c b/src/drivers/ao_hmc5883.c index 059fc2c8..782d03f4 100644 --- a/src/drivers/ao_hmc5883.c +++ b/src/drivers/ao_hmc5883.c @@ -77,11 +77,11 @@ ao_hmc5883_sample(struct ao_hmc5883_sample *sample) ao_hmc5883_reg_write(HMC5883_MODE, HMC5883_MODE_SINGLE); ao_alarm(AO_MS_TO_TICKS(10)); - cli(); + ao_arch_block_interrupts(); while (!ao_hmc5883_done) if (ao_sleep(&ao_hmc5883_done)) ++ao_hmc5883_missed_irq; - sei(); + ao_arch_release_interrupts(); ao_clear_alarm(); ao_hmc5883_read(HMC5883_X_MSB, (uint8_t *) sample, sizeof (struct ao_hmc5883_sample)); @@ -109,7 +109,7 @@ ao_hmc5883_setup(void) ao_i2c_put(AO_HMC5883_I2C_INDEX); if (!present) - ao_panic(AO_PANIC_SELF_TEST); + ao_panic(AO_PANIC_SELF_TEST_HMC5883); ao_hmc5883_reg_write(HMC5883_CONFIG_A, (HMC5883_CONFIG_A_MA_8 << HMC5883_CONFIG_A_MA) | |