Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [2.1.0](https://github.com/rdkcentral/webui/compare/2.0.1...2.1.0)

- RDKB-62953: Primary channel ID is incorrect in GUI for OFDM [`#97`](https://github.com/rdkcentral/webui/pull/97)
- XER10-2533 : Observed duplicates of login message in admin page [`#96`](https://github.com/rdkcentral/webui/pull/96)
- Merge tag '2.0.1' into develop [`05ddeee`](https://github.com/rdkcentral/webui/commit/05ddeee491c1657175ebcba152bf4ab8734dd9ea)

#### [2.0.1](https://github.com/rdkcentral/webui/compare/2.0.0...2.0.1)

> 21 January 2026

- RDKBACCL-1223,RDKBACCL-1224: "Local IP Network" and "Port forwarding add" from WebUI results in "500 Internal Server Error" [`#82`](https://github.com/rdkcentral/webui/pull/82)
- RDKB-62741-Observed Guard Interval is not updating from 400ns when switch from a/n or a/n/c mode to be mode [`#90`](https://github.com/rdkcentral/webui/pull/90)
- Add changelog for release 2.0.1 [`47b33e5`](https://github.com/rdkcentral/webui/commit/47b33e573f7e0d910585e7bfb200b3c61b18e850)
- Merge tag '2.0.0' into develop [`d534467`](https://github.com/rdkcentral/webui/commit/d5344676790294bf2955e2ca2aaeb71f37db7b22)

### [2.0.0](https://github.com/rdkcentral/webui/compare/1.4.1...2.0.0)
Expand Down
2 changes: 1 addition & 1 deletion source/Styles/xb3/jst/index.jst
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ if($webuiIsEnabled == "false"){
<input type="submit" class="btn" value="Login" />
</div>
<?% if((!$isMSO) && (strpos($partnerId, "sky-") === false)){ ?>
<p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
<p id="index_helptext_tip">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
<?% } ?>
<input type="hidden" name="locale" id="locale" value="<?% echo($locale); ?>">
</form>
Expand Down
2 changes: 1 addition & 1 deletion source/Styles/xb6/jst/index.jst
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ if($webuiIsEnabled == "false"){
<input type="submit" class="btn" value="Login" />
</div>
<?% if((!$isMSO) && (strpos($partnerId, "sky-") === false)){ ?>
<p id="index_helptext">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
<p id="index_helptext_tip">Tip: The default password is printed on the bottom or back of your router - use this if you haven’t already changed .</
<?% } ?>
<input type="hidden" name="locale" id="locale" value="<?% echo($locale); ?>">
</form>
Expand Down
92 changes: 53 additions & 39 deletions source/Styles/xb6/jst/network_setup.jst
Original file line number Diff line number Diff line change
Expand Up @@ -894,30 +894,30 @@ $ds_ofdm_tab = []/*p2j-array*/;
for ($i=1, $j=1; $i<count($ds_ofdm_ids); $i++)
{
$ds_ofdm_tab[$i]={};
$ds_ofdm_tab[$i]['ChannelID'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['ChanIndicator'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['SubcarrierZeroFreq'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['FirstActiveSubcarrierNum'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['LastActiveSubcarrierNum'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NumActiveSubcarriers'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['SubcarrierSpacing'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['CyclicPrefix'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['RollOffPeriod'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PlcFreq'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NumPilots'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['TimeInterleaverDepth'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['SNRLevel'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PowerLevel'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PlcTotalCodewords'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PlcUnreliableCodewords'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NcpTotalFields'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NcpFieldCrcFailures'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['ChannelID'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['ChanIndicator'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['SubcarrierZeroFreq'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['FirstActiveSubcarrierNum'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['LastActiveSubcarrierNum'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NumActiveSubcarriers'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['SubcarrierSpacing'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['CyclicPrefix'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['RollOffPeriod'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PlcFreq'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NumPilots'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['TimeInterleaverDepth'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['SNRLevel'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PowerLevel'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PlcTotalCodewords'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['PlcUnreliableCodewords'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NcpTotalFields'] = $ds_ofdm_val[$j++][1];
$ds_ofdm_tab[$i]['NcpFieldCrcFailures'] = $ds_ofdm_val[$j++][1];

if($ds_ofdm_tab[$i]['SubcarrierZeroFreq']) {
$ds_ofdm_tab[$i]['LockStatus'] = 'Locked';
} else {
$ds_ofdm_tab[$i]['LockStatus'] = 'Not Locked';
}
if($ds_ofdm_tab[$i]['SubcarrierZeroFreq']) {
$ds_ofdm_tab[$i]['LockStatus'] = 'Locked';
} else {
$ds_ofdm_tab[$i]['LockStatus'] = 'Not Locked';
}
}

$channel_id=[];
Expand All @@ -926,22 +926,36 @@ for ($i=1; $i< $ds_ofdm_tab.length; $i++){
}

for($i=1;$i<$ds_tab.length;$i++){
if($ds_tab[$i]['Modulation']=='OFDM'){
$ds_tab.splice($i,1);
$ds_ids.splice($i,1);
$i--;

}else{

for ($j=0; $j<$channel_id.length; $j++){
if($channel_id[$j]==$ds_tab[$i]['ChannelID']){
$ds_tab.splice($i,1);
$ds_ids.splice($i,1);
$i--;
break;
if($ds_tab[$i]['Modulation']=='OFDM'){
$ds_tab.splice($i,1);
$ds_ids.splice($i,1);
$i--;
}else{
for ($j=0; $j<$channel_id.length; $j++){
if($channel_id[$j]==$ds_tab[$i]['ChannelID']){
$ds_tab.splice($i,1);
$ds_ids.splice($i,1);
$i--;
break;
}
}
}
}
}
}

// Find the primary ChannelID from $ds_ofdm_tab
for ($i=1; $i< $ds_ofdm_tab.length; $i++){
var $chanIndicator = $ds_ofdm_tab[$i]['ChanIndicator'].toLowerCase();
if ($chanIndicator == 'primary') {
// Move Primary $ds_ofdm_tab entry to the front of $ds_tab
const $tabItem = $ds_ofdm_tab.splice($i, 1)[0];
$ds_ofdm_ids.splice($i, 1);
$ds_tab.splice(1, 0, $tabItem);
$ds_ids.push($ds_ids.length);
//Add Frequency & Modulation
$ds_tab[1]['Frequency'] = $tabItem['PlcFreq'];
$ds_tab[1]['Modulation'] = ($tabItem['LockStatus']=='Locked')?'OFDM':'UNSUPPORTED';
break; // only one primary
}
}

?>
Expand All @@ -951,7 +965,7 @@ for($i=1;$i<$ds_tab.length;$i++){
<thead>
<tr>
<td class="row-label acs-th"><div class="netWidth">Downstream</div></td>
<td class="row-label acs-th" colspan="<?% echo( count($ds_ids));?>">Channel Bonding Value</td>
<td class="row-label acs-th" colspan="<?% echo(count($ds_ids)+count($ds_ofdm_ids));?>">Channel Bonding Value</td>
</tr>
</thead>
<tbody>
Expand Down