From 43aa1ec6658ca05806755295a7d4e8aa037adf76 Mon Sep 17 00:00:00 2001 From: sityliu Date: Thu, 23 May 2024 00:23:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E6=AE=B5=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=86=85=E8=AF=AD=E9=9F=B3=E6=8E=A7=E5=88=B6=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E6=8C=82=E8=B5=B7=EF=BC=9B=E6=96=B0=E5=A2=9E=E6=96=B0?= =?UTF-8?q?=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++ __pycache__/config.cpython-38.pyc | Bin 705 -> 967 bytes __pycache__/main.cpython-38.pyc | Bin 0 -> 4034 bytes config.py | 5 +- docs/控制指令表.txt | 8 +++ logs/Error.log | 1 + main.py | 17 +++-- src/__pycache__/__init__.cpython-38.pyc | Bin 1593 -> 2538 bytes src/__pycache__/action_cmd.cpython-38.pyc | Bin 0 -> 561 bytes src/__pycache__/data_up.cpython-38.pyc | Bin 701 -> 707 bytes src/__pycache__/local_status.cpython-38.pyc | Bin 0 -> 1937 bytes src/__pycache__/master_control.cpython-38.pyc | Bin 4275 -> 4524 bytes src/__pycache__/python_mqtt.cpython-38.pyc | Bin 1826 -> 2302 bytes .../voice_processing.cpython-38.pyc | Bin 1425 -> 1656 bytes src/action_cmd.py | 8 +-- src/voice_processing.py | 62 +++++++++--------- start_all.sh | 2 +- 17 files changed, 67 insertions(+), 46 deletions(-) create mode 100644 __pycache__/main.cpython-38.pyc create mode 100644 src/__pycache__/action_cmd.cpython-38.pyc create mode 100644 src/__pycache__/local_status.cpython-38.pyc diff --git a/README.md b/README.md index 07b7c85..a0e0f8a 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,16 @@ gedit config.py +**加入系统自启动方法：** + +将`start_system.service`文件复制到`/etc/systemd/system/`下，然后使用 `systemctl enable start_system.service`设置开机启动服务 + + + +设置USB设备绑定： + +将`ttyUSBLink.rules`文件复制到`/etc/udev/rules.d/`下，然后重新插拔USB设备即可刷新 + ### 目结构： diff --git a/__pycache__/config.cpython-38.pyc b/__pycache__/config.cpython-38.pyc index 14117c1a50aadae0aef6d05ca54e4bd24c496c44..c357e543e1f5cbd91e7d396adfc0be36247fdb9b 100644 GIT binary patch delta 509 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 SU}nfl2BQXF)KLy44fVg1pmxOo literal 0 HcmV?d00001 diff --git a/config.py b/config.py index fd6ee42..afc998b 100644 --- a/config.py +++ b/config.py @@ -21,9 +21,10 @@ class Config: EQUIPMENT_TEMPERATURE_UP = '/python/mqtt/equipment_temperature' LOCAL_STATUS_UP = '/python/mqtt/local_status' - # 订阅话题 + # 发布/订阅话题 VOICE_CMD_SUB = '/python/mqtt/voice_cmd' - ACTION_CMD_SUB = 'dc4f224c4ebe' + ACTION_socket = 'dc4f224c4ebe' + ACTION_water_heater = '08f9e07db383' # 程序变量 RUN_FLAG = 1 diff --git a/docs/控制指令表.txt b/docs/控制指令表.txt index 0615f04..51ab603 100644 --- a/docs/控制指令表.txt +++ b/docs/控制指令表.txt @@ -20,6 +20,14 @@ 校验语音模块：AA 55 03 55 AA 返回=> aa 19（不播放语音） +电蚊香： +打开：AA DF +关闭：BB DF + +热水器： +打开：CC AF +关闭：DD BF + 485 红外2： 第一组：68 08 00 FF 12 00 11 16 第二组：68 08 00 FF 12 01 12 16 diff --git a/logs/Error.log b/logs/Error.log index c6e9f6a..61338fe 100644 --- a/logs/Error.log +++ b/logs/Error.log @@ -109,3 +109,4 @@ 2024-05-12 01:59:03,325 - voice_processing.pyw - ERROR - Instruction error; error command: ffffffffff 2024-05-12 02:04:57,694 - voice_processing.pyw - ERROR - Instruction error; error command: ffffffffff 2024-05-12 02:05:00,083 - main.py1 - ERROR - Thread died, restarting！！！！ +2024-05-16 22:50:18,123 - master_control.pyw - ERROR - 请检查/dev/control_usb1串口是否被占用；或者串口出现异常！ diff --git a/main.py b/main.py index 0914615..e80b5d6 100755 --- a/main.py +++ b/main.py @@ -73,7 +73,7 @@ def run_local_status(mqtt_client): def run_start_main(mqtt_client): - voice = master_control.open_serial(Config.VOICE_OPEN_SERIAL, 9600, 0.3) + voice = master_control.open_serial(Config.VOICE_OPEN_SERIAL, 115200, 0.3) while True: ser_cmd = voice_processing.get_voice_data(voice) @@ -103,10 +103,18 @@ def run_start_main(mqtt_client): client.callback_result = 'xxx' # WIFI插座 elif (ser_cmd == 'bba1') or (client.callback_result == 'bba1'): - action_cmd.action(client, Config.ACTION_CMD_SUB, 'a1') + action_cmd.action(client, Config.ACTION_socket, 'a1') client.callback_result = 'xxx' elif (ser_cmd == 'bbb1') or (client.callback_result == 'bbb1'): - action_cmd.action(client, Config.ACTION_CMD_SUB, 'b1') + action_cmd.action(client, Config.ACTION_socket, 'b1') + client.callback_result = 'xxx' + # 打开热水器 + elif (ser_cmd == 'ccaf') or (client.callback_result == 'ccaf'): + action_cmd.action(client, Config.ACTION_water_heater, 'a1') + client.callback_result = 'xxx' + # 关闭热水器 + elif (ser_cmd == 'ddbf') or (client.callback_result == 'ddbf'): + action_cmd.action(client, Config.ACTION_water_heater, 'b1') client.callback_result = 'xxx' # 校验语音模块串口是否运行异常 @@ -139,7 +147,8 @@ if __name__ == '__main__': run_start_main_thread.start() client.subscribe(Config.VOICE_CMD_SUB) - client.subscribe(Config.ACTION_CMD_SUB) + client.subscribe(Config.ACTION_socket) + client.subscribe(Config.ACTION_water_heater) while True: time.sleep(20) diff --git a/src/__pycache__/__init__.cpython-38.pyc b/src/__pycache__/__init__.cpython-38.pyc index 955a7397d35cb3ffc579ce16cf434a16f361bb1a..1bc1e83f663fc1e2f114275fc81560daf22749a9 100644 GIT binary patch literal 2538 zcmbtV&5ImG6tC*9>6x81Yu3aMqK0T717;PJ_(729hD1SDaN?y{Xgggsvom&2uT?eC z9Xh8hZiEC6ii`0w2?&Y!fhdxM4gMc}HM7Z{a`)tW)zh0v*o&lwdQ13n@D;AV0-usH@(eE@_LPGiFG-->BsF^l5bj_t%|wpr8IVa`dy9qz6Y z?h4X%&)Liaj>jv&shqP|h0`W!_*-C+EHr37`%$Vx-RZSYbYk&d*yFK~!1j5lh3+IG zLcz&l!{!)FbpVJUjB>&(PMOUuZm$yN@CtXiw@R7I9fZp3^UYHyQkjHW3)x5AyK6s< ze!X=2##fu`KaT!h-(3G|YyHp7;l^m=>(TdD?`>SzT3fsG?N!jbw{iaV^mnU`nGHNA!|U07 zRJnWW=go^(#`ie?$L;Gk0UNfX3pejvS}lDs`t8Qu-!BiQ-%*|L<>pe@YcGYJ24$We zbb76{QIU8LHq+NpOQs3BPw6mO&Yk5IJ;;4z4AP#+D^e`SVI-IhqO2CG@}%MBjuLT; zRkxLy4>AF6nHMP?=mD$6X%xnWca6v@VE%jL_*;u7J9=@sua*{@on$!{!BU!tAWC~$ zrg5NFlorXNlF?!ibb1{f1ar$Pc@@sj2nm6~R8)|Kgjh9NqfgMm-pRPlZ3`|$_{ws4 zu-NwgQP^Z;NHW?TdtL6!?4gxe=4%Gk# zTZsnSg^ir5oND9Kf}mUST4DJVfIJR+RR=<>I(29r=nNe^`GBkLOE>63!^{03=!I~< zAg={MlJY(TC&=qT@L4~M$0wB_;As>D=BaW9>`z<*Lu>*hu_aVsD)hTg9m}s6UIg0* z2FBzVOm!ScS*F77I-IsFQ>vywu~RUw=nvoxpI2e;^BSLm|0=KZY51?1p7B^-YldgU z2Wh)4@5slJ9sEm5vD>z?LWN#;34$wco~Z`!uWc; zhtgDG8%{ffd_uOci45GnZXJH3VKYAozj${=3&o~Rhta3~<@vPV)44BtQOcoLHfnh# z20y@(Rog-rKFK}g3CVl~EW|URVbe_wiJOd@E33olb~}XP=X`u3v8&}i7ztX?jG>*F zTy^jjxoaLEp8*k8EfNfhmhFPFR4EpF(Yje3Rm$Y$E zQ1W%lfn3J_!R-A=&y_k4G+n$ZrkII1W-G*R+;;I()Fjs+^DX%_oa8PSr~B<|R`DD= zQSFEBC7%beS70jB*Xdwp0^TV9KWzCN*ecN-Y|U~%a2`fI0K8XWmZ-ZXP*Ld-Kr5ez zvIp6*Bkl`;d1L~2_XO@(?-8I~A!RCe1bz`f-<$xRbhFWV1Xw?k9o>P?(vHXn0Tn+E zrK>0Nt5j@ENo=liH5LZ7=UMz$;Z~L{j%1g6$^{7x@`*9i-^Y-ZL5bxkX+)rGrLA6nerx8mUywIYj>4Z>~CJ`&FMt;puIOWMwt_ltUq9neA_vl}k?$~gU| zPg#q;(TmQ}rKqv4Ang@}0R6*xFjul%$U(`nUMfmQinl_7ukX9d-9rKa<~>^tL8&6_ zCh3k8@oSZexUaGTl#KIHUWhczp&!O^k|jkPuk4IU|F7aApI=2mXg~vNLLaySxm*n!Ld diff --git a/src/__pycache__/action_cmd.cpython-38.pyc b/src/__pycache__/action_cmd.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f6ba50052d3fab7617b13988caecfcc1ef27ab09 GIT binary patch literal 561 zcmYjNF>4h;5Z>9lcW-^>A%sBMRKhi}m7qaTNE1TfVY3`8m)m{!Hr(Bww|h#$HDX$k zw87$CX=NuCg8$=MjbdeQIR&D~X|N6zSxDFHg2e0> zGLoYhhS?&0sSZt^tLA*GFu8q@W=@+*lrNmy#fum?!z7lvQ20J-lxv$R3p~M%`Loyh z6y4s((2+Iiprbu%bg-r!NZ3Z*+oVJ90dNXb5geU|JCFBw+D+`aes_8O`OVL(i|=3i zAFn_D{&E!ud|J0Bg|@4KS(GVI#}MjjX|NP!g;tg06K86jaVArjiqhsENE0F5pNG%( zk^}9My0xohq072ZVr5DtGE=$66vCcar^>`OS#mRSR?6M_Y>58Bdwv=}7J&_D80Pry zK#k=Awloy+5Z0+%4dJQL)ez;%Wv?Wk|6i6Ei|iz|s!B^WFfr~>h{ltSgrm}1Vd_cQ UqteK>Q2YK%>jQ%gx(QpsU-9jgW&i*H literal 0 HcmV?d00001 diff --git a/src/__pycache__/data_up.cpython-38.pyc b/src/__pycache__/data_up.cpython-38.pyc index 90ffb30e1e8d128c77aea6910fbcea5cddd8fece..5bec899fa841a755584bb67a237e17e768dba4af 100644 GIT binary patch delta 48 zcmdnXdYF|vl$V!_0SFxH%rIIc731(*^)H CdJaec delta 63 zcmX@ix|fwZl$V!_0SIzxjW=@NVN}!CFUrp^(GSkdEyziY&&bbBjZefpDfI@0RUZZ6%POa diff --git a/src/__pycache__/local_status.cpython-38.pyc b/src/__pycache__/local_status.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4661e65624516db93306c299defa54019ac6cdad GIT binary patch literal 1937 zcmZuxON$#v5bo}IX!P2Ly)5xMFG3tLIas+Q0b@d7Lvj;wmJl-t#GsztosC8_boUr` zkszR4gMUD5*gg7|e-Oye=xZ+VPl!+XswM5Nl*}+y-PJYKUsrwAKXkh-hNpP`#ql2@ zV}H@)_9HO)3ZIq`l1V;h$wKplySYe&(_Z39A-!K%;!9r!(18qP13HwEY(h6=OSYjS z*^yo7rreU-&@H(mccI&oAF=q(YwX1OBa*9!P&Dx!;?ti%7$A{iE}rktnBh})DX!R@ zOYc6L@gLb|>v@S>b#pY}{vRFY}*tUK}Q*2P|#a~{<7WG=Cw{wvMrc2rI!iSgSqJ0P^ zBCfWf{{zK?(Lve4fS^cz#aCcr(SO5xOEk76bN$mIup;0<;ge|-#umZ2@x2GvC5RSR zcQ9K6LGZ3YJjG-Mg6MbYT`?){F%Z(9UX#%TtJyx2{sHVWac%Qq3!Kd}!IaPWR7|~N z52OwI7dxZWyx*%-IqKDw$%{-;Ir5*MaF*}jOs^kf8i!Vt+6EO7Rt2!wKv(13*x-0v zrbZFu*tg*#g!N^54)@ctR@yd-d{UcCZziQhNm=~x9)8#Eh7kL_!}sv2w_#gL%Nk8O zSiPaiiX=kq!JbfLz>?{+6I3Lk;Sl3Z0FE5XMYP9B_A$Y@CdWIQ0H`LkdPr{MO8|_Z ziYy3n>0jYuz%>y-iz)If`3o=@q=|(h$hHkKuKFep9j9&MJ7ho8+JUzrz*o6+?#b4Y zyDOG^ApFvq!l`#j+_azTyj{xc(rdxZhw#$0#>5tn@Tw0mUP~^WiwfY*w&2{H4ZIo7 z119k~`wds&OJRf?35>is7&u3dV#S+sNPj9IgO{NRuoljl3|};6o@ty#Q%^Qz^eg3} z*{>;)fBt^>hCi?#m|}e*O5%ejI&LJ}8&_7+B!lbTq;tEM)h^M689m9;U?Y8 ze0y>C4vRFOd=4*7Y-GG6TD--5yn7`730o?LJ?^NFpcYm4UF*>m_rI{H8E&w--*0X1 h2;gcTJuXUFkFzhSS@b>xl^d@YHKHI2@iy^A{{pHzrDOmA literal 0 HcmV?d00001 diff --git a/src/__pycache__/master_control.cpython-38.pyc b/src/__pycache__/master_control.cpython-38.pyc index 8c3a39e024a1ecc7e9a72187230e9a1cec850df3..151ea78f07da141638db615104b09c42d3264172 100644 GIT binary patch delta 360 zcmdn2xJH>Tl$V!_0SIOq}2xPjav9uQ#yBs7_e1VC&fAaRSkD7B=tC@(%Gu_Uob5F`vHgg|nfMWuQ1 zX*r4MsWXAxVh$j|z$nDX$H>K4_d+95Miwky=;) delta 115 zcmZ3ZyjhVil$V!_0SG>8nWSZlOyrYcyf;z%9xGEYgQo0eF~)67YG(RH`S~UK!I`-Q zIjQj(`MIg_$@zIDMfo}L#g)Y+sk!>aMalY`e=z@L;gSQI^nBN%r%R@7{>ia}jY(5> T@?3#Elj8)H7}X{>3TgrXIPfPq diff --git a/src/__pycache__/python_mqtt.cpython-38.pyc b/src/__pycache__/python_mqtt.cpython-38.pyc index 0f314fdc14dfc8c25935f953ea9e7b7c78e874f2..209f0f4aa653b8119821ef8f6d161e2f5cc2901c 100644 GIT binary patch delta 951 zcmZuw&rcIU6yDkCZWkzpT8N5(s9>m(#wJFQ7(7VA$r}0LfizjSJ5##2+pRNGLz@x~ zlE{7H$(W!A6OP7z!M|eu1uvdG5Z`PIL3B3rcILhBy>Iq?vtP0&x$Nff@Sp)>b?0F% zN`K29Aaq|!w2&c#2gX*K46Pf5jQoLaqj~ug-OQt|;abE1uUS@jcXzj7%W-oqr$&4) z46C01+GUitLLryT>zl(+`S+uhrOIj`D$N$JSJs258B(_%N7VJ>hG22%@-`PVs&M94 znr%^!8*cPQh+?y?9M=sRfpFb%D8w`RpveCI)hwZsa$1}+;t5Y#wb0w<%49y%ggujm zl^TRvz|x?;n3hiJ0aEfw%3svgRJtEvX`SPMDVR)CFde>7iCqQXlvJrTe2mJnWaTH1 zQ4jq$CA+2z$ye6e@`PTQ%!HRpH(S*(;PnFTB@HA_PKg`w?TcJf5WFjYS<|b&PCgwN z7N?WX!sfkELj)1?z}YhojUD3%bon}2e0gHe{sHGD*KPm+ delta 435 zcmew-xQLH0l$V!_0SL-#jnleWH}bVGGU`m8%&5x}%%I6N`3$2PqtfKhj7l5~!3--I z{WMu8YcQ!!j$@MN;Q?y;WvpM6pI@Rsxt~djRlm3>S%306CRtXnftxQe88RA1ag-LP z7NsPXB;I08%SlWxzQt6OTm;e!A$WnTTU_~h@yYpld8x@IvXf0%%ow94XR{!0- z;y`5@le<`h?2z@b7nCODWEN*=GD9?Rf(&CXPECo=Elx*saghX2QhTx#n;f&BCi~=P z?5ehWKoPK$z{Z0WAZbFlniZ%{1c-|{fCL942RjE32lHfq4n;=M$%P#LQv4uuK#DMQ JPrk*W0ssS2RDJ*e diff --git a/src/__pycache__/voice_processing.cpython-38.pyc b/src/__pycache__/voice_processing.cpython-38.pyc index 627b005250e1a6adb9a2d0c3944317210fb0cc8b..2768ae46d68b652fa84a1d26e2f81e988a4db7d2 100644 GIT binary patch delta 625 zcmbQp{ey=ul$V!_0SFp4*{7Z3*vNOCv7QCU1&KKWaj^s=149Z!En^i=4Z{M4g+Nv~ zL!Jc-LkVLxSCI!JLoE{{LzPqs(*ouc#u}#C40D+lGBPrRGej~hVo6~L2I*z0V~POs z^MGUx;{?Vcks8JYEI^Z(YnW4*vYCpCN>~@Lr2u&l-SvzNdGml$EI_FquoNpy3MkV8 zlwkwPECb81Bgtd|WjKH`2f#9%NHPIH87`pAEwBtXl8hNph6gC~1uVl0meB?KAWsG; z#h1+nbT31m0N8*02#qz&AfE*@XbNn8#Kg@geTyY2DbcW04;W(4IwwEf(-7|I=J~9D z($ihbCmS#;NG2sEL1dq{Zhkp^EsCt1f+ou?mc&Fu(Q{DTyVCQC!LSx$&8K1*Ij1w-{5S_z>LqjMR#i3`HV9hy1d0v5IleEQu*7EzXFU zT+1TG8dF@995Z*cTk59|YNsTW^EXgn|;sXj6flLP5k3@)0&Sh0*WCj2|BBFi( delta 466 zcmZ9JPfG$p7{=ds_D{O5qGFvRPt{>5GJ>E>P`54`nwLe~wH4hRnVk;Fn)hz8#|qYC zP>1My1f2puLZ2WyHR~Fr1MdURGrxIfc;{Qc%jC|pSq;QG+}i8N>TB*3$C9vdb}Y*O z5;D{Sh+qOEtb?~J1IM1mju1u!VOZiMk}M3!Jv@>LBGjP*me{)?4Y&YLXn_8S_Yhzt zPrxEQ!W^zdswE}K-#KrX_^~Am0vIj96JB_UA-O5brZ0y+kAr))v#m zRbex8_EwNI3}0mDRBEPto0(RNx0>lTbK#Ml3mLReGFNPYnajW diff --git a/src/action_cmd.py b/src/action_cmd.py index 6fc26df..8e00885 100644 --- a/src/action_cmd.py +++ b/src/action_cmd.py @@ -1,10 +1,4 @@ - - - - - - import os from src import SaveLogger @@ -14,4 +8,4 @@ save_log = SaveLogger(os.path.basename(__file__), log_file=log_file_path) def action(client, topic, data_msg) -> None: client.publish(topic, data_msg) - save_log.info(topic + " => " + "发布的信息：" + data_msg) \ No newline at end of file + save_log.info(topic + " => " + "发布的信息：" + data_msg) diff --git a/src/voice_processing.py b/src/voice_processing.py index bf1edb0..47b0a23 100644 --- a/src/voice_processing.py +++ b/src/voice_processing.py @@ -20,37 +20,35 @@ save_log_error = SaveLogger('voice_processing.pyw', log_file=log_file_path1) def get_voice_data(ser_data): - com_input1 = None # 初始化为None，避免后续引用前未定义的问题 - try: - com_input1 = ser_data.readline() - except Exception as e: - save_log_error.error(f'get_voice_data(); com_input = ser_data.readline(); Error: {e}') - return # 或者根据需要处理异常后继续或终止函数执行 + com_input = ser_data.readline() - # 确保com_input1有值后再进行后续判断 - if com_input1: - com_input1_hex = com_input1.hex() - # 开灯 - if com_input1_hex == 'a487': - save_log.info(f'开灯指令处理完返回,command:{com_input1_hex}') - # 关灯 - elif com_input1_hex == 'a488': - save_log.info(f'关灯指令处理完返回,command:{com_input1_hex}') - # 暖色灯 - elif com_input1_hex == 'd366': - save_log.info(f'打开暖色灯指令处理完返回,command:{com_input1_hex}') - # 关暖色灯 - elif com_input1_hex == 'd388': - save_log.info(f'关闭暖色灯指令处理完返回,command:{com_input1_hex}') - # 打开WIFI插座01 - elif com_input1_hex == 'bba1': - save_log.info(f'打开WIFI插座指令处理完返回,command:{com_input1_hex}') - # 关闭WIFI插座01 - elif com_input1_hex == 'bbb1': - save_log.info(f'关闭WIFI插座指令处理完返回,command:{com_input1_hex}') - elif com_input1_hex in ('aa15', 'aa19', 'aa12', 'ffffffffff'): - pass - else: - save_log_error.error(f'Instruction error; error command: {com_input1_hex}') + # 开灯 + if com_input.hex() == 'a487': + save_log.info(f'开灯指令处理完返回,command:{com_input.hex()}') + # 关灯 + elif com_input.hex() == 'a488': + save_log.info(f'关灯指令处理完返回,command:{com_input.hex()}') + # 暖色灯 + elif com_input.hex() == 'd366': + save_log.info(f'打开暖色灯指令处理完返回,command:{com_input.hex()}') + # 关暖色灯 + elif com_input.hex() == 'd388': + save_log.info(f'关闭暖色灯指令处理完返回,command:{com_input.hex()}') + # 打开WIFI插座01 + elif com_input.hex() == 'bba1': + save_log.info(f'打开WIFI插座指令处理完返回,command:{com_input.hex()}') + # 关闭WIFI插座01 + elif com_input.hex() == 'bbb1': + save_log.info(f'关闭WIFI插座指令处理完返回,command:{com_input.hex()}') + # 打开热水器 + elif com_input.hex() == 'ccaf': + save_log.info(f'打开热水器指令处理完返回,command:{com_input.hex()}') + # 关闭热水器 + elif com_input.hex() == 'ddbf': + save_log.info(f'关闭热水器指令处理完返回,command:{com_input.hex()}') + elif com_input.hex() in ('', 'aa15', 'aa19', 'aa12', 'ffffffffff'): + pass + else: + save_log_error.error(f'Instruction error; error command: {com_input.hex()}') - return com_input1_hex + return com_input.hex() diff --git a/start_all.sh b/start_all.sh index a89cf02..fbcebca 100755 --- a/start_all.sh +++ b/start_all.sh @@ -1,7 +1,7 @@ #!/bin/bash -sleep 1 +sleep 30 echo *********start python_scripts success*******