Skip to content

Commit 6d675f7

Browse files
committed
feat: rename sonar_read in board.h to be range_read
1 parent 71ca9f6 commit 6d675f7

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

boards/varmint_h7/common/Varmint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ class Varmint : public rosflight_firmware::Board
120120

121121
bool diff_pressure_read(rosflight_firmware::PressureStruct * diff_pressure) override;
122122

123-
bool sonar_read(rosflight_firmware::RangeStruct * sonar) override;
123+
bool range_read(rosflight_firmware::RangeStruct * range) override;
124124

125125
// Battery
126126
bool battery_read(rosflight_firmware::BatteryStruct * bat) override;

comms/mavlink/mavlink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class Mavlink : public CommLinkInterface
7676
void send_param_value_float(uint8_t system_id, uint16_t index, const char * const name,
7777
float value, uint16_t param_count) override;
7878
void send_rc_raw(uint8_t system_id, uint32_t timestamp_ms, const uint16_t channels[8]) override;
79-
void send_sonar(uint8_t system_id,
79+
void send_range(uint8_t system_id,
8080
/* TODO enum type*/ uint8_t type, float range, float max_range,
8181
float min_range) override;
8282
void send_status(uint8_t system_id, bool armed, bool failsafe, uint16_t rc_override, bool offboard,

include/comm_link.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class CommLinkInterface
148148
float value, uint16_t param_count) = 0;
149149
virtual void send_rc_raw(uint8_t system_id, uint32_t timestamp_ms,
150150
const uint16_t channels[8]) = 0;
151-
virtual void send_sonar(uint8_t system_id,
151+
virtual void send_range(uint8_t system_id,
152152
/* TODO enum type*/ uint8_t type, float range, float max_range,
153153
float min_range) = 0;
154154
virtual void send_status(uint8_t system_id, bool armed, bool failsafe, uint16_t rc_override,

include/comm_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class CommManager : public CommLinkInterface::ListenerInterface, public ParamLis
151151
void send_output_raw(void);
152152
void send_diff_pressure(void);
153153
void send_baro(void);
154-
void send_sonar(void);
154+
void send_range(void);
155155
void send_mag(void);
156156
void send_battery_status(void);
157157
void send_gnss(void);

include/interface/board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ typedef struct
138138
bool baro;
139139
bool mag;
140140
bool diff_pressure;
141-
bool sonar;
141+
bool range;
142142
bool battery;
143143
} got_flags;
144144

@@ -206,7 +206,7 @@ class Board
206206
virtual bool diff_pressure_read(PressureStruct * diff_pressure) = 0;
207207

208208
// Sonar
209-
virtual bool sonar_read(RangeStruct * sonar) = 0;
209+
virtual bool range_read(RangeStruct * range) = 0;
210210

211211
// GPS
212212
virtual bool gnss_read(rosflight_firmware::GnssStruct * gnss) = 0;

include/sensors.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class Sensors : public ParamListenerInterface
5454
public:
5555
PressureStruct * get_diff_pressure(void) { return &diff_pressure_; }
5656
PressureStruct * get_baro(void) { return &baro_; }
57-
RangeStruct * get_sonar(void) { return &sonar_; }
57+
RangeStruct * get_range(void) { return &range_; }
5858
ImuStruct * get_imu(void) { return &imu_; }
5959
BatteryStruct * get_battery(void) { return &battery_; }
6060
MagStruct * get_mag(void) { return &mag_; }
@@ -79,7 +79,7 @@ class Sensors : public ParamListenerInterface
7979
// Data
8080
PressureStruct diff_pressure_ = {};
8181
PressureStruct baro_ = {};
82-
RangeStruct sonar_ = {};
82+
RangeStruct range_ = {};
8383
ImuStruct imu_ = {};
8484
BatteryStruct battery_ = {};
8585
MagStruct mag_ = {};

test/test_board.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282

8383
bool diff_pressure_read(rosflight_firmware::PressureStruct * diff_pressure) override;
8484

85-
bool sonar_read(rosflight_firmware::RangeStruct * sonar) override;
85+
bool range_read(rosflight_firmware::RangeStruct * range) override;
8686

8787
// Battery
8888
bool battery_read(rosflight_firmware::BatteryStruct * bat) override;
@@ -130,4 +130,4 @@
130130
} // namespace rosflight_firmware
131131

132132
#endif // ROSLFIGHT_FIRMWARE_TEST_BOARD_H
133-
133+

0 commit comments

Comments
 (0)