freemodbus: fix merge issues

This commit is contained in:
Alex Lisitsyn
2019-12-10 14:30:25 +08:00
committed by Angus Gratton
parent 671fea5c58
commit ba1ee4092a
12 changed files with 78 additions and 20 deletions
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5)
set(SUPPORTED_TARGETS esp32)
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/modbus/serial/common_components)
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/modbus/serial/mb_example_common)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(modbus_master)