Skip to content
Snippets Groups Projects
Verified Commit 95b035ce authored by Zoe Michaela Dietmar Pfister's avatar Zoe Michaela Dietmar Pfister :gay_pride_flag:
Browse files

WIP: Remove sentec soil sensors from codebase (felt good)

parent e8c88901
No related branches found
No related tags found
2 merge requests!39Merge Develop into Main,!30Renamed Sentec Sensors, made RS485 serial connection a singleton shared...
Pipeline #101717 passed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 7 additions and 502 deletions
    client/ESPcam/.idea/misc.xml
    + 1
    − 3
    View file @ 95b035ce
    <?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
    <project version="4"> <project version="4">
    <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$"> <component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
    <contentRoot DIR="$PROJECT_DIR$/.." />
    </component>
    </project> </project>
    \ No newline at end of file
    client/ESPcam/CMakeLists.txt deleted 100644 → 0
    + 0
    − 33
    View file @ e8c88901
    # !!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE
    # https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags
    #
    # If you need to override existing CMake configuration or add extra,
    # please create `CMakeListsUser.txt` in the root of project.
    # The `CMakeListsUser.txt` will not be overwritten by PlatformIO.
    cmake_minimum_required(VERSION 3.13)
    set(CMAKE_SYSTEM_NAME Generic)
    set(CMAKE_C_COMPILER_WORKS 1)
    set(CMAKE_CXX_COMPILER_WORKS 1)
    project("ESPcam" C CXX)
    include(CMakeListsPrivate.txt)
    if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt)
    include(CMakeListsUser.txt)
    endif()
    add_custom_target(
    Production ALL
    COMMAND platformio -c clion run "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
    add_custom_target(
    Debug ALL
    COMMAND platformio -c clion debug "$<$<NOT:$<CONFIG:All>>:-e${CMAKE_BUILD_TYPE}>"
    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
    add_executable(Z_DUMMY_TARGET ${SRC_LIST})
    client/ESPcam/CMakeListsPrivate.txt deleted 100644 → 0
    + 0
    − 305
    View file @ e8c88901
    # !!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE
    # https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags
    #
    # If you need to override existing CMake configuration or add extra,
    # please create `CMakeListsUser.txt` in the root of project.
    # The `CMakeListsUser.txt` will not be overwritten by PlatformIO.
    set(CMAKE_CONFIGURATION_TYPES "esp32cam" CACHE STRING "Build Types reflect PlatformIO Environments" FORCE)
    # Convert "Home Directory" that may contain unescaped backslashes on Windows
    SET(CMAKE_C_COMPILER "$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/bin/xtensa-esp32-elf-gcc")
    SET(CMAKE_CXX_COMPILER "$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/bin/xtensa-esp32-elf-g++")
    SET(CMAKE_CXX_FLAGS "-std=gnu++17 -Wno-frame-address -fexceptions -fno-rtti -mfix-esp32-psram-cache-issue -mlongcalls -ffunction-sections -fdata-sections -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -ggdb -Os -freorder-blocks -Wwrite-strings -fstack-protector -fstrict-volatile-bitfields -Wno-error=unused-but-set-variable -fno-jump-tables -fno-tree-switch-conversion -MMD")
    SET(CMAKE_C_FLAGS "-Wno-frame-address -std=gnu99 -Wno-old-style-declaration -mfix-esp32-psram-cache-issue -mlongcalls -ffunction-sections -fdata-sections -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-sign-compare -ggdb -Os -freorder-blocks -Wwrite-strings -fstack-protector -fstrict-volatile-bitfields -Wno-error=unused-but-set-variable -fno-jump-tables -fno-tree-switch-conversion -MMD")
    SET(CMAKE_C_STANDARD 99)
    set(CMAKE_CXX_STANDARD 17)
    if (CMAKE_BUILD_TYPE MATCHES "esp32cam")
    add_definitions(-DPLATFORMIO=60105)
    add_definitions(-DARDUINO_ESP32_DEV)
    add_definitions(-DBOARD_HAS_PSRAM)
    add_definitions(-DCORE_DEBUG_LEVEL=5)
    add_definitions(-DHAVE_CONFIG_H)
    add_definitions(-DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\")
    add_definitions(-DUNITY_INCLUDE_CONFIG_H)
    add_definitions(-DWITH_POSIX)
    add_definitions(-D_GNU_SOURCE)
    add_definitions(-DIDF_VER=\"v4.4.2\")
    add_definitions(-DESP_PLATFORM)
    add_definitions(-D_POSIX_READER_WRITER_LOCKS)
    add_definitions(-DARDUINO_ARCH_ESP32)
    add_definitions(-DESP32)
    add_definitions(-DF_CPU=240000000L)
    add_definitions(-DARDUINO=10812)
    add_definitions(-DARDUINO_VARIANT=\"esp32\")
    add_definitions(-DARDUINO_BOARD=\"AI\ Thinker\ ESP32-CAM\")
    add_definitions(-DARDUINO_PARTITION_default)
    include_directories("${CMAKE_CURRENT_LIST_DIR}/include")
    include_directories("${CMAKE_CURRENT_LIST_DIR}/src")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/sht85")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/FS/src")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/espnow/src")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/includes")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/caching/src")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/time/src")
    include_directories("${CMAKE_CURRENT_LIST_DIR}/.pio/libdeps/esp32cam/ArduinoJson/src")
    include_directories("${CMAKE_CURRENT_LIST_DIR}/.pio/libdeps/esp32cam/ESP32Time")
    include_directories("${CMAKE_CURRENT_LIST_DIR}/.pio/libdeps/esp32cam/RTClib/src")
    include_directories("${CMAKE_CURRENT_LIST_DIR}/.pio/libdeps/esp32cam/Adafruit BusIO")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src")
    include_directories("${CMAKE_CURRENT_LIST_DIR}/.pio/libdeps/esp32cam/arduino-sht")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/newlib/platform_include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include/esp_additions/freertos")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/port/xtensa/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freertos/include/esp_additions")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_hw_support/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_hw_support/include/soc")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_hw_support/include/soc/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_hw_support/port/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_hw_support/port/esp32/private_include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/heap/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/log/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/lwip/include/apps")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/lwip/include/apps/sntp")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/lwip/lwip/src/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/lwip/port/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/lwip/port/esp32/include/arch")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/soc/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/soc/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/soc/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/hal/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/hal/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/hal/platform_port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_rom/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_rom/include/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_rom/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_common/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_system/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_system/port/soc")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_system/port/public_compat")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/xtensa/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/xtensa/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/driver/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/driver/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_pm/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_ringbuf/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/efuse/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/efuse/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/vfs/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_wifi/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_event/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_netif/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_eth/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/tcpip_adapter/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_phy/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_phy/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_ipc/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/app_trace/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_timer/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/mbedtls/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/mbedtls/mbedtls/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/mbedtls/esp_crt_bundle/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/app_update/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/spi_flash/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bootloader_support/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/nvs_flash/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/pthread/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_gdbstub/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_gdbstub/xtensa")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_gdbstub/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/espcoredump/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/espcoredump/include/port/xtensa")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/wpa_supplicant/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/wpa_supplicant/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/wpa_supplicant/esp_supplicant/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/ieee802154/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/console")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/asio/asio/asio/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/asio/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/common/osi/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/include/esp32/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/common/api/include/api")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/common/btc/profile/esp/blufi/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/common/btc/profile/esp/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/host/bluedroid/api/include/api")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_common/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_common/tinycrypt/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_core")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_core/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_core/storage")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/btc/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_models/common/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_models/client/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/mesh_models/server/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/api/core/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/api/models/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/bt/esp_ble_mesh/api")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/cbor/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/unity/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/unity/unity/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/cmock/CMock/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/coap/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/coap/libcoap/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/nghttp/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/nghttp/nghttp2/lib/includes")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-tls")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-tls/esp-tls-crypto")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_adc_cal/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_hid/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/tcp_transport/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_http_client/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_http_server/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_https_ota/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_https_server/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_lcd/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_lcd/interface")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/protobuf-c/protobuf-c")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/protocomm/include/common")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/protocomm/include/security")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/protocomm/include/transports")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/mdns/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_local_ctrl/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/sdmmc/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_serial_slave_link/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_websocket_client/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/expat/expat/expat/lib")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/expat/port/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/wear_levelling/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/fatfs/diskio")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/fatfs/vfs")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/fatfs/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/freemodbus/common/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/idf_test/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/idf_test/include/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/jsmn/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/json/cJSON")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/libsodium/libsodium/src/libsodium/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/libsodium/port_include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/mqtt/esp-mqtt/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/openssl/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/perfmon/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/spiffs/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/ulp/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/wifi_provisioning/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/rmaker_common/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/json_parser/upstream/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/json_parser/upstream")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/json_generator/upstream")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_schedule/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_rainmaker/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/gpio_button/button/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/qrcode/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/ws2812_led")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/dotprod/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/support/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/hann/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/blackman/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/blackman_harris/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/blackman_nuttall/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/nuttall/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/windows/flat_top/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/iir/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/fir/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/add/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/sub/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/mul/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/addc/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/mulc/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/math/sqrt/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/matrix/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/fft/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/dct/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/conv/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/common/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/kalman/ekf/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dsp/modules/kalman/ekf_imu13states/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp_littlefs/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/tool")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/typedef")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/image")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/math")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/nn")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/layer")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/detect")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-dl/include/model_zoo")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-sr/src/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-sr/esp-tts/esp_tts_chinese/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp-sr/include/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp32-camera/driver/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/esp32-camera/conversions/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/include/fb_gfx/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/tools/sdk/esp32/dio_qspi/include")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/cores/esp32")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/variants/esp32")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/.idea")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/LC7090203F")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/SentecSensors")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/deep_sleep")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/dr26_analogue")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/drs26_digital")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/ina219")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/mock_sensor")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/rs485")
    include_directories("$ENV{HOME}/GitRepos/sensor-system/client/libs/scd30")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/ArduinoOTA/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/Ethernet/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/FFat/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/HTTPClient/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdate/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdateServer/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/I2S/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/LittleFS/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/NetBIOS/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/RainMaker/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/SD/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/SimpleBLE/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/Ticker/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/USB/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/Update/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/WebServer/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src")
    include_directories("$ENV{HOME}/.platformio/packages/framework-arduinoespressif32/libraries/WiFiProv/src")
    include_directories("$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/xtensa-esp32-elf/include/c++/8.4.0")
    include_directories("$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/xtensa-esp32-elf/include/c++/8.4.0/xtensa-esp32-elf")
    include_directories("$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/lib/gcc/xtensa-esp32-elf/8.4.0/include-fixed")
    include_directories("$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/lib/gcc/xtensa-esp32-elf/8.4.0/include")
    include_directories("$ENV{HOME}/.platformio/packages/toolchain-xtensa-esp32/xtensa-esp32-elf/include")
    FILE(GLOB_RECURSE EXTRA_LIB_SOURCES
    ${CMAKE_CURRENT_LIST_DIR}/.pio/libdeps/esp32cam/*.*
    $ENV{HOME}/GitRepos/sensor-system/client/libs/*.*
    )
    endif()
    FILE(GLOB_RECURSE SRC_LIST
    ${CMAKE_CURRENT_LIST_DIR}/src/*.*
    ${CMAKE_CURRENT_LIST_DIR}/lib/*.*
    ${CMAKE_CURRENT_LIST_DIR}/test/*.*
    )
    list(APPEND SRC_LIST ${EXTRA_LIB_SOURCES})
    client/ESPcam/platformio.ini
    + 1
    − 0
    View file @ 95b035ce
    ...@@ -14,6 +14,7 @@ board = esp32cam ...@@ -14,6 +14,7 @@ board = esp32cam
    framework = arduino framework = arduino
    monitor_speed = 115200 monitor_speed = 115200
    lib_ldf_mode = deep lib_ldf_mode = deep
    monitor_port = /dev/ttyACM1
    lib_extra_dirs = lib_extra_dirs =
    ../libs ../libs
    ../../shared-libs ../../shared-libs
    ......
    client/libs/SentecSensors/SentecSensors.cpp
    + 0
    − 1
    View file @ 95b035ce
    #include "NoDataAvailableException.hpp" #include "NoDataAvailableException.hpp"
    #include "SentecSoilMoistureSensor.h"
    #include "SentecRainGaugeSensor.h" #include "SentecRainGaugeSensor.h"
    #include "SentecSolarRadiationSensor.h" #include "SentecSolarRadiationSensor.h"
    #include <SentecSensors.h> #include <SentecSensors.h>
    ......
    client/libs/SentecSensors/SentecSoilMoistureSensor.cpp deleted 100644 → 0
    + 0
    − 67
    View file @ e8c88901
    //
    // Created by zoe on 2/20/23.
    //
    #include "SentecSoilMoistureSensor.h"
    out_data_soil_moisture SoilMoistureSensor::getMoistureTemp() {
    auto error = readRegister(0,
    2); // start register at 0, read 2 variables (vwc, soil temp)
    moistureRaw = (answerFrame[3] << 8) + answerFrame[4];
    // TODO: neg. temp check
    if (answerFrame[5] < 0x80) {
    temperatureRaw = (answerFrame[5] << 8) + answerFrame[6];
    } else {
    temperatureRaw = (answerFrame[5] << 8) + answerFrame[6] - 65536;
    }
    auto soilTemperature = getTemperature();
    auto soilMoisture = getMoisture();
    ESP_LOGI("SOILMOISTURE",
    "Soil moisture: %.1f %",
    soilMoisture);
    ESP_LOGI("SOILMOISTURE",
    "Soil temperature: %.1f °C",
    soilTemperature);
    return {soilMoisture, soilTemperature, error};
    }
    float SoilMoistureSensor::getMoisture() {
    return (moistureRaw - moistureOffset) / 10.0;
    }
    float SoilMoistureSensor::getTemperature() {
    return (temperatureRaw - temperatureOffset) / 10.0;
    }
    String SoilMoistureSensor::getMoistureStr() {
    return getValueStr((float) ((moistureRaw - moistureOffset) / 10.0));
    }
    String SoilMoistureSensor::getTemperatureStr() {
    return getValueStr((float) ((temperatureRaw - temperatureOffset) / 10.0));
    }
    SensorInformation SoilMoistureSensor::getSensorInformation() const {
    return SensorInformation(HardwareName::SEM225, SensorProtocol::RS485);
    }
    out_data_soil_moisture SoilMoistureSensor::readData() {
    return getMoistureTemp();
    }
    std::list<Message> SoilMoistureSensor::buildMessages() {
    auto data = readData();
    Measurement soilMoisture{data.moisture, address, NO_I2C_ADDRESS,
    MeasurementType::SOIL_MOISTURE, data.soilError};
    Measurement soilTemperature{data.temperature, address, NO_I2C_ADDRESS,
    MeasurementType::SOIL_TEMPERATURE,
    data.soilError};
    return {Message{soilMoisture, getSensorInformation(),
    Time::getInstance().getEpochSeconds()},
    Message{soilTemperature, getSensorInformation(),
    Time::getInstance().getEpochSeconds()}};
    }
    void SoilMoistureSensor::setup() {
    // TODO: check if rs485 serial is active
    }
    client/libs/SentecSensors/SentecSoilMoistureSensor.h deleted 100644 → 0
    + 0
    − 46
    View file @ e8c88901
    //
    // Created by zoe on 2/20/23.
    //
    #ifndef CLIENT_CENTRAL_MAST_SENTECSOILMOISTURESENSOR_H
    #define CLIENT_CENTRAL_MAST_SENTECSOILMOISTURESENSOR_H
    #include "SentecSensors.h"
    #include <ForteSensor.hpp>
    #include <Message.hpp>
    struct out_data_soil_moisture {
    float moisture;
    float temperature;
    ErrorType soilError;
    };
    class SoilMoistureSensor
    : public SentecSensorRS485, ForteSensor<out_data_soil_moisture> {
    public:
    using SentecSensorRS485::SentecSensorRS485;
    // vwc: volumetric water content [%]
    uint16_t moistureRaw = 0;
    int moistureOffset = 0;
    // soil temperature [deg C]
    int temperatureRaw = 0;
    int temperatureOffset = 0;
    void setup() override;
    out_data_soil_moisture readData() override;
    std::list<Message> buildMessages() override;
    [[nodiscard]] SensorInformation getSensorInformation() const override;
    private:
    out_data_soil_moisture getMoistureTemp();
    float getMoisture();
    float getTemperature();
    String getMoistureStr();
    String getTemperatureStr();
    };
    #endif //CLIENT_CENTRAL_MAST_SENTECSOILMOISTURESENSOR_H
    client/libs/ina219/ina219.cpp
    + 5
    − 5
    View file @ 95b035ce
    ...@@ -46,11 +46,11 @@ std::list<Message> ForteINA219::buildMessages() { ...@@ -46,11 +46,11 @@ std::list<Message> ForteINA219::buildMessages() {
    out_data_ina219 measurements = readData(); out_data_ina219 measurements = readData();
    messages.emplace_back(measurements.shuntVoltage_mV, sensorInformation, 0); messages.emplace_back(measurements.shuntVoltage_mV, sensorInformation, Time::getInstance().getEpochSeconds());
    messages.emplace_back(measurements.busVoltage_V, sensorInformation, 0); messages.emplace_back(measurements.busVoltage_V, sensorInformation, Time::getInstance().getEpochSeconds());
    messages.emplace_back(measurements.current_mA, sensorInformation, 0); messages.emplace_back(measurements.current_mA, sensorInformation, Time::getInstance().getEpochSeconds());
    messages.emplace_back(measurements.power_mW, sensorInformation, 0); messages.emplace_back(measurements.power_mW, sensorInformation, Time::getInstance().getEpochSeconds());
    messages.emplace_back(measurements.loadVoltage_V, sensorInformation, 0); messages.emplace_back(measurements.loadVoltage_V, sensorInformation, Time::getInstance().getEpochSeconds());
    // messages.emplace_back(ina219OverflowData, sensorInformation, 0); TODO: Do we need this as an extra message? // messages.emplace_back(ina219OverflowData, sensorInformation, 0); TODO: Do we need this as an extra message?
    return messages; return messages;
    ......
    client/libs/rs485/rs485.cpp
    + 0
    − 38
    View file @ 95b035ce
    #include "rs485.hpp" #include "rs485.hpp"
    #include "SentecSoilMoistureSensor.h"
    #include "SentecRainGaugeSensor.h" #include "SentecRainGaugeSensor.h"
    #include "SentecSolarRadiationSensor.h" #include "SentecSolarRadiationSensor.h"
    // RS485 control // RS485 control
    ...@@ -19,10 +18,6 @@ SolarRadiationSensor solarSensor(&RS485Serial, 1, RE_DE_PIN); ...@@ -19,10 +18,6 @@ SolarRadiationSensor solarSensor(&RS485Serial, 1, RE_DE_PIN);
    RainGaugeSensor rainGauge = RainGaugeSensor(&RS485Serial, RainGaugeSensor rainGauge = RainGaugeSensor(&RS485Serial,
    2, 2,
    RE_DE_PIN); // Give 2 Sensor Adress 2 RE_DE_PIN); // Give 2 Sensor Adress 2
    SoilMoistureSensor
    soilSensor3 = SoilMoistureSensor(&RS485Serial, 3, RE_DE_PIN); //.....
    SoilMoistureSensor soilSensor4 = SoilMoistureSensor(&RS485Serial, 4, RE_DE_PIN);
    SoilMoistureSensor soilSensor5 = SoilMoistureSensor(&RS485Serial, 5, RE_DE_PIN);
    void Forte_RS485::setup() { void Forte_RS485::setup() {
    // configure the pins to be output only // configure the pins to be output only
    ...@@ -42,9 +37,6 @@ out_data_rs485 Forte_RS485::readData() { ...@@ -42,9 +37,6 @@ out_data_rs485 Forte_RS485::readData() {
    out_data_rs485 output; out_data_rs485 output;
    unsigned long ts = millis(); unsigned long ts = millis();
    output.solar = solarSensor.readData(); output.solar = solarSensor.readData();
    output.soil3 = soilSensor3.readData();
    output.soil4 = soilSensor4.readData();
    output.soil5 = soilSensor5.readData();
    output.precipitation = rainGauge.readData(); output.precipitation = rainGauge.readData();
    digitalWrite(POWER_SWITCH_PIN_12V, LOW); digitalWrite(POWER_SWITCH_PIN_12V, LOW);
    digitalWrite(POWER_SWITCH_PIN_5V, LOW); digitalWrite(POWER_SWITCH_PIN_5V, LOW);
    ...@@ -64,40 +56,10 @@ std::list<Message> Forte_RS485::buildMessages() { ...@@ -64,40 +56,10 @@ std::list<Message> Forte_RS485::buildMessages() {
    Measurement precipitation Measurement precipitation
    {output.precipitation.precipitation, 2, NO_I2C_ADDRESS, {output.precipitation.precipitation, 2, NO_I2C_ADDRESS,
    MeasurementType::PRECIPITATION, output.precipitation.precipitationError}; MeasurementType::PRECIPITATION, output.precipitation.precipitationError};
    Measurement soilTemp3{output.soil3.temperature, 3, NO_I2C_ADDRESS,
    MeasurementType::SOIL_TEMPERATURE,
    output.soil3.soilError};
    Measurement soilTemp4{output.soil4.temperature, 4, NO_I2C_ADDRESS,
    MeasurementType::SOIL_TEMPERATURE,
    output.soil4.soilError};
    Measurement soilTemp5{output.soil5.temperature, 5, NO_I2C_ADDRESS,
    MeasurementType::SOIL_TEMPERATURE,
    output.soil5.soilError};
    Measurement soilMoisture3
    {output.soil3.moisture, 3, NO_I2C_ADDRESS, MeasurementType::SOIL_MOISTURE,
    output.soil3.soilError};
    Measurement soilMoisture4
    {output.soil4.moisture, 4, NO_I2C_ADDRESS, MeasurementType::SOIL_MOISTURE,
    output.soil4.soilError};
    Measurement soilMoisture5
    {output.soil5.moisture, 5, NO_I2C_ADDRESS, MeasurementType::SOIL_MOISTURE,
    output.soil5.soilError};
    messages.emplace_back(solarRadiation, sensorInformation, messages.emplace_back(solarRadiation, sensorInformation,
    Time::getInstance().getEpochSeconds()); Time::getInstance().getEpochSeconds());
    messages.emplace_back(soilTemp3, sensorInformation,
    Time::getInstance().getEpochSeconds());
    messages.emplace_back(soilTemp4, sensorInformation,
    Time::getInstance().getEpochSeconds());
    messages.emplace_back(soilTemp5, sensorInformation,
    Time::getInstance().getEpochSeconds());
    messages.emplace_back(soilMoisture3, sensorInformation,
    Time::getInstance().getEpochSeconds());
    messages.emplace_back(soilMoisture4, sensorInformation,
    Time::getInstance().getEpochSeconds());
    messages.emplace_back(soilMoisture5, sensorInformation,
    Time::getInstance().getEpochSeconds());
    messages.emplace_back(precipitation, messages.emplace_back(precipitation,
    sensorInformation, sensorInformation,
    Time::getInstance().getEpochSeconds()); Time::getInstance().getEpochSeconds());
    ......
    client/libs/rs485/rs485.hpp
    + 0
    − 4
    View file @ 95b035ce
    ...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
    #define _RS485 #define _RS485
    #include <MeasurementTypes.h> #include <MeasurementTypes.h>
    #include <SentecSoilMoistureSensor.h>
    #include <SentecSolarRadiationSensor.h> #include <SentecSolarRadiationSensor.h>
    #include <SentecRainGaugeSensor.h> #include <SentecRainGaugeSensor.h>
    #include "Message.hpp" #include "Message.hpp"
    ...@@ -10,9 +9,6 @@ ...@@ -10,9 +9,6 @@
    #include "SentecSensors.h" #include "SentecSensors.h"
    struct out_data_rs485 { struct out_data_rs485 {
    out_data_soil_moisture soil3;
    out_data_soil_moisture soil4;
    out_data_soil_moisture soil5;
    out_data_solar_radiation solar; out_data_solar_radiation solar;
    out_data_rain_gauge precipitation; out_data_rain_gauge precipitation;
    }; };
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment