Skip to content

C
car-controlserver
Commit 771451ac authored by 957dd's avatar 957dd
Browse files
Options

Merge branch 'feature/device_adjust_waji' into 'master'

加入了tts播放，但是有bug，会一直播放 See merge request !83
parents 643e4172 e22b2880
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 75 deletions
audio.mp3 0 → 100644
View file @ 771451ac
File added
build/Makefile
View file @ 771451ac
......@@ -1025,6 +1025,30 @@ drivers/sensors/audioplay.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/audioplay.c.s
.PHONY : drivers/sensors/audioplay.c.s
drivers/sensors/audiotts_play.o: drivers/sensors/audiotts_play.c.o
.PHONY : drivers/sensors/audiotts_play.o
# target to build an object file
drivers/sensors/audiotts_play.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/audiotts_play.c.o
.PHONY : drivers/sensors/audiotts_play.c.o
drivers/sensors/audiotts_play.i: drivers/sensors/audiotts_play.c.i
.PHONY : drivers/sensors/audiotts_play.i
# target to preprocess a source file
drivers/sensors/audiotts_play.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/audiotts_play.c.i
.PHONY : drivers/sensors/audiotts_play.c.i
drivers/sensors/audiotts_play.s: drivers/sensors/audiotts_play.c.s
.PHONY : drivers/sensors/audiotts_play.s
# target to generate assembly for a file
drivers/sensors/audiotts_play.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/audiotts_play.c.s
.PHONY : drivers/sensors/audiotts_play.c.s
drivers/sensors/infrared_gun.o: drivers/sensors/infrared_gun.c.o
.PHONY : drivers/sensors/infrared_gun.o
......@@ -2000,6 +2024,9 @@ help:
@echo "... drivers/sensors/audioplay.o"
@echo "... drivers/sensors/audioplay.i"
@echo "... drivers/sensors/audioplay.s"
@echo "... drivers/sensors/audiotts_play.o"
@echo "... drivers/sensors/audiotts_play.i"
@echo "... drivers/sensors/audiotts_play.s"
@echo "... drivers/sensors/infrared_gun.o"
@echo "... drivers/sensors/infrared_gun.i"
@echo "... drivers/sensors/infrared_gun.s"
......
build/main
View file @ 771451ac
No preview for this file type
build/third_party/mosquitto/apps/mosquitto_ctrl/CMakeFiles/mosquitto_ctrl.dir/progress.make
View file @ 771451ac
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 81
CMAKE_PROGRESS_2 = 81
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = 82
CMAKE_PROGRESS_6 =
......
build/third_party/mosquitto/lib/CMakeFiles/libmosquitto.dir/progress.make
View file @ 771451ac
......@@ -34,8 +34,8 @@ CMAKE_PROGRESS_33 =
CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 = 12
CMAKE_PROGRESS_36 =
CMAKE_PROGRESS_37 = 13
CMAKE_PROGRESS_38 =
CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 = 13
CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 = 14
CMAKE_PROGRESS_41 =
......
build/third_party/mosquitto/lib/CMakeFiles/libmosquitto_static.dir/progress.make
View file @ 771451ac
......@@ -7,8 +7,8 @@ CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 = 18
CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 = 19
CMAKE_PROGRESS_11 =
CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 = 19
CMAKE_PROGRESS_12 =
CMAKE_PROGRESS_13 = 20
CMAKE_PROGRESS_14 =
......@@ -24,11 +24,11 @@ CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_25 = 24
CMAKE_PROGRESS_26 =
CMAKE_PROGRESS_27 = 25
CMAKE_PROGRESS_28 =
CMAKE_PROGRESS_27 =
CMAKE_PROGRESS_28 = 25
CMAKE_PROGRESS_29 =
CMAKE_PROGRESS_30 = 26
CMAKE_PROGRESS_31 =
CMAKE_PROGRESS_30 =
CMAKE_PROGRESS_31 = 26
CMAKE_PROGRESS_32 =
CMAKE_PROGRESS_33 = 27
CMAKE_PROGRESS_34 =
......
build/third_party/mosquitto/plugins/dynamic-security/CMakeFiles/mosquitto_dynamic_security.dir/progress.make
View file @ 771451ac
......@@ -3,8 +3,8 @@ CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = 86
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = 87
CMAKE_PROGRESS_6 = 87
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 = 88
CMAKE_PROGRESS_10 =
......
build/third_party/mosquitto/src/CMakeFiles/mosquitto.dir/progress.make
View file @ 771451ac
CMAKE_PROGRESS_1 = 54
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = 55
CMAKE_PROGRESS_3 = 55
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = 56
CMAKE_PROGRESS_6 = 56
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 = 57
CMAKE_PROGRESS_10 =
......@@ -14,14 +14,14 @@ CMAKE_PROGRESS_13 =
CMAKE_PROGRESS_14 =
CMAKE_PROGRESS_15 = 59
CMAKE_PROGRESS_16 =
CMAKE_PROGRESS_17 =
CMAKE_PROGRESS_18 = 60
CMAKE_PROGRESS_17 = 60
CMAKE_PROGRESS_18 =
CMAKE_PROGRESS_19 =
CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_21 = 61
CMAKE_PROGRESS_20 = 61
CMAKE_PROGRESS_21 =
CMAKE_PROGRESS_22 =
CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 = 62
CMAKE_PROGRESS_23 = 62
CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_25 =
CMAKE_PROGRESS_26 = 63
CMAKE_PROGRESS_27 =
......@@ -34,11 +34,11 @@ CMAKE_PROGRESS_33 =
CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 = 66
CMAKE_PROGRESS_36 =
CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 = 67
CMAKE_PROGRESS_37 = 67
CMAKE_PROGRESS_38 =
CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_41 = 68
CMAKE_PROGRESS_40 = 68
CMAKE_PROGRESS_41 =
CMAKE_PROGRESS_42 =
CMAKE_PROGRESS_43 = 69
CMAKE_PROGRESS_44 =
......@@ -54,8 +54,8 @@ CMAKE_PROGRESS_53 =
CMAKE_PROGRESS_54 =
CMAKE_PROGRESS_55 = 73
CMAKE_PROGRESS_56 =
CMAKE_PROGRESS_57 =
CMAKE_PROGRESS_58 = 74
CMAKE_PROGRESS_57 = 74
CMAKE_PROGRESS_58 =
CMAKE_PROGRESS_59 =
CMAKE_PROGRESS_60 = 75
CMAKE_PROGRESS_61 =
......@@ -71,6 +71,6 @@ CMAKE_PROGRESS_70 =
CMAKE_PROGRESS_71 =
CMAKE_PROGRESS_72 = 79
CMAKE_PROGRESS_73 =
CMAKE_PROGRESS_74 =
CMAKE_PROGRESS_75 = 80
CMAKE_PROGRESS_74 = 80
CMAKE_PROGRESS_75 =
drivers/sensors/audioplay.c
View file @ 771451ac
......@@ -108,6 +108,10 @@ void audioplay_cycle(){
}
audioplay_send_mqtt();
}
video_tts_play();
delay_us(500);
}
}
......
drivers/sensors/audiotts_play.c
View file @ 771451ac
This diff is collapsed.
drivers/sensors/audiotts_play.h
View file @ 771451ac
......@@ -3,8 +3,14 @@
#include "common.h"
void set_audio_tts_index(bool index);
/*
*将接收到的保存到指定文件
*/
int mqtt_audio_tts(cJSON *body);
int audio_tts(const char *text);
/*
*功能，tts播放
*/
void video_tts_play();
bool get_audio_tts_index();
#endif
\ No newline at end of file
modules/mqtt/mqtt_infor_handle.c
View file @ 771451ac
......@@ -337,7 +337,10 @@ int device_message_receive(cJSON *json){//接收到的控制设备的mqtt消息
break;
case 2026:
receive_self_contorl_date_mqtt(body);
my_zlog_debug("device self comtrol date save");
my_zlog_info("device self comtrol date save");
case 2027:
mqtt_audio_tts(body);
my_zlog_info("device audio_tts");
default:
break;
}
......
modules/mqtt/mqtt_init.c
View file @ 771451ac
......@@ -244,35 +244,29 @@ void mqtt_clean(){
int mqtt_cycle() {//非阻塞型
my_zlog_info("MQTT 异步监控线程启动");
int check_interval = 30000; // 30秒检查一次，减少日志频率
while (1) {
// bool all_connected = true;
// for (int i = 0; i < g_mqtt_cam_config_t->mqtt_count; i++) {
// if (!g_clients_t[i].mosq) continue;
// int state = mosquitto_socket(g_clients_t[i].mosq);
// if (state == -1) {
// all_connected = false;
// my_zlog_warn("检测到 MQTT [%s:%d] 已断开，尝试重连...",
// g_clients_t[i].host, g_clients_t[i].port);
// //mosquitto_reconnect_async(g_clients_t[i].mosq);
// }
// }
delay_ms(1000); // 每 1 秒检测一次连接状态
// 简单的存活检查，记录连接状态
int active_count = 0;
int total_count = g_mqtt_cam_config_t ? g_mqtt_cam_config_t->mqtt_count : 0;
for (int i = 0; i < total_count; i++) {
if (g_clients_t[i].mosq && !g_clients_t[i].permanently_failed) {
active_count++;
}
}
// 只在状态变化或定期记录
static int last_active_count = -1;
if (active_count != last_active_count) {
my_zlog_info("MQTT 连接状态: %d/%d 活跃", active_count, total_count);
last_active_count = active_count;
}
delay_ms(check_interval);
}
// while (1) {
// for(int i=0;i<g_mqtt_cam_config_t->mqtt_count;i++){
// int rc= mosquitto_loop(g_clients_t[i].mosq, 17, 1); // 每秒检查一次
// if(rc != MOSQ_ERR_SUCCESS){
// my_zlog_warn("服务器 %s:%d 断开，尝试重连...",
// g_clients_t[i].host, g_clients_t[i].port);
// mosquitto_reconnect(g_clients_t[i].mosq);
// }
// }
// delay_us(50);
// }
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment