mixer: update to List<> container

This commit is contained in:
Daniel Agar
2019-11-22 15:00:25 -05:00
parent 79dc676c8f
commit cc7807c066
7 changed files with 59 additions and 111 deletions
+8 -8
View File
@@ -88,12 +88,12 @@ bool ListTest::test_add()
// verify full size (100)
ut_assert_true(list1.size() == 100);
int i = 99;
int i = 0;
for (auto t : list1) {
// verify all elements were inserted in order
ut_compare("stored i", i, t->i);
i--;
i++;
}
// delete all elements
@@ -182,27 +182,27 @@ bool ListTest::test_range_based_for()
ut_assert_true(!list1.empty());
}
// first element should be 0
ut_compare("first 0", list1.getHead()->i, 0);
// first element should be 99 (first added)
ut_compare("first 0", list1.getHead()->i, 99);
// verify all elements were inserted in order
int i = 0;
int i = 99;
auto t1 = list1.getHead();
while (t1 != nullptr) {
ut_compare("check count", i, t1->i);
t1 = t1->getSibling();
i++;
i--;
}
// verify full size (100)
ut_compare("size check", list1.size(), 100);
i = 0;
i = 99;
for (auto t2 : list1) {
ut_compare("range based for i", i, t2->i);
i++;
i--;
}
// verify full size (100)
+3 -3
View File
@@ -383,10 +383,10 @@ bool MixerTest::mixerTest()
output_limit_calc(should_arm, should_prearm, mixed, reverse_pwm_mask, r_page_servo_disarmed, r_page_servo_control_min,
r_page_servo_control_max, outputs, r_page_servos, &output_limit);
//warnx("mixed %d outputs (max %d), values:", mixed, output_max);
for (unsigned i = 0; i < mixed; i++) {
//PX4_INFO("mixed %d outputs (max %d), values:", mixed, output_max);
//fprintf(stderr, "pre-arm:\t %d: out: %8.4f, servo: %d \n", i, (double)outputs[i], (int)r_page_servos[i]);
for (unsigned i = 0; i < mixed; i++) {
//PX4_ERR("pre-arm:\t %d: out: %8.4f, servo: %d", i, (double)outputs[i], (int)r_page_servos[i]);
if (i != actuator_controls_s::INDEX_THROTTLE) {
if (r_page_servos[i] < r_page_servo_control_min[i]) {