Skip to content

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

Merge branch 'feature/add_0207tankyouhua' into 'master'

合并代码 See merge request !93
parents 6a503b14 cf153ae7
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 102 deletions
build/Makefile
View file @ dcbd8165
......@@ -1217,6 +1217,30 @@ modules/delay/delay.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/delay/delay.c.s
.PHONY : modules/delay/delay.c.s
modules/go_deploy/go_deploy.o: modules/go_deploy/go_deploy.c.o
.PHONY : modules/go_deploy/go_deploy.o
# target to build an object file
modules/go_deploy/go_deploy.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/go_deploy/go_deploy.c.o
.PHONY : modules/go_deploy/go_deploy.c.o
modules/go_deploy/go_deploy.i: modules/go_deploy/go_deploy.c.i
.PHONY : modules/go_deploy/go_deploy.i
# target to preprocess a source file
modules/go_deploy/go_deploy.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/go_deploy/go_deploy.c.i
.PHONY : modules/go_deploy/go_deploy.c.i
modules/go_deploy/go_deploy.s: modules/go_deploy/go_deploy.c.s
.PHONY : modules/go_deploy/go_deploy.s
# target to generate assembly for a file
modules/go_deploy/go_deploy.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/go_deploy/go_deploy.c.s
.PHONY : modules/go_deploy/go_deploy.c.s
modules/http/http_config_mqtt.o: modules/http/http_config_mqtt.c.o
.PHONY : modules/http/http_config_mqtt.o
......@@ -1289,6 +1313,30 @@ modules/http/http_request.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/http/http_request.c.s
.PHONY : modules/http/http_request.c.s
modules/ipc/unix_socket_server.o: modules/ipc/unix_socket_server.c.o
.PHONY : modules/ipc/unix_socket_server.o
# target to build an object file
modules/ipc/unix_socket_server.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/ipc/unix_socket_server.c.o
.PHONY : modules/ipc/unix_socket_server.c.o
modules/ipc/unix_socket_server.i: modules/ipc/unix_socket_server.c.i
.PHONY : modules/ipc/unix_socket_server.i
# target to preprocess a source file
modules/ipc/unix_socket_server.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/ipc/unix_socket_server.c.i
.PHONY : modules/ipc/unix_socket_server.c.i
modules/ipc/unix_socket_server.s: modules/ipc/unix_socket_server.c.s
.PHONY : modules/ipc/unix_socket_server.s
# target to generate assembly for a file
modules/ipc/unix_socket_server.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/ipc/unix_socket_server.c.s
.PHONY : modules/ipc/unix_socket_server.c.s
modules/logger/mylog.o: modules/logger/mylog.c.o
.PHONY : modules/logger/mylog.o
......@@ -1385,6 +1433,30 @@ modules/mqtt/mqtt_verify.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/mqtt/mqtt_verify.c.s
.PHONY : modules/mqtt/mqtt_verify.c.s
modules/tailscale_deploy/tailscale_deploy.o: modules/tailscale_deploy/tailscale_deploy.c.o
.PHONY : modules/tailscale_deploy/tailscale_deploy.o
# target to build an object file
modules/tailscale_deploy/tailscale_deploy.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/tailscale_deploy/tailscale_deploy.c.o
.PHONY : modules/tailscale_deploy/tailscale_deploy.c.o
modules/tailscale_deploy/tailscale_deploy.i: modules/tailscale_deploy/tailscale_deploy.c.i
.PHONY : modules/tailscale_deploy/tailscale_deploy.i
# target to preprocess a source file
modules/tailscale_deploy/tailscale_deploy.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/tailscale_deploy/tailscale_deploy.c.i
.PHONY : modules/tailscale_deploy/tailscale_deploy.c.i
modules/tailscale_deploy/tailscale_deploy.s: modules/tailscale_deploy/tailscale_deploy.c.s
.PHONY : modules/tailscale_deploy/tailscale_deploy.s
# target to generate assembly for a file
modules/tailscale_deploy/tailscale_deploy.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/tailscale_deploy/tailscale_deploy.c.s
.PHONY : modules/tailscale_deploy/tailscale_deploy.c.s
modules/thread_pool/pthrpoll.o: modules/thread_pool/pthrpoll.c.o
.PHONY : modules/thread_pool/pthrpoll.o
......@@ -2072,6 +2144,9 @@ help:
@echo "... modules/delay/delay.o"
@echo "... modules/delay/delay.i"
@echo "... modules/delay/delay.s"
@echo "... modules/go_deploy/go_deploy.o"
@echo "... modules/go_deploy/go_deploy.i"
@echo "... modules/go_deploy/go_deploy.s"
@echo "... modules/http/http_config_mqtt.o"
@echo "... modules/http/http_config_mqtt.i"
@echo "... modules/http/http_config_mqtt.s"
......@@ -2081,6 +2156,9 @@ help:
@echo "... modules/http/http_request.o"
@echo "... modules/http/http_request.i"
@echo "... modules/http/http_request.s"
@echo "... modules/ipc/unix_socket_server.o"
@echo "... modules/ipc/unix_socket_server.i"
@echo "... modules/ipc/unix_socket_server.s"
@echo "... modules/logger/mylog.o"
@echo "... modules/logger/mylog.i"
@echo "... modules/logger/mylog.s"
......@@ -2093,6 +2171,9 @@ help:
@echo "... modules/mqtt/mqtt_verify.o"
@echo "... modules/mqtt/mqtt_verify.i"
@echo "... modules/mqtt/mqtt_verify.s"
@echo "... modules/tailscale_deploy/tailscale_deploy.o"
@echo "... modules/tailscale_deploy/tailscale_deploy.i"
@echo "... modules/tailscale_deploy/tailscale_deploy.s"
@echo "... modules/thread_pool/pthrpoll.o"
@echo "... modules/thread_pool/pthrpoll.i"
@echo "... modules/thread_pool/pthrpoll.s"
......
build/main
View file @ dcbd8165
No preview for this file type
build/third_party/mosquitto/apps/mosquitto_ctrl/CMakeFiles/mosquitto_ctrl.dir/progress.make
View file @ dcbd8165
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 81
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = 82
CMAKE_PROGRESS_4 = 82
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 = 83
CMAKE_PROGRESS_7 = 83
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 = 84
CMAKE_PROGRESS_10 = 84
CMAKE_PROGRESS_11 =
CMAKE_PROGRESS_12 =
CMAKE_PROGRESS_13 =
CMAKE_PROGRESS_13 = 85
build/third_party/mosquitto/apps/mosquitto_passwd/CMakeFiles/mosquitto_passwd.dir/progress.make
View file @ dcbd8165
CMAKE_PROGRESS_1 = 90
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = 91
CMAKE_PROGRESS_3 = 91
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = 92
CMAKE_PROGRESS_6 = 92
CMAKE_PROGRESS_7 =
build/third_party/mosquitto/lib/CMakeFiles/libmosquitto.dir/progress.make
View file @ dcbd8165
......@@ -20,11 +20,11 @@ CMAKE_PROGRESS_19 =
CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_21 = 7
CMAKE_PROGRESS_22 =
CMAKE_PROGRESS_23 = 8
CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 = 8
CMAKE_PROGRESS_25 =
CMAKE_PROGRESS_26 = 9
CMAKE_PROGRESS_27 =
CMAKE_PROGRESS_26 =
CMAKE_PROGRESS_27 = 9
CMAKE_PROGRESS_28 =
CMAKE_PROGRESS_29 = 10
CMAKE_PROGRESS_30 =
......@@ -40,6 +40,6 @@ CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_41 = 14
CMAKE_PROGRESS_42 =
CMAKE_PROGRESS_43 = 15
CMAKE_PROGRESS_44 =
CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_44 = 15
build/third_party/mosquitto/lib/CMakeFiles/libmosquitto_static.dir/progress.make
View file @ dcbd8165
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 16
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 16
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = 17
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 = 17
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 = 18
CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 = 18
CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 = 19
CMAKE_PROGRESS_12 =
......@@ -16,30 +16,30 @@ CMAKE_PROGRESS_15 =
CMAKE_PROGRESS_16 =
CMAKE_PROGRESS_17 = 21
CMAKE_PROGRESS_18 =
CMAKE_PROGRESS_19 = 22
CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_19 =
CMAKE_PROGRESS_20 = 22
CMAKE_PROGRESS_21 =
CMAKE_PROGRESS_22 = 23
CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_22 =
CMAKE_PROGRESS_23 = 23
CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_25 = 24
CMAKE_PROGRESS_26 =
CMAKE_PROGRESS_25 =
CMAKE_PROGRESS_26 = 24
CMAKE_PROGRESS_27 =
CMAKE_PROGRESS_28 = 25
CMAKE_PROGRESS_29 =
CMAKE_PROGRESS_28 =
CMAKE_PROGRESS_29 = 25
CMAKE_PROGRESS_30 =
CMAKE_PROGRESS_31 = 26
CMAKE_PROGRESS_32 =
CMAKE_PROGRESS_31 =
CMAKE_PROGRESS_32 = 26
CMAKE_PROGRESS_33 =
CMAKE_PROGRESS_34 = 27
CMAKE_PROGRESS_35 =
CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 = 27
CMAKE_PROGRESS_36 =
CMAKE_PROGRESS_37 = 28
CMAKE_PROGRESS_38 =
CMAKE_PROGRESS_39 = 29
CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 = 29
CMAKE_PROGRESS_41 =
CMAKE_PROGRESS_42 = 30
CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_42 =
CMAKE_PROGRESS_43 = 30
CMAKE_PROGRESS_44 =
build/third_party/mosquitto/plugins/dynamic-security/CMakeFiles/mosquitto_dynamic_security.dir/progress.make
View file @ dcbd8165
CMAKE_PROGRESS_1 = 85
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 86
CMAKE_PROGRESS_4 =
......
build/third_party/mosquitto/src/CMakeFiles/mosquitto.dir/progress.make
View file @ dcbd8165
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_1 = 55
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = 55
CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = 56
CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 = 56
CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = 57
CMAKE_PROGRESS_8 =
CMAKE_PROGRESS_9 = 57
CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 = 58
CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 = 58
CMAKE_PROGRESS_11 =
CMAKE_PROGRESS_12 =
CMAKE_PROGRESS_13 =
CMAKE_PROGRESS_14 = 59
CMAKE_PROGRESS_13 = 59
CMAKE_PROGRESS_14 =
CMAKE_PROGRESS_15 =
CMAKE_PROGRESS_16 =
CMAKE_PROGRESS_17 = 60
CMAKE_PROGRESS_16 = 60
CMAKE_PROGRESS_17 =
CMAKE_PROGRESS_18 =
CMAKE_PROGRESS_19 =
CMAKE_PROGRESS_20 = 61
CMAKE_PROGRESS_19 = 61
CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_21 =
CMAKE_PROGRESS_22 =
CMAKE_PROGRESS_23 = 62
CMAKE_PROGRESS_22 = 62
CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_25 =
CMAKE_PROGRESS_26 = 63
CMAKE_PROGRESS_27 =
CMAKE_PROGRESS_25 = 63
CMAKE_PROGRESS_26 =
CMAKE_PROGRESS_27 = 64
CMAKE_PROGRESS_28 =
CMAKE_PROGRESS_29 = 64
CMAKE_PROGRESS_30 =
CMAKE_PROGRESS_31 = 65
CMAKE_PROGRESS_29 =
CMAKE_PROGRESS_30 = 65
CMAKE_PROGRESS_31 =
CMAKE_PROGRESS_32 =
CMAKE_PROGRESS_33 =
CMAKE_PROGRESS_34 = 66
CMAKE_PROGRESS_33 = 66
CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 =
CMAKE_PROGRESS_36 =
CMAKE_PROGRESS_37 = 67
CMAKE_PROGRESS_36 = 67
CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 =
CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 = 68
CMAKE_PROGRESS_39 = 68
CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_41 =
CMAKE_PROGRESS_42 =
CMAKE_PROGRESS_43 = 69
CMAKE_PROGRESS_42 = 69
CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_44 =
CMAKE_PROGRESS_45 =
CMAKE_PROGRESS_46 = 70
CMAKE_PROGRESS_45 = 70
CMAKE_PROGRESS_46 =
CMAKE_PROGRESS_47 =
CMAKE_PROGRESS_48 =
CMAKE_PROGRESS_49 = 71
CMAKE_PROGRESS_48 = 71
CMAKE_PROGRESS_49 =
CMAKE_PROGRESS_50 =
CMAKE_PROGRESS_51 = 72
CMAKE_PROGRESS_52 =
CMAKE_PROGRESS_53 =
CMAKE_PROGRESS_54 = 73
CMAKE_PROGRESS_53 = 73
CMAKE_PROGRESS_54 =
CMAKE_PROGRESS_55 =
CMAKE_PROGRESS_56 =
CMAKE_PROGRESS_57 = 74
CMAKE_PROGRESS_56 = 74
CMAKE_PROGRESS_57 =
CMAKE_PROGRESS_58 =
CMAKE_PROGRESS_59 =
CMAKE_PROGRESS_60 = 75
CMAKE_PROGRESS_59 = 75
CMAKE_PROGRESS_60 =
CMAKE_PROGRESS_61 =
CMAKE_PROGRESS_62 =
CMAKE_PROGRESS_63 = 76
CMAKE_PROGRESS_62 = 76
CMAKE_PROGRESS_63 =
CMAKE_PROGRESS_64 =
CMAKE_PROGRESS_65 =
CMAKE_PROGRESS_66 = 77
CMAKE_PROGRESS_65 = 77
CMAKE_PROGRESS_66 =
CMAKE_PROGRESS_67 =
CMAKE_PROGRESS_68 =
CMAKE_PROGRESS_69 = 78
CMAKE_PROGRESS_68 = 78
CMAKE_PROGRESS_69 =
CMAKE_PROGRESS_70 =
CMAKE_PROGRESS_71 = 79
CMAKE_PROGRESS_72 =
......
drivers/devicecontrol/tank_common.c
View file @ dcbd8165
......@@ -68,6 +68,7 @@ bool set_backshotstatus(bool flag){
s_backshot_status=flag;
}
/*后退函数*/
static int tank_delay_shot_back(){
if(g_device_delay_back_count <= g_tank_common_config_t->back_time) {
tank_shot_back(g_tank_common_config_t->shot_back_speed);
......@@ -104,41 +105,43 @@ int tankshot_detection_backcount(int *cool_time,int flag){
static int cool_count_init=0;
static int cool_count=0;
pthread_mutex_lock(&tankshot_detection_i2c_mutex);
if(flag==0){
cool_count_init=*cool_time;
my_zlog_info("cool_count_init的值：%d",cool_count_init);
}
else if(flag==1){
pthread_mutex_lock(&tankshot_detection_i2c_mutex);
cool_count++;
if(cool_count>cool_count_init*2){
setshot_detection_index(true);
}
if(cool_count>200000) cool_count=200001;
pthread_mutex_unlock(&tankshot_detection_i2c_mutex);
}else if(flag==2){
return cool_count;
}else if(flag==3){
pthread_mutex_lock(&tankshot_detection_i2c_mutex);
cool_count=0;
tankshot_detectionback_count=0;
my_zlog_info("冷却计时重置");
pthread_mutex_unlock(&tankshot_detection_i2c_mutex);
}else if(flag==4){
tankshot_detectionback_count=0;
}
pthread_mutex_unlock(&tankshot_detection_i2c_mutex);
}
static void tankshot_detectionback(){
static bool index=0;
if(digitalRead(12)==LOW) {
s_back_status=true;
index=1;
delay_ms(100); // 延时 100ms，防止抖动
g_device_delay_back_count=0;
softPwmWrite(27, 0);
set_backshotstatus(false);
my_zlog_info("检测引脚12拉低");
delay_ms(10);
if(digitalRead(12)==LOW){
s_back_status=true;
index=1;
delay_ms(90); // 延时 100ms，防止抖动
g_device_delay_back_count=0;
softPwmWrite(27, 0);
set_backshotstatus(false);
my_zlog_info("检测引脚12拉低");
}
}
if(s_back_status==true&&index==1) {
tank_delay_shot_back();
......@@ -207,7 +210,6 @@ int tank_shot_back_stop(unsigned char pin,unsigned char val){
if(val != 0) {
if(g_tank_shot_index == 0){
tank_shot_pthrpoll_task_init();
g_tank_shot_index=1;
}
if(g_tank_shot_index == 1 && s_tank_shot_index_cool==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