Merging from develop

This commit is contained in:
2022-01-05 12:28:19 +03:00
2 changed files with 11 additions and 100 deletions

View File

@@ -1,89 +0,0 @@
; PlatformIO Project Configuration File (for copy and paste)
;
; Build options: build flags, source filter
; Upload options: custom upload port, speed and extra flags
; Library options: dependencies, extra library storages
; Advanced options: extra scripting
;
; Please visit documentation for the other options and examples
; http://docs.platformio.org/page/projectconf.html
[platformio]
src_dir = lighthub
env_default =
<<<<<<< HEAD
due-5500
; controllino
; megaatmega2560
; megaatmega2560-5500
; due
=======
; megaatmega2560
due
>>>>>>> 2b56dcd8dd4e7b95e02c88bcbbbdec0a400a6dc4
; esp8266
[env:due]
platform = atmelsam
framework = arduino
board = due
lib_ldf_mode = chain+
build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
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
https://github.com/anklimov/ArduinoHttpClient
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet
https://github.com/anklimov/Ethernet2
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
FastLED
SD
SdFat
[env:megaatmega2560]
platform = atmelavr
board = megaatmega2560
framework = arduino
;lib_ldf_mode = chain+
build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
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/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet
https://github.com/anklimov/Ethernet2
https://github.com/PaulStoffregen/SPI.git
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
FastLED
EEPROM
[env:esp8266]
platform = espressif8266
framework = arduino
board = nodemcuv2
lib_ldf_mode = chain+
build_flags = !echo -n "-DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
lib_deps =
https://github.com/anklimov/Arduino-Temperature-Control-Library.git
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/ESP-Dmx
https://github.com/arduino-libraries/ArduinoHttpClient
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
FastLED

View File

@@ -100,7 +100,7 @@ lib_deps =
https://github.com/anklimov/Ethernet
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/knolleary/pubsubclient.git
; https://github.com/anklimov/Artnet.git
@@ -159,7 +159,7 @@ lib_deps =
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/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/knolleary/pubsubclient.git
Streaming
;ESP_EEPROM
@@ -229,7 +229,7 @@ lib_deps =
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/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/knolleary/pubsubclient.git
Streaming
;EEPROM
@@ -301,7 +301,7 @@ lib_deps =
https://github.com/anklimov/DmxDue
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet.git
https://github.com/knolleary/pubsubclient.git
@@ -425,7 +425,7 @@ lib_deps =
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
;https://github.com/anklimov/Ethernet5100
@@ -477,7 +477,7 @@ lib_deps =
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet2
@@ -555,7 +555,7 @@ lib_deps =
https://github.com/anklimov/ESP-Dmx
ESP8266HTTPClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
@@ -658,7 +658,7 @@ lib_deps =
https://github.com/anklimov/DmxDue
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet2
https://github.com/knolleary/pubsubclient.git
@@ -720,7 +720,7 @@ lib_deps =
https://github.com/anklimov/DmxDue
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet
https://github.com/knolleary/pubsubclient.git
@@ -771,7 +771,7 @@ lib_deps =
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet5100
@@ -835,7 +835,7 @@ lib_ignore =
ArduinoOTA
lib_deps =
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
ArduinoHttpClient
https://github.com/knolleary/pubsubclient.git
Streaming