Merge branch 'master' into develop

This commit is contained in:
2021-04-13 01:24:22 +03:00
2 changed files with 10 additions and 1 deletions

View File

@@ -298,7 +298,6 @@ void DMXOUT_propagate()
#endif #endif
} }
void ArtnetSetup() void ArtnetSetup()
{ {
#ifdef _artnet #ifdef _artnet

View File

@@ -114,6 +114,7 @@ monitor_speed = 115200
[env:m5stack] [env:m5stack]
platform = espressif32 platform = espressif32
board = m5stack-core-esp32 board = m5stack-core-esp32
monitor_baud = 115200
framework = arduino framework = arduino
upload_speed = 921600 upload_speed = 921600
build_flags = !python get_build_flags.py m5stack build_flags = !python get_build_flags.py m5stack
@@ -171,6 +172,7 @@ framework = arduino
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
build_type = debug build_type = debug
board = esp32-evb board = esp32-evb
monitor_baud = 115200
upload_speed = 115200 upload_speed = 115200
build_flags = !python get_build_flags.py esp32-wifi build_flags = !python get_build_flags.py esp32-wifi
lib_ignore = lib_ignore =
@@ -224,6 +226,7 @@ monitor_speed = 115200
platform = atmelsam platform = atmelsam
framework = arduino framework = arduino
board = due board = due
monitor_baud = 115200
build_flags = !python get_build_flags.py due-5100 build_flags = !python get_build_flags.py due-5100
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
@@ -274,6 +277,7 @@ monitor_speed = 115200
platform = atmelsam platform = atmelsam
framework = arduino framework = arduino
board = due board = due
monitor_baud = 115200
build_flags = !python get_build_flags.py due build_flags = !python get_build_flags.py due
; Need to place arduinoOTA utility from Arduino IDE distribution to folder in your PATH ; Need to place arduinoOTA utility from Arduino IDE distribution to folder in your PATH
;fix address and password ;fix address and password
@@ -375,6 +379,7 @@ monitor_speed = 115200
[env:mega2560-5500] [env:mega2560-5500]
platform = atmelavr platform = atmelavr
board = megaatmega2560 board = megaatmega2560
monitor_baud = 115200
framework = arduino framework = arduino
build_flags = !python get_build_flags.py mega2560-5500 build_flags = !python get_build_flags.py mega2560-5500
lib_ignore = lib_ignore =
@@ -421,6 +426,7 @@ monitor_speed = 115200
platform = espressif8266 platform = espressif8266
framework = arduino framework = arduino
board = nodemcuv2 board = nodemcuv2
monitor_baud = 115200
upload_protocol = esptool upload_protocol = esptool
;upload_protocol = espota ;upload_protocol = espota
@@ -482,6 +488,7 @@ monitor_speed = 115200
[env:mega2560-5100] [env:mega2560-5100]
platform = atmelavr platform = atmelavr
board = megaatmega2560 board = megaatmega2560
monitor_baud = 115200
framework = arduino framework = arduino
upload_port = net:192.168.88.2:23000 upload_port = net:192.168.88.2:23000
build_flags = !python get_build_flags.py mega2560-5100 build_flags = !python get_build_flags.py mega2560-5100
@@ -581,6 +588,7 @@ monitor_speed = 115200
platform = atmelsam platform = atmelsam
framework = arduino framework = arduino
board = due board = due
monitor_baud = 115200
build_flags = !python get_build_flags.py lighthub21 build_flags = !python get_build_flags.py lighthub21
;upload_command = arduinoOTA -address 192.168.11.172 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE ;sleep 4 ;upload_command = arduinoOTA -address 192.168.11.172 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE ;sleep 4
upload_command = arduinoOTA -address 192.168.88.64 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE;sleep 4 upload_command = arduinoOTA -address 192.168.88.64 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE;sleep 4
@@ -634,6 +642,7 @@ monitor_speed = 115200
[env:controllino] [env:controllino]
platform = atmelavr platform = atmelavr
board = megaatmega2560 board = megaatmega2560
monitor_baud = 115200
framework = arduino framework = arduino
build_flags = !python get_build_flags.py controllino build_flags = !python get_build_flags.py controllino
lib_ignore = lib_ignore =
@@ -681,6 +690,7 @@ monitor_speed = 115200
platform = ststm32 platform = ststm32
framework = arduino framework = arduino
board = nucleo_f103rb board = nucleo_f103rb
monitor_baud = 115200
upload_protocol = stlink upload_protocol = stlink
debug_tool = stlink debug_tool = stlink
build_flags = !python get_build_flags.py stm32-enc2860 build_flags = !python get_build_flags.py stm32-enc2860