From 672c1ba946c130cd81ee81537256fe6496c2fef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Szafer?= Date: Mon, 7 Nov 2022 18:59:03 +0100 Subject: [PATCH] Change dev to support Input board v0.5 --- .esphome/boneIOsample.yaml.json | 50 ++++ .esphome/boneIOsample.yml.json | 52 ++++ .esphome/idedata/boneio.json | 241 ++++++++++++++++++ ...32_inputs_PCF.yaml => relay32_inputs.yaml} | 126 ++++----- boards/relay32_outputs_PCF.yaml | 4 +- boneIOsample.yaml | 21 +- boneio_config_for_esphome_addon.yaml | 12 +- ...oneio_board_PCF.yaml => boneio_board.yaml} | 26 +- devices/boneio_board_MCP.yaml | 34 --- devices/display.yaml | 5 +- devices/lm75b.yaml | 1 + devices/one_wire.yaml | 2 +- devices/wt32_eth01.yaml | 14 +- 13 files changed, 462 insertions(+), 126 deletions(-) create mode 100644 .esphome/boneIOsample.yaml.json create mode 100644 .esphome/boneIOsample.yml.json create mode 100644 .esphome/idedata/boneio.json rename boards/{relay32_inputs_PCF.yaml => relay32_inputs.yaml} (84%) rename devices/{boneio_board_PCF.yaml => boneio_board.yaml} (64%) delete mode 100644 devices/boneio_board_MCP.yaml diff --git a/.esphome/boneIOsample.yaml.json b/.esphome/boneIOsample.yaml.json new file mode 100644 index 0000000..afef871 --- /dev/null +++ b/.esphome/boneIOsample.yaml.json @@ -0,0 +1,50 @@ +{ + "storage_version": 1, + "name": "boneio", + "comment": null, + "esphome_version": "2022.6.2", + "src_version": 1, + "address": "boneio.local", + "web_port": 80, + "esp_platform": "ESP32", + "build_path": ".esphome/build/boneio", + "firmware_bin_path": ".esphome/build/boneio/.pioenvs/boneio/firmware.bin", + "loaded_integrations": [ + "api", + "async_tcp", + "binary_sensor", + "display", + "ds1307", + "esp32", + "esphome", + "ethernet", + "external_components", + "font", + "gpio", + "homeassistant", + "i2c", + "ina219", + "json", + "lm75", + "logger", + "md5", + "mdns", + "network", + "ota", + "pcf8574", + "preferences", + "script", + "sensor", + "socket", + "ssd1306_base", + "ssd1306_i2c", + "substitutions", + "switch", + "template", + "text_sensor", + "time", + "uptime", + "web_server", + "web_server_base" + ] +} diff --git a/.esphome/boneIOsample.yml.json b/.esphome/boneIOsample.yml.json new file mode 100644 index 0000000..f124f37 --- /dev/null +++ b/.esphome/boneIOsample.yml.json @@ -0,0 +1,52 @@ +{ + "storage_version": 1, + "name": "boneio", + "comment": null, + "esphome_version": "2022.6.2", + "src_version": 1, + "address": "boneio.local", + "web_port": 80, + "esp_platform": "ESP32", + "build_path": ".esphome/build/boneio", + "firmware_bin_path": ".esphome/build/boneio/.pioenvs/boneio/firmware.bin", + "loaded_integrations": [ + "api", + "async_tcp", + "binary_sensor", + "display", + "ds1307", + "esp32", + "esphome", + "ethernet", + "external_components", + "font", + "gpio", + "homeassistant", + "i2c", + "ina219", + "json", + "lm75", + "logger", + "mcp23017", + "mcp23x17_base", + "mcp23xxx_base", + "md5", + "mdns", + "network", + "ota", + "preferences", + "script", + "sensor", + "socket", + "ssd1306_base", + "ssd1306_i2c", + "substitutions", + "switch", + "template", + "text_sensor", + "time", + "uptime", + "web_server", + "web_server_base" + ] +} diff --git a/.esphome/idedata/boneio.json b/.esphome/idedata/boneio.json new file mode 100644 index 0000000..0cc2632 --- /dev/null +++ b/.esphome/idedata/boneio.json @@ -0,0 +1,241 @@ +{ + "env_name": "boneio", + "libsource_dirs": [ + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/lib", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio", + "/home/poznan.tbhydro.net/admin/.platformio/lib", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries" + ], + "defines": [ + "PLATFORMIO=50205", + "ARDUINO_NodeMCU_32S", + "ESPHOME_LOG_LEVEL=ESPHOME_LOG_LEVEL_DEBUG", + "USE_ARDUINO", + "USE_ESP32", + "USE_ESP32_FRAMEWORK_ARDUINO", + "USE_ESP32_VARIANT_ESP32", + "ESP32", + "ESP_PLATFORM", + "F_CPU=240000000L", + "HAVE_CONFIG_H", + "MBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\"", + "ARDUINO=10805", + "ARDUINO_ARCH_ESP32", + "ARDUINO_VARIANT=\"nodemcu-32s\"", + "ARDUINO_BOARD=\"NodeMCU-32S\"" + ], + "includes": { + "build": [ + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/include", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ArduinoJson/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ESPAsyncWebServer-esphome/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/AsyncTCP-esphome/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/config", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_trace", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/app_update", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/asio", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bootloader_support", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/bt", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/coap", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/console", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/driver", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/efuse", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-tls", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_adc_cal", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_event", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_client", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_http_server", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_ota", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_https_server", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_ringbuf", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp_websocket_client", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/espcoredump", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ethernet", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/expat", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fatfs", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freemodbus", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/freertos", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/heap", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/idf_test", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/jsmn", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/json", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/libsodium", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/log", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/lwip", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mbedtls", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mdns", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/micro-ecc", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/mqtt", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/newlib", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nghttp", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/nvs_flash", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/openssl", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protobuf-c", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/protocomm", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/pthread", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/sdmmc", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/smartconfig_ack", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/soc", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spi_flash", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/spiffs", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcp_transport", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/tcpip_adapter", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/ulp", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/unity", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/vfs", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wear_levelling", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wifi_provisioning", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/wpa_supplicant", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/xtensa-debug-module", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-face", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp32-camera", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/esp-face", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/include/fb_gfx", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/cores/esp32", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/variants/nodemcu-32s" + ], + "compatlib": [ + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ArduinoJson/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ESPAsyncWebServer-esphome/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/AsyncTCP-esphome/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ArduinoJson/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/AsyncTCP-esphome/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/AsyncTCP-esphome/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ESPAsyncWebServer-esphome/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/ESPAsyncWebServer-esphome/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/AsyncTCP-esphome/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/ESPmDNS/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/FS/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Update/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WiFi/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Wire/src", + "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.piolibdeps/boneio/AsyncMqttClient-esphome/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/ArduinoOTA/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/AsyncUDP/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/AzureIoT/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/BLE/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/BluetoothSerial/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/DNSServer/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/EEPROM/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/ESP32/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/FFat/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/HTTPClient/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdate/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/HTTPUpdateServer/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/NetBIOS/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Preferences/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/SD/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/SD_MMC/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/SPI/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/SPIFFS/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/SimpleBLE/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/Ticker/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WebServer/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WiFiClientSecure/src", + "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/libraries/WiFiProv/src" + ], + "toolchain": [ + "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0", + "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include/c++/5.2.0/xtensa-esp32-elf", + "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/lib/gcc/xtensa-esp32-elf/5.2.0/include", + "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/lib/gcc/xtensa-esp32-elf/5.2.0/include-fixed", + "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/xtensa-esp32-elf/include" + ], + "unity": [] + }, + "cc_path": "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/bin/xtensa-esp32-elf-gcc", + "cxx_path": "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/bin/xtensa-esp32-elf-g++", + "gdb_path": "/home/poznan.tbhydro.net/admin/.platformio/packages/toolchain-xtensa32/bin/xtensa-esp32-elf-gdb", + "prog_path": "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.pioenvs/boneio/firmware.elf", + "svd_path": null, + "compiler_type": "gcc", + "targets": [ + { + "name": "buildfs", + "title": "Build Filesystem Image", + "description": null, + "group": "Platform" + }, + { + "name": "size", + "title": "Program Size", + "description": "Calculate program size", + "group": "Platform" + }, + { + "name": "upload", + "title": "Upload", + "description": null, + "group": "Platform" + }, + { + "name": "uploadfs", + "title": "Upload Filesystem Image", + "description": null, + "group": "Platform" + }, + { + "name": "uploadfsota", + "title": "Upload Filesystem Image OTA", + "description": null, + "group": "Platform" + }, + { + "name": "erase", + "title": "Erase Flash", + "description": null, + "group": "Platform" + }, + { + "name": "compiledb", + "title": "Compilation Database", + "description": "Generate compilation database `compile_commands.json`", + "group": "Advanced" + }, + { + "name": "clean", + "title": "Clean", + "group": "General" + }, + { + "name": "cleanall", + "title": "Clean All", + "group": "General", + "description": "Clean a build environment and installed library dependencies" + } + ], + "extra": { + "flash_images": [ + { + "offset": "0x1000", + "path": "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/sdk/bin/bootloader_dio_40m.bin" + }, + { + "offset": "0x8000", + "path": "/home/poznan.tbhydro.net/admin/ProjektyPrywatne/bone/esphome/.esphome/build/boneio/.pioenvs/boneio/partitions.bin" + }, + { + "offset": "0xe000", + "path": "/home/poznan.tbhydro.net/admin/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin" + } + ] + }, + "cc_flags": "-std=gnu99 -Wno-old-style-declaration -Wno-sign-compare -Wno-unused-but-set-variable -Wno-unused-variable -fno-exceptions -Os -g3 -Wall -nostdlib -Wpointer-arith -Wno-error=unused-but-set-variable -Wno-error=unused-variable -mlongcalls -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -Wno-error=deprecated-declarations -Wno-error=unused-function -Wno-unused-parameter -Wno-sign-compare -fstack-protector -fexceptions -Werror=reorder", + "cxx_flags": "-fno-rtti -fno-exceptions -std=gnu++11 -Wno-sign-compare -Wno-unused-but-set-variable -Wno-unused-variable -fno-exceptions -Os -g3 -Wall -nostdlib -Wpointer-arith -Wno-error=unused-but-set-variable -Wno-error=unused-variable -mlongcalls -ffunction-sections -fdata-sections -fstrict-volatile-bitfields -Wno-error=deprecated-declarations -Wno-error=unused-function -Wno-unused-parameter -Wno-sign-compare -fstack-protector -fexceptions -Werror=reorder" +} diff --git a/boards/relay32_inputs_PCF.yaml b/boards/relay32_inputs.yaml similarity index 84% rename from boards/relay32_inputs_PCF.yaml rename to boards/relay32_inputs.yaml index fc64572..2f61139 100644 --- a/boards/relay32_inputs_PCF.yaml +++ b/boards/relay32_inputs.yaml @@ -10,7 +10,7 @@ binary_sensor: name: "${node_name} IN_01" id: in_01 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 0 mode: input: true @@ -23,7 +23,7 @@ binary_sensor: name: "${node_name} IN_02" id: in_02 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 1 mode: input: true @@ -36,7 +36,7 @@ binary_sensor: name: "${node_name} IN_03" id: in_03 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 2 mode: input: true @@ -49,7 +49,7 @@ binary_sensor: name: "${node_name} IN_04" id: in_04 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 3 mode: input: true @@ -62,7 +62,7 @@ binary_sensor: name: "${node_name} IN_05" id: in_05 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 4 mode: input: true @@ -75,7 +75,7 @@ binary_sensor: name: "${node_name} IN_06" id: in_06 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 5 mode: input: true @@ -88,7 +88,7 @@ binary_sensor: name: "${node_name} IN_07" id: in_07 pin: - pcf8574: mcp_inputs_1to16 + pcf8574: pcf_inputs_1to14 number: 6 mode: input: true @@ -101,8 +101,8 @@ binary_sensor: name: "${node_name} IN_08" id: in_08 pin: - pcf8574: mcp_inputs_1to16 - number: 7 + pcf8574: pcf_inputs_1to14 + number: 8 mode: input: true inverted: true @@ -114,8 +114,8 @@ binary_sensor: name: "${node_name} IN_09" id: in_09 pin: - pcf8574: mcp_inputs_1to16 - number: 8 + pcf8574: pcf_inputs_1to14 + number: 9 mode: input: true inverted: true @@ -127,8 +127,8 @@ binary_sensor: name: "${node_name} IN_10" id: in_10 pin: - pcf8574: mcp_inputs_1to16 - number: 9 + pcf8574: pcf_inputs_1to14 + number: 10 mode: input: true inverted: true @@ -140,8 +140,8 @@ binary_sensor: name: "${node_name} IN_11" id: in_11 pin: - pcf8574: mcp_inputs_1to16 - number: 10 + pcf8574: pcf_inputs_1to14 + number: 11 mode: input: true inverted: true @@ -153,8 +153,8 @@ binary_sensor: name: "${node_name} IN_12" id: in_12 pin: - pcf8574: mcp_inputs_1to16 - number: 11 + pcf8574: pcf_inputs_1to14 + number: 12 mode: input: true inverted: true @@ -166,8 +166,8 @@ binary_sensor: name: "${node_name} IN_13" id: in_13 pin: - pcf8574: mcp_inputs_1to16 - number: 12 + pcf8574: pcf_inputs_1to14 + number: 13 mode: input: true inverted: true @@ -179,8 +179,8 @@ binary_sensor: name: "${node_name} IN_14" id: in_14 pin: - pcf8574: mcp_inputs_1to16 - number: 13 + pcf8574: pcf_inputs_1to14 + number: 14 mode: input: true inverted: true @@ -192,8 +192,8 @@ binary_sensor: name: "${node_name} IN_15" id: in_15 pin: - pcf8574: mcp_inputs_1to16 - number: 14 + pcf8574: pcf_inputs_15to28 + number: 6 mode: input: true inverted: true @@ -205,8 +205,8 @@ binary_sensor: name: "${node_name} IN_16" id: in_16 pin: - pcf8574: mcp_inputs_1to16 - number: 15 + pcf8574: pcf_inputs_15to28 + number: 5 mode: input: true inverted: true @@ -218,8 +218,8 @@ binary_sensor: name: "${node_name} IN_17" id: in_17 pin: - pcf8574: mcp_inputs_17to32 - number: 7 + pcf8574: pcf_inputs_15to28 + number: 4 mode: input: true inverted: true @@ -231,8 +231,8 @@ binary_sensor: name: "${node_name} IN_18" id: in_18 pin: - pcf8574: mcp_inputs_17to32 - number: 6 + pcf8574: pcf_inputs_15to28 + number: 3 mode: input: true inverted: true @@ -244,8 +244,8 @@ binary_sensor: name: "${node_name} IN_19" id: in_19 pin: - pcf8574: mcp_inputs_17to32 - number: 5 + pcf8574: pcf_inputs_15to28 + number: 2 mode: input: true inverted: true @@ -257,8 +257,8 @@ binary_sensor: name: "${node_name} IN_20" id: in_20 pin: - pcf8574: mcp_inputs_17to32 - number: 4 + pcf8574: pcf_inputs_15to28 + number: 1 mode: input: true inverted: true @@ -270,8 +270,8 @@ binary_sensor: name: "${node_name} IN_21" id: in_21 pin: - pcf8574: mcp_inputs_17to32 - number: 3 + pcf8574: pcf_inputs_15to28 + number: 0 mode: input: true inverted: true @@ -283,8 +283,8 @@ binary_sensor: name: "${node_name} IN_22" id: in_22 pin: - pcf8574: mcp_inputs_17to32 - number: 2 + pcf8574: pcf_inputs_15to28 + number: 8 mode: input: true inverted: true @@ -296,8 +296,8 @@ binary_sensor: name: "${node_name} IN_23" id: in_23 pin: - pcf8574: mcp_inputs_17to32 - number: 1 + pcf8574: pcf_inputs_15to28 + number: 9 mode: input: true inverted: true @@ -309,8 +309,8 @@ binary_sensor: name: "${node_name} IN_24" id: in_24 pin: - pcf8574: mcp_inputs_17to32 - number: 0 + pcf8574: pcf_inputs_15to28 + number: 10 mode: input: true inverted: true @@ -322,8 +322,8 @@ binary_sensor: name: "${node_name} IN_25" id: in_25 pin: - pcf8574: mcp_inputs_17to32 - number: 8 + pcf8574: pcf_inputs_15to28 + number: 11 mode: input: true inverted: true @@ -335,8 +335,8 @@ binary_sensor: name: "${node_name} IN_26" id: in_26 pin: - pcf8574: mcp_inputs_17to32 - number: 9 + pcf8574: pcf_inputs_15to28 + number: 12 mode: input: true inverted: true @@ -348,8 +348,8 @@ binary_sensor: name: "${node_name} IN_27" id: in_27 pin: - pcf8574: mcp_inputs_17to32 - number: 10 + pcf8574: pcf_inputs_15to28 + number: 13 mode: input: true inverted: true @@ -361,8 +361,8 @@ binary_sensor: name: "${node_name} IN_28" id: in_28 pin: - pcf8574: mcp_inputs_17to32 - number: 11 + pcf8574: pcf_inputs_15to28 + number: 14 mode: input: true inverted: true @@ -374,8 +374,8 @@ binary_sensor: name: "${node_name} IN_29" id: in_29 pin: - pcf8574: mcp_inputs_17to32 - number: 12 + pcf8574: pcf_inputs_28to35_menu + number: 0 mode: input: true inverted: true @@ -387,8 +387,8 @@ binary_sensor: name: "${node_name} IN_30" id: in_30 pin: - pcf8574: mcp_inputs_17to32 - number: 13 + pcf8574: pcf_inputs_28to35_menu + number: 1 mode: input: true inverted: true @@ -400,8 +400,8 @@ binary_sensor: name: "${node_name} IN_31" id: in_31 pin: - pcf8574: mcp_inputs_17to32 - number: 14 + pcf8574: pcf_inputs_28to35_menu + number: 2 mode: input: true inverted: true @@ -413,8 +413,8 @@ binary_sensor: name: "${node_name} IN_32" id: in_32 pin: - pcf8574: mcp_inputs_17to32 - number: 15 + pcf8574: pcf_inputs_28to35_menu + number: 3 mode: input: true inverted: true @@ -425,7 +425,8 @@ binary_sensor: - platform: gpio name: "${node_name} IN_33" pin: - number: GPIO33 + pcf8574: pcf_inputs_28to35_menu + number: 4 mode: input: true inverted: true @@ -433,7 +434,8 @@ binary_sensor: - platform: gpio name: "${node_name} IN_34" pin: - number: GPIO17 + pcf8574: pcf_inputs_28to35_menu + number: 5 mode: input: true inverted: true @@ -441,9 +443,9 @@ binary_sensor: - platform: gpio name: "${node_name} IN_35" pin: - number: GPIO12 + pcf8574: pcf_inputs_28to35_menu + number: 6 mode: input: true - pullup: true - inverted: false + inverted: true diff --git a/boards/relay32_outputs_PCF.yaml b/boards/relay32_outputs_PCF.yaml index b676ea7..b7b5f64 100644 --- a/boards/relay32_outputs_PCF.yaml +++ b/boards/relay32_outputs_PCF.yaml @@ -3,9 +3,11 @@ pcf8574: - id: 'pcf_1' address: 0x21 pcf8575: true + i2c_id: bus_b - id: 'pcf_2' address: 0x20 - pcf8575: true + pcf8575: true + i2c_id: bus_b switch: diff --git a/boneIOsample.yaml b/boneIOsample.yaml index 5f2aa15..d94d82d 100644 --- a/boneIOsample.yaml +++ b/boneIOsample.yaml @@ -2,26 +2,23 @@ substitutions: node_name: boneio packages: -# devices + # devices core: !include devices/wt32_eth01.yaml - internals: !include devices/boneio_board_PCF.yaml - #internals: !include devices/boneio_board_MCP.yaml + internals: !include devices/boneio_board.yaml temp: !include devices/lm75b.yaml display: !include devices/display.yaml # uart: !include devices/uart.yaml # one_wire: !include devices/one_wire.yaml -# relay32 - #output: !include boards/relay32_outputs_MCP.yaml + # relay32 output: !include boards/relay32_outputs_PCF.yaml - #input: !include boards/relay32_inputs_MCP.yaml - input: !include boards/relay32_inputs_PCF.yaml + input: !include boards/relay32_inputs.yaml # dimmer led - #output: !include boards/dimmer_led8x4_outputs.yaml - #input: !include boards/dimmer_led8x4_inputs.yaml - #light: !include boards/monochromatic_lights.yaml +# output: !include boards/dimmer_led8x4_outputs.yaml +# input: !include boards/dimmer_led8x4_inputs.yaml +# light: !include boards/monochromatic_lights.yaml # cover - #output: !include boards/cover16_outputs.yaml - # input: !include boards/cover16_inputs.yaml +# output: !include boards/cover16_outputs.yaml +# input: !include boards/cover16_inputs.yaml # cover: !include boards/cover.yaml logger: diff --git a/boneio_config_for_esphome_addon.yaml b/boneio_config_for_esphome_addon.yaml index 864a73d..7428c02 100644 --- a/boneio_config_for_esphome_addon.yaml +++ b/boneio_config_for_esphome_addon.yaml @@ -2,23 +2,23 @@ substitutions: node_name: boneio packages: -# devices + # devices core: !include boneio/devices/wt32_eth01.yaml internals: !include boneio/devices/boneio_board.yaml temp: !include boneio/devices/lm75b.yaml display: !include boneio/devices/display.yaml # uart: !include devices/uart.yaml # one_wire: !include devices/one_wire.yaml -# relay32 + # relay32 output: !include boneio/boards/relay32_outputs.yaml input: !include boneio/boards/relay32_inputs.yaml # dimmer led - # output: !include boards/dimmer_led8x4_outputs.yaml - # input: !include boards/dimmer_led8x4_inputs.yaml - # light: !include boards/monochromatic_lights.yaml +# output: !include boards/dimmer_led8x4_outputs.yaml +# input: !include boards/dimmer_led8x4_inputs.yaml +# light: !include boards/monochromatic_lights.yaml # cover # output: !include boards/cover16_outputs.yaml - # input: !include boards/cover16_inputs.yaml +# input: !include boards/cover16_inputs.yaml # cover: !include boards/cover.yaml logger: diff --git a/devices/boneio_board_PCF.yaml b/devices/boneio_board.yaml similarity index 64% rename from devices/boneio_board_PCF.yaml rename to devices/boneio_board.yaml index 82d1697..fa8ad53 100644 --- a/devices/boneio_board_PCF.yaml +++ b/devices/boneio_board.yaml @@ -5,11 +5,14 @@ time: - platform: ds1307 id: ds1307_time + address: 0x68 + i2c_id: bus_a sensor: # Module power consmption - platform: ina219 address: 0x40 + i2c_id: bus_a shunt_resistance: 0.1 ohm current: id: ina_current @@ -27,11 +30,26 @@ sensor: max_current: 3.2A update_interval: 30s +switch: + - platform: gpio + id: buzzer + name: "Buzzer" + pin: + number: GPIO2 + mode: + output: true + inverted: false pcf8574: - - id: 'mcp_inputs_1to16' - address: 0x26 + - id: 'pcf_inputs_1to14' + i2c_id: bus_a + address: 0x20 pcf8575: true - - id: 'mcp_inputs_17to32' - address: 0x27 + - id: 'pcf_inputs_15to28' + i2c_id: bus_a + address: 0x21 pcf8575: true + - id: 'pcf_inputs_28to35_menu' + i2c_id: bus_a + address: 0x22 + pcf8575: false diff --git a/devices/boneio_board_MCP.yaml b/devices/boneio_board_MCP.yaml deleted file mode 100644 index f7e32ab..0000000 --- a/devices/boneio_board_MCP.yaml +++ /dev/null @@ -1,34 +0,0 @@ -#i2c address: 0x26 input mcp io -#i2c address: 0x27 input mcp io -#i2c address: 0x40 input ina219 power -#i2c address: 0x68 input rtc ds1307 -time: - - platform: ds1307 - id: ds1307_time - -sensor: -# Module power consmption - - platform: ina219 - address: 0x40 - shunt_resistance: 0.1 ohm - current: - id: ina_current - name: "${node_name} INA219 Current" - power: - id: ina_power - name: "${node_name} INA219 Power" - bus_voltage: - id: ina_bus_voltage - name: "${node_name} INA219 Bus Voltage" - shunt_voltage: - id: ina_shunt_voltage - name: "${node_name} INA219 Shunt Voltage" - max_voltage: 32.0V - max_current: 3.2A - update_interval: 30s - -mcp23017: - - id: 'mcp_inputs_1to16' - address: 0x26 - - id: 'mcp_inputs_17to32' - address: 0x27 diff --git a/devices/display.yaml b/devices/display.yaml index a340de7..d61fa93 100644 --- a/devices/display.yaml +++ b/devices/display.yaml @@ -53,10 +53,10 @@ binary_sensor: entity_category: config id: boneIO_button pin: - number: GPIO4 + pcf8574: pcf_inputs_28to35_menu + number: 7 mode: input: true - pullup: true inverted: true on_press: then: @@ -91,6 +91,7 @@ display: id: oled_display model: "SH1106 128x64" address: 0x3C + i2c_id: bus_b contrast: 0.5 pages: - id: logo_page diff --git a/devices/lm75b.yaml b/devices/lm75b.yaml index 6fe5063..8f2925b 100644 --- a/devices/lm75b.yaml +++ b/devices/lm75b.yaml @@ -10,3 +10,4 @@ sensor: id: boneIO_temp name: "${node_name} LM75B Temperature" update_interval: 30s + i2c_id: bus_b diff --git a/devices/one_wire.yaml b/devices/one_wire.yaml index 9aff7a6..ff9b1af 100644 --- a/devices/one_wire.yaml +++ b/devices/one_wire.yaml @@ -1,5 +1,5 @@ dallas: -- pin: GPIO32 +- pin: GPIO4 # sensor: # - platform: dallas diff --git a/devices/wt32_eth01.yaml b/devices/wt32_eth01.yaml index ff05abf..16a53ac 100644 --- a/devices/wt32_eth01.yaml +++ b/devices/wt32_eth01.yaml @@ -4,10 +4,16 @@ esphome: board: nodemcu-32s i2c: - sda: GPIO14 - scl: GPIO15 - scan: True - frequency: 100kHz + - id: bus_a + sda: GPIO14 + scl: GPIO15 + scan: True + frequency: 100kHz + - id: bus_b + sda: GPIO17 + scl: GPIO33 + scan: True + frequency: 100kHz ethernet: id: eth