Merge pull request #45 from anklimov/develop

merging Develop branch

.gitignore

@@ -1,7 +1,9 @@
 .pioenvs
 .piolibdeps
+.pio
 .clang_complete
 .gcc-flags.json
+.DS_Store
 CMakeListsPrivate.txt
 custom-build-flags/*
 build_flags_due.sh
@@ -10,5 +12,6 @@ build_flags_esp8266.sh
 build_flags_stm32.sh
 build_flags_due-5500.sh
 build_flags_mega2560.sh
+build_flags_mega2560-net.sh
 build_flags_controllino.sh
 build_flags_nrf52840.sh

check_custom_build_flags_esp32.sh

@@ -1,10 +1,11 @@
 #! /bin/bash
 export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
-#export FLAGS="$FLAGS -DDMX_DISABLE"
+export FLAGS="$FLAGS -DDMX_DISABLE"
 export FLAGS="$FLAGS -DMODBUS_DISABLE"
-#export FLAGS="$FLAGS -DOWIRE_DISABLE"
-#export FLAGS="$FLAGS -DDHT_DISABLE"
+export FLAGS="$FLAGS -DOWIRE_DISABLE"
+export FLAGS="$FLAGS -DDHT_DISABLE"
 export FLAGS="$FLAGS -DCOUNTER_DISABLE"
+#export FLAGS="$FLAGS -DM5STACK"
 #export FLAGS="$FLAGS -std=gnu++11"
 CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_esp32.sh
 if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then

check_custom_build_flags_mega2560-5500.sh

@@ -0,0 +1,9 @@
+#! /bin/bash
+CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560.sh"
+export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
+export FLAGS="$FLAGS -DWiz5500"
+#TODO: make one file for all envs
+if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
+    source $CUSTOM_BUILD_FLAGS_FILE
+fi
+ echo $FLAGS

check_custom_build_flags_mega2560-slim.sh

@@ -1,6 +1,7 @@
 #! /bin/bash
-CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_mega2560-net.sh
+CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560-slim.sh"
 export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
+#TODO: make one file for all envs
 if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
     source $CUSTOM_BUILD_FLAGS_FILE
 fi

check_custom_build_flags_mega2560.sh

@@ -1,7 +1,6 @@
 #! /bin/bash
-CUSTOM_BUILD_FLAGS_FILE="custom-build-flags/build_flags_mega2560.sh"
+CUSTOM_BUILD_FLAGS_FILE=custom-build-flags/build_flags_mega2560.sh
 export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
-#TODO: make one file for all envs
 if [ -f $CUSTOM_BUILD_FLAGS_FILE ]; then
     source $CUSTOM_BUILD_FLAGS_FILE
 fi

check_custom_build_flags_nrf52840.sh

@@ -1,5 +1,6 @@
 #! /bin/bash
 export FLAGS="$FLAGS -DWiz5500"
+#export FLAGS="$FLAGS -DW5500_CS_PIN=10"
 export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
 export FLAGS="$FLAGS -DDMX_DISABLE"
 export FLAGS="$FLAGS -DMODBUS_DISABLE"

compiled/controllino/upload.bat

@@ -0,0 +1 @@
+..\tools\win\tool-avrdude\avrdude -C ../tools/mac/tool-avrdude/avrdude.conf  -v -V -P com3 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/controllino/upload.sh

@@ -0,0 +1 @@
+../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -v -V -P /dev/cu.usbmodem1411 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/due-5100/upload.bat

@@ -1,3 +1,3 @@
 mode com3:1200,n,8,1
 pause
-C:\Users\Akmal\.platformio\packages\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b C:\Users\Akmal\ownCloud\compiled\due\Wiz5500\firmware.bin -R 
+..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R 

compiled/due-5100/upload999.bat

@@ -1,3 +0,0 @@
-mode com3:1200,n,8,1
-pause
-C:\Users\Akmal\.platformio\packages\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b C:\Users\Akmal\ownCloud\compiled\due\Wiz5500\firmware999.bin -R 

compiled/due-5500/upload.bat

@@ -0,0 +1,3 @@
+mode com3:1200,n,8,1
+pause
+..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R 

compiled/lighthub21/upload.bat

@@ -0,0 +1,3 @@
+mode com3:1200,n,8,1
+pause
+..\tools\win\tool-bossac\bossac.exe -i --port=com3 -U false -e -w -v -b firmware.bin -R 

compiled/mega2560-5100/upload.bat

@@ -0,0 +1 @@
+..\tools\win\tool-avrdude\avrdude -C ../tools/mac/tool-avrdude/avrdude.conf  -v -V -P com3 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/mega2560-5100/upload.sh

@@ -0,0 +1 @@
+../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -v -V -P /dev/cu.usbmodem1411 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/mega2560-5500/upload.bat

@@ -0,0 +1 @@
+..\tools\win\tool-avrdude\avrdude -C ../tools/mac/tool-avrdude/avrdude.conf  -v -V -P com3 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/mega2560-5500/upload.sh

@@ -0,0 +1 @@
+../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -v -V -P /dev/cu.usbmodem1411 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/mega2560slim-5100/upload.bat

@@ -0,0 +1 @@
+..\tools\win\tool-avrdude\avrdude -C ../tools/mac/tool-avrdude/avrdude.conf  -v -V -P com3 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/mega2560slim-5100/upload.sh

@@ -0,0 +1 @@
+../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -v -V -P /dev/cu.usbmodem1411 -patmega2560 -cwiring -b115200 -D -Uflash:w:firmware.hex:i

compiled/tools/DUE_16u2_reflash/16u2.hex

@@ -0,0 +1,273 @@
+:10000000A7C00000C0C00000BEC00000BCC000000F
+:10001000BAC00000B8C00000B6C00000B4C0000004
+:10002000B2C00000B0C00000AEC00000C1C40000FB
+:1000300085C40000A8C00000A6C00000A4C0000045
+:10004000A2C00000A0C000009EC000009CC0000034
+:100050009AC0000098C0000096C0000021C10000B6
+:1000600092C0000090C000008EC000008CC0000054
+:100070008AC0000088C0000086C0000084C0000064
+:1000800082C0000080C000007EC000007CC0000074
+:100090007AC0000078C000001201100102000008C0
+:1000A00041233D0001000102DC0109023E00020182
+:1000B00000C0320904000001020201000524000111
+:1000C0001004240206052406000107058203080027
+:1000D000FF09040100020A000000070504024000B5
+:1000E00001070583024000010403090432034100B3
+:1000F00072006400750069006E006F002000280027
+:100100007700770077002E006100720064007500B0
+:1001100069006E006F002E0063006300290000007C
+:100120002E03410072006400750069006E006F00CC
+:1001300020004400750065002000500072006F0030
+:1001400067002E00200050006F0072007400000055
+:1001500011241FBECFEFD2E0DEBFCDBF11E0A0E083
+:10016000B1E0E4EDF0E102C005900D92A831B107D5
+:10017000D9F712E0A8E1B1E001C01D92A833B107A0
+:10018000E1F72BD1A5C73CCF9C01DC01AE57BF4F97
+:10019000ED91FC91119741911196FC93EE9380584B
+:1001A0009F4FE817F90711F42D933C939FB7F894EC
+:1001B000F901EC57FF4F8081815080839FBF842FCE
+:1001C0000895882311F03F9A01C03F9847980895F9
+:1001D000882311F046980895469A0895DF92EF9289
+:1001E000FF920F931F93FC018489813019F08230B4
+:1001F00019F404C010E303C010E001C010E28389C9
+:10020000823009F418608589873031F0883031F008
+:10021000863029F4126003C0146001C01660109289
+:10022000C9001092C8001092CA000785F088E188C2
+:10023000D288202F3F2D4E2D5D2D10921E01203B88
+:1002400084E0380780E0480780E0580719F481E02F
+:1002500080931E01CA01B90122E030E040E050E085
+:100260001CD720583B47414E5F4FCA01B901202F90
+:100270003F2D4E2D5D2DEFD6215030403093CD00D7
+:100280002093CC001093CA0082E08093C80088E9D4
+:100290008093C9001F910F91FF90EF90DF90089518
+:1002A0001F920F920FB60F9211242F938F939F934B
+:1002B000EF93FF939091CE008EB38430F1F4E091F0
+:1002C000A201F091A3019083E091A201F091A3011A
+:1002D000CF0101969093A3018093A201825A91408D
+:1002E00021F482E291E0928381839FB7F894809118
+:1002F000A6018F5F8093A6019FBFFF91EF919F9111
+:100300008F912F910F900FBE0F901F901895FC01A9
+:1003100040911A0140931B0180911C0180931D01A3
+:100320008585282F30E02170307020931A01858553
+:1003300090E096958795817080931C0180911E01B5
+:10034000882339F088E790E0909319018093180191
+:100350000895442341F4222331F082E390E0909306
+:10036000190180931801089580E091E00AC680E0A9
+:1003700091E0BDC584B7877F84BF88E10FB6F8944C
+:1003800080936000109260000FBE81E01ADF16BCFF
+:1003900083E085BD86B58831E8F315BC16BC80E0E6
+:1003A00010DF469A3E9A87E690E09093CD008093C6
+:1003B000CC0086E08093CA001092C80088E1809348
+:1003C000C900539A5A9A8AB180638AB98BB1806303
+:1003D0008BB9A9D284E085BD08950F931F93CF9365
+:1003E000DF93C8DF2FB7F89487EA91E09093280253
+:1003F0008093270290932A02809329022FBF2FB760
+:10040000F89482E291E09093A3018093A2019093EB
+:10041000A5018093A4012FBF7894C7EAD1E003E03F
+:100420008FB7F89490912B028FBF903809F180E03C
+:1004300091E0D3D497FD1CC0E0912702F0912802EF
+:100440008083E0912702F0912802CF0101969093DA
+:100450002802809327028752924011F4D283C183ED
+:100460009FB7F89480912B028F5F80932B029FBFE0
+:100470008FB7F8941091A6018FBFA89903C01136C9
+:1004800008F456C0A89A8091A601882361F05D986F
+:1004900000931F0108C082E291E076DE682F80E0C1
+:1004A00091E001D511501123B1F780911F018823EC
+:1004B00051F080911F01815080931F0180911F0195
+:1004C000882309F45D9A80912001882351F080915E
+:1004D000200181508093200180912001882309F41C
+:1004E0005C9A809118019091190118161906E4F48C
+:1004F000CC97CD9710F481E001C080E069DE809157
+:100500001801909119010197C29710F481E001C080
+:1005100080E057DE80911801909119010197909326
+:1005200019018093180104C080E052DE80E049DEAA
+:100530008FB7F89490912B028FBF992369F087EAC7
+:1005400091E022DE982F8091C80085FFFCCF909328
+:10055000CE005C980093200180E091E095D42AD4ED
+:100560005FCFDA01923049F0933061F09130F9F4C5
+:10057000E8E9F0E022E130E01EC0EAEAF0E02EE334
+:1005800030E019C0813049F0813018F0823079F4C0
+:1005900008C0E8EEF0E0849107C0ECEEF0E0849152
+:1005A00003C0E0E2F1E08491282F30E004C0E0E0F5
+:1005B000F0E020E030E0ED93FC93C901089528E0DD
+:1005C00030E040E003C04F5F220F331F2817390788
+:1005D000D0F3842F8295807F08958093E9008091E5
+:1005E000EB0081608093EB001092ED006093EC00D3
+:1005F0004093ED008091EE00881F8827881F0895A2
+:100600001092F40090E09093E9001092F0001092A4
+:10061000E8001092ED008091EB008E7F8093EB005C
+:100620009F5F953081F708958091300288238CF484
+:1006300003C08EB38823B1F08091E80082FFF9CF28
+:100640008091E8008B778093E80008958EB388232B
+:1006500049F08091E80080FFF9CF8091E8008E7723
+:100660008093E800089594E68091EC0080FF05C037
+:100670008091E80080FF05C023C08091E80082FDE2
+:100680001FC08EB3882311F482E008958EB38530A5
+:1006900011F483E008958091EB0085FF02C081E0B2
+:1006A00008958091E10082FFDFCF8091E1008B7F90
+:1006B0008093E100992311F484E008959150D4CF00
+:1006C00080E008959C014091360250913702461710
+:1006D000570718F4F90120E038C06115710511F0D1
+:1006E000AB01F8CF8091E8008E778093E80040E07E
+:1006F00050E0F0CF8091E80083FF02C081E00895D0
+:100700008091E80082FD2DC08EB3882381F18EB3E5
+:10071000853079F18091E80080FF17C09091F20058
+:1007200006C081918093F100415050409F5F411578
+:10073000510511F09830A8F320E0983009F421E039
+:100740008091E8008E778093E8004115510591F67D
+:10075000222381F606C08EB3882349F08EB38530FC
+:1007600041F08091E80082FFF6CF80E0089582E0BA
+:10077000089583E008959C0140913602509137021C
+:100780004617570710F490E03BC06115710511F052
+:10079000AB01F9CF8091E8008E778093E80040E0CC
+:1007A00050E0F1CF8091E80083FF02C081E008951E
+:1007B0008091E80082FD30C08EB3882399F18EB31A
+:1007C000853091F18091E80080FF1AC08091F2009D
+:1007D00009C0F9012F5F3F4FE491E093F1004150D0
+:1007E00050408F5F4115510511F0883090F390E033
+:1007F000883009F491E08091E8008E778093E800DA
+:100800004115510579F6992369F606C08EB3882300
+:1008100049F08EB3853041F08091E80082FFF6CF39
+:1008200080E0089582E0089583E008959C016115B9
+:10083000710529F48091E8008B778093E800F90135
+:1008400020C08091E80083FF02C081E008958EB34C
+:10085000882339F18EB3853031F18091E80082FF31
+:10086000F0CF06C08091F10081936150704021F07B
+:100870008091F2008823B1F78091E8008B77809314
+:10088000E80061157105E9F606C08EB3882349F0CA
+:100890008EB3853041F08091E80080FFF6CF80E094
+:1008A000089582E0089583E0089542D044D01EBAAE
+:1008B00010922E0210922D0210922C0284E089BD1B
+:1008C00089B5826089BD09B400FEFDCF8091D80052
+:1008D000982F9F779093D80080688093D80080915C
+:1008E00063008E7F809363008091D8008F7D80931A
+:1008F000D8008091E0008E7F8093E0008091E1003D
+:100900008E7F8093E1008091E20081608093E2001D
+:100910008091E100877F8093E1008091E200886010
+:100920008093E2000895C1DF81E080932F02089553
+:100930001092E20008951092E10008951F920F9224
+:100940000FB60F9211241F932F933F934F935F93F2
+:100950006F937F938F939F93AF93BF93EF93FF9387
+:10096000E9EEF0E0108117701082E0EFF0E0808196
+:10097000877F80837894C3D0F894A9EEB0E01C926E
+:10098000E0EFF0E08081886080831C93FF91EF911D
+:10099000BF91AF919F918F917F916F915F914F9197
+:1009A0003F912F911F910F900FBE0F901F901895A0
+:1009B0001F920F920FB60F9211242F933F934F93D4
+:1009C0005F936F937F938F939F93AF93BF93EF93B7
+:1009D000FF938091E10080FF1BC08091E20080FFC7
+:1009E00017C08091E1008E7F8093E1008091E2004A
+:1009F0008E7F8093E2008091E20080618093E2002C
+:100A00008091D80080628093D80019BC1EBAD1D1E1
+:100A10008091E10084FF29C08091E20084FF25C01D
+:100A200084E089BD89B5826089BD09B400FEFDCF2F
+:100A30008091D8008F7D8093D8008091E1008F7ED7
+:100A40008093E1008091E2008F7E8093E2008091AC
+:100A5000E20081608093E20080912E02882311F4ED
+:100A600081E001C084E08EBBA4D18091E10083FFCE
+:100A700027C08091E20083FF23C08091E100877F3F
+:100A80008093E10082E08EBB10922E028091E10003
+:100A90008E7F8093E1008091E2008E7F8093E20060
+:100AA0008091E20080618093E200AADD80E060E056
+:100AB00042E093DD8091F00088608093F00079D16E
+:100AC0008091E10082FF0AC08091E20082FF06C0AF
+:100AD0008091E1008B7F8093E1006BD1FF91EF91DA
+:100AE000BF91AF919F918F917F916F915F914F9146
+:100AF0003F912F910F900FBE0F901F9018951F934D
+:100B0000DF93CF93CDB7DEB7AC970FB6F894DEBFC7
+:100B10000FBECDBFE0E3F2E08091F100819322E0CF
+:100B2000E833F207C9F78091300230913102353055
+:100B300009F487C0363040F43130C9F1313070F0FB
+:100B4000333009F01DC133C0383009F4EFC03930FB
+:100B500009F4FEC0363009F013C192C0803821F08C
+:100B6000823809F00DC108C090912C0280912D02AD
+:100B7000882399F0926011C080913402877080932D
+:100B8000E9008091EB0090E025E0969587952A9505
+:100B9000E1F7982F91701092E9008091E800877F2B
+:100BA0008093E8009093F1001092F100CAC088236E
+:100BB00019F0823009F0E4C090E08F7190700097D6
+:100BC00021F0029709F0DDC00CC080913202813023
+:100BD00009F0D7C010922D02333069F580932D02B1
+:100BE0002AC080913202882331F520913402277087
+:100BF00009F4C7C02093E9008091EB0080FFC1C0D9
+:100C0000333021F48091EB00806213C08091EB00BF
+:100C100080618093EB0081E090E002C0880F991F13
+:100C20002A95E2F78093EA001092EA008091EB00A7
+:100C300088608093EB001092E9008091E800877F44
+:100C400083C0882309F09CC0109132028091E80093
+:100C5000877F8093E800E8DC04C08EB3882309F422
+:100C600090C08091E80080FFF8CF812F8F7711F43A
+:100C700092E001C093E09EBB80688093E30081C056
+:100C80008058823008F07CC080913202909133020B
+:100C900023E08C3D920799F55FB7F894DE01159635
+:100CA0004EE020E030E061E2E42FF0E06093570096
+:100CB000849120FF03C082958F704F5F982F9F70A3
+:100CC000892F805D8A3308F0895F8C9311961C927E
+:100CD00011972F5F3F4F12962431310529F75FBFDF
+:100CE0008AE28B8383E08C838091E800877F809306
+:100CF000E800CE0103966AE270E0E4DC11C0609186
+:100D00003402AE014F5F5F4F2CDCBC010097C9F18C
+:100D10008091E800877F8093E80089819A812BDDAC
+:100D20008091E8008B778093E8002BC0803841F5F4
+:100D30008091E800877F8093E80080912E02809365
+:100D4000F1008091E8008E778093E8006DDC19C097
+:100D50008823B1F490913202923098F48091E800A7
+:100D6000877F8093E80090932E025EDC80912E02B4
+:100D7000882311F483E001C084E08EBBF8DA01C05F
+:100D8000F3DA8091E80083FF0AC08091EB00806273
+:100D90008093EB008091E800877F8093E800AC9619
+:100DA0000FB6F894DEBF0FBECDBFCF91DF911F917C
+:100DB000089508951F938EB3882361F01091E90080
+:100DC0001092E9008091E80083FF01C098DE17705F
+:100DD0001093E9001F9108950895FC018EB38430AB
+:100DE00021F587859089A189B2890097A105B10570
+:100DF000E1F085818093E9008091E80082FF15C0D1
+:100E00008091F200882319F42FEF3FEF04C0809106
+:100E1000F100282F30E08091F200882341F4809186
+:100E2000E8008B778093E80002C02FEF3FEFC90105
+:100E30000895FC018EB3843011F587859089A189CE
+:100E4000B2890097A105B105D1F081818093E900B5
+:100E50008091F2008823A9F09091E8008091E80049
+:100E60008E778093E80095FD0CC0FDDB982F8823DA
+:100E700049F48091E8008E778093E80003C092E007
+:100E800001C090E0892F0895FC018EB3843051F4A5
+:100E900087859089A189B2890097A105B10511F0D4
+:100EA000CF01C7CF08951F93FC01162F8EB3843056
+:100EB000D9F487859089A189B2890097A105B105E8
+:100EC00099F081818093E9008091E80085FD08C058
+:100ED0008091E8008E778093E800C5DB882329F4B1
+:100EE0001093F10080E001C082E01F9108950F93FC
+:100EF0001F93CF93DF93EC010D96FC0189E0DF0196
+:100F00001D928A95E9F72A813B8109818C8188238A
+:100F100011F410E001C014E0C90151DB182B12607C
+:100F2000802F61E8412F59DB882329F12E813F81F1
+:100F30000D818885882311F410E001C014E0C901F7
+:100F40003EDB182B1260802F60E8412F46DB8823A0
+:100F500091F02A853B8509858C85882311F410E062
+:100F600001C014E0C9012BDB182B1260802F61EC4B
+:100F7000412F33DB01C080E0DF91CF911F910F91B2
+:100F80000895CF93DF93EC018091E80083FF60C068
+:100F9000888190E02091340230913502281739077A
+:100FA00009F056C080913102813261F0823220F422
+:100FB000803209F04DC019C0823269F1833209F0E4
+:100FC00047C038C080913002813A09F041C0809119
+:100FD000E800877F8093E800CE010F9667E070E01D
+:100FE00071DB8091E8008B7713C0809130028132F1
+:100FF00079F58091E800877F8093E800CE010F9615
+:1010000067E070E013DCCE01E9D88091E8008E77CC
+:101010008093E8001DC0809130028132C9F4809134
+:10102000E800877F8093E800809132028D87CE01AF
+:101030006ED90DC080913002813251F48091E80068
+:10104000877F8093E800CE0160913202C5DEECDA42
+:10105000DF91CF910895A1E21A2EAA1BBB1BFD01BF
+:101060000DC0AA1FBB1FEE1FFF1FA217B307E40787
+:10107000F50720F0A21BB30BE40BF50B661F771FDF
+:10108000881F991F1A9469F76095709580959095BF
+:101090009B01AC01BD01CF01089597FB092E0526E8
+:1010A0000ED057FD04D0D7DF0AD0001C38F450957D
+:1010B0004095309521953F4F4F4F5F4F0895F6F77C
+:1010C00090958095709561957F4F8F4F9F4F0895B4
+:0410D000F894FFCFC2
+:1010D400000340000004400000020800000000007B
+:0810E4000000000000001400F0
+:00000001FF

compiled/tools/DUE_16u2_reflash/readme.md

@@ -0,0 +1,2 @@
+This package need if you have problem with unrelable cold start of Arduino DUE
+Arduino ISP should be connected to 16u2 ICSP connector before run

compiled/tools/DUE_16u2_reflash/reflash16u2DUE.sh

@@ -0,0 +1 @@
+../../tools/mac/tool-avrdude/avrdude -C ../tools/mac/tool-avrdude/avrdude.conf -c arduino -P /dev/cu.usbmodem1411 -b 19200 -p m16u2 -vvv -U flash:w:16u2.hex:i

compiled/tools/mac/tool-avrdude/libavrdude.dylib

@@ -0,0 +1 @@
+libavrdude.1.dylib

compiled/tools/mac/tool-avrdude/libavrdude.la

@@ -0,0 +1,41 @@
+# libavrdude.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.6
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libavrdude.1.dylib'
+
+# Names of this library.
+library_names='libavrdude.1.dylib libavrdude.dylib'
+
+# The name of the static archive.
+old_library='libavrdude.a'
+
+# Linker flags that cannot go in dependency_libs.
+inherited_linker_flags=' '
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir/lib -lreadline -lncurses -ltermcap'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libavrdude.
+current=1
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir/lib'

compiled/tools/mac/tool-avrdude/libusb-1.0.la

@@ -0,0 +1,41 @@
+# libusb-1.0.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libusb-1.0.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=' '
+
+# Libraries that this one depends upon.
+dependency_libs=' -lobjc'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libusb-1.0.
+current=1
+age=1
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir/lib'

compiled/tools/mac/tool-avrdude/libusb-config

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+prefix=/Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir
+exec_prefix=${prefix}
+includedir=${prefix}/include
+libdir=${exec_prefix}/lib
+exec_prefix_set=no
+
+usage()
+{
+	cat <<EOF
+Usage: libusb-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      if test $exec_prefix_set = no ; then
+        exec_prefix=$optarg
+      fi
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      exec_prefix_set=yes
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --version)
+      echo 0.1.12
+      exit 0
+      ;;
+    --cflags)
+      if test "$includedir" != /usr/include ; then
+        includes="-I$includedir"
+      fi
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+if test "$echo_prefix" = "yes"; then
+	echo $prefix
+fi
+if test "$echo_exec_prefix" = "yes"; then
+	echo $exec_prefix
+fi
+if test "$echo_cflags" = "yes"; then
+	echo $includes
+fi
+if test "$echo_libs" = "yes"; then
+	echo -L$libdir -lusb
+fi

compiled/tools/mac/tool-avrdude/libusb.la

@@ -0,0 +1,41 @@
+# libusb.la - a libtool library file
+# Generated by libtool (GNU libtool) 2.4.2
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname=''
+
+# Names of this library.
+library_names=''
+
+# The name of the static archive.
+old_library='libusb.a'
+
+# Linker flags that can not go in dependency_libs.
+inherited_linker_flags=' '
+
+# Libraries that this one depends upon.
+dependency_libs=' -L/Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir/lib /Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir/lib/libusb-1.0.la -lobjc'
+
+# Names of additional weak libraries provided by this library
+weak_library_names=''
+
+# Version information for libusb.
+current=8
+age=4
+revision=4
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/Users/jenkins/jenkins/workspace/avrdude/label/mac-mini/objdir/lib'

compiled/tools/mac/tool-avrdude/package.json

@@ -0,0 +1,10 @@
+{
+    "description": "AVRDUDE",
+    "name": "tool-avrdude",
+    "system": [
+        "darwin_x86_64",
+        "darwin_i386"
+    ],
+    "url": "http://www.nongnu.org/avrdude/",
+    "version": "1.60300.190424"
+}

compiled/tools/mac/tool-bossac/package.json

@@ -0,0 +1,7 @@
+{
+    "description": "Basic Open Source SAM-BA Application (BOSSA)",
+    "name": "tool-bossac",
+    "system": "darwin_x86_64",
+    "url": "https://github.com/shumatech/BOSSA",
+    "version": "1.10700.0"
+}

compiled/tools/mac/tool-esptool/package.json

@@ -0,0 +1,10 @@
+{
+    "description": "esptool-ck",
+    "name": "tool-esptool",
+    "system": [
+        "darwin_x86_64",
+        "darwin_i386"
+    ],
+    "url": "https://github.com/igrr/esptool-ck",
+    "version": "1.413.0"
+}

compiled/tools/win/tool-avrdude/install_giveio.bat

@@ -0,0 +1,34 @@
+@set DIRVERNAME=giveio
+@set DIRVERFILE=%DIRVERNAME%.sys
+
+@echo Copying the driver to the windows directory
+@echo target file: %WINDIR%\%DIRVERFILE%
+@copy %DIRVERFILE% %WINDIR%\%DIRVERFILE%
+
+@echo Remove a running service if needed...
+@loaddrv stop %DIRVERNAME% >NUL
+@if errorlevel 2 goto install
+
+@loaddrv remove %DIRVERNAME% >NUL
+@if errorlevel 1 goto install
+
+:install
+@echo Installing Windows NT/2k/XP driver: %DIRVERNAME%
+
+@loaddrv install %DIRVERNAME% %WINDIR%\%DIRVERFILE%
+@if errorlevel 3 goto error
+
+@loaddrv start %DIRVERNAME%
+@if errorlevel 1 goto error
+
+@loaddrv starttype %DIRVERNAME% auto
+@if errorlevel 1 goto error
+
+@echo Success
+@goto exit
+
+:error
+@echo ERROR: Installation of %DIRVERNAME% failed
+
+:exit
+

compiled/tools/win/tool-avrdude/package.json

@@ -0,0 +1,11 @@
+{
+    "name": "tool-avrdude",
+    "description": "AVRDUDE",
+    "system": [
+        "windows",
+        "windows_amd64",
+        "windows_x86"
+    ],
+    "url": "http://www.nongnu.org/avrdude/",
+    "version": "1.60300.190424"
+}

compiled/tools/win/tool-avrdude/remove_giveio.bat

@@ -0,0 +1,14 @@
+@set DIRVERNAME=giveio
+
+@loaddrv stop %DIRVERNAME%
+@if errorlevel 2 goto error
+
+@loaddrv remove %DIRVERNAME%
+@if errorlevel 1 goto error
+
+@goto exit
+
+:error
+@echo ERROR: Deinstallation of %DIRVERNAME% failed
+
+:exit

compiled/tools/win/tool-avrdude/status_giveio.bat

@@ -0,0 +1,12 @@
+@set DIRVERNAME=giveio
+
+@loaddrv status %DIRVERNAME%
+@if errorlevel 1 goto error
+
+@goto exit
+
+:error
+@echo ERROR: Status querry for %DIRVERNAME% failed
+
+:exit
+

compiled/tools/win/tool-bossac/package.json

@@ -0,0 +1,11 @@
+{
+    "description": "Basic Open Source SAM-BA Application (BOSSA)",
+    "name": "tool-bossac",
+    "system": [
+        "windows",
+        "windows_amd64",
+        "windows_x86"
+    ],
+    "url": "https://github.com/shumatech/BOSSA",
+    "version": "1.10700.0"
+}

compiled/tools/win/tool-esptool/package.json

@@ -0,0 +1,11 @@
+{
+    "description": "esptool-ck",
+    "name": "tool-esptool",
+    "system": [
+        "windows",
+        "windows_amd64",
+        "windows_x86"
+    ],
+    "url": "https://github.com/igrr/esptool-ck",
+    "version": "1.413.0"
+}

compiled/tools/win/tool-mkspiffs/package.json

@@ -0,0 +1,11 @@
+{
+    "description": "Tool to build and unpack SPIFFS images",
+    "name": "tool-mkspiffs",
+    "system": [
+        "windows",
+        "windows_amd64",
+        "windows_x86"
+    ],
+    "url": "https://github.com/igrr/mkspiffs",
+    "version": "2.230.0"
+}

compiled/update_bin.sh

@@ -0,0 +1,12 @@
+cp ../.pioenvs/controllino/firmware.hex controllino
+cp ../.pioenvs/m5stack/firmware.bin m5stack
+cp ../.pioenvs/mega2560slim-5100/firmware.hex mega2560slim-5100
+cp ../.pioenvs/due-5100/firmware.bin due-5100
+cp ../.pioenvs/mega2560-5100/firmware.hex mega2560-5100
+cp ../.pioenvs/due-5500/firmware.bin due-5500
+cp ../.pioenvs/nrf52840-5500/firmware.hex nrf52840-5500
+cp ../.pioenvs/esp32-wifi/firmware.bin esp32-wifi
+cp ../.pioenvs/stm32-enc2860/firmware.bin stm32-enc2860
+cp ../.pioenvs/esp8266-wifi/firmware.bin esp8266-wifi
+cp ../.pioenvs/lighthub21/firmware.bin lighthub21
+cp ../.pioenvs/mega2560-5500/firmware.hex mega2560-5500

custom-build-flags/build_flags_controllino.sh

@@ -24,8 +24,9 @@
 # export FLAGS="$FLAGS -DESP_WIFI_AP=vent"
 # export FLAGS="$FLAGS -DESP_WIFI_PWD=kk007remont"
 # export FLAGS="$FLAGS -DSYSLOG_ENABLE"
- export FLAGS="$FLAGS -DDEVICE_NAME=kk007_mega2560"
-export FLAGS="$FLAGS -DDHT_COUNTER_DISABLE"
+export FLAGS="$FLAGS -DDEVICE_NAME=kk007_mega2560"
+export FLAGS="$FLAGS -DCOUNTER_DISABLE"
+export FLAGS="$FLAGS -DDHT_DISABLE"
 #export FLAGS="$FLAGS -DWITH_DOMOTICZ"
 #export FLAGS="$FLAGS -DWITH_PRINTEX_LIB"
  export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)

custom-build-flags/build_flags_mega2560-net.sh

@@ -1,30 +0,0 @@
-#! /bin/bash
-# usage:
-# first make your own copy of template
-# cp build_flags_template.sh build_flags_ENVNAME.sh
-# then edit, change or comment something
- export FLAGS="$FLAGS -DMY_CONFIG_SERVER=lazyhome.ru"
- #export FLAGS="$FLAGS -DWATCH_DOG_TICKER_DISABLE"
- #export FLAGS="$FLAGS -DUSE_1W_PIN=12"
- #export FLAGS="$FLAGS -DSD_CARD_INSERTED"
- export FLAGS="$FLAGS -DSERIAL_BAUD=115200"
- #export FLAGS="$FLAGS -DWiz5500"
- #export FLAGS="$FLAGS -DDISABLE_FREERAM_PRINT"
- export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:fe"
-# export FLAGS="$FLAGS -DDMX_DISABLE"
-# export FLAGS="$FLAGS -DARTNET_ENABLE"
-# export FLAGS="$FLAGS -DMODBUS_DISABLE"
-# export FLAGS="$FLAGS -DOWIRE_DISABLE"
-# export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18"
-# export FLAGS="$FLAGS -DLAN_INIT_DELAY=2000"
-# export FLAGS="$FLAGS -DCONTROLLINO"
-# export FLAGS="$FLAGS -DESP_WIFI_AP=MYAP"
-# export FLAGS="$FLAGS -DESP_WIFI_PWD=MYPWD"
-# export FLAGS="$FLAGS -DWIFI_MANAGER_DISABLE"
- export FLAGS="$FLAGS -DDHT_DISABLE"
-# export FLAGS="$FLAGS -DRESET_PIN=5"
-# export FLAGS="$FLAGS -DDHCP_RETRY_INTERVAL=60000"
-# export FLAGS="$FLAGS -DRESTART_LAN_ON_MQTT_ERRORS"
-# export FLAGS="$FLAGS -DW5500_CS_PIN=53"
- export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
- echo $FLAGS

custom-build-flags/build_flags_nrf52840.sh

@@ -3,29 +3,28 @@
 # first make your own copy of template
 # cp build_flags_template.sh build_flags_ENVNAME.sh
 # then edit, change or comment something
- export FLAGS="$FLAGS -DMY_CONFIG_SERVER=lazyhome.ru"
+ #export FLAGS="$FLAGS -DMY_CONFIG_SERVER=lazyhome.ru"
  export FLAGS="$FLAGS -DWATCH_DOG_TICKER_DISABLE"
  #export FLAGS="$FLAGS -DUSE_1W_PIN=12"
  #export FLAGS="$FLAGS -DSD_CARD_INSERTED"
- export FLAGS="$FLAGS -DSERIAL_BAUD=115200"
+ #export FLAGS="$FLAGS -DSERIAL_BAUD=115200"
  #export FLAGS="$FLAGS -DWiz5500"
  export FLAGS="$FLAGS -DDISABLE_FREERAM_PRINT"
- export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:ff"
- export FLAGS="$FLAGS -DDMX_DISABLE"
- export FLAGS="$FLAGS -DMODBUS_DISABLE"
- export FLAGS="$FLAGS -DOWIRE_DISABLE"
+ #export FLAGS="$FLAGS -DCUSTOM_FIRMWARE_MAC=de:ad:be:ef:fe:ff"
+ #export FLAGS="$FLAGS -DDMX_DISABLE"
+ #export FLAGS="$FLAGS -DMODBUS_DISABLE"
+ #export FLAGS="$FLAGS -DOWIRE_DISABLE"
 # export FLAGS="$FLAGS -DAVR_DMXOUT_PIN=18"
 # export FLAGS="$FLAGS -DLAN_INIT_DELAY=2000"
 # export FLAGS="$FLAGS -DCONTROLLINO"
- export FLAGS="$FLAGS -DWIFI_MANAGER_DISABLE"
+# export FLAGS="$FLAGS -DWIFI_MANAGER_DISABLE"
 # export FLAGS="$FLAGS -DRESET_PIN=5"
 # export FLAGS="$FLAGS -DDHCP_RETRY_INTERVAL=60000"
 # export FLAGS="$FLAGS -DRESTART_LAN_ON_MQTT_ERRORS"
 # export FLAGS="$FLAGS -DW5500_CS_PIN=53"
-export FLAGS="$FLAGS -DSYSLOG_DISABLE"
-export FLAGS="$FLAGS -std=gnu++11"
+#export FLAGS="$FLAGS -std=gnu++11"
 #export FLAGS="$FLAGS -DDEVICE_NAME=MYDEVICE"
-export FLAGS="$FLAGS -DDHT_COUNTER_DISABLE"
+#export FLAGS="$FLAGS -DDHT_COUNTER_DISABLE"
 #export FLAGS="$FLAGS -DWITH_PRINTEX_LIB"
- export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
+#export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
  echo $FLAGS

custom-build-flags/build_flags_template.sh

@@ -30,4 +30,5 @@
 # export FLAGS="$FLAGS -DCOUNTER_DISABLE"
 # export FLAGS="$FLAGS -DWITH_PRINTEX_LIB"
 # export FLAGS="$FLAGS -DPIO_SRC_REV="$(git log --pretty=format:%h_%ad -1 --date=short)
+# export FLAGS="$FLAGS -DCSSHDC_DISABLE"
  echo $FLAGS

lighthub/abstractin.cpp

@@ -4,7 +4,9 @@
 #include "utils.h"
 #include <aJSON.h>
 #include "inputs.h"
+#include "main.h"
 
+extern lan_status lanStatus;
 extern PubSubClient mqttClient;
 
 int abstractIn::publish(long value, char* subtopic)
@@ -32,7 +34,7 @@ int abstractIn::publish(char * value, char* subtopic)
        strncpy(addrstr,emit->valuestring,sizeof(addrstr));
        if (!strchr(addrstr,'/')) setTopic(addrstr,sizeof(addrstr),T_OUT,emit->valuestring);
        strncat(addrstr,subtopic,sizeof(addrstr));
-       if (mqttClient.connected())
+       if (mqttClient.connected() && lanStatus == OPERATION)
                        {
                         mqttClient.publish(addrstr, value, true);
                         return 1;

lighthub/dmx.cpp

@@ -28,7 +28,7 @@ e-mail    anklimov@gmail.com
 #endif
 #endif
 
-#if defined(ESP8266)
+#if defined(ESP8266) ||  defined(ARDUINO_ARCH_ESP32)
 #ifndef DMX_DISABLE
 DMXESPSerial dmxout;
 #endif
@@ -245,6 +245,10 @@ dmxout.begin();
 dmxout.setTxMaxChannels(channels);
 #endif
 #endif
+
+#ifndef DMX_DISABLE
+for (int i=1;i<=channels;i++) DmxWrite(i,0);
+#endif
 }
 
 void ArtnetSetup()

lighthub/dmx.h

@@ -43,6 +43,12 @@ extern DMXESPSerial dmxout;
 #define DmxWrite dmxout.write
 #endif
 
+#if defined(ARDUINO_ARCH_ESP32)
+#include <ESPDMX.h>
+extern DMXESPSerial dmxout;
+#define DmxWrite dmxout.write
+#endif
+
 #if defined(__SAM3X8E__)
 #include <DmxDue.h>
 #define DmxWrite dmxout.write

lighthub/inputs.cpp

@@ -134,8 +134,8 @@ int Input::poll(short cause) {
 
 if (!isValid()) return -1;
 #ifndef CSSHDC_DISABLE
-  in_ccs811  ccs811(this);
-  in_hdc1080 hdc1080(this);
+  in_ccs811  _ccs811(this);
+  in_hdc1080 _hdc1080(this);
 #endif
 
 switch (cause)  {
@@ -167,10 +167,10 @@ switch (cause)  {
     {
     #ifndef CSSHDC_DISABLE
          case IN_CCS811:
-         ccs811.Poll();
+         _ccs811.Poll();
          break;
          case IN_HDC1080:
-         hdc1080.Poll();
+         _hdc1080.Poll();
          break;
     #endif
     #ifndef DHT_DISABLE

lighthub/main.cpp

@@ -361,7 +361,7 @@ if (WiFi.status() != WL_CONNECTED)
         }
 #endif
 
-#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__) || defined (NRF5)
         wdt_dis();
         if (lanStatus > 0)
             switch (Ethernet.maintain()) {
@@ -687,11 +687,11 @@ wifiManager.setTimeout(30);
     }
 #endif
 
-#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)||defined(ARDUINO_ARCH_STM32)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)||defined(ARDUINO_ARCH_STM32) || defined (NRF5)
 #ifdef W5500_CS_PIN
     Ethernet.w5500_cspin = W5500_CS_PIN;
     debugSerial<<F("Use W5500 pin: ");
-    debugSerial<<(Ethernet.w5500_cspin);
+    debugSerial<<(Ethernet.w5500_cspin)<<endl;
 #endif
     IPAddress ip, dns, gw, mask;
     int res = 1;
@@ -718,7 +718,7 @@ wifiManager.setTimeout(30);
     else {
         debugSerial<<"\nNo IP data found in flash\n";
         wdt_dis();
-#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__)
+#if defined(ARDUINO_ARCH_AVR) || defined(__SAM3X8E__) || defined (NRF5)
         res = Ethernet.begin(mac, 12000);
 #endif
 #if defined(ARDUINO_ARCH_STM32)
@@ -1220,7 +1220,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
         return READ_RE_CONFIG;//-11;
     }
 #endif
-#if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32) //|| defined(ARDUINO_ARCH_ESP32) //|| defined(ARDUINO_ARCH_ESP8266)
+#if defined(__SAM3X8E__) || defined(ARDUINO_ARCH_STM32) || defined (NRF5) //|| defined(ARDUINO_ARCH_ESP32) //|| defined(ARDUINO_ARCH_ESP8266)
     #if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
     WiFiClient configEthClient;
     #else
@@ -1269,7 +1269,7 @@ lan_status loadConfigFromHttp(int arg_cnt, char **args)
     }
 #endif
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32) //|| defined (NRF5)
     HTTPClient httpClient;
     String fullURI = "http://";
     fullURI+=configServer;
@@ -1331,6 +1331,11 @@ void setup_main() {
   memset(&UniqueID,0,sizeof(UniqueID));
   #endif
 
+  #if defined(M5STACK)
+   // Initialize the M5Stack object
+   M5.begin();
+  #endif
+
     setupCmdArduino();
     printFirmwareVersionAndBuildOptions();
 
@@ -1557,6 +1562,11 @@ void setupCmdArduino() {
 }
 
 void loop_main() {
+  #if defined(M5STACK)
+   // Initialize the M5Stack object
+   M5.update();
+  #endif
+
     wdt_res();
     cmdPoll();
     if (lanLoop() > HAVE_IP_ADDRESS) {

lighthub/main.h

@@ -1,6 +1,11 @@
 #pragma once
 
 #include "options.h"
+
+#if defined(M5STACK)
+#include <M5Stack.h>
+#endif
+
 #if defined(__SAM3X8E__)
 #include <DueFlashStorage.h>
 #include <watchdog.h>
@@ -47,6 +52,7 @@
 
 #ifdef NRF5
 #include <NRFFlashStorage.h>
+#include <ArduinoHttpClient.h>
 #endif
 
 #ifdef ARDUINO_ARCH_STM32

lighthub/modules/in_ccs811_hdc1080.cpp

@@ -3,10 +3,14 @@
 #include "options.h"
 #include "Streaming.h"
 
-#ifndef CSSHDC_DISABLE
+#if defined(M5STACK)
+#include <M5Stack.h>
+#endif
+
+#ifndef CSSHDC_DISABLE
+static ClosedCube_HDC1080 hdc1080;
+static CCS811 ccs811(CCS811_ADDR);
 
-CCS811 ccs811(CCS811_ADDR);
-ClosedCube_HDC1080 hdc1080;
 long ccs811Baseline;
 
 static bool HDC1080ready = false;
@@ -35,8 +39,16 @@ Wire.begin(); //Inialize I2C Harware
     printDriverError(returnCode);
     return 0;
   }
-ccs811.setBaseline(62000);
+//ccs811.setBaseline(62000);
 CCS811ready = true;
+
+//returnCode = ccs811.setDriveMode(1);
+//printDriverError(returnCode);
+
+delay(2000);Poll();
+delay(2000);Poll();
+delay(2000);Poll();
+delay(2000);
 return 1;
 }
 
@@ -81,6 +93,19 @@ if (reg!=0xff)
   Serial.print("C, RH=");
   Serial.print(h=hdc1080.readHumidity());
   Serial.println("%");
+
+
+  #ifdef M5STACK
+    M5.Lcd.print(" T=");
+  //Returns calculated CO2 reading
+    M5.Lcd.print(t=hdc1080.readTemperature());
+    M5.Lcd.print("C, RH=");
+  //Returns calculated TVOC reading
+
+    M5.Lcd.print(h=hdc1080.readHumidity());
+    M5.Lcd.print("%\n");
+  #endif
+
   publish(t,"/T");
   publish(h,"/H");
   if (CCS811ready) ccs811.setEnvironmentalData(h,t);
@@ -99,8 +124,10 @@ int in_ccs811::Poll()
   #ifdef WAK_PIN
     digitalWrite(WAK_PIN,LOW);
   #endif
+  delay(1);
 //Check to see if data is ready with .dataAvailable()
   if (ccs811.dataAvailable())
+//if (1)
   {
     //If so, have the sensor read and calculate the results.
     //Get them later
@@ -117,15 +144,23 @@ int in_ccs811::Poll()
     Serial.print("] baseline[");
     Serial.print(ccs811Baseline = ccs811.getBaseline());
 
+    #ifdef M5STACK
+      M5.Lcd.print(" CO2[");
+    //Returns calculated CO2 reading
+      M5.Lcd.print(co2 = ccs811.getCO2());
+      M5.Lcd.print("] tVOC[");
+    //Returns calculated TVOC reading
+
+      M5.Lcd.print(tvoc = ccs811.getTVOC());
+      M5.Lcd.print("]\n");
+    #endif
+
+
+
     publish(co2,"/CO2");
     publish(tvoc,"/TVOC");
     publish(ccs811Baseline,"/base");
-
-    Serial.print("] millis[");
-    //Simply the time since program start
-    Serial.print(millis());
-    Serial.print("]");
-    Serial.println();
+    Serial.println("]");
     printSensorError();
 
     #ifdef WAK_PIN

lighthub/modules/in_ccs811_hdc1080.h

@@ -21,9 +21,10 @@
 #endif
 
 #if defined (ARDUINO_ARCH_ESP32)
-#ifndef WAK_PIN
-#define WAK_PIN 17
-#endif
+#undef WAK_PIN
+//#ifndef WAK_PIN
+//#define WAK_PIN 17
+//#endif
 #endif
 
 #if defined(ARDUINO_ARCH_AVR)

lighthub/options.h

@@ -164,7 +164,11 @@
 #if defined(ARDUINO_ARCH_ESP32)
 #undef _dmxin
 #undef _modbus
-#undef _dmxout
+
+#ifndef DMX_DISABLE
+#define _espdmx
+#endif
+//#undef _dmxout
 #undef modbusSerial
 #endif
 
@@ -189,6 +193,10 @@
 #define strncpy_P strncpy
 #endif
 
+//#ifdef M5STACK
+//#define debugSerial M5.Lcd
+//#endif
+
 #ifndef debugSerial
 #define debugSerial Serial
 #endif

platformio.ini

@@ -8,26 +8,53 @@
 ; Please visit documentation for the other options and examples
 ; http://docs.platformio.org/page/projectconf.html
 [platformio]
+;home_dir = C:\platformio
 src_dir = lighthub
 ;monitor_speed = 115200
 env_default =
-;    megaatmega2560
+;   ****** UNCOMMENT single environment name for target platform below *******
+; Arduino Mega (without onewire) + Ethernet shield Wiznet 5100
+;    mega2560slim-5100
+
+; Arduino Mega + Ethernet shield Wiznet 5100
+;    mega2560-5100
+
+; Arduino Mega  + Ethernet shield Wiznet 5500
+;    mega2560-5500
+
+; LightHub controller HW revision 2.1 and above (Wiznet 5500 CS on pin 53)
 ;    lighthub21
-;    megaatmega2560-net
-;    due
-;    esp8266
-;     esp32
-;    megaatmega2560-5500
+
+; Arduino DUE  + Ethernet shield Wiznet 5100
+;    due-5100
+
+; Arduino DUE + Ethernet shield Wiznet 5500
 ;    due-5500
+
+; ESP 8266
+;    esp8266-wifi
+
+; ESP-32
+;    esp32-wifi
+
+; M5Stack core (ESP32 based)
+;    m5stack
+
+; Controllino
 ;    controllino
-;    stm32
-;    nrf52840
+
+; STM32 board + ENC28j60 network
+;    stm32-enc2860
+
+; NRF52 board + Wiznet 5500 network
+;    nrf52840-5500
 
 ;build_dir = /tmp/pioenvs
 ;libdeps_dir = /tmp/piolibdeps
-[env:nrf52840]
+[env:nrf52840-5500]
 platform = nordicnrf52
 board = nrf52840_dk
+;board_build.variant = breakout
 ;upload_protocol = mbed
 ;upload_port = /dev/cu.SLAB_USBtoUART
 framework = arduino
@@ -57,11 +84,13 @@ lib_ignore =
     ;Adafruit_Sensor
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
+    ESP8266HTTPClient
+    M5Stack
 lib_deps =
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
     https://github.com/anklimov/DS2482_OneWire
     https://github.com/anklimov/Ethernet2
-    ESP8266HTTPClient
+    ArduinoHttpClient
     https://github.com/anklimov/aJson
     https://github.com/anklimov/CmdArduino
     https://github.com/anklimov/ModbusMaster
@@ -76,12 +105,11 @@ lib_deps =
 
 
 
-[env:esp32]
+[env:m5stack]
 platform = espressif32
+board = m5stack-core-esp32
 framework = arduino
-;board = pico32
-board = esp32-evb
-upload_speed = 115200
+upload_speed = 921600
 build_flags = !bash check_custom_build_flags_esp32.sh
 lib_ignore =
     DmxSimple
@@ -119,8 +147,57 @@ lib_deps =
     https://github.com/anklimov/ESP-Dmx
     FastLED
     ClosedCube HDC1080
-    SparkFun CCS811 Arduino Library
-[env:due]
+    ;SparkFun CCS811 Arduino Library
+    https://github.com/sparkfun/SparkFun_CCS811_Arduino_Library.git
+    M5Stack
+
+[env:esp32-wifi]
+platform = espressif32
+framework = arduino
+;board = pico32
+board = esp32-evb
+upload_speed = 115200
+build_flags = !bash check_custom_build_flags_esp32.sh
+lib_ignore =
+    DmxSimple
+    DMXSerial
+    DmxDue
+    DueFlashStorage
+    SD
+    SdFat
+    Ethernet
+    Ethernet2
+    Ethernet3
+    EEPROM
+    Artnet
+    UIPEthernet
+    ESP_EEPROM
+    httpClient
+    HttpClient_ID66
+    HttpClient
+    ArduinoHttpClient
+    M5Stack
+lib_deps =
+    https://github.com/ebenolson/WIFIMANAGER-ESP32.git
+    https://github.com/zhouhan0126/WebServer-esp32.git
+    https://github.com/anklimov/aJson
+    https://github.com/anklimov/CmdArduino
+    https://github.com/knolleary/pubsubclient.git
+    Streaming
+    ;ESP_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
+    ClosedCube HDC1080
+    ;SparkFun CCS811 Arduino Library
+    https://github.com/sparkfun/SparkFun_CCS811_Arduino_Library.git
+[env:due-5100]
 platform = atmelsam
 framework = arduino
 board = due
@@ -139,6 +216,7 @@ lib_ignore =
     WebServer
     UIPEthernet
     EEPROM
+    M5Stack
 lib_deps =
     https://github.com/sebnil/DueFlashStorage
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
@@ -161,12 +239,12 @@ lib_deps =
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
 
-[env:megaatmega2560]
+[env:mega2560slim-5100]
 platform = atmelavr
 board = megaatmega2560
 ;upload_port = net:192.168.88.31:23
 framework = arduino
-build_flags = !bash check_custom_build_flags_mega2560.sh
+build_flags = !bash check_custom_build_flags_mega2560-slim.sh
 lib_ignore =
     DHT sensor library for ESPx
     DmxDue
@@ -178,6 +256,7 @@ lib_ignore =
     WebServer
     UIPEthernet
     ESP_EEPROM
+    M5Stack
 lib_deps =
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
     https://github.com/anklimov/DS2482_OneWire
@@ -199,7 +278,45 @@ lib_deps =
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
 
-[env:esp8266]
+[env:mega2560-5500]
+platform = atmelavr
+board = megaatmega2560
+framework = arduino
+build_flags = !bash check_custom_build_flags_mega2560-5500.sh
+lib_ignore =
+        DHT sensor library for ESPx
+        DmxDue
+        DueFlashStorage
+        WifiManager
+        Ethernet3
+        HTTPClient
+        NRFFlashStorage
+        WebServer
+        UIPEthernet
+        ESP_EEPROM
+        M5Stack
+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/knolleary/pubsubclient.git
+        https://github.com/anklimov/Artnet.git
+        FastLED
+        Adafruit Unified Sensor
+        DHT sensor library
+        https://github.com/arcao/Syslog.git
+        Streaming
+        ClosedCube HDC1080
+        SparkFun CCS811 Arduino Library
+
+
+[env:esp8266-wifi]
 platform = espressif8266
 framework = arduino
 board = nodemcuv2
@@ -222,6 +339,7 @@ lib_ignore =
     NRFFlashStorage
     UIPEthernet
     EEPROM
+    M5Stack
 lib_deps =
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
     https://github.com/anklimov/DS2482_OneWire
@@ -232,7 +350,7 @@ lib_deps =
     https://github.com/anklimov/ModbusMaster
     https://github.com/knolleary/pubsubclient.git
     https://github.com/anklimov/Artnet.git
-    FastLED
+    https://github.com/FastLED/FastLED.git
     Adafruit Unified Sensor
     DHT sensor library for ESPx
     DHT sensor library
@@ -243,12 +361,12 @@ lib_deps =
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
 
-[env:megaatmega2560-net]
+[env:mega2560-5100]
 platform = atmelavr
 board = megaatmega2560
 framework = arduino
 upload_port = net:192.168.88.2:23000
-build_flags = !bash check_custom_build_flags_mega2560-net.sh
+build_flags = !bash check_custom_build_flags_mega2560.sh
 lib_ignore =
     DHT sensor library for ESPx
     DmxDue
@@ -262,6 +380,7 @@ lib_ignore =
     WebServer
     UIPEthernet
     ESP_EEPROM
+    M5Stack
 lib_deps =
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
     https://github.com/anklimov/DS2482_OneWire
@@ -302,6 +421,7 @@ lib_ignore =
     UIPEthernet
     ESP_EEPROM
     EEPROM
+    M5Stack
 lib_deps =
     https://github.com/sebnil/DueFlashStorage
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
@@ -345,6 +465,7 @@ lib_ignore =
         UIPEthernet
         ESP_EEPROM
         EEPROM
+        M5Stack
 lib_deps =
         https://github.com/sebnil/DueFlashStorage
         https://github.com/anklimov/Arduino-Temperature-Control-Library.git
@@ -387,6 +508,7 @@ lib_ignore =
     WebServer
     UIPEthernet
     ESP_EEPROM
+    M5Stack
 lib_deps =
     https://github.com/anklimov/Arduino-Temperature-Control-Library.git
     https://github.com/anklimov/DS2482_OneWire
@@ -408,7 +530,7 @@ lib_deps =
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
 
-[env:stm32]
+[env:stm32-enc2860]
 platform = ststm32
 framework = arduino
 board = nucleo_f103rb
@@ -443,6 +565,7 @@ lib_ignore =
     EEPROM
     ClosedCube HDC1080
     SparkFun CCS811 Arduino Library
+    M5Stack
 lib_deps =
     https://github.com/anklimov/aJson
     https://github.com/anklimov/CmdArduino