Skip to content

Commit b8900be

Browse files
committed
Merge branch 'upstream-main' into add-qmc5883p-vectorless
2 parents 2723c39 + 9b79afc commit b8900be

File tree

7 files changed

+435
-3
lines changed

7 files changed

+435
-3
lines changed

library.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name=Adafruit WipperSnapper
2-
version=1.0.0-beta.110
2+
version=1.0.0-beta.111
33
author=Adafruit
44
maintainer=Adafruit <[email protected]>
55
sentence=Arduino application for Adafruit.io WipperSnapper
66
paragraph=Arduino application for Adafruit.io WipperSnapper
77
category=Communication
88
url=https://github.com/adafruit/Adafruit_Wippersnapper_Arduino
99
architectures=*
10-
depends=OmronD6T - Community Fork, SdFat - Adafruit Fork, Adafruit NeoPixel, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, Adafruit INA219, Adafruit INA260 Library, Adafruit INA237 and INA238 Library, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit DPS310, Adafruit DS248x, Adafruit SCD30, Adafruit SGP30 Sensor, Adafruit SGP40 Sensor, Sensirion I2C SCD4x, Sensirion I2C SEN5X, Sensirion I2C SEN66, arduino-sht, Adafruit Si7021 Library, Adafruit MQTT Library, Adafruit MS8607, Adafruit MCP9808 Library, Adafruit MCP9600 Library, Adafruit MPL115A2, Adafruit MPRLS Library, Adafruit TSL2591 Library, Adafruit_VL53L0X, Adafruit VL53L1X, STM32duino VL53L4CD, STM32duino VL53L4CX, Adafruit_VL6180X, Adafruit PM25 AQI Sensor, Adafruit QMC5883P Library, Adafruit VCNL4020 Library, Adafruit VCNL4040, Adafruit VCNL4200 Library, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS28, Adafruit LPS35HW, Adafruit seesaw Library, Adafruit BME680 Library, Adafruit MAX1704X, Adafruit ADT7410 Library, Adafruit HTS221, Adafruit HTU21DF Library, Adafruit HTU31D Library, Adafruit PCT2075, hp_BH1750, ENS160 - Adafruit Fork, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, Adafruit GFX Library, Adafruit LED Backpack Library, Adafruit LiquidCrystal, Adafruit SH110X, Adafruit SSD1306
10+
depends=OmronD6T - Community Fork, SdFat - Adafruit Fork, Adafruit NeoPixel, Adafruit SPIFlash, ArduinoJson, Adafruit DotStar, Adafruit HDC302x, Adafruit INA219, Adafruit INA260 Library, Adafruit INA237 and INA238 Library, Adafruit LTR329 and LTR303, Adafruit LTR390 Library, Adafruit MCP3421, Adafruit MLX90632 Library, Adafruit NAU7802 Library, Adafruit SleepyDog Library, Adafruit TMP117, Adafruit TinyUSB Library, Adafruit AHTX0, Adafruit AS5600 Library, Adafruit BME280 Library, Adafruit BMP280 Library, Adafruit BMP3XX Library, Adafruit DPS310, Adafruit DS248x, Adafruit SCD30, Adafruit SGP30 Sensor, Adafruit SGP40 Sensor, Sensirion I2C SCD4x, Sensirion I2C SEN5X, Sensirion I2C SEN66, arduino-sht, Adafruit Si7021 Library, Adafruit MQTT Library, Adafruit MS8607, Adafruit MCP9808 Library, Adafruit MCP9600 Library, Adafruit MPL115A2, Adafruit MPRLS Library, Adafruit TSL2591 Library, Adafruit_VL53L0X, Adafruit VL53L1X, STM32duino VL53L4CD, STM32duino VL53L4CX, Adafruit_VL6180X, Adafruit PM25 AQI Sensor, Adafruit QMC5883P Library, Adafruit VCNL4020 Library, Adafruit VCNL4040, Adafruit VCNL4200 Library, Adafruit VEML7700 Library, Adafruit LC709203F, Adafruit LPS2X, Adafruit LPS28, Adafruit LPS35HW, Adafruit seesaw Library, Adafruit BME680 Library, Adafruit MAX1704X, Adafruit ADT7410 Library, Adafruit HTS221, Adafruit HTU21DF Library, Adafruit HTU31D Library, Adafruit PCT2075, hp_BH1750, ENS160 - Adafruit Fork, Adafruit BusIO, Adafruit Unified Sensor, Sensirion Core, Adafruit GFX Library, Adafruit LED Backpack Library, Adafruit LiquidCrystal, Adafruit SH110X, Adafruit SSD1306

platformio.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ lib_deps =
3232
adafruit/ENS160 - Adafruit Fork
3333
adafruit/Adafruit SleepyDog Library
3434
adafruit/Adafruit AHTX0
35+
adafruit/Adafruit AS5600 Library
3536
adafruit/Adafruit BME280 Library
3637
adafruit/Adafruit BMP280 Library
3738
adafruit/Adafruit BMP3XX Library
@@ -58,6 +59,7 @@ lib_deps =
5859
adafruit/Adafruit MCP3421
5960
adafruit/Adafruit MCP9808 Library
6061
adafruit/Adafruit MCP9600 Library
62+
adafruit/Adafruit MLX90632 Library
6163
adafruit/Adafruit MPL115A2
6264
adafruit/Adafruit MPRLS Library
6365
adafruit/Adafruit MS8607

src/Wippersnapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
#endif
143143

144144
#define WS_VERSION \
145-
"1.0.0-beta.110" ///< WipperSnapper app. version (semver-formatted)
145+
"1.0.0-beta.111" ///< WipperSnapper app. version (semver-formatted)
146146

147147
// Reserved Adafruit IO MQTT topics
148148
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic

src/components/i2c/WipperSnapper_I2C.cpp

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,16 @@ bool WipperSnapper_Component_I2C::initI2CDevice(
236236
}
237237
_ahtx0->configureDriver(msgDeviceInitReq);
238238
drivers.push_back(_ahtx0);
239+
} else if (strcmp("as5600", msgDeviceInitReq->i2c_device_name) == 0) {
240+
_as5600 = new WipperSnapper_I2C_Driver_AS5600(this->_i2c, i2cAddress);
241+
if (!_as5600->begin()) {
242+
WS_DEBUG_PRINTLN("ERROR: Failed to initialize AS5600 chip!");
243+
_busStatusResponse =
244+
wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL;
245+
return false;
246+
}
247+
_as5600->configureDriver(msgDeviceInitReq);
248+
drivers.push_back(_as5600);
239249
} else if (strcmp("bh1750", msgDeviceInitReq->i2c_device_name) == 0) {
240250
_bh1750 = new WipperSnapper_I2C_Driver_BH1750(this->_i2c, i2cAddress);
241251
if (!_bh1750->begin()) {
@@ -537,6 +547,33 @@ bool WipperSnapper_Component_I2C::initI2CDevice(
537547
_mcp9808->configureDriver(msgDeviceInitReq);
538548
drivers.push_back(_mcp9808);
539549
WS_DEBUG_PRINTLN("MCP9808 Initialized Successfully!");
550+
} else if (strcmp("mlx90632b", msgDeviceInitReq->i2c_device_name) == 0 ||
551+
strcmp("mlx90632d_med", msgDeviceInitReq->i2c_device_name) == 0) {
552+
_mlx90632d = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress);
553+
if (!_mlx90632d->begin()) {
554+
WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632!");
555+
_busStatusResponse =
556+
wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL;
557+
return false;
558+
}
559+
_mlx90632d->configureDriver(msgDeviceInitReq);
560+
drivers.push_back(_mlx90632d);
561+
WS_DEBUG_PRINTLN("MLX90632 Initialized Successfully!");
562+
} else if (strcmp("mlx90632d_ext", msgDeviceInitReq->i2c_device_name) == 0) {
563+
_mlx90632d_ext =
564+
new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress);
565+
// set extended range
566+
if (!_mlx90632d_ext->begin() ||
567+
!_mlx90632d_ext->ConfigureAndPrintSensorInfo(true)) {
568+
WS_DEBUG_PRINTLN(
569+
"ERROR: Failed to initialize MLX90632D with extended range!");
570+
_busStatusResponse =
571+
wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL;
572+
return false;
573+
}
574+
_mlx90632d_ext->configureDriver(msgDeviceInitReq);
575+
drivers.push_back(_mlx90632d_ext);
576+
WS_DEBUG_PRINTLN("MLX90632D_EXT Initialized Successfully!");
540577
} else if (strcmp("mpl115a2", msgDeviceInitReq->i2c_device_name) == 0) {
541578
_mpl115a2 = new WipperSnapper_I2C_Driver_MPL115A2(this->_i2c, i2cAddress);
542579
if (!_mpl115a2->begin()) {

src/components/i2c/WipperSnapper_I2C.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include "drivers/WipperSnapper_I2C_Driver.h"
2323
#include "drivers/WipperSnapper_I2C_Driver_ADT7410.h"
2424
#include "drivers/WipperSnapper_I2C_Driver_AHTX0.h"
25+
#include "drivers/WipperSnapper_I2C_Driver_AS5600.h"
2526
#include "drivers/WipperSnapper_I2C_Driver_BH1750.h"
2627
#include "drivers/WipperSnapper_I2C_Driver_BME280.h"
2728
#include "drivers/WipperSnapper_I2C_Driver_BME680.h"
@@ -50,6 +51,7 @@
5051
#include "drivers/WipperSnapper_I2C_Driver_MAX17048.h"
5152
#include "drivers/WipperSnapper_I2C_Driver_MCP3421.h"
5253
#include "drivers/WipperSnapper_I2C_Driver_MCP9808.h"
54+
#include "drivers/WipperSnapper_I2C_Driver_MLX90632D.h"
5355
#include "drivers/WipperSnapper_I2C_Driver_MPL115A2.h"
5456
#include "drivers/WipperSnapper_I2C_Driver_MPRLS.h"
5557
#include "drivers/WipperSnapper_I2C_Driver_MS8607.h"
@@ -159,6 +161,7 @@ class WipperSnapper_Component_I2C {
159161
_drivers_out; ///< List of i2c output drivers
160162
// Sensor driver objects
161163
WipperSnapper_I2C_Driver_AHTX0 *_ahtx0 = nullptr;
164+
WipperSnapper_I2C_Driver_AS5600 *_as5600 = nullptr;
162165
WipperSnapper_I2C_Driver_D6T1A *_d6t1a = nullptr;
163166
WipperSnapper_I2C_Driver_DPS310 *_dps310 = nullptr;
164167
WipperSnapper_I2C_Driver_DS2484 *_ds2484 = nullptr;
@@ -182,6 +185,8 @@ class WipperSnapper_Component_I2C {
182185
WipperSnapper_I2C_Driver_LTR390 *_ltr390 = nullptr;
183186
WipperSnapper_I2C_Driver_MCP3421 *_mcp3421 = nullptr;
184187
WipperSnapper_I2C_Driver_MCP9808 *_mcp9808 = nullptr;
188+
WipperSnapper_I2C_Driver_MLX90632D *_mlx90632d = nullptr;
189+
WipperSnapper_I2C_Driver_MLX90632D *_mlx90632d_ext = nullptr;
185190
WipperSnapper_I2C_Driver_MPL115A2 *_mpl115a2 = nullptr;
186191
WipperSnapper_I2C_Driver_MPRLS *_mprls = nullptr;
187192
WipperSnapper_I2C_Driver_MS8607 *_ms8607 = nullptr;
Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
/*!
2+
* @file WipperSnapper_I2C_Driver_AS5600.h
3+
*
4+
* Device driver for the AS5600 Magnetic Angle sensor.
5+
*
6+
* Adafruit invests time and resources providing this open source code,
7+
* please support Adafruit and open-source hardware by purchasing
8+
* products from Adafruit!
9+
*
10+
* Copyright (c) Tyeth Gundry 2024 for Adafruit Industries.
11+
*
12+
* MIT license, all text here must be included in any redistribution.
13+
*
14+
*/
15+
#ifndef WipperSnapper_I2C_Driver_AS5600_H
16+
#define WipperSnapper_I2C_Driver_AS5600_H
17+
18+
#include <Adafruit_AS5600.h>
19+
20+
#include "WipperSnapper_I2C_Driver.h"
21+
#include "Wippersnapper.h"
22+
23+
/**************************************************************************/
24+
/*!
25+
@brief Class that provides a driver interface for a AS5600 sensor.
26+
*/
27+
/**************************************************************************/
28+
class WipperSnapper_I2C_Driver_AS5600 : public WipperSnapper_I2C_Driver {
29+
public:
30+
/*******************************************************************************/
31+
/*!
32+
@brief Constructor for the AS5600 sensor.
33+
@param i2c
34+
The I2C interface.
35+
@param sensorAddress
36+
7-bit device address.
37+
*/
38+
/*******************************************************************************/
39+
WipperSnapper_I2C_Driver_AS5600(TwoWire *i2c, uint16_t sensorAddress)
40+
: WipperSnapper_I2C_Driver(i2c, sensorAddress) {
41+
_as5600 = nullptr;
42+
_angle = 0;
43+
}
44+
45+
/*******************************************************************************/
46+
/*!
47+
@brief Destructor for an AS5600 sensor.
48+
*/
49+
/*******************************************************************************/
50+
~WipperSnapper_I2C_Driver_AS5600() {
51+
if (_as5600) {
52+
delete _as5600;
53+
_as5600 = nullptr;
54+
}
55+
}
56+
57+
/*******************************************************************************/
58+
/*!
59+
@brief Initializes the AS5600 sensor and begins I2C.
60+
@returns True if initialized successfully, False otherwise.
61+
*/
62+
/*******************************************************************************/
63+
bool begin() {
64+
_as5600 = new Adafruit_AS5600();
65+
if (!_as5600->begin((uint8_t)_sensorAddress, _i2c)) {
66+
WS_DEBUG_PRINTLN("Failed to find AS5600 chip");
67+
return false;
68+
}
69+
70+
if (!configureSensor()) {
71+
WS_DEBUG_PRINTLN("Failed to configure AS5600 sensor");
72+
return false;
73+
}
74+
return true;
75+
}
76+
77+
/*******************************************************************************/
78+
/*!
79+
@brief Configures the AS5600 sensor.
80+
@returns True if the sensor was configured successfully, False otherwise.
81+
*/
82+
/*******************************************************************************/
83+
bool configureSensor() {
84+
return _as5600->enableWatchdog(false) &&
85+
// Normal (high) power mode
86+
_as5600->setPowerMode(AS5600_POWER_MODE_NOM) &&
87+
// No Hysteresis
88+
_as5600->setHysteresis(AS5600_HYSTERESIS_OFF) &&
89+
// analog output (0-VCC for 0-360 degrees)
90+
_as5600->setOutputStage(AS5600_OUTPUT_STAGE_ANALOG_FULL) &&
91+
// setup filters
92+
_as5600->setSlowFilter(AS5600_SLOW_FILTER_16X) &&
93+
_as5600->setFastFilterThresh(AS5600_FAST_FILTER_THRESH_SLOW_ONLY) &&
94+
// Reset position settings to defaults
95+
_as5600->setZPosition(0) && _as5600->setMPosition(4095) &&
96+
_as5600->setMaxAngle(4095);
97+
}
98+
99+
/*******************************************************************************/
100+
/*!
101+
@brief Reads the Angle sensor.
102+
@returns True if the sensor was read successfully, False otherwise.
103+
*/
104+
/*******************************************************************************/
105+
bool readSensor() {
106+
if (!_as5600->isMagnetDetected()) {
107+
WS_DEBUG_PRINTLN("Magnet not detected!");
108+
return false;
109+
}
110+
111+
// Continuously read and display angle values
112+
uint16_t rawAngle = _as5600->getRawAngle();
113+
uint16_t angle = _as5600->getAngle();
114+
115+
WS_DEBUG_PRINT("AS5600 Raw: ");
116+
WS_DEBUG_PRINT(rawAngle);
117+
WS_DEBUG_PRINT(" | Scaled: ");
118+
WS_DEBUG_PRINT(angle);
119+
120+
// Check status conditions
121+
if (_as5600->isAGCminGainOverflow()) {
122+
WS_DEBUG_PRINTLN(" | MH: magnet too strong");
123+
return false;
124+
}
125+
if (_as5600->isAGCmaxGainOverflow()) {
126+
WS_DEBUG_PRINTLN(" | ML: magnet too weak");
127+
return false;
128+
}
129+
_angle = ((float)angle / 4095.0) * 360.0;
130+
return true;
131+
}
132+
133+
/*******************************************************************************/
134+
/*!
135+
@brief Reads the Angle sensor with short wait for data.
136+
@param rawEvent
137+
Angle sensor reading
138+
@returns True if the sensor event was obtained successfully, False
139+
otherwise.
140+
*/
141+
/*******************************************************************************/
142+
bool getEventRaw(sensors_event_t *rawEvent) {
143+
if (!readSensor()) {
144+
return false;
145+
}
146+
rawEvent->data[0] = _angle;
147+
return true;
148+
}
149+
150+
protected:
151+
float _angle; ///< Current angle reading from the AS5600 sensor
152+
Adafruit_AS5600 *_as5600; ///< Pointer to AS5600 sensor object
153+
};
154+
155+
#endif // WipperSnapper_I2C_Driver_AS5600

0 commit comments

Comments
 (0)