Merging with master

2025-12-06 11:49:51 +03:00 · 2022-01-05 12:08:59 +03:00
parent 410c79a78e a8b64e5f03
commit 4a5f219fec
18 changed files with 128 additions and 41659 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,4 +22,5 @@ custom-build-flags/build_flags_nrf52840
 lighthub/modules/out_elevator.cpp
 lighthub/modules/out_elevator.h
 spare_files/*
+spare_files/ArduinoOTA/*
 lib/*
--- a/README.md
+++ b/README.md
@@ -9,10 +9,10 @@ Lighthub allows connecting together:
 * Contact sensors (switches, buttons etc)
 * Analog sensors (Leak detectors, Knobs etc)
 * 1-Wire temperature sensors (up to 20 on single bus)
-* Temperature/Humidity/CO2 sensors: DHT22, CS811, HDC1080
+* Temperature/Humidity/CO2 sensors: DHT22, CS811, HDC1080 and any type of Modbus connected devices
 * Standard nonexpensive Relay board with TTL inputs, [like this](http://ali.pub/2zlosh) to control AC powered lamps, floor heaters, boilers etc
 * [Standard nonexpensive LED dimmers](http://ali.pub/2zlokp) and [AC DMX-512 dimmers](http://ali.pub/2zlont)
-* Modbus RTU devices (Currently, are deployed two types of Modbus devices: AC Dimmer and Ventilation set (Based on [Vacon 10 controller](http://files.danfoss.com/download/Drives/Vacon-10-Quick-Guide-DPD00714F1-UK.pdf))
+* Modbus RTU devices (Currently, possible to control two types of Modbus devices: AC Dimmer and Ventilation set (Based on [Vacon 10 controller](http://files.danfoss.com/download/Drives/Vacon-10-Quick-Guide-DPD00714F1-UK.pdf)) and configure polling of virtually any Modbus device. 
 * Simple DMX wall sensor panel [like this](http://ali.pub/2zlohe)

 [List of non-expensive compatible components from AliExpress here](http://ppv.alipromo.com/custom/promo.php?hash=pjagwaovaero6vkeabjpkpvy4gznbgkc&landing_id=39661)
@@ -22,7 +22,8 @@ Lighthub allows connecting together:

 ![alt text](docs/LightHubAppDiagram.png "LightHub application diagram")

-Where is possible both, to configure local control/mapping between inputs and outputs (light, floor heating thermostats) and remote control from MQTT enabled software. At the moment, LightHub tested and perfectly working with following set of complementary free software:
+Where is possible both, to configure local control/mapping between inputs and outputs (light, floor heating thermostats) and remote control from MQTT enabled software and between controllers. At the moment, LightHub tested and perfectly working with following set of complementary free software:
+* [HomeAssistant](https://www.home-assistant.io) - the best choice of HomeAutomation system
 * [Openhab or Openhab2 Smarthome software](http://www.openhab.org/)
 Openhab provides own native mobile app both, for IoS and Android, and even allow you to use Apple's HomeKit and Google Home to say "Siri, turn on light in bedroom" or "Hey Google, set bedroom light to Red" but requires some server to be installed in-premises (Raspberry PI with [Openhabian](https://docs.openhab.org/installation/openhabian) will good enough)
 * [HomeRemote mobile client](http://thehomeremote.com/)
@@ -32,11 +33,13 @@ Home Remote mobile applicatios for IoS and Android requires just MQTT broker to
 Scalability of Lighthub is virtually unlimited: Setup so many controllers you needed in most convenient places of your house - MQTT broker will allow controllers communicate each other and with Openhab/NodeRed/HomeRemote and propagate commands across network.

 # [Please refer to our Wiki for insructions.](https://github.com/anklimov/lighthub/wiki/Configuring)
+* [Russian-language Wiki](https://www.lazyhome.ru/dokuwiki/doku.php)
 * [Compiling and flashing](https://github.com/anklimov/lighthub/wiki/Compiling-and-flashing)
 * [Configuring](https://github.com/anklimov/lighthub/wiki/Configuring)
 * [Channel commands](https://github.com/anklimov/lighthub/wiki/Channel-commands)
 * [OpenHab integration](https://github.com/anklimov/lighthub/wiki/OpenHab--integration)
-
+* [Doxygen developers documentation](https://anklimov.github.io/lighthub/docs/html/index.html)
+* [Latest Release notes](https://github.com/anklimov/lighthub/releases/tag/v3.0.0)

 # Platforms specific details:

@@ -55,7 +58,7 @@ Scalability of Lighthub is virtually unlimited: Setup so many controllers you ne
 **ESP8266, ESP32**: (Tested)
 * DMX-OUT on USART1 TX
 * DMX-IN - disabled - not possible to deploy in ESP8266
-* Modbus - disabled. Might be configured in future on USART0 instead CLI/DEBUG
+* Modbus - disabled on ESP8266, Might be configured in future on USART0 instead CLI/DEBUG, on ESP32 binded with UART2
 * Uses Wifi interface instead wired connection

 **NRF52840** : Still early development stage
@@ -67,11 +70,14 @@ Scalability of Lighthub is virtually unlimited: Setup so many controllers you ne
 * USE_1W_PIN=49 // use direct connection to 1W devices on 49 pin, no I2C bridge DS2482-100
 * SD_CARD_INSERTED // enable sd-card support and fix lan starting
 * SERIAL_BAUD=115200 // set baud rate for console on Serial0
-* Wiz5500 //Use Wiznet 5500 library instead Wiznet 5100
+* Wiz5500 //Use Wiznet 5500 library instead universal Wiznet
+* Wiz5100 //Use Wiznet 5500 library instead universal Wiznet
 * DISABLE_FREERAM_PRINT // disable printing free Ram in bytes
 * CUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:00 //set firmware macaddress
 * DMX_DISABLE //disable DMX support
-* MODBUS_DISABLE // disable Modbus support
+* MODBUS_DISABLE // disable old Modbus driver 
+* MBUS_DISABLE  // disable new Modbus driver 
+* MODBUS_TX_PIN=13
 * OWIRE_DISABLE // disable OneWire support
 * ARTNET_ENABLE //Enable Artnet protocol support
 * AVR_DMXOUT_PIN=18 // Set Pin for DMXOUT on megaatmega2560
@@ -82,11 +88,27 @@ Scalability of Lighthub is virtually unlimited: Setup so many controllers you ne
 * WIFI_MANAGER_DISABLE //Disable wifi manager for esp8266
 * COUNTER_DISABLE //disable Counter, Uptime input support (for RAM savings on mega2560)
 * DHT_DISABLE //disable DHT input support (for RAM savings on mega2560)
+* PID_DISABLE // Disable PID regulator
+* STATUSLED // Enable RGB status led on pins 50,51,52 (DUE only)
+* DMX_SMOOTH //Smooth transition on DMX channels (DUE only)
+* OTA // Enable Other The Air firmware upload
+* W5500_CS_PIN=53 //Defines CS pin for Ethernet adapter (10-th by default)
+* WIFI_ENABLE //Enable WiFi for ESP (Wiznet by default)
+* SPILED_DISABLE //Disable SPI LED library
+* AC_DISABLE //Disable UART Hayer Air condition driver
+* M5STACK //Logging to M5Stack OLED screen
+* NO_HOMIE //Disable HOMIE discovery topics
+* BRIGHT_STEP //Scale DMX bright - Table1
+* BRIGHT_LOG //Scale DMX bright - Table2
+* MCP23017 allow I2C input port extender on MCP23017 chip
 * RESTART_LAN_ON_MQTT_ERRORS //reinit LAN if many mqtt errors occured
 * DEVICE_NAME short handy device name which is used instead of mac for download config http://{MY_CONFIG_SERVER}/{DEVICE_NAME}_config.json
 * SYSLOG_ENABLE enable UDP SYSLOG support feature(under DEVELOPMENT) that must be configured through config file
 * WITH_PRINTEX_LIB use PrintEx library (develop experimental feature)
 * CSSHDC_DISABLE //Disable CS811 and HDC1080 sensors support
+* FASTLED - using FASTLED library instead default ADAFRUIT_LED
+* SCALE_VOLUME_100 using 0..100 scaling in /set topics instead 0.255 (default)
+



--- a/compiled/controllino/firmware.hex
+++ b/compiled/controllino/firmware.hex
--- a/compiled/due-5100/firmware.bin
+++ b/compiled/due-5100/firmware.bin
--- a/compiled/due-5500/firmware.bin
+++ b/compiled/due-5500/firmware.bin
--- a/compiled/esp32-wifi/data/config.bin
+++ b/compiled/esp32-wifi/data/config.bin
@@ -0,0 +1 @@
+1234567890
--- a/compiled/lighthub21/uploadOTA.bat
+++ b/compiled/lighthub21/uploadOTA.bat
@@ -1,2 +0,0 @@
-..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
-
--- a/compiled/lighthub21/uploadOTA.sh
+++ b/compiled/lighthub21/uploadOTA.sh
@@ -1 +1 @@
-../tools/mac/arduinoOTA -address 192.168.88.45 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch
+../tools/mac/arduinoOTA -address 192.168.11.172 -port 80 -username arduino -password password -sketch firmware.bin -b -upload /sketch
--- a/compiled/mega2560-5100/firmware.hex
+++ b/compiled/mega2560-5100/firmware.hex
--- a/compiled/mega2560-5500/firmware.hex
+++ b/compiled/mega2560-5500/firmware.hex
--- a/compiled/mega2560slim-5100/firmware.hex
+++ b/compiled/mega2560slim-5100/firmware.hex
--- a/compiled/nrf52840-5500
+++ b/compiled/nrf52840-5500
--- a/compiled/nrf52840/firmware.hex
+++ b/compiled/nrf52840/firmware.hex
--- a/compiled/tools/win/arduinoOTA.exe
+++ b/compiled/tools/win/arduinoOTA.exe
--- a/lighthub/itemCmd.cpp
+++ b/lighthub/itemCmd.cpp
@@ -1064,7 +1064,6 @@ int itemCmd::doMappingCmd(aJsonObject *mappingData)

  {
  return 0;
-
  }

 char * itemCmd::toString(char * Buffer, int bufLen, int sendFlags, bool scale100 )
--- a/lighthub/main.cpp
+++ b/lighthub/main.cpp
@@ -1505,9 +1505,9 @@ int cmdFunctionIp(int arg_cnt, char **args)
 /*
    #if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__) || defined(NRF5)
    DNSClient dns;
-    #define inet_aton(cp, addr)   dns.inet_aton(cp, addr)
+    #define _inet_aton(cp, addr)   dns._inet_aton(cp, addr)
    #else
-    #define inet_aton(cp, addr)   inet_aton(cp, addr)
+    #define _inet_aton(cp, addr)   _inet_aton(cp, addr)
    #endif
 */

--- a/platformio.ini
+++ b/platformio.ini
@@ -99,7 +99,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/Ethernet
 	ArduinoHttpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/knolleary/pubsubclient.git
@@ -110,9 +110,8 @@ lib_deps =
 	Streaming
 	https://github.com/anklimov/NRFFlashStorage
 	https://github.com/adafruit/Adafruit_NeoPixel.git
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	https://github.com/arcao/Syslog.git
 	br3ttb/PID@^1.2.1
 	TimerInterrupt_Generic
@@ -157,10 +156,9 @@ lib_ignore =
 	HttpClient
 	ArduinoHttpClient
 lib_deps = 
-	;https://github.com/ebenolson/WIFIMANAGER-ESP32.git
-	;https://github.com/zhouhan0126/WebServer-esp32.git
-	https://github.com/tzapu/WiFiManager
-	https://github.com/anklimov/aJson
+	https://github.com/ebenolson/WIFIMANAGER-ESP32.git
+	https://github.com/zhouhan0126/WebServer-esp32.git
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/knolleary/pubsubclient.git
 	Streaming
@@ -179,9 +177,8 @@ lib_deps =
 	SparkFun CCS811 Arduino Library@~1.0.7
 	M5Stack
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	https://github.com/arcao/Syslog.git
 	br3ttb/PID@^1.2.1
 	;ArduinoMDNS
@@ -229,10 +226,9 @@ lib_ignore =
 	ArduinoHttpClient
 	M5Stack
 lib_deps = 
-	;https://github.com/ebenolson/WIFIMANAGER-ESP32.git
-	https://github.com/tzapu/WiFiManager
-	;https://github.com/zhouhan0126/WebServer-esp32.git
-	https://github.com/anklimov/aJson
+	https://github.com/ebenolson/WIFIMANAGER-ESP32.git
+	https://github.com/zhouhan0126/WebServer-esp32.git
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/knolleary/pubsubclient.git
 	Streaming
@@ -249,9 +245,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-    https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+    https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	https://github.com/arcao/Syslog.git
 	br3ttb/PID@^1.2.1
 	;ArduinoMDNS
@@ -305,7 +300,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/DmxDue
 	ArduinoHttpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/anklimov/Ethernet.git
@@ -321,15 +316,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
-	br3ttb/PID@^1.2.1
-	ArduinoMDNS
-	https://github.com/khoih-prog/TimerInterrupt_Generic.git
 monitor_speed = 115200

-[env:mega2560slim-5100]
 platform = atmelavr
 board = megaatmega2560
 upload_port = net:192.168.88.2:23000
@@ -363,9 +351,9 @@ lib_ignore =
 lib_deps = 
 	https://github.com/anklimov/Arduino-Temperature-Control-Library.git
 	https://github.com/anklimov/DS2482_OneWire
-	;https://github.com/anklimov/DmxSimple
-	https://github.com/anklimov/httpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/DmxDue
+	ArduinoHttpClient
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	;https://github.com/anklimov/ModbusMaster
 	;https://github.com/anklimov/DMXSerial
@@ -378,12 +366,11 @@ lib_deps =
 	DHT sensor library
 	https://github.com/arcao/Syslog.git
 	Streaming
-	;;ClosedCube HDC1080
-	;;SparkFun CCS811 Arduino Library@~1.0.7
-	;Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	ClosedCube HDC1080
+	SparkFun CCS811 Arduino Library@~1.0.7
+	Adafruit NeoPixel
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
 	;https://github.com/khoih-prog/TimerInterrupt_Generic.git
@@ -437,8 +424,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/DmxSimple
 	https://github.com/anklimov/httpClient
-	;ArduinoHttpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/anklimov/DMXSerial
@@ -455,9 +441,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
 	https://github.com/khoih-prog/TimerInterrupt_Generic.git
@@ -491,7 +476,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/DmxSimple
 	https://github.com/anklimov/httpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/anklimov/DMXSerial
@@ -506,9 +491,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
 	https://github.com/khoih-prog/TimerInterrupt_Generic.git
@@ -569,8 +553,8 @@ lib_deps =
    ;COMMENT/UNCOMMENT next line for software 1-wire driver  on/off
    ;https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/ESP-Dmx
-	;ESP8266HTTPClient
-	https://github.com/anklimov/aJson
+	ESP8266HTTPClient
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/knolleary/pubsubclient.git
@@ -586,9 +570,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA.git
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	br3ttb/PID@^1.2.1
 	;ArduinoMDNS
 	;MDNS
@@ -624,7 +607,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/DmxSimple
 	https://github.com/anklimov/httpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/anklimov/DMXSerial
@@ -639,13 +622,61 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
 	https://github.com/khoih-prog/TimerInterrupt_Generic.git

+[env:due-5500]
+platform = atmelsam
+framework = arduino
+board = due
+build_flags = !python get_build_flags.py due-5500
+lib_ignore = 
+    ;DS2482_OneWire   //UNCOMMENT for software 1-wire driver
+	DHT sensor library for ESPx
+	ESPDMX
+	ESP-Dmx
+	DMXSerial
+	WifiManager
+	DmxSimple
+	httpClient
+	Ethernet
+	Ethernet3
+	Ethernet5100
+	NRFFlashStorage
+	WebServer
+	UIPEthernet
+	ESP_EEPROM
+	EEPROM
+	M5Stack
+lib_deps = 
+	https://github.com/sebnil/DueFlashStorage
+	https://github.com/anklimov/Arduino-Temperature-Control-Library.git
+	https://github.com/anklimov/DS2482_OneWire
+	https://github.com/anklimov/DmxDue
+	ArduinoHttpClient
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
+	https://github.com/anklimov/CmdArduino
+	https://github.com/anklimov/ModbusMaster
+	https://github.com/anklimov/Ethernet2
+	https://github.com/knolleary/pubsubclient.git
+	https://github.com/anklimov/Artnet.git
+	FastLED@3.3.2
+	SD
+	SdFat
+	Adafruit Unified Sensor
+	DHT sensor library
+	https://github.com/arcao/Syslog.git
+	Streaming
+	https://github.com/livello/PrintEx#is-select-redecl
+	ClosedCube HDC1080
+	SparkFun CCS811 Arduino Library@~1.0.7
+	Adafruit NeoPixel
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
+	br3ttb/PID@^1.2.1
 monitor_speed = 115200


@@ -688,7 +719,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/DmxDue
 	ArduinoHttpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/anklimov/Ethernet
@@ -705,9 +736,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
 	https://github.com/khoih-prog/TimerInterrupt_Generic.git
@@ -740,7 +770,7 @@ lib_deps =
 	https://github.com/anklimov/DS2482_OneWire
 	https://github.com/anklimov/DmxSimple
 	https://github.com/anklimov/httpClient
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	https://github.com/anklimov/ModbusMaster
 	https://github.com/anklimov/DMXSerial
@@ -755,9 +785,8 @@ lib_deps =
 	ClosedCube HDC1080
 	SparkFun CCS811 Arduino Library@~1.0.7
 	Adafruit NeoPixel
-	https://github.com/anklimov/ArduinoOTA
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	https://github.com/arcao/Syslog.git
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
@@ -805,7 +834,7 @@ lib_ignore =
 	M5Stack
 	ArduinoOTA
 lib_deps = 
-	https://github.com/anklimov/aJson
+	https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
 	https://github.com/anklimov/CmdArduino
 	ArduinoHttpClient
 	https://github.com/knolleary/pubsubclient.git
@@ -813,69 +842,7 @@ lib_deps =
 	UIPEthernet
 	https://github.com/anklimov/NRFFlashStorage
 	Adafruit NeoPixel
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
-	SPI
-	br3ttb/PID@^1.2.1
-	ArduinoMDNS
-	https://github.com/khoih-prog/TimerInterrupt_Generic.git
-
-monitor_speed = 115200
-
-
-[env:stm32]
-platform = ststm32
-board = olimexino
-board_build.mcu = stm32f103rbt6
-board_build.f_cpu = 72000000L
-framework = arduino
-
-monitor_dtr = 1
-upload_protocol = dfu
-;debug_tool = cmsis-dap
-build_flags = !python get_build_flags.py stm32
-lib_ignore = 
-   ;DS2482_OneWire   //UNCOMMENT for software 1-wire driver
-	DHT sensor library for ESPx
-	DmxDue
-	DueFlashStorage
-	ESPDMX
-	ESP-Dmx
-	WifiManager
-	FastLED
-	UIPEthernet
-	DMXSerial
-	DmxSimple
-	httpClient
-	SD
-	PrintEx
-	Ethernet2
-	Artnet
-	Ethernet3
-	WebServer
-	ESP_EEPROM
-	DHT sensor library
-	DallasTemperature
-	Adafruit Unified Sensor
-	DS2482_OneWire
-	ModbusMaster
-	Syslog
-	EEPROM
-	ClosedCube HDC1080
-	SparkFun CCS811 Arduino Library
-	M5Stack
-	ArduinoOTA
-lib_deps = 
-	https://github.com/anklimov/aJson
-	https://github.com/anklimov/CmdArduino
-	ArduinoHttpClient
-	https://github.com/knolleary/pubsubclient.git
-	Streaming
-	Ethernet
-	https://github.com/anklimov/NRFFlashStorage
-	Adafruit NeoPixel
-	Adafruit MCP23017 Arduino Library
-	Adafruit BusIO
+	https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
 	SPI
 	br3ttb/PID@^1.2.1
 	ArduinoMDNS
--- a/spare_files/ArduinoOTA
+++ b/spare_files/ArduinoOTA
				`@@ -1,2 +0,0 @@`
				`..\tools\win\arduinoOTA.exe -address 192.168.88.21 -port 65280 -username arduino -password password -sketch firmware.bin -b -upload /sketch`