File tree 4 files changed +9
-7
lines changed
4 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -65,7 +65,7 @@ void imuDataGet(EulerAngles *pstAngles,
65
65
float acc[3 ], gyro[3 ];
66
66
float MotionVal[9 ];
67
67
68
- // magnetometer_.getData(&x, &y, &z);
68
+ magnetometer_.getData (&x, &y, &z);
69
69
70
70
pstMagnRawData->s16X = x- offset_x;
71
71
pstMagnRawData->s16Y = y- offset_y;
Original file line number Diff line number Diff line change @@ -31,6 +31,8 @@ void updateIMUData() {
31
31
icm_roll = stAngles .roll ;
32
32
icm_pitch = stAngles .pitch ;
33
33
icm_yaw = stAngles .yaw ;
34
+
35
+ temp = temperatureRead ();
34
36
}
35
37
36
38
Original file line number Diff line number Diff line change @@ -388,15 +388,15 @@ void baseInfoFeedback() {
388
388
389
389
jsonInfoHttp ["r" ] = icm_roll ;
390
390
jsonInfoHttp ["p" ] = icm_pitch ;
391
- // jsonInfoHttp["y"] = icm_yaw;
392
- jsonInfoHttp ["y" ] = "null" ;
391
+ jsonInfoHttp ["y" ] = icm_yaw ;
392
+ // jsonInfoHttp["y"] = "null";
393
393
394
394
// jsonInfoHttp["q0"] = qw;
395
395
// jsonInfoHttp["q1"] = qx;
396
396
// jsonInfoHttp["q2"] = qy;
397
397
// jsonInfoHttp["q3"] = qz;
398
398
399
- // jsonInfoHttp["temp"] = temp.temperature ;
399
+ jsonInfoHttp ["temp" ] = temp ;
400
400
401
401
jsonInfoHttp ["v" ] = loadVoltage_V ;
402
402
Original file line number Diff line number Diff line change @@ -278,8 +278,8 @@ const char index_html[] PROGMEM = R"rawliteral(
278
278
< span id = "pn" > PITCH < /span >
279
279
< /div >
280
280
< div >
281
- < span class = "num-color mid-num" id = "y " > -1.01 < /span >
282
- < span id = "yn" > YAW < /span >
281
+ < span class = "num-color mid-num" id = "temp " > -1.01 < /span >
282
+ < span id = "yn" > TEMP < /span >
283
283
< /div >
284
284
< div >
285
285
< span class = "num-color mid-num" id = "mX" > -1.01 < /span >
@@ -706,7 +706,7 @@ const char index_html[] PROGMEM = R"rawliteral(
706
706
707
707
document .getElementById ("r" ).innerHTML = jsonResponse .r ?.toFixed (2 );
708
708
document .getElementById ("p" ).innerHTML = jsonResponse .p ?.toFixed (2 );
709
- document .getElementById ("y " ).innerHTML = jsonResponse .y ?.toFixed (2 );
709
+ document .getElementById ("temp " ).innerHTML = jsonResponse .temp ?.toFixed (2 );
710
710
document .getElementById ("mZ" ).innerHTML = speed_rate ;
711
711
712
712
if (jsonResponse .hasOwnProperty ('pan' )) {
You can’t perform that action at this time.
0 commit comments