Skip to content

Commit f01fb29

Browse files
aul12aul12
committed
Removed compiler warning, format
1 parent 73d33b9 commit f01fb29

File tree

2 files changed

+108
-31
lines changed

2 files changed

+108
-31
lines changed

‎Tests/LowLevel/Application/mode_handler.cpp‎

Lines changed: 106 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,19 @@ TEST(TEST_NAME, imu_initial_timeout) {
1515
auto errorHandlerHandle = mock::error_handler.getHandle();
1616

1717
imuHandle.overrideFunc<imu_data_available>([]() { return false; });
18-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
18+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
19+
imu_data_t res{};
20+
res.imu_ok = true;
21+
return res;
22+
});
1923
remoteHandle.overrideFunc<remote_data_available>([]() { return true; });
20-
remoteHandle.overrideFunc<remote_get_data>(
21-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
24+
remoteHandle.overrideFunc<remote_get_data>([]() {
25+
remote_data_t res{};
26+
res.is_armed = true;
27+
res.override_active = false;
28+
res.remote_ok = true;
29+
return res;
30+
});
2231
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return true; });
2332
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
2433

@@ -40,10 +49,19 @@ TEST(TEST_NAME, imu_initial_nok) {
4049
auto errorHandlerHandle = mock::error_handler.getHandle();
4150

4251
imuHandle.overrideFunc<imu_data_available>([]() { return true; });
43-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = false}; });
52+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
53+
imu_data_t res{};
54+
res.imu_ok = false;
55+
return res;
56+
});
4457
remoteHandle.overrideFunc<remote_data_available>([]() { return true; });
45-
remoteHandle.overrideFunc<remote_get_data>(
46-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
58+
remoteHandle.overrideFunc<remote_get_data>([]() {
59+
remote_data_t res{};
60+
res.is_armed = true;
61+
res.override_active = false;
62+
res.remote_ok = true;
63+
return res;
64+
});
4765
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return true; });
4866
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
4967

@@ -69,10 +87,19 @@ TEST(TEST_NAME, imu_timeout) {
6987
frameCounter += 1;
7088
return frameCounter < 2 or frameCounter > 7;
7189
});
72-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
90+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
91+
imu_data_t res{};
92+
res.imu_ok = true;
93+
return res;
94+
});
7395
remoteHandle.overrideFunc<remote_data_available>([]() { return true; });
74-
remoteHandle.overrideFunc<remote_get_data>(
75-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
96+
remoteHandle.overrideFunc<remote_get_data>([]() {
97+
remote_data_t res{};
98+
res.is_armed = true;
99+
res.override_active = false;
100+
res.remote_ok = true;
101+
return res;
102+
});
76103
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return true; });
77104
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
78105

@@ -130,10 +157,19 @@ TEST(TEST_NAME, remote_initial_timeout) {
130157
auto errorHandlerHandle = mock::error_handler.getHandle();
131158

132159
imuHandle.overrideFunc<imu_data_available>([]() { return true; });
133-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
160+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
161+
imu_data_t res{};
162+
res.imu_ok = true;
163+
return res;
164+
});
134165
remoteHandle.overrideFunc<remote_data_available>([]() { return false; });
135-
remoteHandle.overrideFunc<remote_get_data>(
136-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
166+
remoteHandle.overrideFunc<remote_get_data>([]() {
167+
remote_data_t res{};
168+
res.is_armed = true;
169+
res.override_active = false;
170+
res.remote_ok = true;
171+
return res;
172+
});
137173
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return true; });
138174
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
139175

@@ -155,10 +191,19 @@ TEST(TEST_NAME, remote_initial_nok) {
155191
auto errorHandlerHandle = mock::error_handler.getHandle();
156192

157193
imuHandle.overrideFunc<imu_data_available>([]() { return true; });
158-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
194+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
195+
imu_data_t res{};
196+
res.imu_ok = true;
197+
return res;
198+
});
159199
remoteHandle.overrideFunc<remote_data_available>([]() { return true; });
160-
remoteHandle.overrideFunc<remote_get_data>(
161-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = false}; });
200+
remoteHandle.overrideFunc<remote_get_data>([]() {
201+
remote_data_t res{};
202+
res.is_armed = true;
203+
res.override_active = false;
204+
res.remote_ok = false;
205+
return res;
206+
});
162207
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return true; });
163208
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
164209

@@ -181,13 +226,22 @@ TEST(TEST_NAME, remote_timeout) {
181226

182227
std::size_t frameCounter = 0;
183228
imuHandle.overrideFunc<imu_data_available>([]() { return true; });
184-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
229+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
230+
imu_data_t res{};
231+
res.imu_ok = true;
232+
return res;
233+
});
185234
remoteHandle.overrideFunc<remote_data_available>([&frameCounter]() {
186235
frameCounter += 1;
187236
return frameCounter < 2 or frameCounter > 7;
188237
});
189-
remoteHandle.overrideFunc<remote_get_data>(
190-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
238+
remoteHandle.overrideFunc<remote_get_data>([]() {
239+
remote_data_t res{};
240+
res.is_armed = true;
241+
res.override_active = false;
242+
res.remote_ok = true;
243+
return res;
244+
});
191245
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return true; });
192246
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
193247

@@ -245,10 +299,19 @@ TEST(TEST_NAME, fcp_initial_timeout) {
245299
auto errorHandlerHandle = mock::error_handler.getHandle();
246300

247301
imuHandle.overrideFunc<imu_data_available>([]() { return true; });
248-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
302+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
303+
imu_data_t res{};
304+
res.imu_ok = true;
305+
return res;
306+
});
249307
remoteHandle.overrideFunc<remote_data_available>([]() { return true; });
250-
remoteHandle.overrideFunc<remote_get_data>(
251-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
308+
remoteHandle.overrideFunc<remote_get_data>([]() {
309+
remote_data_t res{};
310+
res.is_armed = true;
311+
res.override_active = false;
312+
res.remote_ok = true;
313+
return res;
314+
});
252315
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([]() { return false; });
253316
flightcomputerHandle.overrideFunc<flightcomputer_get_setpoint>([]() { return flightcomputer_setpoint_t{}; });
254317

@@ -271,10 +334,19 @@ TEST(TEST_NAME, fcp_timeout) {
271334

272335
std::size_t frameCounter = 0;
273336
imuHandle.overrideFunc<imu_data_available>([]() { return true; });
274-
imuHandle.overrideFunc<imu_get_latest_data>([]() { return imu_data_t{.imu_ok = true}; });
337+
imuHandle.overrideFunc<imu_get_latest_data>([]() {
338+
imu_data_t res{};
339+
res.imu_ok = true;
340+
return res;
341+
});
275342
remoteHandle.overrideFunc<remote_data_available>([]() { return true; });
276-
remoteHandle.overrideFunc<remote_get_data>(
277-
[]() { return remote_data_t{.is_armed = true, .override_active = false, .remote_ok = true}; });
343+
remoteHandle.overrideFunc<remote_get_data>([]() {
344+
remote_data_t res{};
345+
res.is_armed = true;
346+
res.override_active = false;
347+
res.remote_ok = true;
348+
return res;
349+
});
278350
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>([&frameCounter]() {
279351
frameCounter += 1;
280352
return frameCounter < 2 or frameCounter > 13;
@@ -409,12 +481,17 @@ TEST(TEST_NAME, modeselection) {
409481

410482
for (auto [availability_value, expected_mode] : decisionTable) {
411483
mode_handler_init();
412-
imuHandle.overrideFunc<imu_get_latest_data>(
413-
[availability_value]() { return imu_data_t{.imu_ok = availability_value.imu}; });
484+
imuHandle.overrideFunc<imu_get_latest_data>([availability_value]() {
485+
imu_data_t res{};
486+
res.imu_ok = availability_value.imu;
487+
return res;
488+
});
414489
remoteHandle.overrideFunc<remote_get_data>([availability_value]() {
415-
return remote_data_t{.is_armed = availability_value.arm,
416-
.override_active = availability_value.override,
417-
.remote_ok = availability_value.remote};
490+
remote_data_t res{};
491+
res.is_armed = availability_value.arm;
492+
res.override_active = availability_value.override;
493+
res.remote_ok = availability_value.remote;
494+
return res;
418495
});
419496
flightcomputerHandle.overrideFunc<flightcomputer_setpoint_available>(
420497
[availability_value]() { return availability_value.fcp; });

‎Tests/LowLevel/Drivers/sbus.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ TEST(TEST_NAME, decode_framelost) {
174174
});
175175
uart_callback_t uartCallback = nullptr;
176176
uartHandle.overrideFunc<uart_init>([&uartCallback](uint8_t /*id*/, uint32_t /*baud*/, uart_parity_t /*parity*/,
177-
uint8_t /*stop_bits*/,
178-
uart_callback_t rx_callback) { uartCallback = rx_callback; });
177+
uint8_t /*stop_bits*/,
178+
uart_callback_t rx_callback) { uartCallback = rx_callback; });
179179
sbus_init();
180180
EXPECT_TRUE(uartHandle.functionGotCalled<uart_init>());
181181

0 commit comments

Comments
 (0)