fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 05:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

uavcan_v1: Apply feedback from Pavel Kirienko

Browse Source 
Co-authored-by: Pavel Kirienko <pavel.kirienko@gmail.com>
This commit is contained in:
Jacob Crabill
2021-02-24 19:22:11 +01:00
committed by Lorenz Meier
co-authored by Pavel Kirienko
parent a7a7e33614
commit 4cca86b5d6
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/uavcan_v1/ParamManager.cpp
+4 -4
View File
@@ -64,8 +64,8 @@ bool UavcanParamManager::GetParamByName(const char *param_name, uavcan_register_
case PARAM_TYPE_FLOAT: {
float out_val {};
param_get(param_handle, &out_val);
value.natural32.value.elements[0] = out_val;
uavcan_register_Value_1_0_select_natural32_(&value);
value.real32.value.elements[0] = out_val;
uavcan_register_Value_1_0_select_real32_(&value);
break;
}
}
@@ -100,8 +100,8 @@ bool UavcanParamManager::GetParamByName(const uavcan_register_Name_1_0 &name, ua
case PARAM_TYPE_FLOAT: {
float out_val {};
param_set(param_handle, &out_val);
value.natural32.value.elements[0] = out_val;
uavcan_register_Value_1_0_select_natural32_(&value);
value.real32.value.elements[0] = out_val;
uavcan_register_Value_1_0_select_real32_(&value);
break;
}
}
src/drivers/uavcan_v1/Publishers/Gnss.hpp
+1 -1
View File
@@ -96,7 +96,7 @@ public:
.position = NAN,
.horizontal = gps.hdop,
.vertical = gps.vdop,
.time = (float)gps.time_utc_usec / 1.e6f, /// ?
.time = NAN,
.northing = NAN,
.easting = NAN,
};
src/drivers/uavcan_v1/Publishers/Publisher.hpp
+2 -2
View File
@@ -65,8 +65,8 @@ public:
void updateParam()
{
char uavcan_param[90];
sprintf(uavcan_param, "uavcan.pub.%s.%d.id", _subject_name, _instance);
char uavcan_param[256];
snprintf(uavcan_param, sizeof(uavcan_param), "uavcan.pub.%s.%d.id", _subject_name, _instance);
// Set _port_id from _uavcan_param
uavcan_register_Value_1_0 value;
src/drivers/uavcan_v1/Subscribers/Battery.hpp
+2 -2
View File
@@ -69,8 +69,8 @@ public:
PX4_INFO("BmsCallback");
reg_drone_service_battery_Status_0_1 bat {};
size_t bat_size_in_bits = receive.payload_size;
reg_drone_service_battery_Status_0_1_deserialize_(&bat, (const uint8_t *)receive.payload, &bat_size_in_bits);
size_t bat_size_in_bytes = receive.payload_size;
reg_drone_service_battery_Status_0_1_deserialize_(&bat, (const uint8_t *)receive.payload, &bat_size_in_bytes);
uavcan_si_unit_voltage_Scalar_1_0 V_Min = bat.cell_voltage_min_max[0];
uavcan_si_unit_voltage_Scalar_1_0 V_Max = bat.cell_voltage_min_max[1];