diff options
| author | Shou-Chieh Hsu <shouchieh@google.com> | 2023-05-15 06:04:30 +0000 |
|---|---|---|
| committer | Shou-Chieh Hsu <shouchieh@google.com> | 2023-05-15 06:04:30 +0000 |
| commit | 246a64a7a7afa655fa977b157d6b4e3bbf8854b6 (patch) | |
| tree | 4de2ae0f17c7e25c2a5b8ecef469f079ff3af270 /test | |
| parent | a7bbb21325bc55526fbc7584efa96bf5b2642c6c (diff) | |
| parent | 98406285eb79141babdae0710cc24b9d9dde9db9 (diff) | |
| download | chrome-ec-246a64a7a7afa655fa977b157d6b4e3bbf8854b6.tar.gz | |
Merge remote-tracking branch cros/main into firmware-nissa-15217.B-main
Generated by: util/update_release_branch.py -r --zephyr --board nissa firmware-
nissa-15217.B-main
Relevant changes:
git log --oneline a7bbb21325..98406285eb -- zephyr/program/nissa
util/getversion.sh
940d056342 Uldren: modify rotate matrix
5c4d8b42ef joxer: Allow alternate rotation parameters for Joxer
76d2b9b1e4 battery: Deprecate CONFIG_BATTERY_LEVEL_NEAR_FULL
454f4b32f8 Uldren: update fw config
b729eab7c7 charger: Move charger_state_v2.h into charge_state.h
47acf64182 charger: Rename charge_get_state() to led_pwr_get_state()
fe2610d0ef yavilla: Limit C1 current with low power charger
0fbfb5b1f0 yaviks: Limit C1 current with low power charger
4e47e1382f yavilla: Update led behavior
e9b1ee0e78 yavilla: Update keyboard config
f60d347b57 yavilla: increase RW image size to 0x58000
BRANCH=None
BUG=b:280818345 b:282054731 b:261102000 b:281487225 b:273791621
BUG=b:279353236 b:273159459 b:218332694
TEST=`make -j buildall`
Force-Relevant-Builds: all
Change-Id: I399350c8ca35aea1963ca6dc49403e44dfcd4b8e
Signed-off-by: Shou-Chieh Hsu <shouchieh@google.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/nvidia_gpu.c | 4 | ||||
| -rw-r--r-- | test/sbs_charging_v2.c | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/nvidia_gpu.c b/test/nvidia_gpu.c index b660943e04..3e03197e50 100644 --- a/test/nvidia_gpu.c +++ b/test/nvidia_gpu.c @@ -20,8 +20,8 @@ #include <stdio.h> struct d_notify_policy d_notify_policies[] = { - AC_ATLEAST_W(100), AC_ATLEAST_W(65), AC_DC, - DC_ATLEAST_SOC(20), DC_ATLEAST_SOC(5), + AC_ATLEAST_W(100), AC_ATLEAST_W(65), AC_DC, + DC_ATMOST_SOC(20), DC_ATMOST_SOC(5), }; extern enum d_notify_level d_notify_level; diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index 041f4f9a45..482770ff1c 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -124,10 +124,10 @@ enum ec_status charger_profile_override_set_param(uint32_t param, test_static int wait_charging_state(void) { - enum charge_state state; + enum led_pwr_state state; task_wake(TASK_ID_CHARGER); msleep(WAIT_CHARGER_TASK); - state = charge_get_state(); + state = led_pwr_get_state(); ccprintf("[CHARGING TEST] state = %d\n", state); return state; } @@ -206,7 +206,7 @@ test_static void ev_clear(int event) test_static int test_charge_state(void) { - enum charge_state state; + enum led_pwr_state state; uint32_t flags; /* On AC */ @@ -504,7 +504,7 @@ test_static int test_external_funcs(void) TEST_ASSERT(!(flags & CHARGE_FLAG_FORCE_IDLE)); /* and the rest */ - TEST_ASSERT(charge_get_state() == PWR_STATE_CHARGE); + TEST_ASSERT(led_pwr_get_state() == PWR_STATE_CHARGE); TEST_ASSERT(!charge_want_shutdown()); TEST_ASSERT(charge_get_percent() == 50); temp = 0; @@ -519,7 +519,7 @@ test_static int test_external_funcs(void) #define CHG_OPT2 0x4000 test_static int test_hc_charge_state(void) { - enum charge_state state; + enum led_pwr_state state; int i, rv, tmp; struct ec_params_charge_state params; struct ec_response_charge_state resp; @@ -964,7 +964,7 @@ test_static int test_battery_sustainer_discharge_idle(void) /* (lower =) upper < SoC */ display_soc = 810; wait_charging_state(); - TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_IDLE); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_DISCHARGE); /* Unplug AC. Sustainer gets deactivated. */ gpio_set_level(GPIO_AC_PRESENT, 0); @@ -974,7 +974,7 @@ test_static int test_battery_sustainer_discharge_idle(void) /* Replug AC. Sustainer gets re-activated. */ gpio_set_level(GPIO_AC_PRESENT, 1); wait_charging_state(); - TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_IDLE); + TEST_ASSERT(get_chg_ctrl_mode() == CHARGE_CONTROL_DISCHARGE); /* lower = SoC = upper */ display_soc = 800; |