rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

BMA180: Enable the EEPROM writing on startup so settings take the first time.

Browse Source
This commit is contained in:
James Cotton 2011-09-02 13:28:36 -05:00
parent e0ed82eef0
commit c40e5800ab
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flight/PiOS/STM32F2xx/pios_bma180.c
View File

@ -53,7 +53,7 @@ static enum bma180_range range;
/** /**
* @brief Initialize with good default settings * @brief Initialize with good default settings
*/ */
void PIOS_BMA180_Init(const struct pios_bma180_cfg * cfg) int32_t PIOS_BMA180_Init(const struct pios_bma180_cfg * cfg)
{ {
dev_cfg = cfg; // store config before enabling interrupt dev_cfg = cfg; // store config before enabling interrupt
@ -69,11 +69,11 @@ void PIOS_BMA180_Init(const struct pios_bma180_cfg * cfg)
/* Enable and set EOC EXTI Interrupt to the lowest priority */ /* Enable and set EOC EXTI Interrupt to the lowest priority */
NVIC_Init(&cfg->eoc_irq.init); NVIC_Init(&cfg->eoc_irq.init);
PIOS_BMA180_Config(); if(PIOS_BMA180_Config() < 0)
PIOS_BMA180_SelectBW(BMA_BW_600HZ); return -1;
PIOS_BMA180_SetRange(BMA_RANGE_8G);
PIOS_DELAY_WaituS(50); PIOS_DELAY_WaituS(50);
PIOS_BMA180_EnableIrq(); PIOS_BMA180_EnableIrq();
return 0;
} }
/** /**
@ -172,18 +172,24 @@ static int32_t PIOS_BMA180_Config()
0x21 = 0x02 //new_data_int = 1 0x21 = 0x02 //new_data_int = 1
*/ */
PIOS_DELAY_WaituS(20);
if(PIOS_BMA180_EnableEeprom() < 0)
return -1;
if(PIOS_BMA180_SetReg(BMA_RESET, BMA_RESET_CODE) < 0) if(PIOS_BMA180_SetReg(BMA_RESET, BMA_RESET_CODE) < 0)
return -1; return -1;
PIOS_DELAY_WaituS(100);
if(PIOS_BMA180_SetReg(BMA_OFFSET_LSB1, 0x81) < 0) if(PIOS_BMA180_SetReg(BMA_OFFSET_LSB1, 0x81) < 0)
return -1; return -1;
if(PIOS_BMA180_SetReg(BMA_GAIN_Y, 0x81) < 0) if(PIOS_BMA180_SetReg(BMA_GAIN_Y, 0x81) < 0)
return -1; return -1;
if(PIOS_BMA180_SetReg(BMA_CTRREG3, 0xFF) < 0) if(PIOS_BMA180_SetReg(BMA_CTRREG3, 0xFF) < 0)
return -1; return -1;
PIOS_BMA180_SelectBW(BMA_BW_600HZ);
PIOS_BMA180_SetRange(BMA_RANGE_8G);
if(PIOS_BMA180_DisableEeprom() < 0)
return -1;
return 0; return 0;
} }

2
flight/PiOS/inc/pios_bma180.h
View File

@ -97,7 +97,7 @@ struct pios_bma180_cfg {
}; };
/* Public Functions */ /* Public Functions */
extern void PIOS_BMA180_Init(const struct pios_bma180_cfg * cfg); extern int32_t PIOS_BMA180_Init(const struct pios_bma180_cfg * cfg);
extern void PIOS_BMA180_Attach(uint32_t spi_id); extern void PIOS_BMA180_Attach(uint32_t spi_id);
extern float PIOS_BMA180_GetScale(); extern float PIOS_BMA180_GetScale();
extern int32_t PIOS_BMA180_ReadFifo(struct pios_bma180_data * buffer); extern int32_t PIOS_BMA180_ReadFifo(struct pios_bma180_data * buffer);