1.马达参数灵活修改

2.拨打电话是关闭静默录音

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py
index 08415dc..126ed5c 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/motor.py
@@ -67,13 +67,14 @@ class motorEventManager(Abstract):#马达事件
                 self.motor_total_time = msg[2]#总的时间
                 self.motor_open_time = msg[3] #开马达事件
                 self.motor_close_time = msg[4]#关马达事件100ms
+                self.motor_total_time_tmp=self.motor_total_time
                 if len(msg) <= 5:
                     self.motor_count = 0
                 else:
                     self.motor_count = msg[5]
 
                 self.motor_timer.stop()
-                # print("motor msg",msg)
+                print("motor msg:{} len:{} self.motor_count:{}".format(msg,len(msg),self.motor_count))
                 close_motor()
                 self.motor_timer.start(MOTOR_TIME,1,self.publish_motor_event_cb)
 
@@ -83,26 +84,26 @@ class motorEventManager(Abstract):#马达事件
             EventMesh.publish("close_motor_infor")#关闭马达和定时器
             return
         if self.motor_mode == 1:# 持续振动时间100单位 长振
-            if self.motor_total_time > 0:
-                if self.motor_count == 0:
-                    self.motor_total_time-=1
-                    if self.motor_total_time > 0:
-                        open_motor()
-                    else:
-                        close_motor()
-                        EventMesh.publish("close_motor_infor")#关闭马达和定时器
-                        return
+            if self.motor_count == 0:
+                self.motor_total_time-=1
+                if self.motor_total_time > 0:
+                    open_motor()
                 else:
-                    if self.motor_count_tmp > self.motor_count:
-                        close_motor()
-                        EventMesh.publish("close_motor_infor")#关闭马达和定时器
-                        return
-                    self.motor_total_time-=1
-                    if self.motor_total_time > 0:
-                        open_motor()
-                    else:
-                        close_motor()
-                        self.motor_count_tmp+=1
+                    close_motor()
+                    EventMesh.publish("close_motor_infor")#关闭马达和定时器
+                    return
+            else:
+                if self.motor_count_tmp > self.motor_count:
+                    close_motor()
+                    EventMesh.publish("close_motor_infor")#关闭马达和定时器
+                    return
+                self.motor_total_time_tmp-=1
+                if self.motor_total_time_tmp > 0:
+                    open_motor()
+                else:
+                    close_motor()
+                    self.motor_total_time_tmp=self.motor_total_time
+                    self.motor_count_tmp+=1
                     
                     pass
         elif self.motor_mode == 2:# 间隔振动

diff --git a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/voice_record.py b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/voice_record.py
index 8d755d9..cf51d06 100644 (file)
--- a/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/voice_record.py
+++ b/2.sdk/project/7PIN_1_5/sdk/services/microPython/ports/quectel/core/voice_record.py
@@ -189,6 +189,7 @@ class VOICE_RECORD(Abstract): #静默录音
                             get_sos_flag = EventMesh.publish("get_sos_flag") 
                             if get_sos_flag != 0:
                                 print("打电话退出静默录音")
+                                EventMesh.publish("stop_voice_record")
                                 EventMesh.publish("SEND_JINMOAUDIO_TO_IOT",[read_buf,self.msgid_int,0])
                                 break
                             EventMesh.publish("SEND_JINMOAUDIO_TO_IOT",[read_buf,self.msgid_int,self.start_voice_record_flag])
@@ -198,7 +199,7 @@ class VOICE_RECORD(Abstract): #静默录音
                             if get_sos_flag != 0:
                                 print("打电话退出语音留言")
                                 # EventMesh.publish("set_yuyinaudio_flag")
-
+                                EventMesh.publish("stop_voice_record")
                                 EventMesh.publish("SEND_YUYINAUDIO_TO_IOT",[read_buf,self.msgid_int,0])
                                 break
                             EventMesh.publish("SEND_YUYINAUDIO_TO_IOT",[read_buf,self.msgid_int,self.start_voice_record_flag])