diff options
| author | Gwendal Grignou <gwendal@chromium.org> | 2022-05-16 17:16:10 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-07 18:29:28 +0000 |
| commit | ae8a73867f4932552297ac0573ad165b4bb531be (patch) | |
| tree | 1d1708c8d63ba27d823e21cbadb218b90ad283eb | |
| parent | 4b469fb4b1e4d9ab01b5f6a969949537fb6299da (diff) | |
| download | chrome-ec-ae8a73867f4932552297ac0573ad165b4bb531be.tar.gz | |
test: motion_lid: Fix merging error
commit bb266fc26fc0 ("common: replace 1 << digits, with BIT(digits)")
is also fixing an error in motion_lid.c.
It should have been split in 2.
Fixes commit 0c71c474 ("motion sense: Calculate loop time based on sensor needs")
BUG=b:129159505
BRANCH=octopus
TEST=pass unit test: "make BOARD=rammus run-motion_lid"
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Change-Id: I78223b1afdcfb965be7b561ede243c262016d966
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3651484
Reviewed-by: Henry Sun <henrysun@google.com>
| -rw-r--r-- | test/motion_lid.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/motion_lid.c b/test/motion_lid.c index 67700d5aa2..e3dcc4db00 100644 --- a/test/motion_lid.c +++ b/test/motion_lid.c @@ -69,7 +69,7 @@ static int accel_set_data_rate(const struct motion_sensor_t *s, const int rate, const int rnd) { - test_data_rate[s - motion_sensors] = rate | (rnd ? ROUND_UP_FLAG : 0); + test_data_rate[s - motion_sensors] = rate; return EC_SUCCESS; } @@ -184,12 +184,7 @@ static int test_lid_angle(void) hook_notify(HOOK_CHIPSET_RESUME); msleep(1000); TEST_ASSERT(sensor_active == SENSOR_ACTIVE_S0); -<<<<<<< HEAD (67a275 TCPMv1, TCPMv2: add pd event for receiving hard reset) - TEST_ASSERT(accel_get_data_rate(lid) == (119000 | ROUND_UP_FLAG)); - TEST_ASSERT(motion_interval == TEST_LID_EC_RATE); -======= TEST_ASSERT(accel_get_data_rate(lid) == 119000); ->>>>>>> CHANGE (0c71c4 motion sense: Calculate loop time based on sensor needs) /* * Set the base accelerometer as if it were sitting flat on a desk |