From f058b0f267ec869908b141cb550c8dc2f55032ed Mon Sep 17 00:00:00 2001 From: David Antliff Date: Fri, 1 Sep 2017 16:47:21 +1200 Subject: [PATCH] Reduce conversion resolution to 11 bits. Update for ESP-IDF v2.1. --- main/ds18b20_main.c | 5 ++-- main/owb.c | 1 + sdkconfig | 58 ++++----------------------------------------- 3 files changed, 7 insertions(+), 57 deletions(-) diff --git a/main/ds18b20_main.c b/main/ds18b20_main.c index 892e5ef..95224bc 100644 --- a/main/ds18b20_main.c +++ b/main/ds18b20_main.c @@ -38,8 +38,7 @@ #define GPIO_DS18B20_0 (GPIO_NUM_5) #define MAX_DEVICES (8) -#define DS18B20_RESOLUTION (DS18B20_RESOLUTION_12_BIT) - +#define DS18B20_RESOLUTION (DS18B20_RESOLUTION_11_BIT) void app_main() { @@ -157,7 +156,7 @@ void app_main() printf("\nTemperature readings (degrees C):\n"); for (int i = 0; i < num_devices; ++i) { - printf(" %d: %.3f\n", i, temps[i]); + printf(" %d: %.1f\n", i, temps[i]); } // make up delay to approximately 1 second per measurement diff --git a/main/owb.c b/main/owb.c index e174805..aa00e98 100644 --- a/main/owb.c +++ b/main/owb.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "esp_log.h" #include "sdkconfig.h" diff --git a/sdkconfig b/sdkconfig index 8b7e1ce..905e617 100644 --- a/sdkconfig +++ b/sdkconfig @@ -19,7 +19,6 @@ CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y # CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set CONFIG_LOG_BOOTLOADER_LEVEL=3 -# CONFIG_BOOTLOADER_LTO is not set # # Security features @@ -82,30 +81,12 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv" CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv" CONFIG_APP_OFFSET=0x10000 - -# -# Compiler options -# CONFIG_OPTIMIZATION_LEVEL_DEBUG=y # CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set -CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y -# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set -# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set # # Component config # - -# -# Application Level Tracing -# -# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set -CONFIG_ESP32_APPTRACE_DEST_NONE=y -# CONFIG_ESP32_APPTRACE_ENABLE is not set - -# -# FreeRTOS SystemView Tracing -# # CONFIG_AWS_IOT_SDK is not set # CONFIG_BT_ENABLED is not set CONFIG_BT_RESERVE_DRAM=0 @@ -126,6 +107,10 @@ CONFIG_TRACEMEM_RESERVE_DRAM=0x0 # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y # CONFIG_ESP32_ENABLE_COREDUMP is not set +# CONFIG_ESP32_APPTRACE_DEST_TRAX is not set +# CONFIG_ESP32_APPTRACE_DEST_UART is not set +CONFIG_ESP32_APPTRACE_DEST_NONE=y +# CONFIG_ESP32_APPTRACE_ENABLE is not set # CONFIG_TWO_UNIVERSAL_MAC_ADDRESS is not set CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 @@ -155,16 +140,6 @@ CONFIG_TASK_WDT=y CONFIG_TASK_WDT_TIMEOUT_S=5 CONFIG_TASK_WDT_CHECK_IDLE_TASK=y CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y -CONFIG_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_0=y -# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set -CONFIG_BROWNOUT_DET_LVL=0 # CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y # CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set @@ -185,8 +160,6 @@ CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32 CONFIG_ESP32_WIFI_AMPDU_ENABLED=y -CONFIG_ESP32_WIFI_TX_BA_WIN=6 -CONFIG_ESP32_WIFI_RX_BA_WIN=6 CONFIG_ESP32_WIFI_NVS_ENABLED=y CONFIG_PHY_ENABLED=y @@ -278,35 +251,12 @@ CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0 CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1 # CONFIG_LWIP_IP_FRAG is not set # CONFIG_LWIP_IP_REASSEMBLY is not set - -# -# TCP -# CONFIG_TCP_MAXRTX=12 CONFIG_TCP_SYNMAXRTX=6 -CONFIG_TCP_MSS=1436 -CONFIG_TCP_SND_BUF_DEFAULT=5744 -CONFIG_TCP_WND_DEFAULT=5744 -CONFIG_TCP_RECVMBOX_SIZE=6 -CONFIG_TCP_QUEUE_OOSEQ=y -CONFIG_TCP_OVERSIZE_MSS=y -# CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set -# CONFIG_TCP_OVERSIZE_DISABLE is not set - -# -# UDP -# -CONFIG_UDP_RECVMBOX_SIZE=6 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y CONFIG_TCPIP_TASK_STACK_SIZE=2560 # CONFIG_PPP_SUPPORT is not set -# -# ICMP -# -# CONFIG_LWIP_MULTICAST_PING is not set -# CONFIG_LWIP_BROADCAST_PING is not set - # # mbedTLS #