Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

on feather sense we might try two inits, before it would cache the i2c addr #12

Merged
merged 2 commits into from
Dec 28, 2023
Merged

on feather sense we might try two inits, before it would cache the i2c addr #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f5a065
on feather sense we might try two inits, before it would cache the i2…
ladyada Dec 28, 2023
0c86770
clang
ladyada Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions Adafruit_LIS3MDL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@
*
*/

#if ARDUINO >= 100
#include "Arduino.h"
#else
#include "WProgram.h"
#endif

#include <Adafruit_LIS3MDL.h>
#include <Wire.h>

Expand All @@ -45,10 +40,13 @@ Adafruit_LIS3MDL::Adafruit_LIS3MDL() {}
* @return True if initialization was successful, otherwise false.
*/
bool Adafruit_LIS3MDL::begin_I2C(uint8_t i2c_address, TwoWire *wire) {
if (!i2c_dev) {
i2c_dev = new Adafruit_I2CDevice(i2c_address, wire);
}
if (i2c_dev)
delete i2c_dev;
if (spi_dev)
delete spi_dev;

spi_dev = NULL;
i2c_dev = new Adafruit_I2CDevice(i2c_address, wire);

if (!i2c_dev->begin()) {
return false;
Expand All @@ -65,14 +63,17 @@ bool Adafruit_LIS3MDL::begin_I2C(uint8_t i2c_address, TwoWire *wire) {
*/
boolean Adafruit_LIS3MDL::begin_SPI(uint8_t cs_pin, SPIClass *theSPI,
uint32_t frequency) {
if (i2c_dev)
delete i2c_dev;
if (spi_dev)
delete spi_dev;

i2c_dev = NULL;
if (!spi_dev) {
spi_dev = new Adafruit_SPIDevice(cs_pin,
frequency, // frequency
SPI_BITORDER_MSBFIRST, // bit order
SPI_MODE0, // data mode
theSPI);
}
spi_dev = new Adafruit_SPIDevice(cs_pin,
frequency, // frequency
SPI_BITORDER_MSBFIRST, // bit order
SPI_MODE0, // data mode
theSPI);
if (!spi_dev->begin()) {
return false;
}
Expand All @@ -90,13 +91,18 @@ boolean Adafruit_LIS3MDL::begin_SPI(uint8_t cs_pin, SPIClass *theSPI,
*/
bool Adafruit_LIS3MDL::begin_SPI(int8_t cs_pin, int8_t sck_pin, int8_t miso_pin,
int8_t mosi_pin, uint32_t frequency) {

if (i2c_dev)
delete i2c_dev;
if (spi_dev)
delete spi_dev;

i2c_dev = NULL;
if (!spi_dev) {
spi_dev = new Adafruit_SPIDevice(cs_pin, sck_pin, miso_pin, mosi_pin,
frequency, // frequency
SPI_BITORDER_MSBFIRST, // bit order
SPI_MODE0); // data mode
}
spi_dev = new Adafruit_SPIDevice(cs_pin, sck_pin, miso_pin, mosi_pin,
frequency, // frequency
SPI_BITORDER_MSBFIRST, // bit order
SPI_MODE0); // data mode

if (!spi_dev->begin()) {
return false;
}
Expand Down
Loading