OTA fixed (broken on last release)

New target: esp32c3 added
partitions optimized for all esp32 targets & OTA
This commit is contained in:
2026-01-19 23:04:07 +03:00
parent 40c1fca5df
commit 42279ed567
32 changed files with 25691 additions and 24841 deletions

View File

@@ -0,0 +1,77 @@
# Build flags for ESP32C3 with WiFi
-D ARDUINO_USB_MODE=1
-D ARDUINO_USB_CDC_ON_BOOT=1
-DdebugSerialPort=Serial
-D CONFIG_CLEAN_PIN=9
-DmodbusSerial=Serial1
#Define pins for modbus UART Serial1. Default - 9/10 is utilized by ESP flash
-DMODBUS_UART_RX_PIN=5
-DMODBUS_UART_TX_PIN=6
-DMODBUS_TX_PIN=-1
-DAC_Serial=Serial0
-D AC_RX_PIN=20
-D AC_TX_PIN=21
-DWIFI_ENABLE
-DDMX_DISABLE
# - exeption in DMX.update/begin
#-DSPILED_DISABLE
#-DAC_DISABLE
-DMODBUS_DISABLE
-DMOTOR_DISABLE
#-DMBUS_DISABLE
#-DCOUNTER_DISABLE
-DSYSLOG_ENABLE
# - udp errors
-DOTA_ENABLE
-DARDUINO_OTA_MDNS_DISABLE
-DMDNS_ENABLE
#- ArduinoMDNS didnt working
#-D CANDRV
-DMCP23017
#-DARTNET_ENABLE - udp rx errors ((
#-DUSE_1W_PIN=16
#-DW5500_CS_PIN=15
#-DPID_DISABLE
#-DMODBUS_DEBUG
# Use default pins for modbus UART
#-DMODBUS_UART_RX_PIN=-1
#-DMODBUS_UART_TX_PIN=-1
# Example of UARTBRIDGE configuration
#-DUARTBRIDGE_ENABLE
#-DMODULE_UATRBRIDGE_UARTA=Serial1
#-DMODULE_UATRBRIDGE_UARTA_RX_PIN=15
#-DMODULE_UATRBRIDGE_UARTA_TX_PIN=2
#-DMODULE_UATRBRIDGE_UARTB=Serial2
#-DMODULE_UATRBRIDGE_UARTB_RX_PIN=-1
#-DMODULE_UATRBRIDGE_UARTB_TX_PIN=-1
#-DAUTOCONNECT_RECONNECT_WAITTIME=60
-DFS_STORAGE
-DFS_PREPARE
-DRESTART_LAN_ON_MQTT_ERRORS
#-D CORS=\"http://lazyhome.ru\"
-DOTA_PORT=80
-DMQTT_KEEPALIVE=10
-DMQTT_SOCKET_TIMEOUT=20
-D CORS=\"*\"
-D REDIRECTION_URL=\"http://lazyhome.ru/pwa\"
#-DMERCURY_ENABLE
-D ROTARYENCODER

View File

@@ -41,4 +41,6 @@
-D MERCURY_ENABLE -D MERCURY_ENABLE
#-D IPMODBUS #-D IPMODBUS
-D CONFIG_CLEAN_PIN=2 -D CONFIG_CLEAN_PIN=2
-D ROTARYENCODER -D ROTARYENCODER
-D CANDRV
-D THERMO_OVERHEAT_CELSIUS=44.

File diff suppressed because it is too large Load Diff

View File

@@ -20,125 +20,125 @@
:100130000000803F0000000000084178D3BB4387E7 :100130000000803F0000000000084178D3BB4387E7
:10014000D1133D190E3CC3BD4282AD2B3E68EC82FB :10014000D1133D190E3CC3BD4282AD2B3E68EC82FB
:1001500076BED98FE1A93E4C80EFFFBE01C4FF7F80 :1001500076BED98FE1A93E4C80EFFFBE01C4FF7F80
:100160003F00000000000C9476A70D9451240C94DD :100160003F00000000000C9468CA0C94477A0C947D
:100170002A1C0C9445E80C9471E90C94D1340C942D :100170006E6F0C94EDFF0C9411240C944CD90C94DC
:10018000EDFF0C9451260D94B5190D940F240C9489 :10018000837B0C94B66F0C9406DC0C944D2B0C9472
:100190004FD90C94F7B30C946D6E0C9413BB0C9464 :10019000339C0C9498CA0C94B9AA0C9451B10C9449
:1001A000EFE90C94AC6D0C941A430C94E42A0C9473 :1001A00052A70C9452C30C946D6E0C94991A0D9432
:1001B0005BD90D94961A0C9404780C949C7A0C9448 :1001B0004D230C94EA1B0C94D41C0C94EEA50C94C7
:1001C0007F5E0D941B230D94C4310C94B2B20C9439 :1001C0004AD80C94321C0C947A1B0C943C350C9439
:1001D0009CAB0C94B0A70C94861C0C9447B70C9461 :1001D0003B350C94623F0C947F5E0C9432E70C9498
:1001E0005AC80C9460560C9445680D9460240C9485 :1001E00007A80C94892A0C9454680C949E9A0C9439
:1001F000BF770D94BF2A0C94C4DD0D9447240C9452 :1001F00041C20C9425480C941D7A0C9429E90C9466
:100200001DFD0D94A71A0C9475AF0C94B3B70C9404 :10020000B3A30C942A1C0C9442E90C9483B10C9473
:10021000F5300C9483A70C943B350C940AA30C94F2 :10021000C6B70C9475C70C94A2B10C944FD90C942A
:1002200056AB0C9472270C94CD780C94CDE90C94B9 :1002200066AB0C9437790C94DE4F0C9454440C94C8
:10023000321C0C946A5E0C94E7410C94EB370C94DE :100230009CDD0C948A1C0C94A6550C94B3E80C9489
:10024000551B0C9469D90C940C300C94BBE60C949F :1002400053EA0C94D0E80C9473B40D94CD2A0D9419
:10025000A8C80D9419240C94A6550C94CB550C9455 :1002500019240C94B32F0C9438A30C94EDE90C944E
:10026000E9A60C9462680C940CAC0C946DEA0C94A6 :10026000F3780C94FFE80C94631B0C949EE70C94B9
:1002700080850C94AFD80D9473190D9413230C94AE :100270002DA20C94EBA50C943F680C9428B80C9418
:1002800025480C9434230C94D0340C94EDE90D944F :10028000D1A50C94301C0C941A430C946A5E0C9407
:1002900077000C94B9A60C94355F0D945F040C9410 :1002900069C80C943DC80C9459B80C94B2E90C94FC
:1002A00011240C9438C70C9420310C9457F00C9402 :1002A0000CAC0C9445E80C94B8C80C94802A0C94BF
:1002B00039DC0C94DD9F0C94AB410D944D230D94CF :1002B00040A20D941B230C945DA30C94031C0C947E
:1002C000E41F0D943A230D9414080C94031C0C9411 :1002C000BADB0C94D0DC0D94E41F0C945AC80C9447
:1002D000D2A70C949E9A0D9474240C9440A20D9471 :1002D0008EA60C9408300C94E43A0C94EAAD0C947D
:1002E000BF190C94944C0C949EE70C94BF6E0C9424 :1002E000FA780D94BF190C94EC1F0D949D190D9480
:1002F00063B50C9428B80C94BDB70C94097B0D948D :1002F00044230C94C4DD0C944B410C94D44C0C94CA
:10030000BE2A0C9406DC0C9459DC0C947EAA0C9446 :10030000355F0D943D240C94BDB70C94C3D80C9468
:10031000AAB70D94811B0C94F8670C9452AB0D9402 :10031000D4780D94CF1F0C94ABC80D940F390C9466
:100320007E240C94D44C0C94BDAB0C94D0DC0C9477 :10032000311B0C9415730C94E5EB0C94CCE90D94F3
:10033000E7300C946E6F0C94742F0C9442EA0C947A :10033000961A0C9427850C949C7A0C9441D90C94B1
:1003400013560D94D6130C94B6780C9454680C94F0 :1003400068220C9445680C9491A70C94F9790C944C
:10035000A2A70C948A1C0C941C410C9404BB0C9412 :100350007E440C94182F0C9404BB0C947AC20D9418
:100360000CB60C9485FF0D9405240C9404B10C94E8 :100360007E240C94FBAB0C94BE1B0C9479990C94DA
:1003700083B10C9423200C9454440D941F230C94AB :1003700000B40D94A71A0D9440230D942B240C94D3
:1003800071A10C94C8A30C94E2200C94FAB30D94C0 :1003800062AB0C9474A30C94F6A20C9437AC0C944E
:100390001D140D9436230D9434140D94D02A0C940E :10039000401B0C9442EA0C9427A80C94BF770C9451
:1003A000F3780C940A300C943D350D94C9190C94D3 :1003A000357A0D9422230C9488E90C947BE70D9404
:1003B0002C1C0C949C1A0D9455190C94EC1F0C9445 :1003B00073190C940DA60C94F8670D943A230C94C1
:1003C0005ED90C940BA70C9469B50C94E5AB0C9416 :1003C00004780C9452AB0C942B460C94E9EA0C94F0
:1003D000623F0C949E1B0C9484550C949E340D9497 :1003D0001FC30C94F1E80C9481FF0C940A300D9427
:1003E00064070C945EAB0C94357A0C941FC30D9487 :1003E000EF130C94AB410C94A31A0D94D3190C94F5
:1003F000EF130C9494560C94262A0C94B32F0C945F :1003F0006AAB0D94BF2A0C9426300D94D61F0D9431
:10040000AD780C944EAB0C9418740D946A240D9432 :1004000000200C946CD90C94E9A60C94FFB70C94C2
:10041000A0070C949F7B0C9448560C94E9EA0C942A :10041000B2B20C940BA70C94742F0C9413560C943A
:1004200025A30C9474A30C94F0550C947AC20D94EB :10042000CB550C94A8C80D94C71A0C94687B0C94F7
:10043000CD2A0C94B7A60D9448230D94361B0C942A :10043000D2A70D9400240C9460560C9459DC0C94B3
:1004400004300C94B9E90C9478A60C94F1E80C945F :1004400066B50D9405240C94FBC70C945CA70C9422
:10045000FE9A0C94A31A0C948AE70C9437790C94A6 :1004500072270C94E5240C9448560C94F7B30D9431
:10046000BADB0C9466B50C9463790C94DA400C9466 :1004600055190C9433A70C9466FD0C94093B0C941D
:10047000DD300D949D190D94C71A0C947A1B0C94C1 :1004700001620D94FE130D94D6130C94B6A50D9441
:100480004B680C94796C0D9437010C9453EA0C94DE :1004800023240C94ACE70D9465190D9428230C9447
:10049000143B0C9464FC0D94F91F0C944FA30C9422 :1004900056AB0D9460240C94D72A0C94562F0C94D0
:1004A00091A70D942B240C94D72A0C9432E70C942A :1004A0003BE90C94295F0C94B9AB0C949DA70C9478
:1004B0007E260C94DE4F0D9432230C94B66F0C9470 :1004B00042790C94097B0C94C4E90C9485FF0C944C
:1004C000CCAA0C9427A80C948EA60C943DC80C942E :1004C000F42F0C94262A0C94F2AD0C94197B0C9406
:1004D000A5260D94DD1F0C9466FD0C948E1C0C94C7 :1004D00093770C94AC6E0D94AC000C940AA30D941D
:1004E00018360C94A4E80D9440230C944AD80C942C :1004E00081190C94944C0C94AC6D0C94C98C0C94A4
:1004F0008BC80D9428230C944CD90C94F81B0C94A5 :1004F000A5370C9434230C94362F0D9436230C948A
:10050000E5EB0D94FE130C945DA30C949CDD0C9410 :100500001C410C94A7FC0C94F8E70C94881C0C94E8
:10051000D2AB0C948C1C0C94E5240C942AB80C944B :1005100034E70D9492240C94A5260C94ED1B0C94B6
:10052000477A0C94586F0C9472DC0C94EEA50C94E2 :100520009E1B0D94A0070C9480850C94E7300C94CE
:10053000687B0C94B8C80C9473B40D9400200C9490 :10053000FAB30C946CB40D946A240C946DEA0D9487
:10054000F42F0D94DD130C9444EA0C94CCE90C9434 :10054000D02A0D9434140D94CF000C94FFAB0C946E
:100550005CDB0C9427440C944CFC0C947E440C946F :10055000245F0C9400790C949AEA0C94F0550C9456
:100560000DA60C9477FA0C9493350D944E230C94AD :10056000A2E90C94B9E90C9471E90C949CAB0C943D
:10057000C3D80C94841C0C94F9410C9439780C94D5 :1005700071A10C9472DC0C9409790C9436780C946B
:10058000311B0C94E43A0C94B3E80C94DC4B0C94BF :1005800003A60D94DD130D9448230C94C9EA0C9432
:10059000A5370C944B410C94A7FC0C9437560C9443 :1005900023200C9463B50C94AD780C948AE70C94EA
:1005A00062AB0C9433A40C946CB40D9405010C94C0 :1005A0004FA30C94D0340D9437010C9476A70C947F
:1005B00007A80C9400790C9436780C9415730C945D :1005B00044EA0C948BC80C9464FC0C941EA70D9414
:1005C0009DA70C94AC6E0C94281C0D9452230C9493 :1005C00052230C944CFC0D941D140C948C1C0C9414
:1005D00059B80C94C42F0C94093B0C94301C0C9407 :1005D0005C790C945EAB0C94B6780C949FAA0C9446
:1005E000D6D80C947D1B0C9438A30C9463A10C9466 :1005E000F9410C9413B80C949C1A0C94DC4B0C94A9
:1005F000D1A50D94D3190C94EC740C9439AC0C94D3 :1005F00062680C94A4E80C9449250C94A6AB0C9466
:10060000FA780C94B3A30C948A430C94991A0C9422 :10060000EFE90C9438C70C94D02E0C94BF6E0C9468
:1006100094950C94892A0C9466AB0C94ADAE0C9412 :10061000DD9F0D9432230C949E340D942C230C9466
:1006200069C80D94F8230C9498CA0D94D61F0C94A5 :100620008E1C0C9425A30C94CADD0C94C6770C94F4
:10063000837B0D943D240C9452C30C9418550C9458 :10063000B0DC0C947ED90C9489680C946DEF0D9409
:1006400037AC0C943CFD0D942C230C94881C0C941A :10064000AB190C94E5AB0C94EBB70C9478A60C9416
:10065000C5780C9401EB0C94D0A70C9442E90C944F :1006500035E70C944EAB0D94361B0C9463790C94D7
:1006600027850C9452A70C94339C0C945DB50C9484 :10066000386A0C94D0A70C946EB50D9447240C9462
:1006700041D90D9465190D940D230C9442790C9475 :100670005BD90C944D790C94C24C0C9418360C94A4
:10068000A2430D9433240D94CF1F0C94996D0C94B8 :10068000C5780C94A2DD0C94E7410D945F040C94A2
:10069000C82C0C9448200C943F680D9423240C948F :10069000AAA60D941F230D94F21F0C9433A40C945E
:1006A000AAA60C94C4E90C94E3E90C9426300C94AB :1006A0003D350C94ADAE0C94B0A70C949F7B0C948C
:1006B000EBB70C946CD90C9493770C942B460C9458 :1006B000AAB70C94DD300D940F240C948B5B0C9432
:1006C000182F0C94562F0C9451B10D94481B0C9478 :1006C0005CDB0C942E1C0C94E9DC0C94A2A70C941B
:1006D00067AB0C94FFE80C94ABC80C94386A0D948B :1006D0007CAB0C9475AF0C9433E70C94996D0D942E
:1006E00022230C9429E90C9496DD0C943C350D944E :1006E0005E000D9414080C9473430C94B7A60C94FC
:1006F00017230C94D8B70D9488240D94AB190C943F :1006F000BBE60C94AFD80D9405010C9490DB0C94E0
:1007000008300C948AD80C94D41C0C9490DB0C9474 :10070000EC740C94551B0C9418740C94CCAA0C9497
:1007100060B50C94C6770C9435E70C944D2B0C9473 :1007100048200C945AAB0C9477FA0C94D2340C9475
:10072000B2E90D9444230C94C9EA0C94C98C0C943E :1007200004B10C9401EB0C9451260D9451240C94BB
:100730007CAB0D9492240C9466EA0C94EA1B0D9405 :10073000586F0C94796C0C94841C0C9447B70C94EF
:10074000AC000C9409790C945C790C946ACA0C94F2 :10074000F81B0C940C300C94E2200C948A430C940B
:100750004D790C94FFB70D94EC030C9403A60C9404 :100750006ACA0D9493190C94C8A30D94C9190C94EA
:1007600001620C94245F0C9418790C9443EA0C9465 :1007600013BB0D94EC030C9437560C941DB80C94E9
:10077000B6A50C94362F0C94C6B70C94D02E0C94BE :10077000FE9A0C94BFAB0D94B5190C941DFD0C940E
:100780006AAB0C94D4780D945E000C949EE90C94A2 :100780003CFD0C94764C0C94B9A60C94E3E90C94C3
:10079000EBA50C94E9DC0C94CA6B0D9481190C94B4 :100790004B680C9469D90D944E230C94CDE90C94BC
:1007A000764C0C94B29A0C94F9790C9479990C9437 :1007A00039780C947EAA0C9496DD0C9484550C94A4
:1007B0007BE70C94D2340C94BA1F0C9468220C94EE :1007B00027440C940CB60C94281C0C94E9C20C949D
:1007C00073430C94C24C0C94F6A20C94802A0C94A3 :1007C000DA400C9443EA0C9493350D9464070C942E
:1007D000F2AD0D94F21F0C949FAA0C940DBB0D94D6 :1007D000BDAB0C94861C0C9494560C948AD80C9443
:1007E00000240C94A6AB0C9441C20C943BE90C94ED :1007E00083A70D94BE2A0C947E260C94D1340C94CD
:1007F0001D7A0C9488E90C941DB80C94D0E80C94E4 :1007F000E42A0D94B01A0C942C1C0C94D6D80C94AA
:10080000B0DC0C947ED90C94E9C20C9413B80C940F :100800009EE90D9474240D9477000C94D2AB0C9453
:10081000A2DD0C946DEF0C94ACE70C94CF340C94E7 :10081000EB370C94C42F0D9433240C94CA6B0C94B6
:10082000CADD0C94ED1B0C9475C70C9411AE0C949E :10082000F5300C94B3B70C9404300D94F8230D9468
:10083000295F0C945CA70C946EB50C942DA20C94BB :10083000F91F0D9413230C94143B0C94B29A0C944E
:1008400033A70D940F390C94B9C70C94197B0C94F1 :10084000C82C0C94BA1F0D9488240C94D8B70C941F
:10085000AE4C0C942E1C0C94E72D0D94CF000C94F0 :10085000AE4C0C94CF340C9439DC0D94DD1F0D9408
:1008600033E70C9400B40C94BFAB0C94A2E90C9445 :10086000811B0C942AB80C94EDA20C9418550C948E
:10087000D9A60C9481FF0C94B9AA0C94FBC70C94D4 :100870005DB50C9494950C94E72D0C94CD780D9463
:10088000BE1B0C94FBAB0C945AAB0C94401B0C9409 :10088000481B0C940DBB0C9420310C9418790D94DA
:100890001EA70C9468CA0C9434E70D94B01A0C94FB :100890000D230C94B9C70C9463A10C947D1B0C948C
:1008A00089680C94F8E70C948B5B0C949AEA0C948E :1008A00060B50C94A2430C9457F00C94D9A60D9407
:1008B00049250D9493190C94A2B10C94FFAB0C94A0 :1008B00017230C9469B50C945ED90C9466EA0C94D9
:1008C000EAAD0C94631B0C94B9AB0C94EDA24E41B1 :1008C00039AC0D94C4310C9411AE0C9467AB4E410D
:1008D0004E494E495459494E46CDCCCC3D0AD723BA :1008D0004E494E495459494E46CDCCCC3D0AD723BA
:1008E0003C17B7D13877CC2B329595E6241FB14F02 :1008E0003C17B7D13877CC2B329595E6241FB14F02
:1008F0000A000020410000C84200401C4620BCBE47 :1008F0000A000020410000C84200401C4620BCBE47
@@ -423,8 +423,8 @@
:101A60006C6F7200302D32353500696E74656765B4 :101A60006C6F7200302D32353500696E74656765B4
:101A70007200666C6F617400332E302E3100246862 :101A70007200666C6F617400332E302E3100246862
:101A80006F6D696500757074696D652C667265654A :101A80006F6D696500757074696D652C667265654A
:101A90006865617000303864656436325F323032B8 :101A90006865617000343063316663615F32303293
:101AA000362D30312D3039004C69676874487562C5 :101AA000362D30312D3130004C69676874487562CD
:101AB0002000246E616D6500526562696E6420735A :101AB0002000246E616D6500526562696E6420735A
:101AC0007563636573732E20495020616464726589 :101AC0007563636573732E20495020616464726589
:101AD00073733A004572726F723A20726562696E72 :101AD00073733A004572726F723A20726562696E72
@@ -613,8 +613,8 @@
:10264000653A65663A66653A3037006C617A796852 :10264000653A65663A66653A3037006C617A796852
:102650006F6D652E7275000A436F6E666967207331 :102650006F6D652E7275000A436F6E666967207331
:1026600065727665723A003230313130334C002079 :1026600065727665723A003230313130334C002079
:10267000432B2B2076657273696F6E3A0030386495 :10267000432B2B2076657273696F6E3A003430639A
:10268000656436325F323032362D30312D303900CC :10268000316663615F323032362D30312D313000AA
:102690000A4C617A79686F6D652E7275204C696796 :102690000A4C617A79686F6D652E7275204C696796
:1026A000687448756220636F6E74726F6C6C6572CB :1026A000687448756220636F6E74726F6C6C6572CB
:1026B0002000204F464600204F4E002042595041F6 :1026B0002000204F464600204F4E002042595041F6
@@ -842,7 +842,7 @@
:1034900070653A004E6F2073746F726564207661B8 :1034900070653A004E6F2073746F726564207661B8
:1034A0006C756573202D2064656661756C743A20B7 :1034A0006C756573202D2064656661756C743A20B7
:1034B00000536176656420455441473A0053657472 :1034B00000536176656420455441473A0053657472
:1034C00020455441473A20002104E30011241FBE47 :1034C00020455441473A20008D01610411241FBE5C
:1034D000CFEFD1E2DEBFCDBF00E00CBF19E0A0E02E :1034D000CFEFD1E2DEBFCDBF00E00CBF19E0A0E02E
:1034E000B2E0E4E3FFE902E00BBF02C007900D92F7 :1034E000B2E0E4E3FFE902E00BBF02C007900D92F7
:1034F000A63CB107D9F720E1A6ECB9E001C01D92C6 :1034F000A63CB107D9F720E1A6ECB9E001C01D92C6
@@ -8825,8 +8825,8 @@
:10276000662329F06150FC0182819381F7CF08959F :10276000662329F06150FC0182819381F7CF08959F
:10277000CF92DF92EF92FF92DC011196EC911197CC :10277000CF92DF92EF92FF92DC011196EC911197CC
:10278000EF70EC3098F4F0E08827E653FC4E8E4F63 :10278000EF70EC3098F4F0E08827E653FC4E8E4F63
:102790000D945E47CB01F701F701A101A101A10151 :102790000D945E47A102EF01EF013B023B023B02B9
:1027A000C7018102A101A101A102A1028FEF9FEF48 :1027A000E30239023B023B02C102C1028FEF9FEFFD
:1027B000FF90EF90DF90CF90089514968D919D91AA :1027B000FF90EF90DF90CF90089514968D919D91AA
:1027C0000D90BC91A02DB7FD4FC085369105A10598 :1027C0000D90BC91A02DB7FD4FC085369105A10598
:1027D000B10574F384E690E0A0E0B0E0E9CF149690 :1027D000B10574F384E690E0A0E0B0E0E9CF149690
@@ -9000,9 +9000,9 @@
:10325000FC01828193810097D9F773836283DB013C :10325000FC01828193810097D9F773836283DB013C
:103260001596FC93EE9314970895853108F09BC052 :103260001596FC93EE9314970895853108F09BC052
:10327000E82FF0E08827E05CF64E8E4F0D945E4715 :10327000E82FF0E08827E05CF64E8E4F0D945E4715
:103280003903F902F902DB01F902F902F902F90244 :103280004302F501F5012F02F501F501F501F50104
:10329000F902F902CD033B0159047D033902F90219 :10329000F501F5016F02D701A9031F037501F501BF
:1032A000C300F9026F01F902D50188E090E00F94A4 :1032A000BB03F5017101F501AD0388E090E00F94D7
:1032B000913CFC01138212821582148217821682BD :1032B000913CFC01138212821582148217821682BD
:1032C00084E794E0918380832CC088E090E00F94A1 :1032C00084E794E0918380832CC088E090E00F94A1
:1032D000913CFC011382128215821482178216829D :1032D000913CFC011382128215821482178216829D
@@ -9041,8 +9041,8 @@
:1034E000BF92CF92DF92EF92FF920F931F93CF93F1 :1034E000BF92CF92DF92EF92FF920F931F93CF93F1
:1034F000DF936115710519F490E080E0D4C0DB0121 :1034F000DF936115710519F490E080E0D4C0DB0121
:103500001896EC911897EF70E830B0F7EC01F0E006 :103500001896EC911897EF70E830B0F7EC01F0E006
:103510008827E257F54E8E4F0D945E47D900010182 :103510008827E257F54E8E4F0D945E479701B9010B
:103520004D043B021D02650389014D0462EA79E006 :10352000F90313022B033F042F04F90362EA79E045
:10353000CE01DF91CF911F910F91FF90EF90DF901F :10353000CE01DF91CF911F910F91FF90EF90DF901F
:10354000CF90BF90AF909F908F900C94E8EE19961B :10354000CF90BF90AF909F908F900C94E8EE19961B
:103550008C9167EA79E0882359F36DEA79E0E8CF46 :103550008C9167EA79E0882359F36DEA79E0E8CF46
@@ -9209,7 +9209,7 @@
:103F6000E40B0895883008F051C0E82FF0E0EE0F20 :103F6000E40B0895883008F051C0E82FF0E0EE0F20
:103F7000FF1FEE5CFD4F718360838150873058F5E1 :103F7000FF1FEE5CFD4F718360838150873058F5E1
:103F8000E82FF0E08827E853F04E8E4F0D945E47FF :103F8000E82FF0E08827E853F04E8E4F0D945E47FF
:103F9000E9034303150369025F014B029D0280910F :103F90004B038901FD012D0463011704FF0180918A
:103FA0006900836080936900E89A089580916900B0 :103FA0006900836080936900E89A089580916900B0
:103FB0008C6080936900E99A08958091690080631C :103FB0008C6080936900E99A08958091690080631C
:103FC00080936900EA9A089580916900806C8093DB :103FC00080936900EA9A089580916900806C8093DB
@@ -9311,9 +9311,9 @@
:1045C000978162EC79E00F94F712009739F0FC01C3 :1045C000978162EC79E00F94F712009739F0FC01C3
:1045D00020852F70223011F090E080E00895815006 :1045D00020852F70223011F090E080E00895815006
:1045E000823108F05AC0E82FF0E08827E550FD4DF1 :1045E000823108F05AC0E82FF0E08827E550FD4DF1
:1045F0008E4F0D945E47E100BD013B033D01770303 :1045F0008E4F0D945E47590149034704190457042F
:104600005D016F03790223035B02C901610173023B :10460000D700D10145020D0309037D02DD01BB0185
:1046100091035D011B02B502E502809180008F7756 :104610007701D700C302CB03DF02809180008F7740
:10462000809380000895809180008F7DF9CF8091E4 :10462000809380000895809180008F7DF9CF8091E4
:104630008000877FF5CF84B58F7784BD089584B5DA :104630008000877FF5CF84B58F7784BD089584B5DA
:104640008F7DFBCF8091B0008F778093B00008956D :104640008F7DFBCF8091B0008F778093B00008956D
@@ -9340,9 +9340,9 @@
:10479000209739F460E0812FDF91CF911F910D9424 :10479000209739F460E0812FDF91CF911F910D9424
:1047A0005623CF3FD10511F461E0F5CFE12FF0E0C2 :1047A0005623CF3FD10511F461E0F5CFE12FF0E0C2
:1047B000E95FFC4CE491E150E23108F0B3C0F0E075 :1047B000E95FFC4CE491E150E23108F0B3C0F0E075
:1047C0008827EA51FC4D8E4F0D945E471103EF038D :1047C0008827EA51FC4D8E4F0D945E47150419025F
:1047D000B301C500290199034D0351024103190397 :1047D00021025B03270189023F02BD010B04810115
:1047E000FD00B500F500050299036B018F017B0305 :1047E0003503950349029B0289020104AF012304AA
:1047F00084B5806884BDC7BDDF91CF911F910895B6 :1047F00084B5806884BDC7BDDF91CF911F910895B6
:1048000084B5806284BDC8BDF7CF80918000806888 :1048000084B5806284BDC8BDF7CF80918000806888
:1048100080938000D0938900C0938800EDCF809171 :1048100080938000D0938900C0938800EDCF809171
@@ -9556,10 +9556,10 @@
:10551000DB016C91262768E070E0D901A170BB2700 :10551000DB016C91262768E070E0D901A170BB2700
:1055200036952795AB2B21F0B1E02B27B0EA3B272E :1055200036952795AB2B21F0B1E02B27B0EA3B272E
:105530006150710991F7EF5FE3CFE150E731F8F483 :105530006150710991F7EF5FE3CFE150E731F8F483
:10554000F0E08827E955F54D8E4F0D945E477F01B9 :10554000F0E08827E955F54D8E4F0D945E47F10345
:105550007F017F017F01CD01CD01F900F900F90044 :10555000F103F103F1039F029F02F901F901F9013F
:10556000F900F900F900F900F900CD01CD01F900C9 :10556000F901F901F901F901F9019F029F02F9011D
:10557000F900F900F900F90017027F01FB800F9490 :10557000F901F901F901F9012501F103FB800F940B
:10558000C927681979098A099B09613D7740810516 :10558000C927681979098A099B09613D7740810516
:10559000910508F4A7CF82EE77CFB5E0FB2EEFCFD1 :10559000910508F4A7CF82EE77CFB5E0FB2EEFCFD1
:1055A000A3E0FA2EECCF8A81853038F4833038F4CA :1055A000A3E0FA2EECCF8A81853038F4833038F4CA
@@ -10756,9 +10756,9 @@
:10A00400E767ABA4E842E9E5EBFFE83BE954680005 :10A00400E767ABA4E842E9E5EBFFE83BE954680005
:10A0140000000029E935E767ABA4E842E901EBFF5A :10A0140000000029E935E767ABA4E842E901EBFF5A
:10A02400E83BE95468020003001500140013001211 :10A02400E83BE95468020003001500140013001211
:10A034000001005E0000000000000088E92D0467B4 :10A034000001005E0000000000000088E9A3026740
:10A04400AB32E771E93CFD4CFC4701EDFFC3034330 :10A04400AB32E771E93CFD4CFC0304EDFF6F03D335
:10A0540002AB03D50266FD1DFDB2E9A2E99EE95EED :10A0540002B1037B0366FD1DFDB2E9A2E99EE95E40
:10A0640000BC0077010000000000B3E835E767ABEF :10A0640000BC0077010000000000B3E835E767ABEF
:10A07400A4E8F1E8D0E8FFE83BE9546801020201F2 :10A07400A4E8F1E8D0E8FFE83BE9546801020201F2
:10A0840001080000080108020100000000020000AD :10A0840001080000080108020100000000020000AD
@@ -10784,9 +10784,9 @@
:10A1C4004C4843330000000000F8E735E77BE745DF :10A1C4004C4843330000000000F8E735E77BE745DF
:10A1D400E8ACE78AE79EE7000000009AEA6DEA67C8 :10A1D400E8ACE78AE79EE7000000009AEA6DEA67C8
:10A1E400AB32E766EA53EA44EA00000000E9EAC950 :10A1E400AB32E766EA53EA44EA00000000E9EAC950
:10A1F400EA67AB33E700000000CDE9070267ABCCA8 :10A1F400EA67AB33E700000000CDE9910267ABCC1E
:10A20400E9A7FC85FF64FC63014D0181FFEF019F19 :10A20400E9A7FC85FF64FC7103450381FFE5036B4B
:10A2140003C4E9EFE9EDE9B9E9E3E900000000F27C :10A2140002C4E9EFE9EDE9B9E9E3E900000000F27D
:10A22400AD35E767AB32E77CAB6AAB11AEBDAB9C37 :10A22400AD35E767AB32E77CAB6AAB11AEBDAB9C37
:10A23400ABBBE60CACB9ABA6AB00000000401B35D1 :10A23400ABBBE60CACB9ABA6AB00000000401B35D1
:10A24400E767AB551B0000000057F07069640073AA :10A24400E767AB551B0000000057F07069640073AA

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1 @@
../tools/mac/arduinoOTA -v -address 192.168.11.207 -port 80 -username arduino -password password -sketch firmware.bin -upload /sketch -b ../tools/arduinoOTA -address 192.168.11.162 -t 120 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1 @@
arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin arduinoOTA -address 192.168.11.162 -t 60 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin

View File

@@ -1 +1 @@
../tools/mac/arduinoOTA -address 192.168.11.208 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin ../tools/arduinoOTA -address 192.168.11.162 -t 60 -port 80 -username arduino -password password -b -upload /sketch -sketch firmware.bin

Binary file not shown.

View File

@@ -1,3 +1,3 @@
export PORT=cu.usbmodem142401 export PORT=cu.usbmodem11301
echo . | stty -f /dev/$PORT speed 1200 echo . | stty -f /dev/$PORT speed 1200
../tools/mac/tool-bossac/bossac -U false -p $PORT -i -w -v -b firmware.bin -R ../tools/mac/tool-bossac/bossac -U false -p $PORT -i -w -v -b firmware.bin -R

Binary file not shown.

View File

@@ -20,125 +20,125 @@
:100130000000803F0000000000084178D3BB4387E7 :100130000000803F0000000000084178D3BB4387E7
:10014000D1133D190E3CC3BD4282AD2B3E68EC82FB :10014000D1133D190E3CC3BD4282AD2B3E68EC82FB
:1001500076BED98FE1A93E4C80EFFFBE01C4FF7F80 :1001500076BED98FE1A93E4C80EFFFBE01C4FF7F80
:100160003F00000000000D94EC1F0C9450240C94F0 :100160003F00000000000C945E660C9472FE0C943C
:100170004ACB0C9485230C942DCB0C94C0760C9414 :10017000B1A90C941A3D0C948D540C94AF9E0C9420
:100180001C3D0D943F020C944CB50C9483A90C9427 :100180002FA50C94DC310D9416230D94B9200C94FA
:100190007DAD0C94061B0D94B1090C94BD570C94C5 :100190008D280C94B9480C94166A0C94CEF70D94E3
:1001A00014670C9468F20C9457A90C94817A0C94FF :1001A00036020C94B02E0C94352D0C9442F80C941D
:1001B000DA1C0D9432020C940FF90C94DD320C947D :1001B0005DFE0C94A87A0D9425030C94ABB00C94BE
:1001C000A17A0C9488CD0D941E210C9487AD0C94CB :1001C0006AC50C9435710C9408AA0C94EEA70C9493
:1001D000A1540D941E020D9400370C94ADF20C94B2 :1001D00083A90C94FF1A0C9458CD0C94577D0C9461
:1001E0000CF80C94FC1A0D9440020C94D61C0C9440 :1001E00079FE0C94735E0D9474200C9477F20D9448
:1001F000EEA70C94EDAD0C945D220C94997A0C94BE :1001F000F2020C94CE7A0C94C77A0C941B7C0C946B
:100200007B690C94C1F90D94C7330C94ED700D9477 :10020000066E0C94B7BA0C94E8AE0C9420F90C94DA
:100210003A020C94D9690C94E4A50C945FAC0C944C :10021000682C0C94A9CA0C94CCE10D942C020C947B
:10022000C6AD0C94ECF70C94C77A0C94FB480D9473 :1002200032DE0C94D41C0C940CF80C9431C50C9454
:1002300036020C9472BA0C9467790C94855D0C9418 :10023000FFA80D9480380C9450240C9484B00C9436
:10024000D81C0C944FF20C94221D0C9413A60D9400 :100240007FE20C94F3420C94E4A70C9447AD0C9419
:100250008F3F0C94E7960C94167B0D9444020C94FB :10025000F0310C94814B0C946C860C94B3E10C94AB
:10026000B3E10C94F8A50C9479FE0C9493E10C94F2 :10026000929E0D94A8470C9402700C949BCB0C9416
:1002700049660C949B310C94352D0C9460BA0C9407 :100270001A8E0C94C2BA0C9454700D945C030D94B5
:100280001CE10C94801C0D9438200C947C1C0D9463 :100280001D030C947BCB0C94DCA50C940A7A0D9482
:10029000EA200C9400B80C94577D0C943B1C0C94F1 :1002900014020C943FE00C9461DE0D9468370C94CA
:1002A000C4BA0C947A1C0D94C31E0C9441700C9427 :1002A000C6AD0D9409200D94D3200C94A1540C9448
:1002B0004FFE0C943BA60C94D8790C947FE20C94DE :1002B0008CB00D940D020C9408B80C9460A40C94AE
:1002C000BF2C0C948FD20C94AF3C0C940A7A0C94F3 :1002C000761C0C942FDE0C942DDD0C949AAD0C94BE
:1002D00072A90C9459CB0C94F75C0D94DF330C94F9 :1002D0002DA70C944BAD0D946E1E0C9495D20C94DE
:1002E0009AAC0C94A9CA0C94CB690C94CCA20C9433 :1002E00085BA0D944A380C9417330C942E6F0C94E5
:1002F0000B7B0D94F2310C9480AC0C9408B80C94E8 :1002F000061B0C94C2690C94ADAC0C944CB50C94D8
:10030000D8490C94EBCA0C94CD260C945EA60C94A0 :100300005A290C9400310C949AA80C94B11B0C94AB
:10031000CEF70C9448AD0C94CF5D0C94AA5D0C9470 :1003100044BA0D941A220C94F5740C94A6B80C945B
:10032000C2BA0C94DD7C0D94D9370D94B7340C947B :100320004FF20C94461C0C9438F80C94B1A60C9423
:10033000B9DD0C942A6F0C94FF1A0C94929E0C94C5 :100330006DDD0D9420210C94D21C0D941A020C94A6
:10034000F0310D947A030D94FF010C94A0AD0D943F :100340003EDE0C946BFE0D94FD200C9498A80C944A
:1003500066030D942F030C9457BA0C941DB40C949F :10035000CCA20C9493790C9480AC0D94DD1F0C947A
:10036000DEF70C9441470C94C6220C9424F80D94AB :1003600016F80D9440020C94AE3C0C94EB220D94C4
:10037000D71E0C9439280C9425A60C94F69E0C9448 :10037000E1340D9498340C948A7A0D941E210C94D7
:10038000461C0C94AE3C0C94EB220C94275E0C940F :10038000ADF20C94737D0C94217B0C9457BA0C94B1
:10039000761C0C94B7BA0C94F3420C94843F0C94E2 :10039000F3BA0D946B1E0D94EA020C9465CA0C948A
:1003A00028CA0C94FAF70C947EA90D9470030C944F :1003A00073E00C94A7E20C9431270D94E51E0C9495
:1003B000CFA70D94DA3B0D9414210C946FA80C94E4 :1003B00041700C944FDE0C9460BA0C942A490D9451
:1003C000CA3F0C94B1A60C94C2690C941C250C94E1 :1003C0006D1E0C94D8790C9466280C949EEB0D94B9
:1003D000771F0C9494B60D94E51E0D945C030C9459 :1003D000FC360C940A4E0C94416F0C940E320C9423
:1003E0004DBA0C949CA60C943CE10C94BB530C9419 :1003E000FAF90C949A790C94B03C0D942A200C9450
:1003F0000A4E0C9473E00C94DC1C0C94097C0D9454 :1003F000B3AD0D94FA210C9443AD0C94C1F90C9457
:1004000062200C949A790C94ADAC0D941A020D9460 :10040000EC1B0C941B3D0D94F7020C94576D0C944F
:10041000FD200C9432DE0C94165E0C947D3C0C9402 :10041000999E0C94ADBA0D9470030C948FD20C94E9
:10042000A31B0C943E310C9448A60D94B4090D9472 :100420003BAD0C944FFE0D94D2270D943F020C94DB
:10043000AA200C94D9C50C9431270D9498340C94AF :10043000A8CB0D94D9370D9414210C94C6220C949A
:100440002EF80C9406B70D94CF200C94D41C0D9468 :10044000064C0C94FAF70C94CF2F0C94CA3F0C94E2
:1004500011020D9414020C9431C50C94FAF90C9409 :1004500072BA0D94B1090D9444020C949DE00C9471
:10046000B13C0C948CB00C9404500C9417330C9445 :10046000D81C0C94167B0C9429F90C943F5E0C94C8
:1004700052A40C943FE00C949AA80C9479E20C944A :10047000B9DD0C9498CB0C94723D0C94801C0C94B8
:10048000635D0C94EAAE0C940FC60C949DE00D9441 :10048000BD570C94997A0C94266F0C945D4C0C9487
:10049000F2370C945DFE0D94FC360C940E2C0C94EB :10049000CB690D9432020C94334C0D948F3F0C9425
:1004A000682C0C9491A90D949E210C94E1B90C94A4 :1004A00000B80C9408670C94B3A90C9452A40C9453
:1004B000066E0D9484210C943F5E0D94B9200C942B :1004B00014670C943E310C94F69E0C94511C0C94D1
:1004C000C6490D94DD1F0C94CCE10C949EB30C94A2 :1004C000CC2C0C9437AD0C940D7A0C9456F20C9401
:1004D00008670C941B7C0D9415030D94DF3E0C945F :1004D000A17A0D94A2090C94307B0C9441470C94A2
:1004E000FDB70C945A290C94ED7C0D9473210D9456 :1004E000E9E00C948A490C9433A90C949EAD0D94C8
:1004F00016230D946C1E0C941E310C94217B0C94CD :1004F0002F030D9474210D9415030D9466030C9431
:10050000E0AD0C94CC2C0C943EDE0C9495D20C9463 :10050000B3540C94B2A70C94F9250C94E8A90C945C
:100510008A490C94EC310C947E1C0C9492DD0C9462 :10051000EAAE0C94F75C0C94BF2C0C940C1C0C945D
:1005200047B10C94EC750D94673B0C94C56B0D941E :10052000F2310D94B7340D94CB210C941E310C9400
:100530007B200D9422340C941CA50D9401030C9483 :10053000524B0C94A31B0C94C4BA0C9424DE0C9460
:10054000C3420C9444BA0D9432220D9409020C94C7 :10054000AA5D0C9424F80C9433AD0C9414A90D946A
:1005500035710C945D4C0C941A3D0C9466280C94E7 :100550007A030C943B1C0C9408330D9424020C94E5
:100560003C7D0C94E8A90C946DDD0C94B11B0C94AB :1005600048A60C9447B10D94E8260D9428020C94EB
:10057000EBB30D9443030C943A9D0D94D3200D944A :100570007EA90C945FAC0C9497A70C943CE10C946E
:100580002A200C94064C0C9402700C94AC310C9400 :10058000A6DD0C94CF320C9457A90C948BA80C9434
:100590002FAD0C945C310D9439030C94BAA80D94D2 :10059000771F0D94EC1F0C9491B60C9488CD0C949D
:1005A000D2270C94B2A70C94381C0C9443AD0C9435 :1005A0001C250C949AAC0C94F73D0C94EC310D94F2
:1005B00091B60C945ACD0C9473540D94EA020C9499 :1005B00022340C944CF80D94A3090C94C56B0C9444
:1005C000712C0C9433AD0C94EC1B0C9408330C94EC :1005C000CCA70D9432220C94E0AD0C9496F20C94CE
:1005D000FFA80C940DB70D9474210C9477F20C9431 :1005D0006FA80D9493470C94ECF70D94C31E0C94E4
:1005E0009BCB0D944A380C9440F90C94F2310D9445 :1005E000635D0C94C3420C940B7B0D9427380C94E0
:1005F000B41E0C94A87A0C9447AD0C9403B80C94D8 :1005F000ADE20D94673B0D94F5200C947A1C0C949D
:10060000F4310C94723D0C946A630D9493470D94ED :100600005EA60D9438200C9404500C9449660C940A
:10061000F7020C942DDD0C940C1C0C948A7A0C942B :10061000D47A0C94FB480C94D9C50C94ED700C94CE
:1006200029F90C9416F80C94694B0D940B030C9457 :10062000CB1B0D94F2310D94AA200C94EC7A0C940F
:100630006AC50D947E1F0C9456F20D941B3F0D94C9 :10063000712C0C94707C0C94ED7C0D94E3200D9443
:100640006D1E0D9497210C94ECA80C94DC310C9445 :10064000FE200C945D220C94DD7C0C94BAA80C94D2
:100650002FDE0C94737D0C949AAD0C9486D20D947D :100650006A630C940E2C0C947C1C0C94FDB70C94C7
:10066000E1340C943CB40D9452030C9454700D94EA :100660001DB40C948F220D94EA200C9439280C941C
:100670001D030C94CF320C9465CA0D94E3200D94A5 :100670007DAD0C94DA1C0C945ACD0C942A6F0C941A
:1006800020210C94A8CB0C942FA50C94166A0C94E2 :10068000AF3C0C9441DE0C943C7D0C947B690C9443
:10069000C5860C94B3AD0C9442F80C94CF2F0C94F7 :10069000165E0D941E020C94DD320C9459A80D9434
:1006A0007BCB0D9424020C944BAD0C9438F80C9435 :1006A000DA3B0C941CA50C945DAD0C94D8490C94C9
:1006B00042C60D9474200C9455E10D941A220C94AA :1006B00091A90C940FF90C94BB530C9472A90C944F
:1006C0003DA90C948BA80C94E8420C94E8AE0D94D0 :1006C0004CDE0C949AB60C94CFA70C94843F0C94F7
:1006D000B2380C94D21C0C94266F0C9459A80C942C :1006D000C5320C94A0AD0D9411020C94FC1A0C942C
:1006E00084B00C9460A40C94F73D0C9437AD0C943A :1006E000694B0D947E1F0C940DB70C949CA60C9432
:1006F00096F20C94CB1B0C9464A90D94A3090D9451 :1006F000EBCA0C9479E20C94006A0C9448AD0C940B
:1007000028020C94814B0C9420F90C94D47A0C940C :10070000F25D0C9406B70C9428CA0C94D61C0C9479
:1007100048FE0C946BFE0C944CDE0C94F17B0C9414 :10071000E8420C94C6490C94CD260C9492DD0C94BE
:10072000A7E20C94A6DD0C9485E20C94C5320C94DF :1007200040F90D9473210D94F2370C9485230D94A8
:10073000707C0D94FA210C94999E0C94DCAD0C9471 :1007300075210C94DEF70C9493E10D94311F0C9409
:100740009EAD0C94A6B80C94576D0D94A2090C9410 :1007400003B80C943CB40C943A9D0C94EDAD0D940C
:10075000524B0D9409200D9425030D946B1E0C949F :1007500009020C94C81B0D9405020C9448FE0C94DD
:100760009EEB0C94B3A90C94F94A0C94CAA80C946F :1007600013A60C942FAD0C94381C0C94E7960C94A3
:10077000CE7A0C941A8E0C94511C0C9472FE0C942C :10077000B8300D9452030C9485E20C943BA60C9473
:10078000F5740C9458CD0D94CB210C9408AA0C94BC :10078000CF5D0C94817A0D9484210C9467790D943B
:10079000416F0C94B1A90C940E320C9456FE0C943B :10079000DF330D9401030C94097C0C94ECA80D94A8
:1007A000C81B0C946C860C948D280C94B3540C9438 :1007A000CF200C94E4A50C9455540C9459CB0C9484
:1007B0001B3D0C942E6F0D94F5200C9498CB0C944B :1007B0007E1C0D940B030D94B4090C941C3D0D94F8
:1007C0000D7A0C943FAD0C94CD7B0C9499BA0C949B :1007C000FF010C9473540C94781C0C945C310C94C1
:1007D000307B0C94ADBA0C9400310C94FAB70D94A4 :1007D000377B0C94855D0D94C7330C94275E0C9485
:1007E00068370C942DA70C94E9E00C94F3BA0C94A0 :1007E0001CE10C9494B60C94F8A50C940FB20C94E4
:1007F00024DE0C94F7B70C9485BA0D942C020C945B :1007F000AC310C9456FE0C94DD7A0C9499BA0C949E
:1008000093790D940D020C94B8300C945DAD0C945A :100800003DA90C9403670C9468F20C94EBB30C9420
:10081000F25D0D94E8260C94AF9E0C942A490C943A :10081000941B0D9439030D9484030C942DCB0C94EC
:100820004FDE0C948D540C94ABB00C94B03C0C94F3 :10082000221D0D941B3F0D94D71E0C94EC750C9457
:100830003BAD0C94F9250C9403670C94334C0C9449 :100830009EB30C94FAB70C94DC1C0C943FAD0D9451
:1008400097A70C94ADE20D9475210C94DCA50C9443 :100840003A020D947B200C9464A90D9497210C948A
:10085000B02E0D94F2020C949AB60C9414A90C9438 :10085000B13C0C9455E10C94F17B0D9462200D9405
:10086000E4A70C94DD7A0C94CCA70C94735E0C94E2 :10086000B41E0C9487AD0C944ACB0C944DBA0C94E6
:10087000006A0D9405020C948F220C94941B0C9426 :100870009B310C94C5860C940FC60C9442C60C9404
:100880000FB20D946E1E0C9498A80C9455540D94B0 :10088000F4310D9400370C94AFF90D949E210D9422
:10089000FE200D94A8470D94311F0C945E660C94B5 :10089000B2380D94DF3E0C9486D20D9443030D9430
:1008A0004CF80C94EC7A0D9480380D9484030C94DD :1008A0006C1E0C94CD7B0C942EF80C94DCAD0C9447
:1008B00061DE0C9441DE0C94B9480D9427380C94F9 :1008B000CAA80C947D3C0C94F7B70C94D9690C949D
:1008C000AFF90C94781C0C94377B0C9433A94E41EF :1008C000F94A0C94E1B90C9425A60C94C0764E41DB
:1008D0004E494E495459494E46CDCCCC3D0AD723BA :1008D0004E494E495459494E46CDCCCC3D0AD723BA
:1008E0003C17B7D13877CC2B329595E6241FB14F02 :1008E0003C17B7D13877CC2B329595E6241FB14F02
:1008F0000A000020410000C84200401C4620BCBE47 :1008F0000A000020410000C84200401C4620BCBE47
@@ -434,8 +434,8 @@
:101B1000636F6C6F7200302D32353500696E7465FD :101B1000636F6C6F7200302D32353500696E7465FD
:101B200067657200666C6F617400332E302E310071 :101B200067657200666C6F617400332E302E310071
:101B300024686F6D696500757074696D652C6672D7 :101B300024686F6D696500757074696D652C6672D7
:101B400065656865617000303864656436325F329F :101B400065656865617000343063316663615F327A
:101B50003032362D30312D3039004C696768744889 :101B50003032362D30312D3130004C696768744891
:101B600075622000246E616D6500526562696E6465 :101B600075622000246E616D6500526562696E6465
:101B700020737563636573732E204950206164641C :101B700020737563636573732E204950206164641C
:101B8000726573733A004572726F723A20726562C1 :101B8000726573733A004572726F723A20726562C1
@@ -622,8 +622,8 @@
:1026D0007A79686F6D652E7275000A436F6E666950 :1026D0007A79686F6D652E7275000A436F6E666950
:1026E00067207365727665723A003230313130336B :1026E00067207365727665723A003230313130336B
:1026F0004C0020432B2B2076657273696F6E3A0075 :1026F0004C0020432B2B2076657273696F6E3A0075
:10270000303864656436325F323032362D30312DE8 :10270000343063316663615F323032362D30312DC3
:102710003039000A4C617A79686F6D652E727520C8 :102710003130000A4C617A79686F6D652E727520D0
:102720004C6967687448756220636F6E74726F6C71 :102720004C6967687448756220636F6E74726F6C71
:102730006C65722000204F464600204F4E0020421C :102730006C65722000204F464600204F4E0020421C
:10274000595041535300536176656420746F20459E :10274000595041535300536176656420746F20459E
@@ -854,8 +854,8 @@
:10355000207A6F6E652D0020416C61726D20457878 :10355000207A6F6E652D0020416C61726D20457878
:1035600070697265640A0020636D643A00204375D7 :1035600070697265640A0020636D643A00204375D7
:10357000723A00205365743A002054696D65723ABE :10357000723A00205365743A002054696D65723ABE
:1035800000204C6F636B733A0052414D3D0049047B :1035800000204C6F636B733A0052414D3D00310196
:10359000050311241FBECFEFD1E2DEBFCDBF00E097 :10359000E90211241FBECFEFD1E2DEBFCDBF00E0B4
:1035A0000CBF1AE0A0E0B2E0E6E5FAEC02E00BBFE7 :1035A0000CBF1AE0A0E0B2E0E6E5FAEC02E00BBFE7
:1035B00002C007900D92AC36B107D9F722E1ACE614 :1035B00002C007900D92AC36B107D9F722E1ACE614
:1035C000BAE001C01D92AE3AB207E1F71AE1C8ECC9 :1035C000BAE001C01D92AE3AB207E1F71AE1C8ECC9
@@ -4426,7 +4426,7 @@
:1014800090E10F944E288091931190919411892BA3 :1014800090E10F944E288091931190919411892BA3
:1014900009F447CF8091871190918811892B09F029 :1014900009F447CF8091871190918811892B09F029
:1014A000E2C083E190E00F9400538C018091891198 :1014A000E2C083E190E00F9400538C018091891198
:1014B00090918A112DEA33E0F801328B218B9683CB :1014B00090918A1129EC31E0F801328B218B9683CF
:1014C00085831482108289E0818381E08283838313 :1014C00085831482108289E0818381E08283838313
:1014D00010938811009387110F94AD066B017C0166 :1014D00010938811009387110F94AD066B017C0166
:1014E000F0E1CF0EF7E2DF1EE11CF11CD8011596EA :1014E000F0E1CF0EF7E2DF1EE11CF11CD8011596EA
@@ -4678,8 +4678,8 @@
:102440000F942A280E948F3AAB01BC012AE030E0A9 :102440000F942A280E948F3AAB01BC012AE030E0A9
:1024500088E290E10F94D92688E290E10F94BE269D :1024500088E290E10F94D92688E290E10F94BE269D
:1024600064E670E080E090E00F94BB048CE696E8B0 :1024600064E670E080E090E00F94BB048CE696E8B0
:10247000D7011E969C938E931D9769E074E089E7BF :10247000D7011E969C938E931D9763EB72E081E1CA
:1024800091E00F9443568C01892B09F4EEC083E050 :1024800093E00F9443568C01892B09F4EEC083E04E
:1024900090E00F940053F80195878487DC01119632 :1024900090E00F940053F80195878487DC01119632
:1024A000FC92EE9212961C92C7010F942738882353 :1024A000FC92EE9212961C92C7010F942738882353
:1024B00019F0C7010F94DF3EF70161897289A38883 :1024B00019F0C7010F94DF3EF70161897289A38883
@@ -8130,8 +8130,8 @@
:10FC00001D0789F78091860D9091870D0F94FD4215 :10FC00001D0789F78091860D9091870D0F94FD4215
:10FC1000882339F082E090E0DF91CF911F910F911E :10FC1000882339F082E090E0DF91CF911F910F911E
:10FC2000089590E080E0F8CF1092D80B1092D70B97 :10FC2000089590E080E0F8CF1092D80B1092D70B97
:10FC30001092260C1092250C0F946D4185E792E0EE :10FC30001092260C1092250C0F946D4181E993E0EF
:10FC40009093D60B8093D50B8BEE92E09093D40BD0 :10FC40009093D60B8093D50B89E792E09093D40BD9
:10FC50008093D30B0895883008F051C0E82FF0E06E :10FC50008093D30B0895883008F051C0E82FF0E06E
:10FC6000EE0FFF1FE45DFD4F71836083815087308D :10FC6000EE0FFF1FE45DFD4F71836083815087308D
:10FC700058F5E82FF0E08827EF5BF1408F4F0D94A7 :10FC700058F5E82FF0E08827EF5BF1408F4F0D94A7
@@ -8253,9 +8253,9 @@
:1003A00011F48681978169EF79E00E9470F10097DE :1003A00011F48681978169EF79E00E9470F10097DE
:1003B00039F0FC0120852F70223011F090E080E0B0 :1003B00039F0FC0120852F70223011F090E080E0B0
:1003C00008958150823108F05AC0E82FF0E0882764 :1003C00008958150823108F05AC0E82FF0E0882764
:1003D000E351FE4F8E4F0D94EF5C01042702A30101 :1003D000E351FE4F8E4F0D94EF5C59016B03DF0329
:1003E0003904A502C10029020502E90051037F0377 :1003E000AB03A703150247019D014903AD02B50206
:1003F000FD03D9001701C1000701F3002D01809111 :1003F0000D014902CF0015021F04B1012B028091AB
:1004000080008F77809380000895809180008F7D99 :1004000080008F77809380000895809180008F7D99
:10041000F9CF80918000877FF5CF84B58F7784BD39 :10041000F9CF80918000877FF5CF84B58F7784BD39
:10042000089584B58F7DFBCF8091B0008F77809346 :10042000089584B58F7DFBCF8091B0008F77809346
@@ -8283,9 +8283,9 @@
:100580001F910D944802CF3FD10511F461E0F5CFE2 :100580001F910D944802CF3FD10511F461E0F5CFE2
:10059000E12FF0E0E95FFE4CE491E150E23108F038 :10059000E12FF0E0E95FFE4CE491E150E23108F038
:1005A000B3C0F0E08827E852FD4F8E4F0D94EF5C0A :1005A000B3C0F0E08827E852FD4F8E4F0D94EF5C0A
:1005B000DD02290407039D02150355046B0237036E :1005B000CB01F7000302C903D9030B047B023F01FF
:1005C000AB03A901CB02B9023303ED015504A70126 :1005C000DB00770209044D04B9033D010B047D02F1
:1005D000D501A10184B5806884BDC7BDDF91CF91ED :1005D0000B02A70284B5806884BDC7BDDF91CF91AF
:1005E0001F91089584B5806284BDC8BDF7CF809106 :1005E0001F91089584B5806284BDC8BDF7CF809106
:1005F0008000806880938000D0938900C093880039 :1005F0008000806880938000D0938900C093880039
:10060000EDCF80918000806280938000D0938B003A :10060000EDCF80918000806280938000D0938B003A
@@ -8497,10 +8497,10 @@
:1012E00070E0D901A170BB2736952795AB2B21F073 :1012E00070E0D901A170BB2736952795AB2B21F073
:1012F000B1E02B27B0EA3B276150710991F7EF5F0E :1012F000B1E02B27B0EA3B276150710991F7EF5F0E
:10130000E3CFE150E731F8F4F0E08827E557F64FF6 :10130000E3CFE150E731F8F4F0E08827E557F64FF6
:101310008E4F0D94EF5CA503A503A503A50315024D :101310008E4F0D94EF5C6902690269026902DB037A
:1013200015027D037D037D037D037D037D037D0326 :10132000DB03DB02DB02DB02DB02DB02DB02DB02D4
:101330007D03150215027D037D037D037D037D037F :10133000DB02DB03DB03DB02DB02DB02DB02DB02C3
:10134000CB00A503FB800F94AD06681979098A09C3 :1013400029026902FB800F94AD06681979098A09A0
:101350009B09613D77408105910508F4A7CF82EE96 :101350009B09613D77408105910508F4A7CF82EE96
:1013600077CFB5E0FB2EEFCFA3E0FA2EECCF8A814A :1013600077CFB5E0FB2EEFCFA3E0FA2EECCF8A814A
:10137000853038F4833038F4813008F03FC080E0A5 :10137000853038F4833038F4813008F03FC080E0A5
@@ -11432,10 +11432,10 @@
:06CA5000A9F7F894FFCFE6 :06CA5000A9F7F894FFCFE6
:10CA5600FFFF0A000000000001014D015AFFFF0A16 :10CA5600FFFF0A000000000001014D015AFFFF0A16
:10CA6600000000000001014D035CFFFF0A0000000A :10CA6600000000000001014D035CFFFF0A0000000A
:10CA7600000001014D025B02E00000FB1F031F03E3 :10CA7600000001014D025B02E00000FBDF01DF0167
:10CA86001F031F031F031F031F031F0303100000C1 :10CA8600DF01DF01DF01DF01DF01DF01031000004D
:10CA9600C001200007070000AE1280000100000060 :10CA9600C001200007070000AE1280000100000060
:10CAA60000000000FC1A410448AD7902941B061BE5 :10CAA60000000000FC1A6B0148AD4F04941B061BE6
:10CAB600FF1ADC1C11E5728A4C6967687448756256 :10CAB600FF1ADC1C11E5728A4C6967687448756256
:10CAC6000000000000000000000000000000000060 :10CAC6000000000000000000000000000000000060
:10CAD6000000000000000000106D61633D000000D2 :10CAD6000000000000000000106D61633D000000D2
@@ -11446,11 +11446,11 @@
:10CB26006967687468756200000000001A3DE8AE27 :10CB26006967687468756200000000001A3DE8AE27
:10CB3600C56B576D48AD48AD47AD000000001A3DC6 :10CB3600C56B576D48AD48AD47AD000000001A3DC6
:10CB4600EAAE166A066E48AD48AD47AD0000000075 :10CB4600EAAE166A066E48AD48AD47AD0000000075
:10CB5600FF01410448AD6102970277024301590380 :10CB56002D046B0148ADAD012104C3000103F300B0
:10CB6600CB6900000000FF01410448AD6102970255 :10CB6600CB69000000002D046B0148ADAD01210426
:10CB7600A30243015903CB69020003001500140008 :10CB7600E1020103F300CB69020003001500140073
:10CB8600130012000000000000B300410448AD612C :10CB8600130012000000000000C9026B0148ADADA1
:10CB960002BF02A90343015903CB69010202010145 :10CB960001F50151010103F300CB69010202010114
:10CBA6000800000801080201000000000200000061 :10CBA6000800000801080201000000000200000061
:10CBB600001B3DDA1C1733F3428D28B3ADA0ADEB55 :10CBB600001B3DDA1C1733F3428D28B3ADA0ADEB55
:10CBC600B3B830461CC6AD0FB2EC1B000000001A0D :10CBC600B3B830461CC6AD0FB2EC1B000000001A0D
@@ -11471,18 +11471,18 @@
:10CCB600AD1DB4A6B8F3BAC6AD0FB2CB1BB02E00ED :10CCB600AD1DB4A6B8F3BAC6AD0FB2CB1BB02E00ED
:10CCC600000000AF3C761CE0AD723DCD26B3ADA0B2 :10CCC600000000AF3C761CE0AD723DCD26B3ADA0B2
:10CCD600AD1DB4A6B8F3BAC6AD0FB2CB1BF9254C41 :10CCD600AD1DB4A6B8F3BAC6AD0FB2CB1BF9254C41
:10CCE60048433300000000004B044104F7021903D7 :10CCE60048433300000000009D036B012F047103CD
:10CCF600EB015301B70100000000C303530248AD26 :10CCF600D501ED021304000000009302450448AD7F
:10CD0600AD03210359022304000000005D039903CB :10CD0600C9012504C3039703000000008901F90146
:10CD160048AD79020000000047041D0348AD070234 :10CD160048AD4F04000000001F03110448ADA301F5
:10CD26009902EB006D012701D9014B026D025D04EA :10CD2600D7024104C7034D024F03E7014904F50248
:10CD3600DB033F03E3004701DB01000000008CB08A :10CD3600FB029901BD0133031B02000000008CB009
:10CD4600410448ADAD035DAD4BADABB09EAD7DAD21 :10CD46006B0148ADC9015DAD4BADABB09EAD7DADE0
:10CD56009EEBEDAD9AAD87AD00000000221D4104AB :10CD56009EEBEDAD9AAD87AD00000000221D6B0184
:10CD660048ADA31B000000005D02F10248ADAD0313 :10CD660048ADA31B00000000C500710148ADC90114
:10CD76001702950103014702EF039301670393022C :10CD760013039102EB0393034D0119024704F902D1
:10CD860053042F031D023D03BD02230200000000D1 :10CD86001901B701B9011D035301CF0300000000CB
:10CD9600CF0201005E000000DEADBEEFFEFF3031C7 :10CD9600130201005E000000DEADBEEFFEFF303183
:10CDA6003233343536373839414243444546005EDE :10CDA6003233343536373839414243444546005EDE
:10CDB60000BC007701706964007366780025642DF5 :10CDB60000BC007701706964007366780025642DF5
:10CDC6002564005350492D4C45442044652D496E39 :10CDC6002564005350492D4C45442044652D496E39

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -6882,8 +6882,8 @@
:10AE000000454550524F4D20636C65617265640A80 :10AE000000454550524F4D20636C65617265640A80
:10AE1000000A4C617A79686F6D652E7275204C69F5 :10AE1000000A4C617A79686F6D652E7275204C69F5
:10AE200067687448756220636F6E74726F6C6C65CE :10AE200067687448756220636F6E74726F6C6C65CE
:10AE3000722000303864656436325F323032362D2D :10AE3000722000343063316663615F323032362D08
:10AE400030312D30390020432B2B20766572736909 :10AE400030312D31300020432B2B20766572736911
:10AE50006F6E3A003230313130334C000A436F6E3E :10AE50006F6E3A003230313130334C000A436F6E3E
:10AE6000666967207365727665723A006C617A79FB :10AE6000666967207365727665723A006C617A79FB
:10AE7000686F6D652E7275000A282B29574154435F :10AE7000686F6D652E7275000A282B29574154435F
@@ -6983,8 +6983,8 @@
:10B450006F6465730072656164790024737461744C :10B450006F6465730072656164790024737461744C
:10B4600065002473746174730024666F726D617477 :10B4600065002473746174730024666F726D617477
:10B47000006C6967687468756200757074696D65E1 :10B47000006C6967687468756200757074696D65E1
:10B4800000303864656436325F323032362D303108 :10B4800000343063316663615F323032362D3031E3
:10B490002D3039004C6967687448756220004D6F23 :10B490002D3130004C6967687448756220004D6F2B
:10B4A000746F723A20466F726365642065786563D5 :10B4A000746F723A20466F726365642065786563D5
:10B4B0007574696F6E00556E6B6E6F776E20636D7D :10B4B0007574696F6E00556E6B6E6F776E20636D7D
:10B4C00064004D6F746F723A2074696D656F7574A6 :10B4C00064004D6F746F723A2074696D656F7574A6

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -6330,10 +6330,10 @@ Linker script and memory map
.text._ZN9Streamlog5writeEh .text._ZN9Streamlog5writeEh
0x08010474 0x20 .pio/build/stm32/src/streamlog.cpp.o 0x08010474 0x20 .pio/build/stm32/src/streamlog.cpp.o
0x08010474 Streamlog::write(unsigned char) 0x08010474 Streamlog::write(unsigned char)
.text._ZN9StreamlogC2EP14HardwareSerialhh .text._ZN9StreamlogC2EP6Streamhh
0x08010494 0x18 .pio/build/stm32/src/streamlog.cpp.o 0x08010494 0x18 .pio/build/stm32/src/streamlog.cpp.o
0x08010494 Streamlog::Streamlog(HardwareSerial*, unsigned char, unsigned char) 0x08010494 Streamlog::Streamlog(Stream*, unsigned char, unsigned char)
0x08010494 Streamlog::Streamlog(HardwareSerial*, unsigned char, unsigned char) 0x08010494 Streamlog::Streamlog(Stream*, unsigned char, unsigned char)
.text.startup._GLOBAL__sub_I_serialDebugLevel .text.startup._GLOBAL__sub_I_serialDebugLevel
0x080104ac 0x1c .pio/build/stm32/src/streamlog.cpp.o 0x080104ac 0x1c .pio/build/stm32/src/streamlog.cpp.o
.text._ZN14templateStream9availableEv .text._ZN14templateStream9availableEv

Binary file not shown.

BIN
compiled/tools/arduinoOTA_x86 Executable file

Binary file not shown.

View File

@@ -13,3 +13,4 @@ cp ../.pio/build/esp8266-wifi/firmware.bin esp8266-wifi
cp ../.pio/build/lighthub21/firmware.bin lighthub21 cp ../.pio/build/lighthub21/firmware.bin lighthub21
cp ../.pio/build/mega2560/firmware.hex mega2560 cp ../.pio/build/mega2560/firmware.hex mega2560
cp ../.pio/build/stm32/firmware.* stm32 cp ../.pio/build/stm32/firmware.* stm32
cp ../.pio/build/esp32c3-wifi/firmware.bin esp32c3-wifi

View File

@@ -2138,7 +2138,7 @@ void preTransmission() {
// set DE and RE on HIGH // set DE and RE on HIGH
PORTJ |= B01100000; PORTJ |= B01100000;
#else #else
digitalWrite(TXEnablePin, 1); if (TXEnablePin>0) digitalWrite(TXEnablePin, 1);
#endif #endif
} }
@@ -2147,7 +2147,7 @@ void postTransmission() {
// set DE and RE on LOW // set DE and RE on LOW
PORTJ &= B10011111; PORTJ &= B10011111;
#else #else
digitalWrite(TXEnablePin, 0); if (TXEnablePin>0) digitalWrite(TXEnablePin, 0);
#endif #endif
} }
@@ -2465,9 +2465,16 @@ while ((digitalRead(CONFIG_CLEAN_PIN)==LOW) && !needClean)
//set RE,DE on LOW //set RE,DE on LOW
PORTJ &= B10011111; PORTJ &= B10011111;
#else #else
pinMode(TXEnablePin, OUTPUT); if (TXEnablePin>0) pinMode(TXEnablePin, OUTPUT);
#endif #endif
#if defined (ARDUINO_ARCH_ESP32)
modbusSerial.begin(MODBUS_SERIAL_BAUD,MODBUS_SERIAL_PARAM,MODBUS_UART_RX_PIN,MODBUS_UART_TX_PIN);
#else
modbusSerial.begin(MODBUS_SERIAL_BAUD,MODBUS_SERIAL_PARAM); modbusSerial.begin(MODBUS_SERIAL_BAUD,MODBUS_SERIAL_PARAM);
#endif
node.idle(&modbusIdle); node.idle(&modbusIdle);
node.preTransmission(preTransmission); node.preTransmission(preTransmission);
node.postTransmission(postTransmission); node.postTransmission(postTransmission);
@@ -2880,7 +2887,7 @@ void loop_main() {
if (lanLoop() > HAVE_IP_ADDRESS) { if (lanLoop() > HAVE_IP_ADDRESS) {
mqttClient.loop(); mqttClient.loop();
#if defined(OTA) #if defined(OTA_ENABLE)
yield(); yield();
if (initializedListeners) ArduinoOTA.poll(); if (initializedListeners) ArduinoOTA.poll();
#endif #endif
@@ -3013,7 +3020,7 @@ void modbusIdle(void) {
#ifdef _artnet #ifdef _artnet
if (artnet && initializedListeners) artnet->read(); if (artnet && initializedListeners) artnet->read();
#endif #endif
#if defined(OTA) #if defined(OTA_ENABLE)
yield(); yield();
ArduinoOTA.poll(); ArduinoOTA.poll();
#endif #endif

View File

@@ -39,22 +39,29 @@ const char QUIET_P[] PROGMEM = "queit";
const char SWING_P[] PROGMEM = "swing"; const char SWING_P[] PROGMEM = "swing";
const char RAW_P[] PROGMEM = "raw"; const char RAW_P[] PROGMEM = "raw";
#if defined (ARDUINO_USB_CDC_ON_BOOT)
#define defaultACSerial AC_Serial
#else
#define defaultACSerial Serial
#endif
void out_AC::getConfig(){ void out_AC::getConfig(){
ACSerial=&AC_Serial; ACSerial=&AC_Serial;
if (!item) return; if (!item) return;
if (item->getArgCount()) if (item->getArgCount())
switch(portNum=item->getArg(0)){ switch(portNum=item->getArg(0)){
case 0: ACSerial=&Serial; case 0: ACSerial=&defaultACSerial;
break; break;
#if not defined (AVR) || defined (DMX_DISABLE) #if not defined (AVR) || defined (DMX_DISABLE)
case 1: ACSerial=&Serial1; case 1: ACSerial=&Serial1;
break; break;
#endif #endif
#if defined (HAVE_HWSERIAL2) || defined (__SAM3X8E__) || defined (ESP32) #if defined (HAVE_HWSERIAL2) || defined (__SAM3X8E__) // || defined (ESP32)
case 2: ACSerial=&Serial2; case 2: ACSerial=&Serial2;
break; break;
#endif #endif
@@ -346,7 +353,11 @@ if (!portNum)// && (g_APinDescription[0].ulPinType == PIO_PA8A_URXD))
disableCMD=true; disableCMD=true;
#endif #endif
} }
#if defined (AC_RX_PIN) && defined (AC_TX_PIN)
ACSerial->begin(9600,AC_RX_PIN,AC_TX_PIN); //, SERIAL_8N1, acRXpin, acTXpin
#else
ACSerial->begin(9600); ACSerial->begin(9600);
#endif
setStatus (AC_IDLE); setStatus (AC_IDLE);

View File

@@ -240,7 +240,10 @@
#define AC_Serial Serial2 #define AC_Serial Serial2
#endif #endif
#else #else
#define modbusSerial Serial2 #ifndef modbusSerial
#define modbusSerial Serial2
#endif
#ifndef AC_Serial #ifndef AC_Serial
#define AC_Serial Serial3 #define AC_Serial Serial3
#endif #endif
@@ -300,6 +303,10 @@
#define AC_Serial Serial2 #define AC_Serial Serial2
#endif #endif
#ifdef ARDUINO_USB_CDC_ON_BOOT
#define debugSerialPort Serial
#endif
#endif #endif
#ifndef _dmxout #ifndef _dmxout

View File

@@ -1,5 +1,6 @@
#pragma once #pragma once
#include <Print.h> #include <Print.h>
#include <Stream.h>
#include <Arduino.h> #include <Arduino.h>
#include <HardwareSerial.h> #include <HardwareSerial.h>
#include <inttypes.h> #include <inttypes.h>
@@ -21,7 +22,7 @@ extern uint8_t udpDebugLevel;
#ifndef SerialPortType #ifndef SerialPortType
#define SerialPortType HardwareSerial #define SerialPortType Stream
#endif #endif
#define LOG_TRACE 9 #define LOG_TRACE 9

View File

@@ -65,7 +65,7 @@ monitor_speed = 115200
;upload_protocol = mbed ;upload_protocol = mbed
;upload_port = /dev/cu.SLAB_USBtoUART ;upload_port = /dev/cu.SLAB_USBtoUART
framework = arduino framework = arduino
build_flags = !python get_build_flags.py nrf52840 build_flags = !python3 get_build_flags.py nrf52840
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
ESP_EEPROM ESP_EEPROM
@@ -137,7 +137,9 @@ _upload_command = custom-build-flags/upload_m5stack $SOURCE
framework = arduino framework = arduino
upload_speed = 921600 upload_speed = 921600
build_flags = !python get_build_flags.py m5stack build_flags = !python3 get_build_flags.py m5stack
; >50% space - ok for ESP due spare partition
board_build.partitions = min_spiffs.csv
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DmxSimple DmxSimple
@@ -201,6 +203,7 @@ monitor_filters = esp32_exception_decoder
build_type = debug build_type = debug
board = upesy_wroom board = upesy_wroom
board_build.partitions = min_spiffs.csv board_build.partitions = min_spiffs.csv
;board_build.partitions = huge_app.csv
extra_scripts = extra_script.py extra_scripts = extra_script.py
monitor_speed = 115200 monitor_speed = 115200
@@ -212,7 +215,7 @@ monitor_speed = 115200
_upload_command = custom-build-flags/upload_esp32-wifi $SOURCE _upload_command = custom-build-flags/upload_esp32-wifi $SOURCE
build_flags = !python get_build_flags.py esp32-wifi build_flags = !python3 get_build_flags.py esp32-wifi
lib_ignore = lib_ignore =
;COMMENT/UNCOMMENT next line for software 1-wire driver on/off ;COMMENT/UNCOMMENT next line for software 1-wire driver on/off
;DS2482_OneWire ;DS2482_OneWire
@@ -268,13 +271,90 @@ lib_deps =
https://github.com/anklimov/arduino-CAN.git https://github.com/anklimov/arduino-CAN.git
https://github.com/mathertel/RotaryEncoder https://github.com/mathertel/RotaryEncoder
[env:esp32c3-wifi]
platform = espressif32
framework = arduino
monitor_filters = esp32_exception_decoder
build_type = release
board=ESP32-C3-DevKitC-02
board_build.partitions = min_spiffs.csv
extra_scripts = extra_script.py
monitor_speed = 115200
;Comment next 2 lines to disable OTA and allow USB uploading, uncomment for OTA
;upload_protocol = custom
;upload_command = arduinoOTA -address 192.168.1.17 -port 80 -username arduino -password password -b -upload /sketch -sketch $SOURCE ;sleep 6
;Alternatively, use OTA script for target ota (pio -t ota). Place appropriate script to custom-build-flags/ to allow OTA by one click
_upload_command = custom-build-flags/upload_esp32c3-wifi $SOURCE
build_flags = !python3 get_build_flags.py esp32c3-wifi
lib_ignore =
;COMMENT/UNCOMMENT next line for software 1-wire driver on/off
;DS2482_OneWire
DmxSimple
DMXSerial
DmxDue
DueFlashStorage
SD
SdFat
Ethernet
Ethernet2
Ethernet3
Ethernet5100
;EEPROM
ESP_EEPROM
UIPEthernet
ESP_EEPROM
httpClient
HttpClient_ID66
HttpClient
ArduinoHttpClient
M5Stack
FastLED
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/anklimov/CmdArduino
https://github.com/anklimov/pubsubclient.git
Streaming
;EEPROM
;https://github.com/anklimov/NRFFlashStorage
Adafruit Unified Sensor
DHT sensor library for ESPx
;https://github.com/anklimov/Artnet.git
https://github.com/anklimov/ModbusMaster
https://github.com/anklimov/Arduino-Temperature-Control-Library.git
https://github.com/anklimov/DS2482_OneWire
;https://github.com/anklimov/ESP-Dmx
;FastLED@3.3.2
ClosedCube HDC1080
https://github.com/sparkfun/SparkFun_CCS811_Arduino_Library#v1.0.7
Adafruit NeoPixel
https://github.com/anklimov/ArduinoOTA
Adafruit MCP23017 Arduino Library
Adafruit BusIO
https://github.com/arcao/Syslog.git
;br3ttb/PID@^1.2.1
https://github.com/anklimov/Arduino-PID-Library.git
;ArduinoMDNS
;ESPmDNS
https://github.com/khoih-prog/TimerInterrupt_Generic.git
;https://github.com/anklimov/arduino-CAN.git
https://github.com/mathertel/RotaryEncoder
[env:due] [env:due]
;Experimental target with universal Ethernet Library ;Experimental target with universal Ethernet Library
platform = atmelsam platform = atmelsam
framework = arduino framework = arduino
board = due board = due
extra_scripts = extra_script.py extra_scripts = extra_script.py
build_flags = !python get_build_flags.py due build_flags = !python3 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
@@ -347,7 +427,7 @@ board = megaatmega2560
upload_port = net:192.168.88.2:23000 upload_port = net:192.168.88.2:23000
_upload_command = custom-build-flags/upload_mega2560slim $SOURCE _upload_command = custom-build-flags/upload_mega2560slim $SOURCE
framework = arduino framework = arduino
build_flags = !python get_build_flags.py mega2560slim build_flags = !python3 get_build_flags.py mega2560slim
extra_scripts = post:toBin.py extra_scripts = post:toBin.py
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
@@ -437,7 +517,7 @@ _upload_command = custom-build-flags/upload_mega2560-optiboot $SOURCE
board_upload.speed = ${env:fuses_bootloader.board_bootloader.speed} board_upload.speed = ${env:fuses_bootloader.board_bootloader.speed}
framework = arduino framework = arduino
build_flags = !python get_build_flags.py mega2560-optiboot build_flags = !python3 get_build_flags.py mega2560-optiboot
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DHT sensor library for ESPx DHT sensor library for ESPx
@@ -492,7 +572,7 @@ platform = atmelavr
board = megaatmega2560 board = megaatmega2560
monitor_speed = 115200 monitor_speed = 115200
framework = arduino framework = arduino
build_flags = !python get_build_flags.py mega2560 build_flags = !python3 get_build_flags.py mega2560
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DHT sensor library for ESPx DHT sensor library for ESPx
@@ -581,7 +661,7 @@ upload_protocol = esptool
;Alternatively, use OTA script for target ota (pio -t ota). Place appropriate script to custom-build-flags/ to allow OTA by one click ;Alternatively, use OTA script for target ota (pio -t ota). Place appropriate script to custom-build-flags/ to allow OTA by one click
_upload_command = custom-build-flags/upload_esp8266-wifi.bat $SOURCE _upload_command = custom-build-flags/upload_esp8266-wifi.bat $SOURCE
build_flags = !python get_build_flags.py esp8266-wifi build_flags = !python3 get_build_flags.py esp8266-wifi
lib_ignore = lib_ignore =
;COMMENT/UNCOMMENT next line for software 1-wire driver on/off ;COMMENT/UNCOMMENT next line for software 1-wire driver on/off
@@ -646,7 +726,7 @@ board = megaatmega2560
extra_scripts = extra_script.py extra_scripts = extra_script.py
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 = !python3 get_build_flags.py mega2560-5100
_upload_command = custom-build-flags/upload_mega2560-5100 $SOURCE _upload_command = custom-build-flags/upload_mega2560-5100 $SOURCE
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
@@ -701,7 +781,7 @@ platform = atmelsam
framework = arduino framework = arduino
board = due board = due
extra_scripts = extra_script.py extra_scripts = extra_script.py
build_flags = !python get_build_flags.py lighthub21 build_flags = !python3 get_build_flags.py lighthub21
;Comment next 2 lines to disable OTA and allow USB uploading, uncomment for OTA ;Comment next 2 lines to disable OTA and allow USB uploading, uncomment for OTA
;upload_protocol = custom ;upload_protocol = custom
@@ -771,7 +851,7 @@ platform = atmelavr
board = megaatmega2560 board = megaatmega2560
framework = arduino framework = arduino
build_flags = !python get_build_flags.py controllino build_flags = !python3 get_build_flags.py controllino
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DHT sensor library for ESPx DHT sensor library for ESPx
@@ -826,7 +906,7 @@ board = nucleo_f103rb
upload_protocol = stlink upload_protocol = stlink
debug_tool = stlink debug_tool = stlink
build_flags = !python get_build_flags.py stm32-enc2860 build_flags = !python3 get_build_flags.py stm32-enc2860
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DHT sensor library for ESPx DHT sensor library for ESPx
@@ -896,7 +976,7 @@ framework = arduino
;monitor_dtr = 1 ;monitor_dtr = 1
upload_protocol = serial upload_protocol = serial
;debug_tool = cmsis-dap ;debug_tool = cmsis-dap
build_flags = !python get_build_flags.py stm32 build_flags = !python3 get_build_flags.py stm32
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DHT sensor library for ESPx DHT sensor library for ESPx
@@ -965,7 +1045,7 @@ framework = arduino
;monitor_dtr = 1 ;monitor_dtr = 1
upload_protocol = serial upload_protocol = serial
;debug_tool = cmsis-dap ;debug_tool = cmsis-dap
build_flags = !python get_build_flags.py stm32-noip build_flags = !python3 get_build_flags.py stm32-noip
lib_ignore = lib_ignore =
;DS2482_OneWire //UNCOMMENT for software 1-wire driver ;DS2482_OneWire //UNCOMMENT for software 1-wire driver
DHT sensor library for ESPx DHT sensor library for ESPx