Merge dev 0.10.2 maintance release

Combined
    Update readme for 0.10.2 maintaince release
    Update firmware hex files to 6.5 and 5.8
    Bugfix the 0bytes on update Pic firmware, by downgrading the core to 2.7.4
    Adding a little memory for use with larger settings... NTP longer FQDN fix
    Fix for hostname to wifi (credits to @hvxl)
    Removing git submodules from src tree

.github/workflows/release.yml

@@ -0,0 +1,24 @@
+name: release-workflow
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Build
+        run: echo ${{ github.sha }} > Release.txt
+      - name: Test
+        run: cat Release.txt
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            Release.txt
+            LICENSE

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "Arduino/libraries/aceTime"]
+	path = Arduino/libraries/aceTime
+	url = https://github.com/bxparks/AceTime
+[submodule "Arduino/libraries/Time"]
+	path = Arduino/libraries/Time
+	url = https://github.com/PaulStoffregen/Time.git

Makefile

@@ -12,7 +12,9 @@ CFLAGS = $(CFLAGS_DEFAULT)
 CLI := arduino-cli
 PLATFORM := esp8266:esp8266
 CFGFILE := arduino-cli.yaml
-ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json
+# bug in http stream, fallback to 2.7.4 
+# ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json
+ESP8266URL := https://github.com/esp8266/Arduino/releases/download/2.7.4/package_esp8266com_index.json
 LIBRARIES := libraries/WiFiManager libraries/ArduinoJson libraries/PubSubClient libraries/TelnetStream libraries/AceTime libraries/OneWire libraries/DallasTemperature
 BOARDS := arduino/package_esp8266com_index.json
 # PORT can be overridden by the environment or on the command line. E.g.:
@@ -78,7 +80,7 @@ libraries/PubSubClient:
 	$(CLI) lib install pubsubclient@2.8.0
 
 libraries/TelnetStream:
-	$(CLI) lib install TelnetStream@1.2.2
+	$(CLI) lib install TelnetStream@1.2.4
 
 libraries/AceTime:
 	$(CLI) lib install Acetime@2.0.1

OTGW-firmware.h

@@ -111,13 +111,13 @@ String    settingHostname = _HOSTNAME;
 bool      statusMQTTconnection = false; 
 bool      settingMQTTenable = true;
 bool      settingMQTTsecure = false; 
-String    settingMQTTbroker= "192.168.88.254";
+String    settingMQTTbroker= "homeassistant.local";
 int16_t   settingMQTTbrokerPort = 1883; 
 String    settingMQTTuser = "";
 String    settingMQTTpasswd = "";
 String    settingMQTThaprefix = HOME_ASSISTANT_DISCOVERY_PREFIX;
 bool      settingMQTTharebootdetection = true;
-String    settingMQTTtopTopic = "otgw";
+String    settingMQTTtopTopic = "OTGW";
 String    settingMQTTuniqueid = ""; // Intialized in readsettings
 bool      settingMQTTOTmessage = false;
 bool      settingNTPenable = true;

OTGW-firmware.ino

@@ -75,7 +75,6 @@ void setup() {
   startNTP();
 
   //start with setting wifi hostname
-  WiFi.hostname(String(settingHostname));
   startWiFi(CSTR(settingHostname), 240);  // timeout 240 seconds
   blinkLED(LED1, 3, 100);
   setLed(LED1, OFF);

README.md

@@ -54,12 +54,13 @@ The features of this Nodosop OpenTherm Gateware ESP8266 based firmware are:
 To do:
 - InfluxDB client to do direct logging 
 - Instant update of webUI using websockets
-- Showing log of OT messages using websockets847
+- Showing log of OT messages using websockets
 
 Looking for the documentation, go here (work in progress):  <br> https://github.com/rvdbreemen/OTGW-firmware/wiki/Documentation-of-OTGW-firmware
 
 | Version | Release notes |
 |-|-|
+| 0.10.2 | Bugfix: issue #213 which caused 0 bytes after update of PIC firwmare (dropped to Adruino core 2.7.4)<br>Update to filesystem to include latest PIC firmware (6.5 and 5.8, released 12 march 2023)<br>Fix: Back to correct hostname to wifi (credits to @hvxl)<br>Fix: Adding a little memory for use with larger settings.|
 | 0.10.1 | Beter build processes to generate consistant quality using aruidno-cli and github actions (Thx to @hvxl and @DaveDavenport)<br>Maintaince to sourcetree, removed cruft, time.h library, submodules<br>Fix: parsing VH Status Master correctly<br>Enhancement: Stopping send time commands on detections of PS=1 mode<br>Fix: Mistake in MQTT configuration of auto discovery template for OEM fault code<br>Added wifi quality indication (so you can understand better)<br>Remove: Boardtype, as it was static in compiletime building|
 | 0.10.0 | Updated: Added support fox 6.x firmware (pic16f1847) (Thanks to @hvxl / Schelte Bron)<br>Added reporting of "firmware type"<br>Improved: DHCP can override NTP settings now<br>Improved: Sending SC command on the minute (00 second), after reset ESP all commands (SR 21, SR 22) are resend<br>Bugfix: bitwise not bytewise AND operation for ASF flags OEM codes<br>Readout S0 output from configurable GPIO, interupt rtn added for this, enhanced Dallas-type sensor logic (autoconfigure, code cleanup) (Thanks to @RobR) <br>Web UI improvements by @rlagerwij and @Nicole|
 | 0.9.5 | Improved: WebUI improved by community<br>Bugfix: Device Online status indicator for Home Assistant<br>Improved: Update of 5.x series (pic16f88) firmwares, preparing for 6.x (pic16f1847) updates.<br>Bugfix: Prevent spamming OTGW firmware website in case of rebootloop<br>Added: Unique useragent|

data/pic16f1847/gateway.ver

@@ -1 +1 @@
-6.4
+6.5

data/pic16f88/gateway.hex

@@ -1,53 +1,53 @@
 :020000040000FA
-:080000008A1500278A11F72B75
+:080000008A1500278A11FB2B71
 :08000800F000030E8301F1007A
 :100010000408F2000A08B0008A111108F3008C18D5
-:10002000D1260D1B462630088A0072088400710E06
+:10002000DA260D1B4F2630088A0072088400710EF4
 :080030008300F00E700E0900C0
-:08003800761B4728761A842389
+:08003800761B4728761A882385
 :10004000402077087B06031DE601FB067F115A1747
-:100050009820EC01E11E4F23031932287F1D6119FE
-:1000600075280800E11A40207F155A13F8227F1DD9
+:100050009820EC01E11E5323031932287F1D6119FA
+:1000600075280800E11A40207F155A13FC227F1DD5
 :100070002F28DA12F700982075285A1B422808000A
 :100080007608FA007808B4007908B5000800D91598
-:1000900077084D0603196113761E84234F23F61A41
+:1000900077084D0603196113761E88235323F61A39
 :1000A000761E5C2803195728553980075F28770882
-:1000B0008A15AA228A115F28FF3AE01F8005E01303
+:1000B0008A15AC228A115F28FF3AE01F8005E01301
 :1000C000DA17DA188D287F196A2898207F196119A4
 :1000D000080075289820DA166119080040305A1F68
-:1000E00070303623DA135A1F98207908780677067D
+:1000E00070303A23DA135A1F982079087806770679
 :1000F000F6137606F400F40E7406F400F40CF40C17
 :10010000F4060130F418F4067418F6177F18080086
-:100110005230761B41308A15FC2C98205030F60066
+:100110005230761B41308A15FE2C98205030F60064
 :100120000430F700AA30F8003908F900DA10752811
-:10013000F71BBF2B00308A007708A13E03188A0AFC
-:1001400082003E2975299229BE2BA729B029B629FC
-:10015000BF2BC829D529DB2AE92ADB2AE92AE92984
-:10016000BF2BF729BE2BBF2BBF2B272ABF2BBF2BA3
-:10017000BF2BBF2BBE2BBF2B302A3A2ABF2BBF2B46
-:10018000BF2BBF2BBF2BBF2BBF2BBF2BBF2BBF2B1F
-:10019000BF2BBF2BBF2BBF2BBF2BBF2BBF2BBF2B0F
-:1001A000BF2B462A502ABF2BBF2BBF2BBF2BBF2BE9
-:1001B000BF2B5A2A7B2ABF2BBF2BBF2BBF2BBF2B9A
-:1001C000BF2BBF2BBF2BBF2BBF2BBF2BBF2BB92BE5
-:1001D000A12ABF2BBF2BBF2BBF2BBF2BBF2BBF2BEE
-:1001E000BF2BBF2BBF2BBF2BBF2BBF2BBF2BBF2BBF
-:1001F000BF2BDB2AE92ADB2AE92ABF2BBF2BBF2B27
-:10020000BF2BBF2BBF2BBF2BBF2BAA2AB92BBF2BBA
-:10021000BF2BBF2BDB2AE92ADB2AE92ABF2BBF2B06
-:10022000BF2BBF2BBF2BBF2BBF2BBF2BBF2BBF2B7E
-:10023000BF2BBF2BBF2BBF2BBF2BBF2BCA2AD02A54
-:10024000BF2B603027297A08C038F61F7F39760621
+:10013000F71BC32B00308A007708A13E03188A0AF8
+:1001400082003E2975299229C22BA729B029B629F8
+:10015000C32BC829D529DF2AED2ADF2AED2AE92970
+:10016000C32BF729C22BC32BC32B272AC32BC32B8B
+:10017000C32BC32BC22BC32B302A3A2AC32BC32B2E
+:10018000C32BC32BC32BC32BC32BC32BC32BC32BFF
+:10019000C32BC32BC32BC32BC32BC32BC32BC32BEF
+:1001A000C32B462A502AC32BC32BC32BC32BC32BD1
+:1001B000C32B5A2A7B2AC32BC32BC32BC32BC32B82
+:1001C000C32BC32BC32BC32BC32BC32BC32BBD2BC5
+:1001D000A12AC32BC32BC32BC32BC32BC32BC32BD2
+:1001E000C32BC32BC32BC32BC32BC32BC32BC32B9F
+:1001F000C32BDF2AED2ADF2AED2AC32BC32BC32B07
+:10020000C32BC32BC32BC32BC32BAA2ABD2BC32B9E
+:10021000C32BC32BDF2AED2ADF2AED2AC32BC32BE6
+:10022000C32BC32BC32BC32BC32BC32BC32BC32B5E
+:10023000C32BC32BC32BC32BC32BC32BCA2AD42A38
+:10024000C32B603027297A08C038F61F7F3976061D
 :10025000031D7F15F60600347806031D7F15F8068A
 :100260000034F61E08007A1E2129232134082C218F
 :1002700035087906031D7F15F9060034761B5929C8
-:10028000F2226209EE38ED1EFD39F4000301C41BB1
+:10028000F6226209EE38ED1EFD39F4000301C41BAD
 :10029000E11901386D1A02388316DA1F10388312FB
 :1002A000F405FF3A780574042C21780802394330AC
-:1002B000D52BF61A08007908B500413903195912EF
+:1002B000D92BF61A08007908B500413903195912EB
 :1002C000031D591A672959160530CD0061174D30A5
-:1002D000D523790808394630D523790804395730B1
-:1002E000D523790802394830D52B761B8E29F22286
+:1002D000D923790808394630D923790804395730A9
+:1002E000D923790802394830D92B761B8E29F6227A
 :1002F000611D7F197D29C41B08007616C41BE11DF2
 :1003000087294208031951082C2143083929030180
 :10031000C41F44082C21C41F45083929F61E0800B3
@@ -55,28 +55,28 @@
 :10033000392123297818DD16631A080079080B3C47
 :100340000319E31B0800E317DD1A63170800761F83
 :100350000800AA307802031D080023213908392932
-:10036000761BBF2B5F1A5F1B0800152A761F08003B
+:10036000761BC32B5F1A5F1B0800152A761F080037
 :100370000301F61E761AC0297908FC38601BE005D7
 :1003800061060339E10623216013780803382C291C
-:10039000761BBF2B8316DA1B7F19CF29D32976163C
+:10039000761BC32B8316DA1B7F19CF29D329761638
 :1003A0002C215B08392183120800761F0800DF1911
 :1003B000DB29F61E080023215F1E3A082C215F1E50
 :1003C0003B0839215F13E31ADF1D08005F1DDA14B3
-:1003D0000800761B0800F222D71B7F19F129611D46
+:1003D0000800761B0800F622D71B7F19F129611D42
 :1003E000080076165708D71B64302C213929761B54
 :1003F0003329DF195F1B08005F1A152A3B087902B1
 :10040000F4003A08031C013E7802031CFF3A031D66
 :100410001C2A031CF409E0307405031D1C2A5F1913
-:1004200008005F15DF134F30D72B5F123A083B04EB
+:1004200008005F15DF134F30DB2B5F123A083B04E7
 :100430000319242A5F1708005F1DDF0A5F1D0800EB
-:10044000631B242ABA01BB01DF014F30E32B761F67
+:10044000631B242ABA01BB01DF014F30E72B761F63
 :100450000800BF1B312923213E082C213F083929E0
 :10046000761B591C0800D918212923213C082C216E
 :100470003D083929761B6D1D0800611A21292321A9
 :10048000031730082C21310803133929761F08007F
-:100490006012F61ABF2B7808CF007908CE00BF2B68
-:1004A000761F0800E012F61ABF2B7808D1007908F1
-:1004B000D000BF2B761B682AC008761E601803196F
+:100490006012F61AC32B7808CF007908CE00C32B60
+:1004A000761F0800E012F61AC32B7808D1007908ED
+:1004B000D000C32B761B682AC008761E601803196B
 :1004C00008001030272140082C21410839213834F8
 :1004D0006010F61E3D28761E742A23214008031959
 :1004E0004F082C2141083929C00803190800C00110
@@ -84,407 +84,407 @@
 :10050000031908001030272142082C214308392103
 :100510003934E010F61E3D28761E952A2321420824
 :10052000031951082C2143083929C208031908006E
-:10053000C201C3011130FC01FD018A1564228A1138
+:10053000C201C3011130FC01FD018A1566228A1136
 :1005400008000310460C7F1D0318761B0800761662
 :1005500039212C29761F0800DF19B02AF61E080061
-:10056000DF1AD50E7F11BF237F19BD2A2321550E17
+:10056000DF1AD50E7F11C3237F19BD2A2321550E13
 :10057000033939216A1B79082C21631BDF1EC82A25
 :10058000550E5506031D5F1BC82A5F16DF155F1742
-:10059000DF120800761F0800232103302C2139299F
-:1005A000761FE31F080063137808143C0319E31651
-:1005B000031C63170800761F08007F19DA1FBF2B82
-:1005C0007808F61E03190800E700770ACD006117C6
-:1005D0000800761FB92B7F19E80A67086802031C18
-:1005E00061170800761B08004F23FF3A80050800BA
-:1005F0000030F600F801F901E0080319192BB101E8
-:1006000009235023031D072B3109E005FC2A750837
-:1006100008003117601B06343116601A3034B116E9
-:10062000E01A313431146018612AB114E018822ABA
-:100630000034611F202BE0176808F8004D080800FF
-:10064000E0014C08031D3F2B5A1A352B2030FE00C9
-:10065000DA1AC90A49081F39E03E8A11D6258A11DB
-:10066000031D0800FE0B292B5A167F117A04F60091
-:100670003408F8003508F9007B08F700080010304E
-:10068000F6007430FE00F4010314472BFE0AF40D4B
-:1006900074084C050319462BCC067E080800770821
-:1006A000F500750CF400740C1F39BA3E8400F51B7C
-:1006B0000034033075180C30F400F518F40E0009FE
-:1006C0007405F40E740E0800C334C1348F349F34A3
-:1006D0000234003403340334C03420340034003492
-:1006E00000340034F0340F340034043407340C3454
-:1006F0001234133413341534173419341A341A34A9
-:100700001A341A341A341E34770D031CF61A0800F2
-:10071000F400740E0F39F40077080739FE00FE0A62
-:10072000AA237406F4067406B10103100318B10A73
-:10073000F40CFE0B962B031C0800B123B107310DFE
-:10074000103E8400831778088000840A79088000AE
-:100750008313080003308A007408643E03188A0A71
-:100760008200F40003308A007408743E03188A0A79
-:100770008200DA1B7F1D761F0800C42BF222DA1BD1
-:100780007F1D761F0800B401B50177088A1559232B
-:100790008A11031D0800232183170008350439211D
-:1007A00084130008831334042C290319E32B5F3EC0
-:1007B00084000014FE30000503195434FF3A860506
-:1007C000F938E20554345F3E840000100008031934
-:0A07D000423486040639E204423484
-:0607DA009A08E91AF32B56
-:1007E000E901CC2C6B14EB148A1500278A11031332
-:1007F00083128601831660308F0007309B00E7303C
-:1008000085002730860003300E0640308E185030A9
-:10081000831203196B0E031E6030FF00031EFF15C9
-:10082000831603308E001930990018151812981687
-:10083000D5308100F93092008312003092008E0191
-:100840008F013130900098019817FF1D2D2C2B300F
-:100850008A15D1248A116119FF112030FB24A030A0
-:10086000FB2483171030FB24BF17C417D71781014F
-:100870000B1164000B1D392CFF1D181641309F0011
-:100880000030D625EA00E03883169D00DA170E30D6
-:10089000D625ED008A15E4228A11D425C000031D57
-:1008A0006014D425C100D425C200031DE014D42552
-:1008B000C30083160D178C141C0983010D13C03956
-:1008C000DB00FF3086005B1BF739DB1BEF3985004F
-:1008D0000B17FF1D8B17C9097030E0041430CE00D0
-:1008E0005030CF000A30D0005A30D1003D30D30014
-:1008F0000D30D625E3001030FE00FC01D030B100F1
-:100900003108D625FD007C08FD080319922CFC0057
-:100910000310FD0C031C902C8A1150238A118004B3
-:100920007C0A842C0730FC04FC0AB10AFE0B802CE4
-:1009300015308A15D1248A11F4010630D6258A157E
-:10094000D4208A11F40A0730D6258A15D4208A11BA
-:10095000F40A0830D6258A15D4208A11F40A093001
-:10096000D6258A15D4208A11F40A0A30D6258A158C
-:10097000D4208A11F40A0B30D6258A15D4208A1186
-:100980000130D625D8008A1587268A11FF1DCC2C68
-:100990004D308A11D7238A116400CB08031DB82576
-:1009A000FF19CC2C5A181B25DD1848250B195B257F
-:1009B0000C1881250C1BE0258A15B4268A115919BB
-:1009C000A325661BF22B8C1ECC2C1819ED2B981C22
-:1009D000EC2C18121816D9160325DA1DCC2C8A1502
-:1009E0000020B601DA118A150038031DC824D2246C
-:1009F0008A114425CC2C84008001840A04097039B2
-:100A0000031DFC2C08003608203E84001A08DA1961
-:100A1000080080000A3A03190800073A0319152D47
-:100A20003608013E831CB6000800B608031908000A
-:100A30008001DA1508008A15F9248A115A108A11E2
-:100A40001C208A117F182D2D611D2F2DDB16770894
-:100A50007B06031D442DD40A5412E601442D0130B7
-:100A6000DC00DB155B1658308A11D723761F423025
-:100A7000D723DD11761BDD152230B80083168C14C8
-:100A80008312F930910012158A1513258A11080076
-:100A9000DD105D1A5D1F502D5608803C031C0800B8
-:100AA0005D085E06503903190800DE068A153026F7
-:100AB000D1248A1108000B11D30B692DD919E60A2C
-:100AC000E1173D30D3006C0FEC0005306C020318C9
-:100AD0008511E91EE90A121D1F158A15FF18E22269
-:100AE0008A1564090319E401E408031D08258A1125
-:100AF000E508031DE50B080045308A11E3238A1140
-:100B000008000C10D21F8F25DF195F1908008030F4
-:100B1000DF065F054F308A11D5238A110800D20302
-:100B2000D21F0800DC308400001CBF17801CC417D3
-:100B30008316001DDA1783128A1507308005031DFE
-:100B4000AB218A1108004B083C3C031C08008A15A5
-:100B500020258A1122304A020318B32D2C308A1521
-:100B6000E1248A11080059118A15D2248A1108003B
-:100B70000C1E08003708903E84008317000883137A
-:100B80009900B70A503037060319B701CB030800A4
-:100B9000031783168C1C0800831203138C1EC82DA8
-:100BA000F50003257508C82D03170D0AC8258C010B
-:100BB00083128D0083160C1483120C080313080093
-:100BC0000C131E085606D60656065602031C003C99
-:100BD000FC39031D162E5608803C031C002E7A3C5F
-:100BE000031CFE2D611D0800343C031C182E6111EE
-:100BF000E1114E308A15D1248A110800E115012E29
-:100C0000E1116119182E611536308A15D1248A1127
-:100C100012118030DD055B17631EE301DF01BA01AD
-:100C2000BB0150308A11E3238A110800611D0800BE
-:100C30007F1CE11F08000030F600F801F901FA01FD
-:100C4000E1122D26F7008A1121208A11761A8423B9
-:100C50007708FB00E1138A112F2D06308A00540813
-:100C6000343E03188A0A8200003419340134442EB9
-:100C700011341B341C340E34442E00341934013426
-:0C0C800038343934442E1234E1160034AC
-:040C8C005D09831665
-:100C90001C0683120D135B06C039DB06611980390F
-:100CA000003803190800403903195D1D5A2EFF3022
-:100CB000E4000800031D5D19622E5D15B8080319D4
-:100CC0005B1A7D2EB80803199E2E03305C02031CAC
-:100CD000422F5B0D5D19803EB80B8B2E0318472FFA
-:100CE0005B184B2F5A148A115230E3235430E323FC
-:100CF000E3238A115D1112119B2EB8015B1218308B
-:100D0000DD1B08300506183985068A115830E323A3
-:100D1000E3238A11942E01300318DB06F90DF80D38
-:100D2000F70DF60DF9065B11DC0173089102063030
-:100D3000031C91028C106430810008001219AB2E44
-:100D4000E408031D9B2E273091001215DC01831649
-:100D50008C1483129B2E0A305C020318C32E5B0D89
-:100D60005D19803E03189B2EDC0803197B2E8A1127
-:100D70005230D7235D1D4230D7238A112130B8006D
-:100D80005B105B11942E32305C020318942E5D19B7
-:100D90005D1E942E5D1B5B1F942E4030DD06DB062E
-:100DA000942E8C10DC0A5B1AE92EB808031DE62E7F
-:100DB0005C08143C0319132F50305C02031C08001C
-:100DC00012115D115D18DD145D100800DC19492F4A
-:100DD00008005C180800B8080319042F5D09DB1926
-:100DE000183A0506DD1D0839DD1910398506DC18AD
-:100DF000102FDB110314F90DF80DF70DF60D031884
-:100E0000DB15DC01B803080012115B12DD19DB16DB
-:100E10008A115830E3235430E323E3238A11080076
-:100E20000830DB0608005B0D5D19803E031C0800DE
-:100E300040305D1D8030DD06DB065D1D352F5D1405
-:100E40007F18312FDD1E08005D0950390319080095
-:100E500010308506DD065D0550308A11D5238A11D4
-:100E600008005D11DB1F0800942E7F1C0800DD1BAD
-:100E700010305D06103903190800DD065D142B2FB4
-:100E80005B159B2E5B19EA1A402F01304C2F023064
-:100E90004C2F03304C2F0430E4080319E4005B0DA1
-:100EA0005D19803E031C1211B801DC015B128A112E
-:100EB0005830E3235230E323E3235430E3238A11F1
-:100EC00064090319692F45308A11D7238A117A30B2
-:040ED000E5009B2E70
-:0C0ED400031D812F07308A006E081F39B3
-:100EE000753E03188A0AEE0A8200842FE82F902F9D
-:100EF0000034842FE62F932F842FE82FA02FA22FCA
-:100F0000A62F0314BD270034851383168513C1272C
-:100F1000831685178312C427851B812FC2270134AE
-:100F20004430E9270034D5277408103A03190134F6
-:100F3000EE17383A031901340A3A03190134812FA4
-:100F4000BE30E92FD5277408EF000134D527EE1BFA
-:100F5000AF2F740C6F0CFC00FD01FD0CB92F6F0E50
-:100F6000F039FD00740EF039F4006F0E0F3974047F
-:100F7000FC00553A0319812F03108A15D121EE0187
-:100F80000134C227E830C52F363083168C10120288
-:100F900083120A3E910012158C1CCC2F12118C105A
-:100FA0000800D327D32700000800D627D927D92740
-:100FB000D927851383168513031085178312D2272B
-:100FC000851B0314F40C2D30C52708003330E92F9E
-:100FD000CC30F400EB27EE27EE27EE27F40C851338
-:100FE00083168513031885173230C5278316851796
-:040FF0008312013433
+:10059000DF120800761F08007808F61A2321FD3EB6
+:1005A000031808000330F529761FE31F08006313C2
+:1005B0007808143C0319E316031C63170800761F20
+:1005C00008007F19DA1FC32B7808F61E03190800EC
+:1005D000E700770ACD0061170800761FBD2B7F1951
+:1005E000E80A67086802031C61170800761B080008
+:1005F0005323FF3A800508000030F600F801F901A6
+:10060000E00803191D2BB1010D235423031D0B2BEF
+:100610003109E005002B750808003117601B06340E
+:100620003116601A3034B116E01A313431146018C2
+:10063000612AB114E018822A0034611F242BE017CC
+:100640006808F8004D080800E0014C08031D432B22
+:100650005A1A392B2030FE00DA1AC90A49081F3904
+:10066000E03E8A11E2258A11031D0800FE0B2D2BA6
+:100670005A167F117A04F6003408F8003508F9009C
+:100680007B08F70008001030F6007430FE00F4011B
+:1006900003144B2BFE0AF40D74084C0503194A2B66
+:1006A000CC067E0808007708F500750CF400740C81
+:1006B0001F39BA3E8400F51B0034033075180C3026
+:1006C000F400F518F40E00097405F40E740E080019
+:1006D000C334C1348F349F340234003403340334C0
+:1006E000C03420340034003400340034F0340F348B
+:1006F0000034043407340C341234133413341534F6
+:10070000173419341A341A341A341A341A341E3479
+:10071000770D031CF61A0800F400740E0F39F4006C
+:1007200077080739FE00FE0AAE237406F406740645
+:10073000B10103100318B10AF40CFE0B9A2B031C31
+:100740000800B523B107310D103E840083177808E7
+:100750008000840A790880008313080003308A002F
+:100760007408683E03188A0A8200F40003308A0085
+:100770007408783E03188A0A8200DA1B7F1D761FF0
+:100780000800C82BF622DA1B7F1D761F0800B40173
+:10079000B50177088A155B238A11031D0800232100
+:1007A00083170008350439218413000883133404A7
+:1007B0002C290319E72B5F3E84000014FE3000054E
+:1007C00003195434FF3A8605F938E20554345F3E84
+:1007D0008400001000080319423486040639E2043C
+:0207E0004234A1
+:0E07E2009A08E91AF72BE901D02C6B14EB14DE
+:1007F0008A1500278A11031383128601831660303D
+:100800008F0007309B00E7308500273086000330DB
+:100810000E0640308E185030831203196B0E031EE3
+:100820006030FF00031EFF15831603308E00193061
+:100830009900181518129816D5308100F9309200D9
+:100840008312003092008E018F01313090009801A8
+:100850009817FF1D312C2B308A15D3248A1161196A
+:10086000FF112030FF24A030FF2483171030FF2415
+:10087000BF17C417D71781010B1164000B1D3D2C46
+:10088000FF1D181641309F000030E225EA00E038D5
+:1008900083169D00DA170E30E225ED008A15E62258
+:1008A0008A11E025C000031D6014E025C100E02589
+:1008B000C200031DE014E025C30083160D178C143D
+:1008C0001C0983010D13C039DB00FF3086005B1B60
+:1008D000F739DB1BEF3985000B17FF1D8B17C90993
+:1008E0007030E0041430CE005030CF000A30D00019
+:1008F0005A30D1003D30D3000D30E225E3001030F6
+:10090000FE00FC01D030B1003108E225FD007C087A
+:10091000FD080319962CFC000310FD0C031C942CFD
+:100920008A1154238A1180047C0A882C0730FC0425
+:10093000FC0AB10AFE0B842C15308A15D3248A11C7
+:10094000F4010630E2258A15D4208A11F40A073012
+:10095000E2258A15D4208A11F40A0830E2258A1586
+:10096000D4208A11F40A0930E2258A15D4208A118C
+:10097000F40A0A30E2258A15D4208A11F40A0B30D1
+:10098000E2258A15D4208A110130E225D8008A1583
+:1009900089268A11FF1DD02C4D308A11DB238A1144
+:1009A0006400CB08031DC425FF19D02C5A181F253D
+:1009B000DD184C250B195F250C1885250C1BEC2523
+:1009C0008A15B6268A115919AF25661BF62B8C1E7F
+:1009D000D02C1819F12B981CF02C18121816D916B7
+:1009E0000725DA1DD02C8A150020B601DA118A15E8
+:1009F0000038031DCA24D4248A114825D02C840031
+:100A00008001840A04097039031D002D080036088E
+:100A1000203E84001A08DA19080080000A3A0319F7
+:100A20000800073A0319192D3608013E831CB60049
+:100A30000800B608031908008001DA1508008A15B5
+:100A4000FB248A115A108A111C208A117F18312D1B
+:100A5000611D332DDB1677087B06031D482DD40A54
+:100A60005412E601482D0130DC00DB155B165830CE
+:100A70008A11DB23761F4230DB23DD11761BDD1567
+:100A80002230B80083168C148312F93091001215AD
+:100A90008A1515258A110800DD105D1A5D1F542D79
+:100AA0005608803C031C08005D085E065039031997
+:100AB0000800DE068A153226D3248A1108000B119D
+:100AC000D30B6D2DD919E60AE1173D30D3006C0F19
+:100AD000EC0005306C0203188511E91EE90A121DAD
+:100AE0001F158A15FF18E4228A1564090319E40109
+:100AF000E408031D0A258A11E508031DE50B08001B
+:100B000045308A11E7238A1108000C10D21F932563
+:100B1000DF195F1908008030DF065F054F308A114A
+:100B2000D9238A110800D203D21F0800DC308400C8
+:100B3000001CBF174408F839801C0319A02DC417E6
+:100B400083165A08F839001D0319A72DDA178312E6
+:100B50008A1507308005031DAB218A1108004B0858
+:100B60003C3C031C08008A1522258A1122304A02C7
+:100B70000318BF2D2C308A15E3248A11080059115F
+:100B80008A15D4248A1108000C1E08003708903EEC
+:100B900084008317000883139900B70A5030370682
+:100BA0000319B701CB030800031783168C1C080038
+:100BB000831203138C1ED42DF50007257508D42D40
+:100BC00003170D0AD4258C0183128D0083160C1493
+:100BD00083120C08031308000C131E085606D606D1
+:100BE00056065602031C003CFC39031D1F2E5608F6
+:100BF000803C031C0C2E7A3C031C0A2E611D08004D
+:100C0000343C031C212ED330E1054E308A15D32409
+:100C10008A110800E1150D2EE1116119212E6115CF
+:100C200036308A15D3248A1112118030DD055B1706
+:100C3000631EE301DF01BA01BB015030812D611D4C
+:100C400008007F1CE11F08000030F600F801F901E0
+:100C5000FA01E1123626F7008A1121208A11761A4C
+:100C600088237708FB00E1138A11332D06308A00B0
+:100C700054083D3E03188A0A8200003419340134B6
+:100C80004D2E11341B341C340E344D2E00341934C7
+:0E0C90000134383439344D2E1234E11600345C
+:020C9E005D09EE
+:100CA00083161C0683120D135B06C039DB0661191F
+:100CB0008039003803190800403903195D1D632E7F
+:100CC000FF30E4000800031D5D196B2E5D15B808A8
+:100CD00003195B1A862EB8080319A72E03305C028D
+:100CE000031C482F5B0D5D19803EB80B942E031832
+:100CF0004D2F5B18512F5A148A115230E72354306C
+:100D0000E723E7238A115D111211A42EB8015B12AB
+:100D10001830DD1B08300506183985068A11583051
+:100D2000E723E7238A119D2E01300318DB06F90D16
+:100D3000F80DF70DF60DF9065B11DC017308910251
+:100D40000630031C91028C106430810008001219D7
+:100D5000B42EE408031DA42E273091001215DC01E7
+:100D600083168C148312A42E0A305C020318CC2E36
+:100D70005B0D5D19803E0318A42EDC080319842E38
+:100D80008A115230DB235D1D4230DB238A11213072
+:100D9000B8005B105B119D2E32305C0203189D2E53
+:100DA0005D195D1E9D2E5D1B5B1F9D2E4030DD0677
+:100DB000DB069D2E8C10DC0A5B1AF22EB808031D90
+:100DC000EF2E5C08143C0319192F50305C02031CF1
+:100DD000080012115D115D18DD145D100800DC19AA
+:100DE0004F2F08005C1808005D09DB19183A05064A
+:100DF000DD1D0839DD1910398506DC18162FDB11C9
+:100E00000314F90DF80DF70DF60D0318DB15DC01D1
+:100E1000B80B080012115B12DD19DB168A1158306D
+:100E2000E7235430E723E7238A1108000830DB0664
+:100E300008005B0D5D19803E031C080040305D1DFD
+:100E40008030DD06DB065D1D3B2F5D147F18372FDC
+:100E5000DD1E08005D0950390319080010308506B1
+:100E6000DD065D0550308A11D9238A1108005D1115
+:100E7000DB1F08009D2E7F1C0800DD1B10305D0667
+:100E8000103903190800DD065D14312F5B15A42EFF
+:100E90005B19EA1A462F0130522F0230522F0330CD
+:100EA000522F0430E4080319E4005B0D5D19803E05
+:100EB000031C1211B801DC015B128A115830E723C0
+:100EC0005230E723E7235430E7238A1164090319DA
+:100ED0006F2F45308A11DB238A117A30E500A42E6A
+:100EE000031D872F07308A006E081F397B3E0318C9
+:100EF0008A0AEE0A82008A2FEE2F962F00348A2F5C
+:100F0000EC2F992F8A2FEE2FA62FA82FAC2F03148A
+:100F1000C3270034851383168513C72783168517C7
+:100F20008312CA27851B872FC82701344430EF2737
+:100F30000034DB277408103A03190134EE17383AED
+:100F4000031901340A3A03190134872FBE30EF2FF9
+:100F5000DB277408EF000134DB27EE1BB52F740C80
+:100F60006F0CFC00FD01FD0CBF2F6F0EF039FD0072
+:100F7000740EF039F4006F0E0F397404FC00553A0A
+:100F80000319872F03108A15D121EE010134C827D8
+:100F9000E830CB2F363083168C10120283120A3EB3
+:100FA000910012158C1CD22F12118C100800D92719
+:100FB000D92700000800DC27DF27DF27DF2785137C
+:100FC00083168513031085178312D827851B0314F6
+:100FD000F40C2D30CB2708003330EF2FCC30F40049
+:100FE000F127F427F427F427F40C851383168513CF
+:100FF000031885173230CB278316851783120134E7
 :10100000D91A402804303602031C663422083D3CBD
-:10101000031D663420088A15E1242108E1243A30B2
-:10102000E1242030E12408308A0020082106F40061
-:10103000E039031DA52C7408203E03188A0A82009B
+:10101000031D663420088A15E3242108E3243A30AE
+:10102000E3242030E32408308A0020082106F4005D
+:10103000E039031DA72C7408203E03188A0A820099
 :1010400042284D2855285D2862286A28F2287228EF
 :10105000BA28BA28BA2879286334BA28BA28BA280C
 :101060007E288928912863349628633463349B282A
 :10107000633463346334A028A828AD286334B528CA
 :10108000D91275342008543A03192C29153A03193A
-:10109000872A0C3A0319042B63342008523A0319A7
-:1010A000B52B013A0319162B63342008503A031963
-:1010B000122B1B3A0319792B63342008503A031979
-:1010C000142B63342008563A0319452A053A0319AC
-:1010D000682963342008443A03199E2A123A0319F6
-:1010E000B529F22820084F3A0319B02B1B3AFA2AE7
-:1010F00063342008433A03193E2A63342008533AE4
-:101100000319F229143A0319CF2A043A03199C2926
-:1011100063342008433A03194C2B103A0319602911
-:1011200063342008463A0319B72A63342008443A46
-:101130000319E82963342008543A03192729633432
+:10109000892A0C3A0319062B63342008523A0319A3
+:1010A000B72B013A0319182B63342008503A03195F
+:1010B000142B1B3A03197B2B63342008503A031975
+:1010C000162B63342008563A0319472A053A0319A8
+:1010D000682963342008443A0319A02A123A0319F4
+:1010E000B529F22820084F3A0319B22B1B3AFC2AE3
+:1010F00063342008433A0319402A63342008533AE2
+:101100000319F429143A0319D12A043A03199C2922
+:1011100063342008433A03194E2B103A031960290F
+:1011200063342008463A0319B92A63342008443A44
+:101130000319EA2963342008543A03192729633430
 :1011400020084F3A0319C4291C3A03198229633431
-:101150002008553A0319652B63342008493A0319CE
-:10116000A32B193A0319DF2B63342008483A0319DB
-:101170002E2A633420084C3A031D63343608043C9D
+:101150002008553A0319672B63342008493A0319CC
+:10116000A52B193A0319E12B63342008483A0319D7
+:10117000302A633420084C3A031D63343608043C9B
 :10118000031D66342308F4005A3C193C031C6C34DC
-:1011900041302102063E6E2223088A15E1248A1579
+:1011900041302102063E702223088A15E3248A1575
 :1011A00041302102F4002308FC000830F4184030DC
 :1011B00074190230B10003107418B10DA03084000E
 :1011C0001A30FE0031098005840AFE0BE3287C08F2
 :1011D0005F3E8400310880047C08001C03158A11DE
-:1011E000D52300342008473C031D63343608043CF3
+:1011E000D92300342008473C031D63343608043CEF
 :1011F000031D663430302302F400F839031D6634D1
 :10120000F030211809295805703C03195910F40EC3
-:101210000F3058057404D800F40001306E226217B4
-:10122000E213C030211CE2068A158C265808211CC6
-:10123000580E07398A15DF2C03103608043A031DAF
-:1012400066342308313C013C031808006C34322416
-:101250000318080001303029322403180800033035
+:101210000F3058057404D800F400013070226217B2
+:10122000E213C030211CE2068A158E265808211CC4
+:10123000580E07398A15E12C03103608043A031DAD
+:1012400066342308313C013C031808006C34342414
+:101250000318080001303029342403180800033033
 :101260003221CF2955060F39D5060030631F3D299D
 :101270003A083B04031D5F161030DF057D08BB00F4
 :101280007C08BA00DF155F17DF16B901E31ADA141C
-:101290003B0403195C29E31E08003A087E247D08FC
-:1012A000B9003B087E247C08B907FD1BB90A3A083F
+:101290003B0403195C29E31E08003A0880247D08FA
+:1012A000B9003B0880247C08B907FD1BB90A3A083D
 :1012B000FC003B08FD0008005F165510D510080023
-:1012C0003224031808000319663402306422CF293F
-:1012D000362403180800031977294E08A024031C9C
-:1012E0006C344F08A024031D031C79296C34601052
+:1012C0003424031808000319663402306622CF293B
+:1012D000382403180800031977294E08A224031C98
+:1012E0006C344F08A224031D031C79296C34601050
 :1012F0007B29611860147D08C1007C08C0000F3094
-:101300006422CF29362403180800031991295008B4
-:10131000A024031C6C345108A024031D031C932932
+:101300006622CF29382403180800031991295008B0
+:10131000A224031C6C345108A224031D031C93292E
 :101320006C34E0109529E118E0147D08C3007C08B6
-:10133000C20011306422CF29242403180800C400FD
+:10133000C20011306622CF29262403180800C400F9
 :101340007D08C5007C040319A929AB21031C801466
 :10135000CF29C417CF29DC308400520DD21F0800DA
-:10136000F83080057830D2000800ED230318C22938
+:10136000F83080057830D2000800EF230318C22936
 :101370008008031D6634643C031C7234740DC6007F
-:101380008A15832DC601CB2936240318CA29FC1FD0
-:101390007C1FCE2959102D308A15E12CD8218A15B1
-:1013A0006B2D30306D1DD8296116031C6112DF29A9
-:1013B0005914D914031CD9103C30E0212E30831766
-:1013C00084007C088000840A7D0880008313080064
-:1013D0003608053C031D6634072403180800C700BF
-:1013E0008A15D62CED2303180800BE00173C031CF9
-:1013F000723400083A3C031D6634840AEE23031855
-:101400006634BF003B3C031C723400082F3C031DB4
-:101410006634840A30300002031D031C6C34F4006F
-:10142000F839031D6C34840A8008031D6634F40EF9
-:101430000310740DBE04AB21031C00143E081F39B9
-:10144000F4008A1591253F08F4003A3090252F309A
-:10145000E1243E0EF400740C0739DF2C3608043CFE
-:10146000031D66346D12ED122308313C0319ED168D
-:10147000FE3903196D165B228A15292E1C21031CC7
-:1014800008006210031962141A293608043C031D6F
-:1014900066342308393C093C031C6C34033EF400D9
-:1014A000E03883169D008312E0306A057404EA0078
-:1014B0006C228A15FE2D6D08F4000E306E2A8A11FA
-:1014C000C8258A15831208005F228D007C087122CE
-:1014D0005F228D0A7D08712AF40000305F228D00A2
-:1014E0007408031783160C1483120C060319842A3C
-:1014F0008C0683160C158B1355308D00AA308D0089
-:101500008C148B170C1183120C0803130800ED23A5
-:1015100003180800031972348008031D66345A1238
-:10152000E0308A11D6258A1503199B2A03170D0F5F
-:10153000912A0313693470228A15822DED23031832
-:101540000800031972348008031D6634AA22031DA3
-:101550000800C029F400E0308A11D6258A157406E7
-:101560000319712A03170D0FAC2A03136F343608C1
-:10157000043C031D6634E3012308433A0319E316D0
-:101580000A3A031963171A3A03196316E308031D8D
-:1015900063166308F4000D306E228A15382E360863
-:1015A000043C031D66341C21031CF02A6D14ED0657
-:1015B0007F060139031DE02AFF14E222FF18A30071
-:1015C0005B22AE2B121950347F106D1CFF197F1453
-:1015D00003307F18063083169C008312FF1008002A
-:1015E0002308523C031D6C346B148610831686103E
-:1015F0008A11002823084F3A031D1D3A031D6C343D
-:101600006D11231C6D15E02AED230318102B8008A3
-:10161000031D6634643C031C7234643CD7009C2A6E
-:10162000D717CB298A15D02D8A15632EED230318E1
-:10163000080003196C34F5003A300002031D6634CB
-:10164000840AFC01EE230318080080080319342BD8
-:10165000FC002C300002031D6634840AEE230318BC
-:1016600008008008031D6634FD007508592303191E
-:101670003D2B03015923031D693483177D08800026
-:1016800084137C08800083138417750880008A15F2
-:1016900082253A30E1247D2DED230318080003193B
-:1016A0006C348008031D66345923031D6F34800198
-:1016B000C029F400E0308400000874060319080013
-:1016C00001308407831C5C2B0034ED2303180800D1
-:1016D000031DFC00FC1B6C348008031D66348A115A
-:1016E00050238A1580047C088D23740471227C08A1
-:1016F0009C2AED2303180800031DFC00FC1B6C341E
-:101700008008031D66348A1150238A15FF3A80052C
-:101710007C088D23F4097405762B9723F50E750D3F
-:10172000750D1F39D03E8A11D6258A150800031081
-:10173000F5000130F5180430F4007518F40D751932
-:10174000F40E740808001C21031C08002030231824
-:10175000EA04FF3A231CEA056A086C222308CC2914
-:101760001C21031C08004030A72B3608063C031D33
-:1017700066340130F4002308483A0319C52B1F3A98
-:10178000031D66340430F40012302406423A031973
-:10179000CE2B123A031D66340310F40D2508533A7C
-:1017A0000319D62B1B3A031D6634F40E7408CC04BF
-:1017B00023088A15E1242408E1242508E12CED23DF
-:1017C000031808008008031D6634CD006117E70187
-:1017D000E8019C2A233084000800EA230008393CF1
-:1017E000093C031C7C2CF400840A0008393C093CA9
-:1017F000031C052CB1001A307402031872347408EB
-:101800008A243107031CF32B723474080800EA237E
-:10181000112403180800F400F40E1124031C7404AE
-:10182000080030300002031C7C2CF63E031C202CE8
-:10183000DF39F93E031C7C2CFA3E03186634063E61
-:101840000A3E840A03100800322483140318080097
-:101850009C3E8310031C752C031D7234FD08031D70
-:101860007234752CEA2300082D3C3C2CEA235917CE
-:1018700000082D3C03193F2C5913023C0319840A1C
-:10188000EE2303180800FC0100080319622C2E3C0B
-:10189000031D7C2C0730FE00840A00080319622C0B
-:1018A000393C093C031C7C2C7E198A24FE18FC0759
-:1018B0000310FE0CFE080319031C4C2CFB3E0318FE
-:1018C000FC0A4C2C591F6B2CF409FC0803197A2CC8
-:1018D0007C08643CFC00FD0190240318F40AB20863
-:1018E000031D013EFD007408FC007C080319FD087F
-:1018F00003100800F40A6B2C03146634FC01FD008D
-:1019000086248624FD070318FC0A08000310FD0D39
-:10191000FC0D0800B200B207B20DB207320D08008C
-:101920001030FE00B101B201FD0DFC0DB20D6430AE
-:1019300032020318B200B10DFE0B942C31080800DE
-:101940007C02031D0800FD0808002108323A031D2F
-:1019500063342008433A0319B72C0B3A031D633450
-:101960001C21031C08006212031962161A29242480
-:10197000031808008316DA007D08DB007C040319D5
-:10198000C52C5C158312AB21CF29DA178312CF291E
-:101990008A11D6258A1503190800E12403170D0AB8
-:1019A000C82CC8240D30E1240A30E12CF500750E56
-:1019B000DA2475080F39F63E0318073E0A3ED91798
-:1019C000303ECB0803190C1EE72C9900003484002C
-:1019D00037084B07B03E031C503E903E0406840679
-:1019E00004068317800083134B08503A031DCB0A6B
-:1019F00000345430761B42305A190800E12476082E
-:101A0000D6247708D6247808D6247908D624D22C70
-:101A1000DD1808008E30C8246408D624D22445304E
-:101A2000641CFC24E4014708031908008400000832
-:101A3000F4004708D6243D30E1247408D624D22C83
-:101A40004A084A07103E840083170008FC00840AF5
-:101A50000008FD0083130D308A004A08CA0A333E8D
-:101A600003188A0A8200552D6D2D552D6D2D6D2D73
-:101A70006D2D7D2D6D2D6D2D6D2D6D2D6D2D6D2D86
-:101A80006D2D6D2D6B2D6D2D6D2DA12D7D2D7D2D34
-:101A90006D2D6D2D552D812D812DA32DA32DA32DC4
-:101AA000A32DA32DA32DA32DA32D7C085A252F30C4
-:101AB000E1247D08F4000830FE00F40D6225FE0BE1
-:101AC0005D2D0800140DDF2CFC09FD09FD0A03192A
-:101AD000FC0A2D30E12CFC1B64257D0F712DFC0AC6
-:101AE000FD017C0882256430F4007D087626FD1B0C
-:101AF000FC0A7C08F4002E30902D7C0882252F30C3
-:101B0000E1247D08F4007408D9139C3E031C922D37
-:101B1000F4009C3E031C8F2DF4003230902D3130A8
-:101B2000E124D917FE017408F400F63E031C9A2D37
-:101B3000FE0A942D7E080319D91B9F257408D91716
-:101B4000DF2CFC1B64251030FE00B101B201B30193
-:101B5000AF2D3308C025B3003208C025B200FD0DFB
-:101B6000FC0DB30DB20DB10DFE0BA92DD91331082B
-:101B7000C7253208C7253308C725D91B0800DF2C25
-:101B8000333EF400F41DFD3EF41FD03E0800F40087
-:101B9000740ECB2574080F390319D91BDF2C0800EC
-:101BA0003608043C031D66340D308A0023085A3C75
-:101BB000193C031C6C34DF3E03188A0A820013347C
-:101BC0009534A8345E2E6C346C34502E6C344A2E0E
-:101BD0006C346C3404341B2E6C34012E2F2E202ECA
-:101BE000372E532E422E6C34FD2D282E6C346C343F
-:101BF0006C342308E1243D30E12CF9256A08FD3ED0
-:101C0000DA2CF925DF084E300319E12C3A083B04A1
-:101C10006E300319E12C550E55060F39DF1ED5061F
-:101C20005430D51C43305F1D2038E1243A08FC00B5
-:101C30003B08FD006D2DF92547307F184D30E12C14
-:101C4000F9257F0E0739B03E8A11D6258A15E12C79
-:101C5000F9253030ED1A31306D1E4130E12CF92577
-:101C60005D1E843478305D1B7F30C8248734F925AD
-:101C70004430631A5330E31B5230E31A4330631B82
-:101C80004930E12CF9256A0EF400F40CF40C6225BD
-:101C9000F40C622DF925050D803E6225050D622D9F
-:101CA000F925580ED62CF92502308A11D6258A1529
-:101CB000FC008A11D4258A15FD006D2DF9254F30C1
-:101CC0006D195230E12C3608043C031D663423089C
-:101CD000313C013C031C6C340319722ECA015915A6
-:101CE0005A15742E59115A118A15DF2CFC01FD0169
-:101CF000083AFE00083AFE060310FD0DFC0DF40D37
-:0E1D00000318FD070318FC0AFE0B7C2E0800DA
-:021D0E0062175A
-:101D1000E2138C266213E2170E308A005808E21B89
-:101D2000580E0739963E03188A0A8200A12EAD2E5E
-:101D3000B02EB02EB02EA12EA12E9E2EF030E21F7E
-:101D4000D8056208C0398316850483120800620929
-:101D50003F388316850583120800A72685050800ED
-:101D6000A726FF3A850408006217E213B92662131A
-:101D7000E2170E308A005808E21B580E0739C33E9E
-:101D800003188A0A8200080008000800CB2ED22E11
-:101D9000E32EE52ED92E0508E21805096205C039A3
-:101DA000850608000508621905096205C03985061F
-:101DB0000800DB1E0800B8088A116A278A15003857
-:101DC0000319DB1208000509E62E05086205C03973
-:101DD000031DF02EE21D0800E211FC01FD01FA2EA8
-:101DE000E2190800E21502308A11D625FC00D4253C
-:0C1DF000FD0001308A1532218A15080020
+:101380008A15852DC601CB2938240318CA29FC1FCC
+:101390007C1FCE2959102D308A15E32CD9218A15AE
+:1013A0006D2D6D1DD92961160318080061123030AA
+:1013B000E1295914D91403180800D9103C30E2214E
+:1013C0002E30831784007C088000840A7D0880000A
+:1013D000831308003608053C031D663409240318EE
+:1013E0000800C7008A15D82CEF2303180800BE0098
+:1013F000173C031C723400083A3C031D6634840A0F
+:10140000F02303186634BF003B3C031C7234000811
+:101410002F3C031D6634840A30300002031D031C78
+:101420006C34F400F839031D6C34840A8008031D01
+:101430006634F40E0310740DBE04AB21031C0014BB
+:101440003E081F39F4008A1593253F08F4003A300E
+:1014500092252F30E3243E0EF400740C0739E12C62
+:101460003608043C031D66346D12ED122308313C2E
+:101470000319ED16FE3903196D165D228A152B2E00
+:101480001C21031C08006210031962141A29360873
+:10149000043C031D66342308393C093C031C6C34AE
+:1014A000033EF400E03883169D008312E0306A05A5
+:1014B0007404EA006E228A15002E6D08F4000E30C6
+:1014C000702A8A11D4258A158312080061228D00A2
+:1014D0007C08732261228D0A7D08732AF400003093
+:1014E00061228D007408031783160C1483120C06F6
+:1014F0000319862A8C0683160C158B1355308D0024
+:10150000AA308D008C148B170C1183120C08031356
+:101510000800EF2303180800031972348008031D24
+:1015200066345A12E0308A11E2258A1503199D2A81
+:1015300003170D0F932A0313693472228A15842D21
+:10154000EF2303180800031972348008031D663462
+:10155000AC22031D0800C029F400E0308A11E22506
+:101560008A1574060319732A03170D0FAE2A031385
+:101570006F343608043C031D6634E3012308433A04
+:101580000319E3160A3A031963171A3A0319631683
+:10159000E308031D63166308F4000D3070228A15FA
+:1015A0003A2E3608043C031D66341C21031CF22A23
+:1015B0006D14ED067F060139031DE22AFF14E422B3
+:1015C000FF18A3005D22B02B121950347F106D1C40
+:1015D000FF197F1403307F18063083169C00831296
+:1015E000FF1008002308523C031D6C346B14861056
+:1015F000831686108A11002823084F3A031D1D3ACE
+:10160000031D6C346D11231C6D15E22AEF230318A2
+:10161000122B8008031D6634643C031C7234643C46
+:10162000D7009E2AD717CB298A15D22D8A15652E69
+:10163000EF230318080003196C34F5003A30000258
+:10164000031D6634840AFC01F02303180800800897
+:101650000319362BFC002C300002031D6634840A6B
+:10166000F023031808008008031D6634FD00750888
+:101670005B2303193F2B03015B23031D693483178D
+:101680007D08800084137C0880008313841775080C
+:1016900080008A1584253A30E3247F2DEF23031838
+:1016A000080003196C348008031D66345B23031D96
+:1016B0006F348001C029F400E03084000008740613
+:1016C0000319080001308407831C5E2B0034EF23CC
+:1016D00003180800031DFC00FC1B6C348008031D6C
+:1016E00066348A1154238A1580047C088F2374047D
+:1016F00073227C089E2AEF2303180800031DFC00B8
+:10170000FC1B6C348008031D66348A1154238A152F
+:10171000FF3A80057C088F23F4097405782B992300
+:10172000F50E750D750D1F39D03E8A11E2258A150B
+:1017300008000310F5000130F5180430F4007518A6
+:10174000F40D7519F40E740808001C21031C080020
+:1017500020302318EA04FF3A231CEA056A086E22A7
+:101760002308CC291C21031C08004030A92B360873
+:10177000063C031D66340130F4002308483A03197F
+:10178000C72B1F3A031D66340430F40012302406C0
+:10179000423A0319D02B123A031D66340310F40D9C
+:1017A0002508533A0319D82B1B3A031D6634F40E4F
+:1017B0007408CC0423088A15E3242408E3242508AC
+:1017C000E32CEF23031808008008031D6634CD00C6
+:1017D0006117E701E8019E2A233084000800EC230A
+:1017E0000008393C093C031C7E2CF400840A0008E4
+:1017F000393C093C031C072CB1001A307402031851
+:10180000723474088C243107031CF52B723474086D
+:101810000800EC23132403180800F400F40E13242A
+:10182000031C7404080030300002031C7E2CF63EBA
+:10183000031C222CDF39F93E031C7E2CFA3E0318D0
+:101840006634063E0A3E840A0310080034248314DA
+:10185000031808009C3E8310031C772C031D723470
+:10186000FD08031D7234772CEC2300082D3C3E2C20
+:10187000EC23591700082D3C0319412C5913023C45
+:101880000319840AF02303180800FC010008031957
+:10189000642C2E3C031D7E2C0730FE00840A0008B9
+:1018A0000319642C393C093C031C7E2C7E198C24C2
+:1018B000FE18FC070310FE0CFE080319031C4E2C37
+:1018C000FB3E0318FC0A4E2C591F6D2CF409FC0832
+:1018D00003197C2C7C08643CFC00FD019224031855
+:1018E000F40AB208031D013EFD007408FC007C08E8
+:1018F0000319FD0803100800F40A6D2C0314663464
+:10190000FC01FD0088248824FD070318FC0A080058
+:101910000310FD0DFC0D0800B200B207B20DB207B6
+:10192000320D08001030FE00B101B201FD0DFC0DBA
+:10193000B20D643032020318B200B10DFE0B962CCA
+:10194000310808007C02031D0800FD08080021087A
+:10195000323A031D63342008433A0319B92C0B3A79
+:10196000031D63341C21031C080062120319621654
+:101970001A292624031808008316DA007D08DB00E4
+:101980007C040319C72C5C158312AB21CF29DA170D
+:041990008312CF29C6
+:0C1994008A11E2258A1503190800E324DB
+:1019A00003170D0ACA2CCA240D30E3240A30E32C95
+:1019B000F500750EDC2475080F39F63E0318073E56
+:1019C0000A3ED917303ECB0803190C1EE92C9900AA
+:1019D0000034840037084B07B03E031C503E903E55
+:1019E0000406840604068317800083134B08503ACC
+:1019F000031DCB0A00345430761B42305A190800BC
+:101A0000E3247608D8247708D8247808D8247908DD
+:101A1000D824D42CDD1808008E30CA246408D824B9
+:101A2000D4244530641CFE24E4014708031908004F
+:101A300084000008F4004708D8243D30E3247408EB
+:101A4000D824D42C4A084A07103E84008317000883
+:101A5000FC00840A0008FD0083130D308A004A0848
+:101A6000CA0A353E03188A0A8200572D6F2D572D5A
+:101A70006F2D6F2D6F2D7F2D6F2D6F2D6F2D6F2D76
+:101A80006F2D6F2D6F2D6F2D6D2D6F2D6F2DA32D44
+:101A90007F2D7F2D6F2D6F2D572D832D832DA52D00
+:101AA000A52DA52DA52DA52DA52DA52DA52D7C08F4
+:101AB0005C252F30E3247D08F4000830FE00F40D8F
+:101AC0006425FE0B5F2D0800140DE12CFC09FD09B7
+:101AD000FD0A0319FC0A2D30E32CFC1B66257D0F43
+:101AE000732DFC0AFD017C0884256430F4007D0818
+:101AF0007826FD1BFC0A7C08F4002E30922D7C0811
+:101B000084252F30E3247D08F4007408D9139C3E0B
+:101B1000031C942DF4009C3E031C912DF4003230E4
+:101B2000922D3130E324D917FE017408F400F63EFB
+:101B3000031C9C2DFE0A962D7E080319D91BA12596
+:101B40007408D917E12CFC1B66251030FE00B1018A
+:101B5000B201B301B12D3308C225B3003208C2254A
+:101B6000B200FD0DFC0DB30DB20DB10DFE0BAB2D92
+:101B7000D9133108C9253208C9253308C925D91B0D
+:101B80000800E12C333EF400F41DFD3EF41FD03E6E
+:101B90000800F400740ECD2574080F390319D91B01
+:101BA000E12C08003608043C031D66340D308A0021
+:101BB00023085A3C193C031C6C34E13E03188A0A82
+:101BC000820013349534A834602E6C346C34522E59
+:101BD0006C344C2E6C346C3404341D2E6C34032E57
+:101BE000312E222E392E552E442E6C34FF2D2A2EC6
+:101BF0006C346C346C342308E3243D30E32CFB2537
+:101C00006A08FD3EDC2CFB25DF084E300319E32C6F
+:101C10003A083B046E300319E32C550E55060F3974
+:101C2000DF1ED5065430D51C43305F1D2038E32419
+:101C30003A08FC003B08FD006F2DFB2547307F185C
+:101C40004D30E32CFB257F0E0739B03E8A11E2258B
+:101C50008A15E32CFB253030ED1A31306D1E4130F2
+:101C6000E32CFB255D1E843478305D1B7F30CA2455
+:101C70008734FB254430631A5330E31B5230E31A98
+:101C80004330631B4930E32CFB256A0EF400F40C4F
+:101C9000F40C6425F40C642DFB25050D803E6425B1
+:101CA000050D642DFB25580ED82CFB2502308A111A
+:101CB000E2258A15FC008A11E0258A15FD006F2DAA
+:101CC000FB254F306D195230E32C3608043C031DC0
+:101CD00066342308313C013C031C6C340319742E18
+:101CE000CA0159155A15762E59115A118A15E12C27
+:101CF000FC01FD01083AFE00083AFE060310FD0D46
+:101D0000FC0DF40D0318FD070318FC0AFE0B7E2ED4
+:021D10000800C9
+:0E1D12006217E2138E266213E2170E308A006B
+:101D20005808E21B580E0739983E03188A0A8200A9
+:101D3000A32EAF2EB22EB22EB22EA32EA32EA02EE5
+:101D4000F030E21FD8056208C0398316850483127B
+:101D5000080062093F388316850583120800A9260A
+:101D600085050800A926FF3A850408006217E213DA
+:101D7000BB266213E2170E308A005808E21B580E89
+:101D80000739C53E03188A0A8200080008000800C7
+:101D9000CD2ED42EE52EE72EDB2E0508E218050900
+:101DA0006205C03985060800050862190509620543
+:101DB000C03985060800DB1E0800B8088A117027A4
+:101DC0008A1500380319DB1208000509E82E0508FA
+:101DD0006205C039031DF22EE21D0800E211FC016C
+:101DE000FD01FC2EE2190800E21502308A11E225FD
+:101DF000FC00E025FD0001308A1532218A1508001B
 :101E0000031E08008B138316031360308F002730E6
 :101E10008600E730850007309B00E6309D000630E5
 :101E20009C00D73081001930990026309800831229
@@ -524,7 +524,7 @@
 :1042200000000000000041003D004F0070006500EC
 :104230006E0054006800650072006D0020004700A9
 :10424000610074006500770061007900200035008E
-:104250002E00370000005700440054002000720078
+:104250002E00380000005700440054002000720077
 :1042600065007300650074002100000054006800C0
 :10427000650072006D006F007300740061007400CF
 :10428000200064006900730063006F006E006E0020
@@ -538,8 +538,8 @@
 :1043000069006700680000004C006F007700200023
 :1043100070006F00770065007200000045007200B9
 :1043200072006F0072002000000042003D0031006A
-:1043300032003A00320034002000320038002D00F4
-:10434000310032002D003200300032003200000017
+:1043300037003A00350031002000310032002D00F6
+:10434000300033002D003200300032003300000016
 :1043500043003D00340020004D0048007A0000007A
 :0E4360004500430053004C005000420057003F
 :1043A000000000000000000000000000000000000D

data/pic16f88/gateway.ver

@@ -1 +1 @@
-5.7
+5.8

networkStuff.h

@@ -123,6 +123,7 @@ void startWiFi(const char* hostname, int timeOut)
   manageWiFi.setShowInfoUpdate(false);
   manageWiFi.setShowInfoErase(false);
   manageWiFi.setMenu(wm_menu);
+  manageWiFi.setHostname(hostname);
   
   //--- fetches ssid and pass and tries to connect
   //--- if it does not connect it starts an access point with the specified name

settingStuff.ino

@@ -27,7 +27,7 @@ void writeSettings(bool show)
   DebugT(F("Start writing setting data "));
 
   //const size_t capacity = JSON_OBJECT_SIZE(6);  // save more setting, grow # of objects accordingly
-  DynamicJsonDocument doc(1024);
+  DynamicJsonDocument doc(1280);
   JsonObject root  = doc.to<JsonObject>();
   root["hostname"] = settingHostname;
   root["MQTTenable"] = settingMQTTenable;
@@ -69,7 +69,6 @@ void writeSettings(bool show)
 //=======================================================================
 void readSettings(bool show) 
 {
-
   // Open file for reading
   File file =  LittleFS.open(SETTINGS_FILE, "r");
 
@@ -83,7 +82,7 @@ void readSettings(bool show)
   }
 
   // Deserialize the JSON document
-  StaticJsonDocument<1024> doc;
+  StaticJsonDocument<1280> doc;
   DeserializationError error = deserializeJson(doc, file);
   if (error)
   {

version.h

@@ -1,16 +1,16 @@
 //The version number conforms to semver.org format
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 10  
-#define _VERSION_PATCH 1
-#define _VERSION_BUILD 2047
-#define _VERSION_GITHASH "0f35eb6"
-//#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
-#define _VERSION_DATE "11-02-2023"
-#define _VERSION_TIME "12:57:24"
-#define _SEMVER_CORE "0.10.1"
-#define _SEMVER_BUILD "0.10.1+2047"
-#define _SEMVER_GITHASH "0.10.1+0f35eb6"
-#define _SEMVER_FULL "0.10.1+0f35eb6"
-#define _SEMVER_NOBUILD "0.10.1 (11-02-2023)"
-#define _VERSION "0.10.1+0f35eb6 (11-02-2023)"
+#define _VERSION_PATCH 2
+#define _VERSION_BUILD 2087
+#define _VERSION_GITHASH "fa737be"
+#define _VERSION_PRERELEASE beta
+#define _VERSION_DATE "14-03-2023"
+#define _VERSION_TIME "22:07:39"
+#define _SEMVER_CORE "0.10.2"
+#define _SEMVER_BUILD "0.10.2+2087"
+#define _SEMVER_GITHASH "0.10.2+fa737be"
+#define _SEMVER_FULL "0.10.2-beta+fa737be"
+#define _SEMVER_NOBUILD "0.10.2-beta (14-03-2023)"
+#define _VERSION "0.10.2-beta+fa737be (14-03-2023)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver