From e873237b5e6121924bafc2fb0c484fa0b46a85c9 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 12:33:33 +0100 Subject: [PATCH 01/15] add(driver): Add MLX90632 driver w/ debug info --- library.properties | 4 +- platformio.ini | 1 + src/Wippersnapper.h | 2 +- src/components/i2c/WipperSnapper_I2C.cpp | 11 + src/components/i2c/WipperSnapper_I2C.h | 2 + .../WipperSnapper_I2C_Driver_MLX90632.h | 328 ++++++++++++++++++ 6 files changed, 345 insertions(+), 3 deletions(-) create mode 100644 src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h diff --git a/library.properties b/library.properties index 9ef6dc4a..d6a7e6b2 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=Adafruit WipperSnapper -version=1.0.0-beta.110 +version=1.0.0-beta.111 author=Adafruit maintainer=Adafruit sentence=Arduino application for Adafruit.io WipperSnapper @@ -7,4 +7,4 @@ paragraph=Arduino application for Adafruit.io WipperSnapper category=Communication url=https://github.com/adafruit/Adafruit_Wippersnapper_Arduino architectures=* -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 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 +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 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 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 diff --git a/platformio.ini b/platformio.ini index 28f06511..ab46ba5d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -57,6 +57,7 @@ lib_deps = adafruit/Adafruit MCP3421 adafruit/Adafruit MCP9808 Library adafruit/Adafruit MCP9600 Library + adafruit/Adafruit MLX90632 Library adafruit/Adafruit MPL115A2 adafruit/Adafruit MPRLS Library adafruit/Adafruit MS8607 diff --git a/src/Wippersnapper.h b/src/Wippersnapper.h index dc3152d0..136b529c 100644 --- a/src/Wippersnapper.h +++ b/src/Wippersnapper.h @@ -142,7 +142,7 @@ #endif #define WS_VERSION \ - "1.0.0-beta.110" ///< WipperSnapper app. version (semver-formatted) + "1.0.0-beta.111" ///< WipperSnapper app. version (semver-formatted) // Reserved Adafruit IO MQTT topics #define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index a074e7f7..6078dfb1 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -537,6 +537,17 @@ bool WipperSnapper_Component_I2C::initI2CDevice( _mcp9808->configureDriver(msgDeviceInitReq); drivers.push_back(_mcp9808); WS_DEBUG_PRINTLN("MCP9808 Initialized Successfully!"); + } else if (strcmp("mlx90632", msgDeviceInitReq->i2c_device_name) == 0) { + _mlx90632 = new WipperSnapper_I2C_Driver_MLX90632(this->_i2c, i2cAddress); + if (!_mlx90632->begin()) { + WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632!"); + _busStatusResponse = + wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL; + return false; + } + _mlx90632->configureDriver(msgDeviceInitReq); + drivers.push_back(_mlx90632); + WS_DEBUG_PRINTLN("MLX90632 Initialized Successfully!"); } else if (strcmp("mpl115a2", msgDeviceInitReq->i2c_device_name) == 0) { _mpl115a2 = new WipperSnapper_I2C_Driver_MPL115A2(this->_i2c, i2cAddress); if (!_mpl115a2->begin()) { diff --git a/src/components/i2c/WipperSnapper_I2C.h b/src/components/i2c/WipperSnapper_I2C.h index c594e0bf..67e8f3b4 100644 --- a/src/components/i2c/WipperSnapper_I2C.h +++ b/src/components/i2c/WipperSnapper_I2C.h @@ -50,6 +50,7 @@ #include "drivers/WipperSnapper_I2C_Driver_MAX17048.h" #include "drivers/WipperSnapper_I2C_Driver_MCP3421.h" #include "drivers/WipperSnapper_I2C_Driver_MCP9808.h" +#include "drivers/WipperSnapper_I2C_Driver_MLX90632.h" #include "drivers/WipperSnapper_I2C_Driver_MPL115A2.h" #include "drivers/WipperSnapper_I2C_Driver_MPRLS.h" #include "drivers/WipperSnapper_I2C_Driver_MS8607.h" @@ -180,6 +181,7 @@ private: WipperSnapper_I2C_Driver_LTR390 *_ltr390 = nullptr; WipperSnapper_I2C_Driver_MCP3421 *_mcp3421 = nullptr; WipperSnapper_I2C_Driver_MCP9808 *_mcp9808 = nullptr; + WipperSnapper_I2C_Driver_MLX90632 *_mlx90632 = nullptr; WipperSnapper_I2C_Driver_MPL115A2 *_mpl115a2 = nullptr; WipperSnapper_I2C_Driver_MPRLS *_mprls = nullptr; WipperSnapper_I2C_Driver_MS8607 *_ms8607 = nullptr; diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h new file mode 100644 index 00000000..b229fca4 --- /dev/null +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h @@ -0,0 +1,328 @@ +/*! + * @file WipperSnapper_I2C_Driver_MLX90632.h + * + * Device driver for a Melexis MLX90632 thermal FIR sensor. + * + * Adafruit invests time and resources providing this open source code, + * please support Adafruit and open-source hardware by purchasing + * products from Adafruit! + * + * Copyright (c) Tyeth Gundry 2025 for Adafruit Industries. + * + * MIT license, all text here must be included in any redistribution. + * + */ + +#ifndef WipperSnapper_I2C_Driver_MLX90632_H +#define WipperSnapper_I2C_Driver_MLX90632_H + +#include + +#include "WipperSnapper_I2C_Driver.h" + +/**************************************************************************/ +/*! + @brief Sensor driver for the Melexis MLX90632 temperature sensor. +*/ +/**************************************************************************/ +class WipperSnapper_I2C_Driver_MLX90632 : public WipperSnapper_I2C_Driver { +public: + /*******************************************************************************/ + /*! + @brief Constructor for an MLX90632 sensor. + @param i2c + The I2C interface. + @param sensorAddress + 7-bit device address. + */ + /*******************************************************************************/ + WipperSnapper_I2C_Driver_MLX90632(TwoWire *i2c, uint16_t sensorAddress) + : WipperSnapper_I2C_Driver(i2c, sensorAddress) { + _i2c = i2c; + _sensorAddress = sensorAddress; + _deviceTemp = NAN; + _objectTemp = NAN; + _lastRead = 0; + } + + /*******************************************************************************/ + /*! + @brief Destructor for an MLX90632 sensor. + */ + /*******************************************************************************/ + ~WipperSnapper_I2C_Driver_MLX90632() { delete _mlx90632; } + + /*******************************************************************************/ + /*! + @brief Initializes the MLX90632 sensor and begins I2C. + @returns True if initialized successfully, False otherwise. + */ + /*******************************************************************************/ + bool begin() { + _mlx90632 = new Adafruit_MLX90632(); + // attempt to initialize MLX90632 + if (!_mlx90632->begin(_sensorAddress, _i2c)) + return false; + + return ConfigureAndPrintSensorInfo(); + } + + /*******************************************************************************/ + /*! + @brief Configures the MLX90632 sensor and prints its information. + @returns True if configuration fetching and setting were successful. + */ + /*******************************************************************************/ + bool ConfigureAndPrintSensorInfo() { + // Reset the device + if (!_mlx90632->reset()) { + WS_PRINTER.println(F("Device reset failed")); + while (1) { delay(10); } + } + WS_PRINTER.println(F("Device reset: SUCCESS")); + + uint64_t productID = _mlx90632->getProductID(); + WS_PRINTER.print(F("Product ID: 0x")); + WS_PRINTER.print((uint32_t)(productID >> 32), HEX); + WS_PRINTER.println((uint32_t)(productID & 0xFFFFFFFF), HEX); + + uint16_t productCode = _mlx90632->getProductCode(); + WS_PRINTER.print(F("Product Code: 0x")); + WS_PRINTER.println(productCode, HEX); + + uint16_t eepromVersion = _mlx90632->getEEPROMVersion(); + WS_PRINTER.print(F("EEPROM Version: 0x")); + WS_PRINTER.println(eepromVersion, HEX); + + // Decode product code bits + uint8_t fov = (productCode >> 8) & 0x3; + uint8_t package = (productCode >> 5) & 0x7; + uint8_t accuracy = productCode & 0x1F; + + WS_PRINTER.print(F("FOV: ")); + WS_PRINTER.println(fov == 0 ? F("50°") : F("Unknown")); + + WS_PRINTER.print(F("Package: ")); + WS_PRINTER.println(package == 1 ? F("SFN 3x3") : F("Unknown")); + + WS_PRINTER.print(F("Accuracy: ")); + if (accuracy == 1) { + WS_PRINTER.println(F("Medical")); + } else if (accuracy == 2) { + WS_PRINTER.println(F("Standard")); + } else { + WS_PRINTER.println(F("Unknown")); + } + + // Set and get mode - choose one: + WS_PRINTER.println(F("\n--- Mode Settings ---")); + if (!_mlx90632->setMode(MLX90632_MODE_CONTINUOUS)) { + // if (!_mlx90632->setMode(MLX90632_MODE_STEP)) { // Uncomment for step mode testing + // if (!_mlx90632->setMode(MLX90632_MODE_SLEEPING_STEP)) { // Uncomment for sleeping step mode testing + WS_PRINTER.println(F("Failed to set mode")); + while (1) { delay(10); } + } + + //TODO: use Step mode? + mlx90632_mode_t currentMode = _mlx90632->getMode(); + WS_PRINTER.print(F("Current mode: ")); + switch (currentMode) { + case MLX90632_MODE_HALT: + WS_PRINTER.println(F("Halt")); + break; + case MLX90632_MODE_SLEEPING_STEP: + WS_PRINTER.println(F("Sleeping Step")); + break; + case MLX90632_MODE_STEP: + WS_PRINTER.println(F("Step")); + break; + case MLX90632_MODE_CONTINUOUS: + WS_PRINTER.println(F("Continuous")); + break; + default: + WS_PRINTER.println(F("Unknown")); + } + + // set accuracy mode based on medical if detected + if (accuracy == 1) { + // Set and get measurement select (medical) + WS_PRINTER.println(F("\n--- Measurement Select Settings ---")); + if (!_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { + WS_PRINTER.println(F("Failed to set measurement select to Medical")); + while (1) { delay(10); } + } + + mlx90632_meas_select_t currentMeasSelect = _mlx90632->getMeasurementSelect(); + WS_PRINTER.print(F("Current measurement select: ")); + switch (currentMeasSelect) { + case MLX90632_MEAS_MEDICAL: + WS_PRINTER.println(F("Medical")); + break; + case MLX90632_MEAS_EXTENDED_RANGE: + WS_PRINTER.println(F("Extended Range")); + break; + default: + WS_PRINTER.println(F("Unknown")); + } + } + + // Set and get refresh rate (default to 2Hz) + WS_PRINTER.println(F("\n--- Refresh Rate Settings ---")); + if (!_mlx90632->setRefreshRate(MLX90632_REFRESH_2HZ)) { + WS_PRINTER.println(F("Failed to set refresh rate to 2Hz")); + while (1) { delay(10); } + } + + mlx90632_refresh_rate_t currentRefreshRate = _mlx90632->getRefreshRate(); + WS_PRINTER.print(F("Current refresh rate: ")); + switch (currentRefreshRate) { + case MLX90632_REFRESH_0_5HZ: + WS_PRINTER.println(F("0.5 Hz")); + break; + case MLX90632_REFRESH_1HZ: + WS_PRINTER.println(F("1 Hz")); + break; + case MLX90632_REFRESH_2HZ: + WS_PRINTER.println(F("2 Hz")); + break; + case MLX90632_REFRESH_4HZ: + WS_PRINTER.println(F("4 Hz")); + break; + case MLX90632_REFRESH_8HZ: + WS_PRINTER.println(F("8 Hz")); + break; + case MLX90632_REFRESH_16HZ: + WS_PRINTER.println(F("16 Hz")); + break; + case MLX90632_REFRESH_32HZ: + WS_PRINTER.println(F("32 Hz")); + break; + case MLX90632_REFRESH_64HZ: + WS_PRINTER.println(F("64 Hz")); + break; + default: + WS_PRINTER.println(F("Unknown")); + } + + // Clear new data flag before starting continuous measurements + WS_PRINTER.println(F("\\n--- Starting Continuous Measurements ---")); + if (!_mlx90632->resetNewData()) { + WS_PRINTER.println(F("Failed to reset new data flag")); + while (1) { delay(10); } + } + return true; + } + + /*******************************************************************************/ + /*! + @brief Checks if sensor was read within last 1s, or is the first read. + @returns True if the sensor was recently read, False otherwise. + */ + /*******************************************************************************/ + bool HasBeenReadInLast200ms() { + return _lastRead != 0 && millis() - _lastRead < 200; + } + + /*******************************************************************************/ + /*! + @brief Reads the sensor. + @returns True if the sensor was read successfully, False otherwise. + */ + /*******************************************************************************/ + bool ReadSensorData() { + bool result=false; + + // Only check new data flag - much more efficient for continuous mode + if (_mlx90632->isNewData()) { + WS_PRINTER.print(F("New Data Available - Cycle Position: ")); + WS_PRINTER.println(_mlx90632->readCyclePosition()); + + // Read ambient temperature + _deviceTemp = _mlx90632->getAmbientTemperature(); + WS_PRINTER.print(F("Ambient Temperature: ")); + WS_PRINTER.print(_deviceTemp, 4); + WS_PRINTER.println(F(" °C")); + + // Read object temperature + _objectTemp = _mlx90632->getObjectTemperature(); + WS_PRINTER.print(F("Object Temperature: ")); + if (isnan(_objectTemp)) { + WS_PRINTER.println(F("NaN (invalid cycle position)")); + } else { + WS_PRINTER.print(_objectTemp, 4); + WS_PRINTER.println(F(" °C")); + } + result=true; + // Reset new data flag after reading + if (!_mlx90632->resetNewData()) { + WS_PRINTER.println(F("Failed to reset new data flag")); + } + + WS_PRINTER.println(); // Add blank line between readings + } else { + WS_PRINTER.println(F("No new data available, skipping read")); + + } + + // Check if we need to trigger a new measurement for step modes + mlx90632_mode_t currentMode = _mlx90632->getMode(); + if (currentMode == MLX90632_MODE_STEP || currentMode == MLX90632_MODE_SLEEPING_STEP) { + // Trigger single measurement (SOC bit) for step modes + if (!_mlx90632->startSingleMeasurement()) { + WS_PRINTER.println(F("Failed to start single measurement")); + } + } + + _lastRead = millis(); + return result; + } + + /*******************************************************************************/ + /*! + @brief Gets the MLX90632's current temperature. + @param tempEvent + Pointer to an Adafruit_Sensor event. + @returns True if the temperature was obtained successfully, False + otherwise. + */ + /*******************************************************************************/ + bool getEventAmbientTemp(sensors_event_t *tempEvent) { + if (ReadSensorData() && _deviceTemp != NAN) { + //TODO: check max/min or error values in datasheet + // if (_deviceTemp < -40 || _deviceTemp > 125) { + // WS_PRINTER.println(F("Invalid ambient temperature")); + // return false; + // } + // if the sensor was read recently, return the cached temperature + tempEvent->temperature = _deviceTemp; + return true; + } + return false; // sensor not read recently, return false + } + + /*******************************************************************************/ + /*! + @brief Gets the MLX90632's object temperature. + @param tempEvent + Pointer to an Adafruit_Sensor event. + @returns True if the temperature was obtained successfully, False + otherwise. + */ + /*******************************************************************************/ + bool getEventObjectTemp(sensors_event_t *tempEvent) { + if (ReadSensorData() && _objectTemp != NAN) { + // if the sensor was read recently, return the cached temperature + tempEvent->temperature = _objectTemp; + return true; + } + return false; // sensor not read recently, return false + } + +protected: + double _deviceTemp; ///< Device temperature in Celsius + double _objectTemp; ///< Object temperature in Celsius + uint32_t _lastRead; ///< Last time the sensor was read in milliseconds + Adafruit_MLX90632 *_mlx90632 = nullptr; ///< MLX90632 object +}; + +#endif // WipperSnapper_I2C_Driver_MLX90632 \ No newline at end of file From 54ee1a632a183dc165330e33e5a5fade93e8b82e Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 14:13:45 +0100 Subject: [PATCH 02/15] refactor(mlx90632): use -d model distinction for medical --- src/components/i2c/WipperSnapper_I2C.cpp | 5 +++-- src/components/i2c/WipperSnapper_I2C.h | 2 +- .../drivers/WipperSnapper_I2C_Driver_MLX90632.h | 14 ++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index 6078dfb1..c301eaeb 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -537,8 +537,9 @@ bool WipperSnapper_Component_I2C::initI2CDevice( _mcp9808->configureDriver(msgDeviceInitReq); drivers.push_back(_mcp9808); WS_DEBUG_PRINTLN("MCP9808 Initialized Successfully!"); - } else if (strcmp("mlx90632", msgDeviceInitReq->i2c_device_name) == 0) { - _mlx90632 = new WipperSnapper_I2C_Driver_MLX90632(this->_i2c, i2cAddress); + } else if (strcmp("mlx90632d_med", msgDeviceInitReq->i2c_device_name) == 0 || + strcmp("mlx90632d_ext", msgDeviceInitReq->i2c_device_name) == 0) { + _mlx90632 = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); if (!_mlx90632->begin()) { WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632!"); _busStatusResponse = diff --git a/src/components/i2c/WipperSnapper_I2C.h b/src/components/i2c/WipperSnapper_I2C.h index 67e8f3b4..33f9fdc7 100644 --- a/src/components/i2c/WipperSnapper_I2C.h +++ b/src/components/i2c/WipperSnapper_I2C.h @@ -181,7 +181,7 @@ private: WipperSnapper_I2C_Driver_LTR390 *_ltr390 = nullptr; WipperSnapper_I2C_Driver_MCP3421 *_mcp3421 = nullptr; WipperSnapper_I2C_Driver_MCP9808 *_mcp9808 = nullptr; - WipperSnapper_I2C_Driver_MLX90632 *_mlx90632 = nullptr; + WipperSnapper_I2C_Driver_MLX90632D *_mlx90632 = nullptr; WipperSnapper_I2C_Driver_MPL115A2 *_mpl115a2 = nullptr; WipperSnapper_I2C_Driver_MPRLS *_mprls = nullptr; WipperSnapper_I2C_Driver_MS8607 *_ms8607 = nullptr; diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h index b229fca4..bb90062a 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h @@ -1,7 +1,7 @@ /*! * @file WipperSnapper_I2C_Driver_MLX90632.h * - * Device driver for a Melexis MLX90632 thermal FIR sensor. + * Device driver for a Melexis MLX90632-D (medical) thermal FIR sensor. * * Adafruit invests time and resources providing this open source code, * please support Adafruit and open-source hardware by purchasing @@ -22,10 +22,10 @@ /**************************************************************************/ /*! - @brief Sensor driver for the Melexis MLX90632 temperature sensor. + @brief Sensor driver for the Melexis MLX90632-D temperature sensor. */ /**************************************************************************/ -class WipperSnapper_I2C_Driver_MLX90632 : public WipperSnapper_I2C_Driver { +class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { public: /*******************************************************************************/ /*! @@ -36,7 +36,7 @@ public: 7-bit device address. */ /*******************************************************************************/ - WipperSnapper_I2C_Driver_MLX90632(TwoWire *i2c, uint16_t sensorAddress) + WipperSnapper_I2C_Driver_MLX90632D(TwoWire *i2c, uint16_t sensorAddress) : WipperSnapper_I2C_Driver(i2c, sensorAddress) { _i2c = i2c; _sensorAddress = sensorAddress; @@ -50,7 +50,7 @@ public: @brief Destructor for an MLX90632 sensor. */ /*******************************************************************************/ - ~WipperSnapper_I2C_Driver_MLX90632() { delete _mlx90632; } + ~WipperSnapper_I2C_Driver_MLX90632D() { delete _mlx90632; } /*******************************************************************************/ /*! @@ -70,10 +70,12 @@ public: /*******************************************************************************/ /*! @brief Configures the MLX90632 sensor and prints its information. + @param extendedInsteadOfMedicalRange + If true, configures the sensor for extended temperature range/acc. @returns True if configuration fetching and setting were successful. */ /*******************************************************************************/ - bool ConfigureAndPrintSensorInfo() { + bool ConfigureAndPrintSensorInfo(bool extendedInsteadOfMedicalRange = false) { // Reset the device if (!_mlx90632->reset()) { WS_PRINTER.println(F("Device reset failed")); From f007fe83ef96630debb845891ab8f8b18529ac67 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 14:20:24 +0100 Subject: [PATCH 03/15] refactor(mlx90632d): support extended range at init --- src/components/i2c/WipperSnapper_I2C.cpp | 23 ++++++++++++++----- src/components/i2c/WipperSnapper_I2C.h | 5 ++-- ...h => WipperSnapper_I2C_Driver_MLX90632D.h} | 0 3 files changed, 20 insertions(+), 8 deletions(-) rename src/components/i2c/drivers/{WipperSnapper_I2C_Driver_MLX90632.h => WipperSnapper_I2C_Driver_MLX90632D.h} (100%) diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index c301eaeb..3116af30 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -537,18 +537,29 @@ bool WipperSnapper_Component_I2C::initI2CDevice( _mcp9808->configureDriver(msgDeviceInitReq); drivers.push_back(_mcp9808); WS_DEBUG_PRINTLN("MCP9808 Initialized Successfully!"); - } else if (strcmp("mlx90632d_med", msgDeviceInitReq->i2c_device_name) == 0 || - strcmp("mlx90632d_ext", msgDeviceInitReq->i2c_device_name) == 0) { - _mlx90632 = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); - if (!_mlx90632->begin()) { + } else if (strcmp("mlx90632d_med", msgDeviceInitReq->i2c_device_name) == 0) { + _mlx90632d = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); + if (!_mlx90632d->begin()) { WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632!"); _busStatusResponse = wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL; return false; } - _mlx90632->configureDriver(msgDeviceInitReq); - drivers.push_back(_mlx90632); + _mlx90632d->configureDriver(msgDeviceInitReq); + drivers.push_back(_mlx90632d); WS_DEBUG_PRINTLN("MLX90632 Initialized Successfully!"); + } else if (strcmp("mlx90632d_ext", msgDeviceInitReq->i2c_device_name) == 0) { + _mlx90632d_ext = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); + // set extended range + if (!_mlx90632d_ext->begin() || !_mlx90632d_ext->ConfigureAndPrintSensorInfo(true)) { + WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632D with extended range!"); + _busStatusResponse = + wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL; + return false; + } + _mlx90632d_ext->configureDriver(msgDeviceInitReq); + drivers.push_back(_mlx90632d_ext); + WS_DEBUG_PRINTLN("MLX90632D_EXT Initialized Successfully!"); } else if (strcmp("mpl115a2", msgDeviceInitReq->i2c_device_name) == 0) { _mpl115a2 = new WipperSnapper_I2C_Driver_MPL115A2(this->_i2c, i2cAddress); if (!_mpl115a2->begin()) { diff --git a/src/components/i2c/WipperSnapper_I2C.h b/src/components/i2c/WipperSnapper_I2C.h index 33f9fdc7..9dc4c5cb 100644 --- a/src/components/i2c/WipperSnapper_I2C.h +++ b/src/components/i2c/WipperSnapper_I2C.h @@ -50,7 +50,7 @@ #include "drivers/WipperSnapper_I2C_Driver_MAX17048.h" #include "drivers/WipperSnapper_I2C_Driver_MCP3421.h" #include "drivers/WipperSnapper_I2C_Driver_MCP9808.h" -#include "drivers/WipperSnapper_I2C_Driver_MLX90632.h" +#include "drivers/WipperSnapper_I2C_Driver_MLX90632D.h" #include "drivers/WipperSnapper_I2C_Driver_MPL115A2.h" #include "drivers/WipperSnapper_I2C_Driver_MPRLS.h" #include "drivers/WipperSnapper_I2C_Driver_MS8607.h" @@ -181,7 +181,8 @@ private: WipperSnapper_I2C_Driver_LTR390 *_ltr390 = nullptr; WipperSnapper_I2C_Driver_MCP3421 *_mcp3421 = nullptr; WipperSnapper_I2C_Driver_MCP9808 *_mcp9808 = nullptr; - WipperSnapper_I2C_Driver_MLX90632D *_mlx90632 = nullptr; + WipperSnapper_I2C_Driver_MLX90632D *_mlx90632d = nullptr; + WipperSnapper_I2C_Driver_MLX90632D *_mlx90632d_ext = nullptr; WipperSnapper_I2C_Driver_MPL115A2 *_mpl115a2 = nullptr; WipperSnapper_I2C_Driver_MPRLS *_mprls = nullptr; WipperSnapper_I2C_Driver_MS8607 *_ms8607 = nullptr; diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h similarity index 100% rename from src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632.h rename to src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h From 28dff4e04d7a88d2f2f8261bc947a27a7fb762d9 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 14:23:22 +0100 Subject: [PATCH 04/15] add(mlx90632): implement extended mode --- .../i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index bb90062a..1ff06462 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -149,11 +149,14 @@ public: if (accuracy == 1) { // Set and get measurement select (medical) WS_PRINTER.println(F("\n--- Measurement Select Settings ---")); - if (!_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { + if (!extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { WS_PRINTER.println(F("Failed to set measurement select to Medical")); while (1) { delay(10); } + } else if (extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_EXTENDED_RANGE)) { + WS_PRINTER.println(F("Failed to set measurement select to Extended Range")); + while (1) { delay(10); } } - + mlx90632_meas_select_t currentMeasSelect = _mlx90632->getMeasurementSelect(); WS_PRINTER.print(F("Current measurement select: ")); switch (currentMeasSelect) { From 32f85f7b470e704db7c459e5b3aadf809b2d45eb Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 14:45:45 +0100 Subject: [PATCH 05/15] add(mlx90632): alias B model to D driver --- src/components/i2c/WipperSnapper_I2C.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index 3116af30..7f5b5e7a 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -537,7 +537,8 @@ bool WipperSnapper_Component_I2C::initI2CDevice( _mcp9808->configureDriver(msgDeviceInitReq); drivers.push_back(_mcp9808); WS_DEBUG_PRINTLN("MCP9808 Initialized Successfully!"); - } else if (strcmp("mlx90632d_med", msgDeviceInitReq->i2c_device_name) == 0) { + } else if (strcmp("mlx90632b", msgDeviceInitReq->i2c_device_name) == 0 || + strcmp("mlx90632d_med", msgDeviceInitReq->i2c_device_name) == 0) { _mlx90632d = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); if (!_mlx90632d->begin()) { WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632!"); From dc5ff4ae9ffebe4d95caa0025e6de9479780a0b3 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 14:54:32 +0100 Subject: [PATCH 06/15] clang-format --- src/components/i2c/WipperSnapper_I2C.cpp | 9 +- .../WipperSnapper_I2C_Driver_MLX90632D.h | 122 ++++++++++-------- 2 files changed, 77 insertions(+), 54 deletions(-) diff --git a/src/components/i2c/WipperSnapper_I2C.cpp b/src/components/i2c/WipperSnapper_I2C.cpp index 7f5b5e7a..54cb8668 100644 --- a/src/components/i2c/WipperSnapper_I2C.cpp +++ b/src/components/i2c/WipperSnapper_I2C.cpp @@ -550,10 +550,13 @@ bool WipperSnapper_Component_I2C::initI2CDevice( drivers.push_back(_mlx90632d); WS_DEBUG_PRINTLN("MLX90632 Initialized Successfully!"); } else if (strcmp("mlx90632d_ext", msgDeviceInitReq->i2c_device_name) == 0) { - _mlx90632d_ext = new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); + _mlx90632d_ext = + new WipperSnapper_I2C_Driver_MLX90632D(this->_i2c, i2cAddress); // set extended range - if (!_mlx90632d_ext->begin() || !_mlx90632d_ext->ConfigureAndPrintSensorInfo(true)) { - WS_DEBUG_PRINTLN("ERROR: Failed to initialize MLX90632D with extended range!"); + if (!_mlx90632d_ext->begin() || + !_mlx90632d_ext->ConfigureAndPrintSensorInfo(true)) { + WS_DEBUG_PRINTLN( + "ERROR: Failed to initialize MLX90632D with extended range!"); _busStatusResponse = wippersnapper_i2c_v1_BusResponse_BUS_RESPONSE_DEVICE_INIT_FAIL; return false; diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 1ff06462..959130d3 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -26,7 +26,7 @@ */ /**************************************************************************/ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { -public: + public: /*******************************************************************************/ /*! @brief Constructor for an MLX90632 sensor. @@ -71,7 +71,8 @@ public: /*! @brief Configures the MLX90632 sensor and prints its information. @param extendedInsteadOfMedicalRange - If true, configures the sensor for extended temperature range/acc. + If true, configures the sensor for extended temperature + range/acc. @returns True if configuration fetching and setting were successful. */ /*******************************************************************************/ @@ -79,39 +80,41 @@ public: // Reset the device if (!_mlx90632->reset()) { WS_PRINTER.println(F("Device reset failed")); - while (1) { delay(10); } + while (1) { + delay(10); + } } WS_PRINTER.println(F("Device reset: SUCCESS")); - + uint64_t productID = _mlx90632->getProductID(); WS_PRINTER.print(F("Product ID: 0x")); WS_PRINTER.print((uint32_t)(productID >> 32), HEX); WS_PRINTER.println((uint32_t)(productID & 0xFFFFFFFF), HEX); - + uint16_t productCode = _mlx90632->getProductCode(); WS_PRINTER.print(F("Product Code: 0x")); WS_PRINTER.println(productCode, HEX); - + uint16_t eepromVersion = _mlx90632->getEEPROMVersion(); WS_PRINTER.print(F("EEPROM Version: 0x")); WS_PRINTER.println(eepromVersion, HEX); - + // Decode product code bits uint8_t fov = (productCode >> 8) & 0x3; - uint8_t package = (productCode >> 5) & 0x7; + uint8_t package = (productCode >> 5) & 0x7; uint8_t accuracy = productCode & 0x1F; - + WS_PRINTER.print(F("FOV: ")); WS_PRINTER.println(fov == 0 ? F("50°") : F("Unknown")); - + WS_PRINTER.print(F("Package: ")); WS_PRINTER.println(package == 1 ? F("SFN 3x3") : F("Unknown")); - + WS_PRINTER.print(F("Accuracy: ")); if (accuracy == 1) { WS_PRINTER.println(F("Medical")); } else if (accuracy == 2) { - WS_PRINTER.println(F("Standard")); + WS_PRINTER.println(F("Standard")); } else { WS_PRINTER.println(F("Unknown")); } @@ -119,13 +122,17 @@ public: // Set and get mode - choose one: WS_PRINTER.println(F("\n--- Mode Settings ---")); if (!_mlx90632->setMode(MLX90632_MODE_CONTINUOUS)) { - // if (!_mlx90632->setMode(MLX90632_MODE_STEP)) { // Uncomment for step mode testing - // if (!_mlx90632->setMode(MLX90632_MODE_SLEEPING_STEP)) { // Uncomment for sleeping step mode testing + // if (!_mlx90632->setMode(MLX90632_MODE_STEP)) { // Uncomment + // for step mode testing if + // (!_mlx90632->setMode(MLX90632_MODE_SLEEPING_STEP)) { // Uncomment for + // sleeping step mode testing WS_PRINTER.println(F("Failed to set mode")); - while (1) { delay(10); } + while (1) { + delay(10); + } } - - //TODO: use Step mode? + + // TODO: use Step mode? mlx90632_mode_t currentMode = _mlx90632->getMode(); WS_PRINTER.print(F("Current mode: ")); switch (currentMode) { @@ -149,15 +156,24 @@ public: if (accuracy == 1) { // Set and get measurement select (medical) WS_PRINTER.println(F("\n--- Measurement Select Settings ---")); - if (!extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { + if (!extendedInsteadOfMedicalRange && + !_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { WS_PRINTER.println(F("Failed to set measurement select to Medical")); - while (1) { delay(10); } - } else if (extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_EXTENDED_RANGE)) { - WS_PRINTER.println(F("Failed to set measurement select to Extended Range")); - while (1) { delay(10); } + while (1) { + delay(10); + } + } else if (extendedInsteadOfMedicalRange && + !_mlx90632->setMeasurementSelect( + MLX90632_MEAS_EXTENDED_RANGE)) { + WS_PRINTER.println( + F("Failed to set measurement select to Extended Range")); + while (1) { + delay(10); + } } - mlx90632_meas_select_t currentMeasSelect = _mlx90632->getMeasurementSelect(); + mlx90632_meas_select_t currentMeasSelect = + _mlx90632->getMeasurementSelect(); WS_PRINTER.print(F("Current measurement select: ")); switch (currentMeasSelect) { case MLX90632_MEAS_MEDICAL: @@ -175,9 +191,11 @@ public: WS_PRINTER.println(F("\n--- Refresh Rate Settings ---")); if (!_mlx90632->setRefreshRate(MLX90632_REFRESH_2HZ)) { WS_PRINTER.println(F("Failed to set refresh rate to 2Hz")); - while (1) { delay(10); } + while (1) { + delay(10); + } } - + mlx90632_refresh_rate_t currentRefreshRate = _mlx90632->getRefreshRate(); WS_PRINTER.print(F("Current refresh rate: ")); switch (currentRefreshRate) { @@ -208,12 +226,14 @@ public: default: WS_PRINTER.println(F("Unknown")); } - + // Clear new data flag before starting continuous measurements WS_PRINTER.println(F("\\n--- Starting Continuous Measurements ---")); if (!_mlx90632->resetNewData()) { WS_PRINTER.println(F("Failed to reset new data flag")); - while (1) { delay(10); } + while (1) { + delay(10); + } } return true; } @@ -235,19 +255,19 @@ public: */ /*******************************************************************************/ bool ReadSensorData() { - bool result=false; + bool result = false; // Only check new data flag - much more efficient for continuous mode if (_mlx90632->isNewData()) { WS_PRINTER.print(F("New Data Available - Cycle Position: ")); WS_PRINTER.println(_mlx90632->readCyclePosition()); - + // Read ambient temperature _deviceTemp = _mlx90632->getAmbientTemperature(); WS_PRINTER.print(F("Ambient Temperature: ")); WS_PRINTER.print(_deviceTemp, 4); WS_PRINTER.println(F(" °C")); - + // Read object temperature _objectTemp = _mlx90632->getObjectTemperature(); WS_PRINTER.print(F("Object Temperature: ")); @@ -257,27 +277,27 @@ public: WS_PRINTER.print(_objectTemp, 4); WS_PRINTER.println(F(" °C")); } - result=true; + result = true; // Reset new data flag after reading if (!_mlx90632->resetNewData()) { WS_PRINTER.println(F("Failed to reset new data flag")); } - - WS_PRINTER.println(); // Add blank line between readings + + WS_PRINTER.println(); // Add blank line between readings } else { WS_PRINTER.println(F("No new data available, skipping read")); - } - + // Check if we need to trigger a new measurement for step modes mlx90632_mode_t currentMode = _mlx90632->getMode(); - if (currentMode == MLX90632_MODE_STEP || currentMode == MLX90632_MODE_SLEEPING_STEP) { + if (currentMode == MLX90632_MODE_STEP || + currentMode == MLX90632_MODE_SLEEPING_STEP) { // Trigger single measurement (SOC bit) for step modes if (!_mlx90632->startSingleMeasurement()) { WS_PRINTER.println(F("Failed to start single measurement")); } } - + _lastRead = millis(); return result; } @@ -293,16 +313,16 @@ public: /*******************************************************************************/ bool getEventAmbientTemp(sensors_event_t *tempEvent) { if (ReadSensorData() && _deviceTemp != NAN) { - //TODO: check max/min or error values in datasheet - // if (_deviceTemp < -40 || _deviceTemp > 125) { - // WS_PRINTER.println(F("Invalid ambient temperature")); - // return false; - // } - // if the sensor was read recently, return the cached temperature + // TODO: check max/min or error values in datasheet + // if (_deviceTemp < -40 || _deviceTemp > 125) { + // WS_PRINTER.println(F("Invalid ambient temperature")); + // return false; + // } + // if the sensor was read recently, return the cached temperature tempEvent->temperature = _deviceTemp; return true; } - return false; // sensor not read recently, return false + return false; // sensor not read recently, return false } /*******************************************************************************/ @@ -320,14 +340,14 @@ public: tempEvent->temperature = _objectTemp; return true; } - return false; // sensor not read recently, return false + return false; // sensor not read recently, return false } -protected: - double _deviceTemp; ///< Device temperature in Celsius - double _objectTemp; ///< Object temperature in Celsius - uint32_t _lastRead; ///< Last time the sensor was read in milliseconds - Adafruit_MLX90632 *_mlx90632 = nullptr; ///< MLX90632 object + protected: + double _deviceTemp; ///< Device temperature in Celsius + double _objectTemp; ///< Object temperature in Celsius + uint32_t _lastRead; ///< Last time the sensor was read in milliseconds + Adafruit_MLX90632 *_mlx90632 = nullptr; ///< MLX90632 object }; -#endif // WipperSnapper_I2C_Driver_MLX90632 \ No newline at end of file +#endif // WipperSnapper_I2C_Driver_MLX90632 \ No newline at end of file From 96fa8d20664ea703fef5c8d62b6da30fd3b18fea Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 15:44:36 +0100 Subject: [PATCH 07/15] fix(partitions): update 4mb to No OTA in platformIO.ini --- platformio.ini | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platformio.ini b/platformio.ini index ab46ba5d..4d843bbc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -204,7 +204,7 @@ board_build.partitions = min_spiffs.csv extends = common:esp32 board = featheresp32-s2 build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2 -DBOARD_HAS_PSRAM -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Feather ESP32-S2 TFT @@ -212,7 +212,7 @@ extra_scripts = pre:rename_usb_config.py extends = common:esp32 board = adafruit_feather_esp32s2_tft build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT -DBOARD_HAS_PSRAM -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Feather ESP32-S2 Reverse TFT @@ -220,7 +220,7 @@ extra_scripts = pre:rename_usb_config.py extends = common:esp32 board = adafruit_feather_esp32s2_reversetft build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT -DBOARD_HAS_PSRAM -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Feather ESP32-S3 2MB PSRAM @@ -229,7 +229,7 @@ extends = common:esp32 board = adafruit_feather_esp32s3 build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3 -DBOARD_HAS_PSRAM ;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Feather ESP32-S3 NO PSRAM @@ -248,7 +248,7 @@ debug_tool = esp-builtin board = adafruit_feather_esp32s3_tft build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT -DBOARD_HAS_PSRAM ;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Feather ESP32-S3 Reverse TFT @@ -257,7 +257,7 @@ extends = common:esp32 board = adafruit_feather_esp32s3_reversetft build_flags = -DARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT -DBOARD_HAS_PSRAM ;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Magtag ESP32-S2 @@ -266,7 +266,7 @@ extends = common:esp32 board = adafruit_magtag29_esp32s2 build_flags = -DARDUINO_MAGTAG29_ESP32S2 -DBOARD_HAS_PSRAM ;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Metro ESP32-S2 @@ -275,7 +275,7 @@ extends = common:esp32 board = adafruit_metro_esp32s2 build_flags = -DARDUINO_METRO_ESP32S2 -DBOARD_HAS_PSRAM ;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit Metro ESP32-S3 @@ -364,7 +364,7 @@ extends = common:esp32 board = adafruit_qtpy_esp32s2 build_flags = -DARDUINO_ADAFRUIT_QTPY_ESP32S2 -DBOARD_HAS_PSRAM ;set partition to tinyuf2-partitions-4MB.csv as of idf 5.1 -board_build.partitions = tinyuf2-partitions-4MB.csv +board_build.partitions = tinyuf2-partitions-4MB-noota.csv extra_scripts = pre:rename_usb_config.py ; Adafruit QT Py ESP32-S3 NO PSRAM From 79f372af44b0f4d1ce15dbe4610f3fa75b727e9a Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 16:11:18 +0100 Subject: [PATCH 08/15] fix(mlx90632): skip re-reading if recently read --- .../WipperSnapper_I2C_Driver_MLX90632D.h | 127 +++++++++--------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 959130d3..ba4e5662 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -79,54 +79,54 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { bool ConfigureAndPrintSensorInfo(bool extendedInsteadOfMedicalRange = false) { // Reset the device if (!_mlx90632->reset()) { - WS_PRINTER.println(F("Device reset failed")); + WS_DEBUG_PRINTLN(F("Device reset failed")); while (1) { delay(10); } } - WS_PRINTER.println(F("Device reset: SUCCESS")); + WS_DEBUG_PRINTLN(F("Device reset: SUCCESS")); uint64_t productID = _mlx90632->getProductID(); - WS_PRINTER.print(F("Product ID: 0x")); - WS_PRINTER.print((uint32_t)(productID >> 32), HEX); - WS_PRINTER.println((uint32_t)(productID & 0xFFFFFFFF), HEX); + WS_DEBUG_PRINT(F("Product ID: 0x")); + WS_DEBUG_PRINT((uint32_t)(productID >> 32), HEX); + WS_DEBUG_PRINTLN((uint32_t)(productID & 0xFFFFFFFF), HEX); uint16_t productCode = _mlx90632->getProductCode(); - WS_PRINTER.print(F("Product Code: 0x")); - WS_PRINTER.println(productCode, HEX); + WS_DEBUG_PRINT(F("Product Code: 0x")); + WS_DEBUG_PRINTLN(productCode, HEX); uint16_t eepromVersion = _mlx90632->getEEPROMVersion(); - WS_PRINTER.print(F("EEPROM Version: 0x")); - WS_PRINTER.println(eepromVersion, HEX); + WS_DEBUG_PRINT(F("EEPROM Version: 0x")); + WS_DEBUG_PRINTLN(eepromVersion, HEX); // Decode product code bits uint8_t fov = (productCode >> 8) & 0x3; uint8_t package = (productCode >> 5) & 0x7; uint8_t accuracy = productCode & 0x1F; - WS_PRINTER.print(F("FOV: ")); - WS_PRINTER.println(fov == 0 ? F("50°") : F("Unknown")); + WS_DEBUG_PRINT(F("FOV: ")); + WS_DEBUG_PRINTLN(fov == 0 ? F("50°") : F("Unknown")); - WS_PRINTER.print(F("Package: ")); - WS_PRINTER.println(package == 1 ? F("SFN 3x3") : F("Unknown")); + WS_DEBUG_PRINT(F("Package: ")); + WS_DEBUG_PRINTLN(package == 1 ? F("SFN 3x3") : F("Unknown")); - WS_PRINTER.print(F("Accuracy: ")); + WS_DEBUG_PRINT(F("Accuracy: ")); if (accuracy == 1) { - WS_PRINTER.println(F("Medical")); + WS_DEBUG_PRINTLN(F("Medical")); } else if (accuracy == 2) { - WS_PRINTER.println(F("Standard")); + WS_DEBUG_PRINTLN(F("Standard")); } else { - WS_PRINTER.println(F("Unknown")); + WS_DEBUG_PRINTLN(F("Unknown")); } // Set and get mode - choose one: - WS_PRINTER.println(F("\n--- Mode Settings ---")); + WS_DEBUG_PRINTLN(F("\n--- Mode Settings ---")); if (!_mlx90632->setMode(MLX90632_MODE_CONTINUOUS)) { // if (!_mlx90632->setMode(MLX90632_MODE_STEP)) { // Uncomment // for step mode testing if // (!_mlx90632->setMode(MLX90632_MODE_SLEEPING_STEP)) { // Uncomment for // sleeping step mode testing - WS_PRINTER.println(F("Failed to set mode")); + WS_DEBUG_PRINTLN(F("Failed to set mode")); while (1) { delay(10); } @@ -134,38 +134,38 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { // TODO: use Step mode? mlx90632_mode_t currentMode = _mlx90632->getMode(); - WS_PRINTER.print(F("Current mode: ")); + WS_DEBUG_PRINT(F("Current mode: ")); switch (currentMode) { case MLX90632_MODE_HALT: - WS_PRINTER.println(F("Halt")); + WS_DEBUG_PRINTLN(F("Halt")); break; case MLX90632_MODE_SLEEPING_STEP: - WS_PRINTER.println(F("Sleeping Step")); + WS_DEBUG_PRINTLN(F("Sleeping Step")); break; case MLX90632_MODE_STEP: - WS_PRINTER.println(F("Step")); + WS_DEBUG_PRINTLN(F("Step")); break; case MLX90632_MODE_CONTINUOUS: - WS_PRINTER.println(F("Continuous")); + WS_DEBUG_PRINTLN(F("Continuous")); break; default: - WS_PRINTER.println(F("Unknown")); + WS_DEBUG_PRINTLN(F("Unknown")); } // set accuracy mode based on medical if detected if (accuracy == 1) { // Set and get measurement select (medical) - WS_PRINTER.println(F("\n--- Measurement Select Settings ---")); + WS_DEBUG_PRINTLN(F("\n--- Measurement Select Settings ---")); if (!extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { - WS_PRINTER.println(F("Failed to set measurement select to Medical")); + WS_DEBUG_PRINTLN(F("Failed to set measurement select to Medical")); while (1) { delay(10); } } else if (extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect( MLX90632_MEAS_EXTENDED_RANGE)) { - WS_PRINTER.println( + WS_DEBUG_PRINTLN( F("Failed to set measurement select to Extended Range")); while (1) { delay(10); @@ -174,63 +174,63 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { mlx90632_meas_select_t currentMeasSelect = _mlx90632->getMeasurementSelect(); - WS_PRINTER.print(F("Current measurement select: ")); + WS_DEBUG_PRINT(F("Current measurement select: ")); switch (currentMeasSelect) { case MLX90632_MEAS_MEDICAL: - WS_PRINTER.println(F("Medical")); + WS_DEBUG_PRINTLN(F("Medical")); break; case MLX90632_MEAS_EXTENDED_RANGE: - WS_PRINTER.println(F("Extended Range")); + WS_DEBUG_PRINTLN(F("Extended Range")); break; default: - WS_PRINTER.println(F("Unknown")); + WS_DEBUG_PRINTLN(F("Unknown")); } } // Set and get refresh rate (default to 2Hz) - WS_PRINTER.println(F("\n--- Refresh Rate Settings ---")); + WS_DEBUG_PRINTLN(F("\n--- Refresh Rate Settings ---")); if (!_mlx90632->setRefreshRate(MLX90632_REFRESH_2HZ)) { - WS_PRINTER.println(F("Failed to set refresh rate to 2Hz")); + WS_DEBUG_PRINTLN(F("Failed to set refresh rate to 2Hz")); while (1) { delay(10); } } mlx90632_refresh_rate_t currentRefreshRate = _mlx90632->getRefreshRate(); - WS_PRINTER.print(F("Current refresh rate: ")); + WS_DEBUG_PRINT(F("Current refresh rate: ")); switch (currentRefreshRate) { case MLX90632_REFRESH_0_5HZ: - WS_PRINTER.println(F("0.5 Hz")); + WS_DEBUG_PRINTLN(F("0.5 Hz")); break; case MLX90632_REFRESH_1HZ: - WS_PRINTER.println(F("1 Hz")); + WS_DEBUG_PRINTLN(F("1 Hz")); break; case MLX90632_REFRESH_2HZ: - WS_PRINTER.println(F("2 Hz")); + WS_DEBUG_PRINTLN(F("2 Hz")); break; case MLX90632_REFRESH_4HZ: - WS_PRINTER.println(F("4 Hz")); + WS_DEBUG_PRINTLN(F("4 Hz")); break; case MLX90632_REFRESH_8HZ: - WS_PRINTER.println(F("8 Hz")); + WS_DEBUG_PRINTLN(F("8 Hz")); break; case MLX90632_REFRESH_16HZ: - WS_PRINTER.println(F("16 Hz")); + WS_DEBUG_PRINTLN(F("16 Hz")); break; case MLX90632_REFRESH_32HZ: - WS_PRINTER.println(F("32 Hz")); + WS_DEBUG_PRINTLN(F("32 Hz")); break; case MLX90632_REFRESH_64HZ: - WS_PRINTER.println(F("64 Hz")); + WS_DEBUG_PRINTLN(F("64 Hz")); break; default: - WS_PRINTER.println(F("Unknown")); + WS_DEBUG_PRINTLN(F("Unknown")); } // Clear new data flag before starting continuous measurements - WS_PRINTER.println(F("\\n--- Starting Continuous Measurements ---")); + WS_DEBUG_PRINTLN(F("\\n--- Starting Continuous Measurements ---")); if (!_mlx90632->resetNewData()) { - WS_PRINTER.println(F("Failed to reset new data flag")); + WS_DEBUG_PRINTLN(F("Failed to reset new data flag")); while (1) { delay(10); } @@ -256,36 +256,39 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { /*******************************************************************************/ bool ReadSensorData() { bool result = false; + if (HasBeenReadInLast200ms()) { + WS_DEBUG_PRINTLN(F("Sensor was read recently, using cached data")); + return true; + } // Only check new data flag - much more efficient for continuous mode if (_mlx90632->isNewData()) { - WS_PRINTER.print(F("New Data Available - Cycle Position: ")); - WS_PRINTER.println(_mlx90632->readCyclePosition()); + WS_DEBUG_PRINT(F("New Data Available - Cycle Position: ")); + WS_DEBUG_PRINTLN(_mlx90632->readCyclePosition()); // Read ambient temperature _deviceTemp = _mlx90632->getAmbientTemperature(); - WS_PRINTER.print(F("Ambient Temperature: ")); - WS_PRINTER.print(_deviceTemp, 4); - WS_PRINTER.println(F(" °C")); + WS_DEBUG_PRINT(F("Ambient Temperature: ")); + WS_DEBUG_PRINT(_deviceTemp, 4); + WS_DEBUG_PRINTLN(F(" °C")); // Read object temperature _objectTemp = _mlx90632->getObjectTemperature(); - WS_PRINTER.print(F("Object Temperature: ")); + WS_DEBUG_PRINT(F("Object Temperature: ")); if (isnan(_objectTemp)) { - WS_PRINTER.println(F("NaN (invalid cycle position)")); + WS_DEBUG_PRINTLN(F("NaN (invalid cycle position)")); } else { - WS_PRINTER.print(_objectTemp, 4); - WS_PRINTER.println(F(" °C")); + WS_DEBUG_PRINT(_objectTemp, 4); + WS_DEBUG_PRINTLN(F(" °C")); } result = true; + _lastRead = millis(); // Reset new data flag after reading if (!_mlx90632->resetNewData()) { - WS_PRINTER.println(F("Failed to reset new data flag")); + WS_DEBUG_PRINTLN(F("Failed to reset new data flag")); } - - WS_PRINTER.println(); // Add blank line between readings } else { - WS_PRINTER.println(F("No new data available, skipping read")); + WS_DEBUG_PRINTLN(F("No new data available, skipping read")); } // Check if we need to trigger a new measurement for step modes @@ -294,11 +297,9 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { currentMode == MLX90632_MODE_SLEEPING_STEP) { // Trigger single measurement (SOC bit) for step modes if (!_mlx90632->startSingleMeasurement()) { - WS_PRINTER.println(F("Failed to start single measurement")); + WS_DEBUG_PRINTLN(F("Failed to start single measurement")); } } - - _lastRead = millis(); return result; } @@ -315,7 +316,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { if (ReadSensorData() && _deviceTemp != NAN) { // TODO: check max/min or error values in datasheet // if (_deviceTemp < -40 || _deviceTemp > 125) { - // WS_PRINTER.println(F("Invalid ambient temperature")); + // WS_DEBUG_PRINTLN(F("Invalid ambient temperature")); // return false; // } // if the sensor was read recently, return the cached temperature From d3919890fb61cd4b3ab1c2c3f3aea4ddaef95ebc Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 16:25:18 +0100 Subject: [PATCH 09/15] adjust read logic for MLX90632 if not continuous reads (offline/low-power mode?) --- .../WipperSnapper_I2C_Driver_MLX90632D.h | 47 ++++++------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index ba4e5662..38ec2c49 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -80,9 +80,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { // Reset the device if (!_mlx90632->reset()) { WS_DEBUG_PRINTLN(F("Device reset failed")); - while (1) { - delay(10); - } + return false; } WS_DEBUG_PRINTLN(F("Device reset: SUCCESS")); @@ -261,25 +259,25 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { return true; } + // Check if we need to trigger a new measurement for step modes + mlx90632_mode_t currentMode = _mlx90632->getMode(); + if (currentMode == MLX90632_MODE_STEP || + currentMode == MLX90632_MODE_SLEEPING_STEP) { + // Trigger single measurement (SOC bit) for step modes + if (!_mlx90632->startSingleMeasurement()) { + WS_DEBUG_PRINTLN(F("Failed to start single measurement")); + return false; + } + delay(510); // Wait for measurement to complete @ 2Hz + } + // Only check new data flag - much more efficient for continuous mode if (_mlx90632->isNewData()) { - WS_DEBUG_PRINT(F("New Data Available - Cycle Position: ")); - WS_DEBUG_PRINTLN(_mlx90632->readCyclePosition()); - - // Read ambient temperature _deviceTemp = _mlx90632->getAmbientTemperature(); - WS_DEBUG_PRINT(F("Ambient Temperature: ")); - WS_DEBUG_PRINT(_deviceTemp, 4); - WS_DEBUG_PRINTLN(F(" °C")); - - // Read object temperature _objectTemp = _mlx90632->getObjectTemperature(); - WS_DEBUG_PRINT(F("Object Temperature: ")); if (isnan(_objectTemp)) { WS_DEBUG_PRINTLN(F("NaN (invalid cycle position)")); - } else { - WS_DEBUG_PRINT(_objectTemp, 4); - WS_DEBUG_PRINTLN(F(" °C")); + return false; } result = true; _lastRead = millis(); @@ -291,15 +289,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("No new data available, skipping read")); } - // Check if we need to trigger a new measurement for step modes - mlx90632_mode_t currentMode = _mlx90632->getMode(); - if (currentMode == MLX90632_MODE_STEP || - currentMode == MLX90632_MODE_SLEEPING_STEP) { - // Trigger single measurement (SOC bit) for step modes - if (!_mlx90632->startSingleMeasurement()) { - WS_DEBUG_PRINTLN(F("Failed to start single measurement")); - } - } + return result; } @@ -314,12 +304,6 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { /*******************************************************************************/ bool getEventAmbientTemp(sensors_event_t *tempEvent) { if (ReadSensorData() && _deviceTemp != NAN) { - // TODO: check max/min or error values in datasheet - // if (_deviceTemp < -40 || _deviceTemp > 125) { - // WS_DEBUG_PRINTLN(F("Invalid ambient temperature")); - // return false; - // } - // if the sensor was read recently, return the cached temperature tempEvent->temperature = _deviceTemp; return true; } @@ -337,7 +321,6 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { /*******************************************************************************/ bool getEventObjectTemp(sensors_event_t *tempEvent) { if (ReadSensorData() && _objectTemp != NAN) { - // if the sensor was read recently, return the cached temperature tempEvent->temperature = _objectTemp; return true; } From 40a7ecbce702b985ecf36ede242d43c8f2659e22 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 17:20:39 +0100 Subject: [PATCH 10/15] clean up object and stop infinite loops --- .../WipperSnapper_I2C_Driver_MLX90632D.h | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 38ec2c49..95a48bc4 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -40,6 +40,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { : WipperSnapper_I2C_Driver(i2c, sensorAddress) { _i2c = i2c; _sensorAddress = sensorAddress; + _mlx90632 = nullptr; _deviceTemp = NAN; _objectTemp = NAN; _lastRead = 0; @@ -50,7 +51,12 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { @brief Destructor for an MLX90632 sensor. */ /*******************************************************************************/ - ~WipperSnapper_I2C_Driver_MLX90632D() { delete _mlx90632; } + ~WipperSnapper_I2C_Driver_MLX90632D() { + if (_mlx90632){ + delete _mlx90632; + _mlx90632 = nullptr; + } + } /*******************************************************************************/ /*! @@ -125,9 +131,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { // (!_mlx90632->setMode(MLX90632_MODE_SLEEPING_STEP)) { // Uncomment for // sleeping step mode testing WS_DEBUG_PRINTLN(F("Failed to set mode")); - while (1) { - delay(10); - } + return false; } // TODO: use Step mode? @@ -157,17 +161,13 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { if (!extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { WS_DEBUG_PRINTLN(F("Failed to set measurement select to Medical")); - while (1) { - delay(10); - } + return false; } else if (extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect( MLX90632_MEAS_EXTENDED_RANGE)) { WS_DEBUG_PRINTLN( F("Failed to set measurement select to Extended Range")); - while (1) { - delay(10); - } + return false; } mlx90632_meas_select_t currentMeasSelect = @@ -189,9 +189,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("\n--- Refresh Rate Settings ---")); if (!_mlx90632->setRefreshRate(MLX90632_REFRESH_2HZ)) { WS_DEBUG_PRINTLN(F("Failed to set refresh rate to 2Hz")); - while (1) { - delay(10); - } + return false; } mlx90632_refresh_rate_t currentRefreshRate = _mlx90632->getRefreshRate(); @@ -229,9 +227,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("\\n--- Starting Continuous Measurements ---")); if (!_mlx90632->resetNewData()) { WS_DEBUG_PRINTLN(F("Failed to reset new data flag")); - while (1) { - delay(10); - } + return false; } return true; } From 39a15fd584f4e9fd0dbcf85c0277f5816a7a0ec7 Mon Sep 17 00:00:00 2001 From: tyeth Date: Wed, 20 Aug 2025 17:21:19 +0100 Subject: [PATCH 11/15] clang --- .../i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 95a48bc4..4140f44b 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -51,8 +51,8 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { @brief Destructor for an MLX90632 sensor. */ /*******************************************************************************/ - ~WipperSnapper_I2C_Driver_MLX90632D() { - if (_mlx90632){ + ~WipperSnapper_I2C_Driver_MLX90632D() { + if (_mlx90632) { delete _mlx90632; _mlx90632 = nullptr; } @@ -67,8 +67,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { bool begin() { _mlx90632 = new Adafruit_MLX90632(); // attempt to initialize MLX90632 - if (!_mlx90632->begin(_sensorAddress, _i2c)) - return false; + if (!_mlx90632->begin(_sensorAddress, _i2c)) return false; return ConfigureAndPrintSensorInfo(); } @@ -264,7 +263,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("Failed to start single measurement")); return false; } - delay(510); // Wait for measurement to complete @ 2Hz + delay(510); // Wait for measurement to complete @ 2Hz } // Only check new data flag - much more efficient for continuous mode @@ -285,7 +284,6 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("No new data available, skipping read")); } - return result; } From 6de22b6d258611c0bf3bad82bca0c110ccbc4a2d Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Fri, 22 Aug 2025 12:58:59 +0100 Subject: [PATCH 12/15] Add delete/nullptr check to begin (dtor not called) --- .../i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 4140f44b..911e8edc 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -65,6 +65,10 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { */ /*******************************************************************************/ bool begin() { + if (_mlx90632) { + delete _mlx90632; + _mlx90632 = nullptr; + } _mlx90632 = new Adafruit_MLX90632(); // attempt to initialize MLX90632 if (!_mlx90632->begin(_sensorAddress, _i2c)) return false; From 5be2eb1b4a4bc7951c298308c6b00d45c8f3685c Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Fri, 22 Aug 2025 13:03:01 +0100 Subject: [PATCH 13/15] Drop logging around model id, accuracy etc. --- .../WipperSnapper_I2C_Driver_MLX90632D.h | 103 ------------------ 1 file changed, 103 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 911e8edc..802ab7e3 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -91,76 +91,21 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("Device reset failed")); return false; } - WS_DEBUG_PRINTLN(F("Device reset: SUCCESS")); - - uint64_t productID = _mlx90632->getProductID(); - WS_DEBUG_PRINT(F("Product ID: 0x")); - WS_DEBUG_PRINT((uint32_t)(productID >> 32), HEX); - WS_DEBUG_PRINTLN((uint32_t)(productID & 0xFFFFFFFF), HEX); uint16_t productCode = _mlx90632->getProductCode(); - WS_DEBUG_PRINT(F("Product Code: 0x")); - WS_DEBUG_PRINTLN(productCode, HEX); - - uint16_t eepromVersion = _mlx90632->getEEPROMVersion(); - WS_DEBUG_PRINT(F("EEPROM Version: 0x")); - WS_DEBUG_PRINTLN(eepromVersion, HEX); - // Decode product code bits uint8_t fov = (productCode >> 8) & 0x3; uint8_t package = (productCode >> 5) & 0x7; uint8_t accuracy = productCode & 0x1F; - WS_DEBUG_PRINT(F("FOV: ")); - WS_DEBUG_PRINTLN(fov == 0 ? F("50°") : F("Unknown")); - - WS_DEBUG_PRINT(F("Package: ")); - WS_DEBUG_PRINTLN(package == 1 ? F("SFN 3x3") : F("Unknown")); - - WS_DEBUG_PRINT(F("Accuracy: ")); - if (accuracy == 1) { - WS_DEBUG_PRINTLN(F("Medical")); - } else if (accuracy == 2) { - WS_DEBUG_PRINTLN(F("Standard")); - } else { - WS_DEBUG_PRINTLN(F("Unknown")); - } - - // Set and get mode - choose one: - WS_DEBUG_PRINTLN(F("\n--- Mode Settings ---")); if (!_mlx90632->setMode(MLX90632_MODE_CONTINUOUS)) { - // if (!_mlx90632->setMode(MLX90632_MODE_STEP)) { // Uncomment - // for step mode testing if - // (!_mlx90632->setMode(MLX90632_MODE_SLEEPING_STEP)) { // Uncomment for - // sleeping step mode testing WS_DEBUG_PRINTLN(F("Failed to set mode")); return false; } - // TODO: use Step mode? - mlx90632_mode_t currentMode = _mlx90632->getMode(); - WS_DEBUG_PRINT(F("Current mode: ")); - switch (currentMode) { - case MLX90632_MODE_HALT: - WS_DEBUG_PRINTLN(F("Halt")); - break; - case MLX90632_MODE_SLEEPING_STEP: - WS_DEBUG_PRINTLN(F("Sleeping Step")); - break; - case MLX90632_MODE_STEP: - WS_DEBUG_PRINTLN(F("Step")); - break; - case MLX90632_MODE_CONTINUOUS: - WS_DEBUG_PRINTLN(F("Continuous")); - break; - default: - WS_DEBUG_PRINTLN(F("Unknown")); - } - // set accuracy mode based on medical if detected if (accuracy == 1) { // Set and get measurement select (medical) - WS_DEBUG_PRINTLN(F("\n--- Measurement Select Settings ---")); if (!extendedInsteadOfMedicalRange && !_mlx90632->setMeasurementSelect(MLX90632_MEAS_MEDICAL)) { WS_DEBUG_PRINTLN(F("Failed to set measurement select to Medical")); @@ -172,62 +117,14 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { F("Failed to set measurement select to Extended Range")); return false; } - - mlx90632_meas_select_t currentMeasSelect = - _mlx90632->getMeasurementSelect(); - WS_DEBUG_PRINT(F("Current measurement select: ")); - switch (currentMeasSelect) { - case MLX90632_MEAS_MEDICAL: - WS_DEBUG_PRINTLN(F("Medical")); - break; - case MLX90632_MEAS_EXTENDED_RANGE: - WS_DEBUG_PRINTLN(F("Extended Range")); - break; - default: - WS_DEBUG_PRINTLN(F("Unknown")); - } } // Set and get refresh rate (default to 2Hz) - WS_DEBUG_PRINTLN(F("\n--- Refresh Rate Settings ---")); if (!_mlx90632->setRefreshRate(MLX90632_REFRESH_2HZ)) { WS_DEBUG_PRINTLN(F("Failed to set refresh rate to 2Hz")); return false; } - mlx90632_refresh_rate_t currentRefreshRate = _mlx90632->getRefreshRate(); - WS_DEBUG_PRINT(F("Current refresh rate: ")); - switch (currentRefreshRate) { - case MLX90632_REFRESH_0_5HZ: - WS_DEBUG_PRINTLN(F("0.5 Hz")); - break; - case MLX90632_REFRESH_1HZ: - WS_DEBUG_PRINTLN(F("1 Hz")); - break; - case MLX90632_REFRESH_2HZ: - WS_DEBUG_PRINTLN(F("2 Hz")); - break; - case MLX90632_REFRESH_4HZ: - WS_DEBUG_PRINTLN(F("4 Hz")); - break; - case MLX90632_REFRESH_8HZ: - WS_DEBUG_PRINTLN(F("8 Hz")); - break; - case MLX90632_REFRESH_16HZ: - WS_DEBUG_PRINTLN(F("16 Hz")); - break; - case MLX90632_REFRESH_32HZ: - WS_DEBUG_PRINTLN(F("32 Hz")); - break; - case MLX90632_REFRESH_64HZ: - WS_DEBUG_PRINTLN(F("64 Hz")); - break; - default: - WS_DEBUG_PRINTLN(F("Unknown")); - } - - // Clear new data flag before starting continuous measurements - WS_DEBUG_PRINTLN(F("\\n--- Starting Continuous Measurements ---")); if (!_mlx90632->resetNewData()) { WS_DEBUG_PRINTLN(F("Failed to reset new data flag")); return false; From 6deba1dea6d4a391f8ced06d20f1c8a67ee8ca07 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Fri, 22 Aug 2025 13:04:10 +0100 Subject: [PATCH 14/15] clang-format --- .../WipperSnapper_I2C_Driver_MLX90632D.h | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 802ab7e3..3a321922 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -26,7 +26,7 @@ */ /**************************************************************************/ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { - public: +public: /*******************************************************************************/ /*! @brief Constructor for an MLX90632 sensor. @@ -71,7 +71,8 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { } _mlx90632 = new Adafruit_MLX90632(); // attempt to initialize MLX90632 - if (!_mlx90632->begin(_sensorAddress, _i2c)) return false; + if (!_mlx90632->begin(_sensorAddress, _i2c)) + return false; return ConfigureAndPrintSensorInfo(); } @@ -164,7 +165,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { WS_DEBUG_PRINTLN(F("Failed to start single measurement")); return false; } - delay(510); // Wait for measurement to complete @ 2Hz + delay(510); // Wait for measurement to complete @ 2Hz } // Only check new data flag - much more efficient for continuous mode @@ -202,7 +203,7 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { tempEvent->temperature = _deviceTemp; return true; } - return false; // sensor not read recently, return false + return false; // sensor not read recently, return false } /*******************************************************************************/ @@ -219,14 +220,14 @@ class WipperSnapper_I2C_Driver_MLX90632D : public WipperSnapper_I2C_Driver { tempEvent->temperature = _objectTemp; return true; } - return false; // sensor not read recently, return false + return false; // sensor not read recently, return false } - protected: - double _deviceTemp; ///< Device temperature in Celsius - double _objectTemp; ///< Object temperature in Celsius - uint32_t _lastRead; ///< Last time the sensor was read in milliseconds - Adafruit_MLX90632 *_mlx90632 = nullptr; ///< MLX90632 object +protected: + double _deviceTemp; ///< Device temperature in Celsius + double _objectTemp; ///< Object temperature in Celsius + uint32_t _lastRead; ///< Last time the sensor was read in milliseconds + Adafruit_MLX90632 *_mlx90632 = nullptr; ///< MLX90632 object }; -#endif // WipperSnapper_I2C_Driver_MLX90632 \ No newline at end of file +#endif // WipperSnapper_I2C_Driver_MLX90632 \ No newline at end of file From 71b8dd42d2d843883c1fb630f49cef6ae8e7ad65 Mon Sep 17 00:00:00 2001 From: Tyeth Gundry Date: Fri, 22 Aug 2025 13:21:14 +0100 Subject: [PATCH 15/15] Doxygen fixes --- .../i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h index 3a321922..d5302962 100644 --- a/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h +++ b/src/components/i2c/drivers/WipperSnapper_I2C_Driver_MLX90632D.h @@ -1,5 +1,5 @@ /*! - * @file WipperSnapper_I2C_Driver_MLX90632.h + * @file WipperSnapper_I2C_Driver_MLX90632D.h * * Device driver for a Melexis MLX90632-D (medical) thermal FIR sensor. * @@ -13,8 +13,8 @@ * */ -#ifndef WipperSnapper_I2C_Driver_MLX90632_H -#define WipperSnapper_I2C_Driver_MLX90632_H +#ifndef WipperSnapper_I2C_Driver_MLX90632D_H +#define WipperSnapper_I2C_Driver_MLX90632D_H #include @@ -230,4 +230,4 @@ protected: Adafruit_MLX90632 *_mlx90632 = nullptr; ///< MLX90632 object }; -#endif // WipperSnapper_I2C_Driver_MLX90632 \ No newline at end of file +#endif // WipperSnapper_I2C_Driver_MLX90632D_H \ No newline at end of file