From 6c327319863325910901036a122f6f480f50326b Mon Sep 17 00:00:00 2001 From: David Antliff Date: Wed, 18 Mar 2020 17:15:41 +1300 Subject: [PATCH 1/4] Fix CMake build. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f19c761..1e87312 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,4 +6,4 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp32-ds18b20-example) # Ignore false clang warnings about `struct foo = { 0 }` -target_compile_options(main PRIVATE -Wno-missing-braces -Wmissing-field-initializers) +target_compile_options(${IDF_PROJECT_EXECUTABLE} PRIVATE -Wno-missing-braces -Wmissing-field-initializers) From 17bec84d911c0d68ead6a5976e43b6b0941f20c0 Mon Sep 17 00:00:00 2001 From: David Antliff Date: Wed, 18 Mar 2020 17:16:00 +1300 Subject: [PATCH 2/4] Update esp32-ds18b20 and esp32-owb components. --- components/esp32-ds18b20 | 2 +- components/esp32-owb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/esp32-ds18b20 b/components/esp32-ds18b20 index 331cadf..9f8a4ea 160000 --- a/components/esp32-ds18b20 +++ b/components/esp32-ds18b20 @@ -1 +1 @@ -Subproject commit 331cadf2e25c004b5506d329979ac3f7d4998a5d +Subproject commit 9f8a4ea14df39e9c81da665caf4d35535f7f495b diff --git a/components/esp32-owb b/components/esp32-owb index de012fd..4085946 160000 --- a/components/esp32-owb +++ b/components/esp32-owb @@ -1 +1 @@ -Subproject commit de012fd1deeb9aff194bc8e32e1dee725258c022 +Subproject commit 40859461ee38c61a596f12b44445643829e6d820 From 362774091b3fb141651dce344d036b50aa28bb73 Mon Sep 17 00:00:00 2001 From: David Antliff Date: Wed, 18 Mar 2020 18:52:42 +1300 Subject: [PATCH 3/4] Update esp32-ds18b20 and esp32-owb components. --- components/esp32-ds18b20 | 2 +- components/esp32-owb | 2 +- main/app_main.c | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/esp32-ds18b20 b/components/esp32-ds18b20 index 331cadf..97fa5ee 160000 --- a/components/esp32-ds18b20 +++ b/components/esp32-ds18b20 @@ -1 +1 @@ -Subproject commit 331cadf2e25c004b5506d329979ac3f7d4998a5d +Subproject commit 97fa5ee7c3edc6cbf77aac97cf61cece98651b5c diff --git a/components/esp32-owb b/components/esp32-owb index de012fd..781c61e 160000 --- a/components/esp32-owb +++ b/components/esp32-owb @@ -1 +1 @@ -Subproject commit de012fd1deeb9aff194bc8e32e1dee725258c022 +Subproject commit 781c61e4422f13ad45f7ada7e37f9986b3bc5379 diff --git a/main/app_main.c b/main/app_main.c index a15ee6a..46fc17c 100644 --- a/main/app_main.c +++ b/main/app_main.c @@ -43,8 +43,9 @@ void app_main() // Override global log level esp_log_level_set("*", ESP_LOG_INFO); - // To debug OWB, use 'make menuconfig' to set default Log level to DEBUG, then uncomment: + // To debug, use 'make menuconfig' to set default Log level to DEBUG, then uncomment: //esp_log_level_set("owb", ESP_LOG_DEBUG); + //esp_log_level_set("ds18b20", ESP_LOG_DEBUG); // Stable readings require a brief period before communication vTaskDelay(2000.0 / portTICK_PERIOD_MS); @@ -133,7 +134,7 @@ void app_main() { ds18b20_init(ds18b20_info, owb, device_rom_codes[i]); // associate with bus and device } - ds18b20_use_crc(ds18b20_info, true); // enable CRC check for temperature readings + ds18b20_use_crc(ds18b20_info, true); // enable CRC check on all reads ds18b20_set_resolution(ds18b20_info, DS18B20_RESOLUTION); } From 0292adfbc498ac7391acef37eb35b291a35bf238 Mon Sep 17 00:00:00 2001 From: David Antliff Date: Wed, 18 Mar 2020 19:37:17 +1300 Subject: [PATCH 4/4] Update esp32-owb component to resolve owb_verify_rom blocking when no devices are connected. --- components/esp32-owb | 2 +- main/app_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/esp32-owb b/components/esp32-owb index de012fd..af25dd3 160000 --- a/components/esp32-owb +++ b/components/esp32-owb @@ -1 +1 @@ -Subproject commit de012fd1deeb9aff194bc8e32e1dee725258c022 +Subproject commit af25dd31dbb1e80364b99fad29815badfab0ceda diff --git a/main/app_main.c b/main/app_main.c index a15ee6a..eb13214 100644 --- a/main/app_main.c +++ b/main/app_main.c @@ -45,6 +45,7 @@ void app_main() // To debug OWB, use 'make menuconfig' to set default Log level to DEBUG, then uncomment: //esp_log_level_set("owb", ESP_LOG_DEBUG); + //esp_log_level_set("ds18b20", ESP_LOG_DEBUG); // Stable readings require a brief period before communication vTaskDelay(2000.0 / portTICK_PERIOD_MS); @@ -191,6 +192,10 @@ void app_main() vTaskDelayUntil(&last_wake_time, SAMPLE_PERIOD / portTICK_PERIOD_MS); } } + else + { + printf("\nNo DS18B20 devices detected!\n"); + } // clean up dynamically allocated data for (int i = 0; i < num_devices; ++i)