Browse Source

Merge branch 'refactor' into integration

main
David Antliff 6 years ago
parent
commit
9c2b81dd80
  1. 2
      components/esp32-ds18b20
  2. 2
      components/esp32-owb
  3. 5
      main/app_main.c

2
components/esp32-ds18b20

@ -1 +1 @@
Subproject commit 9f8a4ea14df39e9c81da665caf4d35535f7f495b Subproject commit d76b70c0a795adbbd1b9d1b3e2789b455cfd945d

2
components/esp32-owb

@ -1 +1 @@
Subproject commit 40859461ee38c61a596f12b44445643829e6d820 Subproject commit af25dd31dbb1e80364b99fad29815badfab0ceda

5
main/app_main.c

@ -43,8 +43,9 @@ void app_main()
// Override global log level // Override global log level
esp_log_level_set("*", ESP_LOG_INFO); 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("owb", ESP_LOG_DEBUG);
//esp_log_level_set("ds18b20", ESP_LOG_DEBUG);
// Stable readings require a brief period before communication // Stable readings require a brief period before communication
vTaskDelay(2000.0 / portTICK_PERIOD_MS); 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_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); ds18b20_set_resolution(ds18b20_info, DS18B20_RESOLUTION);
} }

Loading…
Cancel
Save