Merge pull request #3876 from SybexX/test4

test1

Author: SybexX

code/components/esp32-camera

@@ -1,7 +1,7 @@
 FILE(GLOB_RECURSE app_sources ${CMAKE_CURRENT_SOURCE_DIR}/*.*)
 
 idf_component_register(SRCS ${app_sources}
-                    INCLUDE_DIRS "."
+                    INCLUDE_DIRS "." "../../include"
                     REQUIRES jomjol_logfile)
 
 

code/components/jomjol_configfile/CMakeLists.txt

@@ -12,13 +12,13 @@ static const char *TAG = "CONFIG";
 
 ConfigFile::ConfigFile(std::string filePath)
 {
-    std::string config = FormatFileName(filePath);
-    pFile = fopen(config.c_str(), "r");
+	std::string config = FormatFileName(filePath);
+	pFile = fopen(config.c_str(), "r");
 }
 
 ConfigFile::~ConfigFile()
 {
-    fclose(pFile);
+	fclose(pFile);
 }
 
 bool ConfigFile::isNewParagraph(std::string input)
@@ -30,18 +30,23 @@ bool ConfigFile::isNewParagraph(std::string input)
 	return false;
 }
 
-bool ConfigFile::GetNextParagraph(std::string& aktparamgraph, bool &disabled, bool &eof)
+bool ConfigFile::GetNextParagraph(std::string &aktparamgraph, bool &disabled, bool &eof)
 {
-	while (getNextLine(&aktparamgraph, disabled, eof) && !isNewParagraph(aktparamgraph));
+	while (getNextLine(&aktparamgraph, disabled, eof) && !isNewParagraph(aktparamgraph))
+	{
+	}
 
 	if (isNewParagraph(aktparamgraph))
+	{
 		return true;
+	}
+
 	return false;
 }
 
 bool ConfigFile::getNextLine(std::string *rt, bool &disabled, bool &eof)
 {
-    eof = false;
+	eof = false;
 	char zw[1024] = "";
 	if (pFile == NULL)
 	{
@@ -74,13 +79,13 @@ bool ConfigFile::getNextLine(std::string *rt, bool &disabled, bool &eof)
 		if (feof(pFile))
 		{
 			*rt = "";
-            eof = true;
+			eof = true;
 			return false;
 		}
 		*rt = zw;
 		*rt = trim(*rt);
 	}
 
-    disabled = ((*rt)[0] == ';');
+	disabled = ((*rt)[0] == ';');
 	return true;
 }

code/components/jomjol_configfile/configFile.cpp

@@ -0,0 +1,106 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
+#include <string.h>
+#include "ds18b20.h"
+#include "esp_check.h"
+
+static const char *TAG = "ds18b20";
+
+esp_err_t ds18b20_trigger_temperature_conversion(onewire_bus_handle_t handle, const uint8_t *rom_number)
+{
+    ESP_RETURN_ON_FALSE(handle, ESP_ERR_INVALID_ARG, TAG, "invalid 1-wire handle");
+
+    ESP_RETURN_ON_ERROR(onewire_bus_reset(handle), TAG, "error while resetting bus"); // reset bus and check if the device is present
+
+    uint8_t tx_buffer[10];
+    uint8_t tx_buffer_size;
+
+    if (rom_number) { // specify rom id
+        tx_buffer[0] = ONEWIRE_CMD_MATCH_ROM;
+        tx_buffer[9] = DS18B20_CMD_CONVERT_TEMP;
+        memcpy(&tx_buffer[1], rom_number, 8);
+        tx_buffer_size = 10;
+    } else { // skip rom id
+        tx_buffer[0] = ONEWIRE_CMD_SKIP_ROM;
+        tx_buffer[1] = DS18B20_CMD_CONVERT_TEMP;
+        tx_buffer_size = 2;
+    }
+
+    ESP_RETURN_ON_ERROR(onewire_bus_write_bytes(handle, tx_buffer, tx_buffer_size),
+                        TAG, "error while triggering temperature convert");
+
+    return ESP_OK;
+}
+
+esp_err_t ds18b20_get_temperature(onewire_bus_handle_t handle, const uint8_t *rom_number, float *temperature)
+{
+    ESP_RETURN_ON_FALSE(handle, ESP_ERR_INVALID_ARG, TAG, "invalid 1-wire handle");
+    ESP_RETURN_ON_FALSE(temperature, ESP_ERR_INVALID_ARG, TAG, "invalid temperature pointer");
+
+    ESP_RETURN_ON_ERROR(onewire_bus_reset(handle), TAG, "error while resetting bus"); // reset bus and check if the device is present
+
+    ds18b20_scratchpad_t scratchpad;
+
+    uint8_t tx_buffer[10];
+    uint8_t tx_buffer_size;
+
+    if (rom_number) { // specify rom id
+        tx_buffer[0] = ONEWIRE_CMD_MATCH_ROM;
+        tx_buffer[9] = DS18B20_CMD_READ_SCRATCHPAD;
+        memcpy(&tx_buffer[1], rom_number, 8);
+        tx_buffer_size = 10;
+    } else {
+        tx_buffer[0] = ONEWIRE_CMD_SKIP_ROM;
+        tx_buffer[1] = DS18B20_CMD_READ_SCRATCHPAD;
+        tx_buffer_size = 2;
+    }
+
+    ESP_RETURN_ON_ERROR(onewire_bus_write_bytes(handle, tx_buffer, tx_buffer_size),
+                        TAG, "error while sending read scratchpad command");
+    ESP_RETURN_ON_ERROR(onewire_bus_read_bytes(handle, (uint8_t *)&scratchpad, sizeof(scratchpad)),
+                        TAG, "error while reading scratchpad command");
+
+    ESP_RETURN_ON_FALSE(onewire_check_crc8((uint8_t *)&scratchpad, 8) == scratchpad.crc_value, ESP_ERR_INVALID_CRC,
+                        TAG, "crc error");
+
+    static const uint8_t lsb_mask[4] = { 0x07, 0x03, 0x01, 0x00 };
+    uint8_t lsb_masked = scratchpad.temp_lsb & (~lsb_mask[scratchpad.configuration >> 5]); // mask bits not used in low resolution
+    *temperature = (((int16_t)scratchpad.temp_msb << 8) | lsb_masked)  / 16.0f;
+
+    return ESP_OK;
+}
+
+esp_err_t ds18b20_set_resolution(onewire_bus_handle_t handle, const uint8_t *rom_number, ds18b20_resolution_t resolution)
+{
+    ESP_RETURN_ON_FALSE(handle, ESP_ERR_INVALID_ARG, TAG, "invalid 1-wire handle");
+
+    ESP_RETURN_ON_ERROR(onewire_bus_reset(handle), TAG, "error while resetting bus"); // reset bus and check if the device is present
+
+    uint8_t tx_buffer[10];
+    uint8_t tx_buffer_size;
+
+    if (rom_number) { // specify rom id
+        tx_buffer[0] = ONEWIRE_CMD_MATCH_ROM;
+        tx_buffer[9] = DS18B20_CMD_WRITE_SCRATCHPAD;
+        memcpy(&tx_buffer[1], rom_number, 8);
+        tx_buffer_size = 10;
+    } else {
+        tx_buffer[0] = ONEWIRE_CMD_SKIP_ROM;
+        tx_buffer[1] = DS18B20_CMD_WRITE_SCRATCHPAD;
+        tx_buffer_size = 2;
+    }
+
+    ESP_RETURN_ON_ERROR(onewire_bus_write_bytes(handle, tx_buffer, tx_buffer_size),
+                        TAG, "error while sending read scratchpad command");
+
+    tx_buffer[0] = 0;
+    tx_buffer[1] = 0;
+    tx_buffer[2] = resolution;
+    ESP_RETURN_ON_ERROR(onewire_bus_write_bytes(handle, tx_buffer, 3),
+                        TAG, "error while sending write scratchpad command");
+
+    return ESP_OK;
+}

code/components/jomjol_controlGPIO/ds18b20.c

@@ -0,0 +1,78 @@
+/*
+ * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
+#pragma once
+
+#include "onewire_bus.h"
+
+#define DS18B20_CMD_CONVERT_TEMP 0x44
+#define DS18B20_CMD_WRITE_SCRATCHPAD 0x4E
+#define DS18B20_CMD_READ_SCRATCHPAD 0xBE
+
+/**
+ * @brief Structure of DS18B20's scratchpad
+ *
+ */
+typedef struct  {
+    uint8_t temp_lsb; /*!< lsb of temperature */
+    uint8_t temp_msb; /*!< msb of temperature */
+    uint8_t th_user1; /*!< th register or user byte 1 */
+    uint8_t tl_user2; /*!< tl register or user byte 2 */
+    uint8_t configuration; /*!< configuration register */
+    uint8_t _reserved1;
+    uint8_t _reserved2;
+    uint8_t _reserved3;
+    uint8_t crc_value; /*!< crc value of scratchpad data */
+} ds18b20_scratchpad_t;
+
+/**
+ * @brief Enumeration of DS18B20's resolution config
+ *
+ */
+typedef enum {
+    DS18B20_RESOLUTION_12B = 0x7F, /*!< 750ms convert time */
+    DS18B20_RESOLUTION_11B = 0x5F, /*!< 375ms convert time */
+    DS18B20_RESOLUTION_10B = 0x3F, /*!< 187.5ms convert time */
+    DS18B20_RESOLUTION_9B = 0x1F, /*!< 93.75ms convert time */
+} ds18b20_resolution_t;
+
+/**
+ * @brief Trigger temperature conversion of DS18B20
+ *
+ * @param[in] handle 1-wire handle with DS18B20 on
+ * @param[in] rom_number ROM number to specify which DS18B20 to send command, NULL to skip ROM
+ * @return
+ *         - ESP_OK                Trigger tempreture convertsion success.
+ *         - ESP_ERR_INVALID_ARG   Invalid argument.
+ *         - ESP_ERR_NOT_FOUND     There is no device present on 1-wire bus.
+ */
+esp_err_t ds18b20_trigger_temperature_conversion(onewire_bus_handle_t handle, const uint8_t *rom_number);
+
+/**
+ * @brief Get temperature from DS18B20
+ *
+ * @param[in] handle 1-wire handle with DS18B20 on
+ * @param[in] rom_number ROM number to specify which DS18B20 to read from, NULL to skip ROM
+ * @param[out] temperature result from DS18B20
+ * @return
+ *         - ESP_OK                Get tempreture from DS18B20 success.
+ *         - ESP_ERR_INVALID_ARG   Invalid argument.
+ *         - ESP_ERR_NOT_FOUND     There is no device present on 1-wire bus.
+ *         - ESP_ERR_INVALID_CRC   CRC check failed.
+ */
+esp_err_t ds18b20_get_temperature(onewire_bus_handle_t handle, const uint8_t *rom_number, float *temperature);
+
+/**
+ * @brief Set DS18B20's temperation conversion resolution
+ *
+ * @param[in] handle 1-wire handle with DS18B20 on
+ * @param[in] rom_number ROM number to specify which DS18B20 to read from, NULL to skip ROM
+ * @param[in] resolution resolution of DS18B20's temperation conversion
+ * @return
+ *         - ESP_OK                Set DS18B20 resolution success.
+ *         - ESP_ERR_INVALID_ARG   Invalid argument.
+ *         - ESP_ERR_NOT_FOUND     There is no device present on 1-wire bus.
+ */
+esp_err_t ds18b20_set_resolution(onewire_bus_handle_t handle, const uint8_t *rom_number, ds18b20_resolution_t resolution);