From b64d86d308d6a0c01941b01c61b594879118e4cc Mon Sep 17 00:00:00 2001 From: Miroslav Pivovarsky Date: Fri, 12 Jul 2024 21:51:29 +0200 Subject: [PATCH] "Added support for an external temperature sensor to more boards. --- ESP32_PrusaConnectCam/ExternalTemperatureSensor.h | 4 ++-- ESP32_PrusaConnectCam/cfg.cpp | 10 ++++++++++ ESP32_PrusaConnectCam/mcu_cfg.h | 12 ++++++------ ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h | 4 ++++ ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h | 4 ++++ ESP32_PrusaConnectCam/module_XIAO_ESP32-S3-cam.h | 2 +- 6 files changed, 27 insertions(+), 9 deletions(-) diff --git a/ESP32_PrusaConnectCam/ExternalTemperatureSensor.h b/ESP32_PrusaConnectCam/ExternalTemperatureSensor.h index 636b756..09a35cc 100644 --- a/ESP32_PrusaConnectCam/ExternalTemperatureSensor.h +++ b/ESP32_PrusaConnectCam/ExternalTemperatureSensor.h @@ -31,8 +31,8 @@ class ExternalSensor { bool UserEnable; ///< user enable flag uint8_t SensorType; ///< sensor type - Logs *log; - Configuration *config; + Logs *log; ///< log object + Configuration *config; ///< configuration object public: ExternalSensor(uint8_t, bool, Logs *, Configuration *); diff --git a/ESP32_PrusaConnectCam/cfg.cpp b/ESP32_PrusaConnectCam/cfg.cpp index 13a5721..f3864af 100644 --- a/ESP32_PrusaConnectCam/cfg.cpp +++ b/ESP32_PrusaConnectCam/cfg.cpp @@ -1383,6 +1383,11 @@ bool Configuration::LoadTimeLapseFunctionStatus() { return (bool) ret; } +/** + * @brief Load external temperature sensor enable + * + * @return bool - status + */ bool Configuration::LoadExternalTemperatureSensorEnable() { uint8_t ret = EEPROM.read(EEPROM_ADDR_EXT_SENS_ENABLE_START); Log->AddEvent(LogLevel_Info, F("External temperature sensor enable: "), String(ret)); @@ -1394,6 +1399,11 @@ bool Configuration::LoadExternalTemperatureSensorEnable() { return (bool) ret; } +/** + * @brief Load external temperature sensor unit + * + * @return uint8_t - unit + */ uint8_t Configuration::LoadExternalTemperatureSensorUnit() { uint8_t ret = EEPROM.read(EEPROM_ADDR_EXT_SENS_UNIT_START); Log->AddEvent(LogLevel_Info, F("External temperature sensor unit: "), String(ret)); diff --git a/ESP32_PrusaConnectCam/mcu_cfg.h b/ESP32_PrusaConnectCam/mcu_cfg.h index 46e455e..5317866 100644 --- a/ESP32_PrusaConnectCam/mcu_cfg.h +++ b/ESP32_PrusaConnectCam/mcu_cfg.h @@ -14,12 +14,12 @@ #define _MCU_CFG_H_ /* ----------------- CAMERA TYPE ---------------*/ -#define AI_THINKER_ESP32_CAM false -#define ESP32_WROVER_DEV false -#define CAMERA_MODEL_ESP32_S3_DEV_CAM false -#define CAMERA_MODEL_ESP32_S3_EYE_2_2 false -#define CAMERA_MODEL_XIAO_ESP32_S3_CAM true -#define CAMERA_MODEL_ESP32_S3_CAM false +#define AI_THINKER_ESP32_CAM true +#define ESP32_WROVER_DEV false +#define CAMERA_MODEL_ESP32_S3_DEV_CAM false +#define CAMERA_MODEL_ESP32_S3_EYE_2_2 false +#define CAMERA_MODEL_XIAO_ESP32_S3_CAM false +#define CAMERA_MODEL_ESP32_S3_CAM false /* ---------------- BASIC MCU CFG --------------*/ #define SW_VERSION "1.1.0-rc2" ///< SW version diff --git a/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h b/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h index 4c11f1b..6d2ad4c 100644 --- a/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h +++ b/ESP32_PrusaConnectCam/module_ESP32-S3-EYE_2_2.h @@ -93,5 +93,9 @@ #define STATUS_LED_GPIO_NUM 3 ///< GPIO pin for status LED #define STATUS_LED_OFF_PIN_LEVEL HIGH ///< GPIO pin level for status LED ON +/* -------------- DHT SENSOR CFG ----------------*/ +#define DHT_SENSOR_ENABLE true ///< enable/disable DHT sensor +#define DHT_SENSOR_PIN 46 ///< GPIO pin for DHT sensor + #endif // CAMERA_MODEL_ESP32_S3_EYE_2_2 /* EOF */ \ No newline at end of file diff --git a/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h b/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h index ca64c98..c25829b 100644 --- a/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h +++ b/ESP32_PrusaConnectCam/module_ESP32-WROVER-DEV.h @@ -81,5 +81,9 @@ #define STATUS_LED_GPIO_NUM 2 ///< GPIO pin for status LED #define STATUS_LED_OFF_PIN_LEVEL HIGH ///< GPIO pin level for status LED ON +/* -------------- DHT SENSOR CFG ----------------*/ +#define DHT_SENSOR_ENABLE true ///< enable/disable DHT sensor +#define DHT_SENSOR_PIN 46 ///< GPIO pin for DHT sensor + #endif // ESP32_WROVER_DEV /* EOF */ \ No newline at end of file diff --git a/ESP32_PrusaConnectCam/module_XIAO_ESP32-S3-cam.h b/ESP32_PrusaConnectCam/module_XIAO_ESP32-S3-cam.h index 8267c40..25e15cc 100644 --- a/ESP32_PrusaConnectCam/module_XIAO_ESP32-S3-cam.h +++ b/ESP32_PrusaConnectCam/module_XIAO_ESP32-S3-cam.h @@ -7,7 +7,7 @@ Contact: miroslav.pivovarsky@gmail.com https://www.seeedstudio.com/XIAO-ESP32S3-Sense-p-5639.html - https://wiki.seeedstudio.com/xiao_esp32s3_getting_started/ + https://wiki.seeedstudio.com/xiao_esp32s3_getting_started/ https://github.com/limengdu/SeeedStudio-XIAO-ESP32S3-Sense-camera https://github.com/Seeed-Studio/XIAO_Series