From b1e916223363a169a225984e5768671b7398b8b5 Mon Sep 17 00:00:00 2001 From: Robert van den Breemen Date: Thu, 26 Jan 2023 21:52:05 +0100 Subject: [PATCH] Update to firmware fo pic to latest --- OTGW-firmware.h | 2 +- OTGW-firmware.ino | 2 +- data/pic16f1847/diagnose.hex | 322 +++++++++++++++++++--------------- data/pic16f1847/diagnose.ver | 2 +- data/pic16f1847/interface.hex | 243 +++++++++++++++++++++++++ data/pic16f1847/interface.ver | 1 + data/settings.ini | 2 +- helperStuff.ino | 2 + restAPI.ino | 4 +- version.h | 16 +- 10 files changed, 437 insertions(+), 159 deletions(-) create mode 100644 data/pic16f1847/interface.hex create mode 100644 data/pic16f1847/interface.ver diff --git a/OTGW-firmware.h b/OTGW-firmware.h index 4d48ad6..66c93eb 100644 --- a/OTGW-firmware.h +++ b/OTGW-firmware.h @@ -153,7 +153,7 @@ uint16_t settingS0COUNTERpulsekw = 1000; // Most S0 counters have 1000 uint16_t settingS0COUNTERinterval = 60; // Sugggested measurement reporting interval uint16_t OTGWs0pulseCount; // Number of S0 pulses in measurement interval uint32_t OTGWs0pulseCountTot = 0; // Number of S0 pulses since start of measurement -float OTGWs0powerkw = 0 ; // Calculated kW actual consumption based on time between last pulses and settings +float OTGWs0powerkw = 0.0f ; // Calculated kW actual consumption based on time between last pulses and settings time_t OTGWs0lasttime = 0; // Last time S0 counters have been read byte OTGWs0dataid = 245; // foney dataid to be used to do autoconfigure for counter diff --git a/OTGW-firmware.ino b/OTGW-firmware.ino index b1a883b..8c3fb9d 100644 --- a/OTGW-firmware.ino +++ b/OTGW-firmware.ino @@ -165,7 +165,7 @@ void sendMQTTuptime(){ void sendtimecommand(){ if (!settingNTPenable) return; // if NTP is disabled, then return if (NtpStatus != TIME_SYNC) return; // only send time command when time is synced - if (OTGWSerial.firmwareType() != FIRMWARE_OTGW) return; //only send timecommand when in gateway firmware, not in diagnotic or interface mode + if (OTGWSerial.firmwareType() != FIRMWARE_OTGW) return; //only send timecommand when in gateway firmware, not in diagnostic or interface mode //send time command to OTGW //send time / weekday diff --git a/data/pic16f1847/diagnose.hex b/data/pic16f1847/diagnose.hex index 8937995..d3c9828 100644 --- a/data/pic16f1847/diagnose.hex +++ b/data/pic16f1847/diagnose.hex @@ -1,151 +1,183 @@ :020000040000FA -:100000009F31002798310028200020080B000900AC -:100010000900043212320900090009009501131287 -:10002000233085003E358400BE0A26000130930649 -:1000300011081A0012081A000900950193122330C2 -:1000400085003E358400BE0A260001309A06180855 -:080050001A0019081A0009004A +:100000009F310027983100288031200020080B0004 +:100010000900090004320632090006320900131AE9 +:1000200017200900931A2620911835200900950100 +:1000300013122330850040358400C00A26000130A9 +:10004000930611081A0012081A000800950193126D +:100050002330850040358400C00A260001309A060E +:1000600018081A0019081A0008009110BD08031991 +:100070000800BD0303191C113D18080074080C0684 +:1000800008398C060830F406BD180800F411031472 +:0E009000F30DF20DF10DF00D031CF415080038 :1030000021006A3099002100E7308C0027308D00C4 :10301000230007308C008D0122008A309700883011 -:10302000980017309900230019309B001E151E12BE -:103030009E169D171D1620009801A301A4018B1355 -:103040002100D730950022001030920011309400FA -:10305000A6309100930021009216121723009B3096 -:103060009200A1309100BB2223009B309200BA3025 -:103070009100BB22013085002030840023009D1C7C -:10308000033219081D121D162000A0016400B32090 -:103090004D20A008031946281F28911E0800230070 -:1030A0001D1D083219082000031D080064000D1DB5 -:1030B000FD330100190880002000E03903190732B0 -:1030C0006F300402031808001200422308000008B1 -:1030D0000B000800080008000800080008000800AD -:1030E0000800163208000800080008001C3208001A -:1030F0000800080008000800080008000800080090 -:10310000080008000800080008000800080008007F -:1031100020300402031908008403083042234223AC -:10312000083042230800B722800120308400800844 -:103130000319B7281A30200203180D322008A007FF -:10314000A00DA007A00D1200393C093C031C03325E -:10315000A007031C972823009B309200FF309100AA -:10316000BB22A0090800A119111E08005C2B200831 -:10317000063C063C031CAB280B00C428C928EA28DF -:10318000F1283529A829472A20300402031908000C -:103190000100BD010130BC002100D73095002000A6 -:1031A0006400AF220319E7280B1DD0280B11BC0BBC -:1031B000D0280130BC000310BD0DBD080319BD159A -:1031C000BD1ABD0DD8308D043D098D05D028D830ED -:1031D0008D040800262193002000131221001316ED -:1031E000063226219A0020009312210093162330E4 -:1031F000850020000B178B17B601BE018401640007 -:10320000B320AF2203192A323E350319F83384085C -:10321000031912320B19163204020319F033040891 -:10322000023A2C30031D422337080002B400013F4C -:10323000B5003808B53BDC220B111200B7001200B4 -:10324000B800DD332E304223B722D7330130980047 -:10325000BE012100D5301508260004342100930159 -:10326000260093019A012000080022009112931277 -:1032700020008C110C12980196019701111018145E -:10328000640011182832220095082000031DF8332D -:1032900023009C3092003D309100BB22023072210D -:1032A00023009C30920047309100BB2242307221B3 -:1032B00023009C30920051309100BB2203307221D8 -:1032C00023009C3092005B309100BB22433072217E -:1032D00098019901080023009C309200073091006A -:1032E000BB22F6339801960197018038990040304F -:1032F0009800083019181030111018148C0664004A -:103300001118A02919197F291736B500160CB40019 -:10331000B536B40CB601DC222E3042231608033930 -:10332000093596180138303E4223303016183530B2 -:10333000422323009C30920065309100BB2208009C -:10334000181023009C3092001F309100BB2208000F -:10335000210090309E007C30E6212030B200B10187 -:10336000B001EB217A2323009C309200253091009C -:10337000BB223408BA003508BB00DB22B722783004 -:10338000E62123009C30920037309100BB22EB21D4 -:103390003A08B4003B08B50067230430B800B70111 -:1033A0007A23DB22B72223009C3092002D3091003B -:1033B000BB220030E621F82123009C3092003330FC -:1033C0009100BB220430E621F821080021000138D9 -:1033D0009D002000080021009D149D18ED291B0868 -:1033E0002000B70021001C082000B800B901080027 -:1033F0001030A5003E3085018400FF301A00A50B77 -:10340000FE294030BD0021009E13A601EB2164007F -:10341000B3203808BC00EB2138083C02031C003CF8 -:10342000023C031CA601A60AA61D1F2A380E0F394E -:103430003E3E8400380EF0398000370E8004A50B24 -:10344000072ABD0B072A3A30A6003E308400001838 -:10345000402A2608422342233E3004020936B8009F -:10346000000CB700B836B70C3A08B4003B08B500FA -:1034700067230430B800B7017A23DB222C30A60082 -:10348000840A4E300402031C272AB72208000130A8 -:1034900098002100D53095000330850026000430C7 -:1034A00093009A00200093019501BC016400B320B1 -:1034B000AF2203194E323030130503190432BC0019 -:1034C000930695010B11BC08031D0B1DEF33123041 -:1034D0003C1E1930840001301110971F801F03011A -:1034E000B600031D11103F3FB400003FB500260099 -:1034F000013093069A06200093016400B320AF22A6 -:103500000319273230301305031D0732111CF53320 -:10351000B60A1110031DF133C933BC0011303C1E33 -:103520001830840034080002B400840A3508003BD7 -:10353000B500031CB603B60A801B111CB603543039 -:103540003C1E423042233A3042234223DB22B72240 -:10355000A5331810260093019A01200008000311DA -:10356000911E08002300190820000D3C08000D30B2 -:1035700042230A30422B23009501951715140000B1 -:103580000000130D140DD22203190A322300130870 -:10359000D222031905322300910A0319920AEB3350 -:1035A000200008007F391A3A031908001A3A031D4F -:1035B000422303110800211618302000A500AB019A -:1035C000AC01AD01AE010030870006322B30860021 -:1035D0000523052305230523B435B50DB60DAB0D25 -:1035E000AC0DAD0DAE0DA50BF13321152E08162334 -:1035F0002D0816232C08211E1623211A0D232B0813 -:103600001623303021194223080033300107891D69 -:10361000FD3E891FD03E1E00080021122111A60088 -:10362000260E1A232E30422326080432A600260E28 -:103630001A2326080F390319211D223208003108E8 -:103640002A236430A6003008B01BB10A3108A60056 -:103650002E30312B2115A6009C3E031C332BA600D7 -:10366000313042232111A5012608A600F63E031C95 -:103670003B2BA50A352B25080319211D40232608BD -:103680002111303E2000A11D111E043223009A009A -:1036900020002034A200230A2402031D0332111E3D -:1036A000FE335C2322308700230886002208810035 -:1036B000A30AA115111E2034223087002408860099 -:1036C000A40A240823020319A1110108DF331030D2 -:1036D000A500B301B201B50CB40C031C04323708C9 -:1036E000B2073808B33DB30CB20CB10CB00CA50B4B -:1036F000F2330800B601B501B401AF01AF0AB91B3E -:103700000432B735B80DB90DF933B435B50DB60D72 -:10371000370830023808313B3908323B031C0B3282 -:103720003708B0023808B13B3908B23BB40A031974 -:10373000B50A0319B60AB936B80CB70CAF0BE533A6 -:1037400008008A06F027EE32683AF232A036E133FA -:10375000653AE13BA03C6932E7306F37F439E33436 -:10376000A039A016652B7339EF3420372E190018B5 -:103770008A061A05AE184C10C4227410F3320D3AA2 -:1037800000052E194210F4347410ED34EE34A033D9 -:10379000683AF232EF36F439F4308A06AE19421044 -:1037A000F4347410ED34EE34A0336F31EC34F23273 -:1037B0008A062E1A4410EC32F9307310ED3CE536CF -:1037C000723A8D3C0005AE1A5610EC37613AE5337B -:1037D0006C10F632EC328D3900052E1B49106C321C -:1037E000A032693AE5368D390A05EE22653A20396C -:1037F000653AF4396E10ED3A65313A391A108A0695 -:10380000EE24613B69362032653AF439000DA3118C -:10381000A011F2226F393A3949107437F23261330C -:10382000E531A0396F322737203AF0306538F23071 -:103830007410A03765316C10EF3765381A32A31158 -:10384000A011F2226F390D391A056F28E53B203996 -:10385000F53970387936201D000D682AF232EF36BE -:10386000F439F430000D6F21EC34F232000D65298B -:10387000653365396337BA321A10CB27C11868101F -:10388000E7342D346F3AEC16F737201D000DCB27A7 -:10389000C1186C10F737F416AD376934E833201DC2 -:1038A000000DCB27C2186810E7342D346F3AEC16A0 -:1038B000F737201D000DCB27C2186C10F737F41610 -:1038C000AD376934E833201D000DF33A8A06000D48 +:10302000980017309900F401EB20210010309E0029 +:103030007D309D00230019309B001E151E129E1628 +:103040009D171D1621009D149D18FE330630BE20CD +:10305000A1005630BE20A2009C30BE20A30020005C +:103060009801A301A4018B132100D5309500910193 +:103070009201920110309E0001309D00EB209801DA +:103080009C0174188D11BC018C1100306A23193019 +:103090006A2323009D185C2020006020031807325B +:1030A000A000063C063C031C5728152133281D1997 +:1030B00073285E306A23332819081D121D16080074 +:1030C00001308500203084006400B520111BD12020 +:1030D0000B19B920911EF83323001D1D0832190861 +:1030E0002000031DF13364000D1DFD33010019089C +:1030F00080002000E039031907326F300402031802 +:10310000E3331200F523E03300080D3A03190F32C0 +:10311000053A031901326428203004020319D4331C +:1031200084030830F523F5230830F523CD336623D7 +:10313000800120308400A6010314260880080319AA +:103140000800E63E03180D322608A607A60DA607BE +:10315000A60D1200393C093C031C0532A607031CCE +:10316000EC330311013403140234A119111E0800B9 +:103170000F2C0B1121009D1420000800F0000830D6 +:10318000A5001C089B1B013EF101F00C0318F10780 +:10319000F10CF00CA50BFA337035710D701B013E6C +:1031A0000800111321001C082006A006200620029A +:1031B000031C003CFC39031D183220082302031CA9 +:1031C0000732200822020318741C0F3274100332D5 +:1031D00074180B32741422001030920011309400D5 +:1031E000A6309300741886309100200008008C15DA +:1031F000F9309B0021009114200091100230BC0096 +:10320000080074180B1D08000B11BC08031DBC0B33 +:1032100008000F30BC008030F0001930F100F201DE +:10322000F3018830BD001C1508000B0001001D29AA +:103230003E2945298F29E629F62ABF010130BE0023 +:103240002100D7309500200064005E2303193B293C +:103250000B1D24290B11BE0B24290130BE000310C5 +:10326000BF0DBF080319BF15BF1ABF0DD8308D049D +:103270003F098D052429D8308D0408008021930052 +:103280002000131221001316083280219A0020001A +:1032900093127418F7202100931623308500210023 +:1032A000D730950020000B178B17B601C0018401A1 +:1032B0006400B52001215E2303192A324035031929 +:1032C000F7338408031912320B191632040203195A +:1032D000EF330408023A2C30031DF52337080002AF +:1032E000B400013FB5003808B53B8F230B11120025 +:1032F000B7001200B800DC332E30F5236623D63336 +:1033000001309800C0012100D53015082600043492 +:1033100021009301260093019A0120000800220059 +:103320009112931220008C110C12980196019701B2 +:10333000111018146400111818322200950820008A +:10334000031DF8339B306A230230B821A5306A236D +:103350004230B821AF306A230330B821B9306A2334 +:103360004330B82198019901080065306A23FA3387 +:1033700098019601970180389900403098000830F4 +:1033800019181030111018148C0664001118E22955 +:103390001919C5291736B500160CB400B536B40C8A +:1033A000B6018F232E30F5231608033909359618F8 +:1033B0000138303EF523303016183530F523C33050 +:1033C0006A23080018107D306A2308007418F7205B +:1033D0000B178B17210090309E007C302B22203061 +:1033E000B200B101B0013022342483306A233408A2 +:1033F000BA003508BB008E23662378302B22953027 +:103400006A2330221A2431248E2366238B306A23C8 +:1034100000302B22A0303D2291306A2304302B2231 +:10342000B0303D22C6306A239A22C000F323D83040 +:103430006A236020031D0C3203184008093C093C34 +:10344000031C063209350D3E220099002000332866 +:10345000DA306A233328210001389D00200008005B +:1034600021009D149D18322A1B082000B70021005E +:103470001C082000B800B901080084000130850054 +:103480001030A500FF301A00A50B432A3031403020 +:10349000BF0021009E13A60130226400B520012147 +:1034A0003808BE00302238083E02031C003C023CB3 +:1034B000031CA601A60AA61D672A380E0F39840729 +:1034C000380EF0398000370E8004F0308405012179 +:1034D000A50B4D2ABF0B4D2A3A30A6001030BF0075 +:1034E0000018822A2608F523F52304080F39093627 +:1034F000B800000CB700B836B70C1A2431248E235C +:103500002C30A600840ABF0B702A66230800B10085 +:10351000A03E84000008B0004108A03E84000008DE +:103520000008B0024108B13B08004708B002460855 +:10353000B13B0800A501FF30C200C300C100C601B5 +:10354000C7012508A03E84000018B72AC11BB12A74 +:10355000250887229522031CB52A3008C7073108A1 +:10356000C63D4108C2002508C3002508C10001303E +:10357000A507831CA12A420A43020319C217A51AF0 +:10358000C62A4208C4004308C5009B2AC21FCF2A8E +:10359000C41B05344408C2004508C300DD2AC41B0F +:1035A000DD2A420844028318C20743084502831CEF +:1035B000C30743084202031805344208B800381212 +:1035C000A03E84000008B7004308A03E8400000825 +:1035D000B70743080F39B83DB836B70C1A24312461 +:1035E00035360F3C093C03180800053401309800BB +:1035F0002100D5309500033085002600043093006B +:103600009A00200093019501BE016400B5205E235D +:1036100003194E323030130503190432BE009306ED +:1036200095010B11BE08031D0B1DEF3312303E1E1A +:103630001930840001301110971F801F0301B6005C +:10364000031D11103F3FB400003FB50026000130BC +:1036500093069A06200093016400B5205E230319A7 +:10366000273230301305031D0732111CF533B60A1B +:103670001110031DF133C933BE0011303E1E183046 +:10368000840034080002B400840A3508003BB50009 +:10369000031CB603B60A801B111CB60354303E1E31 +:1036A0004230F5233A30F523F5238E236623A533E4 +:1036B0001810260093019A01200008000311911EA2 +:1036C00008002300190820000D3C08000D30F523E8 +:1036D0000A30F52B230091001E3092002300950143 +:1036E0009517151400000000130D140D8523031900 +:1036F0000A32230013088523031905322300910A97 +:103700000319920AEB33200008007F391A3A031993 +:1037100008001A3A031DF52303110800211618307A +:103720002000A500AB01AC01AD01AE010030870067 +:1037300006322B308600B823B823B823B823B4351B +:10374000B50DB60DAB0DAC0DAD0DAE0DA50BF1333A +:1037500021152E08C9232D08C9232C08211EC92391 +:10376000211AC0232B08C92330302119F523080062 +:1037700033300107891DFD3E891FD03E1E00080021 +:1037800021122111A600260ECD232E30F523260866 +:103790000432A600260ECD2326080F390319211D59 +:1037A000223208003108DD236430A6003008B01B47 +:1037B000B10A3108A6002E30E42B2115A6009C3E4C +:1037C000031CE62BA6003130F5232111A5012608A4 +:1037D000A600F63E031CEE2BA50AE82B25080319CC +:1037E000211DF32326082111303E2000A11D111EAA +:1037F000043223009A0020002034A200230A24026D +:10380000031D0332111EFE330F24223087002308CC +:10381000860022088100A30AA115111E203422303F +:10382000870024088600A40A240823020319A11192 +:103830000108DF333A08B4003B08B5001030A5009A +:10384000B301B201B50CB40C031C04323708B20743 +:103850003808B33DB30CB20CB10CB00CA50BF2336D +:1038600008000430B800B701B601B501B401AF01DA +:10387000AF0AB91B0432B735B80DB90DF933B435F9 +:10388000B50DB60D370830023808313B3908323BE8 +:10389000031C0B323708B0023808B13B3908B23B81 +:1038A000B40A0319B50A0319B60AB936B80CB70C2D +:0638B000AF0BE533080038 +:103C00008A06F027EE32683AF232A036E133653A9E +:103C1000E13BA03C6932E7306F37F439E334A03937 +:103C2000A016652B7339EF3420372E1980188A06B9 +:103C30001A05AE184C10C4227410F3320D3A000568 +:103C40002E194210F4347410ED34EE34A033683A77 +:103C5000F232EF36F439F4308A06AE194210F434F9 +:103C60007410ED34EE34A0336F31EC34F2328A0646 +:103C70002E1A4410EC32F9307310ED3CE536723AEE +:103C80008D3C0005AE1A5610EC37613AE5336C10E6 +:103C9000F632EC328D3900052E1B49106C32A03201 +:103CA000693AE5368D390A05EE22653A2039653ADA +:103CB000F4396E10ED3A65313A391A10EE24613B51 +:103CC00069362032653AF439000DA311A011F222B1 +:103CD0006F393A3949107437F2326133E531A0391E +:103CE0006F322737203AF0306538F2307410A03741 +:103CF00065316C10EF3765381A32A311A011F2222A +:103D00006F390D391A056F28E53B2039F5397038C0 +:103D10007936201D000D682AF232EF36F439F4307E +:103D2000000D6F21EC34F232000D652965336539E1 +:103D30006337BA321A10CB27C1186810E7342D3414 +:103D40006F3AEC16F737201D000DCB27C1186C1009 +:103D5000F737F416AD376934E833201D000DCB2753 +:103D6000C2186810E7342D346F3AEC16F737201D6F +:103D7000000DCB27C2186C10F737F416AD37693435 +:103D8000E833201D000DF33A8A06000D65296533DE +:103D900065396337A0326F3B7436E730A032E539BE +:103DA000743AEE34A03330142E17A91C5B10000DAA +:103DB000BA2E1A10EE24613B69362032613B75360B +:023DC0009A3235 :103E0000031E08008B1321006A309900D7309500FB :103E10002200FF308D0088309700C830980017309E :103E200099001030920011309400A6309100930058 diff --git a/data/pic16f1847/diagnose.ver b/data/pic16f1847/diagnose.ver index cd5ac03..42f7d23 100644 --- a/data/pic16f1847/diagnose.ver +++ b/data/pic16f1847/diagnose.ver @@ -1 +1 @@ -2.0 +2.1 \ No newline at end of file diff --git a/data/pic16f1847/interface.hex b/data/pic16f1847/interface.hex new file mode 100644 index 0000000..09be95f --- /dev/null +++ b/data/pic16f1847/interface.hex @@ -0,0 +1,243 @@ +:020000040000FA +:100000009F3100279831092828001508F9001C089D +:10001000FA009B3120009318D12493191F25921ABE +:0C002000AF23121B122491187824090051 +:1030000023009908200064000D1D03289F3100272C +:10301000983122008D010C1621006A30990023009E +:1030200007308C008D0122001E149D172100E7300F +:103030008C0027308D00F801D53095002300073033 +:103040008C008D012800F93096009D0097019E01AB +:1030500022008A30970023009D0119309B001E1525 +:103060001E129E169D171D16210010309E007D30E9 +:103070009D00921612179114931493159D142030ED +:1030800084005030F7008030800184068001840A7B +:10309000F70B44289D18FE330830F421EA0056301F +:1030A000F421EB009C30F421EC0001309D00C8308D +:1030B000980000305521C90022009900D0309200BC +:1030C000D1309400863091009300200095010B11BF +:1030D00064000B1D682831309800F9309B009C017A +:1030E0009201FF308C008D000B178B173D30B9001B +:1030F0000530BB000A309D315B2598310230AB00B2 +:10310000053055219A3196229831AB35063055213C +:103110009A3196229831AB35013055219A31962259 +:103120009831AB35023055219A3196229831AB3522 +:10313000AB35033055219A3196229831AB350430A6 +:1031400055219A31962298316400B808031D3B211D +:10315000BE1EBF1AF220C41BFF20BD1AFB200B1994 +:103160001221111B5C21911EA42823001D1D053274 +:103170009908031900282000A4289D1CC4281D12AA +:103180001D1620007816A4282000D6203D1EA42855 +:103190009A310722B6013D129D31FF3A0319D42816 +:1031A000FF3A031D52255C259831A4280130870081 +:1031B0003608A03E86002300190820003D1A0800AA +:1031C00081000A3A03190800073A0319EC28360867 +:1031D000013E831CB6000800B608031908008101EF +:1031E0003D1608009D31BE1A8225BE12BF1A8D25DC +:1031F000BF1298310800BD128521C41F08006A3033 +:10320000441E0D295E303E1F0A293A089C3C031CCF +:10321000080065309D3152256D309D315B25993117 +:10322000C41308000B11B90B1D293D30B900BB0BAD +:1032300008008C11C4118030BF001C19033221001A +:103240009D142000C41E2C29C4123E30441D3F3062 +:103250008400801F2C29C0309D3147090319C70104 +:10326000C708031DA4259831C808031DC80B080012 +:103270004530E6210800111E08003708A03E8400F2 +:10328000000823009A002000B70A303037060319DF +:10329000B701B80308002300951C08002000911E08 +:1032A0004B29F200D62072084B294B219501910041 +:1032B000151413082000080011131C083A06BA065A +:1032C0003A063A02031C003CFC39031D08003A0888 +:1032D0009C3C031C76293A08943C0318BD1C08004A +:1032E000BD103A309D315B2599310800BD180800AA +:1032F000BD1422309D315B25993128001711200023 +:103300008030BE000A30C4050800C508031D003423 +:103310004618B129C61F00341C1D94293D0E76069F +:103320004039031900341C11C517C6130130C300FE +:10333000C01540165830E3215430761F4230E32147 +:103340000830761B1030B5002230B400F9309A00F6 +:103350001C150530761FBB009D3198255C259931E1 +:1033600000341C19003446081F39C606C5001E3932 +:103370000319D229C518CC294519C629451ACA29C5 +:10338000C51D0034C5013D151030D6293F1FD42975 +:10339000C419DC29C501D4293F1FD429C41DDC2947 +:1033A000C606C5103F1FDC293D1108309A011C15C7 +:1033B0008C06C406C3010034C5018A298F3E8400EF +:1033C00008000319E629DE210014E829DE21001097 +:1033D000E4300406D8300018003003194B090D06FC +:1033E0000005D8398D060800F6000830F7001C08E3 +:1033F0009B1B013EF501F60C0318F507F50CF60CC6 +:10340000F70BFA337635750D761B013E0800781AF6 +:10341000462A04303602031C523401308700A030A3 +:103420008600423F3D3C031D552B413F0106F10004 +:10343000E039031D4F3401089D316A25413F6A255B +:103440003A306A2520306A2571080B004F344F341A +:10345000482A4D2A522A4F344F344F346B2A4F3466 +:103460004F344F344F346B2A6B2A6B2A572A4F3410 +:103470004F344F345C2A612A4F344F344F344F3429 +:103480004F344F344F34662A4F344F3478125B3404 +:103490000108503C0319B62A4F340108533C031964 +:1034A0002A2B4F340108563C0319D12A4F34010806 +:1034B000473C03194C2B4F340108443C0319B82AEC +:1034C0004F340108453C0319202B4F340108493C77 +:1034D0000319112B4F3401084C3C031D4F3436089F +:1034E000043C031D5234413FBF3EB0000830B018C9 +:1034F0004030AB003018AB07AB2203189C2A433F87 +:10350000F1005A3C193C031C55343008013EE822B6 +:10351000433F9D316A259A31D03084001A30F7003C +:103520002B098005840AF70B912A433F8F3E8400C4 +:103530002B0880049931E829433101089D316A251F +:103540009A312B084B06011C2B062B05CB06E430C9 +:1035500084009931E82903103608043A031D5234D7 +:10356000433F313C013C0318080055349D31B22DD6 +:103570006F233608053C03190532090F5234962390 +:1035800003180800F2008D23031808008600720853 +:1035900087009D316425060860253D306A250108B5 +:1035A000602D3608043C031D5234433F393C093C2E +:1035B000031C553409350D3E2200990020004906B0 +:1035C0001F394906C900E6229D31CC2DF10000309B +:1035D00099314B219A312300910071082300151471 +:1035E000230013060319FF2A9306230015158B13D6 +:1035F00055309600AA30960095148B1715112000AF +:10360000710808000310F2000130F2180430F100D4 +:103610007218F10D7219F10EF20E720D720D1F3942 +:103620000800AB22031C0800203043310118C904F4 +:10363000FF3A011CC9054908E62201089D316A2D9F +:10364000AB22031C0800031D441703194413433F16 +:103650009D316A2D3608043C031D5234433F4C3AD9 +:103660000319452B013A0319442B053A0319422B40 +:103670001C3A0319402B163A031D553410300532FD +:1036800008300332043001320230C6044614433F8E +:103690009D316A25993185293608043C031D523431 +:1036A000433F523C031D553401003608083A031DC0 +:1036B0005234A03086008D2303180800F6008D23B5 +:1036C00003180800F5008D2303180800F4008D236B +:1036D00003180800F300C61799318521FF34A33081 +:1036E000860008000108393C093C031C8A2BF100C4 +:1036F0001400393C093C031C882BA9001A307102C4 +:10370000031858347108A9232907031C772B583450 +:1037100071080800031452346F239623031808001D +:10372000F100F10E9623031C7104080030300102F1 +:10373000031C8A2BF63E031CA52BDF39F93E031C24 +:103740008A2BFA3E03185234063E0A3E860A0310BC +:103750000800AA00AA07AA0DAA072A0D08003E0918 +:103760002200110620009212090D3E06803903192D +:103770000800BE062800171906321E3095001715DE +:103780002000C10108002000B2080319DF2B03301C +:103790004102031C10323E0DB20B3032C101BE1B80 +:1037A000FE2C3E18032DBE1698315230E6215430BF +:1037B000E6219B3108003E19C91A3E1508000A305F +:1037C000410203180F32BE1B0800C1080319123250 +:1037D0005230E3215430E3219B312130B2003E10BE +:1037E0003E11082C323041020318082CC030BE1B99 +:1037F000BE06080028001711200008003E350130E1 +:10380000031CBE06A00DA10DA20DA30DA0063E1126 +:10381000C1017908280095020630031C950220009A +:10382000931008003F092200130620001213090D0F +:103830003F06803903190800BF0628001E1906320A +:103840001E309C001E152000C20108002000B30895 +:103850000319422C03304202031C10323F0DB30BFC +:103860003432C201BF1B322D3F18372DBF1698319D +:103870005230E6214230E6219C3108003F19C91A36 +:103880003F1508000A30420203181032BF1B08001F +:10389000C2080319163298315230E3214230E32135 +:1038A0009C312130B3003F103F116E2C45180800A9 +:1038B0003230420203186E2CBF1F0800C030BF0612 +:1038C000080028001E11200008000130031CBF065C +:1038D000A40DA50DA60DA70DA4063F11C2017A08DF +:1038E00028009C020630031C9C0220009311080053 +:1038F0009110C30A43180800B408031914320301D5 +:10390000C01D183044060C0635058C06C318CE2C95 +:10391000C0110314F30DF40DF50DF60D0318C015C9 +:10392000C301B4030800C51B043245180E321C1134 +:103930000800C51340121C1198315830E62154304C +:10394000E6214230E6219C310800C51C451912329F +:10395000C419083228304302031C0800CA24891CF9 +:10396000BF0115323C304302031C08008C15C41102 +:10397000C301080028304302031C0800CA24891C24 +:1039800004323F17BF13C51C02328C15C411C50188 +:103990001C11080022001509200008000830C0068C +:1039A00008009310C10A320803190332C119002D0F +:1039B00008001430410203190B3250304102031C3D +:1039C00008003E1AC4173E122800171120000800F4 +:1039D000BE1F0800C030BE06441F08003E163E1B36 +:1039E000441E0132080010308C06C40644055030D5 +:1039F0009931E1219C310800013006320230043255 +:103A0000CA00033001320430C7080319C7003E0959 +:103A1000220011062800091F17112000B201C10160 +:103A2000401298315230E6215430E62147090319FB +:103A300004324530E3217A30C8009D3108009311EB +:103A4000C20A330803190332C219342D0800420890 +:103A5000B03E031C080028001E112000C50108000C +:103A60000130063202300432CA0003300132043021 +:103A7000C7080319C700220013092800091F1E11D7 +:103A80002000B301C201401298315230E621423089 +:103A9000E6214709031904324530E3217A30C80092 +:103AA0009D310800993155219D31031908006A257F +:103AB0002300110A522D52250D306A250A306A2D35 +:103AC000F200720E642572080F39F63E0318073EA5 +:103AD0000A3E303EB8080319111E722D23009A00C9 +:103AE00020000034840038083707D03E031C303EE5 +:103AF000A03E04068406040680003808303A031D00 +:103B0000B80A003454306A2523086025220860254D +:103B100021086025200860255C2D42306A25270891 +:103B200060252608602525086025240860255C2D71 +:103B30005230761B41306A2576086025750860256D +:103B4000740860257308602DC41B0800743052256A +:103B5000470860255C254530471C8325C7010800C0 +:103B60001E0D692D3608043A031D5234433F413A75 +:103B700003190834153A0319C52D023A0319CB2D40 +:103B80005534433F6A253D306A2DC125490EF10069 +:0E3B9000F10CF10CB02DC1254936FA3E642D22 +:103E0000031E08008B1321006A309900D7309500FB +:103E10002200FF308D0088309700C830980017309E +:103E200099001030920011309400A6309100930058 +:103E30001E149D172100E7308C0007308D002300F1 +:103E400007308C008D0119309B0026309E009D1795 +:103E50001D168701113086000301C43F0130E127A0 +:103E6000C7271030E127811E0800CC27031D08005A +:103E7000203085008401F001CC270319F9330B3A77 +:103E800003190732013A0319CC2772081A00F00708 +:103E9000F333F008031D413284019501023F910084 +:103EA000033F9200013FF100043084073C3F083C8F +:103EB000083C031C32320B000D32123232324232D5 +:103EC000493250320532293201000002001FE91F39 +:103ED00015170632653091009F3092000230840041 +:103EE000951715140000000013081A0014081A0092 +:103EF000910A0319920AF10BF3330408F10015112A +:103F000084010F30C727F0011200F007BA27F10B28 +:103F1000FB337009013EBA27C727CC270319A83302 +:103F2000FC33A43095001200930012009400110994 +:103F30001F3903190232710303199512D527F10BAA +:103F4000F033DC33943095001F309104D527F10B0A +:103F5000F933D4339501151413081A00910AF10BA3 +:103F6000F933CB330430950012009300D527F10BC1 +:103F7000F933C433F3000F3A031906320B3A03192D +:103F80000332013A031D02320530C727730864006B +:103F9000011EFE339A0004349D1801006400811E46 +:103FA000FD331908F2000F3A0800640055309600FE +:103FB000AA30960095149518FE33910A0319920AB7 +:103FC00001346400811A08000B1DFB330B11090B2F +:043FD000F83304348A +:020000040001F9 +:02000E00FC0BE9 +:02001000FF1AD5 +:10E0000037005500550055005500550055000000DB +:10E0100041003D004F00700065006E005400680034 +:10E02000650072006D00200049006E0074006500FC +:10E0300072006600610063006500200032002E005F +:10E040003000000054006800650072006D006F0031 +:10E0500073007400610074002000640069007300A4 +:10E0600063006F006E006E00650063007400650061 +:10E070006400000054006800650072006D006F00CD +:10E080007300740061007400200063006F006E0074 +:10E090006E006500630074006500640000004E00BF +:10E0A00047000000530045000000420056000000F9 +:10E0B0004F00520000004F00450000004D00650079 +:10E0C0006400690075006D00000048006900670089 +:10E0D000680000004C006F007700200070006F00A7 +:10E0E00077006500720000004500720072006F004A +:10E0F000720020000000310032003A003100300090 +:10E100002000320033002D00310030002D0032009D +:10E110003000320032000000340020004D00480082 +:04E120007A00000081 +:00000001FF diff --git a/data/pic16f1847/interface.ver b/data/pic16f1847/interface.ver new file mode 100644 index 0000000..415b19f --- /dev/null +++ b/data/pic16f1847/interface.ver @@ -0,0 +1 @@ +2.0 \ No newline at end of file diff --git a/data/settings.ini b/data/settings.ini index a1bb75e..affd5af 100644 --- a/data/settings.ini +++ b/data/settings.ini @@ -10,6 +10,6 @@ "NTPenable": true, "NTPtimezone": "Europe/Amsterdam", "LEDblink": true, - "OTGWcommands": "GW=R" + "OTGWcommands": "GW=1" } diff --git a/helperStuff.ino b/helperStuff.ino index 66efae3..d4e65d0 100644 --- a/helperStuff.ino +++ b/helperStuff.ino @@ -484,6 +484,8 @@ String strHTTPmethod(HTTPMethod method) return ""; } } + + /*************************************************************************** * * Permission is hereby granted, free of charge, to any person obtaining a diff --git a/restAPI.ino b/restAPI.ino index 3cbe5b5..87a2af2 100644 --- a/restAPI.ino +++ b/restAPI.ino @@ -304,7 +304,7 @@ void sendOTmonitor() if (settingS0COUNTERenabled) { - sendJsonOTmonObj("s0powerkw", String(OTGWs0powerkw,3) , "kW", OTGWs0lasttime); + sendJsonOTmonObj("s0powerkw", OTGWs0powerkw , "kW", OTGWs0lasttime); sendJsonOTmonObj("s0intervalcount", OTGWs0pulseCount , "", OTGWs0lasttime); sendJsonOTmonObj("s0totalcount", OTGWs0pulseCountTot , "", OTGWs0lasttime); } @@ -313,7 +313,7 @@ void sendOTmonitor() sendJsonOTmonObj("numberofsensors", DallasrealDeviceCount , "", now ); for (int i = 0; i < DallasrealDeviceCount; i++) { const char * strDeviceAddress = getDallasAddress(DallasrealDevice[i].addr); - sendJsonOTmonObj(strDeviceAddress, String(DallasrealDevice[i].tempC,1) , "°C", DallasrealDevice[i].lasttime); + sendJsonOTmonObj(strDeviceAddress, roundf(DallasrealDevice[i].tempC*10.0f)/10.0f , "°C", DallasrealDevice[i].lasttime); } } diff --git a/version.h b/version.h index b3a54f5..6c4688f 100644 --- a/version.h +++ b/version.h @@ -2,15 +2,15 @@ #define _VERSION_MAJOR 0 #define _VERSION_MINOR 10 #define _VERSION_PATCH 0 -#define _VERSION_BUILD 1977 -#define _VERSION_GITHASH "da6627e" +#define _VERSION_BUILD 1981 +#define _VERSION_GITHASH "828ebb3" #define _VERSION_PRERELEASE rc1 #define _VERSION_DATE "26-01-2023" -#define _VERSION_TIME "20:18:00" +#define _VERSION_TIME "21:18:11" #define _SEMVER_CORE "0.10.0" -#define _SEMVER_BUILD "0.10.0+1977" -#define _SEMVER_GITHASH "0.10.0+da6627e" -#define _SEMVER_FULL "0.10.0-beta+da6627e" -#define _SEMVER_NOBUILD "0.10.0-beta (26-01-2023)" -#define _VERSION "0.10.0-beta+da6627e (26-01-2023)" +#define _SEMVER_BUILD "0.10.0+1981" +#define _SEMVER_GITHASH "0.10.0+828ebb3" +#define _SEMVER_FULL "0.10.0-rc1+828ebb3" +#define _SEMVER_NOBUILD "0.10.0-rc1 (26-01-2023)" +#define _VERSION "0.10.0-rc1+828ebb3 (26-01-2023)" //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver