summaryrefslogtreecommitdiff
path: root/cesar/ce/rx/bitloading
diff options
context:
space:
mode:
authorjutteau2011-04-01 11:48:27 +0200
committerjutteau2011-04-01 13:50:29 +0200
commit070d5bbaf95bce3089cdaf29e560e077af011ef2 (patch)
treefb068ca26fa6ce31ec220eccdded6fc4806d7ef8 /cesar/ce/rx/bitloading
parent738555043f56427422796a5124cd25bbe908233a (diff)
cesar/ce/rx/bl: change branch pb_err_rate_low to no_channel_change, refs #2332
pb_err_rate_low branch name correspond to the case when the channel didn't changed too much and it is more logic to call it as it is.
Diffstat (limited to 'cesar/ce/rx/bitloading')
-rw-r--r--cesar/ce/rx/bitloading/fsm/src/fsm/bl.fsm4
-rw-r--r--cesar/ce/rx/bitloading/src/transition.c4
-rw-r--r--cesar/ce/rx/bitloading/test/src/test_fsm.c18
3 files changed, 13 insertions, 13 deletions
diff --git a/cesar/ce/rx/bitloading/fsm/src/fsm/bl.fsm b/cesar/ce/rx/bitloading/fsm/src/fsm/bl.fsm
index 5133c2b763..7436550632 100644
--- a/cesar/ce/rx/bitloading/fsm/src/fsm/bl.fsm
+++ b/cesar/ce/rx/bitloading/fsm/src/fsm/bl.fsm
@@ -75,7 +75,7 @@ TRACKING:
Copy the noise NRJ to initialize the mean/sum.
sound_completed -> .
Do nothing (ignore it, more than one sound complete flag is possible).
- data: pb_err_rate_low -> .
+ data: no_channel_change -> .
Do nothing.
data: pb_err_rate_high -> IDLE
Release tone maps.
@@ -107,7 +107,7 @@ INTERVAL_TRACKING:
Compute the NSR mean.
Compute tone map.
Send new tone map on this interval.
- interval_data: pb_err_rate_low -> .
+ interval_data: no_channel_change -> .
Do nothing.
interval_data: pb_err_rate_high -> INTERVAL_SOUND
Send MME asking for sound.
diff --git a/cesar/ce/rx/bitloading/src/transition.c b/cesar/ce/rx/bitloading/src/transition.c
index 07539aa4fe..c90cc1afad 100644
--- a/cesar/ce/rx/bitloading/src/transition.c
+++ b/cesar/ce/rx/bitloading/src/transition.c
@@ -346,7 +346,7 @@ ce_rx_bl_fsm__TRACKING__data (ce_rx_t *ce_rx,
}
ce_debug_gpio_event
(CE_DEBUG_GPIO_EVENT_CE_RX_BL_MEASURE_DATA_NORMAL, true);
- return ce_rx_bl_fsm_next_branch (TRACKING, data, pb_err_rate_low);
+ return ce_rx_bl_fsm_next_branch (TRACKING, data, no_channel_change);
}
ce_rx_bl_fsm_branch_t
@@ -435,7 +435,7 @@ ce_rx_bl_fsm__INTERVAL_TRACKING__interval_data (
dbg_assert_default ();
return ce_rx_bl_fsm_next_branch (INTERVAL_TRACKING,
interval_data,
- pb_err_rate_low);
+ no_channel_change);
return ce_rx_bl_fsm_next_branch (INTERVAL_TRACKING,
interval_data,
pb_err_rate_high);
diff --git a/cesar/ce/rx/bitloading/test/src/test_fsm.c b/cesar/ce/rx/bitloading/test/src/test_fsm.c
index ddbc33f4e0..424791d1df 100644
--- a/cesar/ce/rx/bitloading/test/src/test_fsm.c
+++ b/cesar/ce/rx/bitloading/test/src/test_fsm.c
@@ -266,7 +266,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
}
@@ -299,7 +299,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
if (measure.false_pb_count == 0)
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
@@ -326,7 +326,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
if (measure.total_pb_count != measure.false_pb_count)
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
@@ -357,7 +357,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
}
scenario_test[pos++] = scenario_end;
scenario_run (t, scenario_test, &globals);
@@ -383,7 +383,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
}
@@ -431,7 +431,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
}
@@ -495,7 +495,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
scenario_test[pos++] = (scenario_entry_t)
@@ -561,7 +561,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
scenario_test[pos++] = (scenario_entry_t)
@@ -591,7 +591,7 @@ test_ce_rx_bl_fsm_base (test_t t)
.sta = &sta,
.measure = measure,
.branch = ce_rx_bl_fsm_next_branch
- (TRACKING, data, pb_err_rate_low));
+ (TRACKING, data, no_channel_change));
scenario_test[pos++] = (scenario_entry_t)
SCENARIO_EVENT (ce_rx_bl_ber_sliding_mean_update);
scenario_test[pos++] = (scenario_entry_t)