lijie/gaoguangpu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.08

Browse Source
This commit is contained in:
DESKTOP-T3S0O41\iris_lj
2026-06-17 18:38:48 +08:00
parent 4efce1d8ee
commit 6ebbd67dec
2 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Version.txt
View File

@ -19,14 +19,14 @@ Version ： V2.0.3
{ {
"command": "set_bochangxishu", "command": "set_bochangxishu",
"bochangxishu": { "bochangxishu": {
"a0": -1.37016491e-9, "a0": -1.08988798e-09,
"a1": -0.000052, "a1": -5.32620063e-05,
"a2": 0.440364, "a2": 0.441532,
"a3": 348.4284, "a3": 348.5026,
"b0": -1.2597071e-9, "b0": -1.2597071e-9,
"b1": -0.000053, "b1": -0.000053,
"b2": 0.440609, "b2": 0.440609,
"b3": 348.3989 "b3": 48.3989
} }
} }

68
src/main.cpp
View File

@ -284,8 +284,8 @@ void setup()
// is11Sensor->guangpu_bochang.a1 = 0.000000000000000; // is11Sensor->guangpu_bochang.a1 = 0.000000000000000;
// is11Sensor->guangpu_bochang.a2 = 0.000000000; // is11Sensor->guangpu_bochang.a2 = 0.000000000;
sys_sd_doc["firmware"] = "V2.0.7"; sys_sd_doc["firmware"] = "V2.0.8";
sys_sd_doc["version"] = "V2.0.7"; sys_sd_doc["version"] = "V2.0.8";
sys_info_init(); sys_info_init();
// dingbiao_init("/dingbiao/dingbiao_up_gain.bin"); // dingbiao_init("/dingbiao/dingbiao_up_gain.bin");
@ -322,23 +322,16 @@ void setup()
if(is11Sensor->guangpu_bochang.b3 < 100) if(is11Sensor->guangpu_bochang.b3 < 100)
{ {
write_log(log_path,"guangpu_bochang.b3 false",10);
is11Sensor->guangpu_bochang.is_valid = false; is11Sensor->guangpu_bochang.is_valid = false;
is11Sensor->guangpu_bochang.a0 = is11Sensor->SensorInfo.a1; write_log(log_path,"guangpu_bochang.b3 false",10);
is11Sensor->guangpu_bochang.a1 = is11Sensor->SensorInfo.a2; if(is11Sensor->guangpu_bochang.a3 > 100)
is11Sensor->guangpu_bochang.a2 = is11Sensor->SensorInfo.a3; {
is11Sensor->guangpu_bochang.a3 = is11Sensor->SensorInfo.a4; write_log(log_path,"guangpu_bochang.a3 true",10);
is11Sensor->SensorInfo.a1 = is11Sensor->guangpu_bochang.a0;
is11Sensor->guangpu_bochang.b0 = is11Sensor->SensorInfo.a1; is11Sensor->SensorInfo.a2 = is11Sensor->guangpu_bochang.a1;
is11Sensor->guangpu_bochang.b1 = is11Sensor->SensorInfo.a2; is11Sensor->SensorInfo.a3 = is11Sensor->guangpu_bochang.a2;
is11Sensor->guangpu_bochang.b2 = is11Sensor->SensorInfo.a3; is11Sensor->SensorInfo.a4 = is11Sensor->guangpu_bochang.a3;
is11Sensor->guangpu_bochang.b3 = is11Sensor->SensorInfo.a4; }
sys_sd_doc["bochangxishu"]["a0"] = is11Sensor->guangpu_bochang.a0;
sys_sd_doc["bochangxishu"]["a1"] = is11Sensor->guangpu_bochang.a1;
sys_sd_doc["bochangxishu"]["a2"] = is11Sensor->guangpu_bochang.a2;
sys_sd_doc["bochangxishu"]["a3"] = is11Sensor->guangpu_bochang.a3;
} }
else else
{ {
@ -1799,10 +1792,10 @@ void json_command(uint8_t port_type)
{ {
double a0=0,a1=0,a2=0,a3=0,a4=0,b1=0,b2=0,b3=0,b4=0; double a0=0,a1=0,a2=0,a3=0,a4=0,b1=0,b2=0,b3=0,b4=0;
a0 = doc["bochangxishu"]["a0"]; // a0 = doc["bochangxishu"]["a0"];
a1 = doc["bochangxishu"]["a1"]; // a1 = doc["bochangxishu"]["a1"];
a2 = doc["bochangxishu"]["a2"]; // a2 = doc["bochangxishu"]["a2"];
a3 = doc["bochangxishu"]["a3"]; // a3 = doc["bochangxishu"]["a3"];
b1 = doc["bochangxishu"]["b0"]; b1 = doc["bochangxishu"]["b0"];
@ -1817,10 +1810,11 @@ void json_command(uint8_t port_type)
// bc_b2 = doc["bochangxishu"]["b1"]; // bc_b2 = doc["bochangxishu"]["b1"];
// bc_b3 = doc["bochangxishu"]["b2"]; // bc_b3 = doc["bochangxishu"]["b2"];
// bc_b4 = doc["bochangxishu"]["b3"]; // bc_b4 = doc["bochangxishu"]["b3"];
is11Sensor->SensorInfo.a1 = doc["bochangxishu"]["a0"];
is11Sensor->SensorInfo.a2 = doc["bochangxishu"]["a1"]; // is11Sensor->SensorInfo.a1 = doc["bochangxishu"]["a0"];
is11Sensor->SensorInfo.a3 = doc["bochangxishu"]["a2"]; // is11Sensor->SensorInfo.a2 = doc["bochangxishu"]["a1"];
is11Sensor->SensorInfo.a4 = doc["bochangxishu"]["a3"]; // is11Sensor->SensorInfo.a3 = doc["bochangxishu"]["a2"];
// is11Sensor->SensorInfo.a4 = doc["bochangxishu"]["a3"];
is11Sensor->guangpu_bochang.a0 = doc["bochangxishu"]["a0"]; is11Sensor->guangpu_bochang.a0 = doc["bochangxishu"]["a0"];
is11Sensor->guangpu_bochang.a1 = doc["bochangxishu"]["a1"]; is11Sensor->guangpu_bochang.a1 = doc["bochangxishu"]["a1"];
@ -2690,12 +2684,6 @@ void sys_info_init()
} }
// sys_sd_doc["bochangxishu"]["a0"] = STRSensorInfos_structure.a1;
// sys_sd_doc["bochangxishu"]["a1"] = STRSensorInfos_structure.a2;
// sys_sd_doc["bochangxishu"]["a2"] = STRSensorInfos_structure.a3;
// sys_sd_doc["bochangxishu"]["a3"] = STRSensorInfos_structure.a4;
sys_sd_doc["bochangxishu"]["a0"] = doc["bochangxishu"]["a0"]; sys_sd_doc["bochangxishu"]["a0"] = doc["bochangxishu"]["a0"];
sys_sd_doc["bochangxishu"]["a1"] = doc["bochangxishu"]["a1"]; sys_sd_doc["bochangxishu"]["a1"] = doc["bochangxishu"]["a1"];
sys_sd_doc["bochangxishu"]["a2"] = doc["bochangxishu"]["a2"]; sys_sd_doc["bochangxishu"]["a2"] = doc["bochangxishu"]["a2"];
@ -2758,15 +2746,15 @@ void sys_info_init()
sys_sd_doc["Minimum_temperature"] = Minimum_temperature; sys_sd_doc["Minimum_temperature"] = Minimum_temperature;
sys_sd_doc["servo_offset_angle"] = 0; sys_sd_doc["servo_offset_angle"] = 0;
sys_sd_doc["bochangxishu"]["a0"] = is11Sensor->guangpu_bochang.a0; sys_sd_doc["bochangxishu"]["a0"] = is11Sensor->SensorInfo.a1;
sys_sd_doc["bochangxishu"]["a1"] = is11Sensor->guangpu_bochang.a1; sys_sd_doc["bochangxishu"]["a1"] = is11Sensor->SensorInfo.a1;
sys_sd_doc["bochangxishu"]["a2"] = is11Sensor->guangpu_bochang.a2; sys_sd_doc["bochangxishu"]["a2"] = is11Sensor->SensorInfo.a1;
sys_sd_doc["bochangxishu"]["a3"] = is11Sensor->guangpu_bochang.a3; sys_sd_doc["bochangxishu"]["a3"] = is11Sensor->SensorInfo.a1;
sys_sd_doc["bochangxishu"]["b0"] = is11Sensor->guangpu_bochang.b0; sys_sd_doc["bochangxishu"]["b0"] = 0;
sys_sd_doc["bochangxishu"]["b1"] = is11Sensor->guangpu_bochang.b1; sys_sd_doc["bochangxishu"]["b1"] = 0;
sys_sd_doc["bochangxishu"]["b2"] = is11Sensor->guangpu_bochang.b2; sys_sd_doc["bochangxishu"]["b2"] = 0;
sys_sd_doc["bochangxishu"]["b3"] = is11Sensor->guangpu_bochang.b3; sys_sd_doc["bochangxishu"]["b3"] = 0;
sys_sd_doc["return_data_type"] = return_data_type; sys_sd_doc["return_data_type"] = return_data_type;
sys_sd_doc["return_mode"] = ""; //暂定 sys_sd_doc["return_mode"] = ""; //暂定
sys_sd_doc["atuo_return"] = "no"; sys_sd_doc["atuo_return"] = "no";