Skip to content

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

Merge branch 'feature/tankM1A2_flontset' into 'master'

Feature/tank m1 a2 flontset See merge request !52
parents 81d5f49c 193b8804
Hide whitespace changes
Inline Side-by-side
Showing with 364 additions and 331 deletions
build/Makefile
View file @ f582ab9d
...@@ -942,6 +942,30 @@ drivers/sensors/infrared_gun.c.s: ...@@ -942,6 +942,30 @@ drivers/sensors/infrared_gun.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/infrared_gun.c.s $(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/infrared_gun.c.s
.PHONY : drivers/sensors/infrared_gun.c.s .PHONY : drivers/sensors/infrared_gun.c.s
drivers/sensors/tank_angle.o: drivers/sensors/tank_angle.c.o
.PHONY : drivers/sensors/tank_angle.o
# target to build an object file
drivers/sensors/tank_angle.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/tank_angle.c.o
.PHONY : drivers/sensors/tank_angle.c.o
drivers/sensors/tank_angle.i: drivers/sensors/tank_angle.c.i
.PHONY : drivers/sensors/tank_angle.i
# target to preprocess a source file
drivers/sensors/tank_angle.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/tank_angle.c.i
.PHONY : drivers/sensors/tank_angle.c.i
drivers/sensors/tank_angle.s: drivers/sensors/tank_angle.c.s
.PHONY : drivers/sensors/tank_angle.s
# target to generate assembly for a file
drivers/sensors/tank_angle.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/drivers/sensors/tank_angle.c.s
.PHONY : drivers/sensors/tank_angle.c.s
drivers/sensors/temperature.o: drivers/sensors/temperature.c.o drivers/sensors/temperature.o: drivers/sensors/temperature.c.o
.PHONY : drivers/sensors/temperature.o .PHONY : drivers/sensors/temperature.o
...@@ -1086,6 +1110,30 @@ modules/http/http_request.c.s: ...@@ -1086,6 +1110,30 @@ modules/http/http_request.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/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 .PHONY : modules/http/http_request.c.s
modules/http/ota.o: modules/http/ota.c.o
.PHONY : modules/http/ota.o
# target to build an object file
modules/http/ota.c.o:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/http/ota.c.o
.PHONY : modules/http/ota.c.o
modules/http/ota.i: modules/http/ota.c.i
.PHONY : modules/http/ota.i
# target to preprocess a source file
modules/http/ota.c.i:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/http/ota.c.i
.PHONY : modules/http/ota.c.i
modules/http/ota.s: modules/http/ota.c.s
.PHONY : modules/http/ota.s
# target to generate assembly for a file
modules/http/ota.c.s:
$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/modules/http/ota.c.s
.PHONY : modules/http/ota.c.s
modules/logger/mylog.o: modules/logger/mylog.c.o modules/logger/mylog.o: modules/logger/mylog.c.o
.PHONY : modules/logger/mylog.o .PHONY : modules/logger/mylog.o
...@@ -1834,6 +1882,9 @@ help: ...@@ -1834,6 +1882,9 @@ help:
@echo "... drivers/sensors/infrared_gun.o" @echo "... drivers/sensors/infrared_gun.o"
@echo "... drivers/sensors/infrared_gun.i" @echo "... drivers/sensors/infrared_gun.i"
@echo "... drivers/sensors/infrared_gun.s" @echo "... drivers/sensors/infrared_gun.s"
@echo "... drivers/sensors/tank_angle.o"
@echo "... drivers/sensors/tank_angle.i"
@echo "... drivers/sensors/tank_angle.s"
@echo "... drivers/sensors/temperature.o" @echo "... drivers/sensors/temperature.o"
@echo "... drivers/sensors/temperature.i" @echo "... drivers/sensors/temperature.i"
@echo "... drivers/sensors/temperature.s" @echo "... drivers/sensors/temperature.s"
...@@ -1852,6 +1903,9 @@ help: ...@@ -1852,6 +1903,9 @@ help:
@echo "... modules/http/http_request.o" @echo "... modules/http/http_request.o"
@echo "... modules/http/http_request.i" @echo "... modules/http/http_request.i"
@echo "... modules/http/http_request.s" @echo "... modules/http/http_request.s"
@echo "... modules/http/ota.o"
@echo "... modules/http/ota.i"
@echo "... modules/http/ota.s"
@echo "... modules/logger/mylog.o" @echo "... modules/logger/mylog.o"
@echo "... modules/logger/mylog.i" @echo "... modules/logger/mylog.i"
@echo "... modules/logger/mylog.s" @echo "... modules/logger/mylog.s"
......
build/main
View file @ f582ab9d
No preview for this file type
build/third_party/mosquitto/apps/mosquitto_ctrl/CMakeFiles/mosquitto_ctrl.dir/progress.make
View file @ f582ab9d
CMAKE_PROGRESS_1 = 80 CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = CMAKE_PROGRESS_3 = 81
CMAKE_PROGRESS_4 = 81 CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 = 82 CMAKE_PROGRESS_6 = 82
CMAKE_PROGRESS_7 = CMAKE_PROGRESS_7 =
......
build/third_party/mosquitto/apps/mosquitto_passwd/CMakeFiles/mosquitto_passwd.dir/progress.make
View file @ f582ab9d
CMAKE_PROGRESS_1 = CMAKE_PROGRESS_1 = 90
CMAKE_PROGRESS_2 = 90 CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = 91 CMAKE_PROGRESS_4 = 91
CMAKE_PROGRESS_5 = CMAKE_PROGRESS_5 =
......
build/third_party/mosquitto/client/CMakeFiles/mosquitto_rr.dir/progress.make
View file @ f582ab9d
CMAKE_PROGRESS_1 = CMAKE_PROGRESS_1 = 95
CMAKE_PROGRESS_2 = 95 CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = 96 CMAKE_PROGRESS_4 = 96
CMAKE_PROGRESS_5 = CMAKE_PROGRESS_5 =
......
build/third_party/mosquitto/lib/CMakeFiles/libmosquitto.dir/progress.make
View file @ f582ab9d
...@@ -34,8 +34,8 @@ CMAKE_PROGRESS_33 = ...@@ -34,8 +34,8 @@ CMAKE_PROGRESS_33 =
CMAKE_PROGRESS_34 = CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 = 13 CMAKE_PROGRESS_35 = 13
CMAKE_PROGRESS_36 = CMAKE_PROGRESS_36 =
CMAKE_PROGRESS_37 = 14 CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 = CMAKE_PROGRESS_38 = 14
CMAKE_PROGRESS_39 = CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 = 15 CMAKE_PROGRESS_40 = 15
CMAKE_PROGRESS_41 = CMAKE_PROGRESS_41 =
......
build/third_party/mosquitto/lib/CMakeFiles/libmosquitto_static.dir/progress.make
View file @ f582ab9d
...@@ -4,8 +4,8 @@ CMAKE_PROGRESS_3 = ...@@ -4,8 +4,8 @@ CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = 18 CMAKE_PROGRESS_5 = 18
CMAKE_PROGRESS_6 = CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = 19 CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 = CMAKE_PROGRESS_8 = 19
CMAKE_PROGRESS_9 = CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 = 20 CMAKE_PROGRESS_10 = 20
CMAKE_PROGRESS_11 = CMAKE_PROGRESS_11 =
...@@ -15,11 +15,11 @@ CMAKE_PROGRESS_14 = ...@@ -15,11 +15,11 @@ CMAKE_PROGRESS_14 =
CMAKE_PROGRESS_15 = CMAKE_PROGRESS_15 =
CMAKE_PROGRESS_16 = 22 CMAKE_PROGRESS_16 = 22
CMAKE_PROGRESS_17 = CMAKE_PROGRESS_17 =
CMAKE_PROGRESS_18 = 23 CMAKE_PROGRESS_18 =
CMAKE_PROGRESS_19 = CMAKE_PROGRESS_19 = 23
CMAKE_PROGRESS_20 = CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_21 = 24 CMAKE_PROGRESS_21 =
CMAKE_PROGRESS_22 = CMAKE_PROGRESS_22 = 24
CMAKE_PROGRESS_23 = CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 = 25 CMAKE_PROGRESS_24 = 25
CMAKE_PROGRESS_25 = CMAKE_PROGRESS_25 =
...@@ -29,17 +29,17 @@ CMAKE_PROGRESS_28 = ...@@ -29,17 +29,17 @@ CMAKE_PROGRESS_28 =
CMAKE_PROGRESS_29 = CMAKE_PROGRESS_29 =
CMAKE_PROGRESS_30 = 27 CMAKE_PROGRESS_30 = 27
CMAKE_PROGRESS_31 = CMAKE_PROGRESS_31 =
CMAKE_PROGRESS_32 = 28 CMAKE_PROGRESS_32 =
CMAKE_PROGRESS_33 = CMAKE_PROGRESS_33 = 28
CMAKE_PROGRESS_34 = CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 = 29 CMAKE_PROGRESS_35 =
CMAKE_PROGRESS_36 = CMAKE_PROGRESS_36 = 29
CMAKE_PROGRESS_37 = CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 = 30 CMAKE_PROGRESS_38 = 30
CMAKE_PROGRESS_39 = CMAKE_PROGRESS_39 =
CMAKE_PROGRESS_40 = CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_41 = 31 CMAKE_PROGRESS_41 = 31
CMAKE_PROGRESS_42 = CMAKE_PROGRESS_42 =
CMAKE_PROGRESS_43 = 32 CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_44 = CMAKE_PROGRESS_44 = 32
build/third_party/mosquitto/plugins/dynamic-security/CMakeFiles/mosquitto_dynamic_security.dir/progress.make
View file @ f582ab9d
CMAKE_PROGRESS_1 = CMAKE_PROGRESS_1 = 85
CMAKE_PROGRESS_2 = 85 CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = CMAKE_PROGRESS_3 =
CMAKE_PROGRESS_4 = CMAKE_PROGRESS_4 = 86
CMAKE_PROGRESS_5 = 86 CMAKE_PROGRESS_5 =
CMAKE_PROGRESS_6 = CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = 87 CMAKE_PROGRESS_7 = 87
CMAKE_PROGRESS_8 = CMAKE_PROGRESS_8 =
......
build/third_party/mosquitto/src/CMakeFiles/mosquitto.dir/progress.make
View file @ f582ab9d
CMAKE_PROGRESS_1 = 53 CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_3 = CMAKE_PROGRESS_3 = 54
CMAKE_PROGRESS_4 = 54 CMAKE_PROGRESS_4 =
CMAKE_PROGRESS_5 = CMAKE_PROGRESS_5 = 55
CMAKE_PROGRESS_6 = 55 CMAKE_PROGRESS_6 =
CMAKE_PROGRESS_7 = CMAKE_PROGRESS_7 =
CMAKE_PROGRESS_8 = CMAKE_PROGRESS_8 = 56
CMAKE_PROGRESS_9 = 56 CMAKE_PROGRESS_9 =
CMAKE_PROGRESS_10 = CMAKE_PROGRESS_10 =
CMAKE_PROGRESS_11 = CMAKE_PROGRESS_11 = 57
CMAKE_PROGRESS_12 = 57 CMAKE_PROGRESS_12 =
CMAKE_PROGRESS_13 = CMAKE_PROGRESS_13 =
CMAKE_PROGRESS_14 = CMAKE_PROGRESS_14 = 58
CMAKE_PROGRESS_15 = 58 CMAKE_PROGRESS_15 =
CMAKE_PROGRESS_16 = CMAKE_PROGRESS_16 =
CMAKE_PROGRESS_17 = CMAKE_PROGRESS_17 = 59
CMAKE_PROGRESS_18 = 59 CMAKE_PROGRESS_18 =
CMAKE_PROGRESS_19 = CMAKE_PROGRESS_19 = 60
CMAKE_PROGRESS_20 = 60 CMAKE_PROGRESS_20 =
CMAKE_PROGRESS_21 = CMAKE_PROGRESS_21 =
CMAKE_PROGRESS_22 = CMAKE_PROGRESS_22 = 61
CMAKE_PROGRESS_23 = 61 CMAKE_PROGRESS_23 =
CMAKE_PROGRESS_24 = CMAKE_PROGRESS_24 =
CMAKE_PROGRESS_25 = CMAKE_PROGRESS_25 = 62
CMAKE_PROGRESS_26 = 62 CMAKE_PROGRESS_26 =
CMAKE_PROGRESS_27 = CMAKE_PROGRESS_27 =
CMAKE_PROGRESS_28 = CMAKE_PROGRESS_28 = 63
CMAKE_PROGRESS_29 = 63 CMAKE_PROGRESS_29 =
CMAKE_PROGRESS_30 = CMAKE_PROGRESS_30 =
CMAKE_PROGRESS_31 = 64 CMAKE_PROGRESS_31 = 64
CMAKE_PROGRESS_32 = CMAKE_PROGRESS_32 =
CMAKE_PROGRESS_33 = CMAKE_PROGRESS_33 = 65
CMAKE_PROGRESS_34 = 65 CMAKE_PROGRESS_34 =
CMAKE_PROGRESS_35 = CMAKE_PROGRESS_35 =
CMAKE_PROGRESS_36 = CMAKE_PROGRESS_36 = 66
CMAKE_PROGRESS_37 = 66 CMAKE_PROGRESS_37 =
CMAKE_PROGRESS_38 = CMAKE_PROGRESS_38 =
CMAKE_PROGRESS_39 = CMAKE_PROGRESS_39 = 67
CMAKE_PROGRESS_40 = 67 CMAKE_PROGRESS_40 =
CMAKE_PROGRESS_41 = CMAKE_PROGRESS_41 =
CMAKE_PROGRESS_42 = CMAKE_PROGRESS_42 = 68
CMAKE_PROGRESS_43 = 68 CMAKE_PROGRESS_43 =
CMAKE_PROGRESS_44 = CMAKE_PROGRESS_44 =
CMAKE_PROGRESS_45 = 69 CMAKE_PROGRESS_45 = 69
CMAKE_PROGRESS_46 = CMAKE_PROGRESS_46 =
CMAKE_PROGRESS_47 = CMAKE_PROGRESS_47 = 70
CMAKE_PROGRESS_48 = 70 CMAKE_PROGRESS_48 =
CMAKE_PROGRESS_49 = CMAKE_PROGRESS_49 =
CMAKE_PROGRESS_50 = CMAKE_PROGRESS_50 = 71
CMAKE_PROGRESS_51 = 71 CMAKE_PROGRESS_51 =
CMAKE_PROGRESS_52 = CMAKE_PROGRESS_52 =
CMAKE_PROGRESS_53 = CMAKE_PROGRESS_53 = 72
CMAKE_PROGRESS_54 = 72 CMAKE_PROGRESS_54 =
CMAKE_PROGRESS_55 = CMAKE_PROGRESS_55 =
CMAKE_PROGRESS_56 = 73 CMAKE_PROGRESS_56 = 73
CMAKE_PROGRESS_57 = CMAKE_PROGRESS_57 =
CMAKE_PROGRESS_58 = CMAKE_PROGRESS_58 =
CMAKE_PROGRESS_59 = 74 CMAKE_PROGRESS_59 = 74
CMAKE_PROGRESS_60 = CMAKE_PROGRESS_60 =
CMAKE_PROGRESS_61 = CMAKE_PROGRESS_61 = 75
CMAKE_PROGRESS_62 = 75 CMAKE_PROGRESS_62 =
CMAKE_PROGRESS_63 = CMAKE_PROGRESS_63 =
CMAKE_PROGRESS_64 = CMAKE_PROGRESS_64 = 76
CMAKE_PROGRESS_65 = 76 CMAKE_PROGRESS_65 =
CMAKE_PROGRESS_66 = CMAKE_PROGRESS_66 =
CMAKE_PROGRESS_67 = CMAKE_PROGRESS_67 = 77
CMAKE_PROGRESS_68 = 77 CMAKE_PROGRESS_68 =
CMAKE_PROGRESS_69 = CMAKE_PROGRESS_69 =
CMAKE_PROGRESS_70 = 78 CMAKE_PROGRESS_70 = 78
CMAKE_PROGRESS_71 = CMAKE_PROGRESS_71 =
CMAKE_PROGRESS_72 = CMAKE_PROGRESS_72 =
CMAKE_PROGRESS_73 = 79 CMAKE_PROGRESS_73 = 79
CMAKE_PROGRESS_74 = CMAKE_PROGRESS_74 =
CMAKE_PROGRESS_75 = CMAKE_PROGRESS_75 = 80
drivers/devicecontrol/car0104_control.c
View file @ f582ab9d
...@@ -9,82 +9,31 @@ void car0104_stop() { ...@@ -9,82 +9,31 @@ void car0104_stop() {
} }
void car0104_back(unsigned char gval) { void car0104_back(unsigned char gval) {
int b=0;
if (gval < 50) { if (gval < 50) {
pwmWrite(PWM_PIN_SPEED, 75); pwmWrite(PWM_PIN_SPEED, 75);
} else if (gval <= 55) { }
pwmWrite(PWM_PIN_SPEED, 78); else if (gval <= 60) {
} else if (gval <= 60) {
pwmWrite(PWM_PIN_SPEED, 79); pwmWrite(PWM_PIN_SPEED, 79);
} else if (gval <= 65) { }else if (gval <= 70) {
pwmWrite(PWM_PIN_SPEED, 80); pwmWrite(PWM_PIN_SPEED, 80);
} else if (gval <= 70) { }else if(gval >70){
pwmWrite(PWM_PIN_SPEED, 81); int flont_speed = 80+(gval-70)/10+b;
} else if (gval <= 75) { pwmWrite(PWM_PIN_SPEED, flont_speed);
pwmWrite(PWM_PIN_SPEED, 82); }
} else if (gval <= 90) {
pwmWrite(PWM_PIN_SPEED, 83);
} else if (gval <= 100) {
pwmWrite(PWM_PIN_SPEED, 84);
} else if (gval <= 110) {
pwmWrite(PWM_PIN_SPEED, 85);
} else if (gval <= 120) {
pwmWrite(PWM_PIN_SPEED, 86);
} else if (gval <= 130) {
pwmWrite(PWM_PIN_SPEED, 87);
} else if (gval <= 140) {
pwmWrite(PWM_PIN_SPEED, 88);
} else if (gval <= 150) {
pwmWrite(PWM_PIN_SPEED, 89);
} else if (gval <= 160) {
pwmWrite(PWM_PIN_SPEED, 90);
} else if (gval <= 170) {
pwmWrite(PWM_PIN_SPEED, 91);
} else if (gval <= 180) {
pwmWrite(PWM_PIN_SPEED, 92);
} else if (gval <= 190) {
pwmWrite(PWM_PIN_SPEED, 93);
} else if (gval <= 200) {
pwmWrite(PWM_PIN_SPEED, 94);
}
} }
void car0104_flont(unsigned char gval) { void car0104_flont(unsigned char gval) {
int b=0;
if (gval < 50) { if (gval < 50) {
pwmWrite(PWM_PIN_SPEED, 75); pwmWrite(PWM_PIN_SPEED, 75);
} else if (gval <= 55) {
pwmWrite(PWM_PIN_SPEED, 72);
} else if (gval <= 60) { } else if (gval <= 60) {
pwmWrite(PWM_PIN_SPEED, 71); pwmWrite(PWM_PIN_SPEED, 71);
} else if (gval <= 65) { }else if (gval <= 70) {
pwmWrite(PWM_PIN_SPEED, 70); pwmWrite(PWM_PIN_SPEED, 70);
} else if (gval <= 70) { } else if(gval >70){
pwmWrite(PWM_PIN_SPEED, 69); int back_speed = 70 - (gval-70)/10-b;
} else if (gval <= 75) { pwmWrite(PWM_PIN_SPEED, back_speed);
pwmWrite(PWM_PIN_SPEED, 68);
} else if (gval <= 90) {
pwmWrite(PWM_PIN_SPEED, 67);
} else if (gval <= 100) {
pwmWrite(PWM_PIN_SPEED, 66);
} else if (gval <= 110) {
pwmWrite(PWM_PIN_SPEED, 65);
} else if (gval <= 120) {
pwmWrite(PWM_PIN_SPEED, 64);
} else if (gval <= 130) {
pwmWrite(PWM_PIN_SPEED, 63);
} else if (gval <= 140) {
pwmWrite(PWM_PIN_SPEED, 62);
} else if (gval <= 150) {
pwmWrite(PWM_PIN_SPEED, 61);
} else if (gval <= 160) {
pwmWrite(PWM_PIN_SPEED, 60);
} else if (gval <= 170) {
pwmWrite(PWM_PIN_SPEED, 59);
} else if (gval <= 180) {
pwmWrite(PWM_PIN_SPEED, 58);
} else if (gval <= 190) {
pwmWrite(PWM_PIN_SPEED, 57);
} else if (gval <= 200) {
pwmWrite(PWM_PIN_SPEED, 56);
} }
} }
...@@ -173,13 +122,15 @@ void car0104_change(unsigned char *buf) { ...@@ -173,13 +122,15 @@ void car0104_change(unsigned char *buf) {
unsigned char val = buf[2]; unsigned char val = buf[2];
if(mode == 1 ) { if(mode == 1 ) {
car0104_flont(val+25); car0104_flont(val+20);
}else if(mode == 2 ) { }else if(mode == 2 ) {
car0104_back(val+25); car0104_back(val+20);
}else if(mode == 3) { }else if(mode == 3) {
car0104_lift(90); if(val !=0)car0104_lift(90);
else car0104_lift(0);
}else if(mode == 4) { }else if(mode == 4) {
car0104_right(90); if(val !=0) car0104_right(90);
else car0104_lift(0);
} }
} }
drivers/devicecontrol/tank0203_control.c
View file @ f582ab9d
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
#include "pthrpoll.h" #include "pthrpoll.h"
#include "tank0203_control.h" #include "tank0203_control.h"
int g_modecount_tank0203=0; #define PWM_MIN 55 // 最小PWM值
#define PWM_MAX 95 // 最大PWM值
#define PWM_NEUTRAL 75 // 中立位置
void tank0203_middle() { void tank0203_middle() {
pwmWrite(PWM_PIN_SPEED,75); pwmWrite(PWM_PIN_SPEED,75);
...@@ -11,187 +13,132 @@ void tank0203_middle() { ...@@ -11,187 +13,132 @@ void tank0203_middle() {
} }
void tank0203_mode_lift_flont(unsigned char gval) { void tank0203_mode_lift_flont(unsigned char gval) {
int b=0;
if (gval < 50) { if (gval < 50) {
pwmWrite(PWM_PIN_SPEED, 75); pwmWrite(PWM_PIN_SPEED, 75);
} else if (gval <= 55) { }
pwmWrite(PWM_PIN_SPEED, 78); else if (gval <= 60) {
} else if (gval <= 60) {
pwmWrite(PWM_PIN_SPEED, 79); pwmWrite(PWM_PIN_SPEED, 79);
} else if (gval <= 65) { }else if (gval <= 70) {
pwmWrite(PWM_PIN_SPEED, 80); pwmWrite(PWM_PIN_SPEED, 80);
} else if (gval <= 70) { }else if(gval >70){
pwmWrite(PWM_PIN_SPEED, 81); int flont_speed = 80+(gval-70)/10+b;
} else if (gval <= 75) { pwmWrite(PWM_PIN_SPEED, flont_speed);
pwmWrite(PWM_PIN_SPEED, 82); }
} else if (gval <= 90) {
pwmWrite(PWM_PIN_SPEED, 83);
} else if (gval <= 100) {
pwmWrite(PWM_PIN_SPEED, 84);
} else if (gval <= 110) {
pwmWrite(PWM_PIN_SPEED, 85);
} else if (gval <= 120) {
pwmWrite(PWM_PIN_SPEED, 86);
} else if (gval <= 130) {
pwmWrite(PWM_PIN_SPEED, 87);
} else if (gval <= 140) {
pwmWrite(PWM_PIN_SPEED, 88);
} else if (gval <= 150) {
pwmWrite(PWM_PIN_SPEED, 89);
} else if (gval <= 160) {
pwmWrite(PWM_PIN_SPEED, 90);
} else if (gval <= 170) {
pwmWrite(PWM_PIN_SPEED, 91);
} else if (gval <= 180) {
pwmWrite(PWM_PIN_SPEED, 92);
} else if (gval <= 190) {
pwmWrite(PWM_PIN_SPEED, 93);
} else if (gval <= 200) {
pwmWrite(PWM_PIN_SPEED, 94);
}
} }
void tank0203_mode_lift_back(unsigned char gval) { void tank0203_mode_lift_back(unsigned char gval) {
int b=0;
if (gval < 50) { if (gval < 50) {
pwmWrite(PWM_PIN_SPEED, 75); pwmWrite(PWM_PIN_SPEED, 75);
} else if (gval <= 55) {
pwmWrite(PWM_PIN_SPEED, 72);
} else if (gval <= 60) { } else if (gval <= 60) {
pwmWrite(PWM_PIN_SPEED, 71); pwmWrite(PWM_PIN_SPEED, 71);
} else if (gval <= 65) { }else if (gval <= 70) {
pwmWrite(PWM_PIN_SPEED, 70); pwmWrite(PWM_PIN_SPEED, 70);
} else if (gval <= 70) { } else if(gval >70){
pwmWrite(PWM_PIN_SPEED, 69); int back_speed = 70 - (gval-70)/10-b;
} else if (gval <= 75) { pwmWrite(PWM_PIN_SPEED, back_speed);
pwmWrite(PWM_PIN_SPEED, 68); }
} else if (gval <= 90) {
pwmWrite(PWM_PIN_SPEED, 67);
} else if (gval <= 100) {
pwmWrite(PWM_PIN_SPEED, 66);
} else if (gval <= 110) {
pwmWrite(PWM_PIN_SPEED, 65);
} else if (gval <= 120) {
pwmWrite(PWM_PIN_SPEED, 64);
} else if (gval <= 130) {
pwmWrite(PWM_PIN_SPEED, 63);
} else if (gval <= 140) {
pwmWrite(PWM_PIN_SPEED, 62);
} else if (gval <= 150) {
pwmWrite(PWM_PIN_SPEED, 61);
} else if (gval <= 160) {
pwmWrite(PWM_PIN_SPEED, 60);
} else if (gval <= 170) {
pwmWrite(PWM_PIN_SPEED, 59);
} else if (gval <= 180) {
pwmWrite(PWM_PIN_SPEED, 58);
} else if (gval <= 190) {
pwmWrite(PWM_PIN_SPEED, 57);
} else if (gval <= 200) {
pwmWrite(PWM_PIN_SPEED, 56);
}
} }
void tank0203_mode_right_flont(unsigned char gval) { void tank0203_mode_right_back(unsigned char gval) {
int b=0;
if (gval < 50) { if (gval < 50) {
pwmWrite(PWM_PIN_CHANGE, 75); pwmWrite(PWM_PIN_CHANGE, 75);
} else if (gval <= 55) { }else if (gval <= 60) {
pwmWrite(PWM_PIN_CHANGE, 78);
} else if (gval <= 60) {
pwmWrite(PWM_PIN_CHANGE, 79); pwmWrite(PWM_PIN_CHANGE, 79);
} else if (gval <= 65) { }else if (gval <= 70) {
pwmWrite(PWM_PIN_CHANGE, 80); pwmWrite(PWM_PIN_CHANGE, 80);
} else if (gval <= 70) { }else if(gval >70){
pwmWrite(PWM_PIN_CHANGE, 81); int flont_speed = 80+(gval-70)/10+b;
} else if (gval <= 75) { pwmWrite(PWM_PIN_CHANGE, flont_speed);
pwmWrite(PWM_PIN_CHANGE, 82); }
} else if (gval <= 90) {
pwmWrite(PWM_PIN_CHANGE, 83);
} else if (gval <= 100) {
pwmWrite(PWM_PIN_CHANGE, 84);
} else if (gval <= 110) {
pwmWrite(PWM_PIN_CHANGE, 85);
} else if (gval <= 120) {
pwmWrite(PWM_PIN_CHANGE, 86);
} else if (gval <= 130) {
pwmWrite(PWM_PIN_CHANGE, 87);
} else if (gval <= 140) {
pwmWrite(PWM_PIN_CHANGE, 88);
} else if (gval <= 150) {
pwmWrite(PWM_PIN_CHANGE, 89);
} else if (gval <= 160) {
pwmWrite(PWM_PIN_CHANGE, 90);
} else if (gval <= 170) {
pwmWrite(PWM_PIN_CHANGE, 91);
} else if (gval <= 180) {
pwmWrite(PWM_PIN_CHANGE, 92);
} else if (gval <= 190) {
pwmWrite(PWM_PIN_CHANGE, 93);
} else if (gval <= 200) {
pwmWrite(PWM_PIN_CHANGE, 94);
}
} }
void tank0203_mode_right_back(unsigned char gval) { void tank0203_mode_right_flont(unsigned char gval) {
int b=0;
if (gval < 50) { if (gval < 50) {
pwmWrite(PWM_PIN_CHANGE, 75); pwmWrite(PWM_PIN_CHANGE, 75);
} else if (gval <= 55) { }else if (gval <= 60) {
pwmWrite(PWM_PIN_CHANGE, 71); pwmWrite(PWM_PIN_CHANGE, 71);
} else if (gval <= 60) {
pwmWrite(PWM_PIN_CHANGE, 70);
} else if (gval <= 65) {
pwmWrite(PWM_PIN_CHANGE, 70);
} else if (gval <= 70) { } else if (gval <= 70) {
pwmWrite(PWM_PIN_CHANGE, 70); pwmWrite(PWM_PIN_CHANGE, 70);
} else if (gval <= 75) { } else if(gval >70){
pwmWrite(PWM_PIN_CHANGE, 69); int back_speed = 70 - (gval-70)/10-b;
} else if (gval <= 90) { pwmWrite(PWM_PIN_CHANGE, back_speed);
pwmWrite(PWM_PIN_CHANGE, 68); }
} else if (gval <= 100) {
pwmWrite(PWM_PIN_CHANGE, 68);
} else if (gval <= 110) {
pwmWrite(PWM_PIN_CHANGE, 66);
} else if (gval <= 120) {
pwmWrite(PWM_PIN_CHANGE, 65);
} else if (gval <= 130) {
pwmWrite(PWM_PIN_CHANGE, 64);
} else if (gval <= 140) {
pwmWrite(PWM_PIN_CHANGE, 62);
} else if (gval <= 150) {
pwmWrite(PWM_PIN_CHANGE, 60);
} else if (gval <= 160) {
pwmWrite(PWM_PIN_CHANGE, 59);
} else if (gval <= 170) {
pwmWrite(PWM_PIN_CHANGE, 58);
} else if (gval <= 180) {
pwmWrite(PWM_PIN_CHANGE, 57);
} else if (gval <= 190) {
pwmWrite(PWM_PIN_CHANGE, 56);
} else if (gval <= 200) {
pwmWrite(PWM_PIN_CHANGE, 55);
}
} }
void tank0203_change(unsigned char *buf) { void tank0203_change(unsigned char *buf) {
unsigned char mode = buf[1]; unsigned char mode = buf[1];
unsigned char val = buf[2]; unsigned char val = buf[2];
static int modecount_tank0203=0;
static int tank0203_index =0;
// static int s_val_1=0;
// static int s_val_2=0;
if(mode == 1 ) { if(mode == 1 ) {
//tank0203_mode_lift_flont(val); tank0203_mode_lift_flont(val);
tank0203_mode_right_flont(val); tank0203_mode_right_flont(val);
g_modecount_tank0203=0; modecount_tank0203=0;
//s_val_1 = val;
}else if(mode == 2 ) { }else if(mode == 2 ) {
//tank0203_mode_lift_back(val); tank0203_mode_lift_back(val);
tank0203_mode_right_back(val); tank0203_mode_right_back(val);
g_modecount_tank0203=1; modecount_tank0203=1;
//s_val_2 = val;
} }
if((mode == 1||mode == 2)&&val == 0) {
if((mode == 1||mode ==2)&&val == 0) g_modecount_tank0203=0; modecount_tank0203 = 0;
tank0203_index = 0;
}
if((mode == 1||mode == 2)&&val != 0) tank0203_index = 1;
if(mode == 3) { if(mode == 3) {
if(g_modecount_tank0203 == 0) tank0203_mode_lift_back(val+15); if(modecount_tank0203 == 0){
if(g_modecount_tank0203 == 1) tank0203_mode_lift_flont(val+15); if(tank0203_index == 1) {
tank0203_mode_lift_flont(0);
//tank0203_mode_right_flont(s_val_1-20);
}
else {
tank0203_mode_lift_back(val+30);
tank0203_mode_right_flont(val+30);
}
}
if(modecount_tank0203 == 1) {
if(tank0203_index == 1) {
tank0203_mode_lift_back(0);
//tank0203_mode_lift_back(s_val_2-20);
}else {
tank0203_mode_lift_back(val+20);
tank0203_mode_right_flont(val+20);
}
}
}else if(mode == 4) { }else if(mode == 4) {
if(g_modecount_tank0203 == 0) tank0203_mode_lift_flont(val+15); if(modecount_tank0203 == 1){
if(g_modecount_tank0203 == 1) tank0203_mode_lift_back(val+15); if(tank0203_index == 1) {
//tank0203_mode_right_back(s_val_1);
tank0203_mode_right_back(0);
}
else {
tank0203_mode_lift_flont(val+20);
tank0203_mode_right_back(val+20);
}
}
if(modecount_tank0203 == 0) {
if(tank0203_index == 1) {
//tank0203_mode_lift_flont(s_val_1-20);
tank0203_mode_right_flont(0);
}
else {
tank0203_mode_lift_flont(val+20);
tank0203_mode_right_back(val+20);
}
}
} }
} }
......
drivers/devicecontrol/tank_common.c
View file @ f582ab9d
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include "devcontrol_common.h" #include "devcontrol_common.h"
#include "gpio_init.h" #include "gpio_init.h"
#include "pthrpoll.h" #include "pthrpoll.h"
#include "tank_angle.h"
int tank_shot_back_stop(unsigned char pin,unsigned char val); int tank_shot_back_stop(unsigned char pin,unsigned char val);
...@@ -11,43 +12,61 @@ long long shot_device_time_start =0 ; ...@@ -11,43 +12,61 @@ long long shot_device_time_start =0 ;
long long shot_device_time_end = 0; long long shot_device_time_end = 0;
void tank_shot_back(unsigned char gval) { void tank_shot_back(unsigned char gval) {
if (gval < 50) {
int b=0;
if (gval < 50) {
pwmWrite(PWM_PIN_CHANGE, 75); pwmWrite(PWM_PIN_CHANGE, 75);
} else if (gval <= 55) { if(g_tank_common_config_t->device_id ==DEVICE_TANK0203) pwmWrite(PWM_PIN_SPEED, 75);
pwmWrite(PWM_PIN_CHANGE, 71); }else if (gval <= 60) {
} else if (gval <= 60) { pwmWrite(PWM_PIN_CHANGE, 79);
pwmWrite(PWM_PIN_CHANGE, 70); if(g_tank_common_config_t->device_id ==DEVICE_TANK0203) pwmWrite(PWM_PIN_SPEED, 71);
} else if (gval <= 65) { }else if (gval <= 70) {
pwmWrite(PWM_PIN_CHANGE, 70); pwmWrite(PWM_PIN_CHANGE, 80);
} else if (gval <= 70) { if(g_tank_common_config_t->device_id ==DEVICE_TANK0203) pwmWrite(PWM_PIN_SPEED, 70);
pwmWrite(PWM_PIN_CHANGE, 70); }else if(gval >70){
} else if (gval <= 75) { int change_1 = 80+(gval-70)/10+b;
pwmWrite(PWM_PIN_CHANGE, 69); int speed_2= 70 - (gval-70)/10-b;
} else if (gval <= 90) { if(g_tank_common_config_t->device_id ==DEVICE_TANK0203) pwmWrite(PWM_PIN_SPEED, speed_2);
pwmWrite(PWM_PIN_CHANGE, 68); pwmWrite(PWM_PIN_CHANGE, change_1);
} else if (gval <= 100) { }
pwmWrite(PWM_PIN_CHANGE, 68);
} else if (gval <= 110) { // if (gval < 50) {
pwmWrite(PWM_PIN_CHANGE, 66); // pwmWrite(PWM_PIN_CHANGE, 75);
} else if (gval <= 120) { // } else if (gval <= 55) {
pwmWrite(PWM_PIN_CHANGE, 65); // pwmWrite(PWM_PIN_CHANGE, 71);
} else if (gval <= 130) { // } else if (gval <= 60) {
pwmWrite(PWM_PIN_CHANGE, 64); // pwmWrite(PWM_PIN_CHANGE, 70);
} else if (gval <= 140) { // } else if (gval <= 65) {
pwmWrite(PWM_PIN_CHANGE, 62); // pwmWrite(PWM_PIN_CHANGE, 70);
} else if (gval <= 150) { // } else if (gval <= 70) {
pwmWrite(PWM_PIN_CHANGE, 60); // pwmWrite(PWM_PIN_CHANGE, 70);
} else if (gval <= 160) { // } else if (gval <= 75) {
pwmWrite(PWM_PIN_CHANGE, 59); // pwmWrite(PWM_PIN_CHANGE, 69);
} else if (gval <= 170) { // } else if (gval <= 90) {
pwmWrite(PWM_PIN_CHANGE, 58); // pwmWrite(PWM_PIN_CHANGE, 68);
} else if (gval <= 180) { // } else if (gval <= 100) {
pwmWrite(PWM_PIN_CHANGE, 57); // pwmWrite(PWM_PIN_CHANGE, 68);
} else if (gval <= 190) { // } else if (gval <= 110) {
pwmWrite(PWM_PIN_CHANGE, 56); // pwmWrite(PWM_PIN_CHANGE, 66);
} else if (gval <= 200) { // } else if (gval <= 120) {
pwmWrite(PWM_PIN_CHANGE, 55); // pwmWrite(PWM_PIN_CHANGE, 65);
} // } else if (gval <= 130) {
// pwmWrite(PWM_PIN_CHANGE, 64);
// } else if (gval <= 140) {
// pwmWrite(PWM_PIN_CHANGE, 62);
// } else if (gval <= 150) {
// pwmWrite(PWM_PIN_CHANGE, 60);
// } else if (gval <= 160) {
// pwmWrite(PWM_PIN_CHANGE, 59);
// } else if (gval <= 170) {
// pwmWrite(PWM_PIN_CHANGE, 58);
// } else if (gval <= 180) {
// pwmWrite(PWM_PIN_CHANGE, 57);
// } else if (gval <= 190) {
// pwmWrite(PWM_PIN_CHANGE, 56);
// } else if (gval <= 200) {
// pwmWrite(PWM_PIN_CHANGE, 55);
// }
} }
const tank_common_back tank_common_config_t[]={ const tank_common_back tank_common_config_t[]={
...@@ -147,4 +166,5 @@ void tank_shot_stop_control(int device_id,unsigned char pin,unsigned char val) { ...@@ -147,4 +166,5 @@ void tank_shot_stop_control(int device_id,unsigned char pin,unsigned char val) {
} }
g_tank_common_config_t->shot_back(pin,val); g_tank_common_config_t->shot_back(pin,val);
} }
\ No newline at end of file
drivers/devicecontrol/tank_common.h
View file @ f582ab9d
...@@ -15,4 +15,6 @@ void tank_shot_stop_control(int device_id,unsigned char pin,unsigned char val); ...@@ -15,4 +15,6 @@ void tank_shot_stop_control(int device_id,unsigned char pin,unsigned char val);
void tank_thread_close(); void tank_thread_close();
int angele_limit();
#endif #endif
\ No newline at end of file
drivers/gpio/device_init.c
View file @ f582ab9d
...@@ -62,7 +62,7 @@ const deviceconfig_t device_configs[] = { ...@@ -62,7 +62,7 @@ const deviceconfig_t device_configs[] = {
.device_id = DEVICE_TANK0203, .device_id = DEVICE_TANK0203,
.device_name = "tank0203", .device_name = "tank0203",
.gpio_pins = {6, 16, 20, 22, 23,-1},/* 补充GPIO引脚 */ .gpio_pins = {6, 16, 20, 22, 23,-1},/* 补充GPIO引脚 */
.gpio_pwms = {5 , 7 ,24,26, 27,-1}, .gpio_pwms = {5 , 7 ,24, 26, 27,-1},
.device_pwm_init = physics_pwm_init, .device_pwm_init = physics_pwm_init,
.device_control_stop = tank0203_middle,/* 补充速度控制函数 */ .device_control_stop = tank0203_middle,/* 补充速度控制函数 */
.emergency_code = 203 .emergency_code = 203
......
drivers/gpio/gpio_init.c
View file @ f582ab9d
...@@ -70,21 +70,31 @@ void pwm_value(int pin,int value) { //软件陪我们控制调速 ...@@ -70,21 +70,31 @@ void pwm_value(int pin,int value) { //软件陪我们控制调速
else if(g_device_type == DEVICE_TANK0206) softPwmWrite(pin, 45); else if(g_device_type == DEVICE_TANK0206) softPwmWrite(pin, 45);
else { else {
softPwmWrite(pin, shot_speed); softPwmWrite(pin, shot_speed);
my_zlog_debug("pin:%d,%d",pin,shot_speed); my_zlog_debug("pwm:%d,%d",pin,shot_speed);
} }
} else { } else {
if(g_device_type == DEVICE_TANK0202) softPwmWrite(pin, 35); if(g_device_type == DEVICE_TANK0202) {
if(g_device_type == DEVICE_TANK0203) softPwmWrite(pin, 35); softPwmWrite(pin, 35);
if(g_device_type == DEVICE_TANK0206) softPwmWrite(pin, 35); if(angele_limit() == 1) softPwmWrite(5, 0);
if(angele_limit() == 2) softPwmWrite(7, 0);
}
else if(g_device_type == DEVICE_TANK0203) {
softPwmWrite(pin, 30);
if(angele_limit() == 1) softPwmWrite(5, 0);
if(angele_limit() == 2) softPwmWrite(7, 0);
}
else if(g_device_type == DEVICE_TANK0206) softPwmWrite(pin, 35);
else{ else{
softPwmWrite(pin, shot_speed); softPwmWrite(pin, shot_speed);
my_zlog_debug("pwm:%d,%d",pin,shot_speed);
} }
my_zlog_debug("pwm:%d",pin);
} }
}else if(value==0) { }else if(value==0) {
softPwmWrite(pin, 0); softPwmWrite(pin, 0);
my_zlog_debug("pin:%d,0",pin); my_zlog_debug("pwm:%d,0",pin);
} }
} }
......
drivers/sensors/tank_angle.c 0 → 100644
View file @ f582ab9d
#include "tank_angle.h"
#include "common.h"
#include "ads1115.h"
#define LIFT_LIMIT 165
#define MIDDLE_LIMIT 180
#define RIGHT_LIMIT 195
double tank_angle(){
double angle=0;
float angle_shot=ads1115_read_channel(2);
if(angle_shot>0){
angle_shot=angle_shot*360/5;
angle = round(angle_shot * 100) / 100;
}
return angle;
}
int angele_limit(){
int tank_limit_angele = tank_angle();
if(tank_limit_angele >=LIFT_LIMIT && tank_limit_angele<=MIDDLE_LIMIT) return 1;
else if(tank_limit_angele >=MIDDLE_LIMIT && tank_limit_angele<=RIGHT_LIMIT) return 2;
return 0;
}
\ No newline at end of file
drivers/sensors/tank_angle.h 0 → 100644
View file @ f582ab9d
#ifndef TANK_ANGLE_H
#define TANK_ANGLE_H
double tank_angle();
int angele_limit();
#endif
\ No newline at end of file
modules/http/http_request.h
View file @ f582ab9d
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
#include"common.h"// 用于存储HTTP响应数据的结构体 #include"common.h"// 用于存储HTTP响应数据的结构体
/*2为关闭请求，1为打开*/ /*2为关闭请求，1为打开*/
#define HTTP_REQUEST_INDEX 1 #define HTTP_REQUEST_INDEX 2
struct MemoryStruct { struct MemoryStruct {
char *memory; char *memory;
......
modules/http/ota.c 0 → 100644
View file @ f582ab9d
#include "ota.h"
#include "common.h"
int ota_init(){
}
\ No newline at end of file
modules/http/ota.h 0 → 100644
View file @ f582ab9d
#ifndef OTA_H
#define OTA_H
#endif
\ No newline at end of file
modules/mqtt/mqtt_infor_handle.c
View file @ f582ab9d
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "audioplay.h" #include "audioplay.h"
#include "gpio_init.h" #include "gpio_init.h"
#include "device_init.h" #include "device_init.h"
#include "tank_angle.h"
int g_heartbeat_count=0; int g_heartbeat_count=0;
...@@ -82,12 +83,9 @@ void heartbeat_send() { ...@@ -82,12 +83,9 @@ void heartbeat_send() {
//角度发送 //角度发送
void angle_mqtt_send() { void angle_mqtt_send() {
static int angle_i=0; static int angle_i=0;
float angle_shot=ads1115_read_channel(2);
if(angle_shot>0){
angle_shot=angle_shot*360/5;
cJSON *root = cJSON_CreateObject(); cJSON *root = cJSON_CreateObject();
char TOPIC_send_angle[26]; char TOPIC_send_angle[26];
double rounded_angle = round(angle_shot * 100) / 100; double rounded_angle = tank_angle();
sprintf(TOPIC_send_angle,"dev_rtinfo/%s",mqtt_topic_pure_number()); sprintf(TOPIC_send_angle,"dev_rtinfo/%s",mqtt_topic_pure_number());
cJSON_AddStringToObject(root, "type","tank_angle"); cJSON_AddStringToObject(root, "type","tank_angle");
cJSON_AddNumberToObject(root, "angle",rounded_angle); cJSON_AddNumberToObject(root, "angle",rounded_angle);
...@@ -99,7 +97,7 @@ void angle_mqtt_send() { ...@@ -99,7 +97,7 @@ void angle_mqtt_send() {
} }
mosquitto_publish(mosq, NULL, TOPIC_send_angle, strlen(payload), payload, 0, false); mosquitto_publish(mosq, NULL, TOPIC_send_angle, strlen(payload), payload, 0, false);
cJSON_Delete(root); // 释放 cJSON 对象 cJSON_Delete(root); // 释放 cJSON 对象
}
} }
......
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