Skip to content

RDKB-66345 Disable 160MHz if DFS at boot up is false #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavankumar464 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

RDKB-66345 Disable 160MHz if DFS at boot up is false #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions source/Styles/xb6/jst/wireless_network_configuration.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ $(document).ready(function() {
}
// disable NOT 20MHz channel if 165
// Warning for DFS channel (52-140)
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
$("#channel_number1").change(function(){
var channel = $("#channel_number1 option:selected").val();
if(channel >= 52 && channel <= 140 ) {
Expand All @@ -1044,18 +1045,25 @@ $(document).ready(function() {
$('[name="channel_bandwidth1"]:not([value="20MHz"])').prop("disabled", true);
}
else{
/*
* Re-enable bandwidth options for non-165 channels,
* but preserve DFS-at-boot restrictions.
*/
$('[name="channel_bandwidth1"]').prop("disabled", false);

if ($dfsBoot == "false") {
$("#channel_bandwidth3").prop("disabled", true);
}
Comment on lines +1054 to +1056
}
});
// disable NOT 20MHz channel if 165
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
if ( "true" != "<?% echo( $channel_automatic1); ?>" && "165" == "<?% echo( $channel_number1); ?>"){
$('[name="channel_bandwidth1"]:not([value="20MHz"])').prop("disabled", true);
}
else{
if($dfsBoot=="false" && (platformSupported=="true" ))
$("#channel_bandwidth3").prop("disabled", true);
else
$("#channel_bandwidth3").prop("disabled", true);
else
$('[name="channel_bandwidth1"]').prop("disabled", false);
}
// now we can show target content
Expand Down
10 changes: 9 additions & 1 deletion source/Styles/xb6/jst/wireless_network_configuration_edit.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,12 +610,21 @@ $(document).ready(function() {
}
}
}).trigger("change");
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
$("#channel_number").change(function() {
if ("165" == $(this).val()){
$('[name="channel_bandwidth1"]:not([value="20MHz"])').prop("disabled", true);
}
else{
/*
* Re-enable bandwidth options for non-165 channels,
* but preserve DFS-at-boot restrictions.
*/
$('[name="channel_bandwidth1"]').prop("disabled", false);

if ($dfsBoot == "false") {
$("#channel_bandwidth3").prop("disabled", true);
}
Comment on lines +625 to +627
}
}).trigger("change");
$("#wireless_network_switch").change(function() {
Expand Down Expand Up @@ -757,7 +766,6 @@ wpa2psk ==> 8 to 63 Ascii characters
click_save();
}
});
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
if($dfsBoot=="false" && (platformSupported=="true" )){
$("#channel_bandwidth3").prop("disabled", true);
}
Expand Down
10 changes: 9 additions & 1 deletion source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,12 +635,21 @@ $(document).ready(function() {
}
}
}).trigger("change");
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
$("#channel_number").change(function() {
if ("165" == $(this).val()){
$('[name="channel_bandwidth1"]:not([value="20MHz"])').prop("disabled", true);
}
else{
/*
* Re-enable bandwidth options for non-165 channels,
* but preserve DFS-at-boot restrictions.
*/
$('[name="channel_bandwidth1"]').prop("disabled", false);

if ($dfsBoot == "false") {
$("#channel_bandwidth3").prop("disabled", true);
}
Comment on lines +650 to +652
}
}).trigger("change");
$("#wireless_network_switch").change(function() {
Expand Down Expand Up @@ -782,7 +791,6 @@ wpa2psk ==> 8 to 63 Ascii characters
click_save();
}
});
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
if($dfsBoot=="false" && (platformSupported=="true" )){
$("#channel_bandwidth3").prop("disabled", true);
}
Expand Down
10 changes: 9 additions & 1 deletion source/Styles/xb6/jst/wireless_network_configuration_onewifi.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,7 @@ $(document).ready(function() {
}
// disable NOT 20MHz channel if 165
// Warning for DFS channel (52-140)
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
$("#channel_number1").change(function(){
var channel = $("#channel_number1 option:selected").val();
if(channel >= 52 && channel <= 140 ) {
Expand All @@ -1063,11 +1064,18 @@ $(document).ready(function() {
$('[name="channel_bandwidth1"]:not([value="20MHz"])').prop("disabled", true);
}
else{
/*
* Re-enable bandwidth options for non-165 channels,
* but preserve DFS-at-boot restrictions.
*/
$('[name="channel_bandwidth1"]').prop("disabled", false);

if ($dfsBoot == "false") {
$("#channel_bandwidth3").prop("disabled", true);
}
Comment on lines +1073 to +1075
}
});
// disable NOT 20MHz channel if 165
$dfsBoot= '<?% echo($dfsAtBootup); ?>';
if ( "true" != "<?% echo( $channel_automatic1); ?>" && "165" == "<?% echo( $channel_number1); ?>"){
$('[name="channel_bandwidth1"]:not([value="20MHz"])').prop("disabled", true);
}
Expand Down
Loading