Mercurial > co2meter / changeset

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CMakeLists.txt	Sat Oct 26 14:05:17 2019 +0200
@@ -0,0 +1,9 @@
+# The following lines of boilerplate have to be in your project's CMakeLists
+# in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.5)
+
+set(PROJECT_VER "0.1.0")
+set(PROJECT_NAME "co2meter")
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+project(co2meter)

--- a/Makefile	Fri Oct 25 23:27:57 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#
-# This is a project Makefile. It is assumed the directory this Makefile resides in is a
-# project subdirectory.
-#
-
-PROJECT_VER := "0.1.0"
-PROJECT_NAME := co2meter
-
-include $(IDF_PATH)/make/project.mk
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/esp32-ds18b20/CMakeLists.txt	Sat Oct 26 14:05:17 2019 +0200
@@ -0,0 +1,1 @@
+idf_component_register(SRCS ./ds18b20.c INCLUDE_DIRS include REQUIRES esp32-owb)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/esp32-owb/CMakeLists.txt	Sat Oct 26 14:05:17 2019 +0200
@@ -0,0 +1,2 @@
+idf_component_register(SRCS owb_rmt.c owb.c owb_gpio.c INCLUDE_DIRS include)
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/CMakeLists.txt	Sat Oct 26 14:05:17 2019 +0200
@@ -0,0 +1,3 @@
+idf_component_register(SRCS config.c task_mqtt.c task_ds18b20.c updates.c task_adc.c xutil.c co2meter.c u8g2_esp32_hal.c task_wifi.c
+	INCLUDE_DIRS ".")
+

--- a/sdkconfig	Fri Oct 25 23:27:57 2019 +0200
+++ b/sdkconfig	Sat Oct 26 14:05:17 2019 +0200
@@ -10,8 +10,6 @@
 # SDK tool configuration
 #
 CONFIG_SDK_TOOLPREFIX="xtensa-esp32-elf-"
-CONFIG_SDK_PYTHON="python"
-CONFIG_SDK_MAKE_WARN_UNDEFINED_VARIABLES=y
 CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y
 # CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
 CONFIG_APP_BUILD_GENERATE_BINARIES=y
@@ -41,15 +39,7 @@
 # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set
 # CONFIG_SECURE_BOOT_ENABLED is not set
 # CONFIG_SECURE_FLASH_ENC_ENABLED is not set
-CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
-CONFIG_ESPTOOLPY_BAUD_115200B=y
-# CONFIG_ESPTOOLPY_BAUD_230400B is not set
-# CONFIG_ESPTOOLPY_BAUD_921600B is not set
-# CONFIG_ESPTOOLPY_BAUD_2MB is not set
-# CONFIG_ESPTOOLPY_BAUD_OTHER is not set
 CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
-CONFIG_ESPTOOLPY_BAUD=115200
-CONFIG_ESPTOOLPY_COMPRESSED=y
 # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set
 # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set
 CONFIG_ESPTOOLPY_FLASHMODE_DIO=y
@@ -82,6 +72,13 @@
 # CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set
 CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200
 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_OFFSET=0x8000
+CONFIG_PARTITION_TABLE_MD5=y
 CONFIG_ONE_WIRE_BUS=25
 CONFIG_I2C_MASTER_SCL=22
 CONFIG_I2C_MASTER_SDA=21
@@ -94,13 +91,6 @@
 CONFIG_PRESSURE_1=6
 CONFIG_PRESSURE_2=7
 CONFIG_PRESSURE_3=5
-# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-# CONFIG_PARTITION_TABLE_TWO_OTA is not set
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_OFFSET=0x8000
-CONFIG_PARTITION_TABLE_MD5=y
 CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y
 # CONFIG_COMPILER_OPTIMIZATION_SIZE is not set
 # CONFIG_COMPILER_OPTIMIZATION_PERF is not set
@@ -568,8 +558,6 @@
 
 # Deprecated options for backward compatibility
 CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
-CONFIG_PYTHON="python"
-CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
 # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
 # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
 CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y