MS Power Control Loop: Fix oscillations within good MS Power Levels

Related: SYS#4917
Change-Id: Ib33a94eba92004f9327c91e020a506dfa9a957c3

3 files changed, 18 insertions, 18 deletions

diff --git a/tests/power/ms_power_loop_test.c b/tests/power/ms_power_loop_test.c
index d8d1c710..e54d75ff 100644
--- a/tests/power/ms_power_loop_test.c
+++ b/tests/power/ms_power_loop_test.c
@@ -398,11 +398,11 @@ static void test_good_threshold_convergence(void)
 	lchan->ms_power_ctrl.current = 10;
 	lchan->ms_power_ctrl.max = 2;
 
-	apply_power_test_ext(lchan, 9, good_rxlev, good_lqual, 1, 9);
-	apply_power_test_ext(lchan, 10, good_rxlev, good_lqual, 1, 10);
-	apply_power_test_ext(lchan, 9, good_rxlev, good_lqual, 1, 9);
-	apply_power_test_ext(lchan, 10, good_rxlev, good_lqual, 1, 10);
-	apply_power_test_ext(lchan, 9, good_rxlev, good_lqual, 1, 9);
+	apply_power_test_ext(lchan, 9, good_rxlev, good_lqual, 0, 10);
+	apply_power_test_ext(lchan, 10, good_rxlev, good_lqual, 0, 10);
+	apply_power_test_ext(lchan, 9, good_rxlev, good_lqual, 0, 10);
+	apply_power_test_ext(lchan, 10, good_rxlev, good_lqual, 0, 10);
+	apply_power_test_ext(lchan, 9, good_rxlev, good_lqual, 0, 10);
 }
 
 int main(int argc, char **argv)
diff --git a/tests/power/ms_power_loop_test.err b/tests/power/ms_power_loop_test.err
index 5a68e3b2..07d90691 100644
--- a/tests/power/ms_power_loop_test.err
+++ b/tests/power/ms_power_loop_test.err
@@ -58,8 +58,8 @@
 (bts=0,trx=0,ts=0,ss=0) Lowering MS power control level 11 (8 dBm) => 12 (6 dBm): ms-pwr-lvl[curr 11, max 2], RSSI[curr -100, avg -100, thresh -75..-75] dBm, C/I[curr 17, avg 17, thresh 12..16] dB
 (bts=0,trx=0,ts=0,ss=0) Lowering MS power control level 12 (6 dBm) => 13 (4 dBm): ms-pwr-lvl[curr 12, max 2], RSSI[curr -60, avg -60, thresh -75..-75] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
 (bts=0,trx=0,ts=0,ss=0) Lowering MS power control level 13 (4 dBm) => 14 (2 dBm): ms-pwr-lvl[curr 13, max 2], RSSI[curr -60, avg -60, thresh -75..-75] dBm, C/I[curr 17, avg 17, thresh 12..16] dB
-(bts=0,trx=0,ts=0,ss=0) Raising MS power control level 10 (10 dBm) => 9 (12 dBm): ms-pwr-lvl[curr 9, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
-(bts=0,trx=0,ts=0,ss=0) Lowering MS power control level 9 (12 dBm) => 10 (10 dBm): ms-pwr-lvl[curr 10, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
-(bts=0,trx=0,ts=0,ss=0) Raising MS power control level 10 (10 dBm) => 9 (12 dBm): ms-pwr-lvl[curr 9, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
-(bts=0,trx=0,ts=0,ss=0) Lowering MS power control level 9 (12 dBm) => 10 (10 dBm): ms-pwr-lvl[curr 10, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
-(bts=0,trx=0,ts=0,ss=0) Raising MS power control level 10 (10 dBm) => 9 (12 dBm): ms-pwr-lvl[curr 9, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 9 (12 dBm): ms-pwr-lvl[curr 9, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 10 (10 dBm): ms-pwr-lvl[curr 10, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 9 (12 dBm): ms-pwr-lvl[curr 9, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 10 (10 dBm): ms-pwr-lvl[curr 10, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
+(bts=0,trx=0,ts=0,ss=0) Keeping MS power at control level 9 (12 dBm): ms-pwr-lvl[curr 9, max 2], RSSI[curr -78, avg -78, thresh -80..-73] dBm, C/I[curr 14, avg 14, thresh 12..16] dB
diff --git a/tests/power/ms_power_loop_test.ok b/tests/power/ms_power_loop_test.ok
index 4dc01e4b..09e19ad4 100644
--- a/tests/power/ms_power_loop_test.ok
+++ b/tests/power/ms_power_loop_test.ok
@@ -166,14 +166,14 @@ lchan_ms_pwr_ctrl(RxLvl=-60 dBm) returns 1 (expected 1)
 	MS current power 13 -> 14 (expected 14)
 
 Starting test case 'test_good_threshold_convergence'
-lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 1 (expected 1)
-	MS current power 9 -> 9 (expected 9)
-lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 1 (expected 1)
+lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 0 (expected 0)
+	MS current power 9 -> 10 (expected 10)
+lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 0 (expected 0)
 	MS current power 10 -> 10 (expected 10)
-lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 1 (expected 1)
-	MS current power 9 -> 9 (expected 9)
-lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 1 (expected 1)
+lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 0 (expected 0)
+	MS current power 9 -> 10 (expected 10)
+lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 0 (expected 0)
 	MS current power 10 -> 10 (expected 10)
-lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 1 (expected 1)
-	MS current power 9 -> 9 (expected 9)
+lchan_ms_pwr_ctrl(RxLvl=-78 dBm) returns 0 (expected 0)
+	MS current power 9 -> 10 (expected 10)
 Power loop test OK