D10:
authordxy15521469561 <1731678236@qq.com>
Thu, 7 Dec 2023 07:47:25 +0000 (15:47 +0800)
committerdxy15521469561 <1731678236@qq.com>
Thu, 7 Dec 2023 07:47:25 +0000 (15:47 +0800)
跌倒提示音频文件增加

2.sdk/Helios_SDK/services/microPython/ports/quectel/core/source/modHsensor_HX3918.c
2.sdk/project/D10/audio.bin
2.sdk/project/D10/audio/R_FALL_ALARM.mp3 [new file with mode: 0644]
2.sdk/project/D10/list.json
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/btn_device_ec800m.py
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/project/D10/usr/static/audio.bin

index d916a6a..724755d 100644 (file)
@@ -169,7 +169,7 @@ void HX3918_thread_do(void)
                // }
                
                #if CONFIG_SC7A20
-               if(ir_wear == 1 && cap_wear==1)
+               //if(ir_wear == 1 && cap_wear==1)
                {
                        SL_SC7A20_PEDO_KCAL_WRIST_SLEEP_SWAY_L_ALGO();
                        
index 5448f4c..df7bebd 100644 (file)
Binary files a/2.sdk/project/D10/audio.bin and b/2.sdk/project/D10/audio.bin differ
diff --git a/2.sdk/project/D10/audio/R_FALL_ALARM.mp3 b/2.sdk/project/D10/audio/R_FALL_ALARM.mp3
new file mode 100644 (file)
index 0000000..329f4e6
Binary files /dev/null and b/2.sdk/project/D10/audio/R_FALL_ALARM.mp3 differ
index 5a079f8..50b4991 100644 (file)
@@ -1 +1 @@
-['audio_find_haixiu', 'R_ALARM_NEW', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_NO_SET_SOS_DIAL', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_WECHAT_RECV']
\ No newline at end of file
+['audio_find_haixiu', 'R_ALARM_NEW', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_FALL_ALARM', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_NO_SET_SOS_DIAL', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_WECHAT_RECV']
\ No newline at end of file
index 59cd58c..1bc0808 100644 (file)
@@ -26,7 +26,7 @@ def open_motor():
 def close_motor():
     motor_pin.write(0)
 
-audio_buf = ['audio_find_haixiu', 'R_ALARM_NEW', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_NO_SET_SOS_DIAL', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_WECHAT_RECV']
+audio_buf = ['audio_find_haixiu', 'R_ALARM_NEW', 'R_CALL_mp3', 'R_CHARGE_FULL', 'R_CHARGE_IN', 'R_CHARGE_OUT', 'R_FALL_ALARM', 'R_HSENSOR_RESULT_FAILE', 'R_HSENSOR_RESULT_HR_TITLE', 'R_HSENSOR_RESULT_OK', 'R_HSENSOR_SPO2_TITLE', 'R_HSENSOR_TEMP_TITLE', 'R_NO_SET_SOS_DIAL', 'R_NO_SIM', 'R_POWER_OFF_1', 'R_READ_STEP_0', 'R_READ_STEP_1', 'R_READ_STEP_2', 'R_READ_STEP_3', 'R_READ_STEP_4', 'R_READ_TIME_0', 'R_READ_TIME_1', 'R_READ_TIME_2', 'R_READ_TIME_3', 'R_READ_TIME_4', 'R_READ_TIME_5', 'R_READ_TIME_6', 'R_READ_TIME_7', 'R_READ_TIME_8', 'R_READ_TIME_9', 'R_READ_TIME_MIN', 'R_READ_TIME_ZHENG', 'R_SIM_CONNECT', 'R_SIM_FAILE', 'R_SOS_ALERT', 'R_TSENSOR_RESULT_VALUE_DOT', 'R_UNREAD_WECHAT', 'R_WECHAT_RECV']
 class call:
     CALL_OUT = 1
     CALL_IN = 2
@@ -109,6 +109,7 @@ class intervManager(Abstract):
         self.msg_tmp = ""
         self.time_count = 0
         self.audio_int = 0
+        
         check_txt = ql_fs.path_exists("/usr/static/storage_file/wechat_record.json")
         if check_txt == True :
             with open("/usr/static/storage_file/wechat_record.json","r") as fd:#音频文件编号
@@ -191,8 +192,27 @@ class intervManager(Abstract):
 
 
         EventMesh.subscribe("sos_short_press", self.sos_short_press)#sos短按事件
+
+        EventMesh.subscribe("falldown_alarm_event", self.falldown_alarm_event)#跌倒报警启动中
+        
+    def falldown_alarm_event(self,args,msg):#跌倒报警启动中提示
+       
+        str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_FALL_ALARM"))
+        self.time_count = 0
+        self.timer.start(500, 1, self.falldown_alarm_cb)
+        EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
         
 
+    def falldown_alarm_cb(self,*args):
+        self.time_count+=1
+        if self.time_count > 3:
+            self.time_count=0
+            self.timer.stop()
+            str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_FALL_ALARM"))
+            EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
+            
+           
+
     def sos_short_press(self,args,msg):
         EventMesh.publish("interup_call_event")#如果在电话中强制挂断电话
         EventMesh.publish("close_audio_play")#强制关闭音频文件播放
@@ -371,7 +391,7 @@ class intervManager(Abstract):
                 EventMesh.publish("play_audio_file",[str_data,1])#获取播放音频文件
                 # EventMesh.publish("play_audio_file",str_data)#获取播放音频文件('U:/static/audio.bin',1,1,str_data)
             else:
-                self.time_count = 0
+                
                 self.phone_num = str(msg)
                 self.timer1.start(2000, 0, self.time_out_phone)
                 str_data = 'mp3files={}.mp3'.format(audio_buf.index("R_SOS_ALERT"))
@@ -2177,7 +2197,7 @@ class BtnDevice(Abstract):
                 EventMesh.publish("answer_call_event")#接听电话
             else:
                 EventMesh.publish("play_wechat_last_amr")
-            pass
+            # pass
         self.wechatKey_press_count = 0
 
 
index 61300ad..9a3a504 100644 (file)
@@ -912,7 +912,7 @@ class DeviceInfoManager(Abstract):
         if para == 0: #跌倒报警
             pass
             if fall_sw == "1":
-                EventMesh.publish("OPEN_FIND_WATCH")
+                EventMesh.publish("falldown_alarm_event")
                 dev_state =  EventMesh.publish("get_dev_state")
 
                 tmp = 1 << 21
@@ -1189,6 +1189,12 @@ class DeviceInfoManager(Abstract):
 
         if get_temp_state == None:
             get_temp_state = 0
+
+        if self.get_hr_state == None:
+            self.get_hr_state = 0
+        if self.get_spo2_state == None:
+            self.get_spo2_state = 0 
+
         hr_time = {}
         hr_time = EventMesh.publish("get_time_hr_spo2")#获取时间是否大于0
 
index 5448f4c..df7bebd 100644 (file)
Binary files a/2.sdk/project/D10/usr/static/audio.bin and b/2.sdk/project/D10/usr/static/audio.bin differ