Skip to content

Commit be97836

Browse files
committed
解决param不兼容的问题
Signed-off-by: latercomer <[email protected]>
1 parent 866e7b2 commit be97836

File tree

105 files changed

+7015
-6953
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+7015
-6953
lines changed

apps/controller/commander/Arming/ArmAuthorization/ArmAuthorization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
#include <px4_platform_common/defines.h>
1616
#include <px4_platform_common/px4_config.h>
17-
#include <lib/parameters/param.h>
17+
#include <lib/param/param.h>
1818
#include <systemlib/mavlink_log.h>
1919
#include <uORB/Publication.hpp>
2020
#include <uORB/topics/vehicle_command.h>

apps/controller/commander/accelerometer_calibration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
#include <geo/geo.h>
115115
#include <matrix/math.hpp>
116116
#include <conversion/rotation.h>
117-
#include <lib/parameters/param.h>
117+
#include <lib/param/param.h>
118118
#include <lib/systemlib/err.h>
119119
#include <lib/systemlib/mavlink_log.h>
120120
#include <uORB/Subscription.hpp>

apps/controller/commander/airspeed_calibration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <uORB/Subscription.hpp>
3030
#include <uORB/topics/differential_pressure.h>
3131
#include <systemlib/mavlink_log.h>
32-
#include <parameters/param.h>
32+
#include <param/param.h>
3333
#include <systemlib/err.h>
3434

3535
using namespace nextpilot;

apps/controller/commander/commander_helper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <uORB/topics/led_control.h>
3434
#include <uORB/topics/tune_control.h>
3535
#include <systemlib/err.h>
36-
#include <parameters/param.h>
36+
#include <param/param.h>
3737
#include <drivers/drv_hrt.h>
3838
#include <drivers/drv_tone_alarm.h>
3939
#include "commander_helper.h"

apps/controller/commander/factory_calibration_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <fcntl.h>
1313
#include <string.h>
1414

15-
#include <lib/parameters/param.h>
15+
#include <lib/param/param.h>
1616
#include <px4_platform_common/log.h>
1717

1818
#include "factory_calibration_storage.h"

apps/controller/commander/failsafe/emscripten.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
******************************************************************/
1010

1111
#define PARAM_IMPLEMENTATION
12-
#include <parameters/param.h>
12+
#include <param/param.h>
1313

1414
#include "failsafe.h"
1515
#include "../ModeUtil/mode_requirements.hpp"

apps/peripheral/notification/lights/rgbled_tca62724/rgbled.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <drivers/device/i2c.h>
2323
#include <lib/led/led.h>
24-
#include <lib/parameters/param.h>
24+
#include <lib/param/param.h>
2525
#include <px4_platform_common/getopt.h>
2626
#include <px4_platform_common/i2c_spi_buses.h>
2727
#include <px4_platform_common/module.h>

apps/peripheral/payload/camera_capture/camera_capture.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <drivers/drv_hrt.h>
1919
#include <drivers/drv_input_capture.h>
2020
#include <drivers/drv_pwm_output.h>
21-
#include <lib/parameters/param.h>
21+
#include <lib/param/param.h>
2222
#include <px4_platform_common/px4_config.h>
2323
#include <px4_platform_common/defines.h>
2424
#include <px4_platform_common/module.h>

apps/peripheral/payload/camera_feedback/CameraFeedback.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#pragma once
1919

2020
#include <mathlib/mathlib.h>
21-
#include <parameters/param.h>
21+
#include <param/param.h>
2222

2323
#include <defines.h>
2424
#include <module/module_command.hpp>

apps/peripheral/payload/camera_trigger/camera_trigger.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <matrix/math.hpp>
3232
#include <px4_platform_common/px4_work_queue/WorkItemScheduled.hpp>
3333
#include <systemlib/err.h>
34-
#include <parameters/param.h>
34+
#include <param/param.h>
3535

3636
#include <uORB/Publication.hpp>
3737
#include <uORB/Subscription.hpp>
@@ -129,17 +129,17 @@ class CameraTrigger : public px4::WorkItemScheduled {
129129
void adjust_roll();
130130

131131
private:
132-
struct hrt_call _engagecall {};
132+
struct hrt_call _engagecall{};
133133

134-
struct hrt_call _disengagecall {};
134+
struct hrt_call _disengagecall{};
135135

136-
struct hrt_call _engage_turn_on_off_call {};
136+
struct hrt_call _engage_turn_on_off_call{};
137137

138-
struct hrt_call _disengage_turn_on_off_call {};
138+
struct hrt_call _disengage_turn_on_off_call{};
139139

140-
struct hrt_call _keepalivecall_up {};
140+
struct hrt_call _keepalivecall_up{};
141141

142-
struct hrt_call _keepalivecall_down {};
142+
struct hrt_call _keepalivecall_down{};
143143

144144
float _activation_time{0.5f};
145145
float _interval{100.f};

0 commit comments

Comments
 (0)