re-compilation after merge

This commit is contained in:
2022-01-05 12:52:10 +03:00
parent 5227182dd8
commit fbdf400a2b
18 changed files with 36393 additions and 108 deletions

View File

@@ -288,8 +288,8 @@
:1011F000436F6E666967207365727665723A000A9E
:10120000282B295741544348444F47003230313747
:1012100030334C0020432B2B2076657273696F6E40
:101220003A00316365373639645F323032322D30FF
:10123000312D3033000A4C617A79686F6D652E72FA
:101220003A00353232373138325F323032322D3097
:10123000312D3035000A4C617A79686F6D652E72F8
:1012400075204C6967687448756220636F6E7472AC
:101250006F6C6C65722000204F464600204F4E0098
:101260002042595041535300757074696D65006692
@@ -394,9 +394,9 @@
:101890004150492E20557365206F74617077642024
:1018A000636F6D6D616E6420746F2073657400707A
:1018B000617373776F726400757074696D652C66FF
:1018C00072656568656170002473746174730031BA
:1018D0006365373639645F323032322D30312D3026
:1018E00033004C696768744875622000246E616D2E
:1018C00072656568656170002473746174730035B6
:1018D0003232373138325F323032322D30312D30C2
:1018E00035004C696768744875622000246E616D2C
:1018F0006500726561647900546F6F206D616E7967
:10190000204D51545420636F6E6E656374696F6E21
:10191000206572726F72732E2052657374617274D7
@@ -1486,7 +1486,7 @@
:105CD00000D0CDB7DEB76C017C0110E08AE0A82EC1
:105CE000B12C133061F1F701828190E0B0E0A0E0C7
:105CF00089839A83AB83BC83BE82AD82BE016F5F12
:105D00007F4F85E19FE00E94721A66EB76E10E9468
:105D00007F4F84EE9DE00E94721A66EB76E10E945E
:105D100095821F5FFFEFEF1AFF0A143011F72696E6
:105D20000FB6F894DEBF0FBECDBFDF91CF911F91AC
:105D3000FF90EF90DF90CF90BF90AF900895F60165

15
compiled/check_bin.sh Executable file
View File

@@ -0,0 +1,15 @@
diff ../.pio/build/due/firmware.bin due
diff ../.pio/build/controllino/firmware.hex controllino
diff ../.pio/build/m5stack/firmware.bin m5stack
diff ../.pio/build/mega2560slim-5100/firmware.hex mega2560slim-5100
diff ../.pio/build/mega2560slim-5100/firmware.bin mega2560slim-5100
diff ../.pio/build/mega2560-optiboot/firmware.hex mega2560-optiboot
diff ../.pio/build/mega2560-optiboot/firmware.bin mega2560-optiboot
diff ../.pio/build/mega2560-5100/firmware.hex mega2560-5100
diff ../.pio/build/nrf52840/firmware.hex nrf52840-5500
diff ../.pio/build/esp32-wifi/firmware.bin esp32-wifi
diff ../.pio/build/stm32-enc2860/firmware.bin stm32-enc2860
diff ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi
diff ../.pio/build/lighthub21/firmware.bin lighthub21
diff ../.pio/build/mega2560-5500/firmware.hex mega2560-5500
diff ../.pio/build/stm32/firmware.* stm32

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

5962
compiled/nrf52840-5500 Normal file

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -99,8 +99,8 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/Ethernet
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/knolleary/pubsubclient.git
; https://github.com/anklimov/Artnet.git
@@ -110,8 +110,9 @@ lib_deps =
Streaming
https://github.com/anklimov/NRFFlashStorage
https://github.com/adafruit/Adafruit_NeoPixel.git
https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
https://github.com/anklimov/ArduinoOTA
Adafruit MCP23017 Arduino Library
Adafruit BusIO
https://github.com/arcao/Syslog.git
br3ttb/PID@^1.2.1
TimerInterrupt_Generic
@@ -156,10 +157,11 @@ lib_ignore =
HttpClient
ArduinoHttpClient
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#5742af5b0748c93867557a8384f0d4552f4fe50b
;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/anklimov/CmdArduino
https://github.com/knolleary/pubsubclient.git
Streaming
;ESP_EEPROM
@@ -177,8 +179,9 @@ lib_deps =
SparkFun CCS811 Arduino Library@~1.0.7
M5Stack
Adafruit NeoPixel
https://github.com/anklimov/ArduinoOTA#8feeea77869a5039857d2d23d0a46f8a8fe1514a
https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
https://github.com/anklimov/ArduinoOTA
Adafruit MCP23017 Arduino Library
Adafruit BusIO
https://github.com/arcao/Syslog.git
br3ttb/PID@^1.2.1
;ArduinoMDNS
@@ -226,10 +229,11 @@ lib_ignore =
ArduinoHttpClient
M5Stack
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#5742af5b0748c93867557a8384f0d4552f4fe50b
;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/anklimov/CmdArduino
https://github.com/knolleary/pubsubclient.git
Streaming
;EEPROM
@@ -245,8 +249,9 @@ lib_deps =
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
https://github.com/anklimov/ArduinoOTA
Adafruit MCP23017 Arduino Library
Adafruit BusIO
https://github.com/arcao/Syslog.git
br3ttb/PID@^1.2.1
;ArduinoMDNS
@@ -300,8 +305,8 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxDue
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet.git
https://github.com/knolleary/pubsubclient.git
@@ -316,8 +321,15 @@ 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
@@ -351,9 +363,9 @@ lib_ignore =
lib_deps =
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/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
@@ -366,11 +378,12 @@ 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#8feeea77869a5039857d2d23d0a46f8a8fe1514a
https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
;;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
@@ -424,8 +437,9 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
;ArduinoHttpClient
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
;https://github.com/anklimov/Ethernet5100
@@ -441,8 +455,9 @@ lib_deps =
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
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
@@ -476,8 +491,8 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet2
@@ -491,8 +506,9 @@ lib_deps =
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
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
@@ -553,9 +569,9 @@ 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#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
;ESP8266HTTPClient
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/knolleary/pubsubclient.git
https://github.com/anklimov/Artnet.git
@@ -570,8 +586,9 @@ lib_deps =
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
https://github.com/anklimov/ArduinoOTA.git
Adafruit MCP23017 Arduino Library
Adafruit BusIO
br3ttb/PID@^1.2.1
;ArduinoMDNS
;MDNS
@@ -607,7 +624,7 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
@@ -622,61 +639,13 @@ lib_deps =
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
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
[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#5742af5b0748c93867557a8384f0d4552f4fe50b
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
@@ -719,8 +688,8 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxDue
ArduinoHttpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Ethernet
https://github.com/knolleary/pubsubclient.git
@@ -736,8 +705,9 @@ lib_deps =
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
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
@@ -770,8 +740,8 @@ lib_deps =
https://github.com/anklimov/DS2482_OneWire
https://github.com/anklimov/DmxSimple
https://github.com/anklimov/httpClient
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/DMXSerial
https://github.com/anklimov/Ethernet5100
@@ -785,8 +755,9 @@ lib_deps =
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
https://github.com/anklimov/ArduinoOTA
Adafruit MCP23017 Arduino Library
Adafruit BusIO
https://github.com/arcao/Syslog.git
br3ttb/PID@^1.2.1
ArduinoMDNS
@@ -834,15 +805,77 @@ lib_ignore =
M5Stack
ArduinoOTA
lib_deps =
https://github.com/anklimov/aJson#b063de5fb8041e039aaff06b21790edb12c22fdf
https://github.com/anklimov/CmdArduino#5742af5b0748c93867557a8384f0d4552f4fe50b
https://github.com/anklimov/aJson
https://github.com/anklimov/CmdArduino
ArduinoHttpClient
https://github.com/knolleary/pubsubclient.git
Streaming
UIPEthernet
https://github.com/anklimov/NRFFlashStorage
Adafruit NeoPixel
https://github.com/adafruit/Adafruit-MCP23017-Arduino-Library#65438e94ef5cdeb73d7a79d37b8ca46ee9331cd2
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
SPI
br3ttb/PID@^1.2.1
ArduinoMDNS