From 225d54b33cc5e47e7c3d1fa6cb34c30bd31364df Mon Sep 17 00:00:00 2001 From: Nate Clark Date: Thu, 20 Sep 2018 14:00:03 -0400 Subject: [PATCH] fix json parsing error if actuator GET endpoint returns an error --- .../konnected-filesystem-0xf0000-2-2-4.img | Bin 122880 -> 122880 bytes src/application.lua | 2 +- src/device.lua | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/konnected-filesystem-0xf0000-2-2-4.img b/firmware/konnected-filesystem-0xf0000-2-2-4.img index 1df49b1324a830628ecec5c4e6f3922757210d28..9c065ea529d13c3b6212db449d63a4c14d0686c1 100644 GIT binary patch delta 428 zcmYL_y-q?w5QWdo@>>}c7ch`$Vq#+`j1O?H0-`TKA%&Xw0!pI|b3rLB+;=dRCcFR_ zgajW!Ev#&4tPO<&XsmYUoSpB?tn}j2i$5g{)w)UZm7-(!o!)4&btd#(}iPA=-6cs2q~^^!Y|#cYNOrwI2C>GxJKSRs4`M z9+8DvdSm$Q%;(`BuRl+BX>q*!G~qYL7qQH&57li+Y3s z&-H&6BZaB?1C|4WAT$_KB&}mUoA*FKtq4l2qwa;SU~BF!yX3BH#f|M&g0YP0;X&0c zU2nV1Oq*ivF;iV-tY8XI-4mMsq6TDLG&@lzjcF{Vi(NKOFB*CRDHqL6?$;9Z*-fq; badPJF6nBcd?kq3vBfsuW&LgeDLxBcA){t`L delta 429 zcmZXP%`QVx6ouE`r>-_6RNHe~@e?xx8X6C9FKzw2fJrAL1|}k6Zl9uajt4L@mY5jH zy{$It2?X%~OpL|AsU{|dYwfkZy|+Yz5)ED_6|LT+)MuJD?N@f@h@=t%RTHt0pk_cI z;YJj22O*c8Cj>kiplif*W7KP*P$eYSiTT8(8*!l8PIuy1^=4(~RpW^LfJj400XWgZ zk`I=l!SW11yJf$OBh&nYL?qM$=pZ3|NRv+;xIrt*7sEP2zZACkB@os@Uw6>r{z3m) z6{BEc#Yp2DZAzdM-m6z5pn3vjMuMu%$j<9cdzbO-g|4Iq9^8Eca|HXOXLIYTYw$eh z>>upz9l~Rb;oF*_X}jbf6Wd#VEeB975Gp`KyC3q5jLYQmANJB8@zRWJPZmDT7Dms< llk|R*8sFfNVFxW0OU0$)_RitfqODDceVdr7PhL$@>j%!ba>D=s diff --git a/src/application.lua b/src/application.lua index 6eba8d6..5ab0cf0 100644 --- a/src/application.lua +++ b/src/application.lua @@ -110,7 +110,7 @@ sendTimer:alarm(200, tmr.ALARM_AUTO, function(t) function(code, response) timeout:stop() local pin, state, json_response - if response then + if response and code >= 200 and code < 300 then json_response = sjson.decode(response) pin = json_response.pin state = json_response.state diff --git a/src/device.lua b/src/device.lua index 6225f07..9db4a16 100644 --- a/src/device.lua +++ b/src/device.lua @@ -1,8 +1,8 @@ local me = { id = "uuid:8f655392-a778-4fee-97b9-4825918" .. string.format("%x", node.chipid()), name = "Konnected", - hwVersion = "2.2.4.beta1", - swVersion = "2.2.4.beta1", + hwVersion = "2.2.4", + swVersion = "2.2.4", http_port = math.floor(node.chipid()/1000) + 8000, urn = "urn:schemas-konnected-io:device:Security:1" }